X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs%2Fextended.cpp;h=11342f15e75baa32afea0eade5de3aea03fd0af6;hb=3de7f18a4cc4f264a571384437373bc255da0632;hp=a19f4a557d545a52319a197c70a6308b45878d56;hpb=750d656b42cb85adb1b76b80fdb18f0c9355853e;p=vlc

diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp
index a19f4a557d..11342f15e7 100644
--- a/modules/gui/qt4/dialogs/extended.cpp
+++ b/modules/gui/qt4/dialogs/extended.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * extended.cpp : Extended controls - Undocked
  ****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
@@ -26,65 +26,87 @@
 #endif
 
 #include "dialogs/extended.hpp"
-#include "dialogs_provider.hpp"
-#include "components/extended_panels.hpp"
+
+#include "main_interface.hpp" /* Needed for external MI size */
+#include "input_manager.hpp"
 
 #include <QTabWidget>
 #include <QGridLayout>
-
-ExtendedDialog *ExtendedDialog::instance = NULL;
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include <vlc_modules.h>
 
 ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
 {
     setWindowFlags( Qt::Tool );
-    setWindowOpacity( config_GetFloat( p_intf, "qt-opacity" ) );
+    setWindowOpacity( var_InheritFloat( p_intf, "qt-opacity" ) );
     setWindowTitle( qtr( "Adjustments and Effects" ) );
+    setWindowRole( "vlc-extended" );
 
-    QGridLayout *layout = new QGridLayout( this );
+    QVBoxLayout *layout = new QVBoxLayout( this );
+    layout->setContentsMargins( 0, 2, 0, 1 );
+    layout->setSpacing( 3 );
 
-    QTabWidget *mainTabW = new QTabWidget( this );
+    mainTabW = new QTabWidget( this );
 
     /* AUDIO effects */
     QWidget *audioWidget = new QWidget;
     QHBoxLayout *audioLayout = new QHBoxLayout( audioWidget );
     QTabWidget *audioTab = new QTabWidget( audioWidget );
 
-    Equalizer *equal = new Equalizer( p_intf, audioTab );
+    equal = new Equalizer( p_intf, audioTab );
     audioTab->addTab( equal, qtr( "Graphic Equalizer" ) );
 
+    Compressor *compres = new Compressor( p_intf, audioTab );
+    audioTab->addTab( compres, qtr( "Compressor" ) );
+
     Spatializer *spatial = new Spatializer( p_intf, audioTab );
     audioTab->addTab( spatial, qtr( "Spatializer" ) );
     audioLayout->addWidget( audioTab );
 
-    mainTabW->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 );
+    videoEffect = new ExtVideo( p_intf, videoTab );
     videoLayout->addWidget( videoTab );
     videoTab->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
 
     mainTabW->addTab( videoWidget, qtr( "Video Effects" ) );
 
-    SyncControls *syncW = new SyncControls( p_intf, videoTab );
-    mainTabW->addTab( syncW, qtr( "Synchronisation" ) );
+    syncW = new SyncControls( p_intf, videoTab );
+    mainTabW->addTab( syncW, qtr( "Synchronization" ) );
 
-    if( module_Exists( p_intf, "v4l2" ) )
+    if( module_exists( "v4l2" ) )
     {
         ExtV4l2 *v4l2 = new ExtV4l2( p_intf, mainTabW );
         mainTabW->addTab( v4l2, qtr( "v4l2 controls" ) );
     }
 
-    layout->addWidget( mainTabW, 0, 0, 1, 5 );
+    layout->addWidget( mainTabW );
+
+    QDialogButtonBox *closeButtonBox = new QDialogButtonBox( Qt::Horizontal, this );
+    closeButtonBox->addButton(
+        new QPushButton( qtr("&Close"), this ), QDialogButtonBox::RejectRole );
+    layout->addWidget( closeButtonBox );
+    CONNECT( closeButtonBox, rejected(), this, close() );
 
-    QPushButton *closeButton = new QPushButton( qtr( "Close" ) );
-    layout->addWidget( closeButton, 1, 4, 1, 1 );
-    CONNECT( closeButton, clicked(), this, close() );
+    /* Restore geometry or move this dialog on the left pane of the MI */
+    if( !restoreGeometry( getSettings()->value("EPanel/geometry").toByteArray() ) )
+    {
+        resize( QSize( 400, 280 ) );
+
+        MainInterface *p_mi = p_intf->p_sys->p_mi;
+        if( p_mi && p_mi->x() > 50 )
+            move( ( p_mi->x() - frameGeometry().width() - 10 ), p_mi->y() );
+        else
+            move ( 450 , 0 );
+    }
 
-    readSettings( "EPanel", QSize( 400, 280 ), QPoint( 450, 0 ) );
+    CONNECT( THEMIM->getIM(), statusChanged( int ), this, changedItem( int ) );
 }
 
 ExtendedDialog::~ExtendedDialog()
@@ -92,3 +114,21 @@ ExtendedDialog::~ExtendedDialog()
     writeSettings( "EPanel" );
 }
 
+void ExtendedDialog::showTab( int i )
+{
+    mainTabW->setCurrentIndex( i );
+    show();
+}
+
+int ExtendedDialog::currentTab()
+{
+    return mainTabW->currentIndex();
+}
+
+void ExtendedDialog::changedItem( int i_status )
+{
+    if( i_status != END_S ) return;
+    syncW->clean();
+    videoEffect->clean();
+    equal->clean();
+}