Skip to content

V
vlc-gpu
Commit 547a4494 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

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

parent 031e7a2d
Show whitespace changes
Inline Side-by-side
Showing with 1063 additions and 846 deletions
modules/gui/qt4/components/extended_panels.cpp
View file @ 547a4494
...@@ -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 ) \
{ \ { \
......
modules/gui/qt4/components/extended_panels.hpp
View file @ 547a4494
...@@ -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:
......
modules/gui/qt4/dialogs/extended.cpp
View file @ 547a4494
...@@ -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" ) )
{ {
......
modules/gui/qt4/ui/video_effects.ui
View file @ 547a4494
<ui version="4.0" > <ui version="4.0" >
<class>ExtVideoWidget</class> <class>ExtVideoWidget</class>
<widget class="QWidget" name="ExtVideoWidget" > <widget class="QTabWidget" name="ExtVideoWidget" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>561</width> <width>472</width>
<height>289</height> <height>320</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" >
<sizepolicy vsizetype="Maximum" hsizetype="Maximum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle" >
<string>Form</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QTabWidget" name="tabWidget" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex" > <property name="currentIndex" >
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tab" > <widget class="QWidget" name="tab" >
<attribute name="title" > <attribute name="title" >
<string>_("Basic")</string> <string>_("Basic")</string>
</attribute> </attribute>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="1" > <item row="1" column="1" >
...@@ -59,10 +47,22 @@ ...@@ -59,10 +47,22 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
...@@ -83,10 +83,22 @@ ...@@ -83,10 +83,22 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
...@@ -136,12 +148,6 @@ ...@@ -136,12 +148,6 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="1" > <item row="0" column="1" >
<widget class="QSlider" name="hueSlider" > <widget class="QSlider" name="hueSlider" >
<property name="maximum" > <property name="maximum" >
...@@ -274,10 +280,22 @@ ...@@ -274,10 +280,22 @@
<string>_("Color fun")</string> <string>_("Color fun")</string>
</attribute> </attribute>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="1" > <item row="1" column="1" >
...@@ -292,10 +310,22 @@ ...@@ -292,10 +310,22 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
...@@ -334,10 +364,22 @@ ...@@ -334,10 +364,22 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="2" column="0" > <item row="2" column="0" >
...@@ -392,10 +434,22 @@ ...@@ -392,10 +434,22 @@
<string>_("Some random name")</string> <string>_("Some random name")</string>
</attribute> </attribute>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="0" > <item row="1" column="0" >
...@@ -417,10 +471,22 @@ ...@@ -417,10 +471,22 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="1" > <item row="0" column="1" >
...@@ -467,10 +533,22 @@ ...@@ -467,10 +533,22 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="1" > <item row="0" column="1" >
...@@ -524,10 +602,22 @@ ...@@ -524,10 +602,22 @@
<string>_("Image modification")</string> <string>_("Image modification")</string>
</attribute> </attribute>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="2" column="0" > <item row="2" column="0" >
...@@ -577,10 +667,22 @@ ...@@ -577,10 +667,22 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
...@@ -627,10 +729,22 @@ ...@@ -627,10 +729,22 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
...@@ -667,10 +781,22 @@ ...@@ -667,10 +781,22 @@
<string>_("Find a name")</string> <string>_("Find a name")</string>
</attribute> </attribute>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item rowspan="2" row="0" column="1" > <item rowspan="2" row="0" column="1" >
...@@ -685,10 +811,22 @@ ...@@ -685,10 +811,22 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="0" > <item row="1" column="0" >
...@@ -736,10 +874,22 @@ ...@@ -736,10 +874,22 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
...@@ -774,10 +924,22 @@ ...@@ -774,10 +924,22 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
...@@ -824,10 +986,22 @@ ...@@ -824,10 +986,22 @@
<string>_("Overlay")</string> <string>_("Overlay")</string>
</attribute> </attribute>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
...@@ -842,10 +1016,22 @@ ...@@ -842,10 +1016,22 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="0" > <item row="1" column="0" >
...@@ -883,10 +1069,22 @@ ...@@ -883,10 +1069,22 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="3" column="0" > <item row="3" column="0" >
...@@ -952,10 +1150,22 @@ ...@@ -952,10 +1150,22 @@
<string>_("Advanced video filter controls")</string> <string>_("Advanced video filter controls")</string>
</attribute> </attribute>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="2" column="1" colspan="2" > <item row="2" column="1" colspan="2" >
...@@ -1005,9 +1215,6 @@ ...@@ -1005,9 +1215,6 @@
</layout> </layout>
</widget> </widget>
</widget> </widget>
</item>
</layout>
</widget>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>
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