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

remove redundant methods

This commit is contained in:
Mitchell Livingston 2006-10-24 21:25:03 +00:00
parent ab291dc44d
commit e14c518ab6
1 changed files with 37 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
macosx/PrefsController.m
View File

@ -44,12 +44,7 @@
@interface PrefsController (Private) @interface PrefsController (Private)
- (void) showGeneralPref: (id) sender; - (void) setPrefView: (id) sender;
- (void) showTransfersPref: (id) sender;
- (void) showBandwidthPref: (id) sender;
- (void) showNetworkPref: (id) sender;
- (void) setPrefView: (NSView *) view;
- (void) folderSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) info; - (void) folderSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) info;
- (void) updatePopUp; - (void) updatePopUp;
@ -99,7 +94,7 @@
[fToolbar setSizeMode: NSToolbarSizeModeRegular]; [fToolbar setSizeMode: NSToolbarSizeModeRegular];
[fToolbar setSelectedItemIdentifier: TOOLBAR_GENERAL]; [fToolbar setSelectedItemIdentifier: TOOLBAR_GENERAL];
[self showGeneralPref: nil]; [self setPrefView: nil];
//set download folder //set download folder
NSString * downloadChoice = [fDefaults stringForKey: @"DownloadChoice"]; NSString * downloadChoice = [fDefaults stringForKey: @"DownloadChoice"];
@ -296,28 +291,28 @@
[item setLabel: NSLocalizedString(@"General", "Preferences -> General toolbar item title")]; [item setLabel: NSLocalizedString(@"General", "Preferences -> General toolbar item title")];
[item setImage: [NSImage imageNamed: @"Preferences.png"]]; [item setImage: [NSImage imageNamed: @"Preferences.png"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector(showGeneralPref:)]; [item setAction: @selector(setPrefView:)];
} }
else if ([ident isEqualToString: TOOLBAR_TRANSFERS]) else if ([ident isEqualToString: TOOLBAR_TRANSFERS])
{ {
[item setLabel: NSLocalizedString(@"Transfers", "Preferences -> Transfers toolbar item title")]; [item setLabel: NSLocalizedString(@"Transfers", "Preferences -> Transfers toolbar item title")];
[item setImage: [NSImage imageNamed: @"Transfers.png"]]; [item setImage: [NSImage imageNamed: @"Transfers.png"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector(showTransfersPref:)]; [item setAction: @selector(setPrefView:)];
} }
else if ([ident isEqualToString: TOOLBAR_BANDWIDTH]) else if ([ident isEqualToString: TOOLBAR_BANDWIDTH])
{ {
[item setLabel: NSLocalizedString(@"Bandwidth", "Preferences -> Bandwidth toolbar item title")]; [item setLabel: NSLocalizedString(@"Bandwidth", "Preferences -> Bandwidth toolbar item title")];
[item setImage: [NSImage imageNamed: @"Bandwidth.png"]]; [item setImage: [NSImage imageNamed: @"Bandwidth.png"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector(showBandwidthPref:)]; [item setAction: @selector(setPrefView:)];
} }
else if ([ident isEqualToString: TOOLBAR_NETWORK]) else if ([ident isEqualToString: TOOLBAR_NETWORK])
{ {
[item setLabel: NSLocalizedString(@"Network", "Preferences -> Network toolbar item title")]; [item setLabel: NSLocalizedString(@"Network", "Preferences -> Network toolbar item title")];
[item setImage: [NSImage imageNamed: @"Network.png"]]; [item setImage: [NSImage imageNamed: @"Network.png"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector(showNetworkPref:)]; [item setAction: @selector(setPrefView:)];
} }
else else
{ {
@ -881,34 +876,22 @@
@implementation PrefsController (Private) @implementation PrefsController (Private)
- (void) showGeneralPref: (id) sender - (void) setPrefView: (id) sender
{ {
[self setPrefView: fGeneralView]; NSView * view = fGeneralView;
} if (sender)
{
- (void) showTransfersPref: (id) sender NSString * identifier = [sender itemIdentifier];
{ if ([identifier isEqualToString: TOOLBAR_TRANSFERS])
[self setPrefView: fTransfersView]; view = fTransfersView;
} else if ([identifier isEqualToString: TOOLBAR_BANDWIDTH])
view = fBandwidthView;
- (void) showBandwidthPref: (id) sender else if ([identifier isEqualToString: TOOLBAR_NETWORK])
{ view = fNetworkView;
[self setPrefView: fBandwidthView]; else;
} }
- (void) showNetworkPref: (id) sender
{
[self setPrefView: fNetworkView];
//make sure progress indicator hides itself
if ([fPortStatusImage image])
[fPortStatusProgress setDisplayedWhenStopped: NO];
}
- (void) setPrefView: (NSView *) view
{
NSWindow * window = [self window]; NSWindow * window = [self window];
if ([window contentView] == view) if ([window contentView] == view)
return; return;
@ -922,14 +905,24 @@
[window setFrame: windowRect display: YES animate: YES]; [window setFrame: windowRect display: YES animate: YES];
[view setHidden: NO]; [view setHidden: NO];
NSToolbarItem * item; //set title label
NSEnumerator * enumerator = [[fToolbar items] objectEnumerator]; if (sender)
while ((item = [enumerator nextObject])) [window setTitle: [sender label]];
if ([[item itemIdentifier] isEqualToString: [fToolbar selectedItemIdentifier]]) else
{ {
[window setTitle: [item label]]; NSToolbarItem * item;
break; NSEnumerator * enumerator = [[fToolbar items] objectEnumerator];
} while ((item = [enumerator nextObject]))
if ([[item itemIdentifier] isEqualToString: [fToolbar selectedItemIdentifier]])
{
[window setTitle: [item label]];
break;
}
}
//for network view make sure progress indicator hides itself
if (view == fNetworkView && [fPortStatusImage image])
[fPortStatusProgress setDisplayedWhenStopped: NO];
} }
- (void) folderSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) info - (void) folderSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) info