Qt4 - Icons for the menus. Works from Danko Dolch again (THANKS). New icons for folde...

diff --git a/THANKS b/THANKS
index 42d51f3f655910fc0e1f4d4b4491be10a821fb09..8d30ce5337044431fb3d6a5be6d2a21d1bb130b6 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -52,6 +52,7 @@ Damian Ivereigh <damian at cisco.com> - ac3dec uninitialized data structure fix
 Damien Fouilleul <damien.fouilleul at laposte.net> - DirectShow input improvements
 Daniel Fischer <dan at subsignal dot org> - Shoutcast output support
 Daniel Stränger <vlc at schmaller d0t de> - M3U, xtag and playlist improvements. Meta information core fixes. XSPF playlist support
+Danko Dolch <info at dolchonline d0t net> - Icons and Design for Qt4 Interface
 David Kennedy <dkennedy at tinytoad.com> - X11 fullscreen patch
 Daniel Dreibrodt, aka aLtgLasS <daniel d.t dreibrodt -@t- gmx d0t de> - VLC 0.8.5 default skin
 Daniel Nylander <info@danielnylander at se> - Swedish translation

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 358ba77ad21d791441d256ff0269b2485e1afa4b..bf5a90e9e3f57c2683fc57de4f40826f407be2ab 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -195,5 +195,10 @@ EXTRA_DIST += \
        pixmaps/vlc_quit_16px.png \
        pixmaps/vlc_network_16px.png \
        pixmaps/vlc_capture-card_16px.png \
+       pixmaps/vlc_folder-grey_16px.png \
+       pixmaps/vlc_folder-blue_16px.png \
+       pixmaps/vlc_tape_16px.png \
+       pixmaps/vlc_file-asym_16px.png \
+       pixmaps/vlc_file-wide_16px.png \
        pixmaps/vlc_info_16px.png \
        pixmaps/vlc_next_16px.png

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 6e2ab558218e70b657f6324b9f85fe7bd0367d37..660a3df4fa4843ec8f9a79768219df7db78c8383 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -197,7 +197,8 @@ void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf,
 QMenu *QVLCMenu::FileMenu()
 {
     QMenu *menu = new QMenu();
-    DP_SADD( menu, qtr("Open &File..." ), "", "", openFileDialog(), "Ctrl+O" );
+    DP_SADD( menu, qtr("Open &File..." ), "",
+            ":/pixmaps/vlc_file-asym_16px.png", openFileDialog(), "Ctrl+O" );
     DP_SADD( menu, qtr("Open &Disc..." ), "", "", openDiscDialog(), "Ctrl+D" );
     DP_SADD( menu, qtr("Open &Network..." ), "",
                 ":/pixmaps/vlc_network_16px.png", openNetDialog(), "Ctrl+N" );
@@ -621,7 +622,8 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, intf_thread_t *p_intf,
     sysMenu->addSeparator();
     POPUP_PLAY_ENTRIES( sysMenu );
     sysMenu->addSeparator();
-    DP_SADD( sysMenu, qtr("&Open Media" ), "", "", openFileDialog(), "" );
+    DP_SADD( sysMenu, qtr("&Open Media" ), "",
+            ":/pixmaps/vlc_file-wide_16px.png", openFileDialog(), "" );
     DP_SADD( sysMenu, qtr("&Quit") , "", ":/pixmaps/vlc_quit_16px.png",
              quit(), "" );
 

diff --git a/modules/gui/qt4/pixmaps/vlc_file-asym_16px.png b/modules/gui/qt4/pixmaps/vlc_file-asym_16px.png
new file mode 100644 (file)
index 0000000..d421faa
Binary files /dev/null and b/modules/gui/qt4/pixmaps/vlc_file-asym_16px.png differ

diff --git a/modules/gui/qt4/pixmaps/vlc_file-wide_16px.png b/modules/gui/qt4/pixmaps/vlc_file-wide_16px.png
new file mode 100644 (file)
index 0000000..95f0585
Binary files /dev/null and b/modules/gui/qt4/pixmaps/vlc_file-wide_16px.png differ

diff --git a/modules/gui/qt4/pixmaps/vlc_folder-blue_16px.png b/modules/gui/qt4/pixmaps/vlc_folder-blue_16px.png
new file mode 100644 (file)
index 0000000..1b88d2e
Binary files /dev/null and b/modules/gui/qt4/pixmaps/vlc_folder-blue_16px.png differ

diff --git a/modules/gui/qt4/pixmaps/vlc_folder-grey_16px.png b/modules/gui/qt4/pixmaps/vlc_folder-grey_16px.png
new file mode 100644 (file)
index 0000000..c336dce
Binary files /dev/null and b/modules/gui/qt4/pixmaps/vlc_folder-grey_16px.png differ

diff --git a/modules/gui/qt4/pixmaps/vlc_network_16px.png b/modules/gui/qt4/pixmaps/vlc_network_16px.png
index 111708be31bbec831d905a162703ffabcb42b40c..3503422d45e8b7c8bdbfbf1a4bfbced51cc67f09 100644 (file)
Binary files a/modules/gui/qt4/pixmaps/vlc_network_16px.png and b/modules/gui/qt4/pixmaps/vlc_network_16px.png differ

diff --git a/modules/gui/qt4/pixmaps/vlc_tape_16px.png b/modules/gui/qt4/pixmaps/vlc_tape_16px.png
new file mode 100644 (file)
index 0000000..0679305
Binary files /dev/null and b/modules/gui/qt4/pixmaps/vlc_tape_16px.png differ

diff --git a/modules/gui/qt4/res.qrc b/modules/gui/qt4/res.qrc
index e82493dc8ecfc7aeb603646c6f37087cdda1a70e..c9cd1e46853c83ea610a870db68855444f13d192 100644 (file)
--- a/modules/gui/qt4/res.qrc
+++ b/modules/gui/qt4/res.qrc
@@ -29,6 +29,8 @@
   <file>pixmaps/vlc_play_16px.png</file>
   <file>pixmaps/vlc_network_16px.png</file>
   <file>pixmaps/vlc_quit_16px.png</file>
+  <file>pixmaps/vlc_file-asym_16px.png</file>
+  <file>pixmaps/vlc_file-wide_16px.png</file>
   <file>pixmaps/vlc_capture-card_16px.png</file>
   <file>pixmaps/vlc_stream_16px.png</file>
  </qresource>