Skip to content

V
vlc
Commit a38092cd authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: implemented pressed state for the effects button (bright UI) (refs #7408)

parent 17bf09b0
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 4 deletions
Makefile.am
View file @ a38092cd
...@@ -213,6 +213,8 @@ EXTRA_DIST += \ ...@@ -213,6 +213,8 @@ EXTRA_DIST += \
extras/package/macosx/Resources/mainwindow/effects-double-buttons@2x.png \ extras/package/macosx/Resources/mainwindow/effects-double-buttons@2x.png \
extras/package/macosx/Resources/mainwindow/effects-one-button-blue.png \ extras/package/macosx/Resources/mainwindow/effects-one-button-blue.png \
extras/package/macosx/Resources/mainwindow/effects-one-button-blue@2x.png \ extras/package/macosx/Resources/mainwindow/effects-one-button-blue@2x.png \
extras/package/macosx/Resources/mainwindow/effects-one-button-pressed.png \
extras/package/macosx/Resources/mainwindow/effects-one-button-pressed@2x.png \
extras/package/macosx/Resources/mainwindow/effects-one-button.png \ extras/package/macosx/Resources/mainwindow/effects-one-button.png \
extras/package/macosx/Resources/mainwindow/effects-one-button@2x.png \ extras/package/macosx/Resources/mainwindow/effects-one-button@2x.png \
extras/package/macosx/Resources/mainwindow/forward-3btns-pressed.png \ extras/package/macosx/Resources/mainwindow/forward-3btns-pressed.png \
......
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @ a38092cd
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
</object> </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="21"/>
<integer value="4948"/>
<integer value="4596"/> <integer value="4596"/>
<integer value="4756"/>
<integer value="4948"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -776,7 +776,7 @@ ...@@ -776,7 +776,7 @@
<reference key="NSSuperview" ref="129808516"/> <reference key="NSSuperview" ref="129808516"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="424650866"> <object class="NSButtonCell" key="NSCell" id="424650866">
<int key="NSCellFlags">-2080374784</int> <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int> <int key="NSCellFlags2">134217728</int>
<string key="NSContents"/> <string key="NSContents"/>
<reference key="NSSupport" ref="188716167"/> <reference key="NSSupport" ref="188716167"/>
......
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ a38092cd
...@@ -430,6 +430,8 @@ ...@@ -430,6 +430,8 @@
CCD83E4D13FEA143004F1652 /* VideoEffects.xib in Resources */ = {isa = PBXBuildFile; fileRef = CCD83E4013FEA143004F1652 /* VideoEffects.xib */; }; CCD83E4D13FEA143004F1652 /* VideoEffects.xib in Resources */ = {isa = PBXBuildFile; fileRef = CCD83E4013FEA143004F1652 /* VideoEffects.xib */; };
CCD83E4E13FEA143004F1652 /* Wizard.xib in Resources */ = {isa = PBXBuildFile; fileRef = CCD83E4213FEA143004F1652 /* Wizard.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 */; }; 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 /* effects-one-button-pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CCE8BAC3160615D9006741FB /* effects-one-button-pressed@2x.png */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */ /* Begin PBXCopyFilesBuildPhase section */
...@@ -966,6 +968,8 @@ ...@@ -966,6 +968,8 @@
CCDBA3B313D32E200006127B /* macosx.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = macosx.m; path = ../../../modules/video_output/macosx.m; sourceTree = "<group>"; }; 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>"; }; 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>"; }; 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 /* effects-one-button-pressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-one-button-pressed@2x.png"; path = "Resources/mainwindow/effects-one-button-pressed@2x.png"; sourceTree = "<group>"; };
CCF0777913659A8000AF19FD /* SPInvocationGrabbing.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPInvocationGrabbing.h; path = ../../../modules/gui/macosx/SPInvocationGrabbing.h; 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>"; }; 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>"; }; CCF0777B13659A8000AF19FD /* SPMediaKeyTap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPMediaKeyTap.h; path = ../../../modules/gui/macosx/SPMediaKeyTap.h; sourceTree = "<group>"; };
...@@ -1365,6 +1369,8 @@ ...@@ -1365,6 +1369,8 @@
CC04333013B28B8200D7D52E /* effects-double-buttons.png */, CC04333013B28B8200D7D52E /* effects-double-buttons.png */,
CC04333113B28B8200D7D52E /* effects-one-button-blue.png */, CC04333113B28B8200D7D52E /* effects-one-button-blue.png */,
CC04333213B28B8200D7D52E /* effects-one-button.png */, CC04333213B28B8200D7D52E /* effects-one-button.png */,
CCE8BAC2160615D9006741FB /* effects-one-button-pressed.png */,
CCE8BAC3160615D9006741FB /* effects-one-button-pressed@2x.png */,
CC04333713B28B8200D7D52E /* fullscreen-double-buttons-pressed.png */, CC04333713B28B8200D7D52E /* fullscreen-double-buttons-pressed.png */,
CC04333813B28B8200D7D52E /* fullscreen-double-buttons.png */, CC04333813B28B8200D7D52E /* fullscreen-double-buttons.png */,
CC0F725015063C820086B6A0 /* fullscreen-one-button-pressed.png */, CC0F725015063C820086B6A0 /* fullscreen-one-button-pressed.png */,
...@@ -2203,6 +2209,8 @@ ...@@ -2203,6 +2209,8 @@
CC16700315F5178B0088201B /* forward-6btns-dark.png in Resources */, CC16700315F5178B0088201B /* forward-6btns-dark.png in Resources */,
CC16700415F5178B0088201B /* forward-6btns-dark@2x.png in Resources */, CC16700415F5178B0088201B /* forward-6btns-dark@2x.png in Resources */,
CC461F75160084A10022423C /* SharedDialogs.xib in Resources */, CC461F75160084A10022423C /* SharedDialogs.xib in Resources */,
CCE8BAC4160615D9006741FB /* effects-one-button-pressed.png in Resources */,
CCE8BAC5160615D9006741FB /* effects-one-button-pressed@2x.png in Resources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
......
modules/gui/macosx/MainWindow.m
View file @ a38092cd
...@@ -272,7 +272,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -272,7 +272,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_volume_up_btn setImage: [NSImage imageNamed:@"volume-high"]]; [o_volume_up_btn setImage: [NSImage imageNamed:@"volume-high"]];
if (b_nativeFullscreenMode) { if (b_nativeFullscreenMode) {
[o_effects_btn setImage: [NSImage imageNamed:@"effects-one-button"]]; [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 { } else {
[o_effects_btn setImage: [NSImage imageNamed:@"effects-double-buttons"]]; [o_effects_btn setImage: [NSImage imageNamed:@"effects-double-buttons"]];
[o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-double-buttons-pressed"]]; [o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-double-buttons-pressed"]];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment