Removes trailing spaces. Removes tabs.

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

diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp
index fc9c85dffaf8448a6704f087b203966dd4b251d6..cdeeaf3d2597b2226da075e662deb3bdc5063ffb 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.cpp
+++ b/modules/gui/qt4/dialogs/extended.cpp
@@ -2,7 +2,7 @@
  * extended.cpp : Extended controls - Undocked
  ****************************************************************************
  * Copyright (C) 2006 the VideoLAN team
- * $Id: streaminfo.cpp 16687 2006-09-17 12:15:42Z jb $
+ * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
  *
@@ -21,33 +21,37 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <QTabWidget>
-#include <QBoxLayout>
-
+#include "qt4.hpp"
 #include "dialogs/extended.hpp"
 #include "dialogs_provider.hpp"
 #include "util/qvlcframe.hpp"
 #include "components/extended_panels.hpp"
-#include "qt4.hpp"
+
+#include <QTabWidget>
+#include <QGridLayout>
 
 ExtendedDialog *ExtendedDialog::instance = NULL;
 
 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" ) );
 
-    QHBoxLayout *l = new QHBoxLayout( this );
-    QTabWidget *tab = new QTabWidget( this );
-
-    l->addWidget( tab );
-
-    setWindowTitle( qtr( "Extended controls" ) );
+    QGridLayout *layout = new QGridLayout( this );
 
+    QTabWidget *tab = new QTabWidget( this );
     Equalizer *foo = new Equalizer( p_intf, this );
-    tab->addTab( foo, qtr( "Equalizer" ) );
+    tab->addTab( foo, qtr( "Graphic Equalizer" ) );
 
     ExtVideo *bar = new ExtVideo( p_intf, this );
-    tab->addTab( bar, qtr( "Video effects" ) );
+    tab->addTab( bar, qtr( "Video Adjustments and Effects" ) );
+
+    layout->addWidget( tab, 0, 0, 1, 5 );
+
+    QPushButton *closeButton = new QPushButton( qtr( "Close" ) );
+    layout->addWidget( closeButton, 1, 4, 1, 1);
+    CONNECT( closeButton, clicked(), this, close() );
 }
 
 ExtendedDialog::~ExtendedDialog()