Qt4 - Open and menus links, cleaning, etc..

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index d0f3209a062eccc749cde5666ee32725547ee2de..9ae4d5ecb60e516cea42aab1f10e0db758f430c3 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -47,10 +47,10 @@ OpenDialog::OpenDialog( QWidget *parent, intf_thread_t *_p_intf, bool modal ) :
     netOpenPanel = new NetOpenPanel( this , p_intf );
     captureOpenPanel = new CaptureOpenPanel( this, p_intf );
 
-    ui.Tab->addTab( fileOpenPanel, qtr( "File" ) );
-    ui.Tab->addTab( diskOpenPanel, qtr( "Disc" ) );
-    ui.Tab->addTab( netOpenPanel, qtr( "Network" ) );
-    ui.Tab->addTab( captureOpenPanel, qtr( "Capture" ) );
+    ui.Tab->addTab( fileOpenPanel, qtr( "&File" ) );
+    ui.Tab->addTab( diskOpenPanel, qtr( "&Disc" ) );
+    ui.Tab->addTab( netOpenPanel, qtr( "&Network" ) );
+    ui.Tab->addTab( captureOpenPanel, qtr( "Capture &Device" ) );
 
     ui.advancedFrame->hide();
 
@@ -74,9 +74,9 @@ OpenDialog::OpenDialog( QWidget *parent, intf_thread_t *_p_intf, bool modal ) :
     CONNECT( ui.slaveText, textChanged(QString), this, updateMRL());
     CONNECT( ui.cacheSpinBox, valueChanged(int), this, updateMRL());
 
-    BUTTONACT( ui.closeButton, playOrEnqueue());
+    BUTTONACT( ui.closeButton, play());
     BUTTONACT( ui.cancelButton, cancel());
-    BUTTONACT( ui.enqueueButton, playOrEnqueue( true ));
+    BUTTONACT( ui.enqueueButton, enqueue());
     BUTTONACT( ui.advancedCheckBox , toggleAdvancedPanel() );
 
     /* Initialize caching */
@@ -111,7 +111,17 @@ void OpenDialog::cancel()
         reject();
 }
 
-void OpenDialog::playOrEnqueue(bool b_enqueue = false )
+void OpenDialog::play()
+{
+    playOrEnqueue( false );
+}
+
+void OpenDialog::enqueue()
+{
+    playOrEnqueue( true );
+}
+
+void OpenDialog::playOrEnqueue( bool b_enqueue = false )
 {
     this->toggleVisible();
     mrl = ui.advancedLineInput->text();

diff --git a/modules/gui/qt4/dialogs/open.hpp b/modules/gui/qt4/dialogs/open.hpp
index 8198cb3997d9755f6576727ffee75a40b173afa8..39c1a184e0160a3bc8898bb78192fafc9a1bb359 100644 (file)
--- a/modules/gui/qt4/dialogs/open.hpp
+++ b/modules/gui/qt4/dialogs/open.hpp
@@ -64,11 +64,14 @@ private:
 
     QString storedMethod;
     int advHeight, mainHeight;
+
+    void playOrEnqueue( bool );
 private slots:
     void cancel();
-    void playOrEnqueue(bool);
+    void play();
+    void enqueue();
     void toggleAdvancedPanel();
-    void updateMRL(QString);
+    void updateMRL( QString );
     void updateMRL();
     void newMethod(QString);
     void signalCurrent();

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 31f800ad235ed488ea48184c422c8de42836475a..132e74a6f79afc8053ae7f10d1a6f6876eea7d13 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -145,9 +145,9 @@ QMenu *QVLCMenu::FileMenu()
     DP_SADD( qtr("Open &File..." ), "", "", openFileDialog() );
     DP_SADD( qtr("Open &Disc..." ), "", "", openDiscDialog());
     DP_SADD( qtr("Open &Network..." ), "", "", openNetDialog());
-    DP_SADD( qtr("Open &Network..." ), "", "", openCaptureDialog());
+    DP_SADD( qtr("Open &Capture Device..." ), "", "", openCaptureDialog());
     menu->addSeparator();
-    DP_SADD( qtr("Streaming..."), "", "", streamingDialog() );
+    DP_SADD( qtr("&Streaming..."), "", "", streamingDialog() );
     menu->addSeparator();
     DP_SADD( qtr("&Quit") , "", "", quit() );
     return menu;

diff --git a/modules/gui/qt4/ui/open.ui b/modules/gui/qt4/ui/open.ui
index b3c6775e05596705ac4313efb7d912d1d1b18fe1..0981a688dd66a12948685e886401ab333030d408 100644 (file)
--- a/modules/gui/qt4/ui/open.ui
+++ b/modules/gui/qt4/ui/open.ui
@@ -33,7 +33,7 @@
    <item>
     <widget class="QCheckBox" name="advancedCheckBox" >
      <property name="text" >
-      <string>Show more options</string>
+      <string>&amp;Show more options</string>
      </property>
     </widget>
    </item>
@@ -160,21 +160,21 @@
      <item>
       <widget class="QPushButton" name="cancelButton" >
        <property name="text" >
-        <string>Cancel</string>
+        <string>&amp;Cancel</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="enqueueButton" >
        <property name="text" >
-        <string>Enqueue</string>
+        <string>&amp;Enqueue</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="closeButton" >
        <property name="text" >
-        <string>Play</string>
+        <string>&amp;Play</string>
        </property>
        <property name="default" >
         <bool>true</bool>