Qt4 - renaming functions cosmetic and KDE/GNome/Windows button fight.

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

diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp
index cdeeaf3d2597b2226da075e662deb3bdc5063ffb..1ac6185a23599f149c8b195e5d9eaf1a3f5b4920 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.cpp
+++ b/modules/gui/qt4/dialogs/extended.cpp
@@ -5,6 +5,7 @@
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
+ *          Jean-Baptiste Kempf <jb@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,10 +22,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>
@@ -40,21 +39,39 @@ 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" ) );
+    QTabWidget *mainTab = new QTabWidget( this );
+    mainTab->setTabPosition( QTabWidget::West );
 
-    ExtVideo *bar = new ExtVideo( p_intf, this );
-    tab->addTab( bar, qtr( "Video Adjustments and Effects" ) );
+    QWidget *audioWidget = new QWidget;
+    QHBoxLayout *audioLayout = new QHBoxLayout( audioWidget );
+    QTabWidget *audioTab = new QTabWidget( mainTab );
 
-    layout->addWidget( tab, 0, 0, 1, 5 );
+    Equalizer *equal = new Equalizer( p_intf, this );
+    audioTab->addTab( equal, qtr( "Graphic Equalizer" ) );
+
+    Spatializer *spatial = new Spatializer( p_intf, this );
+    audioTab->addTab( spatial, qtr( "Spatializer" ) );
+    audioLayout->addWidget( audioTab );
+
+    mainTab->addTab( audioWidget, qtr( "Audio effects" ) );
+
+    ExtVideo *videoEffect = new ExtVideo( p_intf, this );
+    mainTab->addTab( videoEffect, qtr( "Video Adjustments and Effects" ) );
+
+    layout->addWidget( mainTab, 0, 0, 1, 5 );
 
     QPushButton *closeButton = new QPushButton( qtr( "Close" ) );
     layout->addWidget( closeButton, 1, 4, 1, 1);
     CONNECT( closeButton, clicked(), this, close() );
+
+    readSettings( "EPanel", QSize( 400, 300 ), QPoint( 450, 0 ) );
 }
 
-ExtendedDialog::~ExtendedDialog()
+void ExtendedDialog::savingSettings()
 {
+    writeSettings( "EPanel" );
 }
 
+ExtendedDialog::~ExtendedDialog()
+{}
+