vlc | branch: master | Damien Erambert <[email protected]> | Sun Jun 24 16:40:59 2012 +0200| [04d65ac9c8d807dad15a6480aee70c8fa3f0572e] | committer: Felix Paul Kühne
macosx: added retina compatible sidebar icons Signed-off-by: Felix Paul Kühne <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=04d65ac9c8d807dad15a6480aee70c8fa3f0572e --- Makefile.am | 18 ++++++++++----- .../Resources/sidebar-icons/[email protected] | Bin 0 -> 1898 bytes .../Resources/sidebar-icons/[email protected] | Bin 0 -> 1784 bytes .../Resources/sidebar-icons/[email protected] | Bin 0 -> 2280 bytes .../sidebar-icons/[email protected] | Bin 0 -> 1765 bytes .../sidebar-icons/[email protected] | Bin 0 -> 2221 bytes .../Resources/sidebar-icons/[email protected] | Bin 0 -> 1836 bytes .../package/macosx/vlc.xcodeproj/project.pbxproj | 24 ++++++++++++++++++++ 8 files changed, 36 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index a159621..5ac6588 100644 --- a/Makefile.am +++ b/Makefile.am @@ -349,12 +349,18 @@ EXTRA_DIST += \ extras/package/macosx/Resources/prefs/spref_cone_Subtitles_64.png \ 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-movie.png \ - extras/package/macosx/Resources/sidebar-icons/sidebar-music.png \ - extras/package/macosx/Resources/sidebar-icons/sidebar-pictures.png \ - extras/package/macosx/Resources/sidebar-icons/sidebar-playlist.png \ - extras/package/macosx/Resources/sidebar-icons/sidebar-podcast.png \ + extras/package/macosx/Resources/sidebar-icons//sidebar-local.png \ + extras/package/macosx/Resources/sidebar-icons//[email protected] \ + extras/package/macosx/Resources/sidebar-icons//sidebar-movie.png \ + extras/package/macosx/Resources/sidebar-icons//[email protected] \ + extras/package/macosx/Resources/sidebar-icons//sidebar-music.png \ + extras/package/macosx/Resources/sidebar-icons//[email protected] \ + extras/package/macosx/Resources/sidebar-icons//sidebar-pictures.png \ + extras/package/macosx/Resources/sidebar-icons//[email protected] \ + extras/package/macosx/Resources/sidebar-icons//sidebar-playlist.png \ + extras/package/macosx/Resources/sidebar-icons//[email protected] \ + extras/package/macosx/Resources/sidebar-icons//sidebar-podcast.png \ + extras/package/macosx/Resources/sidebar-icons//[email protected] \ 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/[email protected] b/extras/package/macosx/Resources/sidebar-icons/[email protected] new file mode 100644 index 0000000..a5898f1 Binary files /dev/null and b/extras/package/macosx/Resources/sidebar-icons/[email protected] differ diff --git a/extras/package/macosx/Resources/sidebar-icons/[email protected] b/extras/package/macosx/Resources/sidebar-icons/[email protected] new file mode 100644 index 0000000..cfd13d8 Binary files /dev/null and b/extras/package/macosx/Resources/sidebar-icons/[email protected] differ diff --git a/extras/package/macosx/Resources/sidebar-icons/[email protected] b/extras/package/macosx/Resources/sidebar-icons/[email protected] new file mode 100644 index 0000000..045e8d3 Binary files /dev/null and b/extras/package/macosx/Resources/sidebar-icons/[email protected] differ diff --git a/extras/package/macosx/Resources/sidebar-icons/[email protected] b/extras/package/macosx/Resources/sidebar-icons/[email protected] new file mode 100644 index 0000000..5b657b2 Binary files /dev/null and b/extras/package/macosx/Resources/sidebar-icons/[email protected] differ diff --git a/extras/package/macosx/Resources/sidebar-icons/[email protected] b/extras/package/macosx/Resources/sidebar-icons/[email protected] new file mode 100644 index 0000000..d636925 Binary files /dev/null and b/extras/package/macosx/Resources/sidebar-icons/[email protected] differ diff --git a/extras/package/macosx/Resources/sidebar-icons/[email protected] b/extras/package/macosx/Resources/sidebar-icons/[email protected] new file mode 100644 index 0000000..85ac5e2 Binary files /dev/null and b/extras/package/macosx/Resources/sidebar-icons/[email protected] differ diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj index ffddff0..7a0bd57 100644 --- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj +++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj @@ -255,6 +255,12 @@ CC84FB481300843200816D38 /* BGHUDAppKit.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CC84FB2C130083BB00816D38 /* BGHUDAppKit.framework */; }; CC9B43AF13B29C79000205AE /* bottom-background.png in Resources */ = {isa = PBXBuildFile; fileRef = CC9B43AE13B29C79000205AE /* bottom-background.png */; }; CC9B43B113B29FCF000205AE /* bottom-background_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC9B43B013B29FCF000205AE /* bottom-background_dark.png */; }; + CC9E5D7015975E2600D14E83 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = CC9E5D6A15975E2600D14E83 /* [email protected] */; }; + CC9E5D7115975E2600D14E83 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = CC9E5D6B15975E2600D14E83 /* [email protected] */; }; + CC9E5D7215975E2600D14E83 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = CC9E5D6C15975E2600D14E83 /* [email protected] */; }; + CC9E5D7315975E2600D14E83 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = CC9E5D6D15975E2600D14E83 /* [email protected] */; }; + CC9E5D7415975E2600D14E83 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = CC9E5D6E15975E2600D14E83 /* [email protected] */; }; + CC9E5D7515975E2600D14E83 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = CC9E5D6F15975E2600D14E83 /* [email protected] */; }; CCB320721423AAEE002CB53B /* shuffle-blue.png in Resources */ = {isa = PBXBuildFile; fileRef = CCB320711423AAEE002CB53B /* shuffle-blue.png */; }; CCBE999F0F922C51000705F8 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCBE999E0F922C51000705F8 /* CoreServices.framework */; }; CCD83E2D13FE9B90004F1652 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CCD83E2B13FE9B90004F1652 /* MainMenu.xib */; }; @@ -614,6 +620,12 @@ CC9B43AE13B29C79000205AE /* bottom-background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bottom-background.png"; path = "Resources/mainwindow/bottom-background.png"; sourceTree = "<group>"; }; CC9B43B013B29FCF000205AE /* bottom-background_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bottom-background_dark.png"; path = "Resources/mainwindow_dark/bottom-background_dark.png"; sourceTree = "<group>"; }; CC9E3E7913D1CFCF00429A71 /* qtcapture.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = qtcapture.m; path = ../../../modules/access/qtcapture.m; sourceTree = "<group>"; }; + CC9E5D6A15975E2600D14E83 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "Resources/sidebar-icons/[email protected]"; sourceTree = "<group>"; }; + CC9E5D6B15975E2600D14E83 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "Resources/sidebar-icons/[email protected]"; sourceTree = "<group>"; }; + CC9E5D6C15975E2600D14E83 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "Resources/sidebar-icons/[email protected]"; sourceTree = "<group>"; }; + CC9E5D6D15975E2600D14E83 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "Resources/sidebar-icons/[email protected]"; sourceTree = "<group>"; }; + CC9E5D6E15975E2600D14E83 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "Resources/sidebar-icons/[email protected]"; sourceTree = "<group>"; }; + CC9E5D6F15975E2600D14E83 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "Resources/sidebar-icons/[email protected]"; sourceTree = "<group>"; }; CCB0BB3013FAC9F40095BD0A /* CompatibilityFixes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CompatibilityFixes.h; path = ../../../modules/gui/macosx/CompatibilityFixes.h; sourceTree = "<group>"; }; CCB24D5D0D54BBAE004D780C /* simple_prefs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = simple_prefs.m; path = ../../../modules/gui/macosx/simple_prefs.m; sourceTree = SOURCE_ROOT; }; CCB24D5E0D54BBAE004D780C /* simple_prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = simple_prefs.h; path = ../../../modules/gui/macosx/simple_prefs.h; sourceTree = SOURCE_ROOT; }; @@ -1229,6 +1241,12 @@ CC0586B714ACF7C000659A99 /* sidebar-pictures.png */, CC0586B814ACF7C000659A99 /* sidebar-playlist.png */, CC0586B914ACF7C000659A99 /* sidebar-podcast.png */, + CC9E5D6A15975E2600D14E83 /* [email protected] */, + CC9E5D6B15975E2600D14E83 /* [email protected] */, + CC9E5D6C15975E2600D14E83 /* [email protected] */, + CC9E5D6D15975E2600D14E83 /* [email protected] */, + CC9E5D6E15975E2600D14E83 /* [email protected] */, + CC9E5D6F15975E2600D14E83 /* [email protected] */, ); name = sidebar; sourceTree = "<group>"; @@ -1563,6 +1581,12 @@ CCE4057F15655B2100FA5CCA /* back-pressed-single.png in Resources */, CCE4058215655B3300FA5CCA /* back-single.png in Resources */, CC0663391566CD5A003A411C /* ConvertAndSave.xib in Resources */, + CC9E5D7015975E2600D14E83 /* [email protected] in Resources */, + CC9E5D7115975E2600D14E83 /* [email protected] in Resources */, + CC9E5D7215975E2600D14E83 /* [email protected] in Resources */, + CC9E5D7315975E2600D14E83 /* [email protected] in Resources */, + CC9E5D7415975E2600D14E83 /* [email protected] in Resources */, + CC9E5D7515975E2600D14E83 /* [email protected] in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
