Qt: PLSelector: add customized icons

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index f90fb89165f330b465c2c580c9f7229db961ee0b..1bb03e4ed846d073dc0071e6b938cbe2dd6d19d7 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -134,10 +134,20 @@ DEPS_res = \
        pixmaps/playlist/shuffle_off.png \
        pixmaps/playlist/shuffle_on.png \
        pixmaps/playlist/dropzone.png \
-       pixmaps/playlist/sidebar-icons/sidebar-movie.png \
-       pixmaps/playlist/sidebar-icons/sidebar-pictures.png \
-       pixmaps/playlist/sidebar-icons/sidebar-music.png \
-       pixmaps/playlist/sidebar-icons/sidebar-podcast.png \
+       pixmaps/playlist/sidebar-icons/capture.png \
+       pixmaps/playlist/sidebar-icons/pictures.png \
+       pixmaps/playlist/sidebar-icons/disc.png \
+       pixmaps/playlist/sidebar-icons/playlist.png \
+       pixmaps/playlist/sidebar-icons/lan.png \
+       pixmaps/playlist/sidebar-icons/podcast.png \
+       pixmaps/playlist/sidebar-icons/library.png \
+       pixmaps/playlist/sidebar-icons/screen.png \
+       pixmaps/playlist/sidebar-icons/movie.png \
+       pixmaps/playlist/sidebar-icons/mtp.png \
+       pixmaps/playlist/sidebar-icons/music.png \
+       pixmaps/playlist/sidebar-icons/network.png \
+       pixmaps/playlist/sidebar-icons/sd/appletrailers.png \
+       pixmaps/playlist/sidebar-icons/sd/icecast.png \
        pixmaps/prefs/advprefs_audio.png \
        pixmaps/prefs/advprefs_codec.png \
        pixmaps/prefs/advprefs_extended.png \

diff --git a/modules/gui/qt4/components/playlist/selector.cpp b/modules/gui/qt4/components/playlist/selector.cpp
index e856c40d9d80c32f3942cded0f203d93b01ea918..8b4c0ccd16d7307c9506addaff4aaa2770d8622a 100644 (file)
--- a/modules/gui/qt4/components/playlist/selector.cpp
+++ b/modules/gui/qt4/components/playlist/selector.cpp
@@ -225,35 +225,25 @@ void PLSelector::updateTotalDuration( PLSelItem* item, const char* prefix )
     item->setText( qs_timeLabel );
 }
 
-/* Helper until we get proper icons */
-static QIcon orangify( QString resource )
-{
-    QPixmap pix( resource );
-    QPainter painter( &pix );
-    painter.setCompositionMode( QPainter::CompositionMode_SourceAtop );
-    painter.fillRect( pix.rect(), QColor( 255, 157, 62, 128 ) );
-    return QIcon( pix );
-}
-
 void PLSelector::createItems()
 {
     /* PL */
     playlistItem = putPLData( addItem( PL_ITEM_TYPE, N_("Playlist"), true ),
                               THEPL->p_playing );
     playlistItem->treeItem()->setData( 0, SPECIAL_ROLE, QVariant( IS_PL ) );
-    playlistItem->treeItem()->setData( 0, Qt::DecorationRole, orangify( ":/type/playlist" ) );
+    playlistItem->treeItem()->setData( 0, Qt::DecorationRole, QIcon( ":/sidebar/playlist" ) );
     setCurrentItem( playlistItem->treeItem() );
 
     /* ML */
     PLSelItem *ml = putPLData( addItem( PL_ITEM_TYPE, N_("Media Library"), true ),
                               THEPL->p_media_library );
     ml->treeItem()->setData( 0, SPECIAL_ROLE, QVariant( IS_ML ) );
-    ml->treeItem()->setData( 0, Qt::DecorationRole, orangify( ":/type/playlist" ) );
+    ml->treeItem()->setData( 0, Qt::DecorationRole, QIcon( ":/sidebar/library" ) );
 
 #ifdef MEDIA_LIBRARY
     /* SQL ML */
     ml = addItem( SQL_ML_TYPE, "SQL Media Library" )->treeItem();
-    ml->treeItem()->setData( 0, Qt::DecorationRole, orangify( ":/type/playlist" ) );
+    ml->treeItem()->setData( 0, Qt::DecorationRole, QIcon( ":/sidebar/library" ) );
 #endif
 
     /* SD nodes */
@@ -303,10 +293,10 @@ void PLSelector::createItems()
                 int i_head = name.indexOf( "sd='" ) + 4;
                 int i_tail = name.indexOf( '\'', i_head );
                 name.mid( i_head, i_tail - i_head );
-                QString iconname = QString( ":/sidebar/sd/%1" ).arg( name.mid( i_head, i_tail - i_head + 1 ) );
+                QString iconname = QString( ":/sidebar/sd/%1" ).arg( name.mid( i_head, i_tail - i_head ) );
                 QResource resource( iconname );
                 if ( !resource.isValid() )
-                    icon = orangify( ":/type/net" );
+                    icon = QIcon( ":/sidebar/network" );
                 else
                     icon = QIcon( iconname );
             }
@@ -315,16 +305,18 @@ void PLSelector::createItems()
         case SD_CAT_DEVICES:
             name = name.mid( 0, name.indexOf( '{' ) );
             selItem = addItem( SD_TYPE, *ppsz_longname, false, false, devices );
-            if ( name == "xcb_app" )
-                icon = QIcon( ":/sidebar/pictures" );
+            if ( name == "xcb_apps" )
+                icon = QIcon( ":/sidebar/screen" );
+            else if ( name == "mtp" )
+                icon = QIcon( ":/sidebar/mtp" );
             else if ( name == "disc" )
-                icon = orangify( ":/type/disc" );
+                icon = QIcon( ":/sidebar/disc" );
             else
-                icon = orangify( ":/type/capture-card" );
+                icon = QIcon( ":/sidebar/capture" );
             break;
         case SD_CAT_LAN:
             selItem = addItem( SD_TYPE, *ppsz_longname, false, false, lan );
-            icon = orangify( ":/type/network" );
+            icon = QIcon( ":/sidebar/lan" );
             break;
         case SD_CAT_MYCOMPUTER:
             name = name.mid( 0, name.indexOf( '{' ) );
@@ -336,7 +328,7 @@ void PLSelector::createItems()
             else if ( name == "picture_dir" )
                 icon = QIcon( ":/sidebar/pictures" );
             else
-                icon = orangify( ":/type/folder-grey" );
+                icon = QIcon( ":/sidebar/movie" );
             break;
         default:
             selItem = addItem( SD_TYPE, *ppsz_longname );

diff --git a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/capture.png b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/capture.png
new file mode 100644 (file)
index 0000000..79f8649
Binary files /dev/null and b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/capture.png differ

diff --git a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/disc.png b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/disc.png
new file mode 100644 (file)
index 0000000..fa0a5c2
Binary files /dev/null and b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/disc.png differ

diff --git a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/lan.png b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/lan.png
new file mode 100644 (file)
index 0000000..6497bc4
Binary files /dev/null and b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/lan.png differ

diff --git a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/library.png b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/library.png
new file mode 100644 (file)
index 0000000..4fd0bc5
Binary files /dev/null and b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/library.png differ

diff --git a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/movie.png b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/movie.png
new file mode 100644 (file)
index 0000000..4034a71
Binary files /dev/null and b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/movie.png differ

diff --git a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/mtp.png b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/mtp.png
new file mode 100644 (file)
index 0000000..8f77512
Binary files /dev/null and b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/mtp.png differ

diff --git a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/music.png b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/music.png
new file mode 100644 (file)
index 0000000..9bec65e
Binary files /dev/null and b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/music.png differ

diff --git a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/network.png b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/network.png
new file mode 100644 (file)
index 0000000..fb46faa
Binary files /dev/null and b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/network.png differ

diff --git a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/pictures.png b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/pictures.png
new file mode 100644 (file)
index 0000000..3212da6
Binary files /dev/null and b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/pictures.png differ

diff --git a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/playlist.png b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/playlist.png
new file mode 100644 (file)
index 0000000..0ee3c5c
Binary files /dev/null and b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/playlist.png differ

diff --git a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/podcast.png b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/podcast.png
new file mode 100644 (file)
index 0000000..f044c23
Binary files /dev/null and b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/podcast.png differ

diff --git a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/screen.png b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/screen.png
new file mode 100644 (file)
index 0000000..c177b67
Binary files /dev/null and b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/screen.png differ

diff --git a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/sd/appletrailers.png b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/sd/appletrailers.png
new file mode 100644 (file)
index 0000000..7556a0e
Binary files /dev/null and b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/sd/appletrailers.png differ

diff --git a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/sd/icecast.png b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/sd/icecast.png
new file mode 100644 (file)
index 0000000..247fa27
Binary files /dev/null and b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/sd/icecast.png differ

diff --git a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/sidebar-movie.png b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/sidebar-movie.png
deleted file mode 100644 (file)
index c071c49..0000000
Binary files a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/sidebar-movie.png and /dev/null differ

diff --git a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/sidebar-music.png b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/sidebar-music.png
deleted file mode 100644 (file)
index 60d8ddb..0000000
Binary files a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/sidebar-music.png and /dev/null differ

diff --git a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/sidebar-pictures.png b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/sidebar-pictures.png
deleted file mode 100644 (file)
index b9d6145..0000000
Binary files a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/sidebar-pictures.png and /dev/null differ

diff --git a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/sidebar-podcast.png b/modules/gui/qt4/pixmaps/playlist/sidebar-icons/sidebar-podcast.png
deleted file mode 100644 (file)
index a380945..0000000
Binary files a/modules/gui/qt4/pixmaps/playlist/sidebar-icons/sidebar-podcast.png and /dev/null differ

diff --git a/modules/gui/qt4/vlc.qrc b/modules/gui/qt4/vlc.qrc
index 7f849631fa8a0ed9c0c5d1934dd59754d7cb41dc..81f658773a0d479ae28d6e6455e939c70d02edcf 100644 (file)
--- a/modules/gui/qt4/vlc.qrc
+++ b/modules/gui/qt4/vlc.qrc
@@ -128,10 +128,21 @@
         <file alias="next">pixmaps/win7/win7thumbnail_next.png</file>
     </qresource>
     <qresource prefix="/sidebar">
-        <file alias="podcast">pixmaps/playlist/sidebar-icons/sidebar-podcast.png</file>
-        <file alias="movie">pixmaps/playlist/sidebar-icons/sidebar-movie.png</file>
-        <file alias="music">pixmaps/playlist/sidebar-icons/sidebar-music.png</file>
-        <file alias="pictures">pixmaps/playlist/sidebar-icons/sidebar-pictures.png</file>
+        <file alias="disc">pixmaps/playlist/sidebar-icons/disc.png</file>
+        <file alias="playlist">pixmaps/playlist/sidebar-icons/playlist.png</file>
+        <file alias="mtp">pixmaps/playlist/sidebar-icons/mtp.png</file>
+        <file alias="network">pixmaps/playlist/sidebar-icons/network.png</file>
+        <file alias="movie">pixmaps/playlist/sidebar-icons/movie.png</file>
+        <file alias="podcast">pixmaps/playlist/sidebar-icons/podcast.png</file>
+        <file alias="music">pixmaps/playlist/sidebar-icons/music.png</file>
+        <file alias="pictures">pixmaps/playlist/sidebar-icons/pictures.png</file>
+        <file alias="screen">pixmaps/playlist/sidebar-icons/screen.png</file>
+        <file alias="library">pixmaps/playlist/sidebar-icons/library.png</file>
+        <file alias="capture">pixmaps/playlist/sidebar-icons/capture.png</file>
+        <file alias="lan">pixmaps/playlist/sidebar-icons/lan.png</file>
+    </qresource>
+    <qresource prefix="/sidebar/sd">
+        <file alias="icecast">pixmaps/playlist/sidebar-icons/sd/icecast.png</file>
+        <file alias="appletrailers">pixmaps/playlist/sidebar-icons/sd/appletrailers.png</file>
     </qresource>
-    <qresource prefix="/sidebar/sd"/>
 </RCC>