macosx: Cocoa cannot deal with 2 images of the same name in a single bundle even...

Hence, rename one of them.

diff --git a/Makefile.am b/Makefile.am
index a53446833d96f970541cd310b7697c78de238c94..769cf984d4bf3c9a6f2c7d4549e795db9431bc68 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -222,9 +222,9 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow/pause.png \
        extras/package/macosx/Resources/mainwindow/play-pressed.png \
        extras/package/macosx/Resources/mainwindow/play.png \
-       extras/package/macosx/Resources/mainwindow/playlist-blue.png \
-       extras/package/macosx/Resources/mainwindow/playlist-pressed.png \
-       extras/package/macosx/Resources/mainwindow/playlist.png \
+       extras/package/macosx/Resources/mainwindow/playlist-btn-blue.png \
+       extras/package/macosx/Resources/mainwindow/playlist-btn-pressed.png \
+       extras/package/macosx/Resources/mainwindow/playlist-btn.png \
        extras/package/macosx/Resources/mainwindow/progression-fill-left.png \
        extras/package/macosx/Resources/mainwindow/progression-fill-middle.png \
        extras/package/macosx/Resources/mainwindow/progression-fill-right.png \

diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.xib b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
index 4362622796b31b1a76eaa90be33d92636403e945..f91e565b32091f0d4ed76ab70d402a78798b3f56 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.xib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
@@ -21,16 +21,16 @@
     </object>
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
       <bool key="EncodedWithXMLCoder">YES</bool>
-      <integer value="2770"/>
-      <integer value="4948"/>
-      <integer value="4372"/>
       <integer value="915"/>
+      <integer value="2770"/>
       <integer value="4722"/>
-      <integer value="4596"/>
-      <integer value="2730"/>
       <integer value="4850"/>
       <integer value="5100"/>
       <integer value="1617"/>
+      <integer value="4596"/>
+      <integer value="4948"/>
+      <integer value="2730"/>
+      <integer value="4756"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
       <bool key="EncodedWithXMLCoder">YES</bool>
@@ -741,11 +741,11 @@
                     <int key="NSButtonFlags2">2</int>
                     <object class="NSCustomResource" key="NSNormalImage">
                       <string key="NSClassName">NSImage</string>
-                      <string key="NSResourceName">playlist</string>
+                      <string key="NSResourceName">playlist-btn</string>
                     </object>
                     <object class="NSCustomResource" key="NSAlternateImage">
                       <string key="NSClassName">NSImage</string>
-                      <string key="NSResourceName">playlist-pressed</string>
+                      <string key="NSResourceName">playlist-btn-pressed</string>
                     </object>
                     <string key="NSAlternateContents"/>
                     <string key="NSKeyEquivalent"/>
@@ -12150,7 +12150,7 @@ LCAuLi4</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>{{329, 622}, {140, 123}}</string>
+          <string>{{329, 553}, {140, 123}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -12201,9 +12201,9 @@ LCAuLi4</string>
           <string>{{619, 772}, {137, 103}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>{{363, 446}, {604, 310}}</string>
+          <string>{{363, 366}, {604, 310}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{363, 446}, {604, 310}}</string>
+          <string>{{363, 366}, {604, 310}}</string>
           <boolean value="YES"/>
           <boolean value="NO"/>
           <boolean value="NO"/>
@@ -12244,7 +12244,7 @@ LCAuLi4</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>{{473, 299}, {302, 433}}</string>
+          <string>{{956, 223}, {302, 433}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -12360,9 +12360,9 @@ LCAuLi4</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>{{340, 658}, {549, 87}}</string>
+          <string>{{340, 589}, {549, 87}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{340, 658}, {549, 87}}</string>
+          <string>{{340, 589}, {549, 87}}</string>
           <boolean value="YES"/>
           <boolean value="NO"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -12413,7 +12413,7 @@ LCAuLi4</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>{{329, 732}, {468, 20}}</string>
+          <string>{{812, 656}, {468, 20}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -12712,7 +12712,7 @@ LCAuLi4</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{566, 458}, {402, 252}}</string>
+          <string>{{566, 424}, {402, 252}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <object class="NSAffineTransform"/>
           <string>VLBrushedMetalImageView</string>
@@ -12750,7 +12750,7 @@ LCAuLi4</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{363, 734}, {400, 22}}</string>
+          <string>{{880, 654}, {400, 22}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <object class="NSAffineTransform"/>
           <string>VLCCustomWindowCloseButton</string>
@@ -12917,7 +12917,7 @@ LCAuLi4</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{775, 139}, {149, 183}}</string>
+          <string>{{1258, 63}, {149, 183}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -19169,8 +19169,8 @@ LCAuLi4</string>
         <string>fullscreen-double-buttons-pressed</string>
         <string>play</string>
         <string>play-pressed</string>
-        <string>playlist</string>
-        <string>playlist-pressed</string>
+        <string>playlist-btn</string>
+        <string>playlist-btn-pressed</string>
         <string>repeat</string>
         <string>repeat-pressed</string>
         <string>shuffle</string>
@@ -19211,8 +19211,8 @@ LCAuLi4</string>
         <string>{29, 23}</string>
         <string>{29, 30}</string>
         <string>{29, 30}</string>
-        <string>{512, 512}</string>
-        <string>{28, 23}</string>
+        <string>{128, 128}</string>
+        <string>{128, 128}</string>
         <string>{28, 23}</string>
         <string>{28, 23}</string>
         <string>{29, 23}</string>

diff --git a/extras/package/macosx/Resources/mainwindow/playlist-blue.png b/extras/package/macosx/Resources/mainwindow/playlist-btn-blue.png
similarity index 100%
rename from extras/package/macosx/Resources/mainwindow/playlist-blue.png
rename to extras/package/macosx/Resources/mainwindow/playlist-btn-blue.png

diff --git a/extras/package/macosx/Resources/mainwindow/playlist-pressed.png b/extras/package/macosx/Resources/mainwindow/playlist-btn-pressed.png
similarity index 100%
rename from extras/package/macosx/Resources/mainwindow/playlist-pressed.png
rename to extras/package/macosx/Resources/mainwindow/playlist-btn-pressed.png

diff --git a/extras/package/macosx/Resources/mainwindow/playlist.png b/extras/package/macosx/Resources/mainwindow/playlist-btn.png
similarity index 100%
rename from extras/package/macosx/Resources/mainwindow/playlist.png
rename to extras/package/macosx/Resources/mainwindow/playlist-btn.png

diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index e57b7a773f67399f9661e64a5b09ce4adf56cf15..ff8d1a5a60f068d1fd48574a66a187b1970dd379 100644 (file)
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -98,9 +98,9 @@
                CC04337513B28B8200D7D52E /* pause.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334113B28B8200D7D52E /* pause.png */; };
                CC04337613B28B8200D7D52E /* play-pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334213B28B8200D7D52E /* play-pressed.png */; };
                CC04337713B28B8200D7D52E /* play.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334313B28B8200D7D52E /* play.png */; };
-               CC04337813B28B8200D7D52E /* playlist-blue.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334413B28B8200D7D52E /* playlist-blue.png */; };
-               CC04337913B28B8200D7D52E /* playlist-pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334513B28B8200D7D52E /* playlist-pressed.png */; };
-               CC04337A13B28B8200D7D52E /* playlist.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334613B28B8200D7D52E /* playlist.png */; };
+               CC04337813B28B8200D7D52E /* playlist-btn-blue.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334413B28B8200D7D52E /* playlist-btn-blue.png */; };
+               CC04337913B28B8200D7D52E /* playlist-btn-pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334513B28B8200D7D52E /* playlist-btn-pressed.png */; };
+               CC04337A13B28B8200D7D52E /* playlist-btn.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334613B28B8200D7D52E /* playlist-btn.png */; };
                CC04337B13B28B8200D7D52E /* progression-fill-left.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334713B28B8200D7D52E /* progression-fill-left.png */; };
                CC04337C13B28B8200D7D52E /* progression-fill-middle.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334813B28B8200D7D52E /* progression-fill-middle.png */; };
                CC04337D13B28B8200D7D52E /* progression-fill-right.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334913B28B8200D7D52E /* progression-fill-right.png */; };
@@ -423,9 +423,9 @@
                CC04334113B28B8200D7D52E /* pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause.png; path = Resources/mainwindow/pause.png; sourceTree = "<group>"; };
                CC04334213B28B8200D7D52E /* play-pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "play-pressed.png"; path = "Resources/mainwindow/play-pressed.png"; sourceTree = "<group>"; };
                CC04334313B28B8200D7D52E /* play.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = play.png; path = Resources/mainwindow/play.png; sourceTree = "<group>"; };
-               CC04334413B28B8200D7D52E /* playlist-blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "playlist-blue.png"; path = "Resources/mainwindow/playlist-blue.png"; sourceTree = "<group>"; };
-               CC04334513B28B8200D7D52E /* playlist-pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "playlist-pressed.png"; path = "Resources/mainwindow/playlist-pressed.png"; sourceTree = "<group>"; };
-               CC04334613B28B8200D7D52E /* playlist.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = playlist.png; path = Resources/mainwindow/playlist.png; sourceTree = "<group>"; };
+               CC04334413B28B8200D7D52E /* playlist-btn-blue.png */ = {isa = PBXFileReference; name = "playlist-btn-blue.png"; path = "Resources/mainwindow/playlist-btn-blue.png"; sourceTree = "<group>"; };
+               CC04334513B28B8200D7D52E /* playlist-btn-pressed.png */ = {isa = PBXFileReference; name = "playlist-btn-pressed.png"; path = "Resources/mainwindow/playlist-btn-pressed.png"; sourceTree = "<group>"; };
+               CC04334613B28B8200D7D52E /* playlist-btn.png */ = {isa = PBXFileReference; name = "playlist-btn.png"; path = "Resources/mainwindow/playlist-btn.png"; sourceTree = "<group>"; };
                CC04334713B28B8200D7D52E /* progression-fill-left.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "progression-fill-left.png"; path = "Resources/mainwindow/progression-fill-left.png"; sourceTree = "<group>"; };
                CC04334813B28B8200D7D52E /* progression-fill-middle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "progression-fill-middle.png"; path = "Resources/mainwindow/progression-fill-middle.png"; sourceTree = "<group>"; };
                CC04334913B28B8200D7D52E /* progression-fill-right.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "progression-fill-right.png"; path = "Resources/mainwindow/progression-fill-right.png"; sourceTree = "<group>"; };
@@ -967,9 +967,9 @@
                                CC04334113B28B8200D7D52E /* pause.png */,
                                CC04334213B28B8200D7D52E /* play-pressed.png */,
                                CC04334313B28B8200D7D52E /* play.png */,
-                               CC04334413B28B8200D7D52E /* playlist-blue.png */,
-                               CC04334513B28B8200D7D52E /* playlist-pressed.png */,
-                               CC04334613B28B8200D7D52E /* playlist.png */,
+                               CC04334413B28B8200D7D52E /* playlist-btn-blue.png */,
+                               CC04334513B28B8200D7D52E /* playlist-btn-pressed.png */,
+                               CC04334613B28B8200D7D52E /* playlist-btn.png */,
                                CC04334713B28B8200D7D52E /* progression-fill-left.png */,
                                CC04334813B28B8200D7D52E /* progression-fill-middle.png */,
                                CC04334913B28B8200D7D52E /* progression-fill-right.png */,
@@ -1407,9 +1407,9 @@
                                CC04337513B28B8200D7D52E /* pause.png in Resources */,
                                CC04337613B28B8200D7D52E /* play-pressed.png in Resources */,
                                CC04337713B28B8200D7D52E /* play.png in Resources */,
-                               CC04337813B28B8200D7D52E /* playlist-blue.png in Resources */,
-                               CC04337913B28B8200D7D52E /* playlist-pressed.png in Resources */,
-                               CC04337A13B28B8200D7D52E /* playlist.png in Resources */,
+                               CC04337813B28B8200D7D52E /* playlist-btn-blue.png in Resources */,
+                               CC04337913B28B8200D7D52E /* playlist-btn-pressed.png in Resources */,
+                               CC04337A13B28B8200D7D52E /* playlist-btn.png in Resources */,
                                CC04337B13B28B8200D7D52E /* progression-fill-left.png in Resources */,
                                CC04337C13B28B8200D7D52E /* progression-fill-middle.png in Resources */,
                                CC04337D13B28B8200D7D52E /* progression-fill-right.png in Resources */,

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index deb33045f223d43806fa9af11a5ed7a90f5b916b..af8355fcb0f5a9f196a59fea1e1204b0dbcea1b8 100644 (file)
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -201,8 +201,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
         [o_detached_fwd_btn setAlternateImage: [NSImage imageNamed:@"forward-pressed"]];
         [o_stop_btn setImage: [NSImage imageNamed:@"stop"]];
         [o_stop_btn setAlternateImage: [NSImage imageNamed:@"stop-pressed"]];
-        [o_playlist_btn setImage: [NSImage imageNamed:@"playlist"]];
-        [o_playlist_btn setAlternateImage: [NSImage imageNamed:@"playlist-pressed"]];
+        [o_playlist_btn setImage: [NSImage imageNamed:@"playlist-btn"]];
+        [o_playlist_btn setAlternateImage: [NSImage imageNamed:@"playlist-btn-pressed"]];
         o_repeat_img = [[NSImage imageNamed:@"repeat"] retain];
         o_repeat_pressed_img = [[NSImage imageNamed:@"repeat-pressed"] retain];
         o_repeat_all_img  = [[NSImage imageNamed:@"repeat-all"] retain];