Changeset 4023


Ignore:
Timestamp:
Nov 30, 2007, 11:27:55 PM (15 years ago)
Author:
livings124
Message:

even more new images

Location:
trunk
Files:
6 added
5 deleted
9 edited

Legend:

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

    r4020 r4023  
    6666                A2085DDC0C53BC74000BC3B7 /* AboutWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2085DDA0C53BC74000BC3B7 /* AboutWindowController.m */; };
    6767                A2085E3F0C53C949000BC3B7 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = A2085E2F0C53C833000BC3B7 /* LICENSE */; };
    68                 A20AB97B0A5C622A004F81FA /* SmallTurtle.png in Resources */ = {isa = PBXBuildFile; fileRef = A20AB97A0A5C622A004F81FA /* SmallTurtle.png */; };
    6968                A20B6F6B0C4D842B0034AB1D /* PriorityLow.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6F6A0C4D842B0034AB1D /* PriorityLow.png */; };
    7069                A20B6F830C4D8A610034AB1D /* PriorityHigh.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6F820C4D8A610034AB1D /* PriorityHigh.png */; };
     
    8079                A2265F420B5EF5F40093DDA5 /* FileNameCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A2265F400B5EF5F40093DDA5 /* FileNameCell.m */; };
    8180                A22A8D560AEEAFA5007E9CB9 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = A22A8D540AEEAFA5007E9CB9 /* Localizable.strings */; };
    82                 A22BC9A30C5BBCF100F5FB72 /* BottomBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A22BC9A20C5BBCF100F5FB72 /* BottomBorder.png */; };
     81                A22BC9A30C5BBCF100F5FB72 /* BottomBack.png in Resources */ = {isa = PBXBuildFile; fileRef = A22BC9A20C5BBCF100F5FB72 /* BottomBack.png */; };
     82                A22D3AA60D00D1790079CFED /* Turtle.png in Resources */ = {isa = PBXBuildFile; fileRef = A22D3AA30D00D1790079CFED /* Turtle.png */; };
     83                A22D3AA70D00D1790079CFED /* TurtleBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = A22D3AA40D00D1790079CFED /* TurtleBlue.png */; };
     84                A22D3AA80D00D1790079CFED /* TurtleGraphite.png in Resources */ = {isa = PBXBuildFile; fileRef = A22D3AA50D00D1790079CFED /* TurtleGraphite.png */; };
     85                A22D3AAE0D00D22A0079CFED /* ActionPopUp.png in Resources */ = {isa = PBXBuildFile; fileRef = A22D3AAD0D00D22A0079CFED /* ActionPopUp.png */; };
     86                A22D3ABA0D00D31F0079CFED /* BottomBackInactive.png in Resources */ = {isa = PBXBuildFile; fileRef = A22D3AB90D00D31F0079CFED /* BottomBackInactive.png */; };
    8387                A232D29E0A70903E00973B12 /* Filter.png in Resources */ = {isa = PBXBuildFile; fileRef = A232D29D0A70903E00973B12 /* Filter.png */; };
    8488                A234D0D20C79FB3600A82373 /* NSMenuAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A234D0D00C79FB3600A82373 /* NSMenuAdditions.m */; };
     
    8690                A2399CCD0CD3852300225B2B /* NSApplicationAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A2399CCC0CD3852300225B2B /* NSApplicationAdditions.m */; };
    8791                A241528B0C0261B8007DD3B4 /* Globe.png in Resources */ = {isa = PBXBuildFile; fileRef = A2FB06950BFF484A0095564D /* Globe.png */; };
    88                 A24600510A6DCE6600D19088 /* SpeedLimitButtonBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = A246004F0A6DCE6600D19088 /* SpeedLimitButtonBlue.png */; };
    89                 A24600520A6DCE6600D19088 /* SpeedLimitButtonGraphite.png in Resources */ = {isa = PBXBuildFile; fileRef = A24600500A6DCE6600D19088 /* SpeedLimitButtonGraphite.png */; };
    9092                A24621410C769D0900088E81 /* trevent.h in Headers */ = {isa = PBXBuildFile; fileRef = A24621350C769CF400088E81 /* trevent.h */; };
    9193                A24621420C769D0900088E81 /* trevent.c in Sources */ = {isa = PBXBuildFile; fileRef = A24621360C769CF400088E81 /* trevent.c */; };
     
    114116                A277DA0C0C693D9C00DA2CD4 /* ActionOff.png in Resources */ = {isa = PBXBuildFile; fileRef = A277DA0A0C693D9C00DA2CD4 /* ActionOff.png */; };
    115117                A28E1DBA0CFFD41800E16385 /* BottomBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = A28E1DB80CFFD41800E16385 /* BottomBarView.m */; };
    116                 A28E1E0A0D00555400E16385 /* ActionGear.png in Resources */ = {isa = PBXBuildFile; fileRef = A28E1E090D00555400E16385 /* ActionGear.png */; };
    117118                A28E1E160D00574A00E16385 /* ActionPopUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A28E1E150D00574A00E16385 /* ActionPopUpButton.m */; };
    118119                A2912C540A2956E80097A0CA /* PrefsWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = A2912C520A2956E80097A0CA /* PrefsWindow.nib */; };
     
    397398                A2085DDA0C53BC74000BC3B7 /* AboutWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AboutWindowController.m; path = macosx/AboutWindowController.m; sourceTree = "<group>"; };
    398399                A2085E2F0C53C833000BC3B7 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
    399                 A20AB97A0A5C622A004F81FA /* SmallTurtle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SmallTurtle.png; path = macosx/Images/SmallTurtle.png; sourceTree = "<group>"; };
    400400                A20B6F6A0C4D842B0034AB1D /* PriorityLow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityLow.png; path = macosx/Images/PriorityLow.png; sourceTree = "<group>"; };
    401401                A20B6F820C4D8A610034AB1D /* PriorityHigh.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityHigh.png; path = macosx/Images/PriorityHigh.png; sourceTree = "<group>"; };
     
    414414                A2265F3F0B5EF5F40093DDA5 /* FileNameCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FileNameCell.h; path = macosx/FileNameCell.h; sourceTree = "<group>"; };
    415415                A2265F400B5EF5F40093DDA5 /* FileNameCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = FileNameCell.m; path = macosx/FileNameCell.m; sourceTree = "<group>"; };
    416                 A22BC9A20C5BBCF100F5FB72 /* BottomBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BottomBorder.png; path = macosx/Images/BottomBorder.png; sourceTree = "<group>"; };
     416                A22BC9A20C5BBCF100F5FB72 /* BottomBack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BottomBack.png; path = macosx/Images/BottomBack.png; sourceTree = "<group>"; };
     417                A22D3AA30D00D1790079CFED /* Turtle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Turtle.png; path = macosx/Images/Turtle.png; sourceTree = "<group>"; };
     418                A22D3AA40D00D1790079CFED /* TurtleBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TurtleBlue.png; path = macosx/Images/TurtleBlue.png; sourceTree = "<group>"; };
     419                A22D3AA50D00D1790079CFED /* TurtleGraphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TurtleGraphite.png; path = macosx/Images/TurtleGraphite.png; sourceTree = "<group>"; };
     420                A22D3AAD0D00D22A0079CFED /* ActionPopUp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionPopUp.png; path = macosx/Images/ActionPopUp.png; sourceTree = "<group>"; };
     421                A22D3AB90D00D31F0079CFED /* BottomBackInactive.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BottomBackInactive.png; path = macosx/Images/BottomBackInactive.png; sourceTree = "<group>"; };
    417422                A232D29D0A70903E00973B12 /* Filter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Filter.png; path = macosx/Images/Filter.png; sourceTree = "<group>"; };
    418423                A234D0CF0C79FB3600A82373 /* NSMenuAdditions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NSMenuAdditions.h; path = macosx/NSMenuAdditions.h; sourceTree = "<group>"; };
     
    422427                A2399CCB0CD3852300225B2B /* NSApplicationAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSApplicationAdditions.h; path = macosx/NSApplicationAdditions.h; sourceTree = "<group>"; };
    423428                A2399CCC0CD3852300225B2B /* NSApplicationAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSApplicationAdditions.m; path = macosx/NSApplicationAdditions.m; sourceTree = "<group>"; };
    424                 A246004F0A6DCE6600D19088 /* SpeedLimitButtonBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButtonBlue.png; path = macosx/Images/SpeedLimitButtonBlue.png; sourceTree = "<group>"; };
    425                 A24600500A6DCE6600D19088 /* SpeedLimitButtonGraphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButtonGraphite.png; path = macosx/Images/SpeedLimitButtonGraphite.png; sourceTree = "<group>"; };
    426429                A24621350C769CF400088E81 /* trevent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = trevent.h; path = libtransmission/trevent.h; sourceTree = "<group>"; };
    427430                A24621360C769CF400088E81 /* trevent.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = trevent.c; path = libtransmission/trevent.c; sourceTree = "<group>"; };
     
    473476                A28E1DD50CFFD8A700E16385 /* BottomBarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BottomBarView.h; path = macosx/BottomBarView.h; sourceTree = "<group>"; };
    474477                A28E1DDF0CFFD8EC00E16385 /* ButtonToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ButtonToolbarItem.h; path = macosx/ButtonToolbarItem.h; sourceTree = "<group>"; };
    475                 A28E1E090D00555400E16385 /* ActionGear.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionGear.png; path = macosx/Images/ActionGear.png; sourceTree = "<group>"; };
    476478                A28E1E140D00574A00E16385 /* ActionPopUpButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ActionPopUpButton.h; path = macosx/ActionPopUpButton.h; sourceTree = "<group>"; };
    477479                A28E1E150D00574A00E16385 /* ActionPopUpButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ActionPopUpButton.m; path = macosx/ActionPopUpButton.m; sourceTree = "<group>"; };
     
    851853                                A2EF7DEB0C96297400FA9811 /* PurpleDot.png */,
    852854                                A2BC19840CA9AF5A00DD302A /* CompleteCheck.png */,
    853                                 A20AB97A0A5C622A004F81FA /* SmallTurtle.png */,
    854855                                A2D0E0480A54A97C003C72CF /* Bandwidth.png */,
    855856                                A21DFF0F0A292B2B007C5F76 /* Transfers.png */,
     
    862863                                A2F011980C27418800576FC0 /* CreateLarge.png */,
    863864                                4DF7500908A103AD007B0D70 /* Remove.png */,
     865                                A22D3AA30D00D1790079CFED /* Turtle.png */,
     866                                A22D3AA40D00D1790079CFED /* TurtleBlue.png */,
     867                                A22D3AA50D00D1790079CFED /* TurtleGraphite.png */,
    864868                                A277DA090C693D9C00DA2CD4 /* ActionOn.png */,
    865869                                A277DA0A0C693D9C00DA2CD4 /* ActionOff.png */,
    866                                 A28E1E090D00555400E16385 /* ActionGear.png */,
     870                                A22D3AAD0D00D22A0079CFED /* ActionPopUp.png */,
    867871                                35B037F90AC5B53800A10FDF /* ResumeNoWaitOn.png */,
    868872                                35B037FA0AC5B53800A10FDF /* ResumeNoWaitOff.png */,
     
    881885                                A25FCDDD0A37695F002BCBBE /* PauseSelected.png */,
    882886                                A25FCDDE0A37695F002BCBBE /* ResumeSelected.png */,
    883                                 A22BC9A20C5BBCF100F5FB72 /* BottomBorder.png */,
    884                                 A246004F0A6DCE6600D19088 /* SpeedLimitButtonBlue.png */,
    885                                 A24600500A6DCE6600D19088 /* SpeedLimitButtonGraphite.png */,
     887                                A22BC9A20C5BBCF100F5FB72 /* BottomBack.png */,
     888                                A22D3AB90D00D31F0079CFED /* BottomBackInactive.png */,
    886889                                A232D29D0A70903E00973B12 /* Filter.png */,
    887890                                A2F151210CD438DE001F3B0E /* InfoTabBorder.png */,
     
    14531456                                A25FCDF00A3769AC002BCBBE /* ResumeSelected.png in Resources */,
    14541457                                A2D0E0490A54A97C003C72CF /* Bandwidth.png in Resources */,
    1455                                 A20AB97B0A5C622A004F81FA /* SmallTurtle.png in Resources */,
    1456                                 A24600510A6DCE6600D19088 /* SpeedLimitButtonBlue.png in Resources */,
    1457                                 A24600520A6DCE6600D19088 /* SpeedLimitButtonGraphite.png in Resources */,
    14581458                                A232D29E0A70903E00973B12 /* Filter.png in Resources */,
    14591459                                A259317E0A73B2CC002F4FE7 /* TransmissionHelp in Resources */,
     
    14711471                                A20B6FAE0C4D9B040034AB1D /* PriorityNormal.png in Resources */,
    14721472                                A2085E3F0C53C949000BC3B7 /* LICENSE in Resources */,
    1473                                 A22BC9A30C5BBCF100F5FB72 /* BottomBorder.png in Resources */,
     1473                                A22BC9A30C5BBCF100F5FB72 /* BottomBack.png in Resources */,
    14741474                                A2AE68330C628A35008753C9 /* Creator.nib in Resources */,
    14751475                                A277DA0B0C693D9C00DA2CD4 /* ActionOn.png in Resources */,
     
    14951495                                A25892770CF1FCE800CCCDDF /* StatsWindow.xib in Resources */,
    14961496                                A2E165C80CFE45AF0047F575 /* QuittingWindow.xib in Resources */,
    1497                                 A28E1E0A0D00555400E16385 /* ActionGear.png in Resources */,
     1497                                A22D3AA60D00D1790079CFED /* Turtle.png in Resources */,
     1498                                A22D3AA70D00D1790079CFED /* TurtleBlue.png in Resources */,
     1499                                A22D3AA80D00D1790079CFED /* TurtleGraphite.png in Resources */,
     1500                                A22D3AAE0D00D22A0079CFED /* ActionPopUp.png in Resources */,
     1501                                A22D3ABA0D00D31F0079CFED /* BottomBackInactive.png in Resources */,
    14981502                        );
    14991503                        runOnlyForDeploymentPostprocessing = 0;
  • trunk/macosx/ActionPopUpButton.m

    r4020 r4023  
    3131        if ((self = [super initWithCoder: coder]))
    3232    {
    33         fImage = [NSImage imageNamed: @"ActionGear.png"];
     33        fImage = [NSImage imageNamed: @"ActionPopUp.png"];
     34        [fImage setFlipped: YES];
    3435        }
    3536        return self;
     
    4142   
    4243    NSSize imageSize = [fImage size];
    43     NSRect imageRect = NSMakeRect(rect.origin.x + 4.0, rect.origin.y + (rect.size.height - imageSize.height) * 0.5,
    44                                     imageSize.width, imageSize.height);
     44    NSRect imageRect = NSMakeRect(rect.origin.x + (rect.size.width - imageSize.width) * 0.5,
     45                        rect.origin.y + (rect.size.height - imageSize.height) * 0.5, imageSize.width, imageSize.height);
    4546   
    4647        [fImage drawInRect: imageRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0];
  • trunk/macosx/BottomBarView.h

    r4020 r4023  
    2727@interface BottomBarView : NSView
    2828{
    29     NSColor * fBackgroundColor;
     29    NSColor * fBackgroundColor, * fBackgroundInactiveColor;
    3030}
    3131
  • trunk/macosx/BottomBarView.m

    r4020 r4023  
    3333    {
    3434        if ([NSApp isOnLeopardOrBetter])
    35             fBackgroundColor = [[NSColor colorWithPatternImage: [NSImage imageNamed: @"BottomBorder.png"]] retain];
     35        {
     36            fBackgroundColor = [[NSColor colorWithPatternImage: [NSImage imageNamed: @"BottomBack.png"]] retain];
     37            fBackgroundInactiveColor = [[NSColor colorWithPatternImage: [NSImage imageNamed: @"BottomBackInactive.png"]] retain];
     38        }
    3639    }
    3740    return self;
     
    4144{
    4245    [fBackgroundColor release];
     46    [fBackgroundInactiveColor release];
    4347    [super dealloc];
    4448}
     
    4650- (BOOL) isOpaque
    4751{
    48     return [NSApp isOnLeopardOrBetter] && [[self window] isMainWindow];
     52    return [NSApp isOnLeopardOrBetter];
    4953}
    5054
     
    5660- (void) drawRect: (NSRect) rect
    5761{
    58     if ([NSApp isOnLeopardOrBetter] && [[self window] isMainWindow])
     62    if ([NSApp isOnLeopardOrBetter])
    5963    {
    60         [fBackgroundColor set];
     64        NSColor * color = [[self window] isMainWindow] ? fBackgroundColor : fBackgroundInactiveColor;
     65        [color set];
     66       
    6167        [[NSGraphicsContext currentContext] setPatternPhase: [self frame].origin];
    6268        NSRectFill([self bounds]);
  • trunk/macosx/Controller.m

    r4022 r4023  
    19161916    if ([fDefaults boolForKey: @"SpeedLimit"])
    19171917        [fSpeedLimitButton setImage: [NSColor currentControlTint] == NSGraphiteControlTint
    1918             ? [NSImage imageNamed: @"SpeedLimitButtonGraphite.png"] : [NSImage imageNamed: @"SpeedLimitButtonBlue.png"]];
     1918            ? [NSImage imageNamed: @"TurtleGraphite.png"] : [NSImage imageNamed: @"TurtleBlue.png"]];
    19191919}
    19201920
  • trunk/macosx/English.lproj/MainMenu.nib/info.nib

    r4020 r4023  
    1111        <key>IBOpenObjects</key>
    1212        <array>
    13                 <integer>2351</integer>
     13                <integer>2</integer>
    1414        </array>
    1515        <key>IBSystem Version</key>
  • trunk/macosx/SpeedLimitToTurtleIconTransformer.m

    r4020 r4023  
    4343   
    4444    return [value boolValue] ? ([NSColor currentControlTint] == NSGraphiteControlTint
    45             ? [NSImage imageNamed: @"SpeedLimitButtonGraphite.png"] : [NSImage imageNamed: @"SpeedLimitButtonBlue.png"])
    46             : [NSImage imageNamed: @"SmallTurtle.png"];
     45            ? [NSImage imageNamed: @"TurtleGraphite.png"] : [NSImage imageNamed: @"TurtleBlue.png"])
     46            : [NSImage imageNamed: @"Turtle.png"];
    4747}
    4848
  • trunk/macosx/TorrentTableView.m

    r3975 r4023  
    9494    [cell setRepresentedObject: [fTorrents objectAtIndex: row]];
    9595}
    96 
    9796
    9897- (NSString *) tableView: (NSTableView *) tableView typeSelectStringForTableColumn: (NSTableColumn *) tableColumn row: (int) row
Note: See TracChangeset for help on using the changeset viewer.