X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs%2Fextended.cpp;h=3cb89670cd5e58ddf4ac5170685229b27f86d4e8;hb=acbad93b8b447ac9f776a53bf3e8f74f15132fe4;hp=1ac6185a23599f149c8b195e5d9eaf1a3f5b4920;hpb=b879f3e1e8495bdf618a139079739b5545aa444e;p=vlc

diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp
index 1ac6185a23..3cb89670cd 100644
--- a/modules/gui/qt4/dialogs/extended.cpp
+++ b/modules/gui/qt4/dialogs/extended.cpp
@@ -21,10 +21,15 @@
  * 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"
-#include "components/extended_panels.hpp"
+
+#include "main_interface.hpp"
+#include "input_manager.hpp"
 
 #include <QTabWidget>
 #include <QGridLayout>
@@ -38,40 +43,73 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
     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 );
 
+    /* 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 );
+    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 );
+
+    videoEffect = new ExtVideo( p_intf, videoTab );
+    videoLayout->addWidget( videoTab );
+    videoTab->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
 
-    ExtVideo *videoEffect = new ExtVideo( p_intf, this );
-    mainTab->addTab( videoEffect, qtr( "Video Adjustments and Effects" ) );
+    mainTabW->addTab( videoWidget, qtr( "Video Effects" ) );
 
-    layout->addWidget( mainTab, 0, 0, 1, 5 );
+    syncW = new SyncControls( p_intf, videoTab );
+    mainTabW->addTab( syncW, qtr( "Synchronization" ) );
 
-    QPushButton *closeButton = new QPushButton( qtr( "Close" ) );
-    layout->addWidget( closeButton, 1, 4, 1, 1);
+    if( module_exists( p_intf, "v4l2" ) )
+    {
+        ExtV4l2 *v4l2 = new ExtV4l2( p_intf, mainTabW );
+        mainTabW->addTab( v4l2, qtr( "v4l2 controls" ) );
+    }
+
+    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 ) );
+    QPoint startPoint( 450, 0 );
+    MainInterface *p_mi = p_intf->p_sys->p_mi;
+    if( p_mi )
+    {
+        startPoint.setX( p_mi->x() );
+        startPoint.setY( p_mi->y() + p_mi->frameGeometry().height() );
+    }
+    readSettings( "EPanel", QSize( 400, 280 ), startPoint );
+
+    CONNECT( THEMIM->getIM(), statusChanged( int ), this, changedItem( int ) );
+
 }
 
-void ExtendedDialog::savingSettings()
+ExtendedDialog::~ExtendedDialog()
 {
     writeSettings( "EPanel" );
 }
 
-ExtendedDialog::~ExtendedDialog()
-{}
-
+void ExtendedDialog::changedItem( int i_status )
+{
+    if( i_status != END_S ) return;
+    syncW->clean();
+    videoEffect->clean();
+    equal->clean();
+}