Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 20:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Smoother Bandwidth prefs icon.
This commit is contained in:
Mitchell Livingston
2006-07-20 21:58:25 +00:00
parent 1da4599dfe
commit 9048f4683e
11 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Transmission.xcodeproj/project.pbxproj
View File

@@ -91,8 +91,6 @@
A2305AAB0A3DCCEF00AB2D77 /* ProgressBarEndWhite.png in Resources */ = {isa = PBXBuildFile; fileRef = A2305AA60A3DCCEF00AB2D77 /* ProgressBarEndWhite.png */; };
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 */; };
A24600520A6DCE6600D19088 /* SpeedLimitButtonGraphite.png in Resources */ = {isa = PBXBuildFile; fileRef = A24600500A6DCE6600D19088 /* SpeedLimitButtonGraphite.png */; };
@@ -108,6 +106,8 @@
A253F72A0A699373008EE24F /* FilterButtonSelectedLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = A253F7270A699373008EE24F /* FilterButtonSelectedLeft.png */; };
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 */; };
A25FCDEF0A3769A6002BCBBE /* PauseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = A25FCDDD0A37695F002BCBBE /* PauseSelected.png */; };
@@ -119,8 +119,6 @@
A27A53570A06A76400E1F16F /* StatusSep.png in Resources */ = {isa = PBXBuildFile; fileRef = A27A53560A06A76400E1F16F /* StatusSep.png */; };
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 */; };
A28DBADC0A33C1D800F4B4A7 /* ActionButton.png in Resources */ = {isa = PBXBuildFile; fileRef = A28DBADB0A33C1D800F4B4A7 /* ActionButton.png */; };
@@ -296,8 +294,6 @@
A2305AA60A3DCCEF00AB2D77 /* ProgressBarEndWhite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndWhite.png; path = macosx/Images/ProgressBarEndWhite.png; sourceTree = "<group>"; };
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>"; };
A24600500A6DCE6600D19088 /* SpeedLimitButtonGraphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButtonGraphite.png; path = macosx/Images/SpeedLimitButtonGraphite.png; sourceTree = "<group>"; };
@@ -312,6 +308,8 @@
A253F7270A699373008EE24F /* FilterButtonSelectedLeft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterButtonSelectedLeft.png; path = macosx/Images/FilterButtonSelectedLeft.png; sourceTree = "<group>"; };
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>"; };
A261F1DB0A69A1610002815A /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = macosx/Growl.framework; sourceTree = "<group>"; };
@@ -323,8 +321,6 @@
A27A53650A06AEDB00E1F16F /* StatusBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StatusBorder.png; path = macosx/Images/StatusBorder.png; sourceTree = "<group>"; };
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>"; };
A28DBADB0A33C1D800F4B4A7 /* ActionButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionButton.png; path = macosx/Images/ActionButton.png; sourceTree = "<group>"; };
@@ -483,10 +479,8 @@
A246004C0A6DCE4600D19088 /* SpeedLimitButtonPressed.png */,
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 */,
A253F7090A6990EB008EE24F /* FilterButtonOverLeft.png */,
@@ -760,13 +754,11 @@
A253F72A0A699373008EE24F /* FilterButtonSelectedLeft.png in Resources */,
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;
};

2
macosx/Controller.h
View File

@@ -60,7 +60,6 @@
IBOutlet ImageBackgroundView * fStatusBar;
BOOL fStatusBarVisible;
IBOutlet NSTextField * fTotalDLField, * fTotalULField, * fTotalTorrentsField;
IBOutlet NSButton * fShowFilterButton;
NSString * fSortType;
IBOutlet NSMenuItem * fNameSortItem, * fStateSortItem, * fProgressSortItem,
@@ -72,7 +71,6 @@
IBOutlet BarButton * fNoFilterButton, * fPauseFilterButton,
* fSeedFilterButton, * fDownloadFilterButton;
IBOutlet NSSearchField * fSearchFilterField;
IBOutlet NSButton * fHideFilterButton;
IBOutlet NSMenuItem * fNextInfoTabItem, * fPrevInfoTabItem;

32
macosx/Controller.m
View File

@@ -40,6 +40,7 @@
#define TOOLBAR_RESUME_ALL @"Toolbar Resume All"
#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"
@@ -142,7 +143,6 @@ static void sleepCallBack(void * controller, io_service_t y,
//set up filter bar
NSView * contentView = [fWindow contentView];
[fHideFilterButton setToolTip: @"Hide Filter Bar"];
[fFilterBar setHidden: YES];
fFilterBarVisible = NO;
@@ -157,7 +157,6 @@ static void sleepCallBack(void * controller, io_service_t y,
//set up status bar
fStatusBarVisible = NO;
[fShowFilterButton setToolTip: @"Show Filter Bar"];
[fStatusBar setHidden: YES];
NSRect statusBarFrame = [fStatusBar frame];
@@ -1656,8 +1655,16 @@ static void sleepCallBack(void * controller, io_service_t y,
[fWindow makeFirstResponder: fTableView];
}
//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
[fNoFilterButton resetBounds: nil];
@@ -1701,8 +1708,8 @@ static void sleepCallBack(void * controller, io_service_t y,
else if ([ident isEqualToString: TOOLBAR_INFO])
{
[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];
[item setAction: @selector(showInfo:)];
@@ -1743,6 +1750,15 @@ static void sleepCallBack(void * controller, io_service_t y,
[item setTarget: self];
[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
{
[item release];
@@ -1757,7 +1773,7 @@ static void sleepCallBack(void * controller, io_service_t y,
return [NSArray arrayWithObjects:
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,
NSToolbarFlexibleSpaceItemIdentifier,
@@ -1771,7 +1787,7 @@ static void sleepCallBack(void * controller, io_service_t y,
NSToolbarSeparatorItemIdentifier,
TOOLBAR_PAUSE_ALL, TOOLBAR_RESUME_ALL,
NSToolbarFlexibleSpaceItemIdentifier,
TOOLBAR_INFO, nil];
TOOLBAR_FILTER, TOOLBAR_INFO, nil];
}
- (BOOL) validateToolbarItem: (NSToolbarItem *) toolbarItem

2
macosx/English.lproj/MainMenu.nib/classes.nib generated
View File

@@ -45,7 +45,6 @@
fDownloadMenu = NSMenu;
fDownloadNoLimitItem = NSMenuItem;
fFilterBar = ImageBackgroundView;
fHideFilterButton = NSButton;
fNameSortItem = NSMenuItem;
fNextInfoTabItem = NSMenuItem;
fNoFilterButton = BarButton;
@@ -58,7 +57,6 @@
fScrollView = NSScrollView;
fSearchFilterField = NSSearchField;
fSeedFilterButton = BarButton;
fShowFilterButton = NSButton;
fSmallViewItem = NSMenuItem;
fSpeedLimitButton = NSButton;
fSpeedLimitDockItem = NSMenuItem;

6
macosx/English.lproj/MainMenu.nib/info.nib generated
View File

@@ -9,7 +9,7 @@
<key>1041</key>
<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>
<key>29</key>
@@ -31,8 +31,10 @@
<integer>3</integer>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
<integer>21</integer>
<integer>1480</integer>
<integer>29</integer>
<integer>1603</integer>
</array>
<key>IBSystem Version</key>
<string>8J135</string>

BIN
macosx/English.lproj/MainMenu.nib/keyedobjects.nib generated
View File

Binary file not shown.

BIN
macosx/Images/Bandwidth.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
macosx/Images/CloseCircleButton.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 991 B

BIN
macosx/Images/CloseCircleButtonPressed.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 982 B

BIN
macosx/Images/RevealCircleButton.png → macosx/Images/FilterHide.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
macosx/Images/RevealCircleButtonPressed.png → macosx/Images/FilterShow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB