Qt4 - remove a stupid debug thing and rename Disk => Disc

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index c56b1bac4ef33bb7d6b25575578fdbebe8774427..fcb6dad0563cf44f74b347e242e71712e71476c6 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -46,7 +46,7 @@ OpenDialog::OpenDialog( QWidget *parent, intf_thread_t *_p_intf, bool modal ) :
     diskOpenPanel = new DiskOpenPanel(this , p_intf );
     netOpenPanel = new NetOpenPanel(this , p_intf );
     ui.Tab->addTab(fileOpenPanel, qtr("File"));
-    ui.Tab->addTab(diskOpenPanel, qtr("Disk"));
+    ui.Tab->addTab(diskOpenPanel, qtr("Disc"));
     ui.Tab->addTab(netOpenPanel, qtr("Network"));
 
     ui.advancedFrame->hide();
@@ -146,8 +146,6 @@ void OpenDialog::toggleAdvancedPanel()
         }
         resize( width(), mainHeight + advHeight );
     }
-
-    showTab( 2 );
 }
 
 void OpenDialog::updateMRL() {

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