Skip to content

V
vlc-1.1
Commit 3c164b33 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt4 - extended... attempt to fix extended panel size... The culprit is still... 

Qt4 - extended... attempt to fix extended panel size... The culprit is still the VideoFilter Widget.
parent b65f2537
Show whitespace changes
Inline Side-by-side
Showing with 331 additions and 55 deletions
modules/gui/qt4/dialogs/extended.cpp
View file @ 3c164b33
...@@ -39,32 +39,32 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf ) ...@@ -39,32 +39,32 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
QGridLayout *layout = new QGridLayout( this ); QGridLayout *layout = new QGridLayout( this );
QTabWidget *mainTab = new QTabWidget( this ); QTabWidget *mainTabW = new QTabWidget( this );
mainTab->setTabPosition( QTabWidget::West ); mainTabW->setTabPosition( QTabWidget::West );
QWidget *audioWidget = new QWidget; QWidget *audioWidget = new QWidget;
QHBoxLayout *audioLayout = new QHBoxLayout( audioWidget ); QHBoxLayout *audioLayout = new QHBoxLayout( audioWidget );
QTabWidget *audioTab = new QTabWidget( mainTab ); QTabWidget *audioTab = new QTabWidget( audioWidget );
Equalizer *equal = new Equalizer( p_intf, this ); Equalizer *equal = new Equalizer( p_intf, audioTab );
audioTab->addTab( equal, qtr( "Graphic Equalizer" ) ); 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" ) ); audioTab->addTab( spatial, qtr( "Spatializer" ) );
audioLayout->addWidget( audioTab ); audioLayout->addWidget( audioTab );
mainTab->addTab( audioWidget, qtr( "Audio effects" ) ); mainTabW->addTab( audioWidget, qtr( "Audio effects" ) );
ExtVideo *videoEffect = new ExtVideo( p_intf, this ); ExtVideo *videoEffect = new ExtVideo( p_intf, mainTabW );
mainTab->addTab( videoEffect, qtr( "Video Adjustments and Effects" ) ); mainTabW->addTab( videoEffect, qtr( "Video Effects" ) );
if( module_Exists( p_intf, "v4l2" ) ) if( module_Exists( p_intf, "v4l2" ) )
{ {
ExtV4l2 *v4l2 = new ExtV4l2( p_intf, this ); ExtV4l2 *v4l2 = new ExtV4l2( p_intf, mainTabW );
mainTab->addTab( v4l2, qtr( "v4l2 controls" ) ); mainTabW->addTab( v4l2, qtr( "v4l2 controls" ) );
} }
layout->addWidget( mainTab, 0, 0, 1, 5 ); layout->addWidget( mainTabW, 0, 0, 1, 5 );
QPushButton *closeButton = new QPushButton( qtr( "Close" ) ); QPushButton *closeButton = new QPushButton( qtr( "Close" ) );
layout->addWidget( closeButton, 1, 4, 1, 1 ); layout->addWidget( closeButton, 1, 4, 1, 1 );
......
modules/gui/qt4/ui/video_effects.ui
View file @ 3c164b33
...@@ -9,18 +9,42 @@ ...@@ -9,18 +9,42 @@
<height>289</height> <height>289</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" >
<sizepolicy vsizetype="Maximum" hsizetype="Maximum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle" > <property name="windowTitle" >
<string>Form</string> <string>Form</string>
</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" >
<widget class="QTabWidget" name="tabWidget" > <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>0</number>
</property> </property>
...@@ -29,10 +53,22 @@ ...@@ -29,10 +53,22 @@
<string>_("Basic")</string> <string>_("Basic")</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="1" column="1" > <item row="1" column="1" >
...@@ -47,10 +83,22 @@ ...@@ -47,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> <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="0" column="0" > <item row="0" column="0" >
...@@ -71,10 +119,22 @@ ...@@ -71,10 +119,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="0" column="0" > <item row="0" column="0" >
...@@ -124,10 +184,22 @@ ...@@ -124,10 +184,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="0" column="1" > <item row="0" column="1" >
...@@ -262,10 +334,22 @@ ...@@ -262,10 +334,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> <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" >
...@@ -280,10 +364,22 @@ ...@@ -280,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>
</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" >
...@@ -322,10 +418,22 @@ ...@@ -322,10 +418,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" >
...@@ -380,10 +488,22 @@ ...@@ -380,10 +488,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" >
...@@ -405,10 +525,22 @@ ...@@ -405,10 +525,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="1" > <item row="0" column="1" >
...@@ -455,10 +587,22 @@ ...@@ -455,10 +587,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" >
...@@ -512,10 +656,22 @@ ...@@ -512,10 +656,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>
</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="2" column="0" > <item row="2" column="0" >
...@@ -565,10 +721,22 @@ ...@@ -565,10 +721,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="0" column="0" > <item row="0" column="0" >
...@@ -615,10 +783,22 @@ ...@@ -615,10 +783,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" >
...@@ -655,10 +835,22 @@ ...@@ -655,10 +835,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>
</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 rowspan="2" row="0" column="1" > <item rowspan="2" row="0" column="1" >
...@@ -673,10 +865,22 @@ ...@@ -673,10 +865,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" >
...@@ -724,10 +928,22 @@ ...@@ -724,10 +928,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" >
...@@ -762,10 +978,22 @@ ...@@ -762,10 +978,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" >
...@@ -812,10 +1040,22 @@ ...@@ -812,10 +1040,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" >
...@@ -830,10 +1070,22 @@ ...@@ -830,10 +1070,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="1" column="0" > <item row="1" column="0" >
...@@ -871,10 +1123,22 @@ ...@@ -871,10 +1123,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="3" column="0" > <item row="3" column="0" >
...@@ -940,10 +1204,22 @@ ...@@ -940,10 +1204,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" >
......
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