Changeset 649 for trunk

Timestamp:

Jul 20, 2006, 9:58:25 PM (16 years ago)

Author:

livings124

Message:

Remove filter hide and show buttons from the bars and instead have a toolbar item for it.
Smoother Bandwidth prefs icon.

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (8 diffs)
• macosx/Controller.h (modified) (2 diffs)
• macosx/Controller.m (modified) (8 diffs)
• macosx/English.lproj/MainMenu.nib/classes.nib (modified) (2 diffs)
• macosx/English.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
• macosx/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• macosx/Images/Bandwidth.png (modified) (previous)
• macosx/Images/CloseCircleButton.png (deleted)
• macosx/Images/CloseCircleButtonPressed.png (deleted)
• macosx/Images/FilterHide.png (added)
• macosx/Images/FilterShow.png (added)
• macosx/Images/RevealCircleButton.png (deleted)
• macosx/Images/RevealCircleButtonPressed.png (deleted)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -92 +92 @@
                 A2305AAC0A3DCCEF00AB2D77 /* ProgressBarEndGreen.png in Resources */ = {isa = PBXBuildFile; fileRef = A2305AA70A3DCCEF00AB2D77 /* ProgressBarEndGreen.png */; };
                 A2305AAD0A3DCCEF00AB2D77 /* ProgressBarEndGray.png in Resources */ = {isa = PBXBuildFile; fileRef = A2305AA80A3DCCEF00AB2D77 /* ProgressBarEndGray.png */; };
-                A24600400A6DB58600D19088 /* RevealCircleButtonPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A246003E0A6DB58600D19088 /* RevealCircleButtonPressed.png */; };
-                A24600410A6DB58600D19088 /* RevealCircleButton.png in Resources */ = {isa = PBXBuildFile; fileRef = A246003F0A6DB58600D19088 /* RevealCircleButton.png */; };
                 A246004D0A6DCE4600D19088 /* SpeedLimitButtonPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A246004C0A6DCE4600D19088 /* SpeedLimitButtonPressed.png */; };
                 A24600510A6DCE6600D19088 /* SpeedLimitButtonBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = A246004F0A6DCE6600D19088 /* SpeedLimitButtonBlue.png */; };
@@ -109 +107 @@
                 A253F72B0A699373008EE24F /* FilterButtonSelectedMain.png in Resources */ = {isa = PBXBuildFile; fileRef = A253F7280A699373008EE24F /* FilterButtonSelectedMain.png */; };
                 A253F72C0A699373008EE24F /* FilterButtonSelectedRight.png in Resources */ = {isa = PBXBuildFile; fileRef = A253F7290A699373008EE24F /* FilterButtonSelectedRight.png */; };
+                A25A5FF20A70290900E099DE /* FilterHide.png in Resources */ = {isa = PBXBuildFile; fileRef = A25A5FF00A70290900E099DE /* FilterHide.png */; };
+                A25A5FF30A70290900E099DE /* FilterShow.png in Resources */ = {isa = PBXBuildFile; fileRef = A25A5FF10A70290900E099DE /* FilterShow.png */; };
                 A25FCDDF0A37695F002BCBBE /* PauseSelected.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = A25FCDDD0A37695F002BCBBE /* PauseSelected.png */; };
                 A25FCDE00A37695F002BCBBE /* ResumeSelected.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = A25FCDDE0A37695F002BCBBE /* ResumeSelected.png */; };
@@ -120 +120 @@
                 A27A53660A06AEDB00E1F16F /* StatusBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A27A53650A06AEDB00E1F16F /* StatusBorder.png */; };
                 A27ABC240A6ADE410020EC71 /* ImageBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = A27ABC220A6ADE410020EC71 /* ImageBackgroundView.m */; };
-                A27ABC8B0A6B317D0020EC71 /* CloseCircleButton.png in Resources */ = {isa = PBXBuildFile; fileRef = A27ABC890A6B317D0020EC71 /* CloseCircleButton.png */; };
-                A27ABC8C0A6B317D0020EC71 /* CloseCircleButtonPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A27ABC8A0A6B317D0020EC71 /* CloseCircleButtonPressed.png */; };
                 A289EB0C0A33C56D00B082A3 /* ButtonBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */; };
                 A28C43F40A4A5D700091A302 /* Transmission Help in Resources */ = {isa = PBXBuildFile; fileRef = A28C43EB0A4A5D700091A302 /* Transmission Help */; };
@@ -297 +295 @@
                 A2305AA70A3DCCEF00AB2D77 /* ProgressBarEndGreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndGreen.png; path = macosx/Images/ProgressBarEndGreen.png; sourceTree = "<group>"; };
                 A2305AA80A3DCCEF00AB2D77 /* ProgressBarEndGray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndGray.png; path = macosx/Images/ProgressBarEndGray.png; sourceTree = "<group>"; };
-                A246003E0A6DB58600D19088 /* RevealCircleButtonPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RevealCircleButtonPressed.png; path = macosx/Images/RevealCircleButtonPressed.png; sourceTree = "<group>"; };
-                A246003F0A6DB58600D19088 /* RevealCircleButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RevealCircleButton.png; path = macosx/Images/RevealCircleButton.png; sourceTree = "<group>"; };
                 A246004C0A6DCE4600D19088 /* SpeedLimitButtonPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButtonPressed.png; path = macosx/Images/SpeedLimitButtonPressed.png; sourceTree = "<group>"; };
                 A246004F0A6DCE6600D19088 /* SpeedLimitButtonBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButtonBlue.png; path = macosx/Images/SpeedLimitButtonBlue.png; sourceTree = "<group>"; };
@@ -313 +309 @@
                 A253F7280A699373008EE24F /* FilterButtonSelectedMain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterButtonSelectedMain.png; path = macosx/Images/FilterButtonSelectedMain.png; sourceTree = "<group>"; };
                 A253F7290A699373008EE24F /* FilterButtonSelectedRight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterButtonSelectedRight.png; path = macosx/Images/FilterButtonSelectedRight.png; sourceTree = "<group>"; };
+                A25A5FF00A70290900E099DE /* FilterHide.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterHide.png; path = macosx/Images/FilterHide.png; sourceTree = "<group>"; };
+                A25A5FF10A70290900E099DE /* FilterShow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterShow.png; path = macosx/Images/FilterShow.png; sourceTree = "<group>"; };
                 A25FCDDD0A37695F002BCBBE /* PauseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PauseSelected.png; path = macosx/Images/PauseSelected.png; sourceTree = "<group>"; };
                 A25FCDDE0A37695F002BCBBE /* ResumeSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ResumeSelected.png; path = macosx/Images/ResumeSelected.png; sourceTree = "<group>"; };
@@ -324 +322 @@
                 A27ABC210A6ADE410020EC71 /* ImageBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ImageBackgroundView.h; path = macosx/ImageBackgroundView.h; sourceTree = "<group>"; };
                 A27ABC220A6ADE410020EC71 /* ImageBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ImageBackgroundView.m; path = macosx/ImageBackgroundView.m; sourceTree = "<group>"; };
-                A27ABC890A6B317D0020EC71 /* CloseCircleButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CloseCircleButton.png; path = macosx/Images/CloseCircleButton.png; sourceTree = "<group>"; };
-                A27ABC8A0A6B317D0020EC71 /* CloseCircleButtonPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CloseCircleButtonPressed.png; path = macosx/Images/CloseCircleButtonPressed.png; sourceTree = "<group>"; };
                 A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ButtonBorder.png; path = macosx/Images/ButtonBorder.png; sourceTree = "<group>"; };
                 A28C43EB0A4A5D700091A302 /* Transmission Help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Transmission Help"; path = "macosx/Transmission Help"; sourceTree = "<group>"; };
@@ -484 +480 @@
                                 A27A53560A06A76400E1F16F /* StatusSep.png */,
                                 A27A53650A06AEDB00E1F16F /* StatusBorder.png */,
-                                A27ABC890A6B317D0020EC71 /* CloseCircleButton.png */,
-                                A27ABC8A0A6B317D0020EC71 /* CloseCircleButtonPressed.png */,
-                                A246003E0A6DB58600D19088 /* RevealCircleButtonPressed.png */,
-                                A246003F0A6DB58600D19088 /* RevealCircleButton.png */,
+                                A25A5FF00A70290900E099DE /* FilterHide.png */,
+                                A25A5FF10A70290900E099DE /* FilterShow.png */,
                                 A253F6F20A698970008EE24F /* FilterBarBackground.png */,
                                 A253F7080A6990EB008EE24F /* FilterButtonOverMain.png */,
@@ -761 +755 @@
                                 A253F72B0A699373008EE24F /* FilterButtonSelectedMain.png in Resources */,
                                 A253F72C0A699373008EE24F /* FilterButtonSelectedRight.png in Resources */,
-                                A27ABC8B0A6B317D0020EC71 /* CloseCircleButton.png in Resources */,
-                                A27ABC8C0A6B317D0020EC71 /* CloseCircleButtonPressed.png in Resources */,
-                                A24600400A6DB58600D19088 /* RevealCircleButtonPressed.png in Resources */,
-                                A24600410A6DB58600D19088 /* RevealCircleButton.png in Resources */,
                                 A246004D0A6DCE4600D19088 /* SpeedLimitButtonPressed.png in Resources */,
                                 A24600510A6DCE6600D19088 /* SpeedLimitButtonBlue.png in Resources */,
                                 A24600520A6DCE6600D19088 /* SpeedLimitButtonGraphite.png in Resources */,
+                                A25A5FF20A70290900E099DE /* FilterHide.png in Resources */,
+                                A25A5FF30A70290900E099DE /* FilterShow.png in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/macosx/Controller.h

@@ -61 +61 @@
     BOOL                            fStatusBarVisible;
     IBOutlet NSTextField            * fTotalDLField, * fTotalULField, * fTotalTorrentsField;
-    IBOutlet NSButton               * fShowFilterButton;
     
     NSString                        * fSortType;
@@ -73 +72 @@
                                     * fSeedFilterButton, * fDownloadFilterButton;
     IBOutlet NSSearchField          * fSearchFilterField;
-    IBOutlet NSButton               * fHideFilterButton;
                                 
     IBOutlet NSMenuItem             * fNextInfoTabItem, * fPrevInfoTabItem;

trunk/macosx/Controller.m

@@ -41 +41 @@
 #define TOOLBAR_PAUSE_SELECTED  @"Toolbar Pause Selected"
 #define TOOLBAR_RESUME_SELECTED @"Toolbar Resume Selected"
+#define TOOLBAR_FILTER   @"Toolbar Toggle Filter"
 
 #define TORRENT_TABLE_VIEW_DATA_TYPE    @"TorrentTableViewDataType"
@@ -143 +144 @@
     //set up filter bar
     NSView * contentView = [fWindow contentView];
-    [fHideFilterButton setToolTip: @"Hide Filter Bar"];
     [fFilterBar setHidden: YES];
     
@@ -158 +158 @@
     //set up status bar
     fStatusBarVisible = NO;
-    [fShowFilterButton setToolTip: @"Show Filter Bar"];
     [fStatusBar setHidden: YES];
     
@@ -1657 +1656 @@
     }
     
-    //enable show filter button in status bar
-    [fShowFilterButton setEnabled: !show];
+    //change toolbar filter image
+    NSEnumerator * enumerator = [[[fWindow toolbar] items] objectEnumerator];
+    NSToolbarItem * toolbarItem;
+    while ((toolbarItem = [enumerator nextObject]))
+        if ([[toolbarItem itemIdentifier] isEqualToString: TOOLBAR_FILTER])
+        {
+            [toolbarItem setImage: show ? [NSImage imageNamed: @"FilterShow.png"]
+                                        : [NSImage imageNamed: @"FilterHide.png"]];
+            break;
+        }
     
     //reset tracking rects for filter buttons
@@ -1702 +1709 @@
     {
         [item setLabel: @"Inspector"];
-        [item setPaletteLabel: @"Show/Hide Inspector"];
-        [item setToolTip: @"Display torrent inspector"];
+        [item setPaletteLabel: @"Toggle Inspector"];
+        [item setToolTip: @"Toggle the torrent inspector"];
         [item setImage: [NSImage imageNamed: @"Info.png"]];
         [item setTarget: self];
@@ -1744 +1751 @@
         [item setAction: @selector(resumeSelectedTorrents:)];
     }
+    else if ([ident isEqualToString: TOOLBAR_FILTER])
+    {
+        [item setLabel: @"Filter Bar"];
+        [item setPaletteLabel: @"Toggle Filter Bar"];
+        [item setToolTip: @"Toggle the filter bar"];
+        [item setImage: [NSImage imageNamed: @"FilterHide.png"]];
+        [item setTarget: self];
+        [item setAction: @selector(toggleFilterBar:)];
+    }
     else
     {
@@ -1758 +1774 @@
             TOOLBAR_OPEN, TOOLBAR_REMOVE,
             TOOLBAR_PAUSE_SELECTED, TOOLBAR_RESUME_SELECTED,
-            TOOLBAR_PAUSE_ALL, TOOLBAR_RESUME_ALL, TOOLBAR_INFO,
+            TOOLBAR_PAUSE_ALL, TOOLBAR_RESUME_ALL, TOOLBAR_FILTER, TOOLBAR_INFO,
             NSToolbarSeparatorItemIdentifier,
             NSToolbarSpaceItemIdentifier,
@@ -1772 +1788 @@
             TOOLBAR_PAUSE_ALL, TOOLBAR_RESUME_ALL,
             NSToolbarFlexibleSpaceItemIdentifier,
-            TOOLBAR_INFO, nil];
+            TOOLBAR_FILTER, TOOLBAR_INFO, nil];
 }
 

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

@@ -46 +46 @@
                 fDownloadNoLimitItem = NSMenuItem; 
                 fFilterBar = ImageBackgroundView; 
-                fHideFilterButton = NSButton; 
                 fNameSortItem = NSMenuItem; 
                 fNextInfoTabItem = NSMenuItem; 
@@ -59 +58 @@
                 fSearchFilterField = NSSearchField; 
                 fSeedFilterButton = BarButton; 
-                fShowFilterButton = NSButton; 
                 fSmallViewItem = NSMenuItem; 
                 fSpeedLimitButton = NSButton; 

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

@@ -10 +10 @@
                 <string>344 478 208 99 0 0 1152 842 </string>
                 <key>1480</key>
-                <string>358 399 420 63 0 0 1152 842 </string>
+                <string>366 546 420 63 0 0 1152 842 </string>
                 <key>1603</key>
                 <string>337 544 477 67 0 0 1152 842 </string>
@@ -32 +32 @@
         <key>IBOpenObjects</key>
         <array>
+                <integer>21</integer>
+                <integer>1480</integer>
                 <integer>29</integer>
-                <integer>21</integer>
+                <integer>1603</integer>
         </array>
         <key>IBSystem Version</key>