vlc/vlc-2.0 | branch: master | Damien Erambert <damien.eramb...@me.com> | Wed 
Jun 27 17:16:56 2012 +0200| [d1b4a6390b11b75a7a3de0c6b761cbe9294438c5] | 
committer: Felix Paul Kühne

macosx: added retina compatible sidebar icons

manual backport of 04d65ac9c8d807dad15a6480aee70c8fa3f0572e

Signed-off-by: Felix Paul Kühne <fkue...@videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=d1b4a6390b11b75a7a3de0c6b761cbe9294438c5
---

 Makefile.am                                        |    6 +++++
 .../Resources/sidebar-icons/sidebar-lo...@2x.png   |  Bin 0 -> 1898 bytes
 .../Resources/sidebar-icons/sidebar-mo...@2x.png   |  Bin 0 -> 1784 bytes
 .../Resources/sidebar-icons/sidebar-mu...@2x.png   |  Bin 0 -> 2280 bytes
 .../sidebar-icons/sidebar-pictu...@2x.png          |  Bin 0 -> 1765 bytes
 .../sidebar-icons/sidebar-playl...@2x.png          |  Bin 0 -> 2221 bytes
 .../Resources/sidebar-icons/sidebar-podc...@2x.png |  Bin 0 -> 1836 bytes
 .../package/macosx/vlc.xcodeproj/project.pbxproj   |   24 ++++++++++++++++++++
 8 files changed, 30 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 14e6f9d..c9dc7ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -460,11 +460,17 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/prefs/spref_cone_Video_64.png \
        extras/package/macosx/Resources/README \
        extras/package/macosx/Resources/sidebar-icons/sidebar-local.png \
+       extras/package/macosx/Resources/sidebar-icons/sidebar-lo...@2x.png \
        extras/package/macosx/Resources/sidebar-icons/sidebar-movie.png \
+       extras/package/macosx/Resources/sidebar-icons/sidebar-mo...@2x.png \
        extras/package/macosx/Resources/sidebar-icons/sidebar-music.png \
+       extras/package/macosx/Resources/sidebar-icons/sidebar-mu...@2x.png \
        extras/package/macosx/Resources/sidebar-icons/sidebar-pictures.png \
+       extras/package/macosx/Resources/sidebar-icons/sidebar-pictu...@2x.png \
        extras/package/macosx/Resources/sidebar-icons/sidebar-playlist.png \
+       extras/package/macosx/Resources/sidebar-icons/sidebar-playl...@2x.png \
        extras/package/macosx/Resources/sidebar-icons/sidebar-podcast.png \
+       extras/package/macosx/Resources/sidebar-icons/sidebar-podc...@2x.png \
        extras/package/macosx/Resources/vlc.scriptSuite \
        extras/package/macosx/Resources/vlc.scriptTerminology \
        extras/package/macosx/build-package.sh \
diff --git a/extras/package/macosx/Resources/sidebar-icons/sidebar-lo...@2x.png 
b/extras/package/macosx/Resources/sidebar-icons/sidebar-lo...@2x.png
new file mode 100644
index 0000000..a5898f1
Binary files /dev/null and 
b/extras/package/macosx/Resources/sidebar-icons/sidebar-lo...@2x.png differ
diff --git a/extras/package/macosx/Resources/sidebar-icons/sidebar-mo...@2x.png 
b/extras/package/macosx/Resources/sidebar-icons/sidebar-mo...@2x.png
new file mode 100644
index 0000000..cfd13d8
Binary files /dev/null and 
b/extras/package/macosx/Resources/sidebar-icons/sidebar-mo...@2x.png differ
diff --git a/extras/package/macosx/Resources/sidebar-icons/sidebar-mu...@2x.png 
b/extras/package/macosx/Resources/sidebar-icons/sidebar-mu...@2x.png
new file mode 100644
index 0000000..045e8d3
Binary files /dev/null and 
b/extras/package/macosx/Resources/sidebar-icons/sidebar-mu...@2x.png differ
diff --git 
a/extras/package/macosx/Resources/sidebar-icons/sidebar-pictu...@2x.png 
b/extras/package/macosx/Resources/sidebar-icons/sidebar-pictu...@2x.png
new file mode 100644
index 0000000..5b657b2
Binary files /dev/null and 
b/extras/package/macosx/Resources/sidebar-icons/sidebar-pictu...@2x.png differ
diff --git 
a/extras/package/macosx/Resources/sidebar-icons/sidebar-playl...@2x.png 
b/extras/package/macosx/Resources/sidebar-icons/sidebar-playl...@2x.png
new file mode 100644
index 0000000..d636925
Binary files /dev/null and 
b/extras/package/macosx/Resources/sidebar-icons/sidebar-playl...@2x.png differ
diff --git 
a/extras/package/macosx/Resources/sidebar-icons/sidebar-podc...@2x.png 
b/extras/package/macosx/Resources/sidebar-icons/sidebar-podc...@2x.png
new file mode 100644
index 0000000..85ac5e2
Binary files /dev/null and 
b/extras/package/macosx/Resources/sidebar-icons/sidebar-podc...@2x.png differ
diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj 
b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 0255841..2f580ac 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -368,6 +368,12 @@
                CCBAA7A1159B5AE000D8348C /* fs_volume_slider_...@2x.png in 
Resources */ = {isa = PBXBuildFile; fileRef = CCBAA786159B5AE000D8348C /* 
fs_volume_slider_...@2x.png */; };
                CCBAA7A2159B5AE000D8348C /* 
fs_volume_slider_knob_highli...@2x.png in Resources */ = {isa = PBXBuildFile; 
fileRef = CCBAA787159B5AE000D8348C /* fs_volume_slider_knob_highli...@2x.png 
*/; };
                CCBAA7A3159B5AE000D8348C /* fs_volume_slider_k...@2x.png in 
Resources */ = {isa = PBXBuildFile; fileRef = CCBAA788159B5AE000D8348C /* 
fs_volume_slider_k...@2x.png */; };
+               CCBAA7AA159B5B3F00D8348C /* sidebar-lo...@2x.png in Resources 
*/ = {isa = PBXBuildFile; fileRef = CCBAA7A4159B5B3F00D8348C /* 
sidebar-lo...@2x.png */; };
+               CCBAA7AB159B5B3F00D8348C /* sidebar-mo...@2x.png in Resources 
*/ = {isa = PBXBuildFile; fileRef = CCBAA7A5159B5B3F00D8348C /* 
sidebar-mo...@2x.png */; };
+               CCBAA7AC159B5B3F00D8348C /* sidebar-mu...@2x.png in Resources 
*/ = {isa = PBXBuildFile; fileRef = CCBAA7A6159B5B3F00D8348C /* 
sidebar-mu...@2x.png */; };
+               CCBAA7AD159B5B3F00D8348C /* sidebar-pictu...@2x.png in 
Resources */ = {isa = PBXBuildFile; fileRef = CCBAA7A7159B5B3F00D8348C /* 
sidebar-pictu...@2x.png */; };
+               CCBAA7AE159B5B3F00D8348C /* sidebar-playl...@2x.png in 
Resources */ = {isa = PBXBuildFile; fileRef = CCBAA7A8159B5B3F00D8348C /* 
sidebar-playl...@2x.png */; };
+               CCBAA7AF159B5B3F00D8348C /* sidebar-podc...@2x.png in Resources 
*/ = {isa = PBXBuildFile; fileRef = CCBAA7A9159B5B3F00D8348C /* 
sidebar-podc...@2x.png */; };
                CCBE999F0F922C51000705F8 /* CoreServices.framework in 
Frameworks */ = {isa = PBXBuildFile; fileRef = CCBE999E0F922C51000705F8 /* 
CoreServices.framework */; };
                CCD83E2D13FE9B90004F1652 /* MainMenu.xib in Resources */ = {isa 
= PBXBuildFile; fileRef = CCD83E2B13FE9B90004F1652 /* MainMenu.xib */; };
                CCD83E4413FEA143004F1652 /* About.xib in Resources */ = {isa = 
PBXBuildFile; fileRef = CCD83E2E13FEA143004F1652 /* About.xib */; };
@@ -836,6 +842,12 @@
                CCBAA786159B5AE000D8348C /* fs_volume_slider_...@2x.png */ = 
{isa = PBXFileReference; lastKnownFileType = image.png; name = 
"fs_volume_slider_...@2x.png"; path = 
"Resources/fspanel/fs_volume_slider_...@2x.png"; sourceTree = "<group>"; };
                CCBAA787159B5AE000D8348C /* 
fs_volume_slider_knob_highli...@2x.png */ = {isa = PBXFileReference; 
lastKnownFileType = image.png; name = "fs_volume_slider_knob_highli...@2x.png"; 
path = "Resources/fspanel/fs_volume_slider_knob_highli...@2x.png"; sourceTree = 
"<group>"; };
                CCBAA788159B5AE000D8348C /* fs_volume_slider_k...@2x.png */ = 
{isa = PBXFileReference; lastKnownFileType = image.png; name = 
"fs_volume_slider_k...@2x.png"; path = 
"Resources/fspanel/fs_volume_slider_k...@2x.png"; sourceTree = "<group>"; };
+               CCBAA7A4159B5B3F00D8348C /* sidebar-lo...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = "sidebar-lo...@2x.png"; 
path = "Resources/sidebar-icons/sidebar-lo...@2x.png"; sourceTree = "<group>"; 
};
+               CCBAA7A5159B5B3F00D8348C /* sidebar-mo...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = "sidebar-mo...@2x.png"; 
path = "Resources/sidebar-icons/sidebar-mo...@2x.png"; sourceTree = "<group>"; 
};
+               CCBAA7A6159B5B3F00D8348C /* sidebar-mu...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = "sidebar-mu...@2x.png"; 
path = "Resources/sidebar-icons/sidebar-mu...@2x.png"; sourceTree = "<group>"; 
};
+               CCBAA7A7159B5B3F00D8348C /* sidebar-pictu...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = 
"sidebar-pictu...@2x.png"; path = 
"Resources/sidebar-icons/sidebar-pictu...@2x.png"; sourceTree = "<group>"; };
+               CCBAA7A8159B5B3F00D8348C /* sidebar-playl...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = 
"sidebar-playl...@2x.png"; path = 
"Resources/sidebar-icons/sidebar-playl...@2x.png"; sourceTree = "<group>"; };
+               CCBAA7A9159B5B3F00D8348C /* sidebar-podc...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = 
"sidebar-podc...@2x.png"; path = 
"Resources/sidebar-icons/sidebar-podc...@2x.png"; sourceTree = "<group>"; };
                CCBE999E0F922C51000705F8 /* CoreServices.framework */ = {isa = 
PBXFileReference; lastKnownFileType = wrapper.framework; name = 
CoreServices.framework; path = 
/System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
                CCC895830D9A8A82005AE59C /* eyetv.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name 
= eyetv.m; path = ../../../modules/access/eyetv.m; sourceTree = SOURCE_ROOT; };
                CCCCDCA01413E1C000FE3DE1 /* VideoView.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VideoView.h; path 
= ../../../modules/gui/macosx/VideoView.h; sourceTree = "<group>"; };
@@ -1534,6 +1546,12 @@
                CCE6438C13E8CC040061B5F2 /* sidebar */ = {
                        isa = PBXGroup;
                        children = (
+                               CCBAA7A4159B5B3F00D8348C /* 
sidebar-lo...@2x.png */,
+                               CCBAA7A5159B5B3F00D8348C /* 
sidebar-mo...@2x.png */,
+                               CCBAA7A6159B5B3F00D8348C /* 
sidebar-mu...@2x.png */,
+                               CCBAA7A7159B5B3F00D8348C /* 
sidebar-pictu...@2x.png */,
+                               CCBAA7A8159B5B3F00D8348C /* 
sidebar-playl...@2x.png */,
+                               CCBAA7A9159B5B3F00D8348C /* 
sidebar-podc...@2x.png */,
                                CC0586B414ACF7C000659A99 /* sidebar-local.png 
*/,
                                CC0586B514ACF7C000659A99 /* sidebar-movie.png 
*/,
                                CC0586B614ACF7C000659A99 /* sidebar-music.png 
*/,
@@ -1981,6 +1999,12 @@
                                CCBAA7A1159B5AE000D8348C /* 
fs_volume_slider_...@2x.png in Resources */,
                                CCBAA7A2159B5AE000D8348C /* 
fs_volume_slider_knob_highli...@2x.png in Resources */,
                                CCBAA7A3159B5AE000D8348C /* 
fs_volume_slider_k...@2x.png in Resources */,
+                               CCBAA7AA159B5B3F00D8348C /* 
sidebar-lo...@2x.png in Resources */,
+                               CCBAA7AB159B5B3F00D8348C /* 
sidebar-mo...@2x.png in Resources */,
+                               CCBAA7AC159B5B3F00D8348C /* 
sidebar-mu...@2x.png in Resources */,
+                               CCBAA7AD159B5B3F00D8348C /* 
sidebar-pictu...@2x.png in Resources */,
+                               CCBAA7AE159B5B3F00D8348C /* 
sidebar-playl...@2x.png in Resources */,
+                               CCBAA7AF159B5B3F00D8348C /* 
sidebar-podc...@2x.png in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to