Qt4 - Menus modifications and additions. ( hide & playlist mainly )

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index c8d1865af79745ff3486fe79688308aef085e319..b0e414f44a70d1c18fb117a23eef6a0ddfb66f93 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -272,6 +272,9 @@ void DialogsProvider::simpleOpenDialog()
     addFromSimple( true, true );
 }
 
+/****************
+ * Playlist     *
+ ****************/
 void DialogsProvider::openPlaylist()
 {
     QStringList files = showSimpleOpen( qtr( "Open playlist file" ),
@@ -466,6 +469,11 @@ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg )
     }
 }
 
+void DialogsProvider::hideMenus()
+{
+    /* TODO */
+}
+
 void DialogsProvider::switchToSkins()
 {
     var_SetString( p_intf, "intf-switch", "skins2" );

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index e6212a0ab4c3bb5f1f3bb17c3dbd9d45f0aa1cb1..028f13dd734b0a530b52f54490ac4d5e8f7959e8 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -154,6 +154,7 @@ public slots:
     void PLAppendDir();
     void MLAppendDir();
     void quit();
+    void hideMenus();
     void switchToSkins();
     void gotoTimeDialog();
     void helpDialog();

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 261336442caf7273bd36474039d3cdf2601837b1..c6d9f9d0cfad6c5f155f15fc3d0375a117b1d3d8 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -105,6 +105,7 @@ private:
     void customEvent( QEvent *);
 public slots:
     void undockPlaylist();
+    void playlist();
 private slots:
     void setNavigation( int );
     void setStatus( int );
@@ -115,7 +116,6 @@ private slots:
     void stop();
     void prev();
     void next();
-    void playlist();
     void visual();
     void advanced();
     void updateVolume( int sliderVolume );

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 8dec77397f7a76ce7cd3c1cafd1422528b44ea02..e267be6f6fed30000d234c7a07e0948c8f648984 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -240,6 +240,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
     DP_SADD( qtr(I_MENU_MSG), "", "", messagesDialog(), "Ctrl+M" );
     DP_SADD( qtr(I_MENU_INFO) , "", "", mediaInfoDialog(), "Ctrl+J" );
     DP_SADD( qtr(I_MENU_CODECINFO) , "", "", mediaCodecDialog(), "Ctrl+I" );
+    DP_SADD( qtr(I_MENU_GOTOTIME), "","",gotoTimeDialog(), "Ctrl+T" );
     menu->addSeparator();
     if( mi )
     {
@@ -253,9 +254,10 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
         adv->setCheckable( true );
         if( visual_selector_enabled ) adv->setChecked( true );
 #endif
+        menu->addAction ( qtr( "Playlist"), mi, SLOT( playlist() ) );
     }
     DP_SADD( qtr(I_MENU_EXT), "","",extendedDialog(), "Ctrl+E" );
-    DP_SADD( qtr(I_MENU_GOTOTIME), "","",gotoTimeDialog(), "Ctrl+T" );
+    DP_SADD( qtr("Hide Menus..."), "","",hideMenus(), "Ctrl+H" );
     menu->addSeparator();
     DP_SADD( qtr("Preferences"), "", "", prefsDialog(), "Ctrl+P" );
     return menu;