Qt4 - Put the dialog you are not likely to use during playback as QDialogs, meaning...

VLM, Preferences, Errors, Podcast_Conf, GotoTime, Help.

diff --git a/modules/gui/qt4/dialogs/errors.cpp b/modules/gui/qt4/dialogs/errors.cpp
index 329c8f3aeda98e24e03370171815024584cd8fa9..951e229006b45648afc62d98dbeb525e905f4b11 100644 (file)
--- a/modules/gui/qt4/dialogs/errors.cpp
+++ b/modules/gui/qt4/dialogs/errors.cpp
@@ -33,7 +33,8 @@
 
 ErrorsDialog *ErrorsDialog::instance = NULL;
 
-ErrorsDialog::ErrorsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
+ErrorsDialog::ErrorsDialog( QWidget *parent, intf_thread_t *_p_intf ) 
+            : QVLCDialog( parent, _p_intf )
 {
     setWindowTitle( qtr( "Errors" ) );
     resize( 500 , 300 );

diff --git a/modules/gui/qt4/dialogs/errors.hpp b/modules/gui/qt4/dialogs/errors.hpp
index bf9b362bcb9f81dc45d86f08b50f1bbe8fa67318..afa14acba9fab9f889524fb187f701a565922d99 100644 (file)
--- a/modules/gui/qt4/dialogs/errors.hpp
+++ b/modules/gui/qt4/dialogs/errors.hpp
@@ -31,14 +31,14 @@ class QCheckBox;
 class QGridLayout;
 class QTextEdit;
 
-class ErrorsDialog : public QVLCFrame
+class ErrorsDialog : public QVLCDialog
 {
     Q_OBJECT;
 public:
     static ErrorsDialog * getInstance( intf_thread_t *p_intf )
     {
         if( !instance)
-            instance = new ErrorsDialog( p_intf );
+            instance = new ErrorsDialog( (QWidget *)p_intf->p_sys->p_mi, p_intf );
         return instance;
     }
     virtual ~ErrorsDialog() {};
@@ -46,7 +46,7 @@ public:
     void addError( QString, QString );
     void addWarning( QString, QString );
 private:
-    ErrorsDialog( intf_thread_t * );
+    ErrorsDialog( QWidget *parent, intf_thread_t * );
     static ErrorsDialog *instance;
     void add( bool, QString, QString );
 

diff --git a/modules/gui/qt4/dialogs/gototime.cpp b/modules/gui/qt4/dialogs/gototime.cpp
index 5206cd7713c46f6c8a87d7b77d437109fe372435..14fab202ba008b239dd6034e81b37547a8e5b246 100644 (file)
--- a/modules/gui/qt4/dialogs/gototime.cpp
+++ b/modules/gui/qt4/dialogs/gototime.cpp
@@ -36,7 +36,8 @@
 
 GotoTimeDialog *GotoTimeDialog::instance = NULL;
 
-GotoTimeDialog::GotoTimeDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
+GotoTimeDialog::GotoTimeDialog( QWidget *parent, intf_thread_t *_p_intf)
+               : QVLCDialog( parent, _p_intf )
 {
     setWindowFlags( Qt::Tool );
     setWindowTitle( qtr( "Go to time" ) );

diff --git a/modules/gui/qt4/dialogs/gototime.hpp b/modules/gui/qt4/dialogs/gototime.hpp
index 43693f6a96e532ed9c720879054f1e49b0d119ae..da94bae18f625ed3ce8268169192a4c7b3b546c9 100644 (file)
--- a/modules/gui/qt4/dialogs/gototime.hpp
+++ b/modules/gui/qt4/dialogs/gototime.hpp
@@ -28,20 +28,20 @@
 
 class QTimeEdit;
 
-class GotoTimeDialog : public QVLCFrame
+class GotoTimeDialog : public QVLCDialog
 {
     Q_OBJECT;
 public:
     static GotoTimeDialog * getInstance( intf_thread_t *p_intf )
     {
         if( !instance)
-            instance = new GotoTimeDialog( p_intf );
+            instance = new GotoTimeDialog( (QWidget *)p_intf->p_sys->p_mi, p_intf );
         return instance;
     }
     virtual ~GotoTimeDialog();
 
 private:
-    GotoTimeDialog( intf_thread_t * );
+    GotoTimeDialog( QWidget *, intf_thread_t * );
     static GotoTimeDialog *instance;
     QTimeEdit *timeEdit;
 private slots:

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 3f2403257ab0a99ad30dd8d8d87fad8c9b6d97b3..c3a167e73efabecbbe7c8950ac2cb387d6d35186 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -48,7 +48,8 @@
 
 HelpDialog *HelpDialog::instance = NULL;
 
-HelpDialog::HelpDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
+HelpDialog::HelpDialog( QWidget *parent, intf_thread_t *_p_intf )
+           : QVLCDialog( parent, _p_intf )
 {
     setWindowTitle( qtr( "Help" ) );
     resize( 600, 560 );

diff --git a/modules/gui/qt4/dialogs/help.hpp b/modules/gui/qt4/dialogs/help.hpp
index e71534f60820e4e0dcf567beedd6bd3bda2661d4..cb9d4eba87754f5da3787317386f7ce7a2cd46f2 100644 (file)
--- a/modules/gui/qt4/dialogs/help.hpp
+++ b/modules/gui/qt4/dialogs/help.hpp
@@ -34,20 +34,20 @@ class QLabel;
 class QEvent;
 class QPushButton;
 
-class HelpDialog : public QVLCFrame
+class HelpDialog : public QVLCDialog
 {
     Q_OBJECT;
 public:
     static HelpDialog * getInstance( intf_thread_t *p_intf )
     {
         if( !instance)
-            instance = new HelpDialog( p_intf );
+            instance = new HelpDialog( (QWidget *)p_intf->p_sys->p_mi, p_intf );
         return instance;
     }
     virtual ~HelpDialog();
 
 private:
-    HelpDialog( intf_thread_t * );
+    HelpDialog( QWidget *, intf_thread_t * );
     static HelpDialog *instance;
 public slots:
     void close();

diff --git a/modules/gui/qt4/dialogs/podcast_configuration.cpp b/modules/gui/qt4/dialogs/podcast_configuration.cpp
index 7a5ad8cafb772ede9d2dfafc13c6d4a4be241d49..a756fec1c6c1ec282e3193242bcd2081e412249b 100644 (file)
--- a/modules/gui/qt4/dialogs/podcast_configuration.cpp
+++ b/modules/gui/qt4/dialogs/podcast_configuration.cpp
@@ -25,8 +25,8 @@
 
 PodcastConfigDialog *PodcastConfigDialog::instance = NULL;
 
-PodcastConfigDialog::PodcastConfigDialog( intf_thread_t *_p_intf)
-                : QVLCFrame( _p_intf )
+PodcastConfigDialog::PodcastConfigDialog( QWidget *parent, intf_thread_t *_p_intf)
+                    : QVLCDialog( parent, _p_intf )
 
 {
     ui.setupUi( this );

diff --git a/modules/gui/qt4/dialogs/podcast_configuration.hpp b/modules/gui/qt4/dialogs/podcast_configuration.hpp
index 31ca97d1e699068911eb209cb4ab722b816eedf6..796b12e0cc47151f3d9be4a61d2e4f554d787435 100644 (file)
--- a/modules/gui/qt4/dialogs/podcast_configuration.hpp
+++ b/modules/gui/qt4/dialogs/podcast_configuration.hpp
@@ -27,20 +27,21 @@
 #include "util/qvlcframe.hpp"
 #include "ui/podcast_configuration.h"
 
-class PodcastConfigDialog : public QVLCFrame
+class PodcastConfigDialog : public QVLCDialog
 {
     Q_OBJECT;
 public:
     static PodcastConfigDialog * getInstance( intf_thread_t *p_intf )
     {
         if( !instance )
-            instance = new PodcastConfigDialog( p_intf );
+            instance = new PodcastConfigDialog( (QWidget *)p_intf->p_sys->p_mi, 
+                                                p_intf );
         return instance;
     }
     virtual ~PodcastConfigDialog();
 
 private:
-    PodcastConfigDialog( intf_thread_t * );
+    PodcastConfigDialog( QWidget *, intf_thread_t * );
     static PodcastConfigDialog *instance;
     Ui::PodcastConfiguration ui;
 public slots:

diff --git a/modules/gui/qt4/dialogs/preferences.cpp b/modules/gui/qt4/dialogs/preferences.cpp
index 280a3ebcd86505bc215f320aee9adf8a8829379c..d48b00a3865326eae8c02ba28cb94bcee4ffe892 100644 (file)
--- a/modules/gui/qt4/dialogs/preferences.cpp
+++ b/modules/gui/qt4/dialogs/preferences.cpp
@@ -40,7 +40,8 @@
 
 PrefsDialog *PrefsDialog::instance = NULL;
 
-PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
+PrefsDialog::PrefsDialog( QWidget *parent, intf_thread_t *_p_intf )
+            : QVLCDialog( parent, _p_intf )
 {
     QGridLayout *main_layout = new QGridLayout( this );
     setWindowTitle( qtr( "Preferences" ) );

diff --git a/modules/gui/qt4/dialogs/preferences.hpp b/modules/gui/qt4/dialogs/preferences.hpp
index 3ca5401f3a42593e2c1dc5d19fac21d46da488c5..1487f38890fdf5b526d04a95cf0f97da678b445a 100644 (file)
--- a/modules/gui/qt4/dialogs/preferences.hpp
+++ b/modules/gui/qt4/dialogs/preferences.hpp
@@ -43,14 +43,14 @@ class QListWidget;
 class QListWidgetItem;
 class QLabel;
 
-class PrefsDialog : public QVLCFrame
+class PrefsDialog : public QVLCDialog
 {
     Q_OBJECT;
 public:
-    static PrefsDialog * getInstance( intf_thread_t *_p_intf )
+    static PrefsDialog * getInstance( intf_thread_t *p_intf )
     {
         if( !instance )
-            instance = new PrefsDialog( _p_intf );
+            instance = new PrefsDialog( (QWidget *)p_intf->p_sys->p_mi, p_intf );
         return instance;
     }
     virtual ~PrefsDialog() {};
@@ -60,7 +60,7 @@ public:
 #endif
 
 private:
-    PrefsDialog( intf_thread_t * );
+    PrefsDialog( QWidget *, intf_thread_t * );
     QGridLayout *main_layout;
 
     QWidget *main_panel;

diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp
index 3b28516a2a1b1b9ee82ce67a5a9353112a951af1..7982f8d326b968894e49f987ed63c7c7d888a842 100644 (file)
--- a/modules/gui/qt4/dialogs/vlm.cpp
+++ b/modules/gui/qt4/dialogs/vlm.cpp
@@ -51,7 +51,7 @@ static const char *psz_type[] = { "Broadcast", "Schedule", "VOD" };
 
 VLMDialog *VLMDialog::instance = NULL;
 
-VLMDialog::VLMDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
+VLMDialog::VLMDialog( QWidget *parent, intf_thread_t *_p_intf ) : QVLCDialog( parent, _p_intf )
 {
     p_vlm = vlm_New( p_intf );
 

diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp
index 73e3defc00dd35642671e163a4fce0a03b624ce2..9594e5c3932500146643a2f78901c0a145abab3a 100644 (file)
--- a/modules/gui/qt4/dialogs/vlm.hpp
+++ b/modules/gui/qt4/dialogs/vlm.hpp
@@ -63,22 +63,22 @@ class VLMAWidget;
 class VLMWrapper;
 
 
-class VLMDialog : public QVLCFrame
+class VLMDialog : public QVLCDialog
 {
     Q_OBJECT;
 public:
     static VLMDialog * getInstance( intf_thread_t *p_intf )
     {
         if( !instance)
-             instance = new VLMDialog( p_intf );
+             instance = new VLMDialog( (QWidget *)p_intf->p_sys->p_mi, p_intf );
         return instance;
     };
     virtual ~VLMDialog();
 
     VLMWrapper *vlmWrapper;
-vlm_t *p_vlm;
+    vlm_t *p_vlm;
 private:
-    VLMDialog( intf_thread_t * );
+    VLMDialog( QWidget *, intf_thread_t * );
     static VLMDialog *instance;
     Ui::Vlm ui;