diff --git a/THANKS b/THANKS index 42d51f3f65..8d30ce5337 100644 --- a/THANKS +++ b/THANKS @@ -52,6 +52,7 @@ Damian Ivereigh - ac3dec uninitialized data structure fix Damien Fouilleul - DirectShow input improvements Daniel Fischer - Shoutcast output support Daniel Stränger - M3U, xtag and playlist improvements. Meta information core fixes. XSPF playlist support +Danko Dolch - Icons and Design for Qt4 Interface David Kennedy - X11 fullscreen patch Daniel Dreibrodt, aka aLtgLasS - VLC 0.8.5 default skin Daniel Nylander - Swedish translation diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am index 358ba77ad2..bf5a90e9e3 100644 --- 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 6e2ab55821..660a3df4fa 100644 --- 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 index 0000000000..d421faa36e 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 index 0000000000..95f0585793 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 index 0000000000..1b88d2e718 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 index 0000000000..c336dce886 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 111708be31..3503422d45 100644 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 index 0000000000..06793050f3 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 e82493dc8e..c9cd1e4685 100644 --- a/modules/gui/qt4/res.qrc +++ b/modules/gui/qt4/res.qrc @@ -29,6 +29,8 @@ pixmaps/vlc_play_16px.png pixmaps/vlc_network_16px.png pixmaps/vlc_quit_16px.png + pixmaps/vlc_file-asym_16px.png + pixmaps/vlc_file-wide_16px.png pixmaps/vlc_capture-card_16px.png pixmaps/vlc_stream_16px.png