Qt4 - Open Dialog. Use #defines for tab naming to avoid miscomprehensions. Cosmectics.

diff --git a/modules/gui/qt4/components/open.cpp b/modules/gui/qt4/components/open.cpp
index a3fd97fea8f5a6c7ba8aab515844c11b5444618a..2450a6370c40d89219f63ddebf3266235498847e 100644 (file)
--- a/modules/gui/qt4/components/open.cpp
+++ b/modules/gui/qt4/components/open.cpp
@@ -216,7 +216,7 @@ void FileOpenPanel::toggleSubtitleFrame()
 /**************************************************************************
  * Disk open
  **************************************************************************/
-DiskOpenPanel::DiskOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
+DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
                                 OpenPanel( _parent, _p_intf )
 {
     ui.setupUi( this );
@@ -230,16 +230,16 @@ DiskOpenPanel::DiskOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     CONNECT( ui.chapterSpin, valueChanged(int), this, updateMRL());
 }
 
-DiskOpenPanel::~DiskOpenPanel()
+DiscOpenPanel::~DiscOpenPanel()
 {}
 
-void DiskOpenPanel::clear()
+void DiscOpenPanel::clear()
 {
     ui.titleSpin->setValue(0);
     ui.chapterSpin->setValue(0);
 }
 
-void DiskOpenPanel::updateMRL()
+void DiscOpenPanel::updateMRL()
 {
     QString mrl = "";
     /* DVD */

diff --git a/modules/gui/qt4/components/open.hpp b/modules/gui/qt4/components/open.hpp
index 7cf2bb1f70d0b7e6b7eee90eae60eb7ed6fe4d5e..257ae381abb5a9f4b11c1b559c29d78d7b247bde 100644 (file)
--- a/modules/gui/qt4/components/open.hpp
+++ b/modules/gui/qt4/components/open.hpp
@@ -103,12 +103,12 @@ private slots:
     void updateAddress();
 };
 
-class DiskOpenPanel: public OpenPanel
+class DiscOpenPanel: public OpenPanel
 {
     Q_OBJECT;
 public:
-    DiskOpenPanel( QWidget *, intf_thread_t * );
-    virtual ~DiskOpenPanel();
+    DiscOpenPanel( QWidget *, intf_thread_t * );
+    virtual ~DiscOpenPanel();
     virtual void clear() ;
 private:
     Ui::OpenDisk ui;

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index 451f693bfbd1b34d34dd7042704a99f8ccc993ba..c3f3dc2e7e9860966c4dccc743c8ab035405e466 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -48,30 +48,32 @@ OpenDialog::OpenDialog( QWidget *parent, intf_thread_t *_p_intf, bool modal,
     resize( 500, 300);
 
     /* Tab definition and creation */
-    fileOpenPanel = new FileOpenPanel( ui.Tab , p_intf );
-    diskOpenPanel = new DiskOpenPanel( ui.Tab , p_intf );
-    netOpenPanel = new NetOpenPanel( ui.Tab , p_intf );
+    fileOpenPanel = new FileOpenPanel( ui.Tab, p_intf );
+    discOpenPanel = new DiscOpenPanel( ui.Tab, p_intf );
+    netOpenPanel = new NetOpenPanel( ui.Tab, p_intf );
     captureOpenPanel = new CaptureOpenPanel( ui.Tab, 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 &Device" ) );
+    ui.Tab->insertTab( OPEN_FILE_TAB, fileOpenPanel, qtr( "&File" ) );
+    ui.Tab->insertTab( OPEN_DISC_TAB, discOpenPanel, qtr( "&Disc" ) );
+    ui.Tab->insertTab( OPEN_NETWORK_TAB, netOpenPanel, qtr( "&Network" ) );
+    ui.Tab->insertTab( OPEN_CAPTURE_TAB, captureOpenPanel,
+                                qtr( "Capture &Device" ) );
 
     /* Hide the advancedPanel */
     ui.advancedFrame->hide();
 
     /* Buttons Creation */
-    QSizePolicy buttonSizePolicy(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(1));
+    QSizePolicy buttonSizePolicy( static_cast<QSizePolicy::Policy>(7),
+                                  static_cast<QSizePolicy::Policy>(1) );
     buttonSizePolicy.setHorizontalStretch(0);
     buttonSizePolicy.setVerticalStretch(0);
 
     playButton = new QToolButton();
     playButton->setText( qtr( "&Play" ) );
     playButton->setSizePolicy( buttonSizePolicy );
-    playButton->setMinimumSize(QSize(90, 0));
-    playButton->setPopupMode(QToolButton::MenuButtonPopup);
-    playButton->setToolButtonStyle(Qt::ToolButtonTextOnly);
+    playButton->setMinimumSize( QSize(90, 0) );
+    playButton->setPopupMode( QToolButton::MenuButtonPopup );
+    playButton->setToolButtonStyle( Qt::ToolButtonTextOnly );
 
     cancelButton = new QToolButton();
     cancelButton->setText( qtr( "&Cancel" ) );
@@ -96,7 +98,7 @@ 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( discOpenPanel, mrlUpdated( QString ), this, updateMRL(QString) );
     CONNECT( captureOpenPanel, mrlUpdated( QString ), this,
             updateMRL(QString) );
 
@@ -104,7 +106,7 @@ OpenDialog::OpenDialog( QWidget *parent, intf_thread_t *_p_intf, bool modal,
              this, newMethod(QString) );
     CONNECT( netOpenPanel, methodChanged( QString ),
              this, newMethod(QString) );
-    CONNECT( diskOpenPanel, methodChanged( QString ),
+    CONNECT( discOpenPanel, methodChanged( QString ),
              this, newMethod(QString) );
 
     CONNECT( ui.slaveText, textChanged(QString), this, updateMRL());

diff --git a/modules/gui/qt4/dialogs/open.hpp b/modules/gui/qt4/dialogs/open.hpp
index 4b0026eea087805c1aeaf7952cc57a9139ce749e..571b88e4b066232e77cce4dd027288bc97d30b6a 100644 (file)
--- a/modules/gui/qt4/dialogs/open.hpp
+++ b/modules/gui/qt4/dialogs/open.hpp
@@ -72,7 +72,7 @@ private:
     Ui::Open ui;
     FileOpenPanel *fileOpenPanel;
     NetOpenPanel *netOpenPanel;
-    DiskOpenPanel *diskOpenPanel;
+    DiscOpenPanel *discOpenPanel;
     CaptureOpenPanel *captureOpenPanel;
 
     QString storedMethod;

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index da304ad4ea6d03e4fc95e97cf8b70ba152f80d51..8642c577a101083a6101171bf254e8a0638a89a1 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -177,23 +177,23 @@ void DialogsProvider::bookmarksDialog()
 
 void DialogsProvider::openDialog()
 {
-    openDialog( 0 );
+    openDialog( OPEN_FILE_TAB );
 }
 void DialogsProvider::openFileDialog()
 {
-    openDialog( 0 );
+    openDialog( OPEN_FILE_TAB );
 }
 void DialogsProvider::openDiscDialog()
 {
-    openDialog( 1 );
+    openDialog( OPEN_DISC_TAB );
 }
 void DialogsProvider::openNetDialog()
 {
-    openDialog( 2 );
+    openDialog( OPEN_NETWORK_TAB );
 }
 void DialogsProvider::openCaptureDialog()
 {
-    openDialog( 3 );
+    openDialog( OPEN_CAPTURE_TAB );
 }
 void DialogsProvider::openDialog( int i_tab )
 {

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index b7b1918baa14cc2f00580f8a5eb604b5e2bba572..342fe5b7180795ea729e2d564c640d4023757c3d 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -68,6 +68,10 @@
     string += _("All Files");        \
     string += " (*.*)";
 
+#define OPEN_FILE_TAB           0x0
+#define OPEN_DISC_TAB           0x1
+#define OPEN_NETWORK_TAB        0x2
+#define OPEN_CAPTURE_TAB        0x3
 
 class QEvent;
 class QSignalMapper;