vlc | branch: master | Felix Paul Kühne <[email protected]> | Sun Sep 16 16:28:18 2012 +0200| [a38092cd83d85fe232a18b1e3c4581440043b742] | committer: Felix Paul Kühne
macosx: implemented pressed state for the effects button (bright UI) (refs #7408) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a38092cd83d85fe232a18b1e3c4581440043b742 --- Makefile.am | 2 ++ extras/package/macosx/Resources/English.lproj/MainMenu.xib | 6 +++--- extras/package/macosx/vlc.xcodeproj/project.pbxproj | 8 ++++++++ modules/gui/macosx/MainWindow.m | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index c926d06..64facfe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -213,6 +213,8 @@ EXTRA_DIST += \ extras/package/macosx/Resources/mainwindow/[email protected] \ extras/package/macosx/Resources/mainwindow/effects-one-button-blue.png \ extras/package/macosx/Resources/mainwindow/[email protected] \ + extras/package/macosx/Resources/mainwindow/effects-one-button-pressed.png \ + extras/package/macosx/Resources/mainwindow/[email protected] \ extras/package/macosx/Resources/mainwindow/effects-one-button.png \ extras/package/macosx/Resources/mainwindow/[email protected] \ extras/package/macosx/Resources/mainwindow/forward-3btns-pressed.png \ diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.xib b/extras/package/macosx/Resources/English.lproj/MainMenu.xib index eecd6d5..18a434c 100644 --- a/extras/package/macosx/Resources/English.lproj/MainMenu.xib +++ b/extras/package/macosx/Resources/English.lproj/MainMenu.xib @@ -21,9 +21,9 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="21"/> - <integer value="4948"/> <integer value="4596"/> + <integer value="4756"/> + <integer value="4948"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -776,7 +776,7 @@ <reference key="NSSuperview" ref="129808516"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="424650866"> - <int key="NSCellFlags">-2080374784</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">134217728</int> <string key="NSContents"/> <reference key="NSSupport" ref="188716167"/> diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj index 1d2eb22..6d15acf 100644 --- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj +++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj @@ -430,6 +430,8 @@ CCD83E4D13FEA143004F1652 /* VideoEffects.xib in Resources */ = {isa = PBXBuildFile; fileRef = CCD83E4013FEA143004F1652 /* VideoEffects.xib */; }; CCD83E4E13FEA143004F1652 /* Wizard.xib in Resources */ = {isa = PBXBuildFile; fileRef = CCD83E4213FEA143004F1652 /* Wizard.xib */; }; CCDB535D13E97D3500A1782F /* dropzone-background.png in Resources */ = {isa = PBXBuildFile; fileRef = CCDB535C13E97D3500A1782F /* dropzone-background.png */; }; + CCE8BAC4160615D9006741FB /* effects-one-button-pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = CCE8BAC2160615D9006741FB /* effects-one-button-pressed.png */; }; + CCE8BAC5160615D9006741FB /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = CCE8BAC3160615D9006741FB /* [email protected] */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -966,6 +968,8 @@ CCDBA3B313D32E200006127B /* macosx.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = macosx.m; path = ../../../modules/video_output/macosx.m; sourceTree = "<group>"; }; CCE8BABC16060542006741FB /* Windows.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Windows.h; path = ../../../modules/gui/macosx/Windows.h; sourceTree = "<group>"; }; CCE8BABD16060542006741FB /* Windows.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = Windows.m; path = ../../../modules/gui/macosx/Windows.m; sourceTree = "<group>"; }; + CCE8BAC2160615D9006741FB /* effects-one-button-pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-one-button-pressed.png"; path = "Resources/mainwindow/effects-one-button-pressed.png"; sourceTree = "<group>"; }; + CCE8BAC3160615D9006741FB /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "Resources/mainwindow/[email protected]"; sourceTree = "<group>"; }; CCF0777913659A8000AF19FD /* SPInvocationGrabbing.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPInvocationGrabbing.h; path = ../../../modules/gui/macosx/SPInvocationGrabbing.h; sourceTree = "<group>"; }; CCF0777A13659A8000AF19FD /* SPInvocationGrabbing.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SPInvocationGrabbing.m; path = ../../../modules/gui/macosx/SPInvocationGrabbing.m; sourceTree = "<group>"; }; CCF0777B13659A8000AF19FD /* SPMediaKeyTap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPMediaKeyTap.h; path = ../../../modules/gui/macosx/SPMediaKeyTap.h; sourceTree = "<group>"; }; @@ -1365,6 +1369,8 @@ CC04333013B28B8200D7D52E /* effects-double-buttons.png */, CC04333113B28B8200D7D52E /* effects-one-button-blue.png */, CC04333213B28B8200D7D52E /* effects-one-button.png */, + CCE8BAC2160615D9006741FB /* effects-one-button-pressed.png */, + CCE8BAC3160615D9006741FB /* [email protected] */, CC04333713B28B8200D7D52E /* fullscreen-double-buttons-pressed.png */, CC04333813B28B8200D7D52E /* fullscreen-double-buttons.png */, CC0F725015063C820086B6A0 /* fullscreen-one-button-pressed.png */, @@ -2203,6 +2209,8 @@ CC16700315F5178B0088201B /* forward-6btns-dark.png in Resources */, CC16700415F5178B0088201B /* [email protected] in Resources */, CC461F75160084A10022423C /* SharedDialogs.xib in Resources */, + CCE8BAC4160615D9006741FB /* effects-one-button-pressed.png in Resources */, + CCE8BAC5160615D9006741FB /* [email protected] in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index a3d6061..071a25c 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -272,7 +272,7 @@ static VLCMainWindow *_o_sharedInstance = nil; [o_volume_up_btn setImage: [NSImage imageNamed:@"volume-high"]]; if (b_nativeFullscreenMode) { [o_effects_btn setImage: [NSImage imageNamed:@"effects-one-button"]]; - [o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-one-button-blue"]]; + [o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-one-button-pressed"]]; } else { [o_effects_btn setImage: [NSImage imageNamed:@"effects-double-buttons"]]; [o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-double-buttons-pressed"]]; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
