From 21fec3eedfab031505ebb7d195447df90bca700d Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Sun, 8 Jul 2007 16:04:26 +0000
Subject: [PATCH] Qt4 - Menus and new icons. Remove the isCheckable option from
 extended/playlist.

---
 modules/gui/qt4/Modules.am                     |   2 ++
 modules/gui/qt4/menus.cpp                      |  17 ++++++++---------
 .../gui/qt4/pixmaps/vlc_folder-grey_16px.png   | Bin 233 -> 204 bytes
 modules/gui/qt4/pixmaps/vlc_playlist_16px.png  | Bin 0 -> 450 bytes
 modules/gui/qt4/pixmaps/vlc_settings_16px.png  | Bin 0 -> 417 bytes
 modules/gui/qt4/res.qrc                        |   2 ++
 6 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 modules/gui/qt4/pixmaps/vlc_playlist_16px.png
 create mode 100644 modules/gui/qt4/pixmaps/vlc_settings_16px.png

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index a92cab1803..e4b8e25cd6 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -197,6 +197,8 @@ EXTRA_DIST += \
 	pixmaps/vlc_network_16px.png \
 	pixmaps/vlc_capture-card_16px.png \
 	pixmaps/vlc_preferences_16px.png \
+	pixmaps/vlc_settings_16px.png \
+	pixmaps/vlc_playlist_16px.png \
 	pixmaps/vlc_folder-grey_16px.png \
 	pixmaps/vlc_folder-blue_16px.png \
 	pixmaps/vlc_tape_16px.png \
diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index f4c17d6bdf..e9de26e3c3 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -286,22 +286,21 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
                 mi, SLOT( advanced() ) );
         adv->setCheckable( true );
         if( adv_controls_enabled ) adv->setChecked( true );
+
+	DP_SADD( menu, qtr( "Hide Menus..." ), "","",hideMenus(), "Ctrl+H" );
+    	menu->addSeparator();
+
 #if 0 /* For Visualisations. Not yet working */
         adv = menu->addAction( qtr("Visualizations selector" ),
                 mi, SLOT( visual() ) );
         adv->setCheckable( true );
         if( visual_selector_enabled ) adv->setChecked( true );
 #endif
-        QAction *plAction = menu->addAction ( qtr( "Playlist"), mi,
-                SLOT( playlist() ) );
-        plAction->setCheckable( true );
-
+  	menu->addAction ( QIcon(":/pixmaps/vlc_playlist_16px.png"),
+	   		  qtr( "Playlist"), mi, SLOT( playlist() ) );
     }
-    QAction *extAction = menu->addAction( qtr( I_MENU_EXT ), THEDP,
-                SLOT( extendedDialog() ), qtr( "Ctrl+E" ) );
-    extAction->setCheckable( true );
-
-    DP_SADD( menu, qtr( "Hide Menus..." ), "","",hideMenus(), "Ctrl+H" );
+    DP_SADD( menu, qtr( I_MENU_EXT ), "", ":/pixmaps/vlc_settings_16px.png",
+                 extendedDialog() ,  "Ctrl+E"  );
 
     menu->addSeparator();
     DP_SADD( menu, qtr("Preferences"), "", ":/pixmaps/vlc_preferences_16px.png",
diff --git a/modules/gui/qt4/pixmaps/vlc_folder-grey_16px.png b/modules/gui/qt4/pixmaps/vlc_folder-grey_16px.png
index c336dce88648f870ea2bef7254d3097e5a1a7ad6..babe513db7743113fedb3169df69a745a3755c2c 100644
GIT binary patch
delta 155
zcmV;M0A&B^0n7oAIe&ghL_t(|oMU025U^0o0JY@g<eTV{bLY-g2U52P835L7W@g5a
zn3xEcm_L6$h`LG05Ehu`h=>S=@87?}B|v;Az;GF|3&CFS^Ydf)_U#*n0+2We;{i9p
z1|Zu^Di|aNynOkRG6PsySx2-1(4>kpwc!J>lz0osU?kTC02KNKGSWkD?hgO}002ov
JPDHLkV1gfSM0@}M

delta 184
zcmV;p07w7K0qFsdIe(i;L_t(|oMZX_|33pIfQ2I6Faw@Fd-lJst`0-8si}!UN=k|m
zuK_U4W@cs#OiWC0iGTn8F@VH@hWy882n$Rz4-XH9BuE_UGOPiWnVAXkf~cq{R?|5-
zIT^gYy>U8!`t<1#12{N1a4I4Mzy@$}aZzRf#V%lDW24Lfb}@E#$_yCdUI3-0%F0Tz
mG=o#3v9U4ZoH=vIb^!nbRwwe}938v>0000<MNUMnLSTaAz)ddz

diff --git a/modules/gui/qt4/pixmaps/vlc_playlist_16px.png b/modules/gui/qt4/pixmaps/vlc_playlist_16px.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b7dbc181f2119cbd5b52a75c90ca221924c9a2a
GIT binary patch
literal 450
zcmV;z0X_bSP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000id
z000id0mpBsWB>pGbV)=(RCt_~lfO^GKpe$iuLrb|h%G5d6CsV!L=s~(;V*DxG|`1c
zSPUi(ZqVJjI0}Oy!H9z<{ts*p&Q46YFfcJe!jH4P1j1P`@RBy~uJ8M~zTqfi44&HU
z_FJRTIL8Xg<#O+-RO-U>bh_ycmrA9D1CHY$o6TY{7@*(p^Q>*#BEZvVG+GES3<H{`
zae$&I!nc(Gi9`aruJhAXRb3xonkJgfCOVxCy4~*j0L!xYGgY-(T@E<A`{MqioI(EK
z6A?v1Y?ESJ4<Q)~<1}N<kBETba42}m3&;$TGywqvV-q3c1B}OGyxtzp{Nwepua39B
z6wvGSP^|rMUnwMEzqFvK3|g2V9tpyXsyNv<mIGv27Cdn~5cd_32`D89P+7?M0E7@c
zUG2`+_m^p3g}?Fv3Y8Z3wc;Mi^>0KsBp4Bj_*MuzMi^-;`afXayMN9rP}eI#>Q*2^
sW+CAD=3usV@<*#z@UG}O*LmuH0a=W8U+u;g{r~^~07*qoM6N<$g5<u$_5c6?

literal 0
HcmV?d00001

diff --git a/modules/gui/qt4/pixmaps/vlc_settings_16px.png b/modules/gui/qt4/pixmaps/vlc_settings_16px.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a35dfd60e9e76998188e97943ccbbd4200216b4
GIT binary patch
literal 417
zcmV;S0bc%zP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000id
z000id0mpBsWB>pGQ%OWYRCt_Y`Tzev10{fkBHdIm;OyD6#?z-yKSPe@%*;#^7LewN
z6DKnK{reY=|NZ+1r$PA7pFb!xOx@(klh1&?0FtO!_m1K3`&SIdFMVOy*`~>`Y}qn~
z(9lq@!gcG`G5GrWg4J!`zMa9v#RV)54};&oe>0rgy`JIE?|%&c|AK5#WBBml16Tt{
zA&3o9Gxan#!>@l<3=1c`Wtf}Ai!cDBaC1)tLt9%LLuqL#L))G|4Bxrk83LLgFsv+-
zgd2uz$)7(q2m@gLMJU{eq|gH_4pK9t(3SxdUckTuy9mVvAO&B(d;zl;*LW~gRaG%G
zG&C?wKg-MTPc4xlVe$utnQ5GGH7H?#EC4bY<QkaEP@Qdop$5f(=H_O2R8?13gV~dF
zEZ|-Q@w2nD;cCDJfD%J@cQ^S7$=KNV?3_7s7|AgJ?gdH!#RdQXhb$qr`4s2>00000
LNkvXXu0mjfJWjQ<

literal 0
HcmV?d00001

diff --git a/modules/gui/qt4/res.qrc b/modules/gui/qt4/res.qrc
index bdc18b5ab6..4353868b48 100644
--- a/modules/gui/qt4/res.qrc
+++ b/modules/gui/qt4/res.qrc
@@ -35,6 +35,8 @@
   <file>pixmaps/vlc_folder-grey_16px.png</file>
   <file>pixmaps/vlc_capture-card_16px.png</file>
   <file>pixmaps/vlc_preferences_16px.png</file>
+  <file>pixmaps/vlc_playlist_16px.png</file>
+  <file>pixmaps/vlc_settings_16px.png</file>
   <file>pixmaps/vlc_stream_16px.png</file>
  </qresource>
 </RCC>
-- 
2.39.2