Qt: add a bunch of virtual for destructors

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

diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp
index 11342f15e75baa32afea0eade5de3aea03fd0af6..05750cbcd6d6cc260990f6189bba591962d4c7a1 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.cpp
+++ b/modules/gui/qt4/dialogs/extended.cpp
@@ -36,9 +36,15 @@
 #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" );
@@ -55,7 +61,7 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
     QTabWidget *audioTab = new QTabWidget( audioWidget );
 
     equal = new Equalizer( p_intf, audioTab );
-    audioTab->addTab( equal, qtr( "Graphic Equalizer" ) );
+    audioTab->addTab( equal, qtr( "Equalizer" ) );
 
     Compressor *compres = new Compressor( p_intf, audioTab );
     audioTab->addTab( compres, qtr( "Compressor" ) );
@@ -64,7 +70,7 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
     audioTab->addTab( spatial, qtr( "Spatializer" ) );
     audioLayout->addWidget( audioTab );
 
-    mainTabW->addTab( audioWidget, qtr( "Audio Effects" ) );
+    mainTabW->insertTab( AUDIO_TAB, audioWidget, qtr( "Audio Effects" ) );
 
     /* Video Effects */
     QWidget *videoWidget = new QWidget;
@@ -75,23 +81,35 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
     videoLayout->addWidget( videoTab );
     videoTab->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
 
-    mainTabW->addTab( videoWidget, qtr( "Video Effects" ) );
+    mainTabW->insertTab( VIDEO_TAB, videoWidget, qtr( "Video Effects" ) );
 
     syncW = new SyncControls( p_intf, videoTab );
-    mainTabW->addTab( syncW, qtr( "Synchronization" ) );
+    mainTabW->insertTab( SYNCHRO_TAB, syncW, qtr( "Synchronization" ) );
 
     if( module_exists( "v4l2" ) )
     {
         ExtV4l2 *v4l2 = new ExtV4l2( p_intf, mainTabW );
-        mainTabW->addTab( v4l2, qtr( "v4l2 controls" ) );
+        mainTabW->insertTab( V4L2_TAB, v4l2, qtr( "v4l2 controls" ) );
     }
 
     layout->addWidget( mainTabW );
 
+    /* Bottom buttons / checkbox line */
+    QHBoxLayout *buttonsLayout = new QHBoxLayout();
+    layout->addLayout( buttonsLayout );
+
+    writeChangesBox = new QCheckBox( qtr("&Write changes to config") );
+    buttonsLayout->addWidget( writeChangesBox );
+    CONNECT( writeChangesBox, toggled(bool), compres, setSaveToConfig(bool) );
+    CONNECT( writeChangesBox, toggled(bool), spatial, setSaveToConfig(bool) );
+    CONNECT( writeChangesBox, toggled(bool), equal, setSaveToConfig(bool) );
+    CONNECT( mainTabW, currentChanged(int), this, currentTabChanged(int) );
+
     QDialogButtonBox *closeButtonBox = new QDialogButtonBox( Qt::Horizontal, this );
     closeButtonBox->addButton(
         new QPushButton( qtr("&Close"), this ), QDialogButtonBox::RejectRole );
-    layout->addWidget( closeButtonBox );
+    buttonsLayout->addWidget( closeButtonBox );
+
     CONNECT( closeButtonBox, rejected(), this, close() );
 
     /* Restore geometry or move this dialog on the left pane of the MI */
@@ -106,12 +124,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 )
@@ -130,5 +148,9 @@ void ExtendedDialog::changedItem( int i_status )
     if( i_status != END_S ) return;
     syncW->clean();
     videoEffect->clean();
-    equal->clean();
+}
+
+void ExtendedDialog::currentTabChanged( int i )
+{
+    writeChangesBox->setVisible( i == AUDIO_TAB );
 }