Changeset 6045

Timestamp:

Jun 5, 2008, 2:46:39 AM (15 years ago)

Author:

livings124

Message:

some small simplifications to the group code

Location:

trunk/macosx

Files:

• Controller.m (modified) (4 diffs)
• English.lproj/Localizable.strings (modified) (2 diffs)
• GroupsController.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -2266 +2266 @@
     NSImage * icon;
     NSString * toolTip;
-    switch (groupIndex)
-    {
-        case GROUP_FILTER_ALL_TAG:
-            icon = [NSImage imageNamed: @"PinTemplate.png"];
-            toolTip = NSLocalizedString(@"All Groups", "Groups -> Button");
-            break;
-        case -1:
-            icon = [NSImage imageNamed: @"GroupsNoneTemplate.png"];
-            toolTip = [NSString stringWithFormat: @"%@: %@", NSLocalizedString(@"Group", "Groups -> Button"),
-                        NSLocalizedString(@"No Label", "Groups -> Button")];
-            break;
-        default:
-            icon = [[GroupsController groups] imageForIndex: groupIndex];
-            toolTip = [NSString stringWithFormat: @"%@: %@", NSLocalizedString(@"Group", "Groups -> Button"),
-                        [[GroupsController groups] nameForIndex: groupIndex]];
+    if (groupIndex == GROUP_FILTER_ALL_TAG)
+    {
+        icon = [NSImage imageNamed: @"PinTemplate.png"];
+        toolTip = NSLocalizedString(@"All Groups", "Groups -> Button");
+    }
+    else
+    {
+        icon = [[GroupsController groups] imageForIndex: groupIndex];
+        NSString * groupName = groupIndex != -1 ? [[GroupsController groups] nameForIndex: groupIndex]
+                                                : NSLocalizedString(@"None", "Groups -> Button");
+        toolTip = [NSString stringWithFormat: @"%@: %@", NSLocalizedString(@"Group", "Groups -> Button"), groupName];
     }
     
@@ -2543 +2539 @@
 - (id) outlineView: (NSOutlineView *) outlineView objectValueForTableColumn: (NSTableColumn *) tableColumn byItem: (id) item
 {
-    if (![item isKindOfClass: [Torrent class]])
+    if ([item isKindOfClass: [Torrent class]])
+        return [item hashString];
+    else
     {
         NSString * ident = [tableColumn identifier];
@@ -2555 +2553 @@
         {
             int group = [[item objectForKey: @"Group"] intValue];
-            return group != -1 ? [[GroupsController groups] imageForIndex: group]
-                                : [NSImage imageNamed: @"GroupsNoneTemplate.png"];
+            return [[GroupsController groups] imageForIndex: group];
         }
         else if ([ident isEqualToString: @"DL Image"])
@@ -2592 +2589 @@
         }
     }
-    else
-        return [item hashString];
 }
 

trunk/macosx/English.lproj/Localizable.strings

@@ -461 +461 @@
 "No Group" = "No Group";
 
-/* Groups -> Button */
-"No Label" = "No Label";
-
 /* Inspector -> selected torrents */
 "No Torrents Selected" = "No Torrents Selected";
 
-/* Groups -> Menu */
+/* Groups -> Menu
+   Groups -> Button */
 "None" = "None";
 
@@ -512 +510 @@
 "Open Torrent Address" = "Open Torrent Address";
 
+/* Open toolbar item -> tooltip */
+"Open torrent files" = "Open torrent files";
+
 /* Open toolbar item -> palette label */
 "Open Torrent Files" = "Open Torrent Files";
-
-/* Open toolbar item -> tooltip */
-"Open torrent files" = "Open torrent files";
 
 /* Open address toolbar item -> tooltip */

trunk/macosx/GroupsController.m

@@ -147 +147 @@
 {
     int orderIndex = [self rowValueForIndex: index];
-    return orderIndex != -1 ? [self imageForGroup: [fGroups objectAtIndex: orderIndex]] : nil;
+    return orderIndex != -1 ? [self imageForGroup: [fGroups objectAtIndex: orderIndex]]
+                            : [NSImage imageNamed: @"GroupsNoneTemplate.png"];
 }