diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index 87939ba25..483c490fc 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -78,7 +78,7 @@ A200B9200A22798F007BBB1E /* InfoWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A200B83A0A2263BA007BBB1E /* InfoWindowController.m */; }; A200B9B60A22893D007BBB1E /* InfoWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = A200B9620A227FD0007BBB1E /* InfoWindow.nib */; }; A21610FC0A050B1700E8E4C1 /* MenuButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A21610FB0A050B1700E8E4C1 /* MenuButton.m */; }; - A2173E1C0A33C1B300B0D8AB /* ActionButtonPressed.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.tiff */; }; + A2173E1C0A33C1B300B0D8AB /* ActionButtonPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.png */; }; A21DFF100A292B2B007C5F76 /* Transfers.png in Resources */ = {isa = PBXBuildFile; fileRef = A21DFF0F0A292B2B007C5F76 /* Transfers.png */; }; A2305A800A3DC9E400AB2D77 /* ProgressBarWhite.png in Resources */ = {isa = PBXBuildFile; fileRef = A2305A7C0A3DC9E400AB2D77 /* ProgressBarWhite.png */; }; A2305A810A3DC9E400AB2D77 /* ProgressBarBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = A2305A7D0A3DC9E400AB2D77 /* ProgressBarBlue.png */; }; @@ -99,13 +99,13 @@ A25FCDF00A3769AC002BCBBE /* ResumeSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = A25FCDDE0A37695F002BCBBE /* ResumeSelected.png */; }; A26D450B0A0503AC00A10BB3 /* peermessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D1838A309DEC0430047D688 /* peermessages.h */; }; A27A53570A06A76400E1F16F /* StatusSep.png in Resources */ = {isa = PBXBuildFile; fileRef = A27A53560A06A76400E1F16F /* StatusSep.png */; }; - A27A53660A06AEDB00E1F16F /* StatusBorder.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A27A53650A06AEDB00E1F16F /* StatusBorder.tiff */; }; - A289EB0C0A33C56D00B082A3 /* ButtonBorder.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A289EB0B0A33C56D00B082A3 /* ButtonBorder.tiff */; }; - A28DBADC0A33C1D800F4B4A7 /* ActionButton.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A28DBADB0A33C1D800F4B4A7 /* ActionButton.tiff */; }; + A27A53660A06AEDB00E1F16F /* StatusBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A27A53650A06AEDB00E1F16F /* StatusBorder.png */; }; + A289EB0C0A33C56D00B082A3 /* ButtonBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */; }; + A28DBADC0A33C1D800F4B4A7 /* ActionButton.png in Resources */ = {isa = PBXBuildFile; fileRef = A28DBADB0A33C1D800F4B4A7 /* ActionButton.png */; }; A2912C540A2956E80097A0CA /* PrefsWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = A2912C520A2956E80097A0CA /* PrefsWindow.nib */; }; A2AF1C390A3D0F6200F1575D /* FileTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = A2AF1C370A3D0F6200F1575D /* FileTableView.m */; }; A2BD40070A09BBEA008CCE96 /* bencode.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D1838B709DEC0430047D688 /* bencode.h */; }; - A2C655650A04FEDC00E9FD82 /* BottomBorder.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2C655640A04FEDC00E9FD82 /* BottomBorder.tiff */; }; + A2C655650A04FEDC00E9FD82 /* BottomBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A2C655640A04FEDC00E9FD82 /* BottomBorder.png */; }; A2F40AE40A361C00006B8288 /* Transmission.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D2784360905709500687951 /* Transmission.icns */; }; A2F8951F0A2D4BA500ED2127 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = A2F8951E0A2D4BA500ED2127 /* Credits.rtf */; }; /* End PBXBuildFile section */ @@ -258,7 +258,7 @@ A200B9630A227FD0007BBB1E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = macosx/English.lproj/InfoWindow.nib; sourceTree = ""; }; A21610FA0A050B1700E8E4C1 /* MenuButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MenuButton.h; path = macosx/MenuButton.h; sourceTree = ""; }; A21610FB0A050B1700E8E4C1 /* MenuButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = MenuButton.m; path = macosx/MenuButton.m; sourceTree = ""; }; - A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ActionButtonPressed.tiff; path = macosx/Images/ActionButtonPressed.tiff; sourceTree = ""; }; + A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionButtonPressed.png; path = macosx/Images/ActionButtonPressed.png; sourceTree = ""; }; A21DFF0F0A292B2B007C5F76 /* Transfers.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Transfers.png; path = macosx/Images/Transfers.png; sourceTree = ""; }; A2305A7C0A3DC9E400AB2D77 /* ProgressBarWhite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarWhite.png; path = macosx/Images/ProgressBarWhite.png; sourceTree = ""; }; A2305A7D0A3DC9E400AB2D77 /* ProgressBarBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarBlue.png; path = macosx/Images/ProgressBarBlue.png; sourceTree = ""; }; @@ -277,15 +277,15 @@ A25FCDDE0A37695F002BCBBE /* ResumeSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ResumeSelected.png; path = macosx/Images/ResumeSelected.png; sourceTree = ""; }; A27A53420A06A62500E1F16F /* StatusSep.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StatusSep.png; path = macosx/Images/StatusSep.png; sourceTree = ""; }; A27A53560A06A76400E1F16F /* StatusSep.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StatusSep.png; path = macosx/Images/StatusSep.png; sourceTree = ""; }; - A27A53640A06AED200E1F16F /* StatusBorder.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = StatusBorder.tiff; path = macosx/Images/StatusBorder.tiff; sourceTree = ""; }; - A27A53650A06AEDB00E1F16F /* StatusBorder.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = StatusBorder.tiff; path = macosx/Images/StatusBorder.tiff; sourceTree = ""; }; - A289EB0B0A33C56D00B082A3 /* ButtonBorder.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ButtonBorder.tiff; path = macosx/Images/ButtonBorder.tiff; sourceTree = ""; }; - A28DBADB0A33C1D800F4B4A7 /* ActionButton.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ActionButton.tiff; path = macosx/Images/ActionButton.tiff; sourceTree = ""; }; + A27A53640A06AED200E1F16F /* StatusBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StatusBorder.png; path = macosx/Images/StatusBorder.png; sourceTree = ""; }; + A27A53650A06AEDB00E1F16F /* StatusBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StatusBorder.png; path = macosx/Images/StatusBorder.png; sourceTree = ""; }; + A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ButtonBorder.png; path = macosx/Images/ButtonBorder.png; sourceTree = ""; }; + A28DBADB0A33C1D800F4B4A7 /* ActionButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionButton.png; path = macosx/Images/ActionButton.png; sourceTree = ""; }; A2912C530A2956E80097A0CA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = macosx/English.lproj/PrefsWindow.nib; sourceTree = ""; }; - A2A84AD20A04FCDC00C898D4 /* BottomBorder.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = BottomBorder.tiff; path = macosx/Images/BottomBorder.tiff; sourceTree = ""; }; + A2A84AD20A04FCDC00C898D4 /* BottomBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BottomBorder.png; path = macosx/Images/BottomBorder.png; sourceTree = ""; }; A2AF1C360A3D0F6200F1575D /* FileTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FileTableView.h; path = macosx/FileTableView.h; sourceTree = ""; }; A2AF1C370A3D0F6200F1575D /* FileTableView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = FileTableView.m; path = macosx/FileTableView.m; sourceTree = ""; }; - A2C655640A04FEDC00E9FD82 /* BottomBorder.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = BottomBorder.tiff; path = macosx/Images/BottomBorder.tiff; sourceTree = ""; }; + A2C655640A04FEDC00E9FD82 /* BottomBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BottomBorder.png; path = macosx/Images/BottomBorder.png; sourceTree = ""; }; A2F8951E0A2D4BA500ED2127 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = macosx/Credits.rtf; sourceTree = ""; }; /* End PBXFileReference section */ @@ -390,9 +390,9 @@ A2305A7E0A3DC9E400AB2D77 /* ProgressBarGray.png */, A2305A7F0A3DC9E400AB2D77 /* ProgressBarGreen.png */, A21DFF0F0A292B2B007C5F76 /* Transfers.png */, - A27A53640A06AED200E1F16F /* StatusBorder.tiff */, + A27A53640A06AED200E1F16F /* StatusBorder.png */, A27A53420A06A62500E1F16F /* StatusSep.png */, - A2A84AD20A04FCDC00C898D4 /* BottomBorder.tiff */, + A2A84AD20A04FCDC00C898D4 /* BottomBorder.png */, 4D2784360905709500687951 /* Transmission.icns */, 4D043A7E090AE979009FEDA8 /* TransmissionDocument.icns */, 4DF7500808A103AD007B0D70 /* Info.png */, @@ -418,12 +418,12 @@ 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, 29B97318FDCFA39411CA2CEA /* MainMenu.nib */, A200B9620A227FD0007BBB1E /* InfoWindow.nib */, - A2C655640A04FEDC00E9FD82 /* BottomBorder.tiff */, - A289EB0B0A33C56D00B082A3 /* ButtonBorder.tiff */, - A28DBADB0A33C1D800F4B4A7 /* ActionButton.tiff */, - A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.tiff */, + A2C655640A04FEDC00E9FD82 /* BottomBorder.png */, + A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */, + A28DBADB0A33C1D800F4B4A7 /* ActionButton.png */, + A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.png */, A27A53560A06A76400E1F16F /* StatusSep.png */, - A27A53650A06AEDB00E1F16F /* StatusBorder.tiff */, + A27A53650A06AEDB00E1F16F /* StatusBorder.png */, A2912C520A2956E80097A0CA /* PrefsWindow.nib */, ); name = Resources; @@ -650,15 +650,15 @@ 4DE5CCCB0981D9BE00BE280E /* Defaults.plist in Resources */, 4DDFDD22099A5D8E00189D81 /* DownloadBadge.png in Resources */, 4DDFDD23099A5D8E00189D81 /* UploadBadge.png in Resources */, - A2C655650A04FEDC00E9FD82 /* BottomBorder.tiff in Resources */, + A2C655650A04FEDC00E9FD82 /* BottomBorder.png in Resources */, A27A53570A06A76400E1F16F /* StatusSep.png in Resources */, - A27A53660A06AEDB00E1F16F /* StatusBorder.tiff in Resources */, + A27A53660A06AEDB00E1F16F /* StatusBorder.png in Resources */, A21DFF100A292B2B007C5F76 /* Transfers.png in Resources */, A2912C540A2956E80097A0CA /* PrefsWindow.nib in Resources */, A2F8951F0A2D4BA500ED2127 /* Credits.rtf in Resources */, - A2173E1C0A33C1B300B0D8AB /* ActionButtonPressed.tiff in Resources */, - A28DBADC0A33C1D800F4B4A7 /* ActionButton.tiff in Resources */, - A289EB0C0A33C56D00B082A3 /* ButtonBorder.tiff in Resources */, + A2173E1C0A33C1B300B0D8AB /* ActionButtonPressed.png in Resources */, + A28DBADC0A33C1D800F4B4A7 /* ActionButton.png in Resources */, + A289EB0C0A33C56D00B082A3 /* ButtonBorder.png in Resources */, A2F40AE40A361C00006B8288 /* Transmission.icns in Resources */, A25FCDEF0A3769A6002BCBBE /* PauseSelected.png in Resources */, A25FCDF00A3769AC002BCBBE /* ResumeSelected.png in Resources */, diff --git a/macosx/Images/ActionButton.png b/macosx/Images/ActionButton.png new file mode 100644 index 000000000..00c7320c3 Binary files /dev/null and b/macosx/Images/ActionButton.png differ diff --git a/macosx/Images/ActionButton.tiff b/macosx/Images/ActionButton.tiff deleted file mode 100644 index 628913a1e..000000000 Binary files a/macosx/Images/ActionButton.tiff and /dev/null differ diff --git a/macosx/Images/ActionButtonPressed.png b/macosx/Images/ActionButtonPressed.png new file mode 100644 index 000000000..806c88bdc Binary files /dev/null and b/macosx/Images/ActionButtonPressed.png differ diff --git a/macosx/Images/ActionButtonPressed.tiff b/macosx/Images/ActionButtonPressed.tiff deleted file mode 100644 index 89e3c4575..000000000 Binary files a/macosx/Images/ActionButtonPressed.tiff and /dev/null differ diff --git a/macosx/Images/BottomBorder.png b/macosx/Images/BottomBorder.png new file mode 100644 index 000000000..5ca451406 Binary files /dev/null and b/macosx/Images/BottomBorder.png differ diff --git a/macosx/Images/BottomBorder.tiff b/macosx/Images/BottomBorder.tiff deleted file mode 100644 index 4f163c117..000000000 Binary files a/macosx/Images/BottomBorder.tiff and /dev/null differ diff --git a/macosx/Images/ButtonBorder.png b/macosx/Images/ButtonBorder.png new file mode 100644 index 000000000..13edcb89b Binary files /dev/null and b/macosx/Images/ButtonBorder.png differ diff --git a/macosx/Images/ButtonBorder.tiff b/macosx/Images/ButtonBorder.tiff deleted file mode 100644 index e31513678..000000000 Binary files a/macosx/Images/ButtonBorder.tiff and /dev/null differ diff --git a/macosx/Images/StatusBorder.png b/macosx/Images/StatusBorder.png new file mode 100644 index 000000000..d32029c6e Binary files /dev/null and b/macosx/Images/StatusBorder.png differ diff --git a/macosx/Images/StatusBorder.tiff b/macosx/Images/StatusBorder.tiff deleted file mode 100644 index 18804ba38..000000000 Binary files a/macosx/Images/StatusBorder.tiff and /dev/null differ diff --git a/macosx/SmoothAquaView.m b/macosx/SmoothAquaView.m index 585acee9a..ec0357cd6 100644 --- a/macosx/SmoothAquaView.m +++ b/macosx/SmoothAquaView.m @@ -31,7 +31,7 @@ if ((self = [super initWithFrame: frameRect])) { fBackgroundColor = [[NSColor colorWithPatternImage: - [NSImage imageNamed: @"StatusBorder.tiff"]] retain]; + [NSImage imageNamed: @"StatusBorder"]] retain]; } return self; } diff --git a/mk/osx.mk b/mk/osx.mk index 16e7cc389..9dd09d7e3 100644 --- a/mk/osx.mk +++ b/mk/osx.mk @@ -44,7 +44,7 @@ define PACKAGE_RULE1 endef define PACKAGE_RULE2 mv tmp "Transmission $(VERSION_PACKAGE)" - hdiutil create -format UDZO -srcfolder \ + hdiutil create -format UDZO -imagekey zlib-level=9 -srcfolder \ "Transmission $(VERSION_PACKAGE)" Transmission-$(VERSION_PACKAGE).dmg rm -rf "Transmission $(VERSION_PACKAGE)" endef