macosx: icon set for the sidebar table taken from the Fogue icon set by Yusuke Kamiya...

diff --git a/Makefile.am b/Makefile.am
index 5bbbc1ea968ec7fe7f6c1defd8f3c694624223cb..dc2831ce78e75f1cdf6f5308dd14d96cfac5d2f1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -305,6 +305,13 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/repeat_single_embedded_graphite.png \
        extras/package/macosx/Resources/shuffle_embedded.png \
        extras/package/macosx/Resources/shuffle_embedded_graphite.png \
+       extras/package/macosx/Resources/sidebar-icons/document-music-playlist.png \
+       extras/package/macosx/Resources/sidebar-icons/film-cast.png \
+       extras/package/macosx/Resources/sidebar-icons/film.png \
+       extras/package/macosx/Resources/sidebar-icons/music-beam.png \
+       extras/package/macosx/Resources/sidebar-icons/network-cloud.png \
+       extras/package/macosx/Resources/sidebar-icons/picture.png \
+       extras/package/macosx/Resources/sidebar-icons/README \
        extras/package/macosx/Resources/skip_forward_active_embedded.png \
        extras/package/macosx/Resources/skip_forward_embedded_graphite.png \
        extras/package/macosx/Resources/skip_previous_active_embedded.png \

diff --git a/extras/package/macosx/Resources/sidebar-icons/README b/extras/package/macosx/Resources/sidebar-icons/README
new file mode 100644 (file)
index 0000000..29f4457
--- /dev/null
+++ b/extras/package/macosx/Resources/sidebar-icons/README
@@ -0,0 +1,2 @@
+The icons in this folder are taken from the Fogue icon set by Yusuke Kamiyamane, licensed as Creative Commons Attribution 3.0 unported (CC BY 3.0).
+Full set available on: http://www.pinvoke.com/

diff --git a/extras/package/macosx/Resources/sidebar-icons/document-music-playlist.png b/extras/package/macosx/Resources/sidebar-icons/document-music-playlist.png
new file mode 100644 (file)
index 0000000..2efdcd5
Binary files /dev/null and b/extras/package/macosx/Resources/sidebar-icons/document-music-playlist.png differ

diff --git a/extras/package/macosx/Resources/sidebar-icons/film-cast.png b/extras/package/macosx/Resources/sidebar-icons/film-cast.png
new file mode 100644 (file)
index 0000000..9a6a888
Binary files /dev/null and b/extras/package/macosx/Resources/sidebar-icons/film-cast.png differ

diff --git a/extras/package/macosx/Resources/sidebar-icons/film.png b/extras/package/macosx/Resources/sidebar-icons/film.png
new file mode 100644 (file)
index 0000000..cb7a33d
Binary files /dev/null and b/extras/package/macosx/Resources/sidebar-icons/film.png differ

diff --git a/extras/package/macosx/Resources/sidebar-icons/music-beam.png b/extras/package/macosx/Resources/sidebar-icons/music-beam.png
new file mode 100644 (file)
index 0000000..2658621
Binary files /dev/null and b/extras/package/macosx/Resources/sidebar-icons/music-beam.png differ

diff --git a/extras/package/macosx/Resources/sidebar-icons/network-cloud.png b/extras/package/macosx/Resources/sidebar-icons/network-cloud.png
new file mode 100644 (file)
index 0000000..c6a6924
Binary files /dev/null and b/extras/package/macosx/Resources/sidebar-icons/network-cloud.png differ

diff --git a/extras/package/macosx/Resources/sidebar-icons/picture.png b/extras/package/macosx/Resources/sidebar-icons/picture.png
new file mode 100644 (file)
index 0000000..1e4a7b0
Binary files /dev/null and b/extras/package/macosx/Resources/sidebar-icons/picture.png differ

diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 74ff13f32d364f46958c14029ca4c8cfc0183bda..4457cf0d06c40fb1b9c69ff4fd66b859a0680472 100644 (file)
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -198,6 +198,12 @@
                CC9B43B113B29FCF000205AE /* bottom-background_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC9B43B013B29FCF000205AE /* bottom-background_dark.png */; };
                CCBE999F0F922C51000705F8 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCBE999E0F922C51000705F8 /* CoreServices.framework */; };
                CCC0C2AA13A285F700AC92B3 /* VideoEffects.nib in Resources */ = {isa = PBXBuildFile; fileRef = CCC0C2A813A285F700AC92B3 /* VideoEffects.nib */; };
+               CCE6439413E8CC170061B5F2 /* document-music-playlist.png in Resources */ = {isa = PBXBuildFile; fileRef = CCE6438E13E8CC170061B5F2 /* document-music-playlist.png */; };
+               CCE6439513E8CC170061B5F2 /* film-cast.png in Resources */ = {isa = PBXBuildFile; fileRef = CCE6438F13E8CC170061B5F2 /* film-cast.png */; };
+               CCE6439613E8CC170061B5F2 /* film.png in Resources */ = {isa = PBXBuildFile; fileRef = CCE6439013E8CC170061B5F2 /* film.png */; };
+               CCE6439713E8CC170061B5F2 /* music-beam.png in Resources */ = {isa = PBXBuildFile; fileRef = CCE6439113E8CC170061B5F2 /* music-beam.png */; };
+               CCE6439813E8CC170061B5F2 /* network-cloud.png in Resources */ = {isa = PBXBuildFile; fileRef = CCE6439213E8CC170061B5F2 /* network-cloud.png */; };
+               CCE6439913E8CC170061B5F2 /* picture.png in Resources */ = {isa = PBXBuildFile; fileRef = CCE6439313E8CC170061B5F2 /* picture.png */; };
                CCF11B540F8BFB520088542D /* ErrorPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = CCF11B520F8BFB520088542D /* ErrorPanel.nib */; };
 /* End PBXBuildFile section */
 
@@ -481,6 +487,12 @@
                CCD590F210E5B76300D39094 /* VLCLoginPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCLoginPanel.h; path = ../../../modules/gui/macosx_dialog_provider/VLCLoginPanel.h; sourceTree = SOURCE_ROOT; };
                CCD590F310E5B76300D39094 /* VLCLoginPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCLoginPanel.m; path = ../../../modules/gui/macosx_dialog_provider/VLCLoginPanel.m; sourceTree = SOURCE_ROOT; };
                CCDBA3B313D32E200006127B /* macosx.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = macosx.m; path = ../../../modules/video_output/macosx.m; sourceTree = "<group>"; };
+               CCE6438E13E8CC170061B5F2 /* document-music-playlist.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "document-music-playlist.png"; path = "Resources/sidebar-icons/document-music-playlist.png"; sourceTree = "<group>"; };
+               CCE6438F13E8CC170061B5F2 /* film-cast.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "film-cast.png"; path = "Resources/sidebar-icons/film-cast.png"; sourceTree = "<group>"; };
+               CCE6439013E8CC170061B5F2 /* film.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = film.png; path = "Resources/sidebar-icons/film.png"; sourceTree = "<group>"; };
+               CCE6439113E8CC170061B5F2 /* music-beam.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "music-beam.png"; path = "Resources/sidebar-icons/music-beam.png"; sourceTree = "<group>"; };
+               CCE6439213E8CC170061B5F2 /* network-cloud.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "network-cloud.png"; path = "Resources/sidebar-icons/network-cloud.png"; sourceTree = "<group>"; };
+               CCE6439313E8CC170061B5F2 /* picture.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = picture.png; path = "Resources/sidebar-icons/picture.png"; sourceTree = "<group>"; };
                CCF0777913659A8000AF19FD /* SPInvocationGrabbing.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPInvocationGrabbing.h; path = ../../../modules/gui/macosx/SPInvocationGrabbing.h; sourceTree = "<group>"; };
                CCF0777A13659A8000AF19FD /* SPInvocationGrabbing.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SPInvocationGrabbing.m; path = ../../../modules/gui/macosx/SPInvocationGrabbing.m; sourceTree = "<group>"; };
                CCF0777B13659A8000AF19FD /* SPMediaKeyTap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPMediaKeyTap.h; path = ../../../modules/gui/macosx/SPMediaKeyTap.h; sourceTree = "<group>"; };
@@ -686,6 +698,7 @@
                        isa = PBXGroup;
                        children = (
                                CC78DA4313DE056700E9603C /* topbar_background.png */,
+                               CCE6438C13E8CC040061B5F2 /* sidebar */,
                                CC0432C213B2479E00D7D52E /* bright variant */,
                                CC04326513B246E600D7D52E /* dark variant */,
                        );
@@ -948,6 +961,19 @@
                        name = "Minimal Dialog Provider";
                        sourceTree = "<group>";
                };
+               CCE6438C13E8CC040061B5F2 /* sidebar */ = {
+                       isa = PBXGroup;
+                       children = (
+                               CCE6438E13E8CC170061B5F2 /* document-music-playlist.png */,
+                               CCE6438F13E8CC170061B5F2 /* film-cast.png */,
+                               CCE6439013E8CC170061B5F2 /* film.png */,
+                               CCE6439113E8CC170061B5F2 /* music-beam.png */,
+                               CCE6439213E8CC170061B5F2 /* network-cloud.png */,
+                               CCE6439313E8CC170061B5F2 /* picture.png */,
+                       );
+                       name = sidebar;
+                       sourceTree = "<group>";
+               };
                DCF358BC077F1236007DB450 /* nibs */ = {
                        isa = PBXGroup;
                        children = (
@@ -1202,6 +1228,12 @@
                                CC9B43AF13B29C79000205AE /* bottom-background.png in Resources */,
                                CC9B43B113B29FCF000205AE /* bottom-background_dark.png in Resources */,
                                CC78DA4413DE056700E9603C /* topbar_background.png in Resources */,
+                               CCE6439413E8CC170061B5F2 /* document-music-playlist.png in Resources */,
+                               CCE6439513E8CC170061B5F2 /* film-cast.png in Resources */,
+                               CCE6439613E8CC170061B5F2 /* film.png in Resources */,
+                               CCE6439713E8CC170061B5F2 /* music-beam.png in Resources */,
+                               CCE6439813E8CC170061B5F2 /* network-cloud.png in Resources */,
+                               CCE6439913E8CC170061B5F2 /* picture.png in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 94bac4c189008000744bb67831a9f1571b0ae048..c001a5ad4edf8e9ed04ed6de304b4a51942441f3 100644 (file)
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -218,6 +218,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
     o_sidebaritems = [[NSMutableArray alloc] init];
     SideBarItem *libraryItem = [SideBarItem itemWithTitle:_NS("LIBRARY") identifier:@"library"];
     SideBarItem *playlistItem = [SideBarItem itemWithTitle:_NS("Playlist") identifier:@"playlist"];
+    [playlistItem setIcon: [NSImage imageNamed:@"document-music-playlist"]];
     SideBarItem *mycompItem = [SideBarItem itemWithTitle:_NS("MY COMPUTER") identifier:@"mycomputer"];
     SideBarItem *devicesItem = [SideBarItem itemWithTitle:_NS("DEVICES") identifier:@"devices"];
     SideBarItem *lanItem = [SideBarItem itemWithTitle:_NS("LOCAL NETWORK") identifier:@"localnetwork"];
@@ -235,20 +236,45 @@ static VLCMainWindow *_o_sharedInstance = nil;
     NSMutableArray *devicesItems = [[NSMutableArray alloc] init];
     NSMutableArray *lanItems = [[NSMutableArray alloc] init];
     NSMutableArray *mycompItems = [[NSMutableArray alloc] init];
+    NSString *o_identifier;
     for (; *ppsz_name; ppsz_name++, ppsz_longname++, p_category++)
     {
+        o_identifier = [NSString stringWithCString: *ppsz_name encoding: NSUTF8StringEncoding];
+        o_identifier = [[o_identifier componentsSeparatedByString:@"{"] objectAtIndex:0];
         switch (*p_category) {
             case SD_CAT_INTERNET:
-                [internetItems addObject: [SideBarItem itemWithTitle: [NSString stringWithCString: *ppsz_longname encoding: NSUTF8StringEncoding] identifier: [NSString stringWithCString: *ppsz_name encoding: NSUTF8StringEncoding]]];
+                {
+                    [internetItems addObject: [SideBarItem itemWithTitle: [NSString stringWithCString: *ppsz_longname encoding: NSUTF8StringEncoding] identifier: o_identifier]];
+                    if (!strncmp( *ppsz_name, "podcast", 7 ))
+                        [[internetItems lastObject] setIcon: [NSImage imageNamed:@"film-cast"]];
+                    else
+                        [[internetItems lastObject] setIcon: [NSImage imageNamed:@"NSApplicationIcon"]];
+                }
                 break;
             case SD_CAT_DEVICES:
-                [devicesItems addObject: [SideBarItem itemWithTitle: [NSString stringWithCString: *ppsz_longname encoding: NSUTF8StringEncoding] identifier: [NSString stringWithCString: *ppsz_name encoding: NSUTF8StringEncoding]]];
+                {
+                    [devicesItems addObject: [SideBarItem itemWithTitle: [NSString stringWithCString: *ppsz_longname encoding: NSUTF8StringEncoding] identifier: o_identifier]];
+                    [[devicesItems lastObject] setIcon: [NSImage imageNamed:@"NSApplicationIcon"]];
+                }
                 break;
             case SD_CAT_LAN:
-                [lanItems addObject: [SideBarItem itemWithTitle: [NSString stringWithCString: *ppsz_longname encoding: NSUTF8StringEncoding] identifier: [NSString stringWithCString: *ppsz_name encoding: NSUTF8StringEncoding]]];
+                {
+                    [lanItems addObject: [SideBarItem itemWithTitle: [NSString stringWithCString: *ppsz_longname encoding: NSUTF8StringEncoding] identifier: o_identifier]];
+                    [[lanItems lastObject] setIcon: [NSImage imageNamed:@"network-cloud"]];
+                }
                 break;
             case SD_CAT_MYCOMPUTER:
-                [mycompItems addObject: [SideBarItem itemWithTitle: [NSString stringWithCString: *ppsz_longname encoding: NSUTF8StringEncoding] identifier: [NSString stringWithCString: *ppsz_name encoding: NSUTF8StringEncoding]]];
+                {
+                    [mycompItems addObject: [SideBarItem itemWithTitle: [NSString stringWithCString: *ppsz_longname encoding: NSUTF8StringEncoding] identifier: o_identifier]];
+                    if (!strncmp( *ppsz_name, "video_dir", 9 ))
+                        [[mycompItems lastObject] setIcon: [NSImage imageNamed:@"film"]];
+                    else if (!strncmp( *ppsz_name, "audio_dir", 9 ))
+                        [[mycompItems lastObject] setIcon: [NSImage imageNamed:@"music-beam"]];
+                    else if (!strncmp( *ppsz_name, "picture_dir", 11 ))
+                        [[mycompItems lastObject] setIcon: [NSImage imageNamed:@"picture"]];
+                    else
+                        [[mycompItems lastObject] setIcon: [NSImage imageNamed:@"NSApplicationIcon"]];
+                }
                 break;
             default:
                 msg_Warn( VLCIntf, "unknown SD type found, skipping (%s)", *ppsz_name );
@@ -281,7 +307,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
     if ([internetItem hasChildren])
         [o_sidebaritems addObject: internetItem];
 
-    msg_Dbg( VLCIntf, "side bar should contain %lu items", [o_sidebaritems count] );
     [o_sidebar_view reloadData];
 }