Qt4 - Open: Capture Tab added. Still almost empty, but well, this is coming after. :D

diff --git a/modules/gui/qt4/components/open.cpp b/modules/gui/qt4/components/open.cpp
index b00a71bab74250b5c7a21d0ce463a8c5005b6e6b..3fbab4628dd210d0266e8dd013d9af3d33f26c2e 100644 (file)
--- a/modules/gui/qt4/components/open.cpp
+++ b/modules/gui/qt4/components/open.cpp
@@ -271,4 +271,7 @@ void CaptureOpenPanel::clear()
 {}
 
 void CaptureOpenPanel::updateMRL()
-{}
+{
+    QString mrl = "";
+    emit mrlUpdated(mrl);
+}

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index fcb6dad0563cf44f74b347e242e71712e71476c6..4f5bfb45340ee94a777a65ac032cf4174aa823c6 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -42,12 +42,15 @@ OpenDialog::OpenDialog( QWidget *parent, intf_thread_t *_p_intf, bool modal ) :
     setModal( modal );
     ui.setupUi( this );
     setWindowTitle( qtr("Open" ) );
-    fileOpenPanel = new FileOpenPanel(this , p_intf );
-    diskOpenPanel = new DiskOpenPanel(this , p_intf );
-    netOpenPanel = new NetOpenPanel(this , p_intf );
-    ui.Tab->addTab(fileOpenPanel, qtr("File"));
-    ui.Tab->addTab(diskOpenPanel, qtr("Disc"));
-    ui.Tab->addTab(netOpenPanel, qtr("Network"));
+    fileOpenPanel = new FileOpenPanel( this , p_intf );
+    diskOpenPanel = new DiskOpenPanel( this , p_intf );
+    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.advancedFrame->hide();
 
@@ -57,6 +60,9 @@ OpenDialog::OpenDialog( QWidget *parent, intf_thread_t *_p_intf, bool modal ) :
     CONNECT( fileOpenPanel, mrlUpdated( QString ), this, updateMRL(QString) );
     CONNECT( netOpenPanel, mrlUpdated( QString ), this, updateMRL(QString) );
     CONNECT( diskOpenPanel, mrlUpdated( QString ), this, updateMRL(QString) );
+    CONNECT( captureOpenPanel, mrlUpdated( QString ), this,
+            updateMRL(QString) );
+
 
     CONNECT( fileOpenPanel, methodChanged( QString ),
              this, newMethod(QString) );
@@ -122,7 +128,7 @@ void OpenDialog::ok()
                            PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO) |
                            ( i ? PLAYLIST_PREPARSE : 0 ),
                            PLAYLIST_END, VLC_TRUE, VLC_FALSE );
-         }
+        }
 
     }
     else

diff --git a/modules/gui/qt4/dialogs/open.hpp b/modules/gui/qt4/dialogs/open.hpp
index 824b4dc625672d840ead33fe5898a682107ddace..d9909d9f7a886678920d0a7df001f8b1a0cdd173 100644 (file)
--- a/modules/gui/qt4/dialogs/open.hpp
+++ b/modules/gui/qt4/dialogs/open.hpp
@@ -60,6 +60,7 @@ private:
     FileOpenPanel *fileOpenPanel;
     NetOpenPanel *netOpenPanel;
     DiskOpenPanel *diskOpenPanel;
+    CaptureOpenPanel *captureOpenPanel;
 
     QString storedMethod;
     int advHeight, mainHeight;

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 36f784787dcd80dce5216a317ac218d0c2b0c942..a85196857daddf91bdc0aa2634cba64f421fa97a 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -86,7 +86,7 @@ void DialogsProvider::customEvent( QEvent *event )
             case INTF_DIALOG_NET:
                 openNetDialog(); break;
             case INTF_DIALOG_CAPTURE:
-                openDialog(); break;
+                openCaptureDialog(); break;
             case INTF_DIALOG_PLAYLIST:
                 playlistDialog(); break;
             case INTF_DIALOG_MESSAGES:
@@ -173,6 +173,10 @@ void DialogsProvider::openNetDialog()
 {
     openDialog( 2 );
 }
+void DialogsProvider::openCaptureDialog()
+{
+    openDialog( 3 );
+}
 void DialogsProvider::openDialog( int i_tab )
 {
     OpenDialog::getInstance( p_intf->p_sys->p_mi  , p_intf )->showTab( i_tab );

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index 684172c632c8fc03f80c1653549689b54cf48c1e..a71ed4915893cddff44736f43663ef29a321ad8b 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -89,6 +89,7 @@ public slots:
     void openDialog(int );
     void openFileDialog();
     void openNetDialog();
+    void openCaptureDialog();
     void openDiscDialog();
     void PLAppendDialog();
     void MLAppendDialog();

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index b595a1c27899674a8c679415d0fd30eda23eac94..31f800ad235ed488ea48184c422c8de42836475a 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -145,6 +145,7 @@ 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());
     menu->addSeparator();
     DP_SADD( qtr("Streaming..."), "", "", streamingDialog() );
     menu->addSeparator();

diff --git a/modules/gui/qt4/ui/open_capture.ui b/modules/gui/qt4/ui/open_capture.ui
index 4eb939b5f202998b9b0e0865d905ff172c2dcc58..acf5f4c0e6ac3f91d6eee595ddae6ade159c4669 100644 (file)
--- a/modules/gui/qt4/ui/open_capture.ui
+++ b/modules/gui/qt4/ui/open_capture.ui
@@ -59,7 +59,7 @@
     </widget>
    </item>
    <item row="2" column="0" colspan="3" >
-    <widget class="QGroupBox" name="groupBox_3" >
+    <widget class="QGroupBox" name="Options" >
      <property name="sizePolicy" >
       <sizepolicy>
        <hsizetype>5</hsizetype>
@@ -83,6 +83,7 @@
    </item>
   </layout>
  </widget>
+ <includes/>
  <resources/>
  <connections/>
 </ui>