Skip to content

V
vlc-2-2
Commit 6b723625 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt: preferences, fix checkbox behaviours 

Remove weird layout margins, and zones for correct deactivations of
groups of groupBoxes
parent 94b30f51
Show whitespace changes
Inline Side-by-side
Showing with 474 additions and 528 deletions
modules/gui/qt4/components/simple_preferences.cpp
View file @ 6b723625
...@@ -215,6 +215,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -215,6 +215,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
******************************/ ******************************/
START_SPREFS_CAT( Video , qtr("Video Settings") ); START_SPREFS_CAT( Video , qtr("Video Settings") );
CONFIG_BOOL( "video", enableVideo ); CONFIG_BOOL( "video", enableVideo );
ui.videoZone->setEnabled( ui.enableVideo->isChecked() );
CONNECT( ui.enableVideo, toggled( bool ),
ui.videoZone, setEnabled( bool ) );
CONFIG_BOOL( "fullscreen", fullscreen ); CONFIG_BOOL( "fullscreen", fullscreen );
CONFIG_BOOL( "overlay", overlay ); CONFIG_BOOL( "overlay", overlay );
...@@ -259,9 +262,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -259,9 +262,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
START_SPREFS_CAT( Audio, qtr("Audio Settings") ); START_SPREFS_CAT( Audio, qtr("Audio Settings") );
CONFIG_BOOL( "audio", enableAudio ); CONFIG_BOOL( "audio", enableAudio );
ui.SPrefsAudio_zone->setEnabled( ui.enableAudio->isChecked() ); ui.audioZone->setEnabled( ui.enableAudio->isChecked() );
CONNECT( ui.enableAudio, toggled( bool ), CONNECT( ui.enableAudio, toggled( bool ),
ui.SPrefsAudio_zone, setEnabled( bool ) ); ui.audioZone, setEnabled( bool ) );
#define audioCommon( name ) \ #define audioCommon( name ) \
QWidget * name ## Control = new QWidget( ui.outputAudioBox ); \ QWidget * name ## Control = new QWidget( ui.outputAudioBox ); \
...@@ -649,6 +652,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -649,6 +652,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
ui.OSDTitlePosLabel, OSDTitlePos ); ui.OSDTitlePosLabel, OSDTitlePos );
CONFIG_BOOL( "spu", spuActiveBox); CONFIG_BOOL( "spu", spuActiveBox);
ui.spuZone->setEnabled( ui.spuActiveBox->isChecked() );
CONNECT( ui.spuActiveBox, toggled( bool ),
ui.spuZone, setEnabled( bool ) );
CONFIG_GENERIC( "subsdec-encoding", StringList, ui.encodLabel, CONFIG_GENERIC( "subsdec-encoding", StringList, ui.encodLabel,
encoding ); encoding );
......
modules/gui/qt4/ui/sprefs_audio.ui
View file @ 6b723625
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>703</width> <width>707</width>
<height>656</height> <height>536</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
...@@ -32,8 +32,11 @@ ...@@ -32,8 +32,11 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QWidget" name="SPrefsAudio_zone" native="true"> <widget class="QWidget" name="audioZone" native="true">
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="audioZoneLayout">
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="QGroupBox" name="audioBox"> <widget class="QGroupBox" name="audioBox">
<property name="title"> <property name="title">
...@@ -166,9 +169,6 @@ ...@@ -166,9 +169,6 @@
<property name="text"> <property name="text">
<string>Output module:</string> <string>Output module:</string>
</property> </property>
<property name="buddy">
<cstring>outputModule</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
...@@ -204,9 +204,6 @@ ...@@ -204,9 +204,6 @@
<property name="text"> <property name="text">
<string>Destination file:</string> <string>Destination file:</string>
</property> </property>
<property name="buddy">
<cstring>fileName</cstring>
</property>
</widget> </widget>
</item> </item>
<item> <item>
...@@ -264,9 +261,6 @@ ...@@ -264,9 +261,6 @@
<property name="text"> <property name="text">
<string>Visualization:</string> <string>Visualization:</string>
</property> </property>
<property name="buddy">
<cstring>visualisation</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="8" column="2" colspan="2"> <item row="8" column="2" colspan="2">
...@@ -309,9 +303,6 @@ ...@@ -309,9 +303,6 @@
<property name="text"> <property name="text">
<string>Dolby Surround:</string> <string>Dolby Surround:</string>
</property> </property>
<property name="buddy">
<cstring>detectionDolby</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="5" column="0">
...@@ -328,9 +319,6 @@ ...@@ -328,9 +319,6 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>replayCombo</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="5" column="2" colspan="2"> <item row="5" column="2" colspan="2">
...@@ -447,9 +435,6 @@ ...@@ -447,9 +435,6 @@
<property name="text"> <property name="text">
<string>Preferred audio language:</string> <string>Preferred audio language:</string>
</property> </property>
<property name="buddy">
<cstring>preferredAudioLanguage</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
...@@ -501,9 +486,6 @@ ...@@ -501,9 +486,6 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>lastfm_pass_edit</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">
...@@ -520,9 +502,6 @@ ...@@ -520,9 +502,6 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>lastfm_user_edit</cstring>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
......
modules/gui/qt4/ui/sprefs_subtitles.ui
View file @ 6b723625
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>741</width> <width>741</width>
<height>373</height> <height>375</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
...@@ -67,6 +67,12 @@ ...@@ -67,6 +67,12 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QWidget" name="spuZone" native="true">
<layout class="QVBoxLayout" name="spuZoneLayout">
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="sizePolicy"> <property name="sizePolicy">
...@@ -90,9 +96,6 @@ ...@@ -90,9 +96,6 @@
<property name="text"> <property name="text">
<string>Preferred subtitles language</string> <string>Preferred subtitles language</string>
</property> </property>
<property name="buddy">
<cstring>preferredLanguage</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
...@@ -116,9 +119,6 @@ ...@@ -116,9 +119,6 @@
<property name="text"> <property name="text">
<string>Default encoding</string> <string>Default encoding</string>
</property> </property>
<property name="buddy">
<cstring>encoding</cstring>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
...@@ -141,9 +141,6 @@ ...@@ -141,9 +141,6 @@
<property name="text"> <property name="text">
<string>Font</string> <string>Font</string>
</property> </property>
<property name="buddy">
<cstring>font</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1" colspan="3"> <item row="0" column="1" colspan="3">
...@@ -160,9 +157,6 @@ ...@@ -160,9 +157,6 @@
<property name="text"> <property name="text">
<string>Font size</string> <string>Font size</string>
</property> </property>
<property name="buddy">
<cstring>fontSize</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
...@@ -196,9 +190,6 @@ ...@@ -196,9 +190,6 @@
<property name="text"> <property name="text">
<string>Font color</string> <string>Font color</string>
</property> </property>
<property name="buddy">
<cstring>fontColor</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="4"> <item row="1" column="4">
...@@ -215,9 +206,6 @@ ...@@ -215,9 +206,6 @@
<property name="text"> <property name="text">
<string>Outline thickness</string> <string>Outline thickness</string>
</property> </property>
<property name="buddy">
<cstring>effect</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
...@@ -235,9 +223,6 @@ ...@@ -235,9 +223,6 @@
<property name="text"> <property name="text">
<string>Outline color</string> <string>Outline color</string>
</property> </property>
<property name="buddy">
<cstring>outlineColor</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="4"> <item row="2" column="4">
...@@ -268,9 +253,6 @@ ...@@ -268,9 +253,6 @@
<property name="text"> <property name="text">
<string>Force subtitle position</string> <string>Force subtitle position</string>
</property> </property>
<property name="buddy">
<cstring>subsPosition</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="4" column="1">
...@@ -300,6 +282,9 @@ ...@@ -300,6 +282,9 @@
</item> </item>
</layout> </layout>
</widget> </widget>
</item>
</layout>
</widget>
<tabstops> <tabstops>
<tabstop>OSDBox</tabstop> <tabstop>OSDBox</tabstop>
<tabstop>OSDTitleBox</tabstop> <tabstop>OSDTitleBox</tabstop>
......
modules/gui/qt4/ui/sprefs_video.ui
View file @ 6b723625
...@@ -7,20 +7,14 @@ ...@@ -7,20 +7,14 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>699</width> <width>682</width>
<height>615</height> <height>577</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>10</number>
</property>
<property name="margin">
<number>9</number>
</property>
<item> <item>
<widget class="QCheckBox" name="enableVideo"> <widget class="QCheckBox" name="enableVideo">
<property name="text"> <property name="text">
...@@ -31,6 +25,12 @@ ...@@ -31,6 +25,12 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QWidget" name="videoZone" native="true">
<layout class="QVBoxLayout" name="videoZoneLayout">
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="QGroupBox" name="displayBox"> <widget class="QGroupBox" name="displayBox">
<property name="title"> <property name="title">
...@@ -50,48 +50,45 @@ ...@@ -50,48 +50,45 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="2" column="2">
<widget class="QCheckBox" name="alwaysOnTop"> <widget class="QCheckBox" name="windowDecorations">
<property name="text"> <property name="text">
<string>Always on top</string> <string>Window decorations</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="1" colspan="2"> <item row="1" column="2">
<widget class="QComboBox" name="outputModule"> <widget class="QCheckBox" name="hwYUVBox">
<property name="maxVisibleItems"> <property name="text">
<number>15</number> <string>Use hardware YUV-&gt;RGB conversions</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0"> <item row="1" column="0" colspan="2">
<widget class="QLabel" name="voutLabel"> <widget class="QCheckBox" name="overlay">
<property name="text"> <property name="text">
<string>Output</string> <string>Accelerated video output (Overlay)</string>
</property>
<property name="buddy">
<cstring>outputModule</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="2"> <item row="8" column="0">
<widget class="QCheckBox" name="windowDecorations"> <widget class="QLabel" name="voutLabel">
<property name="text"> <property name="text">
<string>Window decorations</string> <string>Output</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="overlay"> <widget class="QCheckBox" name="alwaysOnTop">
<property name="text"> <property name="text">
<string>Accelerated video output (Overlay)</string> <string>Always on top</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="8" column="1" colspan="2">
<widget class="QCheckBox" name="hwYUVBox"> <widget class="QComboBox" name="outputModule">
<property name="text"> <property name="maxVisibleItems">
<string>Use hardware YUV-&gt;RGB conversions</string> <number>15</number>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -118,9 +115,6 @@ ...@@ -118,9 +115,6 @@
<property name="text"> <property name="text">
<string>Display device</string> <string>Display device</string>
</property> </property>
<property name="buddy">
<cstring>dXdisplayDevice</cstring>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
...@@ -138,17 +132,11 @@ ...@@ -138,17 +132,11 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="1" colspan="2">
<widget class="QComboBox" name="kvaVideoMode"/>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="kvaVideoModeLabel"> <widget class="QLabel" name="kvaVideoModeLabel">
<property name="text"> <property name="text">
<string>Video mode</string> <string>Video mode</string>
</property> </property>
<property name="buddy">
<cstring>kvaVideoMode</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
...@@ -158,6 +146,9 @@ ...@@ -158,6 +146,9 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" colspan="2">
<widget class="QComboBox" name="kvaVideoMode"/>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
...@@ -172,9 +163,6 @@ ...@@ -172,9 +163,6 @@
<property name="text"> <property name="text">
<string>Deinterlacing</string> <string>Deinterlacing</string>
</property> </property>
<property name="buddy">
<cstring>deinterlaceBox</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
...@@ -182,9 +170,6 @@ ...@@ -182,9 +170,6 @@
<property name="text"> <property name="text">
<string>Force Aspect Ratio</string> <string>Force Aspect Ratio</string>
</property> </property>
<property name="buddy">
<cstring>arLine</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
...@@ -208,9 +193,6 @@ ...@@ -208,9 +193,6 @@
<property name="text"> <property name="text">
<string>Mode</string> <string>Mode</string>
</property> </property>
<property name="buddy">
<cstring>deinterlaceModeBox</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="3"> <item row="0" column="3">
...@@ -256,9 +238,6 @@ ...@@ -256,9 +238,6 @@
<property name="text"> <property name="text">
<string>Directory</string> <string>Directory</string>
</property> </property>
<property name="buddy">
<cstring>snapshotsDirectory</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
...@@ -266,9 +245,6 @@ ...@@ -266,9 +245,6 @@
<property name="text"> <property name="text">
<string>Prefix</string> <string>Prefix</string>
</property> </property>
<property name="buddy">
<cstring>snapshotsPrefix</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="2">
...@@ -283,9 +259,6 @@ ...@@ -283,9 +259,6 @@
<property name="text"> <property name="text">
<string>Format</string> <string>Format</string>
</property> </property>
<property name="buddy">
<cstring>snapshotsFormat</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="3" colspan="2"> <item row="1" column="3" colspan="2">
...@@ -319,6 +292,9 @@ ...@@ -319,6 +292,9 @@
</item> </item>
</layout> </layout>
</widget> </widget>
</item>
</layout>
</widget>
<tabstops> <tabstops>
<tabstop>enableVideo</tabstop> <tabstop>enableVideo</tabstop>
<tabstop>fullscreen</tabstop> <tabstop>fullscreen</tabstop>
......
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