diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index c2dfbe50e..bab6f54ea 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -107,6 +107,7 @@ A2AF1C390A3D0F6200F1575D /* FileTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = A2AF1C370A3D0F6200F1575D /* FileTableView.m */; }; A2BD40070A09BBEA008CCE96 /* bencode.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D1838B709DEC0430047D688 /* bencode.h */; }; A2C655650A04FEDC00E9FD82 /* BottomBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A2C655640A04FEDC00E9FD82 /* BottomBorder.png */; }; + A2D0E0490A54A97C003C72CF /* Bandwidth.png in Resources */ = {isa = PBXBuildFile; fileRef = A2D0E0480A54A97C003C72CF /* Bandwidth.png */; }; A2F40AE40A361C00006B8288 /* Transmission.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D2784360905709500687951 /* Transmission.icns */; }; A2F8951F0A2D4BA500ED2127 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = A2F8951E0A2D4BA500ED2127 /* Credits.rtf */; }; /* End PBXBuildFile section */ @@ -288,6 +289,7 @@ A2AF1C360A3D0F6200F1575D /* FileTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FileTableView.h; path = macosx/FileTableView.h; sourceTree = ""; }; A2AF1C370A3D0F6200F1575D /* FileTableView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = FileTableView.m; path = macosx/FileTableView.m; sourceTree = ""; }; A2C655640A04FEDC00E9FD82 /* BottomBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BottomBorder.png; path = macosx/Images/BottomBorder.png; sourceTree = ""; }; + A2D0E0480A54A97C003C72CF /* Bandwidth.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Bandwidth.png; path = macosx/Images/Bandwidth.png; sourceTree = ""; }; A2F8951E0A2D4BA500ED2127 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = macosx/Credits.rtf; sourceTree = ""; }; /* End PBXFileReference section */ @@ -392,6 +394,7 @@ A2305A7D0A3DC9E400AB2D77 /* ProgressBarBlue.png */, A2305A7E0A3DC9E400AB2D77 /* ProgressBarGray.png */, A2305A7F0A3DC9E400AB2D77 /* ProgressBarGreen.png */, + A2D0E0480A54A97C003C72CF /* Bandwidth.png */, A21DFF0F0A292B2B007C5F76 /* Transfers.png */, A27A53640A06AED200E1F16F /* StatusBorder.png */, A27A53420A06A62500E1F16F /* StatusSep.png */, @@ -676,6 +679,7 @@ A2305AAC0A3DCCEF00AB2D77 /* ProgressBarEndGreen.png in Resources */, A2305AAD0A3DCCEF00AB2D77 /* ProgressBarEndGray.png in Resources */, A28C43F40A4A5D700091A302 /* Transmission Help in Resources */, + A2D0E0490A54A97C003C72CF /* Bandwidth.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/macosx/English.lproj/InfoWindow.nib/info.nib b/macosx/English.lproj/InfoWindow.nib/info.nib index 9076d3f55..05246b46b 100644 --- a/macosx/English.lproj/InfoWindow.nib/info.nib +++ b/macosx/English.lproj/InfoWindow.nib/info.nib @@ -24,6 +24,6 @@ 5 IBSystem Version - 8I127 + 8J135 diff --git a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib index e533cb145..b372131d3 100644 Binary files a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib and b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib differ diff --git a/macosx/English.lproj/PrefsWindow.nib/classes.nib b/macosx/English.lproj/PrefsWindow.nib/classes.nib index 406a7ec04..38ee29c7e 100644 --- a/macosx/English.lproj/PrefsWindow.nib/classes.nib +++ b/macosx/English.lproj/PrefsWindow.nib/classes.nib @@ -23,6 +23,7 @@ OUTLETS = { fBadgeDownloadRateCheck = NSButton; fBadgeUploadRateCheck = NSButton; + fBandwidthView = NSView; fCopyTorrentCheck = NSButton; fDeleteOriginalTorrentCheck = NSButton; fDownloadCheck = NSButton; diff --git a/macosx/English.lproj/PrefsWindow.nib/info.nib b/macosx/English.lproj/PrefsWindow.nib/info.nib index 68a22b4ec..9b9b10a74 100644 --- a/macosx/English.lproj/PrefsWindow.nib/info.nib +++ b/macosx/English.lproj/PrefsWindow.nib/info.nib @@ -6,20 +6,23 @@ 39 83 356 286 0 0 1152 842 IBEditorPositions + 153 + 261 290 536 130 0 0 1152 842 28 - 308 454 535 247 0 0 1152 842 + 308 451 536 254 0 0 1152 842 41 - 308 405 535 345 0 0 1152 842 + 308 438 536 280 0 0 1152 842 66 - 321 526 535 104 0 0 1152 842 + 300 526 551 104 0 0 1152 842 IBFramework Version 446.1 IBOpenObjects + 153 28 IBSystem Version - 8I127 + 8J135 diff --git a/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib b/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib index 8e89ccb62..a222b60aa 100644 Binary files a/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib and b/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib differ diff --git a/macosx/Images/Bandwidth.png b/macosx/Images/Bandwidth.png new file mode 100644 index 000000000..767ddae7f Binary files /dev/null and b/macosx/Images/Bandwidth.png differ diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h index d86da5adb..70d0ab08b 100644 --- a/macosx/PrefsController.h +++ b/macosx/PrefsController.h @@ -31,7 +31,7 @@ tr_handle_t * fHandle; NSToolbar * fToolbar; - IBOutlet NSView * fGeneralView, * fTransfersView, * fNetworkView; + IBOutlet NSView * fGeneralView, * fTransfersView, * fBandwidthView, * fNetworkView; IBOutlet NSPopUpButton * fFolderPopUp; IBOutlet NSButton * fQuitCheck, * fRemoveCheck, @@ -62,7 +62,6 @@ - (void) setUpdate: (id) sender; - (void) checkUpdate; - - (void) setStartSetting: (id) sender; - (void) setWaitToStart: (id) sender; diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m index 9921f36f5..c3ef842ca 100644 --- a/macosx/PrefsController.m +++ b/macosx/PrefsController.m @@ -42,12 +42,14 @@ #define TOOLBAR_GENERAL @"General" #define TOOLBAR_TRANSFERS @"Transfers" +#define TOOLBAR_BANDWIDTH @"Bandwidth" #define TOOLBAR_NETWORK @"Network" @interface PrefsController (Private) - (void) showGeneralPref: (id) sender; - (void) showTransfersPref: (id) sender; +- (void) showBandwidthPref: (id) sender; - (void) showNetworkPref: (id) sender; - (void) setPrefView: (NSView *) view; @@ -205,6 +207,13 @@ [item setTarget: self]; [item setAction: @selector( showTransfersPref: )]; } + else if ([ident isEqualToString: TOOLBAR_BANDWIDTH]) + { + [item setLabel: TOOLBAR_BANDWIDTH]; + [item setImage: [NSImage imageNamed: @"Bandwidth.png"]]; + [item setTarget: self]; + [item setAction: @selector( showBandwidthPref: )]; + } else if ([ident isEqualToString: TOOLBAR_NETWORK]) { [item setLabel: TOOLBAR_NETWORK]; @@ -223,19 +232,19 @@ - (NSArray *) toolbarSelectableItemIdentifiers: (NSToolbar *) toolbar { - return [self toolbarDefaultItemIdentifiers: nil]; + return [self toolbarDefaultItemIdentifiers: toolbar]; } - (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar { - return [self toolbarAllowedItemIdentifiers: nil]; + return [self toolbarAllowedItemIdentifiers: toolbar]; } - (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar { return [NSArray arrayWithObjects: TOOLBAR_GENERAL, TOOLBAR_TRANSFERS, - TOOLBAR_NETWORK, nil]; + TOOLBAR_BANDWIDTH, TOOLBAR_NETWORK, nil]; } - (void) setPort: (id) sender @@ -545,6 +554,11 @@ [self setPrefView: fTransfersView]; } +- (void) showBandwidthPref: (id) sender +{ + [self setPrefView: fBandwidthView]; +} + - (void) showNetworkPref: (id) sender { [self setPrefView: fNetworkView];