Changeset 486

Timestamp:

Jun 30, 2006, 12:53:17 AM (17 years ago)

Author:

livings124

Message:

Some changes to the preference window to avoid crowding. Some panes will be expanded upon (like bandwidth) when new features are added.

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (4 diffs)
• macosx/English.lproj/InfoWindow.nib/info.nib (modified) (1 diff)
• macosx/English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• macosx/English.lproj/PrefsWindow.nib/classes.nib (modified) (1 diff)
• macosx/English.lproj/PrefsWindow.nib/info.nib (modified) (2 diffs)
• macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib (modified) (previous)
• macosx/Images/Bandwidth.png (added)
• macosx/PrefsController.h (modified) (2 diffs)
• macosx/PrefsController.m (modified) (6 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -108 +108 @@
                 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 */; };
@@ -289 +290 @@
                 A2AF1C370A3D0F6200F1575D /* FileTableView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = FileTableView.m; path = macosx/FileTableView.m; sourceTree = "<group>"; };
                 A2C655640A04FEDC00E9FD82 /* BottomBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BottomBorder.png; path = macosx/Images/BottomBorder.png; sourceTree = "<group>"; };
+                A2D0E0480A54A97C003C72CF /* Bandwidth.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Bandwidth.png; path = macosx/Images/Bandwidth.png; sourceTree = "<group>"; };
                 A2F8951E0A2D4BA500ED2127 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = macosx/Credits.rtf; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -393 +395 @@
                                 A2305A7E0A3DC9E400AB2D77 /* ProgressBarGray.png */,
                                 A2305A7F0A3DC9E400AB2D77 /* ProgressBarGreen.png */,
+                                A2D0E0480A54A97C003C72CF /* Bandwidth.png */,
                                 A21DFF0F0A292B2B007C5F76 /* Transfers.png */,
                                 A27A53640A06AED200E1F16F /* StatusBorder.png */,
@@ -677 +680 @@
                                 A2305AAD0A3DCCEF00AB2D77 /* ProgressBarEndGray.png in Resources */,
                                 A28C43F40A4A5D700091A302 /* Transmission Help in Resources */,
+                                A2D0E0490A54A97C003C72CF /* Bandwidth.png in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/macosx/English.lproj/InfoWindow.nib/info.nib

@@ -25 +25 @@
         </array>
         <key>IBSystem Version</key>
-        <string>8I127</string>
+        <string>8J135</string>
 </dict>
 </plist>

trunk/macosx/English.lproj/PrefsWindow.nib/classes.nib

@@ -24 +24 @@
                 fBadgeDownloadRateCheck = NSButton; 
                 fBadgeUploadRateCheck = NSButton; 
+                fBandwidthView = NSView; 
                 fCopyTorrentCheck = NSButton; 
                 fDeleteOriginalTorrentCheck = NSButton; 

trunk/macosx/English.lproj/PrefsWindow.nib/info.nib

@@ -7 +7 @@
         <key>IBEditorPositions</key>
         <dict>
+                <key>153</key>
+                <string>261 290 536 130 0 0 1152 842 </string>
                 <key>28</key>
-                <string>308 454 535 247 0 0 1152 842 </string>
+                <string>308 451 536 254 0 0 1152 842 </string>
                 <key>41</key>
-                <string>308 405 535 345 0 0 1152 842 </string>
+                <string>308 438 536 280 0 0 1152 842 </string>
                 <key>66</key>
-                <string>321 526 535 104 0 0 1152 842 </string>
+                <string>300 526 551 104 0 0 1152 842 </string>
         </dict>
         <key>IBFramework Version</key>
@@ -18 +20 @@
         <key>IBOpenObjects</key>
         <array>
+                <integer>153</integer>
                 <integer>28</integer>
         </array>
         <key>IBSystem Version</key>
-        <string>8I127</string>
+        <string>8J135</string>
 </dict>
 </plist>

trunk/macosx/PrefsController.h

@@ -32 +32 @@
     
     NSToolbar               * fToolbar;
-    IBOutlet NSView         * fGeneralView, * fTransfersView, * fNetworkView;
+    IBOutlet NSView         * fGeneralView, * fTransfersView, * fBandwidthView, * fNetworkView;
     
     IBOutlet NSPopUpButton  * fFolderPopUp;
@@ -63 +63 @@
 - (void) checkUpdate;
 
-
 - (void) setStartSetting:   (id) sender;
 - (void) setWaitToStart:    (id) sender;

trunk/macosx/PrefsController.m

@@ -43 +43 @@
 #define TOOLBAR_GENERAL     @"General"
 #define TOOLBAR_TRANSFERS   @"Transfers"
+#define TOOLBAR_BANDWIDTH   @"Bandwidth"
 #define TOOLBAR_NETWORK     @"Network"
 
@@ -49 +50 @@
 - (void) showGeneralPref: (id) sender;
 - (void) showTransfersPref: (id) sender;
+- (void) showBandwidthPref: (id) sender;
 - (void) showNetworkPref: (id) sender;
 
@@ -206 +208 @@
         [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])
     {
@@ -224 +233 @@
 - (NSArray *) toolbarSelectableItemIdentifiers: (NSToolbar *) toolbar
 {
-    return [self toolbarDefaultItemIdentifiers: nil];
+    return [self toolbarDefaultItemIdentifiers: toolbar];
 }
 
 - (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar
 {
-    return [self toolbarAllowedItemIdentifiers: nil];
+    return [self toolbarAllowedItemIdentifiers: toolbar];
 }
 
@@ -236 +245 @@
     return [NSArray arrayWithObjects:
             TOOLBAR_GENERAL, TOOLBAR_TRANSFERS,
-            TOOLBAR_NETWORK, nil];
+            TOOLBAR_BANDWIDTH, TOOLBAR_NETWORK, nil];
 }
 
@@ -544 +553 @@
 {
     [self setPrefView: fTransfersView];
+}
+
+- (void) showBandwidthPref: (id) sender
+{
+    [self setPrefView: fBandwidthView];
 }