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

If there was no change in the directory don't even attempt to check files.

This commit is contained in:
Mitchell Livingston 2006-07-07 21:58:17 +00:00
parent a2962c4a71
commit b252a98c13
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
macosx/Controller.m
View File

@ -1148,11 +1148,12 @@ static void sleepCallBack(void * controller, io_service_t y,
NSString * path = [[fDefaults stringForKey: @"AutoImportDirectory"] stringByExpandingTildeInPath]; NSString * path = [[fDefaults stringForKey: @"AutoImportDirectory"] stringByExpandingTildeInPath];
//if folder cannot be found simply give up //if folder cannot be found or the contents hasn't changed simply give up
NSArray * allFileNames; NSArray * allFileNames;NSLog(@"first");
if (!(allFileNames = [[NSFileManager defaultManager] directoryContentsAtPath: path])) if (!(allFileNames = [[NSFileManager defaultManager] directoryContentsAtPath: path])
|| [allFileNames isEqualToArray: fAutoImportedNames])
return; return;
NSLog(@"here!");
//try to add files that haven't already been added //try to add files that haven't already been added
NSMutableArray * newFileNames = [NSMutableArray arrayWithArray: allFileNames]; NSMutableArray * newFileNames = [NSMutableArray arrayWithArray: allFileNames];
[newFileNames removeObjectsInArray: fAutoImportedNames]; [newFileNames removeObjectsInArray: fAutoImportedNames];
@ -1364,68 +1365,68 @@ static void sleepCallBack(void * controller, io_service_t y,
{ {
NSToolbarItem * item = [[NSToolbarItem alloc] initWithItemIdentifier: ident]; NSToolbarItem * item = [[NSToolbarItem alloc] initWithItemIdentifier: ident];
if( [ident isEqualToString: TOOLBAR_OPEN] ) if ([ident isEqualToString: TOOLBAR_OPEN])
{ {
[item setLabel: @"Open"]; [item setLabel: @"Open"];
[item setPaletteLabel: @"Open Torrent Files"]; [item setPaletteLabel: @"Open Torrent Files"];
[item setToolTip: @"Open torrent files"]; [item setToolTip: @"Open torrent files"];
[item setImage: [NSImage imageNamed: @"Open.png"]]; [item setImage: [NSImage imageNamed: @"Open.png"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector( openShowSheet: )]; [item setAction: @selector(openShowSheet:)];
} }
else if( [ident isEqualToString: TOOLBAR_REMOVE] ) else if ([ident isEqualToString: TOOLBAR_REMOVE])
{ {
[item setLabel: @"Remove"]; [item setLabel: @"Remove"];
[item setPaletteLabel: @"Remove Selected"]; [item setPaletteLabel: @"Remove Selected"];
[item setToolTip: @"Remove selected transfers"]; [item setToolTip: @"Remove selected transfers"];
[item setImage: [NSImage imageNamed: @"Remove.png"]]; [item setImage: [NSImage imageNamed: @"Remove.png"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector( removeNoDelete: )]; [item setAction: @selector(removeNoDelete:)];
} }
else if( [ident isEqualToString: TOOLBAR_INFO] ) else if ([ident isEqualToString: TOOLBAR_INFO])
{ {
[item setLabel: @"Inspector"]; [item setLabel: @"Inspector"];
[item setPaletteLabel: @"Show/Hide Inspector"]; [item setPaletteLabel: @"Show/Hide Inspector"];
[item setToolTip: @"Display torrent inspector"]; [item setToolTip: @"Display torrent inspector"];
[item setImage: [NSImage imageNamed: @"Info.png"]]; [item setImage: [NSImage imageNamed: @"Info.png"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector( showInfo: )]; [item setAction: @selector(showInfo:)];
} }
else if( [ident isEqualToString: TOOLBAR_PAUSE_ALL] ) else if ([ident isEqualToString: TOOLBAR_PAUSE_ALL])
{ {
[item setLabel: @"Pause All"]; [item setLabel: @"Pause All"];
[item setPaletteLabel: [item label]]; [item setPaletteLabel: [item label]];
[item setToolTip: @"Pause all transfers"]; [item setToolTip: @"Pause all transfers"];
[item setImage: [NSImage imageNamed: @"PauseAll.png"]]; [item setImage: [NSImage imageNamed: @"PauseAll.png"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector( stopAllTorrents: )]; [item setAction: @selector(stopAllTorrents:)];
} }
else if( [ident isEqualToString: TOOLBAR_RESUME_ALL] ) else if ([ident isEqualToString: TOOLBAR_RESUME_ALL])
{ {
[item setLabel: @"Resume All"]; [item setLabel: @"Resume All"];
[item setPaletteLabel: [item label]]; [item setPaletteLabel: [item label]];
[item setToolTip: @"Resume all transfers"]; [item setToolTip: @"Resume all transfers"];
[item setImage: [NSImage imageNamed: @"ResumeAll.png"]]; [item setImage: [NSImage imageNamed: @"ResumeAll.png"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector( resumeAllTorrents: )]; [item setAction: @selector(resumeAllTorrents:)];
} }
else if( [ident isEqualToString: TOOLBAR_PAUSE_SELECTED] ) else if ([ident isEqualToString: TOOLBAR_PAUSE_SELECTED])
{ {
[item setLabel: @"Pause"]; [item setLabel: @"Pause"];
[item setPaletteLabel: @"Pause Selected"]; [item setPaletteLabel: @"Pause Selected"];
[item setToolTip: @"Pause selected transfers"]; [item setToolTip: @"Pause selected transfers"];
[item setImage: [NSImage imageNamed: @"PauseSelected.png"]]; [item setImage: [NSImage imageNamed: @"PauseSelected.png"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector( stopTorrent: )]; [item setAction: @selector(stopTorrent:)];
} }
else if( [ident isEqualToString: TOOLBAR_RESUME_SELECTED] ) else if ([ident isEqualToString: TOOLBAR_RESUME_SELECTED])
{ {
[item setLabel: @"Resume"]; [item setLabel: @"Resume"];
[item setPaletteLabel: @"Resume Selected"]; [item setPaletteLabel: @"Resume Selected"];
[item setToolTip: @"Resume selected transfers"]; [item setToolTip: @"Resume selected transfers"];
[item setImage: [NSImage imageNamed: @"ResumeSelected.png"]]; [item setImage: [NSImage imageNamed: @"ResumeSelected.png"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector( resumeTorrent: )]; [item setAction: @selector(resumeTorrent:)];
} }
else else
{ {
@ -1721,7 +1722,7 @@ static void sleepCallBack(void * controller, io_service_t y,
} }
} }
- (NSRect) windowWillUseStandardFrame: (NSWindow *) w defaultFrame: (NSRect) defaultFrame - (NSRect) windowWillUseStandardFrame: (NSWindow *) window defaultFrame: (NSRect) defaultFrame
{ {
NSRect windowRect = [fWindow frame]; NSRect windowRect = [fWindow frame];
float newHeight = windowRect.size.height - [fScrollView frame].size.height float newHeight = windowRect.size.height - [fScrollView frame].size.height