Changeset 486


Ignore:
Timestamp:
Jun 30, 2006, 12:53:17 AM (16 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:
1 added
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Transmission.xcodeproj/project.pbxproj

    r440 r486  
    108108                A2BD40070A09BBEA008CCE96 /* bencode.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D1838B709DEC0430047D688 /* bencode.h */; };
    109109                A2C655650A04FEDC00E9FD82 /* BottomBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A2C655640A04FEDC00E9FD82 /* BottomBorder.png */; };
     110                A2D0E0490A54A97C003C72CF /* Bandwidth.png in Resources */ = {isa = PBXBuildFile; fileRef = A2D0E0480A54A97C003C72CF /* Bandwidth.png */; };
    110111                A2F40AE40A361C00006B8288 /* Transmission.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D2784360905709500687951 /* Transmission.icns */; };
    111112                A2F8951F0A2D4BA500ED2127 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = A2F8951E0A2D4BA500ED2127 /* Credits.rtf */; };
     
    289290                A2AF1C370A3D0F6200F1575D /* FileTableView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = FileTableView.m; path = macosx/FileTableView.m; sourceTree = "<group>"; };
    290291                A2C655640A04FEDC00E9FD82 /* BottomBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BottomBorder.png; path = macosx/Images/BottomBorder.png; sourceTree = "<group>"; };
     292                A2D0E0480A54A97C003C72CF /* Bandwidth.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Bandwidth.png; path = macosx/Images/Bandwidth.png; sourceTree = "<group>"; };
    291293                A2F8951E0A2D4BA500ED2127 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = macosx/Credits.rtf; sourceTree = "<group>"; };
    292294/* End PBXFileReference section */
     
    393395                                A2305A7E0A3DC9E400AB2D77 /* ProgressBarGray.png */,
    394396                                A2305A7F0A3DC9E400AB2D77 /* ProgressBarGreen.png */,
     397                                A2D0E0480A54A97C003C72CF /* Bandwidth.png */,
    395398                                A21DFF0F0A292B2B007C5F76 /* Transfers.png */,
    396399                                A27A53640A06AED200E1F16F /* StatusBorder.png */,
     
    677680                                A2305AAD0A3DCCEF00AB2D77 /* ProgressBarEndGray.png in Resources */,
    678681                                A28C43F40A4A5D700091A302 /* Transmission Help in Resources */,
     682                                A2D0E0490A54A97C003C72CF /* Bandwidth.png in Resources */,
    679683                        );
    680684                        runOnlyForDeploymentPostprocessing = 0;
  • trunk/macosx/English.lproj/InfoWindow.nib/info.nib

    r402 r486  
    2525        </array>
    2626        <key>IBSystem Version</key>
    27         <string>8I127</string>
     27        <string>8J135</string>
    2828</dict>
    2929</plist>
  • trunk/macosx/English.lproj/PrefsWindow.nib/classes.nib

    r484 r486  
    2424                fBadgeDownloadRateCheck = NSButton;
    2525                fBadgeUploadRateCheck = NSButton;
     26                fBandwidthView = NSView;
    2627                fCopyTorrentCheck = NSButton;
    2728                fDeleteOriginalTorrentCheck = NSButton;
  • trunk/macosx/English.lproj/PrefsWindow.nib/info.nib

    r484 r486  
    77        <key>IBEditorPositions</key>
    88        <dict>
     9                <key>153</key>
     10                <string>261 290 536 130 0 0 1152 842 </string>
    911                <key>28</key>
    10                 <string>308 454 535 247 0 0 1152 842 </string>
     12                <string>308 451 536 254 0 0 1152 842 </string>
    1113                <key>41</key>
    12                 <string>308 405 535 345 0 0 1152 842 </string>
     14                <string>308 438 536 280 0 0 1152 842 </string>
    1315                <key>66</key>
    14                 <string>321 526 535 104 0 0 1152 842 </string>
     16                <string>300 526 551 104 0 0 1152 842 </string>
    1517        </dict>
    1618        <key>IBFramework Version</key>
     
    1820        <key>IBOpenObjects</key>
    1921        <array>
     22                <integer>153</integer>
    2023                <integer>28</integer>
    2124        </array>
    2225        <key>IBSystem Version</key>
    23         <string>8I127</string>
     26        <string>8J135</string>
    2427</dict>
    2528</plist>
  • trunk/macosx/PrefsController.h

    r484 r486  
    3232   
    3333    NSToolbar               * fToolbar;
    34     IBOutlet NSView         * fGeneralView, * fTransfersView, * fNetworkView;
     34    IBOutlet NSView         * fGeneralView, * fTransfersView, * fBandwidthView, * fNetworkView;
    3535   
    3636    IBOutlet NSPopUpButton  * fFolderPopUp;
     
    6363- (void) checkUpdate;
    6464
    65 
    6665- (void) setStartSetting:   (id) sender;
    6766- (void) setWaitToStart:    (id) sender;
  • trunk/macosx/PrefsController.m

    r484 r486  
    4343#define TOOLBAR_GENERAL     @"General"
    4444#define TOOLBAR_TRANSFERS   @"Transfers"
     45#define TOOLBAR_BANDWIDTH   @"Bandwidth"
    4546#define TOOLBAR_NETWORK     @"Network"
    4647
     
    4950- (void) showGeneralPref: (id) sender;
    5051- (void) showTransfersPref: (id) sender;
     52- (void) showBandwidthPref: (id) sender;
    5153- (void) showNetworkPref: (id) sender;
    5254
     
    206208        [item setAction: @selector( showTransfersPref: )];
    207209    }
     210    else if ([ident isEqualToString: TOOLBAR_BANDWIDTH])
     211    {
     212        [item setLabel: TOOLBAR_BANDWIDTH];
     213        [item setImage: [NSImage imageNamed: @"Bandwidth.png"]];
     214        [item setTarget: self];
     215        [item setAction: @selector( showBandwidthPref: )];
     216    }
    208217    else if ([ident isEqualToString: TOOLBAR_NETWORK])
    209218    {
     
    224233- (NSArray *) toolbarSelectableItemIdentifiers: (NSToolbar *) toolbar
    225234{
    226     return [self toolbarDefaultItemIdentifiers: nil];
     235    return [self toolbarDefaultItemIdentifiers: toolbar];
    227236}
    228237
    229238- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar
    230239{
    231     return [self toolbarAllowedItemIdentifiers: nil];
     240    return [self toolbarAllowedItemIdentifiers: toolbar];
    232241}
    233242
     
    236245    return [NSArray arrayWithObjects:
    237246            TOOLBAR_GENERAL, TOOLBAR_TRANSFERS,
    238             TOOLBAR_NETWORK, nil];
     247            TOOLBAR_BANDWIDTH, TOOLBAR_NETWORK, nil];
    239248}
    240249
     
    544553{
    545554    [self setPrefView: fTransfersView];
     555}
     556
     557- (void) showBandwidthPref: (id) sender
     558{
     559    [self setPrefView: fBandwidthView];
    546560}
    547561
Note: See TracChangeset for help on using the changeset viewer.