* Qt4: added network and disk UIs to Open

Still not functionnal and ugly code.

diff --git a/modules/gui/qt4/components/open.cpp b/modules/gui/qt4/components/open.cpp
index 8167d15fc4a58c90367ceee460306af1cb21af46..0e52a565284930f09cb418829e7d3c3a6b21c4e2 100644 (file)
--- a/modules/gui/qt4/components/open.cpp
+++ b/modules/gui/qt4/components/open.cpp
@@ -51,29 +51,56 @@ QString FileOpenPanel::getUpdatedMRL()
     return ui.fileInput->currentText();
 }
 
+
 /**************************************************************************
- * Net open
+ * Disk open
  **************************************************************************/
-#if 0
-NetOpenPanel::NetOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
+DiskOpenPanel::DiskOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
                                 OpenPanel( _parent, _p_intf )
 {
     ui.setupUi( this );
 }
 
-NetOpenPanel::~NetOpenPanel()
+DiskOpenPanel::~DiskOpenPanel()
+{}
+
+void DiskOpenPanel::sendUpdate()
 {}
 
-QString NetOpenPanel::getUpdatedMRL( )
+QString DiskOpenPanel::getUpdatedMRL()
 {
+    //return ui.DiskInput->currentText();
+    return NULL;
+}
+
+
 
+/**************************************************************************
+ * Net open
+ **************************************************************************/
+NetOpenPanel::NetOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
+                                OpenPanel( _parent, _p_intf )
+{
+    ui.setupUi( this );
 }
 
+NetOpenPanel::~NetOpenPanel()
+{}
+
+void NetOpenPanel::sendUpdate()
+{}
+/*
 void NetOpenPanel::sendUpdate()
 {
     QString *mrl = new QString();
     QString *cache = new QString();
     getUpdatedMRL( mrl, cache );,
     emit dataUpdated( mrl, cache );
+}*/
+
+QString NetOpenPanel::getUpdatedMRL()
+{
+//  return ui.NetInput->currentText();
+    return NULL;
 }
-#endif
+

diff --git a/modules/gui/qt4/components/open.hpp b/modules/gui/qt4/components/open.hpp
index ddb41dce72bb4a8423468b9fe194635a9c16e9d0..37e3a74764053c590d6ecd0882f2ad6c8ba8fc78 100644 (file)
--- a/modules/gui/qt4/components/open.hpp
+++ b/modules/gui/qt4/components/open.hpp
@@ -29,6 +29,8 @@
 #include <QWidget>
 #include <QString>
 #include "ui/open_file.h"
+#include "ui/open_disk.h"
+#include "ui/open_net.h"
 
 class OpenPanel: public QWidget
 {
@@ -62,4 +64,38 @@ signals:
 
 };
 
+class NetOpenPanel: public OpenPanel
+{
+    Q_OBJECT;
+public:
+    NetOpenPanel( QWidget *, intf_thread_t * );
+    virtual ~NetOpenPanel();
+    virtual QString getUpdatedMRL();
+private:
+    Ui::OpenNet ui;
+public slots:
+    virtual void sendUpdate() ;
+signals:
+    void dataUpdated( QString, QString ) ;
+
+};
+
+class DiskOpenPanel: public OpenPanel
+{
+    Q_OBJECT;
+public:
+    DiskOpenPanel( QWidget *, intf_thread_t * );
+    virtual ~DiskOpenPanel();
+    virtual QString getUpdatedMRL();
+private:
+    Ui::OpenDisk ui;
+public slots:
+    virtual void sendUpdate() ;
+signals:
+    void dataUpdated( QString, QString ) ;
+
+};
+
+
+
 #endif

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index 508d12869edee2594610c3076815a1c639decfd3..507af80153e969bba1db41a1deb6dd64d5b9506f 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -39,7 +39,11 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
     setWindowTitle( _("Open" ) );
     ui.setupUi( this );
     fileOpenPanel = new FileOpenPanel(this , _p_intf );
-    ui.Tab->addTab(fileOpenPanel, "Test");
+    diskOpenPanel = new DiskOpenPanel(this , _p_intf );
+    netOpenPanel = new NetOpenPanel(this , _p_intf );
+    ui.Tab->addTab(fileOpenPanel, "File");
+    ui.Tab->addTab(diskOpenPanel, "Disk");
+    ui.Tab->addTab(netOpenPanel, "Network");
 }
 
 OpenDialog::~OpenDialog()

diff --git a/modules/gui/qt4/dialogs/open.hpp b/modules/gui/qt4/dialogs/open.hpp
index 58c59e80b25df84bbc515a3a12c462db9ac0695b..287d7089a1f44fce02eb9abcb69d5e38a8803c64 100644 (file)
--- a/modules/gui/qt4/dialogs/open.hpp
+++ b/modules/gui/qt4/dialogs/open.hpp
@@ -52,6 +52,8 @@ private:
     input_thread_t *p_input;
     Ui::Open ui;
     FileOpenPanel *fileOpenPanel;
+    NetOpenPanel *netOpenPanel;
+    DiskOpenPanel *diskOpenPanel;
 public slots:
     void cancel();
     void ok();

diff --git a/modules/gui/qt4/ui/open_net.ui b/modules/gui/qt4/ui/open_net.ui
index d4557b68b370fcc7c4953703387f9aeb310af892..7801108fe1eaf2cbe2fbc73fa16fb67688387c52 100644 (file)
--- a/modules/gui/qt4/ui/open_net.ui
+++ b/modules/gui/qt4/ui/open_net.ui
@@ -1,6 +1,6 @@
 <ui version="4.0" >
  <author>Jean-Baptiste Kempf</author>
- <class>OpenNetwork</class>
+ <class>OpenNet</class>
  <widget class="QWidget" name="OpenNetwork" >
   <property name="geometry" >
    <rect>