[vlc-commits] macosx: remove alternate image from max volume and mute buttons

David Fuhrmann git at videolan.org
Sat Oct 18 13:23:03 CEST 2014


vlc/vlc-2.2 | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Fri Oct 17 22:37:15 2014 +0200| [4dab7846632d4914f9ebbf9f249b5b24c8e4d141] | committer: David Fuhrmann

macosx: remove alternate image from max volume and mute buttons

This image was set, but it is not overwritten by its os-dependent
counterpart in code. In fact, we only have one image, so just unset
the alternate image in xib.

(cherry picked from commit 544ffab82934566b535c2a10b0dfe6d9ec0154da)
Signed-off-by: David Fuhrmann <dfuhrmann at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=4dab7846632d4914f9ebbf9f249b5b24c8e4d141
---

 extras/package/macosx/Resources/English.lproj/MainWindow.xib |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/extras/package/macosx/Resources/English.lproj/MainWindow.xib b/extras/package/macosx/Resources/English.lproj/MainWindow.xib
index 6a21f46..cfcd665 100644
--- a/extras/package/macosx/Resources/English.lproj/MainWindow.xib
+++ b/extras/package/macosx/Resources/English.lproj/MainWindow.xib
@@ -23,7 +23,7 @@
       <bool key="EncodedWithXMLCoder">YES</bool>
       <integer value="5260"/>
       <integer value="5605"/>
-      <integer value="4682"/>
+      <integer value="5608"/>
       <integer value="4850"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
@@ -793,11 +793,10 @@
                         <reference key="NSControlView" ref="474770834"/>
                         <int key="NSButtonFlags">141819904</int>
                         <int key="NSButtonFlags2">2</int>
-                        <object class="NSCustomResource" key="NSNormalImage" id="267511931">
+                        <object class="NSCustomResource" key="NSNormalImage">
                           <string key="NSClassName">NSImage</string>
                           <string key="NSResourceName">volume-high</string>
                         </object>
-                        <reference key="NSAlternateImage" ref="267511931"/>
                         <string key="NSAlternateContents"/>
                         <object class="NSMutableString" key="NSKeyEquivalent">
                           <characters key="NS.bytes"/>
@@ -845,11 +844,10 @@
                         <reference key="NSControlView" ref="963106097"/>
                         <int key="NSButtonFlags">141819904</int>
                         <int key="NSButtonFlags2">2</int>
-                        <object class="NSCustomResource" key="NSNormalImage" id="112655283">
+                        <object class="NSCustomResource" key="NSNormalImage">
                           <string key="NSClassName">NSImage</string>
                           <string key="NSResourceName">volume-low</string>
                         </object>
-                        <reference key="NSAlternateImage" ref="112655283"/>
                         <string key="NSAlternateContents"/>
                         <object class="NSMutableString" key="NSKeyEquivalent">
                           <characters key="NS.bytes"/>



More information about the vlc-commits mailing list