Changeset 2710

Timestamp:

Aug 10, 2007, 5:46:02 PM (15 years ago)

Author:

livings124

Message:

declare methods in FileBrowserCell?, and make some private

Location:

trunk/macosx

Files:

• FileBrowserCell.h (modified) (1 diff)
• FileBrowserCell.m (modified) (4 diffs)

trunk/macosx/FileBrowserCell.h

@@ -34 +34 @@
 - (void) setProgress: (float) progress;
 
+- (NSRect) titleRectForBounds: (NSRect) bounds;
+- (NSRect) statusRectForBounds: (NSRect) bounds;
+- (NSRect) imageRectForBounds: (NSRect) bounds;
+
 @end

trunk/macosx/FileBrowserCell.m

@@ -34 +34 @@
 #define PADDING_AFTER_TITLE 1.0
 
+@interface FileBrowserCell (Private)
+
+- (NSAttributedString *) attributedTitleWithColor: (NSColor *) color;
+- (NSAttributedString *) attributedStatusWithColor: (NSColor *) color;
+
+@end
+
 @implementation FileBrowserCell
 
@@ -54 +61 @@
 {
     fPercent = progress * 100.0;
-}
-
-- (NSAttributedString *) attributedTitleWithColor: (NSColor *) color
-{
-    if (!fTitleAttributes)
-    {
-        NSMutableParagraphStyle * paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
-        [paragraphStyle setLineBreakMode: NSLineBreakByTruncatingTail];
-        
-        fTitleAttributes = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
-                            [NSFont messageFontOfSize: 12.0], NSFontAttributeName,
-                            paragraphStyle, NSParagraphStyleAttributeName, nil];
-        
-        [paragraphStyle release];
-    }
-    
-    if (color)
-        [fTitleAttributes setObject: color forKey: NSForegroundColorAttributeName];
-        
-    NSString * title = [[self objectValue] objectForKey: @"Name"];
-    return [[[NSAttributedString alloc] initWithString: title attributes: fTitleAttributes] autorelease];
 }
 
@@ -98 +84 @@
     
     return result;
-}
-
-- (NSAttributedString *) attributedStatusWithColor: (NSColor *) color
-{
-    if (!fStatusAttributes)
-    {
-        NSMutableParagraphStyle * paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
-        [paragraphStyle setLineBreakMode: NSLineBreakByTruncatingTail];
-        
-        fStatusAttributes = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
-                                [NSFont messageFontOfSize: 9.0], NSFontAttributeName,
-                                paragraphStyle, NSParagraphStyleAttributeName, nil];
-        
-        [paragraphStyle release];
-    }
-    
-    if (color)
-        [fStatusAttributes setObject: color forKey: NSForegroundColorAttributeName];
-    
-    #warning fPercent?
-    NSString * status = [NSString stringWithFormat: NSLocalizedString(@"%.2f%% of %@",
-                            "Inspector -> Files tab -> file status string"), fPercent,
-                            [NSString stringForFileSize: [[[self objectValue] objectForKey: @"Size"] unsignedLongLongValue]]];
-    
-    return [[[NSAttributedString alloc] initWithString: status attributes: fStatusAttributes] autorelease];
 }
 
@@ -177 +138 @@
 
 @end
+
+@implementation FileBrowserCell (Private)
+
+- (NSAttributedString *) attributedTitleWithColor: (NSColor *) color
+{
+    if (!fTitleAttributes)
+    {
+        NSMutableParagraphStyle * paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
+        [paragraphStyle setLineBreakMode: NSLineBreakByTruncatingTail];
+        
+        fTitleAttributes = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
+                            [NSFont messageFontOfSize: 12.0], NSFontAttributeName,
+                            paragraphStyle, NSParagraphStyleAttributeName, nil];
+        
+        [paragraphStyle release];
+    }
+    
+    if (color)
+        [fTitleAttributes setObject: color forKey: NSForegroundColorAttributeName];
+        
+    NSString * title = [[self objectValue] objectForKey: @"Name"];
+    return [[[NSAttributedString alloc] initWithString: title attributes: fTitleAttributes] autorelease];
+}
+
+- (NSAttributedString *) attributedStatusWithColor: (NSColor *) color
+{
+    if (!fStatusAttributes)
+    {
+        NSMutableParagraphStyle * paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
+        [paragraphStyle setLineBreakMode: NSLineBreakByTruncatingTail];
+        
+        fStatusAttributes = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
+                                [NSFont messageFontOfSize: 9.0], NSFontAttributeName,
+                                paragraphStyle, NSParagraphStyleAttributeName, nil];
+        
+        [paragraphStyle release];
+    }
+    
+    if (color)
+        [fStatusAttributes setObject: color forKey: NSForegroundColorAttributeName];
+    
+    #warning fPercent?
+    NSString * status = [NSString stringWithFormat: NSLocalizedString(@"%.2f%% of %@",
+                            "Inspector -> Files tab -> file status string"), fPercent,
+                            [NSString stringForFileSize: [[[self objectValue] objectForKey: @"Size"] unsignedLongLongValue]]];
+    
+    return [[[NSAttributedString alloc] initWithString: status attributes: fStatusAttributes] autorelease];
+}
+
+@end