Various strings change and capitalisation changes to match the guidelines.

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

diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp
index bc7d31a43f7a409f7e876177b1ec39255c0d5dad..b9cb9548129d23e1ac3606c7b6011077727e4014 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
@@ -20,6 +21,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "dialogs/extended.hpp"
 #include "dialogs_provider.hpp"
@@ -34,44 +38,59 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
 {
     setWindowFlags( Qt::Tool );
     setWindowOpacity( config_GetFloat( p_intf, "qt-opacity" ) );
-
     setWindowTitle( qtr( "Adjustments and Effects" ) );
 
     QGridLayout *layout = new QGridLayout( this );
+    layout->setLayoutMargins( 0, 2, 0, 1, 1 );
+    layout->setSpacing( 3 );
 
-    QTabWidget *mainTab = new QTabWidget( this );
-    mainTab->setTabPosition( QTabWidget::West );
+    QTabWidget *mainTabW = new QTabWidget( this );
 
-    QWidget *audioWidget = new QWidget( this );
+    /* AUDIO effects */
+    QWidget *audioWidget = new QWidget;
     QHBoxLayout *audioLayout = new QHBoxLayout( audioWidget );
-    QTabWidget *audioTab = new QTabWidget( mainTab );
+    QTabWidget *audioTab = new QTabWidget( audioWidget );
 
-    Equalizer *equal = new Equalizer( p_intf, this );
+    Equalizer *equal = new Equalizer( p_intf, audioTab );
     audioTab->addTab( equal, qtr( "Graphic Equalizer" ) );
 
-    Spatializer *spatial = new Spatializer( p_intf, this );
+    Spatializer *spatial = new Spatializer( p_intf, audioTab );
     audioTab->addTab( spatial, qtr( "Spatializer" ) );
     audioLayout->addWidget( audioTab );
 
-    mainTab->addTab( audioWidget, qtr( "Audio effects" ) );
+    mainTabW->addTab( audioWidget, qtr( "Audio Effects" ) );
+
+    /* Video Effects */
+    QWidget *videoWidget = new QWidget;
+    QHBoxLayout *videoLayout = new QHBoxLayout( videoWidget );
+    QTabWidget *videoTab = new QTabWidget( videoWidget );
+
+    ExtVideo *videoEffect = new ExtVideo( p_intf, videoTab );
+    videoLayout->addWidget( videoTab );
+    videoTab->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
+
+    mainTabW->addTab( videoWidget, qtr( "Video Effects" ) );
 
-    ExtVideo *videoEffect = new ExtVideo( p_intf, this );
-    mainTab->addTab( videoEffect, qtr( "Video Adjustments and Effects" ) );
+    SyncControls *syncW = new SyncControls( p_intf, videoTab );
+    mainTabW->addTab( syncW, qtr( "Synchronization" ) );
 
-    layout->addWidget( mainTab, 0, 0, 1, 5 );
+    if( module_Exists( p_intf, "v4l2" ) )
+    {
+        ExtV4l2 *v4l2 = new ExtV4l2( p_intf, mainTabW );
+        mainTabW->addTab( v4l2, qtr( "v4l2 controls" ) );
+    }
 
-    QPushButton *closeButton = new QPushButton( qtr( "Close" ) );
-    layout->addWidget( closeButton, 1, 4, 1, 1);
+    layout->addWidget( mainTabW, 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 ) );
+    readSettings( "EPanel", QSize( 400, 280 ), QPoint( 450, 0 ) );
 }
 
-void ExtendedDialog::savingSettings()
+ExtendedDialog::~ExtendedDialog()
 {
     writeSettings( "EPanel" );
 }
 
-ExtendedDialog::~ExtendedDialog()
-{}
-