[vlc-commits] macosx: implemented pressed state for the effects button (dark UI) ( close #7408)

[Felix Paul Kühne]

vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Sep 25 22:45:20 2012 +0200| [fb32a825dc64c7586c78eaadbbac394e76737f36] | committer: Felix Paul Kühne

macosx: implemented pressed state for the effects button (dark UI) (close #7408)
(cherry picked from commit 2f747cb43fc664c5cb180e8fc92bdd78510d277e)

Conflicts:
	extras/package/macosx/vlc.xcodeproj/project.pbxproj
	modules/gui/macosx/ControlsBar.m

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=fb32a825dc64c7586c78eaadbbac394e76737f36
---

 Makefile.am                                         |    2 ++
 extras/package/macosx/vlc.xcodeproj/project.pbxproj |    8 ++++++++
 modules/gui/macosx/MainWindow.m                     |    2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index e34ff2c..c4e230f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -308,6 +308,8 @@ EXTRA_DIST += \
 	extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons_dark at 2x.png \
 	extras/package/macosx/Resources/mainwindow_dark/effects-one-button-blue_dark.png \
 	extras/package/macosx/Resources/mainwindow_dark/effects-one-button-blue_dark at 2x.png \
+	extras/package/macosx/Resources/mainwindow_dark/effects-one-button-pressed-dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/effects-one-button-pressed-dark at 2x.png \
 	extras/package/macosx/Resources/mainwindow_dark/effects-one-button_dark.png \
 	extras/package/macosx/Resources/mainwindow_dark/effects-one-button_dark at 2x.png \
 	extras/package/macosx/Resources/mainwindow_dark/forward-pressed_dark.png \
diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 260f77b..d3d4ee5 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		7DFFA17416125157001AF89F /* effects-one-button-pressed-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DFFA17216125157001AF89F /* effects-one-button-pressed-dark.png */; };
+		7DFFA17516125157001AF89F /* effects-one-button-pressed-dark at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DFFA17316125157001AF89F /* effects-one-button-pressed-dark at 2x.png */; };
 		CC04323B13B246DF00D7D52E /* back_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04321113B246DF00D7D52E /* back_dark.png */; };
 		CC04323C13B246DF00D7D52E /* back-pressed_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04321213B246DF00D7D52E /* back-pressed_dark.png */; };
 		CC04323D13B246DF00D7D52E /* effects-double-buttons_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04321313B246DF00D7D52E /* effects-double-buttons_dark.png */; };
@@ -419,6 +421,8 @@
 		5CCED71314C0D4A90057F8D1 /* ExtensionsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExtensionsManager.m; path = ../../../modules/gui/macosx/ExtensionsManager.m; sourceTree = SOURCE_ROOT; };
 		5CCED71414C0D4A90057F8D1 /* VLCUIWidgets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCUIWidgets.h; path = ../../../modules/gui/macosx/VLCUIWidgets.h; sourceTree = SOURCE_ROOT; };
 		5CCED71514C0D4A90057F8D1 /* VLCUIWidgets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCUIWidgets.m; path = ../../../modules/gui/macosx/VLCUIWidgets.m; sourceTree = SOURCE_ROOT; };
+		7DFFA17216125157001AF89F /* effects-one-button-pressed-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-one-button-pressed-dark.png"; path = "Resources/mainwindow_dark/effects-one-button-pressed-dark.png"; sourceTree = "<group>"; };
+		7DFFA17316125157001AF89F /* effects-one-button-pressed-dark at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-one-button-pressed-dark at 2x.png"; path = "Resources/mainwindow_dark/effects-one-button-pressed-dark at 2x.png"; sourceTree = "<group>"; };
 		8E49720006417F6800370C9F /* playlistinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = playlistinfo.h; path = ../../../modules/gui/macosx/playlistinfo.h; sourceTree = SOURCE_ROOT; };
 		8E49720106417F6800370C9F /* playlistinfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = playlistinfo.m; path = ../../../modules/gui/macosx/playlistinfo.m; sourceTree = SOURCE_ROOT; };
 		8E55FB7F0459B0FD00FB3317 /* output.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = output.h; path = ../../../modules/gui/macosx/output.h; sourceTree = SOURCE_ROOT; };
@@ -1138,6 +1142,8 @@
 				CC919155159B53CE00E634A7 /* play-pressed_dark at 2x.png */,
 				CC919156159B53CE00E634A7 /* playlist-blue_dark at 2x.png */,
 				CC919157159B53CE00E634A7 /* playlist-blue-pressed_dark at 2x.png */,
+				7DFFA17216125157001AF89F /* effects-one-button-pressed-dark.png */,
+				7DFFA17316125157001AF89F /* effects-one-button-pressed-dark at 2x.png */,
 				CC919158159B53CE00E634A7 /* effects-double-buttons_dark at 2x.png */,
 				CC919159159B53CE00E634A7 /* effects-double-buttons-pressed_dark at 2x.png */,
 				CC91915A159B53CE00E634A7 /* effects-one-button_dark at 2x.png */,
@@ -2013,6 +2019,8 @@
 				CCBAA7AF159B5B3F00D8348C /* sidebar-podcast at 2x.png in Resources */,
 				CCAEE983160747F500DE42D6 /* effects-one-button-pressed.png in Resources */,
 				CCAEE984160747F500DE42D6 /* effects-one-button-pressed at 2x.png in Resources */,
+				7DFFA17416125157001AF89F /* effects-one-button-pressed-dark.png in Resources */,
+				7DFFA17516125157001AF89F /* effects-one-button-pressed-dark at 2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 3c8f09c..b6b628b 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -284,7 +284,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
         if (b_nativeFullscreenMode)
         {
             [o_effects_btn setImage: [NSImage imageNamed:@"effects-one-button_dark"]];
-            [o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-one-button-blue_dark"]];
+            [o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-one-button-pressed-dark"]];
         }
         else
         {