Qt4 - Menus. Add the missing dialogs calls. If someone wants to write VLM and Bookmar...

diff --git a/include/vlc_intf_strings.h b/include/vlc_intf_strings.h
index f26b75b7a2a34bab51f4f5bc0679ed10a5afb6b9..dd7c28d172e401e9dcce1b06b025376c2cb4ed7b 100644 (file)
--- a/include/vlc_intf_strings.h
+++ b/include/vlc_intf_strings.h
@@ -43,6 +43,8 @@
 #define I_MENU_MSG   N_("Messages...")
 #define I_MENU_EXT   N_("Extended settings...")
 #define I_MENU_GOTOTIME N_("Go to specific time...")
+#define I_MENU_BOOKMARK N_("Bookmarks...")
+#define I_MENU_VLM N_("VLM Configuration...")
 
 #define I_MENU_ABOUT N_("About VLC media player...")
 

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index b0e414f44a70d1c18fb117a23eef6a0ddfb66f93..ef44530703801be896b36cdebcc315c5f6838a12 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -116,6 +116,7 @@ void DialogsProvider::customEvent( QEvent *event )
             case INTF_DIALOG_INTERACTION:
                doInteraction( de->p_arg ); break;
             case INTF_DIALOG_VLM:
+               vlmDialog(); break;
             case INTF_DIALOG_WIZARD:
             case INTF_DIALOG_UPDATEVLC:
             case INTF_DIALOG_EXIT:
@@ -152,6 +153,12 @@ void DialogsProvider::gotoTimeDialog()
     GotoTimeDialog::getInstance( p_intf )->toggleVisible();
 }
 
+void DialogsProvider::vlmDialog()
+{
+    /* FIXME */
+    /*  VLMDialog::getInstance( p_intf )->toggleVisible(); */
+}
+
 void DialogsProvider::helpDialog()
 {
     HelpDialog::getInstance( p_intf )->toggleVisible();
@@ -174,6 +181,8 @@ void DialogsProvider::mediaCodecDialog()
 
 void DialogsProvider::bookmarksDialog()
 {
+    /* FIXME */
+    /*  BookmarkDialog::getInstance( p_intf )->toggleVisible(); */
 }
 
 /****************************************************************************

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index 028f13dd734b0a530b52f54490ac4d5e8f7959e8..765be192b8204117a95b792361585f11bd589769 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -157,6 +157,7 @@ public slots:
     void hideMenus();
     void switchToSkins();
     void gotoTimeDialog();
+    void vlmDialog();
     void helpDialog();
     void aboutDialog();
 };

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index e2856c947b260172372462c02967b37dae56b079..071c0de1022b276db80e8d2ddbc221c5af641ec2 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -240,7 +240,10 @@ 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" );
+    DP_SADD( qtr(I_MENU_GOTOTIME), "","", gotoTimeDialog(), "Ctrl+T" );
+    DP_SADD( qtr(I_MENU_BOOKMARK), "","", bookmarksDialog(), "Ctrl+B" );
+    DP_SADD( qtr(I_MENU_VLM), "","", vlmDialog(), "Ctrl+V" );
+
     menu->addSeparator();
     if( mi )
     {