mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Filter can now only be accessed from the filter bar.

This commit is contained in:
Mitchell Livingston 2006-07-15 16:33:39 +00:00
parent 0ae11f0f56
commit 87fee99801
5 changed files with 17 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
macosx/BarButton.m
View File

@ -33,19 +33,20 @@
fEnabled = NO;
fMouseIn = NO;
fButtonNormal = [[NSImage alloc] initWithSize: [self frame].size];
fButtonIn = [[NSImage alloc] initWithSize: [self frame].size];
fButtonDown = [[NSImage alloc] initWithSize: [self frame].size];
NSSize buttonSize = [self frame].size;
fButtonNormal = [[NSImage alloc] initWithSize: buttonSize];
fButtonIn = [[NSImage alloc] initWithSize: buttonSize];
fButtonDown = [[NSImage alloc] initWithSize: buttonSize];
//create shape
NSBezierPath * rect = [NSBezierPath bezierPath];
float ovalDiamater = 20.0;
[rect appendBezierPathWithOvalInRect:
NSMakeRect(0, 0, ovalDiamater, [self frame].size.height)];
NSMakeRect(0, 0, ovalDiamater, buttonSize.height)];
[rect appendBezierPathWithOvalInRect:
NSMakeRect([self frame].size.width - ovalDiamater, 0, ovalDiamater, [self frame].size.height)];
NSMakeRect(buttonSize.width - ovalDiamater, 0, ovalDiamater, buttonSize.height)];
[rect appendBezierPathWithRect:
NSMakeRect(ovalDiamater * 0.5, 0, [self frame].size.width - ovalDiamater, [self frame].size.height)];
NSMakeRect(ovalDiamater * 0.5, 0, buttonSize.width - ovalDiamater, buttonSize.height)];
//create highlighted button
[fButtonIn lockFocus];

7
macosx/Controller.h
View File

@ -59,14 +59,13 @@
BOOL fStatusBarVisible;
IBOutlet NSTextField * fTotalDLField, * fTotalULField, * fTotalTorrentsField;
NSString * fSortType, * fFilterType;
NSString * fSortType;
IBOutlet NSMenuItem * fNameSortItem, * fStateSortItem, * fProgressSortItem,
* fDateSortItem, * fOrderSortItem,
* fNoFilterItem, * fPauseFilterItem,
* fSeedFilterItem, * fDownloadFilterItem;
* fDateSortItem, * fOrderSortItem;
IBOutlet NSView * fFilterBar;
BOOL fFilterBarVisible;
NSString * fFilterType;
IBOutlet BarButton * fNoFilterButton, * fPauseFilterButton,
* fSeedFilterButton, * fDownloadFilterButton;

60
macosx/Controller.m
View File

@ -223,27 +223,14 @@ static void sleepCallBack(void * controller, io_service_t y,
NSMenuItem * currentFilterItem;
BarButton * currentFilterButton;
if ([fFilterType isEqualToString: @"Pause"])
{
currentFilterItem = fPauseFilterItem;
currentFilterButton = fPauseFilterButton;
}
else if ([fFilterType isEqualToString: @"Seed"])
{
currentFilterItem = fSeedFilterItem;
currentFilterButton = fSeedFilterButton;
}
else if ([fFilterType isEqualToString: @"Download"])
{
currentFilterItem = fDownloadFilterItem;
currentFilterButton = fDownloadFilterButton;
}
else
{
currentFilterItem = fNoFilterItem;
currentFilterButton = fNoFilterButton;
}
[currentFilterItem setState: NSOnState];
[currentFilterButton setEnabled: YES];
//set upload limit action button
@ -1055,64 +1042,31 @@ static void sleepCallBack(void * controller, io_service_t y,
//resets filter and sorts torrents
- (void) setFilter: (id) sender
{
NSMenuItem * prevFilterItem;
BarButton * prevFilterButton;
if ([fFilterType isEqualToString: @"Pause"])
{
prevFilterItem = fPauseFilterItem;
prevFilterButton = fPauseFilterButton;
}
else if ([fFilterType isEqualToString: @"Seed"])
{
prevFilterItem = fSeedFilterItem;
prevFilterButton = fSeedFilterButton;
}
else if ([fFilterType isEqualToString: @"Download"])
{
prevFilterItem = fDownloadFilterItem;
prevFilterButton = fDownloadFilterButton;
}
else
{
prevFilterItem = fNoFilterItem;
prevFilterButton = fNoFilterButton;
}
if (sender != prevFilterItem && sender != prevFilterButton)
if (sender != prevFilterButton)
{
[prevFilterItem setState: NSOffState];
[prevFilterButton setEnabled: NO];
[sender setEnabled: YES];
NSMenuItem * currentFilterItem;
BarButton * currentFilterButton;
[fFilterType release];
if (sender == fDownloadFilterItem || sender == fDownloadFilterButton)
{
if (sender == fDownloadFilterButton)
fFilterType = [[NSString alloc] initWithString: @"Download"];
currentFilterItem = fDownloadFilterItem;
currentFilterButton = fDownloadFilterButton;
}
else if (sender == fPauseFilterItem || sender == fPauseFilterButton)
{
else if (sender == fPauseFilterButton)
fFilterType = [[NSString alloc] initWithString: @"Pause"];
currentFilterItem = fPauseFilterItem;
currentFilterButton = fPauseFilterButton;
}
else if (sender == fSeedFilterItem || sender == fSeedFilterButton)
{
else if (sender == fSeedFilterButton)
fFilterType = [[NSString alloc] initWithString: @"Seed"];
currentFilterItem = fSeedFilterItem;
currentFilterButton = fSeedFilterButton;
}
else
{
fFilterType = [[NSString alloc] initWithString: @"None"];
currentFilterItem = fNoFilterItem;
currentFilterButton = fNoFilterButton;
}
[currentFilterItem setState: NSOnState];
[currentFilterButton setEnabled: YES];
[fDefaults setObject: fFilterType forKey: @"Filter"];
}

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

@ -40,7 +40,6 @@
fAdvancedBarItem = NSMenuItem;
fDateSortItem = NSMenuItem;
fDownloadFilterButton = BarButton;
fDownloadFilterItem = NSMenuItem;
fDownloadLimitItem = NSMenuItem;
fDownloadMenu = NSMenu;
fDownloadNoLimitItem = NSMenuItem;
@ -48,17 +47,14 @@
fNameSortItem = NSMenuItem;
fNextInfoTabItem = NSMenuItem;
fNoFilterButton = BarButton;
fNoFilterItem = NSMenuItem;
fOrderSortItem = NSMenuItem;
fPauseFilterButton = BarButton;
fPauseFilterItem = NSMenuItem;
fPrevInfoTabItem = NSMenuItem;
fProgressSortItem = NSMenuItem;
fRatioNotSetItem = NSMenuItem;
fRatioSetItem = NSMenuItem;
fScrollView = NSScrollView;
fSeedFilterButton = BarButton;
fSeedFilterItem = NSMenuItem;
fSmallViewItem = NSMenuItem;
fSpeedLimitButton = NSButton;
fSpeedLimitDockItem = NSMenuItem;

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

Binary file not shown.