From 7d14f9617b86f39d8951b28125cd852eabab947d Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Sat, 3 Dec 2011 02:50:21 +0000 Subject: [PATCH] #4654 Make Mist notifications an optional setting configured through Preferences --- macosx/PrefsController.h | 4 + macosx/PrefsController.m | 11 + macosx/en.lproj/PrefsWindow.xib | 3944 ++++++++++++++++--------------- 3 files changed, 2085 insertions(+), 1874 deletions(-) diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h index 43004793f..609cb5f9c 100644 --- a/macosx/PrefsController.h +++ b/macosx/PrefsController.h @@ -36,6 +36,8 @@ NSString * fInitialString; + IBOutlet NSButton * fBuiltInGrowlButton; + IBOutlet NSTextField * fGrowlInstalledField; IBOutlet NSTextField * fCheckForUpdatesLabel; IBOutlet NSButton * fCheckForUpdatesButton, * fCheckForUpdatesBetaButton; @@ -102,6 +104,8 @@ - (void) setBadge: (id) sender; +- (IBAction) setBuiltInGrowlEnabled: (id) sender; + - (void) resetWarnings: (id) sender; - (void) setDefaultForMagnets: (id) sender; diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m index bd03a7979..b3f99a5d7 100644 --- a/macosx/PrefsController.m +++ b/macosx/PrefsController.m @@ -33,6 +33,7 @@ #import "transmission.h" #import "utils.h" +#import #import #define DOWNLOAD_FOLDER 0 @@ -181,6 +182,11 @@ tr_session * fHandle; [self setPrefView: nil]; + [fBuiltInGrowlButton setState: [GrowlApplicationBridge shouldUseBuiltInNotifications]]; + const BOOL growlRunning = [GrowlApplicationBridge isGrowlRunning]; + [fBuiltInGrowlButton setHidden: growlRunning]; + [fGrowlInstalledField setHidden: !growlRunning]; + //set download folder [fFolderPopUp selectItemAtIndex: [fDefaults boolForKey: @"DownloadLocationConstant"] ? DOWNLOAD_FOLDER : DOWNLOAD_TORRENT]; @@ -729,6 +735,11 @@ tr_session * fHandle; [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateUI" object: self]; } +- (IBAction) setBuiltInGrowlEnabled: (id) sender +{ + [GrowlApplicationBridge setShouldUseBuiltInNotifications: [sender state] == NSOnState]; +} + - (void) resetWarnings: (id) sender { [fDefaults removeObjectForKey: @"WarningDuplicate"]; diff --git a/macosx/en.lproj/PrefsWindow.xib b/macosx/en.lproj/PrefsWindow.xib index a4219c7f7..183f75590 100644 --- a/macosx/en.lproj/PrefsWindow.xib +++ b/macosx/en.lproj/PrefsWindow.xib @@ -2,13 +2,13 @@ 1060 - 11B26 - 1617 - 1138 - 566.00 + 11C74 + 1938 + 1138.23 + 567.00 com.apple.InterfaceBuilder.CocoaPlugin - 1617 + 1938 NSScroller @@ -45,7 +45,10 @@ com.apple.InterfaceBuilder.CocoaPlugin - + + PluginDependencyRecalculationVersion + + PrefsController @@ -68,16 +71,19 @@ - + 256 {542, 107} + + + - {{0, 0}, {1680, 1028}} + {{0, 0}, {2560, 1440}} {10000000000000, 10000000000000} NO - + 256 @@ -85,6 +91,8 @@ 264 {{52, 78}, {137, 17}} + + YES 67239424 @@ -121,6 +129,8 @@ 264 {{192, 160}, {181, 18}} + + YES 67239424 @@ -148,6 +158,8 @@ 264 {{192, 200}, {193, 18}} + + YES 67239424 @@ -170,6 +182,8 @@ 264 {{81, 201}, {108, 17}} + + YES 67239424 @@ -181,11 +195,31 @@ + + + 264 + {{101, 238}, {88, 17}} + + + + YES + + 67239424 + 71303168 + Notifications: + + + + + + 264 - {{45, 257}, {144, 17}} + {{45, 294}, {144, 17}} + + YES 67239424 @@ -200,8 +234,10 @@ 264 - {{192, 256}, {149, 18}} + {{192, 293}, {149, 18}} + + YES 67239424 @@ -219,11 +255,37 @@ 25 + + + 264 + {{192, 237}, {151, 18}} + + + + YES + + 67239424 + 0 + Display notifications + + + 1211912703 + 2 + + + + + 200 + 25 + + 264 - {{192, 236}, {131, 18}} + {{192, 273}, {131, 18}} + + YES 67239424 @@ -246,6 +308,8 @@ 264 {{211, 180}, {258, 18}} + + YES 67239424 @@ -268,6 +332,8 @@ 264 {{211, 140}, {258, 18}} + + YES 67239424 @@ -288,8 +354,10 @@ 264 - {{109, 294}, {80, 17}} + {{109, 331}, {80, 17}} + + YES 67239424 @@ -304,8 +372,10 @@ 264 - {{192, 293}, {303, 18}} + {{192, 330}, {303, 18}} + + YES 67239424 @@ -328,6 +398,8 @@ 264 {{188, 68}, {185, 32}} + + YES 67239424 @@ -351,6 +423,8 @@ 264 {{291, 108}, {82, 32}} + + YES 67239424 @@ -369,11 +443,39 @@ 25 + + + 264 + {{191, 238}, {297, 17}} + + + + YES + + 67239424 + 272629760 + Notifications can be configured through Growl + + + + + 6 + System + disabledControlTextColor + + 3 + MC4zMzMzMzMzMzMzAA + + + + 264 {{191, 118}, {101, 17}} + + YES 67239424 @@ -390,6 +492,8 @@ 264 {{192, 38}, {183, 18}} + + YES 67239424 @@ -412,6 +516,8 @@ 264 {{192, 18}, {155, 18}} + + YES 67239424 @@ -434,6 +540,8 @@ 264 {{72, 39}, {117, 17}} + + YES 67239424 @@ -446,7 +554,10 @@ - {542, 331} + {542, 368} + + + NSView NSResponder @@ -1262,15 +1373,7 @@ - - 6 - System - disabledControlTextColor - - 3 - MC4zMzMzMzMzMzMzAA - - + @@ -1881,9 +1984,9 @@ DOFcNEdIcyBuFIMA1CgCwiD7fopwgQ4iBgOD4GgK4kgTgbAUA8Zw0hqOxG0OYdI4B1jyHAOIdQ9CPD8H AAAAAQASAAABAgADAAAABAAABRwBAwADAAAAAQAFAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgAD AAAAAQABAAABFQADAAAAAQAEAAABFgADAAAAAQASAAABFwAEAAAAAQAABFoBHAADAAAAAQABAAABPQAD AAAAAQACAAABUgADAAAAAQABAAABUwADAAAABAAABSSHcwAHAAAMOAAABSwAAAAAAAgACAAIAAgAAQAB -AAEAAQAADDhhcHBsAhAAAG1udHJSR0IgWFlaIAfbAAgAEAASAAwACGFjc3BBUFBMAAAAAAAAAAAAAAAA +AAEAAQAADDhhcHBsAhAAAG1udHJSR0IgWFlaIAfbAAoADAATAC4AGWFjc3BBUFBMAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAD21gABAAAAANMtYXBwbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAEWRlc2MAAAFQAAAAYmRzY20AAAG0AAABIGNwcnQAAALUAAAAI3d0cHQAAAL4 +AAAAAAAAAAAAAAAAAAAAEWRlc2MAAAFQAAAAYmRzY20AAAG0AAABIGNwcnQAAALUAAAAJHd0cHQAAAL4 AAAAFHJYWVoAAAMMAAAAFGdYWVoAAAMgAAAAFGJYWVoAAAM0AAAAFHJUUkMAAANIAAAIDGFhcmcAAAtU AAAAIHZjZ3QAAAt0AAAAMG5kaW4AAAukAAAAPmNoYWQAAAvkAAAALG1tb2QAAAwQAAAAKGJUUkMAAANI AAAIDGdUUkMAAANIAAAIDGFhYmcAAAtUAAAAIGFhZ2cAAAtUAAAAIGRlc2MAAAAAAAAACERpc3BsYXkA @@ -4439,326 +4542,6 @@ AAABAAAAAQ 358 - - - value: values.CheckRemove - - - - - - value: values.CheckRemove - value - values.CheckRemove - 2 - - - 385 - - - - value: values.CheckRemoveDownloading - - - - - - value: values.CheckRemoveDownloading - value - values.CheckRemoveDownloading - 2 - - - 387 - - - - value: values.CheckQuitDownloading - - - - - - value: values.CheckQuitDownloading - value - values.CheckQuitDownloading - 2 - - - 388 - - - - value: values.CheckQuit - - - - - - value: values.CheckQuit - value - values.CheckQuit - 2 - - - 389 - - - - enabled: values.CheckRemove - - - - - - enabled: values.CheckRemove - enabled - values.CheckRemove - 2 - - - 390 - - - - enabled: values.CheckQuit - - - - - - enabled: values.CheckQuit - enabled - values.CheckQuit - 2 - - - 391 - - - - value: values.BadgeDownloadRate - - - - - - value: values.BadgeDownloadRate - value - values.BadgeDownloadRate - 2 - - - 397 - - - - value: values.BadgeUploadRate - - - - - - value: values.BadgeUploadRate - value - values.BadgeUploadRate - 2 - - - 398 - - - - value: values.AutoSize - - - - - - value: values.AutoSize - value - values.AutoSize - 2 - - - 399 - - - - value: values.DeleteOriginalTorrent - - - - - - value: values.DeleteOriginalTorrent - value - values.DeleteOriginalTorrent - 2 - - - 401 - - - - value: values.AutoImport - - - - - - value: values.AutoImport - value - values.AutoImport - 2 - - - 403 - - - - enabled: values.AutoImport - - - - - - enabled: values.AutoImport - enabled - values.AutoImport - 2 - - - 404 - - - - value: values.Queue - - - - - - value: values.Queue - value - values.Queue - 2 - - - 405 - - - - enabled: values.Queue - - - - - - enabled: values.Queue - enabled - values.Queue - 2 - - - 407 - - - - value: values.RatioCheck - - - - - - value: values.RatioCheck - value - values.RatioCheck - 2 - - - 430 - - - - enabled: values.RatioCheck - - - - - - enabled: values.RatioCheck - enabled - values.RatioCheck - 2 - - - 431 - - - - value: values.NatTraversal - - - - - - value: values.NatTraversal - value - values.NatTraversal - 2 - - - 442 - - - - value: values.SpeedLimitAuto - - - - - - value: values.SpeedLimitAuto - value - values.SpeedLimitAuto - 2 - - - 455 - - - - value: values.CheckUpload - - - - - - value: values.CheckUpload - value - values.CheckUpload - 2 - - - 464 - - - - value: values.CheckDownload - - - - - - value: values.CheckDownload - value - values.CheckDownload - 2 - - - 465 - applySpeedSettings: @@ -4775,99 +4558,6 @@ AAABAAAAAQ 473 - - - image: values.AutoImportDirectory - - - - - - image: values.AutoImportDirectory - image - values.AutoImportDirectory - - NSValueTransformerName - ExpandedPathToIconTransformer - - 2 - - - 495 - - - - image: values.DownloadFolder - - - - - - image: values.DownloadFolder - image - values.DownloadFolder - - NSValueTransformerName - ExpandedPathToIconTransformer - - 2 - - - 498 - - - - title: values.DownloadFolder - - - - - - title: values.DownloadFolder - title - values.DownloadFolder - - NSValueTransformerName - ExpandedPathToPathTransformer - - - 2 - - - 500 - - - - enabled: values.SpeedLimitAuto - - - - - - enabled: values.SpeedLimitAuto - enabled - values.SpeedLimitAuto - 2 - - - 529 - - - - enabled: values.SpeedLimitAuto - - - - - - enabled: values.SpeedLimitAuto - enabled - values.SpeedLimitAuto - 2 - - - 530 - setAutoSpeedLimit: @@ -4876,111 +4566,6 @@ AAABAAAAAQ 531 - - - value: values.SpeedLimitAutoOnDate - - - - - - value: values.SpeedLimitAutoOnDate - value - values.SpeedLimitAutoOnDate - 2 - - - 534 - - - - value: values.SpeedLimitAutoOffDate - - - - - - value: values.SpeedLimitAutoOffDate - value - values.SpeedLimitAutoOffDate - 2 - - - 535 - - - - value: values.UseIncompleteDownloadFolder - - - - - - value: values.UseIncompleteDownloadFolder - value - values.UseIncompleteDownloadFolder - 2 - - - 543 - - - - enabled: values.UseIncompleteDownloadFolder - - - - - - enabled: values.UseIncompleteDownloadFolder - enabled - values.UseIncompleteDownloadFolder - 2 - - - 545 - - - - image: values.IncompleteDownloadFolder - - - - - - image: values.IncompleteDownloadFolder - image - values.IncompleteDownloadFolder - - NSValueTransformerName - ExpandedPathToIconTransformer - - 2 - - - 548 - - - - title: values.IncompleteDownloadFolder - - - - - - title: values.IncompleteDownloadFolder - title - values.IncompleteDownloadFolder - - NSValueTransformerName - ExpandedPathToPathTransformer - - - 2 - - - 550 - fIncompleteFolderPopUp @@ -4997,46 +4582,6 @@ AAABAAAAAQ 552 - - - nextKeyView - - - - 577 - - - - nextKeyView - - - - 580 - - - - nextKeyView - - - - 581 - - - - nextKeyView - - - - 583 - - - - nextKeyView - - - - 584 - fPortField @@ -5093,38 +4638,6 @@ AAABAAAAAQ 602 - - - value: values.QueueSeed - - - - - - value: values.QueueSeed - value - values.QueueSeed - 2 - - - 608 - - - - enabled: values.QueueSeed - - - - - - enabled: values.QueueSeed - enabled - values.QueueSeed - 2 - - - 609 - setQueueNumber: @@ -5213,70 +4726,6 @@ AAABAAAAAQ 631 - - - enabled: values.CheckDownload - - - - - - enabled: values.CheckDownload - enabled - values.CheckDownload - 2 - - - 632 - - - - enabled: values.CheckUpload - - - - - - enabled: values.CheckUpload - enabled - values.CheckUpload - 2 - - - 633 - - - - value: values.CheckStalled - - - - - - value: values.CheckStalled - value - values.CheckStalled - 2 - - - 640 - - - - enabled: values.CheckStalled - - - - - - enabled: values.CheckStalled - enabled - values.CheckStalled - 2 - - - 641 - fStalledField @@ -5301,171 +4750,6 @@ AAABAAAAAQ 646 - - - title: values.AutoImportDirectory - - - - - - title: values.AutoImportDirectory - title - values.AutoImportDirectory - - - ExpandedPathToPathTransformer - - - 2 - - - 649 - - - - value: values.SleepPrevent - - - - - - value: values.SleepPrevent - value - values.SleepPrevent - 2 - - - 666 - - - - delegate - - - - 919 - - - - delegate - - - - 923 - - - - delegate - - - - 924 - - - - delegate - - - - 925 - - - - delegate - - - - 930 - - - - delegate - - - - 931 - - - - delegate - - - - 932 - - - - delegate - - - - 933 - - - - nextKeyView - - - - 934 - - - - delegate - - - - 936 - - - - value: values.DownloadAsk - - - - - - value: values.DownloadAsk - value - values.DownloadAsk - 2 - - - 1295 - - - - enabled: values.PlaySeedingSound - - - - - - enabled: values.PlaySeedingSound - enabled - values.PlaySeedingSound - 2 - - - 1315 - - - - enabled: values.PlayDownloadSound - - - - - - enabled: values.PlayDownloadSound - enabled - values.PlayDownloadSound - 2 - - - 1316 - setSound: @@ -5482,172 +4766,6 @@ AAABAAAAAQ 1321 - - - value: values.PlayDownloadSound - - - - - - value: values.PlayDownloadSound - value - values.PlayDownloadSound - 2 - - - 1322 - - - - contentValues: sounds - - - - - - contentValues: sounds - contentValues - sounds - 2 - - - 1330 - - - - selectedValue: values.DownloadSound - - - - - - selectedValue: values.DownloadSound - selectedValue - values.DownloadSound - - 2 - - - 1331 - - - - contentValues: sounds - - - - - - contentValues: sounds - contentValues - sounds - 2 - - - 1332 - - - - selectedValue: values.SeedingSound - - - - - - selectedValue: values.SeedingSound - selectedValue - values.SeedingSound - - 2 - - - 1333 - - - - value: values.AutoStartDownload - - - - - - value: values.AutoStartDownload - value - values.AutoStartDownload - - - - - - - - - - - - - 2 - - - 1336 - - - - value: values.DownloadAskMulti - - - - - - value: values.DownloadAskMulti - value - values.DownloadAskMulti - 2 - - - 1341 - - - - enabled: values.DownloadAsk - - - - - - enabled: values.DownloadAsk - enabled - values.DownloadAsk - 2 - - - 1343 - - - - value: values.PlaySeedingSound - - - - - - value: values.PlaySeedingSound - value - values.PlaySeedingSound - 2 - - - 1346 - - - - nextKeyView - - - - 1455 - setPeersGlobal: @@ -5712,70 +4830,6 @@ AAABAAAAAQ 1463 - - - value: values.PEXGlobal - - - - - - value: values.PEXGlobal - value - values.PEXGlobal - 2 - - - 1464 - - - - value: values.EncryptionPrefer - - - - - - value: values.EncryptionPrefer - value - values.EncryptionPrefer - 2 - - - 1465 - - - - value: values.EncryptionRequire - - - - - - value: values.EncryptionRequire - value - values.EncryptionRequire - 2 - - - 1466 - - - - enabled: values.EncryptionPrefer - - - - - - enabled: values.EncryptionPrefer - enabled - values.EncryptionPrefer - 2 - - - 1467 - fPeersView @@ -5816,6 +4870,1615 @@ AAABAAAAAQ 1475 + + + fRemoteView + + + + 1512 + + + + setRPCEnabled: + + + + 1513 + + + + fRPCPortField + + + + 1514 + + + + fRPCAddRemoveControl + + + + 1536 + + + + addRemoveRPCIP: + + + + 1539 + + + + setRPCPort: + + + + 1540 + + + + setRPCUsername: + + + + 1571 + + + + setRPCPassword: + + + + 1572 + + + + helpForRemote: + + + + 1662 + + + + fRPCPasswordField + + + + 1674 + + + + linkWebUI: + + + + 1720 + + + + fBlocklistDateField + + + + 1740 + + + + setBlocklistAutoUpdate: + + + + 1745 + + + + fRPCWhitelistTable + + + + 1746 + + + + setRPCUseWhitelist: + + + + 1758 + + + + setRPCAuthorize: + + + + 1759 + + + + fGroupsView + + + + 1761 + + + + setRPCWebUIDiscovery: + + + + 1829 + + + + randomPort: + + + + 1894 + + + + setAutoUpdateToBeta: + + + + 1900 + + + + setAutoSpeedLimitTime: + + + + 1902 + + + + setAutoSpeedLimitTime: + + + + 1903 + + + + setRandomPortOnStart: + + + + 1904 + + + + fAutoSpeedDayTypePopUp + + + + 1921 + + + + setAutoSpeedLimitDay: + + + + 1922 + + + + setDHT: + + + + 1928 + + + + setUseIncompleteFolder: + + + + 1929 + + + + setDefaultForMagnets: + + + + 1935 + + + + setRenamePartialFiles: + + + + 1944 + + + + setAutoStartDownloads: + + + + 1946 + + + + setLPD: + + + + 1957 + + + + fIdleStopField + + + + 1979 + + + + applyIdleStopSetting: + + + + 1980 + + + + setIdleStop: + + + + 1981 + + + + fBlocklistURLField + + + + 1994 + + + + fBlocklistButton + + + + 2031 + + + + fCheckForUpdatesBetaButton + + + + 2040 + + + + fCheckForUpdatesButton + + + + 2041 + + + + fCheckForUpdatesLabel + + + + 2042 + + + + setDoneScriptEnabled: + + + + 2059 + + + + fDoneScriptPopUp + + + + 2060 + + + + doneScriptSheetShow: + + + + 2065 + + + + helpForScript: + + + + 2070 + + + + setUTP: + + + + 2080 + + + + setBuiltInGrowlEnabled: + + + + 2108 + + + + fBuiltInGrowlButton + + + + 2109 + + + + fGrowlInstalledField + + + + 2112 + + + + value: values.CheckQuit + + + + + + value: values.CheckQuit + value + values.CheckQuit + 2 + + + 389 + + + + value: values.CheckRemove + + + + + + value: values.CheckRemove + value + values.CheckRemove + 2 + + + 385 + + + + value: values.BadgeDownloadRate + + + + + + value: values.BadgeDownloadRate + value + values.BadgeDownloadRate + 2 + + + 397 + + + + value: values.BadgeUploadRate + + + + + + value: values.BadgeUploadRate + value + values.BadgeUploadRate + 2 + + + 398 + + + + image: values.DownloadFolder + + + + + + image: values.DownloadFolder + image + values.DownloadFolder + + NSValueTransformerName + ExpandedPathToIconTransformer + + 2 + + + 498 + + + + title: values.DownloadFolder + + + + + + title: values.DownloadFolder + title + values.DownloadFolder + + NSValueTransformerName + ExpandedPathToPathTransformer + + + 2 + + + 500 + + + + delegate + + + + 936 + + + + value: values.DeleteOriginalTorrent + + + + + + value: values.DeleteOriginalTorrent + value + values.DeleteOriginalTorrent + 2 + + + 401 + + + + value: values.CheckRemoveDownloading + + + + + + value: values.CheckRemoveDownloading + value + values.CheckRemoveDownloading + 2 + + + 387 + + + + enabled: values.CheckRemove + + + + + + enabled: values.CheckRemove + enabled + values.CheckRemove + 2 + + + 390 + + + + value: values.CheckQuitDownloading + + + + + + value: values.CheckQuitDownloading + value + values.CheckQuitDownloading + 2 + + + 388 + + + + enabled: values.CheckQuit + + + + + + enabled: values.CheckQuit + enabled + values.CheckQuit + 2 + + + 391 + + + + nextKeyView + + + + 577 + + + + enabled: values.CheckDownload + + + + + + enabled: values.CheckDownload + enabled + values.CheckDownload + 2 + + + 632 + + + + delegate + + + + 930 + + + + value: values.CheckUpload + + + + + + value: values.CheckUpload + value + values.CheckUpload + 2 + + + 464 + + + + enabled: values.CheckUpload + + + + + + enabled: values.CheckUpload + enabled + values.CheckUpload + 2 + + + 633 + + + + delegate + + + + 931 + + + + nextKeyView + + + + 934 + + + + value: values.CheckDownload + + + + + + value: values.CheckDownload + value + values.CheckDownload + 2 + + + 465 + + + + enabled: values.CheckDownload + + + + + + enabled: values.CheckDownload + enabled + values.CheckDownload + 2 + + + 1700 + + + + enabled: values.CheckUpload + + + + + + enabled: values.CheckUpload + enabled + values.CheckUpload + 2 + + + 1701 + + + + nextKeyView + + + + 580 + + + + delegate + + + + 932 + + + + nextKeyView + + + + 581 + + + + delegate + + + + 933 + + + + value: values.AutoImport + + + + + + value: values.AutoImport + value + values.AutoImport + 2 + + + 403 + + + + enabled: values.AutoImport + + + + + + enabled: values.AutoImport + enabled + values.AutoImport + 2 + + + 404 + + + + image: values.AutoImportDirectory + + + + + + image: values.AutoImportDirectory + image + values.AutoImportDirectory + + NSValueTransformerName + ExpandedPathToIconTransformer + + 2 + + + 495 + + + + title: values.AutoImportDirectory + + + + + + title: values.AutoImportDirectory + title + values.AutoImportDirectory + + + ExpandedPathToPathTransformer + + + 2 + + + 649 + + + + value: values.AutoSize + + + + + + value: values.AutoSize + value + values.AutoSize + 2 + + + 399 + + + + nextKeyView + + + + 1643 + + + + enabled: values.Queue + + + + + + enabled: values.Queue + enabled + values.Queue + 2 + + + 407 + + + + delegate + + + + 923 + + + + nextKeyView + + + + 1638 + + + + enabled: values.Queue + + + + + + enabled: values.Queue + enabled + values.Queue + 2 + + + 1697 + + + + value: values.RatioCheck + + + + + + value: values.RatioCheck + value + values.RatioCheck + 2 + + + 430 + + + + enabled: values.RatioCheck + + + + + + enabled: values.RatioCheck + enabled + values.RatioCheck + 2 + + + 431 + + + + delegate + + + + 919 + + + + nextKeyView + + + + 1637 + + + + value: values.SpeedLimitAuto + + + + + + value: values.SpeedLimitAuto + value + values.SpeedLimitAuto + 2 + + + 455 + + + + enabled: values.SpeedLimitAuto + + + + + + enabled: values.SpeedLimitAuto + enabled + values.SpeedLimitAuto + 2 + + + 1702 + + + + value: values.NatTraversal + + + + + + value: values.NatTraversal + value + values.NatTraversal + 2 + + + 442 + + + + value: values.Queue + + + + + + value: values.Queue + value + values.Queue + 2 + + + 405 + + + + enabled: values.SpeedLimitAuto + + + + + + enabled: values.SpeedLimitAuto + enabled + values.SpeedLimitAuto + 2 + + + 529 + + + + value: values.SpeedLimitAutoOnDate + + + + + + value: values.SpeedLimitAutoOnDate + value + values.SpeedLimitAutoOnDate + 2 + + + 534 + + + + nextKeyView + + + + 583 + + + + enabled: values.SpeedLimitAuto + + + + + + enabled: values.SpeedLimitAuto + enabled + values.SpeedLimitAuto + 2 + + + 530 + + + + value: values.SpeedLimitAutoOffDate + + + + + + value: values.SpeedLimitAutoOffDate + value + values.SpeedLimitAutoOffDate + 2 + + + 535 + + + + nextKeyView + + + + 584 + + + + value: values.UseIncompleteDownloadFolder + + + + + + value: values.UseIncompleteDownloadFolder + value + values.UseIncompleteDownloadFolder + 2 + + + 543 + + + + enabled: values.UseIncompleteDownloadFolder + + + + + + enabled: values.UseIncompleteDownloadFolder + enabled + values.UseIncompleteDownloadFolder + 2 + + + 545 + + + + image: values.IncompleteDownloadFolder + + + + + + image: values.IncompleteDownloadFolder + image + values.IncompleteDownloadFolder + + NSValueTransformerName + ExpandedPathToIconTransformer + + 2 + + + 548 + + + + title: values.IncompleteDownloadFolder + + + + + + title: values.IncompleteDownloadFolder + title + values.IncompleteDownloadFolder + + NSValueTransformerName + ExpandedPathToPathTransformer + + + 2 + + + 550 + + + + enabled: values.QueueSeed + + + + + + enabled: values.QueueSeed + enabled + values.QueueSeed + 2 + + + 609 + + + + delegate + + + + 924 + + + + nextKeyView + + + + 1639 + + + + enabled: values.QueueSeed + + + + + + enabled: values.QueueSeed + enabled + values.QueueSeed + 2 + + + 1698 + + + + value: values.QueueSeed + + + + + + value: values.QueueSeed + value + values.QueueSeed + 2 + + + 608 + + + + enabled: values.CheckStalled + + + + + + enabled: values.CheckStalled + enabled + values.CheckStalled + 2 + + + 641 + + + + delegate + + + + 925 + + + + nextKeyView + + + + 1640 + + + + enabled: values.CheckStalled + + + + + + enabled: values.CheckStalled + enabled + values.CheckStalled + 2 + + + 1699 + + + + value: values.CheckStalled + + + + + + value: values.CheckStalled + value + values.CheckStalled + 2 + + + 640 + + + + value: values.SUEnableAutomaticChecks + + + + + + value: values.SUEnableAutomaticChecks + value + values.SUEnableAutomaticChecks + 2 + + + 1737 + + + + value: values.SleepPrevent + + + + + + value: values.SleepPrevent + value + values.SleepPrevent + 2 + + + 666 + + + + value: values.DownloadAsk + + + + + + value: values.DownloadAsk + value + values.DownloadAsk + 2 + + + 1295 + + + + enabled: values.PlayDownloadSound + + + + + + enabled: values.PlayDownloadSound + enabled + values.PlayDownloadSound + 2 + + + 1316 + + + + contentValues: sounds + + + + + + contentValues: sounds + contentValues + sounds + 2 + + + 1330 + + + + selectedValue: values.DownloadSound + + + + + + selectedValue: values.DownloadSound + selectedValue + values.DownloadSound + + 2 + + + 1331 + + + + nextKeyView + + + + 1641 + + + + value: values.PlaySeedingSound + + + + + + value: values.PlaySeedingSound + value + values.PlaySeedingSound + 2 + + + 1346 + + + + enabled: values.PlaySeedingSound + + + + + + enabled: values.PlaySeedingSound + enabled + values.PlaySeedingSound + 2 + + + 1315 + + + + contentValues: sounds + + + + + + contentValues: sounds + contentValues + sounds + 2 + + + 1332 + + + + selectedValue: values.SeedingSound + + + + + + selectedValue: values.SeedingSound + selectedValue + values.SeedingSound + + 2 + + + 1333 + + + + value: values.PlayDownloadSound + + + + + + value: values.PlayDownloadSound + value + values.PlayDownloadSound + 2 + + + 1322 + + + + value: values.AutoStartDownload + + + + + + value: values.AutoStartDownload + value + values.AutoStartDownload + + + + + + + + + + + + + 2 + + + 1336 + + + + value: values.DownloadAskMulti + + + + + + value: values.DownloadAskMulti + value + values.DownloadAskMulti + 2 + + + 1341 + + + + enabled: values.DownloadAsk + + + + + + enabled: values.DownloadAsk + enabled + values.DownloadAsk + 2 + + + 1343 + + + + nextKeyView + + + + 1636 + + + + value: values.EncryptionRequire + + + + + + value: values.EncryptionRequire + value + values.EncryptionRequire + 2 + + + 1466 + + + + enabled: values.EncryptionPrefer + + + + + + enabled: values.EncryptionPrefer + enabled + values.EncryptionPrefer + 2 + + + 1467 + + + + value: values.EncryptionPrefer + + + + + + value: values.EncryptionPrefer + value + values.EncryptionPrefer + 2 + + + 1465 + + + + nextKeyView + + + + 1455 + + + + value: values.PEXGlobal + + + + + + value: values.PEXGlobal + value + values.PEXGlobal + 2 + + + 1464 + + + + value: values.BlocklistNew + + + + + + value: values.BlocklistNew + value + values.BlocklistNew + 2 + + + 1992 + enabled: values.DownloadAsk @@ -5864,30 +6527,6 @@ AAABAAAAAQ 1511 - - - fRemoteView - - - - 1512 - - - - setRPCEnabled: - - - - 1513 - - - - fRPCPortField - - - - 1514 - delegate @@ -5896,46 +6535,6 @@ AAABAAAAAQ 1515 - - - dataSource - - - - 1532 - - - - fRPCAddRemoveControl - - - - 1536 - - - - delegate - - - - 1537 - - - - addRemoveRPCIP: - - - - 1539 - - - - setRPCPort: - - - - 1540 - enabled: values.RPC @@ -5953,28 +6552,20 @@ AAABAAAAAQ 1545 - - enabled: values.RPC - - - - - - enabled: values.RPC - enabled - values.RPC - 2 - + + nextKeyView + + - 1546 + 1627 enabled: values.RPC - + - - + + enabled: values.RPC enabled @@ -5982,39 +6573,7 @@ AAABAAAAAQ 2 - 1547 - - - - enabled: values.RPC - - - - - - enabled: values.RPC - enabled - values.RPC - 2 - - - 1558 - - - - enabled: values.RPC - - - - - - enabled: values.RPC - enabled - values.RPC - 2 - - - 1559 + 1695 @@ -6032,22 +6591,6 @@ AAABAAAAAQ 1560 - - - value: values.RPCUsername - - - - - - value: values.RPCUsername - value - values.RPCUsername - 2 - - - 1565 - value: values.RPCAuthorize @@ -6064,44 +6607,21 @@ AAABAAAAAQ 1567 - - - setRPCUsername: - - - - 1571 - - - - setRPCPassword: - - - - 1572 - - enabled2: values.RPCAuthorize - + enabled: values.RPC + - - + + - enabled2: values.RPCAuthorize - enabled2 - values.RPCAuthorize - - - - - - - + enabled: values.RPC + enabled + values.RPC 2 - 1575 + 1559 @@ -6126,14 +6646,6 @@ AAABAAAAAQ 1576 - - - nextKeyView - - - - 1625 - nextKeyView @@ -6144,91 +6656,27 @@ AAABAAAAAQ - nextKeyView - - + dataSource + + - 1627 + 1532 - nextKeyView - - + delegate + + - 1636 - - - - nextKeyView - - - - 1637 - - - - nextKeyView - - - - 1638 - - - - nextKeyView - - - - 1639 - - - - nextKeyView - - - - 1640 - - - - nextKeyView - - - - 1641 - - - - nextKeyView - - - - 1643 - - - - helpForRemote: - - - - 1662 - - - - fRPCPasswordField - - - - 1674 + 1537 enabled: values.RPC - + - - + + enabled: values.RPC enabled @@ -6236,7 +6684,132 @@ AAABAAAAAQ 2 - 1691 + 1546 + + + + enabled2: values.RPCUseWhitelist + + + + + + enabled2: values.RPCUseWhitelist + enabled2 + values.RPCUseWhitelist + + + + + + + + 2 + + + 1754 + + + + enabled: values.RPC + + + + + + enabled: values.RPC + enabled + values.RPC + 2 + + + 1547 + + + + enabled2: values.RPCUseWhitelist + + + + + + enabled2: values.RPCUseWhitelist + enabled2 + values.RPCUseWhitelist + + + + + + + + 2 + + + 1755 + + + + enabled: values.RPC + + + + + + enabled: values.RPC + enabled + values.RPC + 2 + + + 1558 + + + + value: values.RPCUsername + + + + + + value: values.RPCUsername + value + values.RPCUsername + 2 + + + 1565 + + + + enabled2: values.RPCAuthorize + + + + + + enabled2: values.RPCAuthorize + enabled2 + values.RPCAuthorize + + + + + + + + 2 + + + 1575 + + + + nextKeyView + + + + 1625 @@ -6254,29 +6827,6 @@ AAABAAAAAQ 1692 - - - enabled2: values.RPCAuthorize - - - - - - enabled2: values.RPCAuthorize - enabled2 - values.RPCAuthorize - - - - - - - - 2 - - - 1693 - enabled2: values.RPCAuthorize @@ -6303,10 +6853,10 @@ AAABAAAAAQ enabled: values.RPC - + - - + + enabled: values.RPC enabled @@ -6314,103 +6864,30 @@ AAABAAAAAQ 2 - 1695 + 1691 - enabled: values.Queue - + enabled2: values.RPCAuthorize + - + - enabled: values.Queue - enabled - values.Queue + enabled2: values.RPCAuthorize + enabled2 + values.RPCAuthorize + + + + + + + 2 - 1697 - - - - enabled: values.QueueSeed - - - - - - enabled: values.QueueSeed - enabled - values.QueueSeed - 2 - - - 1698 - - - - enabled: values.CheckStalled - - - - - - enabled: values.CheckStalled - enabled - values.CheckStalled - 2 - - - 1699 - - - - enabled: values.CheckDownload - - - - - - enabled: values.CheckDownload - enabled - values.CheckDownload - 2 - - - 1700 - - - - enabled: values.CheckUpload - - - - - - enabled: values.CheckUpload - enabled - values.CheckUpload - 2 - - - 1701 - - - - enabled: values.SpeedLimitAuto - - - - - - enabled: values.SpeedLimitAuto - enabled - values.SpeedLimitAuto - 2 - - - 1702 + 1693 @@ -6428,38 +6905,6 @@ AAABAAAAAQ 1719 - - - linkWebUI: - - - - 1720 - - - - value: values.SUEnableAutomaticChecks - - - - - - value: values.SUEnableAutomaticChecks - value - values.SUEnableAutomaticChecks - 2 - - - 1737 - - - - fBlocklistDateField - - - - 1740 - value: values.BlocklistAutoUpdate @@ -6476,67 +6921,21 @@ AAABAAAAAQ 1744 - - - setBlocklistAutoUpdate: - - - - 1745 - - - - fRPCWhitelistTable - - - - 1746 - - enabled2: values.RPCUseWhitelist - + enabled: values.BlocklistNew + - + - enabled2: values.RPCUseWhitelist - enabled2 - values.RPCUseWhitelist - - - - - - - + enabled: values.BlocklistNew + enabled + values.BlocklistNew 2 - 1754 - - - - enabled2: values.RPCUseWhitelist - - - - - - enabled2: values.RPCUseWhitelist - enabled2 - values.RPCUseWhitelist - - - - - - - - 2 - - - 1755 + 1989 @@ -6570,45 +6969,13 @@ AAABAAAAAQ 1757 - - - setRPCUseWhitelist: - - - - 1758 - - - - setRPCAuthorize: - - - - 1759 - - fGroupsView - - + nextKeyView + + - 1761 - - - - fTableView - - - - 1784 - - - - fAddRemoveControl - - - - 1785 + 1805 @@ -6626,6 +6993,22 @@ AAABAAAAAQ 1789 + + + fTableView + + + + 1784 + + + + fAddRemoveControl + + + + 1785 + addRemoveGroup: @@ -6634,30 +7017,6 @@ AAABAAAAAQ 1790 - - - delegate - - - - 1803 - - - - nextKeyView - - - - 1804 - - - - nextKeyView - - - - 1805 - fSelectedColorNameField @@ -6706,46 +7065,6 @@ AAABAAAAAQ 1822 - - - enabled: values.RPC - - - - - - enabled: values.RPC - enabled - values.RPC - 2 - - - 1827 - - - - value: values.RPCWebDiscovery - - - - - - value: values.RPCWebDiscovery - value - values.RPCWebDiscovery - 2 - - - 1828 - - - - setRPCWebUIDiscovery: - - - - 1829 - orderFrontRulesSheet: @@ -6778,6 +7097,54 @@ AAABAAAAAQ 1884 + + + delegate + + + + 1803 + + + + nextKeyView + + + + 1804 + + + + enabled: values.RPC + + + + + + enabled: values.RPC + enabled + values.RPC + 2 + + + 1827 + + + + value: values.RPCWebDiscovery + + + + + + value: values.RPCWebDiscovery + value + values.RPCWebDiscovery + 2 + + + 1828 + value: values.RandomPort @@ -6794,14 +7161,6 @@ AAABAAAAAQ 1893 - - - randomPort: - - - - 1894 - value: values.AutoUpdateBeta @@ -6818,54 +7177,6 @@ AAABAAAAAQ 1897 - - - setAutoUpdateToBeta: - - - - 1900 - - - - setAutoSpeedLimitTime: - - - - 1902 - - - - setAutoSpeedLimitTime: - - - - 1903 - - - - setRandomPortOnStart: - - - - 1904 - - - - fAutoSpeedDayTypePopUp - - - - 1921 - - - - setAutoSpeedLimitDay: - - - - 1922 - enabled: values.SpeedLimitAuto @@ -6914,30 +7225,6 @@ AAABAAAAAQ 1927 - - - setDHT: - - - - 1928 - - - - setUseIncompleteFolder: - - - - 1929 - - - - setDefaultForMagnets: - - - - 1935 - value: values.RenamePartialFiles @@ -6954,22 +7241,6 @@ AAABAAAAAQ 1942 - - - setRenamePartialFiles: - - - - 1944 - - - - setAutoStartDownloads: - - - - 1946 - value: values.MagnetOpenAsk @@ -7003,12 +7274,20 @@ AAABAAAAAQ 1956 - - setLPD: - - + + value: values.IdleLimitCheck + + + + + + value: values.IdleLimitCheck + value + values.IdleLimitCheck + 2 + - 1957 + 1982 @@ -7026,46 +7305,6 @@ AAABAAAAAQ 1964 - - - fIdleStopField - - - - 1979 - - - - applyIdleStopSetting: - - - - 1980 - - - - setIdleStop: - - - - 1981 - - - - value: values.IdleLimitCheck - - - - - - value: values.IdleLimitCheck - value - values.IdleLimitCheck - 2 - - - 1982 - enabled: values.IdleLimitCheck @@ -7098,22 +7337,6 @@ AAABAAAAAQ 1984 - - - enabled: values.BlocklistNew - - - - - - enabled: values.BlocklistNew - enabled - values.BlocklistNew - 2 - - - 1989 - enabled: values.BlocklistNew @@ -7130,22 +7353,6 @@ AAABAAAAAQ 1991 - - - value: values.BlocklistNew - - - - - - value: values.BlocklistNew - value - values.BlocklistNew - 2 - - - 1992 - enabled: values.BlocklistNew @@ -7162,46 +7369,6 @@ AAABAAAAAQ 1993 - - - fBlocklistURLField - - - - 1994 - - - - fBlocklistButton - - - - 2031 - - - - fCheckForUpdatesBetaButton - - - - 2040 - - - - fCheckForUpdatesButton - - - - 2041 - - - - fCheckForUpdatesLabel - - - - 2042 - value: values.DoneScriptEnabled @@ -7218,22 +7385,6 @@ AAABAAAAAQ 2058 - - - setDoneScriptEnabled: - - - - 2059 - - - - fDoneScriptPopUp - - - - 2060 - enabled: values.DoneScriptEnabled @@ -7291,22 +7442,6 @@ AAABAAAAAQ 2064 - - - doneScriptSheetShow: - - - - 2065 - - - - helpForScript: - - - - 2070 - value: values.UTPGlobal @@ -7323,14 +7458,6 @@ AAABAAAAAQ 2079 - - - setUTP: - - - - 2080 - @@ -7393,6 +7520,9 @@ AAABAAAAAQ + + + General @@ -9913,6 +10043,45 @@ AAABAAAAAQ + + 2086 + + + + + + + + 2087 + + + + + 2104 + + + + + + + + 2105 + + + + + 2110 + + + + + + + + 2111 + + + @@ -10213,7 +10382,13 @@ AAABAAAAAQ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -10323,7 +10498,7 @@ AAABAAAAAQ - 2084 + 2112 @@ -10434,6 +10609,17 @@ AAABAAAAAQ PrefsController NSWindowController + + setBuiltInGrowlEnabled: + id + + + setBuiltInGrowlEnabled: + + setBuiltInGrowlEnabled: + id + + NSPopUpButton NSView @@ -10441,6 +10627,7 @@ AAABAAAAAQ NSTextField NSTextField NSTextField + NSButton NSButton NSButton NSTextField @@ -10449,6 +10636,7 @@ AAABAAAAAQ NSPopUpButton NSView NSView + NSTextField NSTextField NSPopUpButton NSPopUpButton @@ -10500,6 +10688,10 @@ AAABAAAAAQ fBlocklistURLField NSTextField + + fBuiltInGrowlButton + NSButton + fCheckForUpdatesBetaButton NSButton @@ -10532,6 +10724,10 @@ AAABAAAAAQ fGroupsView NSView + + fGrowlInstalledField + NSTextField + fIdleStopField NSTextField @@ -10656,7 +10852,7 @@ AAABAAAAAQ com.apple.InterfaceBuilder.CocoaPlugin.macosx - + YES 3 @@ -10666,7 +10862,7 @@ AAABAAAAAQ {7, 2} {8, 8} {15, 15} - {64, 64} + {128, 128} {16, 16}