Qt4 - enable and modify the spatializer widget. Don't use a ui for a QCheckbox and a QFrame.

modules/gui/qt4/components/extended_panels.hpp

@@ -29,7 +29,6 @@
 
 #include "ui/equalizer.h"
 #include "ui/video_effects.h"
-#include "ui/spatializer.h"
 
 #define BANDS 10
 #define NUM_SP_CTRL 5
@@ -90,13 +89,14 @@ public:
     virtual ~Spatializer();
 
 private:
-    Ui::SpatializerWidget ui;
     QSlider *spatCtrl[NUM_SP_CTRL];
     QLabel *ctrl_texts[NUM_SP_CTRL];
     QLabel *ctrl_readout[NUM_SP_CTRL];
     float controlVars[5];
     float oldControlVars[5];
 
+    QCheckBox *enableCheck;
+
     void delCallbacks( aout_instance_t * );
     void addCallbacks( aout_instance_t * );
     intf_thread_t *p_intf;

modules/gui/qt4/dialogs/extended.cpp

@@ -21,10 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "qt4.hpp"
 #include "dialogs/extended.hpp"
 #include "dialogs_provider.hpp"
-#include "util/qvlcframe.hpp"
 #include "components/extended_panels.hpp"
 
 #include <QTabWidget>
@@ -41,11 +39,14 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
     QGridLayout *layout = new QGridLayout( this );
 
     QTabWidget *tab = new QTabWidget( this );
-    Equalizer *foo = new Equalizer( p_intf, this );
-    tab->addTab( foo, qtr( "Graphic Equalizer" ) );
+    Equalizer *equal = new Equalizer( p_intf, this );
+    tab->addTab( equal, qtr( "Graphic Equalizer" ) );
 
-    ExtVideo *bar = new ExtVideo( p_intf, this );
-    tab->addTab( bar, qtr( "Video Adjustments and Effects" ) );
+    Spatializer *spatial = new Spatializer( p_intf, this );
+    tab->addTab( spatial, qtr( "Audio Effects" ) );
+
+    ExtVideo *videoEffect = new ExtVideo( p_intf, this );
+    tab->addTab( videoEffect, qtr( "Video Adjustments and Effects" ) );
 
     layout->addWidget( tab, 0, 0, 1, 5 );
 

modules/gui/qt4/ui/spatializer.ui

-<ui version="4.0" >
- <class>SpatializerWidget</class>
- <widget class="QWidget" name="SpatializerWidget" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>409</width>
-    <height>299</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Form</string>
-  </property>
-  <widget class="QCheckBox" name="enableCheck" >
-   <property name="geometry" >
-    <rect>
-     <x>30</x>
-     <y>10</y>
-     <width>91</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <property name="text" >
-    <string>_("Enable")</string>
-   </property>
-  </widget>
-  <widget class="QWidget" name="horizontalLayout" >
-   <property name="geometry" >
-    <rect>
-     <x>10</x>
-     <y>40</y>
-     <width>391</width>
-     <height>251</height>
-    </rect>
-   </property>
-   <layout class="QHBoxLayout" >
-    <item>
-     <widget class="QFrame" name="frame" >
-      <property name="frameShape" >
-       <enum>QFrame::StyledPanel</enum>
-      </property>
-      <property name="frameShadow" >
-       <enum>QFrame::Raised</enum>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>