Changeset 37


Ignore:
Timestamp:
Jan 21, 2006, 2:34:14 AM (16 years ago)
Author:
titer
Message:

The simple bar turns gray when paused
Added missing images for pause/resume all

Location:
trunk/macosx
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/Controller.m

    r36 r37  
    741741        [item setPaletteLabel: [item label]];
    742742        [item setToolTip: @"Resume all torrents"];
    743         [item setImage: [NSImage imageNamed: @"Resume.png"]];
     743        [item setImage: [NSImage imageNamed: @"ResumeAll.png"]];
    744744        [item setTarget: self];
    745745        [item setAction: @selector( resumeAllTorrents: )];
     
    750750        [item setPaletteLabel: [item label]];
    751751        [item setToolTip: @"Pause all torrents"];
    752         [item setImage: [NSImage imageNamed: @"Stop.png"]];
     752        [item setImage: [NSImage imageNamed: @"PauseAll.png"]];
    753753        [item setTarget: self];
    754754        [item setAction: @selector( stopAllTorrents: )];
  • trunk/macosx/ProgressCell.m

    r34 r37  
    165165       two columns and the last four lines contain the shadow. */
    166166
    167     p      = (uint32_t *) [fProgressBmp bitmapData];
    168     p     += 2;
    169     end    = lrintf( floor( fStat->progress * 120 ) );
    170     colors = ( fStat->status & TR_STATUS_SEED ) ? kGreen : kBlue2;
     167    p   = (uint32_t *) [fProgressBmp bitmapData] + 2;
     168    end = lrintf( floor( fStat->progress * 120 ) );
     169
     170    if( fStat->status & TR_STATUS_SEED )
     171        colors = kGreen;
     172    else if( fStat->status & ( TR_STATUS_CHECK | TR_STATUS_DOWNLOAD ) )
     173        colors = kBlue2;
     174    else
     175        colors = kGray;
    171176
    172177    for( h = 0; h < 14; h++ )
  • trunk/macosx/Transmission.xcodeproj/project.pbxproj

    r36 r37  
    2727                4DE5CCA70980735700BE280E /* Badger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DE5CCA60980735700BE280E /* Badger.m */; };
    2828                4DE5CCA90980739100BE280E /* Badge.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DE5CCA80980739100BE280E /* Badge.png */; };
     29                4DE5CCBA0981D27700BE280E /* ResumeAll.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DE5CCB80981D27700BE280E /* ResumeAll.png */; };
     30                4DE5CCBB0981D27700BE280E /* PauseAll.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DE5CCB90981D27700BE280E /* PauseAll.png */; };
    2931                4DF0C5AB0899190500DD8943 /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DF0C5A90899190500DD8943 /* Controller.m */; };
    3032                4DF0C5AE08991C1600DD8943 /* libtransmission.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DF0C5AD08991C1600DD8943 /* libtransmission.a */; };
     
    99101                4DE5CCA60980735700BE280E /* Badger.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = Badger.m; sourceTree = "<group>"; };
    100102                4DE5CCA80980739100BE280E /* Badge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Badge.png; path = Images/Badge.png; sourceTree = "<group>"; };
     103                4DE5CCB80981D27700BE280E /* ResumeAll.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ResumeAll.png; path = Images/ResumeAll.png; sourceTree = "<group>"; };
     104                4DE5CCB90981D27700BE280E /* PauseAll.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PauseAll.png; path = Images/PauseAll.png; sourceTree = "<group>"; };
    101105                4DF0C5A90899190500DD8943 /* Controller.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = Controller.m; sourceTree = "<group>"; };
    102106                4DF0C5AA0899190500DD8943 /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Controller.h; sourceTree = "<group>"; };
     
    106110                4DF7500908A103AD007B0D70 /* Remove.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Remove.png; path = Images/Remove.png; sourceTree = "<group>"; };
    107111                8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
    108                 8D1107320486CEB800E47090 /* Transmission.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Transmission.app; sourceTree = BUILT_PRODUCTS_DIR; };
     112                8D1107320486CEB800E47090 /* Transmission.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = Transmission.app; sourceTree = BUILT_PRODUCTS_DIR; };
    109113/* End PBXFileReference section */
    110114
     
    211215                                4D8CEF90095870E00063BAEA /* Network.png */,
    212216                                4DE5CCA80980739100BE280E /* Badge.png */,
     217                                4DE5CCB80981D27700BE280E /* ResumeAll.png */,
     218                                4DE5CCB90981D27700BE280E /* PauseAll.png */,
    213219                                8D1107310486CEB800E47090 /* Info.plist */,
    214220                                089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
     
    302308                                4D8CEF91095870E00063BAEA /* Network.png in Resources */,
    303309                                4DE5CCA90980739100BE280E /* Badge.png in Resources */,
     310                                4DE5CCBA0981D27700BE280E /* ResumeAll.png in Resources */,
     311                                4DE5CCBB0981D27700BE280E /* PauseAll.png in Resources */,
    304312                        );
    305313                        runOnlyForDeploymentPostprocessing = 0;
Note: See TracChangeset for help on using the changeset viewer.