mirror of
https://github.com/transmission/transmission.git
synced 2026-05-08 09:39:08 +01:00
Tooltips for show and hide filter buttons.
Disable bars when they're not visible.
This commit is contained in:
@@ -70,6 +70,7 @@
|
||||
IBOutlet BarButton * fNoFilterButton, * fPauseFilterButton,
|
||||
* fSeedFilterButton, * fDownloadFilterButton;
|
||||
IBOutlet NSSearchField * fSearchFilterField;
|
||||
IBOutlet NSButton * fHideFilterButton;
|
||||
|
||||
IBOutlet NSMenuItem * fNextInfoTabItem, * fPrevInfoTabItem;
|
||||
|
||||
|
||||
+15
-3
@@ -142,6 +142,8 @@ 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;
|
||||
NSRect filterBarFrame = [fFilterBar frame];
|
||||
@@ -155,6 +157,9 @@ 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];
|
||||
statusBarFrame.size.width = [fWindow frame].size.width;
|
||||
[fStatusBar setFrame: statusBarFrame];
|
||||
@@ -1546,6 +1551,9 @@ static void sleepCallBack(void * controller, io_service_t y,
|
||||
if (show == fStatusBarVisible)
|
||||
return;
|
||||
|
||||
if (show)
|
||||
[fStatusBar setHidden: NO];
|
||||
|
||||
NSRect frame = [fWindow frame];
|
||||
float heightChange = [fStatusBar frame].size.height;
|
||||
if (!show)
|
||||
@@ -1578,6 +1586,9 @@ static void sleepCallBack(void * controller, io_service_t y,
|
||||
minSize.height += heightChange;
|
||||
[fWindow setContentMinSize: minSize];
|
||||
|
||||
if (!show)
|
||||
[fStatusBar setHidden: YES];
|
||||
|
||||
//reset tracking rects for filter buttons
|
||||
[fNoFilterButton resetBounds: nil];
|
||||
[fSeedFilterButton resetBounds: nil];
|
||||
@@ -1603,6 +1614,9 @@ static void sleepCallBack(void * controller, io_service_t y,
|
||||
if (show == fFilterBarVisible)
|
||||
return;
|
||||
|
||||
if (show)
|
||||
[fFilterBar setHidden: NO];
|
||||
|
||||
NSRect frame = [fWindow frame];
|
||||
float heightChange = [fFilterBar frame].size.height;
|
||||
if (!show)
|
||||
@@ -1630,10 +1644,8 @@ static void sleepCallBack(void * controller, io_service_t y,
|
||||
minSize.height += heightChange;
|
||||
[fWindow setContentMinSize: minSize];
|
||||
|
||||
//enable/disable search field
|
||||
[fSearchFilterField setEnabled: show];
|
||||
if (!show)
|
||||
[fWindow makeFirstResponder: fTableView];
|
||||
[fFilterBar setHidden: YES];
|
||||
|
||||
//enable show filter button in status bar
|
||||
[fShowFilterButton setEnabled: !show];
|
||||
|
||||
+1
@@ -45,6 +45,7 @@
|
||||
fDownloadMenu = NSMenu;
|
||||
fDownloadNoLimitItem = NSMenuItem;
|
||||
fFilterBar = ImageBackgroundView;
|
||||
fHideFilterButton = NSButton;
|
||||
fNameSortItem = NSMenuItem;
|
||||
fNextInfoTabItem = NSMenuItem;
|
||||
fNoFilterButton = BarButton;
|
||||
|
||||
+2
-2
@@ -9,9 +9,9 @@
|
||||
<key>1041</key>
|
||||
<string>344 478 208 99 0 0 1152 842 </string>
|
||||
<key>1480</key>
|
||||
<string>310 355 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>
|
||||
<string>311 415 477 67 0 0 1152 842 </string>
|
||||
<key>29</key>
|
||||
<string>9 780 451 44 0 0 1152 842 </string>
|
||||
<key>456</key>
|
||||
|
||||
BIN
Binary file not shown.
Reference in New Issue
Block a user