Changeset 9800

Timestamp:

Dec 19, 2009, 7:17:09 PM (12 years ago)

Author:

livings124

Message:

random cleanup

Location:

trunk/macosx

Files:

• FilePriorityCell.m (modified) (1 diff)
• GroupsPrefsController.m (modified) (3 diffs)

trunk/macosx/FilePriorityCell.m

@@ -139 +139 @@
         
         NSSize imageSize = [image size];
-        NSRect imageRect = NSMakeRect(cellFrame.origin.x + (cellFrame.size.width - imageSize.width) * 0.5,
-                                        cellFrame.origin.y + (cellFrame.size.height - imageSize.height) * 0.5,
+        NSRect imageRect = NSMakeRect(NSMidX(cellFrame) - imageSize.width * 0.5, NSMidY(cellFrame) - imageSize.height * 0.5,
                                         imageSize.width, imageSize.height);
         

trunk/macosx/GroupsPrefsController.m

@@ -36 +36 @@
 
 - (void) updateSelectedGroup;
-- (void) refreshCustomLocation;
+- (void) refreshCustomLocationWithSingleGroup;
 
 @end
@@ -319 +319 @@
         [fSelectedColorNameField setEnabled: YES];
         
-        [self refreshCustomLocation];
+        [self refreshCustomLocationWithSingleGroup];
 
         [fAutoAssignRulesEnableCheck setState: [[GroupsController groups] usesAutoAssignRulesForIndex: index]];
@@ -338 +338 @@
 }
 
-- (void) refreshCustomLocation
+- (void) refreshCustomLocationWithSingleGroup
 {
     const NSInteger index = [[GroupsController groups] indexForRow: [fTableView selectedRow]];
     
-    [fCustomLocationEnableCheck setState: [[GroupsController groups] usesCustomDownloadLocationForIndex: index]];
+    const BOOL hasCustomLocation = [[GroupsController groups] usesCustomDownloadLocationForIndex: index];
+    [fCustomLocationEnableCheck setState: hasCustomLocation];
     [fCustomLocationEnableCheck setEnabled: YES];
-    [fCustomLocationPopUp setEnabled: [fCustomLocationEnableCheck state] == NSOnState];
-    
-    if ([[GroupsController groups] customDownloadLocationForIndex: index])
-    {
-        NSString * location = [[GroupsController groups] customDownloadLocationForIndex: index];
+    [fCustomLocationPopUp setEnabled: hasCustomLocation];
+    
+    NSString * location = [[GroupsController groups] customDownloadLocationForIndex: index];
+    if (location)
+    {
         ExpandedPathToPathTransformer * pathTransformer = [[[ExpandedPathToPathTransformer alloc] init] autorelease];
         [[fCustomLocationPopUp itemAtIndex: 0] setTitle: [pathTransformer transformedValue: location]];