diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index fd4207865..84d6653d3 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -91,6 +91,8 @@ A2305AAB0A3DCCEF00AB2D77 /* ProgressBarEndWhite.png in Resources */ = {isa = PBXBuildFile; fileRef = A2305AA60A3DCCEF00AB2D77 /* ProgressBarEndWhite.png */; }; A2305AAC0A3DCCEF00AB2D77 /* ProgressBarEndGreen.png in Resources */ = {isa = PBXBuildFile; fileRef = A2305AA70A3DCCEF00AB2D77 /* ProgressBarEndGreen.png */; }; A2305AAD0A3DCCEF00AB2D77 /* ProgressBarEndGray.png in Resources */ = {isa = PBXBuildFile; fileRef = A2305AA80A3DCCEF00AB2D77 /* ProgressBarEndGray.png */; }; + A24600400A6DB58600D19088 /* RevealCircleButtonPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A246003E0A6DB58600D19088 /* RevealCircleButtonPressed.png */; }; + A24600410A6DB58600D19088 /* RevealCircleButton.png in Resources */ = {isa = PBXBuildFile; fileRef = A246003F0A6DB58600D19088 /* RevealCircleButton.png */; }; A24F19080A3A790800C9C145 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A24F19070A3A790800C9C145 /* Sparkle.framework */; }; A24F19210A3A796800C9C145 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A24F19070A3A790800C9C145 /* Sparkle.framework */; }; A253F6F30A698970008EE24F /* FilterBarBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = A253F6F20A698970008EE24F /* FilterBarBackground.png */; }; @@ -293,6 +295,8 @@ A2305AA60A3DCCEF00AB2D77 /* ProgressBarEndWhite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndWhite.png; path = macosx/Images/ProgressBarEndWhite.png; sourceTree = ""; }; A2305AA70A3DCCEF00AB2D77 /* ProgressBarEndGreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndGreen.png; path = macosx/Images/ProgressBarEndGreen.png; sourceTree = ""; }; A2305AA80A3DCCEF00AB2D77 /* ProgressBarEndGray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndGray.png; path = macosx/Images/ProgressBarEndGray.png; sourceTree = ""; }; + A246003E0A6DB58600D19088 /* RevealCircleButtonPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RevealCircleButtonPressed.png; path = macosx/Images/RevealCircleButtonPressed.png; sourceTree = ""; }; + A246003F0A6DB58600D19088 /* RevealCircleButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RevealCircleButton.png; path = macosx/Images/RevealCircleButton.png; sourceTree = ""; }; A24F19070A3A790800C9C145 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = macosx/Sparkle.framework; sourceTree = ""; }; A253F6F20A698970008EE24F /* FilterBarBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterBarBackground.png; path = macosx/Images/FilterBarBackground.png; sourceTree = ""; }; A253F7080A6990EB008EE24F /* FilterButtonOverMain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterButtonOverMain.png; path = macosx/Images/FilterButtonOverMain.png; sourceTree = ""; }; @@ -478,6 +482,8 @@ A27A53650A06AEDB00E1F16F /* StatusBorder.png */, A27ABC890A6B317D0020EC71 /* CloseCircleButton.png */, A27ABC8A0A6B317D0020EC71 /* CloseCircleButtonPressed.png */, + A246003E0A6DB58600D19088 /* RevealCircleButtonPressed.png */, + A246003F0A6DB58600D19088 /* RevealCircleButton.png */, A253F6F20A698970008EE24F /* FilterBarBackground.png */, A253F7080A6990EB008EE24F /* FilterButtonOverMain.png */, A253F7090A6990EB008EE24F /* FilterButtonOverLeft.png */, @@ -755,6 +761,8 @@ A26E6A1A0A6A8C18007E3C14 /* SpeedLimitButtonPressedGraphite.png in Resources */, A27ABC8B0A6B317D0020EC71 /* CloseCircleButton.png in Resources */, A27ABC8C0A6B317D0020EC71 /* CloseCircleButtonPressed.png in Resources */, + A24600400A6DB58600D19088 /* RevealCircleButtonPressed.png in Resources */, + A24600410A6DB58600D19088 /* RevealCircleButton.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/macosx/Controller.m b/macosx/Controller.m index 48b3d455e..87b0e606d 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -2090,6 +2090,7 @@ static void sleepCallBack(void * controller, io_service_t y, - (void) windowDidResignKey: (NSNotification *) notification { + #warning should it do this? //set status fields inactive color /*NSColor * disabledColor = [NSColor disabledControlTextColor]; [fTotalTorrentsField setTextColor: disabledColor]; diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib index 771dba69b..e6f2de2ed 100644 --- a/macosx/English.lproj/MainMenu.nib/info.nib +++ b/macosx/English.lproj/MainMenu.nib/info.nib @@ -9,9 +9,9 @@ 1041 344 478 208 99 0 0 1152 842 1480 - 366 546 420 63 0 0 1152 842 + 332 330 420 63 0 0 1152 842 1603 - 311 415 477 67 0 0 1152 842 + 240 433 477 67 0 0 1152 842 29 9 780 451 44 0 0 1152 842 456 @@ -31,9 +31,9 @@ 3 IBOpenObjects + 29 1603 1480 - 29 IBSystem Version 8J135 diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib index fbe887944..33535b1a8 100644 Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/macosx/Images/RevealCircleButton.png b/macosx/Images/RevealCircleButton.png new file mode 100644 index 000000000..861a59270 Binary files /dev/null and b/macosx/Images/RevealCircleButton.png differ diff --git a/macosx/Images/RevealCircleButtonPressed.png b/macosx/Images/RevealCircleButtonPressed.png new file mode 100644 index 000000000..809073502 Binary files /dev/null and b/macosx/Images/RevealCircleButtonPressed.png differ