Adding Open Menu entries.

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index e9a532a14254194a6f9e8d48ff6146bb1bfb454d..bedce7f1070493ac4c5eabce6979512236f0e9f4 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -84,6 +84,7 @@ OpenDialog::~OpenDialog()
 
 void OpenDialog::showTab(int i_tab=0)
 {
+    printf ( "%i" , i_tab);
     this->show();
     ui.Tab->setCurrentIndex(i_tab);
 }
@@ -141,6 +142,8 @@ void OpenDialog::toggleAdvancedPanel()
         }
         resize( width(), mainHeight + advHeight );
     }
+
+    showTab( 2 );
 }
 
 void OpenDialog::updateMRL() {

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index ca2d503ecf4da6faadee3b8ed7070626c72f3699..0c999c23003d13f6bde6d08ca8a5a345d33dafba 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -80,10 +80,13 @@ void DialogsProvider::customEvent( QEvent *event )
         switch( de->i_dialog )
         {
             case INTF_DIALOG_FILE:
+                openDialog(); break;
             case INTF_DIALOG_DISC:
+                openDiscDialog(); break;
             case INTF_DIALOG_NET:
+                openNetDialog(); break;
             case INTF_DIALOG_CAPTURE:
-                openDialog( de->i_dialog ); break;
+                openDialog(); break;
             case INTF_DIALOG_PLAYLIST:
                 playlistDialog(); break;
             case INTF_DIALOG_MESSAGES:
@@ -158,17 +161,27 @@ void DialogsProvider::openDialog()
 {
     openDialog( 0 );
 }
-void DialogsProvider::PLAppendDialog()
+void DialogsProvider::openDiscDialog()
 {
+    openDialog( 1 );
 }
-void DialogsProvider::MLAppendDialog()
+void DialogsProvider::openNetDialog()
 {
+    openDialog( 2 );
 }
 void DialogsProvider::openDialog( int i_tab )
 {
     OpenDialog::getInstance( p_intf->p_sys->p_mi  , p_intf )->showTab( i_tab );
 }
 
+void DialogsProvider::PLAppendDialog()
+{
+}
+void DialogsProvider::MLAppendDialog()
+{
+}
+
+
 /**** Simple open ****/
 
 QStringList DialogsProvider::showSimpleOpen()

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index ef00415445dc859509a55b918db4dde28becaec2..817de8c7b1c6a98342f32a951297f27f82054727 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -83,9 +83,11 @@ public slots:
     void simpleMLAppendDialog();
     void simpleOpenDialog();
     void openDialog();
+    void openDialog(int );
+    void openNetDialog();
+    void openDiscDialog();
     void PLAppendDialog();
     void MLAppendDialog();
-    void openDialog( int );
     void popupMenu( int );
     void doInteraction( intf_dialog_args_t * );
     void menuAction( QObject *);

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 5d7c4939847f6db6764e5ef961e5c824172a0537..9bfc2e4253bbbdfb3f7fca4ac1d485307bc7150c 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -143,6 +143,8 @@ QMenu *QVLCMenu::FileMenu()
     QMenu *menu = new QMenu();
     DP_SADD( qtr("Quick &Open File...") , "", "", simpleOpenDialog() );
     DP_SADD( qtr("&Advanced Open..." ), "", "", openDialog() );
+    DP_SADD( qtr("Open &Network..." ), "", "", openNetDialog());
+    DP_SADD( qtr("Open &Disc..." ), "", "", openDiscDialog());
     menu->addSeparator();
     DP_SADD( qtr("Streaming..."), "", "", streamingDialog() );
     menu->addSeparator();