Commit b141d55c authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: don't attach the core dialogs to the Main Interface but to the Dialog Provider.

This fix all the dialogs (Fix AVI, HTTP login) that didn't show in skins interface.
Manual port of [3b2f1606]
parent 9d5e75a7
......@@ -36,8 +36,8 @@
#include <QProgressDialog>
#include <QMutex>
DialogHandler::DialogHandler (intf_thread_t *intf)
: intf (intf),
DialogHandler::DialogHandler (intf_thread_t *intf, QObject *_parent)
: intf (intf), QObject( _parent ),
message (VLC_OBJECT(intf), "dialog-fatal", VLC_VAR_ADDRESS),
login (VLC_OBJECT(intf), "dialog-login", VLC_VAR_ADDRESS),
question (VLC_OBJECT(intf), "dialog-question", VLC_VAR_ADDRESS),
......
......@@ -35,7 +35,7 @@ class DialogHandler : public QObject
friend class QVLCProgressDialog;
public:
DialogHandler (intf_thread_t *);
DialogHandler (intf_thread_t *, QObject *parent);
~DialogHandler (void);
private:
......
......@@ -52,6 +52,7 @@
#include "dialogs/podcast_configuration.hpp"
#include "dialogs/toolbar.hpp"
#include "dialogs/plugins.hpp"
#include "dialogs/external.hpp"
#include <QEvent>
#include <QApplication>
......@@ -76,6 +77,8 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) :
SDMapper = new QSignalMapper();
CONNECT( SDMapper, mapped (QString), this, SDMenuAction( QString ) );
DialogHandler *dialogHandler = new DialogHandler (p_intf, this );
}
DialogsProvider::~DialogsProvider()
......
......@@ -206,8 +206,6 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/* END CONNECTS ON IM */
dialogHandler = new DialogHandler (p_intf);
/************
* Callbacks
************/
......@@ -284,8 +282,6 @@ MainInterface::~MainInterface()
{
msg_Dbg( p_intf, "Destroying the main interface" );
delete dialogHandler;
/* Unsure we hide the videoWidget before destroying it */
if( videoIsActive ) videoWidget->hide();
......
......@@ -49,7 +49,6 @@ class FullscreenControllerWidget;
class SpeedControlWidget;
class QMenu;
class QSize;
class DialogHandler;
enum {
CONTROLS_VISIBLE = 0x1,
......@@ -110,7 +109,6 @@ private:
ControlsWidget *controls;
InputControlsWidget *inputC;
FullscreenControllerWidget *fullscreenControls;
DialogHandler *dialogHandler;
void createMainWidget( QSettings* );
void createStatusBar();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment