From 4580eed4a6ed62c9591d938e56fc40b428c3a7ad Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Fri, 4 Jan 2008 15:05:25 +0000 Subject: [PATCH] update the group menu when groups change --- macosx/AddWindowController.h | 2 +- macosx/AddWindowController.m | 11 +-- macosx/English.lproj/AddWindow.xib | 150 ++++++++++++++--------------- 3 files changed, 81 insertions(+), 82 deletions(-) diff --git a/macosx/AddWindowController.h b/macosx/AddWindowController.h index 5cf214317..cdd8ee561 100644 --- a/macosx/AddWindowController.h +++ b/macosx/AddWindowController.h @@ -50,6 +50,6 @@ - (void) add: (id) sender; - (void) cancelAdd: (id) sender; -- (void) checkGroupValueForRemoval: (NSNotification *) notification; +- (void) updateGroupMenu: (NSNotification *) notification; @end diff --git a/macosx/AddWindowController.m b/macosx/AddWindowController.m index 0294e6371..80b9b2c24 100644 --- a/macosx/AddWindowController.m +++ b/macosx/AddWindowController.m @@ -55,8 +55,8 @@ - (void) awakeFromNib { - [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(checkGroupValueForRemoval:) - name: @"GroupValueRemoved" object: nil]; + [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updateGroupMenu:) + name: @"UpdateGroups" object: nil]; NSString * name = [fTorrent name]; [[self window] setTitle: name]; @@ -80,7 +80,6 @@ } [fStatusField setStringValue: statusString]; - #warning make dynamic [fGroupPopUp setMenu: [[GroupsWindowController groups] groupMenuWithTarget: nil action: NULL isSmall: NO]]; [fStartCheck setState: [[NSUserDefaults standardUserDefaults] boolForKey: @"AutoStartDownload"] ? NSOnState : NSOffState]; @@ -148,11 +147,11 @@ [self release]; } -- (void) checkGroupValueForRemoval: (NSNotification *) notification +- (void) updateGroupMenu: (NSNotification *) notification { int groupValue = [[fGroupPopUp selectedItem] tag]; - if (groupValue != -1 && [[[notification userInfo] objectForKey: @"Indexes"] containsIndex: groupValue]) - [fGroupPopUp selectItemWithTag: -1]; + [fGroupPopUp setMenu: [[GroupsWindowController groups] groupMenuWithTarget: nil action: NULL isSmall: NO]]; + [fGroupPopUp selectItemWithTag: groupValue]; } @end diff --git a/macosx/English.lproj/AddWindow.xib b/macosx/English.lproj/AddWindow.xib index 53967a9b0..d6ea20882 100644 --- a/macosx/English.lproj/AddWindow.xib +++ b/macosx/English.lproj/AddWindow.xib @@ -61,7 +61,7 @@ 130560 33554432 - + NSImage NSApplicationIcon @@ -91,7 +91,7 @@ 6 - System + System controlColor 3 @@ -100,7 +100,7 @@ 6 - + controlTextColor 3 @@ -201,7 +201,7 @@ 130560 33554432 - + 0 1 0 @@ -298,18 +298,18 @@ 25 - + 265 - {{365, 64}, {100, 26}} + {{347, 64}, {118, 26}} YES - + -2076049856 2048 - + 109199615 1 @@ -318,7 +318,7 @@ 75 YES - + OtherViews YES @@ -331,19 +331,19 @@ 2 - + 265 - {{315, 71}, {48, 17}} + {{297, 71}, {48, 17}} YES - + 67239424 272629760 Group: - + @@ -443,7 +443,7 @@ fGroupPopUp - + 39 @@ -502,8 +502,8 @@ - - + + @@ -649,43 +649,43 @@ 33 - + YES - + 34 - + YES - + - + 35 - + YES - + 40 - + YES - + 41 - - + + @@ -762,9 +762,9 @@ - com.apple.InterfaceBuilder.CocoaPlugin - - + com.apple.InterfaceBuilder.CocoaPlugin + + {{541, 861}, {113, 4}} @@ -823,10 +823,36 @@ - IBProjectSource + IBProjectSource macosx/NSApplicationAdditions.h + + NSMenu + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + macosx/NSMenuAdditions.h + + AddWindowController NSWindowController @@ -840,9 +866,9 @@ YES - id - - + id + + @@ -869,36 +895,10 @@ - + macosx/AddWindowController.h - - NSMenu - - - YES - - YES - - - YES - - - - YES - - YES - - - YES - - - - - macosx/NSMenuAdditions.h - - NSObject @@ -921,7 +921,7 @@ - + macosx/UKKQueue/UKFileWatcher.h @@ -947,7 +947,7 @@ - + macosx/UKKQueue/UKKQueue.h @@ -973,7 +973,7 @@ - + macosx/IPCController.h @@ -999,7 +999,7 @@ - + macosx/UKKQueue/UKMainThreadProxy.h @@ -1016,8 +1016,8 @@ QgBYAFkAWgBbAFwACwBpAHgAiACRAJIAkwCUAJUAlgCXAJsAnACrALAAsQCyALUAuAC+AMcAyADVANYA WgFhAWIBbAF1AXYBegGCAYMBiwGMAZUBlgGgAaEBpQGmAakBsgGzAbwBvQHAAcEByQHKAdIB0wHUAdwB 3QH2AfwB/QIAAgQCBgIKAg0CFQIWAh0CHgALAh8CIQIiAiUCMwI7AjwCQAJFAkYCSwJMAk8CVAJVAloC WwJgAmECZgJnAmwCbQJyAnMCeAJ5An4CfwKeAqECogKkAsMC4wMDAwQDBQMGAwcDCAMJAwoDCwMMAw0D -DgMPAxADEQMSAxMDFAMVAxYDFwMYAxkDGgMbAxwDHQMeAx8DIgMlA1ADewN8A30DfgDpAFUDfwOAA4EB -HAOCA4MDhABWA4UDhgOHA4gAqAOJAPEDigOLA4wDjQOOA48DkAORA5IDkwOUA5UBMQOWA5cDmAOZA5oD +DgMPAxADEQMSAxMDFAMVAxYDFwMYAxkDGgMbAxwDHQMeAx8DIgMlA1ADewN8A30DfgDpAFUDfwOAA4ED +ggEcA4MDhAOFAFYDhgOHA4gAqADxA4kDigOLA4wDjQExA44DjwOQA5EDkgOTA5QDlQOWA5cDmAOZA5oD mwOcA58DogOlVSRudWxs3xASAA0ADgAPABAAEQASABMAFAAVABYAFwAYABkAGgAbABwAHQAeAB8AIAAh ACIAIwAkACUAJgAnACgAKQAqACsALAAtAC4ALwAwVk5TUm9vdFYkY2xhc3NdTlNPYmplY3RzS2V5c18Q D05TQ2xhc3Nlc1ZhbHVlc18QGU5TQWNjZXNzaWJpbGl0eU9pZHNWYWx1ZXNdTlNDb25uZWN0aW9uc1tO @@ -1084,7 +1084,7 @@ PIBYgFmAV4BYgFQSCAAAAFNBZGTUAA4A1wDYANkA2gDbANwBHIAmgCVRDdgAXQAOAHkAewBfAH0AWgBh AE0BHwHEAcUBrgCBAGIATYAMgECAW4BcCYANgAxfEBV7ezMxOCwgMTJ9LCB7ODIsIDMyfX3dAJ0ADgEo ASkBKgErASwAnwDKAMsBLQCiAS4AzQEvATABMQCoANEBzgHPANEAdQE3AbsBOYA/gDyAJIBegF2AJIBa VkNhbmNlbFEb2ABdAA4AeQB7AF8AfQBaAGEATQHWAdcB2AEiAIEAYgBNgAyAaIBggGEJgA2ADF8QFnt7 -MzY1LCA2NH0sIHsxMDAsIDI2fX3fEBMAnQHeAd8BKAEpAA4BKgEsAMoB4ADLAeEB4gHjAS0AogHkAS4B +MzQ3LCA2NH0sIHsxMTgsIDI2fX3fEBMAnQHeAd8BKAEpAA4BKgEsAMoB4ADLAeEB4gHjAS0AogHkAS4B 5QHmAIEAVQEwAekB6gCoATAA0QArAHYAqACBAIEB8QHyAfMB9AH1XxAaTlNNZW51SXRlbVJlc3BlY3RB bGlnbm1lbnRfEA9OU0Fycm93UG9zaXRpb25aTlNNZW51SXRlbV8QD05TUHJlZmVycmVkRWRnZV8QEk5T VXNlc0l0ZW1Gcm9tTWVudV1OU0FsdGVyc1N0YXRlVk5TTWVudV8QD05TU2VsZWN0ZWRJbmRleBP///// @@ -1093,7 +1093,7 @@ aXRsZVtOU01lbnVJdGVtc4BmgGOAZFpPdGhlclZpZXdz0gAOAD4AagH/gGWg0gA3ADgCAQICowICAgMA O15OU011dGFibGVBcnJheVdOU0FycmF50gA3ADgCBQHkogHkADvSADcAOAIHAgimAggCCQFNAQEAewA7 XxARTlNQb3BVcEJ1dHRvbkNlbGxeTlNNZW51SXRlbUNlbGzSADcAOAILAgymAgwBUAC7ALwAvQA7XU5T UG9wVXBCdXR0b27YAF0ADgB5AHsAXwB9AFoAYQBNAMACEAIRASIAgQBiAE2ADIAwgGqAawmADYAMXxAV -e3szMTUsIDcxfSwgezQ4LCAxN3192ACdAA4AyQCfAMoAywCiAMwAzQDOAM8CGQDRAHcA0wDUgC+AJ4Bs +e3syOTcsIDcxfSwgezQ4LCAxN3192ACdAA4AyQCfAMoAywCiAMwAzQDOAM8CGQDRAHcA0wDUgC+AJ4Bs gCSAaYAsVkdyb3VwOlp7NDgyLCAyMTB90gA3ADgCIAC8owC8AL0AO18QFnt7MCwgMH0sIHsxNjgwLCAx MDI4fX3SADcAOAIjAiSiAiQAO18QEE5TV2luZG93VGVtcGxhdGXSAA4APgBqAieAZasCKAIpAioCKwIs Ai0CLgIvAjACMQIygHOAdoB4gHuAfYB/gIGAg4CFgIeAidQADgI0AjUCNgI3AG0AHwI6XU5TRGVzdGlu @@ -1127,13 +1127,13 @@ CkZpbGUpXxAZU3RhdGljIFRleHQgKHN0YXR1cyBpbmZvKV8QFFN0YXRpYyBUZXh0IChHcm91cDopXxAS UG9wIFVwIEJ1dHRvbiBDZWxsXxAdVGV4dCBGaWVsZCBDZWxsIChzdGF0dXMgaW5mbylfECBJbWFnZSBD ZWxsIChOU0FwcGxpY2F0aW9uSWNvbiktMV8QFFB1c2ggQnV0dG9uIChDYW5jZWwpXxAgSW1hZ2UgVmll dyAoTlNBcHBsaWNhdGlvbkljb24pLTFcUG9wdXAgQnV0dG9u0gAOAD4CgAMhgI6g0gAOAD4CgAMkgI6g -0gAOAD4CgAMngI6vECgAbgFVAisCKAEJAE0AdABwAIIBIQBzAfMCEQF+AikAHwIvAjIAQQIxAGwBrQKR -AZABxQIqAG8CLABtAHIAdwItAdgCLgDCAWcCMAB1AHEAdoAxgEOAe4BzgDOADIBUgEGAGYA4gE2AYoBr -gEuAdoACgIOAiYAHgIeAD4BWgIyAT4BcgHiANoB9gCCASYBpgH+AYYCBgCKASICFgFqARYBf0gAOAD4C +0gAOAD4CgAMngI6vECgCKQBuAVUCKgEJAE0AdAIoAHAAggEhAHMB8wIRAX4CKwAfAi8AQQBsAa0CkQIs +AjACMQIuAZABxQIyAG8AbQByAHcCLQHYAMIBZwB1AHEAdoB2gDGAQ4B4gDOADIBUgHOAQYAZgDiATYBi +gGuAS4B7gAKAg4AHgA+AVoCMgH2AhYCHgIGAT4BcgImANoAggEmAaYB/gGGAIoBIgFqARYBf0gAOAD4C gANSgI6vECgDUwNUA1UDVgNXA1gDWQNaA1sDXANdA14DXwNgA2EDYgNjA2QDZQNmA2cDaANpA2oDawNs A20DbgNvA3ADcQNyA3MDdAN1A3YDdwN4A3kDeoCygLOAtIC1gLaAt4C4gLmAuoC7gLyAvYC+gL+AwIDB -gMKAw4DEgMWAxoDHgMiAyYDKgMuAzIDNgM6Az4DQgNGA0oDTgNSA1YDWgNeA2IDZEAUQDxAdEBgQExAK -EAgQERAjECkQHBAqEBcQGxAfEBQT//////////0QEhAWECAQCRAaEAQQDBAoEB4QIhAHEA4QJxAVEAsQ +gMKAw4DEgMWAxoDHgMiAyYDKgMuAzIDNgM6Az4DQgNGA0oDTgNSA1YDWgNeA2IDZEBwQBRAPECAQExAY +EAoQCBARECMQKRAdECoQFxAUE//////////9EBoQJxAfEBIQFhAbEAkQBBAMECgQHhAiEAcQDhAVEAsQ IdIADgA+AGoDnoBloNIADgA+AoADoYCOoNIADgA+AoADpICOoNIANwA4A6YDp6IDpwA7Xk5TSUJPYmpl Y3REYXRhAAgAGQAiACcAMQA6AD8ARABSAFQAZgIlAisCdgJ9AoQCkgKkAsACzgLaAuYC9AL/Aw0DKQM3 A0oDXAN2A4ADjQOPA5EDkwOVA5cDmQObA50DnwOhA6MDpQOnA6kDqwOtA68DsQO6A8YDyAPKA+AD6QPy @@ -1165,7 +1165,7 @@ GV0ZfBmdGbcZ0hnmGgQaERodGjEaUhpzGooapBq+Gtoa8RsGGyYbSRtgG4MbkBuZG5sbnBulG6cbqBux G7McBhwIHAocDBwOHBAcEhwUHBYcGBwaHBwcHhwgHCIcJBwmHCgcKhwsHC4cMBwyHDQcNhw4HDocPBw+ HEAcQhxEHEYcSBxKHEwcThxQHFIcVBxWHF8cYRy0HLYcuBy6HLwcvhzAHMIcxBzGHMgcyhzMHM4c0BzS HNQc1hzYHNoc3BzeHOAc4hzkHOYc6BzqHOwc7hzwHPIc9Bz2HPgc+hz8HP4dAB0CHQQdBh0IHQodDB0O -HRAdEh0UHRYdGB0aHRwdHh0gHSIdJB0tHS8dMR0zHTUdNx05HTsdPR0/HUEdQx1FHUcdSR1LHU0dVh1Y +HRAdEh0UHRYdGB0aHRwdHh0gHSIdKx0tHS8dMR0zHTUdNx05HTsdPR0/HUEdQx1FHUcdSR1LHU0dVh1Y HVkdYh1kHWUdbh1wHXEdeh1/AAAAAAAAAgIAAAAAAAADqAAAAAAAAAAAAAAAAAAAHY4