[vlc-commits] macOS: Restructure images a bit
Marvin Scholz
git at videolan.org
Fri Feb 10 16:57:52 CET 2017
vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Fri Feb 10 16:34:53 2017 +0100| [d2324e20a2af4667d778de3af759611bd5601a36] | committer: Marvin Scholz
macOS: Restructure images a bit
This renames the very generic-named icons folder to better match
what it actually contains, File Icons.
App Icons are moved to their own folder as they are not file icons.
This matches the new structure in Xcode better too.
Pref icons folder is renamed to match other folder names and the icons
are renamed to have a simpler name.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d2324e20a2af4667d778de3af759611bd5601a36
---
.../package/macosx/VLC.xcodeproj/project.pbxproj | 76 +++++++++++----------
modules/gui/macosx/Makefile.am | 56 +++++++--------
.../vlc-xmas.icns => App-Icons/VLC-Xmas.icns} | Bin
.../{icons/vlc.icns => App-Icons/VLC.icns} | Bin
.../Resources/{icons => File-Icons}/aiff.icns | Bin
.../Resources/{icons => File-Icons}/audio.icns | Bin
.../Resources/{icons => File-Icons}/avi.icns | Bin
.../Resources/{icons => File-Icons}/flv.icns | Bin
.../Resources/{icons => File-Icons}/generic.icns | Bin
.../Resources/{icons => File-Icons}/m4a.icns | Bin
.../Resources/{icons => File-Icons}/m4v.icns | Bin
.../Resources/{icons => File-Icons}/mkv.icns | Bin
.../Resources/{icons => File-Icons}/mov.icns | Bin
.../Resources/{icons => File-Icons}/movie.icns | Bin
.../Resources/{icons => File-Icons}/mp3.icns | Bin
.../Resources/{icons => File-Icons}/mpeg.icns | Bin
.../Resources/{icons => File-Icons}/ogg.icns | Bin
.../Resources/{icons => File-Icons}/playlist.icns | Bin
.../macosx/Resources/{icons => File-Icons}/rm.icns | Bin
.../Resources/{icons => File-Icons}/subtitle.icns | Bin
.../Resources/{icons => File-Icons}/vob.icns | Bin
.../Resources/{icons => File-Icons}/wav.icns | Bin
.../Resources/{icons => File-Icons}/wma.icns | Bin
.../Resources/{icons => File-Icons}/wmv.icns | Bin
modules/gui/macosx/Resources/Info.plist.in | 2 +-
.../VLCAudioCone.png} | Bin
.../VLCHotkeysCone.png} | Bin
.../VLCInputCone.png} | Bin
.../VLCInterfaceCone.png} | Bin
.../VLCSubtitleCone.png} | Bin
.../VLCVideoCone.png} | Bin
modules/gui/macosx/UI/About.xib | 22 +++---
modules/gui/macosx/UI/ResumeDialog.xib | 11 +--
modules/gui/macosx/UI/VLCStatusBarIconMainMenu.xib | 11 ++-
modules/gui/macosx/VLCAboutWindowController.m | 2 +-
modules/gui/macosx/VLCMain.m | 2 +-
modules/gui/macosx/simple_prefs.m | 12 ++--
37 files changed, 96 insertions(+), 98 deletions(-)
diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index 0452229..e37958d 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -80,28 +80,28 @@
6B82244C1E4D2B1C00833BE1 /* VLCPreviousTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = VLCPreviousTemplate.pdf; path = "Button-Icons/VLCPreviousTemplate.pdf"; sourceTree = "<group>"; };
6B82244D1E4D2B1C00833BE1 /* VLCShuffleTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = VLCShuffleTemplate.pdf; path = "Button-Icons/VLCShuffleTemplate.pdf"; sourceTree = "<group>"; };
6B82244E1E4D2B1C00833BE1 /* VLCStatusBarIcon.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = VLCStatusBarIcon.pdf; path = "Button-Icons/VLCStatusBarIcon.pdf"; sourceTree = "<group>"; };
- 6B8224551E4D2B4700833BE1 /* aiff.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = aiff.icns; path = icons/aiff.icns; sourceTree = "<group>"; };
- 6B8224561E4D2B4700833BE1 /* audio.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = audio.icns; path = icons/audio.icns; sourceTree = "<group>"; };
- 6B8224571E4D2B4700833BE1 /* avi.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = avi.icns; path = icons/avi.icns; sourceTree = "<group>"; };
- 6B8224581E4D2B4700833BE1 /* flv.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = flv.icns; path = icons/flv.icns; sourceTree = "<group>"; };
- 6B8224591E4D2B4700833BE1 /* generic.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = generic.icns; path = icons/generic.icns; sourceTree = "<group>"; };
- 6B82245A1E4D2B4700833BE1 /* m4a.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = m4a.icns; path = icons/m4a.icns; sourceTree = "<group>"; };
- 6B82245B1E4D2B4700833BE1 /* m4v.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = m4v.icns; path = icons/m4v.icns; sourceTree = "<group>"; };
- 6B82245C1E4D2B4700833BE1 /* mkv.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = mkv.icns; path = icons/mkv.icns; sourceTree = "<group>"; };
- 6B82245D1E4D2B4700833BE1 /* mov.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = mov.icns; path = icons/mov.icns; sourceTree = "<group>"; };
- 6B82245E1E4D2B4700833BE1 /* movie.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = movie.icns; path = icons/movie.icns; sourceTree = "<group>"; };
- 6B82245F1E4D2B4700833BE1 /* mp3.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = mp3.icns; path = icons/mp3.icns; sourceTree = "<group>"; };
- 6B8224601E4D2B4700833BE1 /* mpeg.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = mpeg.icns; path = icons/mpeg.icns; sourceTree = "<group>"; };
- 6B8224611E4D2B4700833BE1 /* ogg.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = ogg.icns; path = icons/ogg.icns; sourceTree = "<group>"; };
- 6B8224621E4D2B4700833BE1 /* playlist.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = playlist.icns; path = icons/playlist.icns; sourceTree = "<group>"; };
- 6B8224631E4D2B4700833BE1 /* rm.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = rm.icns; path = icons/rm.icns; sourceTree = "<group>"; };
- 6B8224641E4D2B4700833BE1 /* subtitle.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = subtitle.icns; path = icons/subtitle.icns; sourceTree = "<group>"; };
- 6B8224651E4D2B4700833BE1 /* vob.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = vob.icns; path = icons/vob.icns; sourceTree = "<group>"; };
- 6B8224661E4D2B4700833BE1 /* wav.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = wav.icns; path = icons/wav.icns; sourceTree = "<group>"; };
- 6B8224671E4D2B4700833BE1 /* wma.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = wma.icns; path = icons/wma.icns; sourceTree = "<group>"; };
- 6B8224681E4D2B4700833BE1 /* wmv.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = wmv.icns; path = icons/wmv.icns; sourceTree = "<group>"; };
- 6B82247D1E4D2BAB00833BE1 /* vlc-xmas.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = "vlc-xmas.icns"; path = "icons/vlc-xmas.icns"; sourceTree = "<group>"; };
- 6B82247E1E4D2BAB00833BE1 /* vlc.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = vlc.icns; path = icons/vlc.icns; sourceTree = "<group>"; };
+ 6B8224551E4D2B4700833BE1 /* aiff.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = aiff.icns; sourceTree = "<group>"; };
+ 6B8224561E4D2B4700833BE1 /* audio.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = audio.icns; sourceTree = "<group>"; };
+ 6B8224571E4D2B4700833BE1 /* avi.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = avi.icns; sourceTree = "<group>"; };
+ 6B8224581E4D2B4700833BE1 /* flv.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = flv.icns; sourceTree = "<group>"; };
+ 6B8224591E4D2B4700833BE1 /* generic.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = generic.icns; sourceTree = "<group>"; };
+ 6B82245A1E4D2B4700833BE1 /* m4a.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = m4a.icns; sourceTree = "<group>"; };
+ 6B82245B1E4D2B4700833BE1 /* m4v.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = m4v.icns; sourceTree = "<group>"; };
+ 6B82245C1E4D2B4700833BE1 /* mkv.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = mkv.icns; sourceTree = "<group>"; };
+ 6B82245D1E4D2B4700833BE1 /* mov.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = mov.icns; sourceTree = "<group>"; };
+ 6B82245E1E4D2B4700833BE1 /* movie.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = movie.icns; sourceTree = "<group>"; };
+ 6B82245F1E4D2B4700833BE1 /* mp3.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = mp3.icns; sourceTree = "<group>"; };
+ 6B8224601E4D2B4700833BE1 /* mpeg.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = mpeg.icns; sourceTree = "<group>"; };
+ 6B8224611E4D2B4700833BE1 /* ogg.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = ogg.icns; sourceTree = "<group>"; };
+ 6B8224621E4D2B4700833BE1 /* playlist.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = playlist.icns; sourceTree = "<group>"; };
+ 6B8224631E4D2B4700833BE1 /* rm.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = rm.icns; sourceTree = "<group>"; };
+ 6B8224641E4D2B4700833BE1 /* subtitle.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = subtitle.icns; sourceTree = "<group>"; };
+ 6B8224651E4D2B4700833BE1 /* vob.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = vob.icns; sourceTree = "<group>"; };
+ 6B8224661E4D2B4700833BE1 /* wav.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = wav.icns; sourceTree = "<group>"; };
+ 6B8224671E4D2B4700833BE1 /* wma.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = wma.icns; sourceTree = "<group>"; };
+ 6B8224681E4D2B4700833BE1 /* wmv.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = wmv.icns; sourceTree = "<group>"; };
+ 6B82247D1E4D2BAB00833BE1 /* VLC-Xmas.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "VLC-Xmas.icns"; sourceTree = "<group>"; };
+ 6B82247E1E4D2BAB00833BE1 /* VLC.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = VLC.icns; sourceTree = "<group>"; };
6B82255B1E4D2C2400833BE1 /* backward-3btns-pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backward-3btns-pressed.png"; sourceTree = "<group>"; };
6B82255C1E4D2C2400833BE1 /* backward-3btns-pressed at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backward-3btns-pressed at 2x.png"; sourceTree = "<group>"; };
6B82255D1E4D2C2400833BE1 /* backward-3btns.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backward-3btns.png"; sourceTree = "<group>"; };
@@ -546,12 +546,12 @@
6B8229491E4D2CC500833BE1 /* ys-volume-slider-knob_dark at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ys-volume-slider-knob_dark at 2x.png"; sourceTree = "<group>"; };
6B82294A1E4D2CC500833BE1 /* ys-volume-slider-track_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ys-volume-slider-track_dark.png"; sourceTree = "<group>"; };
6B82294B1E4D2CC500833BE1 /* ys-volume-slider-track_dark at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ys-volume-slider-track_dark at 2x.png"; sourceTree = "<group>"; };
- 6B8229BF1E4D2CFC00833BE1 /* spref_cone_Audio_64.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spref_cone_Audio_64.png; sourceTree = "<group>"; };
- 6B8229C01E4D2CFC00833BE1 /* spref_cone_Hotkeys_64.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spref_cone_Hotkeys_64.png; sourceTree = "<group>"; };
- 6B8229C11E4D2CFC00833BE1 /* spref_cone_Input_64.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spref_cone_Input_64.png; sourceTree = "<group>"; };
- 6B8229C21E4D2CFC00833BE1 /* spref_cone_Interface_64.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spref_cone_Interface_64.png; sourceTree = "<group>"; };
- 6B8229C31E4D2CFC00833BE1 /* spref_cone_Subtitles_64.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spref_cone_Subtitles_64.png; sourceTree = "<group>"; };
- 6B8229C41E4D2CFC00833BE1 /* spref_cone_Video_64.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spref_cone_Video_64.png; sourceTree = "<group>"; };
+ 6B8229BF1E4D2CFC00833BE1 /* VLCAudioCone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = VLCAudioCone.png; sourceTree = "<group>"; };
+ 6B8229C01E4D2CFC00833BE1 /* VLCHotkeysCone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = VLCHotkeysCone.png; sourceTree = "<group>"; };
+ 6B8229C11E4D2CFC00833BE1 /* VLCInputCone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = VLCInputCone.png; sourceTree = "<group>"; };
+ 6B8229C21E4D2CFC00833BE1 /* VLCInterfaceCone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = VLCInterfaceCone.png; sourceTree = "<group>"; };
+ 6B8229C31E4D2CFC00833BE1 /* VLCSubtitleCone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = VLCSubtitleCone.png; sourceTree = "<group>"; };
+ 6B8229C41E4D2CFC00833BE1 /* VLCVideoCone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = VLCVideoCone.png; sourceTree = "<group>"; };
6B8229CC1E4D2D4700833BE1 /* sidebar-local.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-local.png"; sourceTree = "<group>"; };
6B8229CD1E4D2D4700833BE1 /* sidebar-local at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-local at 2x.png"; sourceTree = "<group>"; };
6B8229CE1E4D2D4700833BE1 /* sidebar-movie.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-movie.png"; sourceTree = "<group>"; };
@@ -941,10 +941,11 @@
6B8224811E4D2BB300833BE1 /* App Icons */ = {
isa = PBXGroup;
children = (
- 6B82247D1E4D2BAB00833BE1 /* vlc-xmas.icns */,
- 6B82247E1E4D2BAB00833BE1 /* vlc.icns */,
+ 6B82247D1E4D2BAB00833BE1 /* VLC-Xmas.icns */,
+ 6B82247E1E4D2BAB00833BE1 /* VLC.icns */,
);
name = "App Icons";
+ path = "App-Icons";
sourceTree = "<group>";
};
6B82255A1E4D2BE400833BE1 /* Main Window */ = {
@@ -1426,15 +1427,15 @@
6B8229BE1E4D2CDA00833BE1 /* Preference Cones */ = {
isa = PBXGroup;
children = (
- 6B8229BF1E4D2CFC00833BE1 /* spref_cone_Audio_64.png */,
- 6B8229C01E4D2CFC00833BE1 /* spref_cone_Hotkeys_64.png */,
- 6B8229C11E4D2CFC00833BE1 /* spref_cone_Input_64.png */,
- 6B8229C21E4D2CFC00833BE1 /* spref_cone_Interface_64.png */,
- 6B8229C31E4D2CFC00833BE1 /* spref_cone_Subtitles_64.png */,
- 6B8229C41E4D2CFC00833BE1 /* spref_cone_Video_64.png */,
+ 6B8229BF1E4D2CFC00833BE1 /* VLCAudioCone.png */,
+ 6B8229C01E4D2CFC00833BE1 /* VLCHotkeysCone.png */,
+ 6B8229C11E4D2CFC00833BE1 /* VLCInputCone.png */,
+ 6B8229C21E4D2CFC00833BE1 /* VLCInterfaceCone.png */,
+ 6B8229C31E4D2CFC00833BE1 /* VLCSubtitleCone.png */,
+ 6B8229C41E4D2CFC00833BE1 /* VLCVideoCone.png */,
);
name = "Preference Cones";
- path = prefs;
+ path = "Pref-Icons";
sourceTree = "<group>";
};
6B8229CB1E4D2D2C00833BE1 /* Sidebar Icons */ = {
@@ -1543,6 +1544,7 @@
6B8224681E4D2B4700833BE1 /* wmv.icns */,
);
name = "File Icons";
+ path = "File-Icons";
sourceTree = "<group>";
};
CC0430EE13B2461A00D7D52E /* UI Graphics */ = {
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 178aad7..d5894b2 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -173,28 +173,28 @@ xib_verbose__0 = $(xib_verbose_0)
--compile $@ $<
DEPS_res = \
- Resources/icons/aiff.icns \
- Resources/icons/audio.icns \
- Resources/icons/avi.icns \
- Resources/icons/flv.icns \
- Resources/icons/generic.icns \
- Resources/icons/m4a.icns \
- Resources/icons/m4v.icns \
- Resources/icons/mkv.icns \
- Resources/icons/mov.icns \
- Resources/icons/movie.icns \
- Resources/icons/mp3.icns \
- Resources/icons/mpeg.icns \
- Resources/icons/ogg.icns \
- Resources/icons/playlist.icns \
- Resources/icons/rm.icns \
- Resources/icons/subtitle.icns \
- Resources/icons/vlc-xmas.icns \
- Resources/icons/vlc.icns \
- Resources/icons/vob.icns \
- Resources/icons/wav.icns \
- Resources/icons/wma.icns \
- Resources/icons/wmv.icns \
+ Resources/App-Icons/VLC-Xmas.icns \
+ Resources/App-Icons/VLC.icns \
+ Resources/File-Icons/aiff.icns \
+ Resources/File-Icons/audio.icns \
+ Resources/File-Icons/avi.icns \
+ Resources/File-Icons/flv.icns \
+ Resources/File-Icons/generic.icns \
+ Resources/File-Icons/m4a.icns \
+ Resources/File-Icons/m4v.icns \
+ Resources/File-Icons/mkv.icns \
+ Resources/File-Icons/mov.icns \
+ Resources/File-Icons/movie.icns \
+ Resources/File-Icons/mp3.icns \
+ Resources/File-Icons/mpeg.icns \
+ Resources/File-Icons/ogg.icns \
+ Resources/File-Icons/playlist.icns \
+ Resources/File-Icons/rm.icns \
+ Resources/File-Icons/subtitle.icns \
+ Resources/File-Icons/vob.icns \
+ Resources/File-Icons/wav.icns \
+ Resources/File-Icons/wma.icns \
+ Resources/File-Icons/wmv.icns \
Resources/mainwindow/backward-3btns-pressed.png \
Resources/mainwindow/backward-3btns-pressed at 2x.png \
Resources/mainwindow/backward-3btns.png \
@@ -729,12 +729,12 @@ DEPS_res = \
Resources/mainwindow_yosemite/ys-volume-slider-track.png \
Resources/mainwindow_yosemite/ys-volume-slider-track at 2x.png \
Resources/noart.png \
- Resources/prefs/spref_cone_Audio_64.png \
- Resources/prefs/spref_cone_Hotkeys_64.png \
- Resources/prefs/spref_cone_Input_64.png \
- Resources/prefs/spref_cone_Interface_64.png \
- Resources/prefs/spref_cone_Subtitles_64.png \
- Resources/prefs/spref_cone_Video_64.png \
+ Resources/Pref-Icons/VLCAudioCone.png \
+ Resources/Pref-Icons/VLCHotkeysCone.png \
+ Resources/Pref-Icons/VLCInputCone.png \
+ Resources/Pref-Icons/VLCInterfaceCone.png \
+ Resources/Pref-Icons/VLCSubtitleCone.png \
+ Resources/Pref-Icons/VLCVideoCone.png \
Resources/sidebar-icons/sidebar-local.png \
Resources/sidebar-icons/sidebar-local at 2x.png \
Resources/sidebar-icons/sidebar-movie.png \
diff --git a/modules/gui/macosx/Resources/icons/vlc-xmas.icns b/modules/gui/macosx/Resources/App-Icons/VLC-Xmas.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/vlc-xmas.icns
rename to modules/gui/macosx/Resources/App-Icons/VLC-Xmas.icns
diff --git a/modules/gui/macosx/Resources/icons/vlc.icns b/modules/gui/macosx/Resources/App-Icons/VLC.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/vlc.icns
rename to modules/gui/macosx/Resources/App-Icons/VLC.icns
diff --git a/modules/gui/macosx/Resources/icons/aiff.icns b/modules/gui/macosx/Resources/File-Icons/aiff.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/aiff.icns
rename to modules/gui/macosx/Resources/File-Icons/aiff.icns
diff --git a/modules/gui/macosx/Resources/icons/audio.icns b/modules/gui/macosx/Resources/File-Icons/audio.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/audio.icns
rename to modules/gui/macosx/Resources/File-Icons/audio.icns
diff --git a/modules/gui/macosx/Resources/icons/avi.icns b/modules/gui/macosx/Resources/File-Icons/avi.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/avi.icns
rename to modules/gui/macosx/Resources/File-Icons/avi.icns
diff --git a/modules/gui/macosx/Resources/icons/flv.icns b/modules/gui/macosx/Resources/File-Icons/flv.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/flv.icns
rename to modules/gui/macosx/Resources/File-Icons/flv.icns
diff --git a/modules/gui/macosx/Resources/icons/generic.icns b/modules/gui/macosx/Resources/File-Icons/generic.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/generic.icns
rename to modules/gui/macosx/Resources/File-Icons/generic.icns
diff --git a/modules/gui/macosx/Resources/icons/m4a.icns b/modules/gui/macosx/Resources/File-Icons/m4a.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/m4a.icns
rename to modules/gui/macosx/Resources/File-Icons/m4a.icns
diff --git a/modules/gui/macosx/Resources/icons/m4v.icns b/modules/gui/macosx/Resources/File-Icons/m4v.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/m4v.icns
rename to modules/gui/macosx/Resources/File-Icons/m4v.icns
diff --git a/modules/gui/macosx/Resources/icons/mkv.icns b/modules/gui/macosx/Resources/File-Icons/mkv.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/mkv.icns
rename to modules/gui/macosx/Resources/File-Icons/mkv.icns
diff --git a/modules/gui/macosx/Resources/icons/mov.icns b/modules/gui/macosx/Resources/File-Icons/mov.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/mov.icns
rename to modules/gui/macosx/Resources/File-Icons/mov.icns
diff --git a/modules/gui/macosx/Resources/icons/movie.icns b/modules/gui/macosx/Resources/File-Icons/movie.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/movie.icns
rename to modules/gui/macosx/Resources/File-Icons/movie.icns
diff --git a/modules/gui/macosx/Resources/icons/mp3.icns b/modules/gui/macosx/Resources/File-Icons/mp3.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/mp3.icns
rename to modules/gui/macosx/Resources/File-Icons/mp3.icns
diff --git a/modules/gui/macosx/Resources/icons/mpeg.icns b/modules/gui/macosx/Resources/File-Icons/mpeg.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/mpeg.icns
rename to modules/gui/macosx/Resources/File-Icons/mpeg.icns
diff --git a/modules/gui/macosx/Resources/icons/ogg.icns b/modules/gui/macosx/Resources/File-Icons/ogg.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/ogg.icns
rename to modules/gui/macosx/Resources/File-Icons/ogg.icns
diff --git a/modules/gui/macosx/Resources/icons/playlist.icns b/modules/gui/macosx/Resources/File-Icons/playlist.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/playlist.icns
rename to modules/gui/macosx/Resources/File-Icons/playlist.icns
diff --git a/modules/gui/macosx/Resources/icons/rm.icns b/modules/gui/macosx/Resources/File-Icons/rm.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/rm.icns
rename to modules/gui/macosx/Resources/File-Icons/rm.icns
diff --git a/modules/gui/macosx/Resources/icons/subtitle.icns b/modules/gui/macosx/Resources/File-Icons/subtitle.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/subtitle.icns
rename to modules/gui/macosx/Resources/File-Icons/subtitle.icns
diff --git a/modules/gui/macosx/Resources/icons/vob.icns b/modules/gui/macosx/Resources/File-Icons/vob.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/vob.icns
rename to modules/gui/macosx/Resources/File-Icons/vob.icns
diff --git a/modules/gui/macosx/Resources/icons/wav.icns b/modules/gui/macosx/Resources/File-Icons/wav.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/wav.icns
rename to modules/gui/macosx/Resources/File-Icons/wav.icns
diff --git a/modules/gui/macosx/Resources/icons/wma.icns b/modules/gui/macosx/Resources/File-Icons/wma.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/wma.icns
rename to modules/gui/macosx/Resources/File-Icons/wma.icns
diff --git a/modules/gui/macosx/Resources/icons/wmv.icns b/modules/gui/macosx/Resources/File-Icons/wmv.icns
similarity index 100%
rename from modules/gui/macosx/Resources/icons/wmv.icns
rename to modules/gui/macosx/Resources/File-Icons/wmv.icns
diff --git a/modules/gui/macosx/Resources/Info.plist.in b/modules/gui/macosx/Resources/Info.plist.in
index 19c7f8b..28e6738 100644
--- a/modules/gui/macosx/Resources/Info.plist.in
+++ b/modules/gui/macosx/Resources/Info.plist.in
@@ -1464,7 +1464,7 @@
<key>CFBundleGetInfoString</key>
<string>@COPYRIGHT_MESSAGE@</string>
<key>CFBundleIconFile</key>
- <string>vlc.icns</string>
+ <string>VLC.icns</string>
<key>CFBundleIdentifier</key>
<string>org.videolan.vlc</string>
<key>CFBundleInfoDictionaryVersion</key>
diff --git a/modules/gui/macosx/Resources/prefs/spref_cone_Audio_64.png b/modules/gui/macosx/Resources/Pref-Icons/VLCAudioCone.png
similarity index 100%
rename from modules/gui/macosx/Resources/prefs/spref_cone_Audio_64.png
rename to modules/gui/macosx/Resources/Pref-Icons/VLCAudioCone.png
diff --git a/modules/gui/macosx/Resources/prefs/spref_cone_Hotkeys_64.png b/modules/gui/macosx/Resources/Pref-Icons/VLCHotkeysCone.png
similarity index 100%
rename from modules/gui/macosx/Resources/prefs/spref_cone_Hotkeys_64.png
rename to modules/gui/macosx/Resources/Pref-Icons/VLCHotkeysCone.png
diff --git a/modules/gui/macosx/Resources/prefs/spref_cone_Input_64.png b/modules/gui/macosx/Resources/Pref-Icons/VLCInputCone.png
similarity index 100%
rename from modules/gui/macosx/Resources/prefs/spref_cone_Input_64.png
rename to modules/gui/macosx/Resources/Pref-Icons/VLCInputCone.png
diff --git a/modules/gui/macosx/Resources/prefs/spref_cone_Interface_64.png b/modules/gui/macosx/Resources/Pref-Icons/VLCInterfaceCone.png
similarity index 100%
rename from modules/gui/macosx/Resources/prefs/spref_cone_Interface_64.png
rename to modules/gui/macosx/Resources/Pref-Icons/VLCInterfaceCone.png
diff --git a/modules/gui/macosx/Resources/prefs/spref_cone_Subtitles_64.png b/modules/gui/macosx/Resources/Pref-Icons/VLCSubtitleCone.png
similarity index 100%
rename from modules/gui/macosx/Resources/prefs/spref_cone_Subtitles_64.png
rename to modules/gui/macosx/Resources/Pref-Icons/VLCSubtitleCone.png
diff --git a/modules/gui/macosx/Resources/prefs/spref_cone_Video_64.png b/modules/gui/macosx/Resources/Pref-Icons/VLCVideoCone.png
similarity index 100%
rename from modules/gui/macosx/Resources/prefs/spref_cone_Video_64.png
rename to modules/gui/macosx/Resources/Pref-Icons/VLCVideoCone.png
diff --git a/modules/gui/macosx/UI/About.xib b/modules/gui/macosx/UI/About.xib
index 467bf49..4b835e3 100644
--- a/modules/gui/macosx/UI/About.xib
+++ b/modules/gui/macosx/UI/About.xib
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment version="1070" identifier="macosx"/>
<development version="7000" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
<capability name="box content view" minToolsVersion="7.0"/>
</dependencies>
<objects>
@@ -30,7 +30,7 @@
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="173" y="74" width="721" height="356"/>
- <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
<value key="minSize" type="size" width="231.86799999999999" height="107"/>
<view key="contentView" id="1344">
<rect key="frame" x="0.0" y="0.0" width="721" height="356"/>
@@ -42,15 +42,13 @@
<rect key="frame" x="0.0" y="0.0" width="430" height="204"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <textView editable="NO" selectable="NO" importsGraphics="NO" richText="NO" usesRuler="YES" usesFontPanel="YES" verticallyResizable="YES" smartInsertDelete="YES" id="1342">
+ <textView editable="NO" selectable="NO" importsGraphics="NO" richText="NO" usesFontPanel="YES" usesRuler="YES" smartInsertDelete="YES" id="1342">
<rect key="frame" x="0.0" y="0.0" width="415" height="204"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
- <size key="minSize" width="430" height="204"/>
+ <size key="minSize" width="415" height="204"/>
<size key="maxSize" width="564" height="10000000"/>
<color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <size key="minSize" width="430" height="204"/>
- <size key="maxSize" width="564" height="10000000"/>
</textView>
</subviews>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
@@ -76,7 +74,7 @@
<constraint firstAttribute="height" constant="240" id="JQt-Up-e0A"/>
<constraint firstAttribute="width" constant="240" id="k85-B9-511"/>
</constraints>
- <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="vlc" id="2269"/>
+ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="VLC" id="2269"/>
</imageView>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2232">
<rect key="frame" x="269" y="274" width="248" height="16"/>
@@ -125,7 +123,7 @@ Help and join us!.</string>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="2313">
+ <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="2313">
<rect key="frame" x="-13" y="-9" width="747" height="90"/>
<view key="contentView" id="Ioe-L7-TBi">
<rect key="frame" x="1" y="1" width="745" height="88"/>
@@ -185,8 +183,6 @@ Help and join us!.</string>
<constraint firstAttribute="width" constant="741" id="7L8-Ze-VYg"/>
<constraint firstAttribute="height" constant="84" id="OTP-sG-AIS"/>
</constraints>
- <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
- <color key="fillColor" white="0.90000000000000002" alpha="1" colorSpace="calibratedWhite"/>
</box>
</subviews>
<constraints>
@@ -215,6 +211,6 @@ Help and join us!.</string>
</window>
</objects>
<resources>
- <image name="vlc" width="512" height="512"/>
+ <image name="VLC" width="512" height="512"/>
</resources>
</document>
diff --git a/modules/gui/macosx/UI/ResumeDialog.xib b/modules/gui/macosx/UI/ResumeDialog.xib
index c0fdedc..34a5b3a 100644
--- a/modules/gui/macosx/UI/ResumeDialog.xib
+++ b/modules/gui/macosx/UI/ResumeDialog.xib
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<development version="7000" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="VLCResumeDialogController">
@@ -49,10 +49,11 @@
<constraint firstAttribute="height" constant="65" id="rlw-rm-gTQ"/>
<constraint firstAttribute="width" constant="65" id="zgb-HV-gIF"/>
</constraints>
- <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="vlc" id="56"/>
+ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="VLC" id="56"/>
</imageView>
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="85X-TN-2Hu">
<rect key="frame" x="102" y="59" width="326" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="check" title="Always continue media playback" bezelStyle="regularSquare" imagePosition="left" inset="2" id="xHm-jn-IdY">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -103,6 +104,6 @@ DQ
</window>
</objects>
<resources>
- <image name="vlc" width="512" height="512"/>
+ <image name="VLC" width="512" height="512"/>
</resources>
</document>
diff --git a/modules/gui/macosx/UI/VLCStatusBarIconMainMenu.xib b/modules/gui/macosx/UI/VLCStatusBarIconMainMenu.xib
index bee03eb..2adb94b 100755
--- a/modules/gui/macosx/UI/VLCStatusBarIconMainMenu.xib
+++ b/modules/gui/macosx/UI/VLCStatusBarIconMainMenu.xib
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G24b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
- <deployment identifier="macosx"/>
<development version="7000" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="VLCStatusBarIcon">
@@ -72,7 +71,7 @@
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="0kw-t4-DcN">
<rect key="frame" x="6" y="4" width="48" height="62"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="vlc" id="7Ns-2s-EgU"/>
+ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="VLC" id="7Ns-2s-EgU"/>
</imageView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Byt-pH-60l">
<rect key="frame" x="60" y="42" width="183" height="17"/>
@@ -195,11 +194,11 @@
</customView>
</objects>
<resources>
+ <image name="VLC" width="512" height="512"/>
<image name="VLCNextTemplate" width="128" height="128"/>
<image name="VLCPauseTemplate" width="128" height="128"/>
<image name="VLCPlayTemplate" width="128" height="128"/>
<image name="VLCPreviousTemplate" width="128" height="128"/>
<image name="VLCShuffleTemplate" width="128" height="128"/>
- <image name="vlc" width="512" height="512"/>
</resources>
</document>
diff --git a/modules/gui/macosx/VLCAboutWindowController.m b/modules/gui/macosx/VLCAboutWindowController.m
index 9a5e5fa..27e3fad 100644
--- a/modules/gui/macosx/VLCAboutWindowController.m
+++ b/modules/gui/macosx/VLCAboutWindowController.m
@@ -168,7 +168,7 @@
NSUInteger dayOfYear = [gregorian ordinalityOfUnit:NSDayCalendarUnit inUnit:NSYearCalendarUnit forDate:[NSDate date]];
if (dayOfYear >= 354)
- [o_icon_view setImage: [NSImage imageNamed:@"vlc-xmas"]];
+ [o_icon_view setImage: [NSImage imageNamed:@"VLC-Xmas"]];
}
}
diff --git a/modules/gui/macosx/VLCMain.m b/modules/gui/macosx/VLCMain.m
index 9b08312..038003a 100644
--- a/modules/gui/macosx/VLCMain.m
+++ b/modules/gui/macosx/VLCMain.m
@@ -257,7 +257,7 @@ static VLCMain *sharedInstance = nil;
NSUInteger dayOfYear = [gregorian ordinalityOfUnit:NSDayCalendarUnit inUnit:NSYearCalendarUnit forDate:[NSDate date]];
if (dayOfYear >= 354)
- [[VLCApplication sharedApplication] setApplicationIconImage: [NSImage imageNamed:@"vlc-xmas"]];
+ [[VLCApplication sharedApplication] setApplicationIconImage: [NSImage imageNamed:@"VLC-Xmas"]];
}
}
diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 75fec12..9a12275 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -277,17 +277,17 @@ create_toolbar_item(NSString *itemIdent, NSString *name, NSString *desc, NSStrin
NSToolbarItem *toolbarItem = nil;
if ([itemIdent isEqual: VLCIntfSettingToolbarIdentifier]) {
- CreateToolbarItem(_NS("Interface"), _NS("Interface Settings"), @"spref_cone_Interface_64", showInterfaceSettings);
+ CreateToolbarItem(_NS("Interface"), _NS("Interface Settings"), @"VLCInterfaceCone", showInterfaceSettings);
} else if ([itemIdent isEqual: VLCAudioSettingToolbarIdentifier]) {
- CreateToolbarItem(_NS("Audio"), _NS("Audio Settings"), @"spref_cone_Audio_64", showAudioSettings);
+ CreateToolbarItem(_NS("Audio"), _NS("Audio Settings"), @"VLCAudioCone", showAudioSettings);
} else if ([itemIdent isEqual: VLCVideoSettingToolbarIdentifier]) {
- CreateToolbarItem(_NS("Video"), _NS("Video Settings"), @"spref_cone_Video_64", showVideoSettings);
+ CreateToolbarItem(_NS("Video"), _NS("Video Settings"), @"VLCVideoCone", showVideoSettings);
} else if ([itemIdent isEqual: VLCOSDSettingToolbarIdentifier]) {
- CreateToolbarItem(_NS(SUBPIC_TITLE), _NS("Subtitle & On Screen Display Settings"), @"spref_cone_Subtitles_64", showOSDSettings);
+ CreateToolbarItem(_NS(SUBPIC_TITLE), _NS("Subtitle & On Screen Display Settings"), @"VLCSubtitleCone", showOSDSettings);
} else if ([itemIdent isEqual: VLCInputSettingToolbarIdentifier]) {
- CreateToolbarItem(_NS(INPUT_TITLE), _NS("Input & Codec Settings"), @"spref_cone_Input_64", showInputSettings);
+ CreateToolbarItem(_NS(INPUT_TITLE), _NS("Input & Codec Settings"), @"VLCInputCone", showInputSettings);
} else if ([itemIdent isEqual: VLCHotkeysSettingToolbarIdentifier]) {
- CreateToolbarItem(_NS("Hotkeys"), _NS("Hotkeys settings"), @"spref_cone_Hotkeys_64", showHotkeySettings);
+ CreateToolbarItem(_NS("Hotkeys"), _NS("Hotkeys settings"), @"VLCHotkeysCone", showHotkeySettings);
}
return toolbarItem;
More information about the vlc-commits
mailing list