[vlc-commits] Qt: spatializer: simplify using groupbox

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Dec 26 16:32:43 2012 +0100| [428b63f40eb2d3d168a538a7713bfba6fbef0144] | committer: Francois Cartegnie

Qt: spatializer: simplify using groupbox

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=428b63f40eb2d3d168a538a7713bfba6fbef0144
---

 modules/gui/qt4/components/extended_panels.cpp |   35 +++++++++---------------
 modules/gui/qt4/components/extended_panels.hpp |    3 +-
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index 6e9d55c..521c34c 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -1396,11 +1396,13 @@ Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent )
     QFont smallFont = QApplication::font();
     smallFont.setPointSize( smallFont.pointSize() - 1 );
 
-    QGridLayout *layout = new QGridLayout( this );
+    QVBoxLayout *layout = new QVBoxLayout( this );
 
-    enableCheck = new QCheckBox( qtr( "Enable spatializer" ) );
-    layout->addWidget( enableCheck, 0, 0, 1, NUM_SP_CTRL );
+    spatializerBox = new QGroupBox( qtr( "Enable spatializer" ) );
+    spatializerBox->setCheckable( true );
+    layout->addWidget( spatializerBox );
 
+    QGridLayout *ctrlLayout = new QGridLayout( spatializerBox );
     for( int i = 0 ; i < NUM_SP_CTRL ; i++ )
     {
         spatCtrl[i] = new QSlider( Qt::Vertical );
@@ -1413,9 +1415,9 @@ Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent )
         ctrl_readout[i] = new QLabel;
         ctrl_readout[i]->setFont( smallFont );
 
-        layout->addWidget( spatCtrl[i],     1, i, Qt::AlignHCenter );
-        layout->addWidget( ctrl_readout[i], 2, i, Qt::AlignHCenter );
-        layout->addWidget( ctrl_texts[i],   3, i, Qt::AlignHCenter );
+        ctrlLayout->addWidget( spatCtrl[i],     0, i, Qt::AlignHCenter );
+        ctrlLayout->addWidget( ctrl_readout[i], 1, i, Qt::AlignHCenter );
+        ctrlLayout->addWidget( ctrl_texts[i],   2, i, Qt::AlignHCenter );
         spatCtrl[i]->setRange( 0, 10 );
     }
     spatCtrl[0]->setRange( 0, 11 );
@@ -1423,8 +1425,6 @@ Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent )
     for( int i = 0; i < NUM_SP_CTRL; i++ )
         CONNECT( spatCtrl[i], valueChanged( int ), this, setInitValues() );
 
-    BUTTONACT( enableCheck, enable() );
-
     /* Write down initial values */
     vlc_object_t *p_aout = (vlc_object_t *)THEMIM->getAout();
     char *psz_af;
@@ -1447,28 +1447,19 @@ Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent )
         }
     }
     if( psz_af && strstr( psz_af, "spatializer" ) != NULL )
-        enableCheck->setChecked( true );
+        spatializerBox->setChecked( true );
+    else
+        spatializerBox->setChecked( false );
+
     free( psz_af );
-    enable( enableCheck->isChecked() );
     setValues();
 }
 
 void Spatializer::enable()
 {
-    bool en = enableCheck->isChecked();
-    playlist_EnableAudioFilter( THEPL, "spatializer", en );
-    enable( en );
+    playlist_EnableAudioFilter( THEPL, "spatializer", spatializerBox->isChecked() );
 }
 
-void Spatializer::enable( bool en )
-{
-    for( int i = 0 ; i< NUM_SP_CTRL; i++ )
-    {
-        spatCtrl[i]->setEnabled( en );
-        ctrl_texts[i]->setEnabled( en );
-        ctrl_readout[i]->setEnabled( en );
-    }
-}
 void Spatializer::setInitValues()
 {
     setValues();
diff --git a/modules/gui/qt4/components/extended_panels.hpp b/modules/gui/qt4/components/extended_panels.hpp
index 2dc25df..da4084d 100644
--- a/modules/gui/qt4/components/extended_panels.hpp
+++ b/modules/gui/qt4/components/extended_panels.hpp
@@ -154,7 +154,7 @@ private:
     float controlVars[5];
     float oldControlVars[5];
 
-    QCheckBox *enableCheck;
+    QGroupBox *spatializerBox;
 
     void delCallbacks( vlc_object_t * );
     void addCallbacks( vlc_object_t * );
@@ -163,7 +163,6 @@ private:
     void setValues();
 
 private slots:
-    void enable(bool);
     void enable();
     void setInitValues();
 };