Changeset 4260

Timestamp:

Dec 21, 2007, 4:29:42 PM (15 years ago)

Author:

livings124

Message:

combine group code and adjust the group button size

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• English.lproj/MainMenu.nib/classes.nib (modified) (2 diffs)
• English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)

trunk/macosx/Controller.m

@@ -2095 +2095 @@
     
     NSImage * icon = nil;
-    if (index >= 0)
-        icon = [[GroupsWindowController groupsController] imageForIndex: index isSmall: YES];
-    else if (index == GROUP_FILTER_ALL_TAG)
-        icon = [NSImage imageNamed: @"PinTemplate.png"];
-    else
-    {
-        if ([NSApp isOnLeopardOrBetter])
-            icon = [NSImage imageNamed: NSImageNameRemoveTemplate];
-    }
-    [[fGroupFilterMenu itemAtIndex: 0] setImage: icon];
-    
     NSString * toolTip;
     switch (index)
     {
         case GROUP_FILTER_ALL_TAG:
+            icon = [NSImage imageNamed: @"PinTemplate.png"];
             toolTip = NSLocalizedString(@"All Groups", "Groups -> Button");
             break;
         case -1:
+            if ([NSApp isOnLeopardOrBetter])
+                icon = [NSImage imageNamed: NSImageNameRemoveTemplate];
             toolTip = NSLocalizedString(@"Group: No Label", "Groups -> Button");
             break;
         default:
+            icon = [[GroupsWindowController groupsController] imageForIndex: index isSmall: YES];
             toolTip = [NSLocalizedString(@"Group: ", "Groups -> Button") stringByAppendingString:
                         [[GroupsWindowController groupsController] nameForIndex: index]];
     }
+    
+    [[fGroupFilterMenu itemAtIndex: 0] setImage: icon];
     [fGroupsButton setToolTip: toolTip];
 }

trunk/macosx/English.lproj/MainMenu.nib/classes.nib

@@ -274 +274 @@
                 </dict>
                 <dict>
-                        <key>CLASS</key>
-                        <string>FilterButton</string>
-                        <key>LANGUAGE</key>
-                        <string>ObjC</string>
-                        <key>SUPERCLASS</key>
-                        <string>NSButton</string>
-                </dict>
-                <dict>
                         <key>ACTIONS</key>
                         <dict>
@@ -318 +310 @@
                         <key>SUPERCLASS</key>
                         <string>NSTableView</string>
+                </dict>
+                <dict>
+                        <key>CLASS</key>
+                        <string>FilterButton</string>
+                        <key>LANGUAGE</key>
+                        <string>ObjC</string>
+                        <key>SUPERCLASS</key>
+                        <string>NSButton</string>
                 </dict>
                 <dict>

trunk/macosx/English.lproj/MainMenu.nib/info.nib

@@ -11 +11 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>1310</integer>
+                <integer>1603</integer>
         </array>
         <key>IBSystem Version</key>