Skip to content

V
vlc-gpu
Commit 07ef9fa5 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

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

macosx: Cocoa cannot deal with 2 images of the same name in a single bundle even if their type is different

Hence, rename one of them.

This is a manual backport of 6051f82ac2a50ce9210ab8ffe052b2784952d18a.
parent 1a7fbfcd
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
Makefile.am
View file @ 07ef9fa5
...@@ -217,9 +217,9 @@ EXTRA_DIST += \ ...@@ -217,9 +217,9 @@ EXTRA_DIST += \
extras/package/macosx/Resources/mainwindow/pause.png \ extras/package/macosx/Resources/mainwindow/pause.png \
extras/package/macosx/Resources/mainwindow/play-pressed.png \ extras/package/macosx/Resources/mainwindow/play-pressed.png \
extras/package/macosx/Resources/mainwindow/play.png \ extras/package/macosx/Resources/mainwindow/play.png \
extras/package/macosx/Resources/mainwindow/playlist-blue.png \ extras/package/macosx/Resources/mainwindow/playlist-btn-blue.png \
extras/package/macosx/Resources/mainwindow/playlist-pressed.png \ extras/package/macosx/Resources/mainwindow/playlist-btn-pressed.png \
extras/package/macosx/Resources/mainwindow/playlist.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-left.png \
extras/package/macosx/Resources/mainwindow/progression-fill-middle.png \ extras/package/macosx/Resources/mainwindow/progression-fill-middle.png \
extras/package/macosx/Resources/mainwindow/progression-fill-right.png \ extras/package/macosx/Resources/mainwindow/progression-fill-right.png \
......
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @ 07ef9fa5
...@@ -21,16 +21,16 @@ ...@@ -21,16 +21,16 @@
</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="915"/> <integer value="2730"/>
<integer value="1617"/> <integer value="2770"/>
<integer value="4948"/> <integer value="4948"/>
<integer value="81"/> <integer value="81"/>
<integer value="2730"/>
<integer value="4596"/>
<integer value="4850"/> <integer value="4850"/>
<integer value="4756"/>
<integer value="1617"/>
<integer value="4596"/>
<integer value="915"/>
<integer value="4722"/> <integer value="4722"/>
<integer value="2770"/>
<integer value="21"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -821,11 +821,11 @@ ...@@ -821,11 +821,11 @@
<int key="NSButtonFlags2">2</int> <int key="NSButtonFlags2">2</int>
<object class="NSCustomResource" key="NSNormalImage"> <object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string> <string key="NSClassName">NSImage</string>
<string key="NSResourceName">playlist</string> <string key="NSResourceName">playlist-btn</string>
</object> </object>
<object class="NSCustomResource" key="NSAlternateImage"> <object class="NSCustomResource" key="NSAlternateImage">
<string key="NSClassName">NSImage</string> <string key="NSClassName">NSImage</string>
<string key="NSResourceName">playlist-pressed</string> <string key="NSResourceName">playlist-btn-pressed</string>
</object> </object>
<string key="NSAlternateContents"/> <string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/> <string key="NSKeyEquivalent"/>
...@@ -18779,8 +18779,8 @@ LCAuLi4</string> ...@@ -18779,8 +18779,8 @@ LCAuLi4</string>
<string>fullscreen-double-buttons-pressed</string> <string>fullscreen-double-buttons-pressed</string>
<string>play</string> <string>play</string>
<string>play-pressed</string> <string>play-pressed</string>
<string>playlist</string> <string>playlist-btn</string>
<string>playlist-pressed</string> <string>playlist-btn-pressed</string>
<string>repeat</string> <string>repeat</string>
<string>repeat-pressed</string> <string>repeat-pressed</string>
<string>shuffle</string> <string>shuffle</string>
...@@ -18821,8 +18821,8 @@ LCAuLi4</string> ...@@ -18821,8 +18821,8 @@ LCAuLi4</string>
<string>{29, 23}</string> <string>{29, 23}</string>
<string>{29, 30}</string> <string>{29, 30}</string>
<string>{29, 30}</string> <string>{29, 30}</string>
<string>{512, 512}</string> <string>{128, 128}</string>
<string>{28, 23}</string> <string>{128, 128}</string>
<string>{28, 23}</string> <string>{28, 23}</string>
<string>{28, 23}</string> <string>{28, 23}</string>
<string>{29, 23}</string> <string>{29, 23}</string>
......
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ 07ef9fa5
...@@ -98,9 +98,9 @@ ...@@ -98,9 +98,9 @@
CC04337513B28B8200D7D52E /* pause.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334113B28B8200D7D52E /* pause.png */; }; CC04337513B28B8200D7D52E /* pause.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334113B28B8200D7D52E /* pause.png */; };
CC04337613B28B8200D7D52E /* play-pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334213B28B8200D7D52E /* play-pressed.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 */; }; CC04337713B28B8200D7D52E /* play.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334313B28B8200D7D52E /* play.png */; };
CC04337813B28B8200D7D52E /* playlist-blue.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334413B28B8200D7D52E /* playlist-blue.png */; }; CC04337813B28B8200D7D52E /* playlist-btn-blue.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334413B28B8200D7D52E /* playlist-btn-blue.png */; };
CC04337913B28B8200D7D52E /* playlist-pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334513B28B8200D7D52E /* playlist-pressed.png */; }; CC04337913B28B8200D7D52E /* playlist-btn-pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334513B28B8200D7D52E /* playlist-btn-pressed.png */; };
CC04337A13B28B8200D7D52E /* playlist.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334613B28B8200D7D52E /* playlist.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 */; }; 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 */; }; 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 */; }; CC04337D13B28B8200D7D52E /* progression-fill-right.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04334913B28B8200D7D52E /* progression-fill-right.png */; };
...@@ -418,9 +418,9 @@ ...@@ -418,9 +418,9 @@
CC04334113B28B8200D7D52E /* pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause.png; path = Resources/mainwindow/pause.png; sourceTree = "<group>"; }; 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>"; }; 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>"; }; 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>"; }; CC04334413B28B8200D7D52E /* playlist-btn-blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "playlist-btn-blue.png"; path = "Resources/mainwindow/playlist-btn-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>"; }; CC04334513B28B8200D7D52E /* playlist-btn-pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "playlist-btn-pressed.png"; path = "Resources/mainwindow/playlist-btn-pressed.png"; sourceTree = "<group>"; };
CC04334613B28B8200D7D52E /* playlist.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = playlist.png; path = Resources/mainwindow/playlist.png; sourceTree = "<group>"; }; CC04334613B28B8200D7D52E /* playlist-btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; 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>"; }; 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>"; }; 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>"; }; CC04334913B28B8200D7D52E /* progression-fill-right.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "progression-fill-right.png"; path = "Resources/mainwindow/progression-fill-right.png"; sourceTree = "<group>"; };
...@@ -948,9 +948,9 @@ ...@@ -948,9 +948,9 @@
CC04334113B28B8200D7D52E /* pause.png */, CC04334113B28B8200D7D52E /* pause.png */,
CC04334213B28B8200D7D52E /* play-pressed.png */, CC04334213B28B8200D7D52E /* play-pressed.png */,
CC04334313B28B8200D7D52E /* play.png */, CC04334313B28B8200D7D52E /* play.png */,
CC04334413B28B8200D7D52E /* playlist-blue.png */, CC04334413B28B8200D7D52E /* playlist-btn-blue.png */,
CC04334513B28B8200D7D52E /* playlist-pressed.png */, CC04334513B28B8200D7D52E /* playlist-btn-pressed.png */,
CC04334613B28B8200D7D52E /* playlist.png */, CC04334613B28B8200D7D52E /* playlist-btn.png */,
CC04334713B28B8200D7D52E /* progression-fill-left.png */, CC04334713B28B8200D7D52E /* progression-fill-left.png */,
CC04334813B28B8200D7D52E /* progression-fill-middle.png */, CC04334813B28B8200D7D52E /* progression-fill-middle.png */,
CC04334913B28B8200D7D52E /* progression-fill-right.png */, CC04334913B28B8200D7D52E /* progression-fill-right.png */,
...@@ -1386,9 +1386,9 @@ ...@@ -1386,9 +1386,9 @@
CC04337513B28B8200D7D52E /* pause.png in Resources */, CC04337513B28B8200D7D52E /* pause.png in Resources */,
CC04337613B28B8200D7D52E /* play-pressed.png in Resources */, CC04337613B28B8200D7D52E /* play-pressed.png in Resources */,
CC04337713B28B8200D7D52E /* play.png in Resources */, CC04337713B28B8200D7D52E /* play.png in Resources */,
CC04337813B28B8200D7D52E /* playlist-blue.png in Resources */, CC04337813B28B8200D7D52E /* playlist-btn-blue.png in Resources */,
CC04337913B28B8200D7D52E /* playlist-pressed.png in Resources */, CC04337913B28B8200D7D52E /* playlist-btn-pressed.png in Resources */,
CC04337A13B28B8200D7D52E /* playlist.png in Resources */, CC04337A13B28B8200D7D52E /* playlist-btn.png in Resources */,
CC04337B13B28B8200D7D52E /* progression-fill-left.png in Resources */, CC04337B13B28B8200D7D52E /* progression-fill-left.png in Resources */,
CC04337C13B28B8200D7D52E /* progression-fill-middle.png in Resources */, CC04337C13B28B8200D7D52E /* progression-fill-middle.png in Resources */,
CC04337D13B28B8200D7D52E /* progression-fill-right.png in Resources */, CC04337D13B28B8200D7D52E /* progression-fill-right.png in Resources */,
......
modules/gui/macosx/MainWindow.m
View file @ 07ef9fa5
...@@ -202,8 +202,8 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -202,8 +202,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_detached_fwd_btn setAlternateImage: [NSImage imageNamed:@"forward-pressed"]]; [o_detached_fwd_btn setAlternateImage: [NSImage imageNamed:@"forward-pressed"]];
[o_stop_btn setImage: [NSImage imageNamed:@"stop"]]; [o_stop_btn setImage: [NSImage imageNamed:@"stop"]];
[o_stop_btn setAlternateImage: [NSImage imageNamed:@"stop-pressed"]]; [o_stop_btn setAlternateImage: [NSImage imageNamed:@"stop-pressed"]];
[o_playlist_btn setImage: [NSImage imageNamed:@"playlist"]]; [o_playlist_btn setImage: [NSImage imageNamed:@"playlist-btn"]];
[o_playlist_btn setAlternateImage: [NSImage imageNamed:@"playlist-pressed"]]; [o_playlist_btn setAlternateImage: [NSImage imageNamed:@"playlist-btn-pressed"]];
o_repeat_img = [[NSImage imageNamed:@"repeat"] retain]; o_repeat_img = [[NSImage imageNamed:@"repeat"] retain];
o_repeat_pressed_img = [[NSImage imageNamed:@"repeat-pressed"] retain]; o_repeat_pressed_img = [[NSImage imageNamed:@"repeat-pressed"] retain];
o_repeat_all_img = [[NSImage imageNamed:@"repeat-all"] retain]; o_repeat_all_img = [[NSImage imageNamed:@"repeat-all"] retain];
......
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