Qt: complete_preferences: toggle prefs for current modules.

[vlc] / modules / gui / qt4 / dialogs / extended.cpp

diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp
index b527b4a254a4a9a001ccb07659c078651f18c41a..2740f9daf71320e938f959ef33994027c5906219 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.cpp
+++ b/modules/gui/qt4/dialogs/extended.cpp
@@ -33,11 +33,18 @@
 #include <QTabWidget>
 #include <QGridLayout>
 #include <QDialogButtonBox>
+#include <QPushButton>
 #include <vlc_modules.h>
 
-ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
+ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf )
+               : QVLCDialog( (QWidget*)_p_intf->p_sys->p_mi, _p_intf )
 {
+#ifdef __APPLE__
+    setWindowFlags( Qt::Drawer );
+#else
     setWindowFlags( Qt::Tool );
+#endif
+
     setWindowOpacity( var_InheritFloat( p_intf, "qt-opacity" ) );
     setWindowTitle( qtr( "Adjustments and Effects" ) );
     setWindowRole( "vlc-extended" );
@@ -87,8 +94,9 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
 
     layout->addWidget( mainTabW );
 
-    QDialogButtonBox *closeButtonBox =
-        new QDialogButtonBox( QDialogButtonBox::Close, Qt::Horizontal, this );
+    QDialogButtonBox *closeButtonBox = new QDialogButtonBox( Qt::Horizontal, this );
+    closeButtonBox->addButton(
+        new QPushButton( qtr("&Close"), this ), QDialogButtonBox::RejectRole );
     layout->addWidget( closeButtonBox );
     CONNECT( closeButtonBox, rejected(), this, close() );
 
@@ -104,12 +112,12 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
             move ( 450 , 0 );
     }
 
-    CONNECT( THEMIM->getIM(), statusChanged( int ), this, changedItem( int ) );
+    CONNECT( THEMIM->getIM(), playingStatusChanged( int ), this, changedItem( int ) );
 }
 
 ExtendedDialog::~ExtendedDialog()
 {
-    writeSettings( "EPanel" );
+    getSettings()->setValue("Epanel/geometry", saveGeometry());
 }
 
 void ExtendedDialog::showTab( int i )