Commit 547a4494 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - Extended Panels. try to fix the sizing ...

parent 031e7a2d
...@@ -92,10 +92,10 @@ QString OptionFromWidgetName( QObject *obj ) ...@@ -92,10 +92,10 @@ QString OptionFromWidgetName( QObject *obj )
return option; return option;
} }
ExtVideo::ExtVideo( intf_thread_t *_p_intf, QWidget *_parent ) : ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) :
QWidget( _parent ) , p_intf( _p_intf ) p_intf( _p_intf )
{ {
ui.setupUi( this ); ui.setupUi( _parent );
#define SETUP_VFILTER( widget ) \ #define SETUP_VFILTER( widget ) \
{ \ { \
......
...@@ -36,16 +36,17 @@ ...@@ -36,16 +36,17 @@
#include "ui/video_effects.h" #include "ui/video_effects.h"
#include "ui/v4l2.h" #include "ui/v4l2.h"
#include <QTabWidget>
#define BANDS 10 #define BANDS 10
#define NUM_SP_CTRL 5 #define NUM_SP_CTRL 5
class QSignalMapper; class QSignalMapper;
class ExtVideo: public QWidget class ExtVideo: public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
ExtVideo( intf_thread_t *, QWidget * ); ExtVideo( intf_thread_t *, QTabWidget * );
virtual ~ExtVideo(); virtual ~ExtVideo();
/*void gotoConf( QObject* );*/ /*void gotoConf( QObject* );*/
private: private:
......
...@@ -45,6 +45,7 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf ) ...@@ -45,6 +45,7 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
QTabWidget *mainTabW = new QTabWidget( this ); QTabWidget *mainTabW = new QTabWidget( this );
mainTabW->setTabPosition( QTabWidget::West ); mainTabW->setTabPosition( QTabWidget::West );
/* AUDIO effects */
QWidget *audioWidget = new QWidget; QWidget *audioWidget = new QWidget;
QHBoxLayout *audioLayout = new QHBoxLayout( audioWidget ); QHBoxLayout *audioLayout = new QHBoxLayout( audioWidget );
QTabWidget *audioTab = new QTabWidget( audioWidget ); QTabWidget *audioTab = new QTabWidget( audioWidget );
...@@ -58,8 +59,16 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf ) ...@@ -58,8 +59,16 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
mainTabW->addTab( audioWidget, qtr( "Audio effects" ) ); mainTabW->addTab( audioWidget, qtr( "Audio effects" ) );
ExtVideo *videoEffect = new ExtVideo( p_intf, mainTabW ); /* Video Effects */
mainTabW->addTab( videoEffect, qtr( "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" ) );
if( module_Exists( p_intf, "v4l2" ) ) if( module_Exists( p_intf, "v4l2" ) )
{ {
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment