Changeset f761baaab13460197740309f879047a1add5020b

Timestamp:

06/16/07 11:40:07 (1 year ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1181986807 +0000

git-parent:

[8aa2b8cb56531f672d5e0f322ffbb82609dc9752]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1181986807 +0000

Message:

Qt4 - Icons for the menus. Works from Danko Dolch again (THANKS). New icons for folders (blue and grey) (not yet used), for file (thin and wide) and tape. Update Network with a bit of coloring.

Files:

• THANKS (modified) (1 diff)
• modules/gui/qt4/Modules.am (modified) (1 diff)
• modules/gui/qt4/menus.cpp (modified) (2 diffs)
• modules/gui/qt4/pixmaps/vlc_file-asym_16px.png (added)
• modules/gui/qt4/pixmaps/vlc_file-wide_16px.png (added)
• modules/gui/qt4/pixmaps/vlc_folder-blue_16px.png (added)
• modules/gui/qt4/pixmaps/vlc_folder-grey_16px.png (added)
• modules/gui/qt4/pixmaps/vlc_network_16px.png (modified) (previous)
• modules/gui/qt4/pixmaps/vlc_tape_16px.png (added)
• modules/gui/qt4/res.qrc (modified) (1 diff)

THANKS

@@ -53 +53 @@
-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

modules/gui/qt4/Modules.am

@@ -196 +196 @@
-    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

modules/gui/qt4/menus.cpp

@@ -198 +198 @@
-{
-    QMenu *menu = new QMenu();
-
+
+
-    DP_SADD( menu, qtr("Open &Disc..." ), "", "", openDiscDialog(), "Ctrl+D" );
-    DP_SADD( menu, qtr("Open &Network..." ), "",
@@ -622 +623 @@
-    POPUP_PLAY_ENTRIES( sysMenu );
-    sysMenu->addSeparator();
-
+
+
-    DP_SADD( sysMenu, qtr("&Quit") , "", ":/pixmaps/vlc_quit_16px.png",
-             quit(), "" );

modules/gui/qt4/res.qrc

@@ -30 +30 @@
-  <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>