Changeset 4020


Ignore:
Timestamp:
Nov 30, 2007, 4:17:43 PM (14 years ago)
Author:
livings124
Message:

change up the bottom of the window, similar to Second Gear

Location:
trunk
Files:
3 added
5 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/NEWS

    r4003 r4020  
    1010- OS X:
    1111   + Statistics window
    12    + Leopard: Time Machine will ignore incomplete downloads
    1312   + Pieces Bar (return of Advanced Bar)
    1413   + Availability Bar (overlay on regular bar)
     14   + Redesigned Leopard-like look
     15   + Leopard: Time Machine will ignore incomplete downloads
    1516   + Display remaining time for seeding transfers
    1617   + Sort by total activity

  • trunk/Transmission.xcodeproj/project.pbxproj

    r4013 r4020  
    7575                A21567ED0A9A5034004DECD6 /* MessageWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = A21567EB0A9A5034004DECD6 /* MessageWindow.nib */; };
    7676                A215760B0C0D449A0057A26A /* NSBezierPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A21576090C0D449A0057A26A /* NSBezierPathAdditions.m */; };
    77                 A2173E1C0A33C1B300B0D8AB /* ActionButtonPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.png */; };
    7877                A21DFF100A292B2B007C5F76 /* Transfers.png in Resources */ = {isa = PBXBuildFile; fileRef = A21DFF0F0A292B2B007C5F76 /* Transfers.png */; };
    7978                A21F5B890AF25FB6008CE5CE /* ActionMenuRatioToDisplayRatioTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = A21F5B870AF25FB6008CE5CE /* ActionMenuRatioToDisplayRatioTransformer.m */; };
    … …  
    8786                A2399CCD0CD3852300225B2B /* NSApplicationAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A2399CCC0CD3852300225B2B /* NSApplicationAdditions.m */; };
    8887                A241528B0C0261B8007DD3B4 /* Globe.png in Resources */ = {isa = PBXBuildFile; fileRef = A2FB06950BFF484A0095564D /* Globe.png */; };
    89                 A246004D0A6DCE4600D19088 /* SpeedLimitButtonPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A246004C0A6DCE4600D19088 /* SpeedLimitButtonPressed.png */; };
    9088                A24600510A6DCE6600D19088 /* SpeedLimitButtonBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = A246004F0A6DCE6600D19088 /* SpeedLimitButtonBlue.png */; };
    9189                A24600520A6DCE6600D19088 /* SpeedLimitButtonGraphite.png in Resources */ = {isa = PBXBuildFile; fileRef = A24600500A6DCE6600D19088 /* SpeedLimitButtonGraphite.png */; };
    … …  
    9391                A24621420C769D0900088E81 /* trevent.c in Sources */ = {isa = PBXBuildFile; fileRef = A24621360C769CF400088E81 /* trevent.c */; };
    9492                A24872B60C9B6BB9000F5B92 /* Advanced.png in Resources */ = {isa = PBXBuildFile; fileRef = A24872B50C9B6BB9000F5B92 /* Advanced.png */; };
    95                 A24999230B49F1B5001EADA3 /* ActionPopUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A24999210B49F1B5001EADA3 /* ActionPopUpButton.m */; };
    9693                A24D2A640C0A624600A0ED9F /* IPCController.m in Sources */ = {isa = PBXBuildFile; fileRef = A24D2A620C0A624600A0ED9F /* IPCController.m */; };
    9794                A24F19080A3A790800C9C145 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A24F19070A3A790800C9C145 /* Sparkle.framework */; };
    … …  
    116113                A277DA0B0C693D9C00DA2CD4 /* ActionOn.png in Resources */ = {isa = PBXBuildFile; fileRef = A277DA090C693D9C00DA2CD4 /* ActionOn.png */; };
    117114                A277DA0C0C693D9C00DA2CD4 /* ActionOff.png in Resources */ = {isa = PBXBuildFile; fileRef = A277DA0A0C693D9C00DA2CD4 /* ActionOff.png */; };
    118                 A289EB0C0A33C56D00B082A3 /* ButtonBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */; };
    119                 A28DBADC0A33C1D800F4B4A7 /* ActionButton.png in Resources */ = {isa = PBXBuildFile; fileRef = A28DBADB0A33C1D800F4B4A7 /* ActionButton.png */; };
     115                A28E1DBA0CFFD41800E16385 /* BottomBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = A28E1DB80CFFD41800E16385 /* BottomBarView.m */; };
     116                A28E1E0A0D00555400E16385 /* ActionGear.png in Resources */ = {isa = PBXBuildFile; fileRef = A28E1E090D00555400E16385 /* ActionGear.png */; };
     117                A28E1E160D00574A00E16385 /* ActionPopUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A28E1E150D00574A00E16385 /* ActionPopUpButton.m */; };
    120118                A2912C540A2956E80097A0CA /* PrefsWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = A2912C520A2956E80097A0CA /* PrefsWindow.nib */; };
    121119                A29B0C270BD15FEF0006F230 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = A2F8951E0A2D4BA500ED2127 /* Credits.rtf */; };
    … …  
    156154                A2F151260CD438DE001F3B0E /* InfoTabBackBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F151230CD438DE001F3B0E /* InfoTabBackBlue.png */; };
    157155                A2F40AE40A361C00006B8288 /* Transmission.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D2784360905709500687951 /* Transmission.icns */; };
    158                 A2F6DB090A55F31C0058D1E5 /* SpeedLimitButton.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F6DB070A55F31C0058D1E5 /* SpeedLimitButton.png */; };
    159156                A2FB057F0BFEB6800095564D /* DragOverlayView.m in Sources */ = {isa = PBXBuildFile; fileRef = A2FB057D0BFEB6800095564D /* DragOverlayView.m */; };
    160157                A2FE61D80CD3D0A500D683E1 /* InfoTabBackGraphite.png in Resources */ = {isa = PBXBuildFile; fileRef = A2FE61D70CD3D0A500D683E1 /* InfoTabBackGraphite.png */; };
    … …  
    410407                A21576090C0D449A0057A26A /* NSBezierPathAdditions.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NSBezierPathAdditions.m; path = macosx/NSBezierPathAdditions.m; sourceTree = "<group>"; };
    411408                A215760A0C0D449A0057A26A /* NSBezierPathAdditions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NSBezierPathAdditions.h; path = macosx/NSBezierPathAdditions.h; sourceTree = "<group>"; };
    412                 A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionButtonPressed.png; path = macosx/Images/ActionButtonPressed.png; sourceTree = "<group>"; };
    413409                A21DFF0F0A292B2B007C5F76 /* Transfers.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Transfers.png; path = macosx/Images/Transfers.png; sourceTree = "<group>"; };
    414410                A21F5B860AF25FB6008CE5CE /* ActionMenuRatioToDisplayRatioTransformer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ActionMenuRatioToDisplayRatioTransformer.h; path = macosx/ActionMenuRatioToDisplayRatioTransformer.h; sourceTree = "<group>"; };
    … …  
    426422                A2399CCB0CD3852300225B2B /* NSApplicationAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSApplicationAdditions.h; path = macosx/NSApplicationAdditions.h; sourceTree = "<group>"; };
    427423                A2399CCC0CD3852300225B2B /* NSApplicationAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSApplicationAdditions.m; path = macosx/NSApplicationAdditions.m; sourceTree = "<group>"; };
    428                 A246004C0A6DCE4600D19088 /* SpeedLimitButtonPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButtonPressed.png; path = macosx/Images/SpeedLimitButtonPressed.png; sourceTree = "<group>"; };
    429424                A246004F0A6DCE6600D19088 /* SpeedLimitButtonBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButtonBlue.png; path = macosx/Images/SpeedLimitButtonBlue.png; sourceTree = "<group>"; };
    430425                A24600500A6DCE6600D19088 /* SpeedLimitButtonGraphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButtonGraphite.png; path = macosx/Images/SpeedLimitButtonGraphite.png; sourceTree = "<group>"; };
    … …  
    432427                A24621360C769CF400088E81 /* trevent.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = trevent.c; path = libtransmission/trevent.c; sourceTree = "<group>"; };
    433428                A24872B50C9B6BB9000F5B92 /* Advanced.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Advanced.png; path = macosx/Images/Advanced.png; sourceTree = "<group>"; };
    434                 A24999200B49F1B5001EADA3 /* ActionPopUpButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ActionPopUpButton.h; path = macosx/ActionPopUpButton.h; sourceTree = "<group>"; };
    435                 A24999210B49F1B5001EADA3 /* ActionPopUpButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ActionPopUpButton.m; path = macosx/ActionPopUpButton.m; sourceTree = "<group>"; };
    436429                A24D2A610C0A624600A0ED9F /* IPCController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = IPCController.h; path = macosx/IPCController.h; sourceTree = "<group>"; };
    437430                A24D2A620C0A624600A0ED9F /* IPCController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = IPCController.m; path = macosx/IPCController.m; sourceTree = "<group>"; };
    … …  
    477470                A277DA090C693D9C00DA2CD4 /* ActionOn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionOn.png; path = macosx/Images/ActionOn.png; sourceTree = "<group>"; };
    478471                A277DA0A0C693D9C00DA2CD4 /* ActionOff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionOff.png; path = macosx/Images/ActionOff.png; sourceTree = "<group>"; };
    479                 A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ButtonBorder.png; path = macosx/Images/ButtonBorder.png; sourceTree = "<group>"; };
    480                 A28DBADB0A33C1D800F4B4A7 /* ActionButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionButton.png; path = macosx/Images/ActionButton.png; sourceTree = "<group>"; };
     472                A28E1DB80CFFD41800E16385 /* BottomBarView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BottomBarView.m; path = macosx/BottomBarView.m; sourceTree = "<group>"; };
     473                A28E1DD50CFFD8A700E16385 /* BottomBarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BottomBarView.h; path = macosx/BottomBarView.h; sourceTree = "<group>"; };
     474                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>"; };
     476                A28E1E140D00574A00E16385 /* ActionPopUpButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ActionPopUpButton.h; path = macosx/ActionPopUpButton.h; sourceTree = "<group>"; };
     477                A28E1E150D00574A00E16385 /* ActionPopUpButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ActionPopUpButton.m; path = macosx/ActionPopUpButton.m; sourceTree = "<group>"; };
    481478                A29C8B340ACC6EB3000ED9F9 /* PortChecker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PortChecker.h; path = macosx/PortChecker.h; sourceTree = "<group>"; };
    482479                A29C8B350ACC6EB3000ED9F9 /* PortChecker.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PortChecker.m; path = macosx/PortChecker.m; sourceTree = "<group>"; };
    … …  
    505502                A2BF078E0B066E0800757C92 /* SpeedLimitToTurtleIconTransformer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SpeedLimitToTurtleIconTransformer.h; path = macosx/SpeedLimitToTurtleIconTransformer.h; sourceTree = "<group>"; };
    506503                A2BF078F0B066E0800757C92 /* SpeedLimitToTurtleIconTransformer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = SpeedLimitToTurtleIconTransformer.m; path = macosx/SpeedLimitToTurtleIconTransformer.m; sourceTree = "<group>"; };
    507                 A2C89D5E0CFCBF57004CC2BC /* ButtonToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ButtonToolbarItem.h; path = macosx/ButtonToolbarItem.h; sourceTree = "<group>"; };
    508504                A2C89D5F0CFCBF57004CC2BC /* ButtonToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ButtonToolbarItem.m; path = macosx/ButtonToolbarItem.m; sourceTree = "<group>"; };
    509505                A2D0E0480A54A97C003C72CF /* Bandwidth.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Bandwidth.png; path = macosx/Images/Bandwidth.png; sourceTree = "<group>"; };
    … …  
    551547                A2F151220CD438DE001F3B0E /* InfoTabBack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = InfoTabBack.png; path = macosx/Images/InfoTabBack.png; sourceTree = "<group>"; };
    552548                A2F151230CD438DE001F3B0E /* InfoTabBackBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = InfoTabBackBlue.png; path = macosx/Images/InfoTabBackBlue.png; sourceTree = "<group>"; };
    553                 A2F6DB070A55F31C0058D1E5 /* SpeedLimitButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButton.png; path = macosx/Images/SpeedLimitButton.png; sourceTree = "<group>"; };
    554549                A2F8951E0A2D4BA500ED2127 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = macosx/Credits.rtf; sourceTree = "<group>"; };
    555550                A2FB057C0BFEB6800095564D /* DragOverlayView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DragOverlayView.h; path = macosx/DragOverlayView.h; sourceTree = "<group>"; };
    … …  
    747742                                4DCCBB3D09C3D71100D3CABF /* TorrentCell.h */,
    748743                                4DCCBB3C09C3D71100D3CABF /* TorrentCell.m */,
    749                                 A24999200B49F1B5001EADA3 /* ActionPopUpButton.h */,
    750                                 A24999210B49F1B5001EADA3 /* ActionPopUpButton.m */,
    751744                                A2BF078E0B066E0800757C92 /* SpeedLimitToTurtleIconTransformer.h */,
    752745                                A2BF078F0B066E0800757C92 /* SpeedLimitToTurtleIconTransformer.m */,
    … …  
    759752                                A25E74470AF5089E006F11AE /* ExpandedPathToIconTransformer.h */,
    760753                                A25E74460AF5089E006F11AE /* ExpandedPathToIconTransformer.m */,
    761                                 A2C89D5E0CFCBF57004CC2BC /* ButtonToolbarItem.h */,
    762                                 A2C89D5F0CFCBF57004CC2BC /* ButtonToolbarItem.m */,
     754                                A28E1E140D00574A00E16385 /* ActionPopUpButton.h */,
     755                                A28E1E150D00574A00E16385 /* ActionPopUpButton.m */,
    763756                                4DE5CCA50980735700BE280E /* Badger.h */,
    764757                                4DE5CCA60980735700BE280E /* Badger.m */,
    … …  
    785778                                A2ED7D8D0CEF431B00970975 /* FilterButton.h */,
    786779                                A2ED7D8E0CEF431B00970975 /* FilterButton.m */,
     780                                A28E1DB80CFFD41800E16385 /* BottomBarView.m */,
     781                                A28E1DD50CFFD8A700E16385 /* BottomBarView.h */,
     782                                A2C89D5F0CFCBF57004CC2BC /* ButtonToolbarItem.m */,
     783                                A28E1DDF0CFFD8EC00E16385 /* ButtonToolbarItem.h */,
    787784                                A257C17F0CAD3003004E121C /* PeerTableView.h */,
    788785                                A257C1800CAD3003004E121C /* PeerTableView.m */,
    … …  
    867864                                A277DA090C693D9C00DA2CD4 /* ActionOn.png */,
    868865                                A277DA0A0C693D9C00DA2CD4 /* ActionOff.png */,
     866                                A28E1E090D00555400E16385 /* ActionGear.png */,
    869867                                35B037F90AC5B53800A10FDF /* ResumeNoWaitOn.png */,
    870868                                35B037FA0AC5B53800A10FDF /* ResumeNoWaitOff.png */,
    … …  
    884882                                A25FCDDE0A37695F002BCBBE /* ResumeSelected.png */,
    885883                                A22BC9A20C5BBCF100F5FB72 /* BottomBorder.png */,
    886                                 A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */,
    887                                 A28DBADB0A33C1D800F4B4A7 /* ActionButton.png */,
    888                                 A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.png */,
    889884                                A246004F0A6DCE6600D19088 /* SpeedLimitButtonBlue.png */,
    890885                                A24600500A6DCE6600D19088 /* SpeedLimitButtonGraphite.png */,
    891                                 A2F6DB070A55F31C0058D1E5 /* SpeedLimitButton.png */,
    892                                 A246004C0A6DCE4600D19088 /* SpeedLimitButtonPressed.png */,
    893886                                A232D29D0A70903E00973B12 /* Filter.png */,
    894887                                A2F151210CD438DE001F3B0E /* InfoTabBorder.png */,
    … …  
    14561449                                A2912C540A2956E80097A0CA /* PrefsWindow.nib in Resources */,
    14571450                                A29B0C270BD15FEF0006F230 /* Credits.rtf in Resources */,
    1458                                 A2173E1C0A33C1B300B0D8AB /* ActionButtonPressed.png in Resources */,
    1459                                 A28DBADC0A33C1D800F4B4A7 /* ActionButton.png in Resources */,
    1460                                 A289EB0C0A33C56D00B082A3 /* ButtonBorder.png in Resources */,
    14611451                                A2F40AE40A361C00006B8288 /* Transmission.icns in Resources */,
    14621452                                A25FCDEF0A3769A6002BCBBE /* PauseSelected.png in Resources */,
    14631453                                A25FCDF00A3769AC002BCBBE /* ResumeSelected.png in Resources */,
    14641454                                A2D0E0490A54A97C003C72CF /* Bandwidth.png in Resources */,
    1465                                 A2F6DB090A55F31C0058D1E5 /* SpeedLimitButton.png in Resources */,
    14661455                                A20AB97B0A5C622A004F81FA /* SmallTurtle.png in Resources */,
    1467                                 A246004D0A6DCE4600D19088 /* SpeedLimitButtonPressed.png in Resources */,
    14681456                                A24600510A6DCE6600D19088 /* SpeedLimitButtonBlue.png in Resources */,
    14691457                                A24600520A6DCE6600D19088 /* SpeedLimitButtonGraphite.png in Resources */,
    … …  
    15071495                                A25892770CF1FCE800CCCDDF /* StatsWindow.xib in Resources */,
    15081496                                A2E165C80CFE45AF0047F575 /* QuittingWindow.xib in Resources */,
     1497                                A28E1E0A0D00555400E16385 /* ActionGear.png in Resources */,
    15091498                        );
    15101499                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    16201609                                A25E74660AF5097D006F11AE /* ExpandedPathToIconTransformer.m in Sources */,
    16211610                                A2BF07910B066E0800757C92 /* SpeedLimitToTurtleIconTransformer.m in Sources */,
    1622                                 A24999230B49F1B5001EADA3 /* ActionPopUpButton.m in Sources */,
    16231611                                A2265F420B5EF5F40093DDA5 /* FileNameCell.m in Sources */,
    16241612                                A2A1CB7A0BF29D5500AE959F /* PeerProgressIndicatorCell.m in Sources */,
    … …  
    16421630                                A2C89D600CFCBF57004CC2BC /* ButtonToolbarItem.m in Sources */,
    16431631                                A2E165BC0CFE44250047F575 /* QuittingWindowController.m in Sources */,
     1632                                A28E1DBA0CFFD41800E16385 /* BottomBarView.m in Sources */,
     1633                                A28E1E160D00574A00E16385 /* ActionPopUpButton.m in Sources */,
    16441634                        );
    16451635                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/macosx/ActionPopUpButton.h

    r3083 r4020  
    2727@interface ActionPopUpButton : NSPopUpButton
    2828{
    29     NSImage * fImage, * fImagePressed;
     29    NSImage * fImage;
    3030}
    3131@end

  • trunk/macosx/ActionPopUpButton.m

    r3754 r4020  
    2525#import "ActionPopUpButton.h"
    2626
    27 #warning needed?
    28 
    2927@implementation ActionPopUpButton
    3028
    … …  
    3331        if ((self = [super initWithCoder: coder]))
    3432    {
    35         fImage = [NSImage imageNamed: @"ActionButton.png"];
    36         [fImage setFlipped: YES];
    37         fImagePressed = [NSImage imageNamed: @"ActionButtonPressed.png"];
    38         [fImagePressed setFlipped: YES];
     33        fImage = [NSImage imageNamed: @"ActionGear.png"];
    3934        }
    4035        return self;
    … …  
    4338- (void) drawRect: (NSRect) rect
    4439{
    45     NSImage * image = [[self cell] isHighlighted] ? fImagePressed : fImage;
    46         [image drawInRect: [self bounds] fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0];
     40    [super drawRect: rect];
     41   
     42    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);
     45   
     46        [fImage drawInRect: imageRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0];
    4747}
    4848

  • trunk/macosx/Controller.m

    r4017 r4020  
    259259    [fStatusBar setFrameOrigin: NSMakePoint(0, NSMaxY([contentView frame]))];
    260260    [self showStatusBar: [fDefaults boolForKey: @"StatusBar"] animate: NO];
    261 
     261   
    262262    [fActionButton setToolTip: NSLocalizedString(@"Shortcuts for changing global settings.",
    263263                                "Main window -> 1st bottom left button (action) tooltip")];
    … …  
    14041404                tr_torrentRates(fLib, & downloadRate, & uploadRate);
    14051405               
    1406                 [fTotalDLField setStringValue: [NSLocalizedString(@"Total DL: ", "Status bar -> total download")
     1406                [fTotalDLField setStringValue: [NSLocalizedString(@"DL: ", "Status bar -> total download")
    14071407                                                stringByAppendingString: [NSString stringForSpeed: downloadRate]]];
    1408                 [fTotalULField setStringValue: [NSLocalizedString(@"Total UL: ", "Status bar -> total upload")
     1408                [fTotalULField setStringValue: [NSLocalizedString(@"UL: ", "Status bar -> total upload")
    14091409                                                stringByAppendingString: [NSString stringForSpeed: uploadRate]]];
    14101410            }

  • trunk/macosx/English.lproj/MainMenu.nib/classes.nib

    r3886 r4020  
    1212                        <key>SUPERCLASS</key>
    1313                        <string>NSResponder</string>
     14                </dict>
     15                <dict>
     16                        <key>CLASS</key>
     17                        <string>BottomBarView</string>
     18                        <key>LANGUAGE</key>
     19                        <string>ObjC</string>
     20                        <key>SUPERCLASS</key>
     21                        <string>NSView</string>
    1422                </dict>
    1523                <dict>

  • trunk/macosx/English.lproj/MainMenu.nib/info.nib

    r3946 r4020  
    1111        <key>IBOpenObjects</key>
    1212        <array>
    13                 <integer>1639</integer>
     13                <integer>2351</integer>
    1414        </array>
    1515        <key>IBSystem Version</key>

  • trunk/macosx/SpeedLimitToTurtleIconTransformer.m

    r3464 r4020  
    4444    return [value boolValue] ? ([NSColor currentControlTint] == NSGraphiteControlTint
    4545            ? [NSImage imageNamed: @"SpeedLimitButtonGraphite.png"] : [NSImage imageNamed: @"SpeedLimitButtonBlue.png"])
    46             : [NSImage imageNamed: @"SpeedLimitButton.png"];
     46            : [NSImage imageNamed: @"SmallTurtle.png"];
    4747}
    4848
Note: See TracChangeset for help on using the changeset viewer.