Skip to content

V
vlc-2-2
Commit ea92ef2b authored by Antoine Cellerier's avatar Antoine Cellerier
Browse files
Options

Bind simple prefs forms to corresponding simple prefs categories

parent 4cd2fe1b
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 102 deletions
modules/gui/qt4/Modules.am
View file @ ea92ef2b
...@@ -12,7 +12,9 @@ ...@@ -12,7 +12,9 @@
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects
TOUI = ui/input_stats ui/main_interface ui/file_open \ TOUI = ui/input_stats ui/main_interface ui/file_open \
ui/logindialog ui/inputdialog ui/progressdialog ui/sprefs_trivial ui/logindialog ui/inputdialog ui/progressdialog ui/sprefs_trivial \
ui/sprefs_audio ui/sprefs_playlist ui/sprefs_subtitles \
ui/sprefs_video
UIH = $(TOUI:%=%.h) UIH = $(TOUI:%=%.h)
TOMOC = main_interface \ TOMOC = main_interface \
...@@ -138,10 +140,21 @@ EXTRA_DIST += \ ...@@ -138,10 +140,21 @@ EXTRA_DIST += \
ui/inputdialog.ui \ ui/inputdialog.ui \
ui/progressdialog.ui \ ui/progressdialog.ui \
ui/sprefs_trivial.ui \ ui/sprefs_trivial.ui \
ui/sprefs_audio.ui \
ui/sprefs_video.ui \
ui/sprefs_playlist.ui \
ui/sprefs_subtitles.ui \
pixmaps/advanced.xpm \ pixmaps/advanced.xpm \
pixmaps/audio.xpm \ pixmaps/audio.xpm \
pixmaps/codec.xpm \ pixmaps/codec.xpm \
pixmaps/intf.xpm \ pixmaps/intf.xpm \
pixmaps/type_net.xpm \ pixmaps/type_net.xpm \
pixmaps/type_playlist.xpm \ pixmaps/type_playlist.xpm \
pixmaps/video.xpm pixmaps/video.xpm \
pixmaps/advanced_50x50.xpm \
pixmaps/audio_50x50.xpm \
pixmaps/input_and_codecs_50x50.xpm \
pixmaps/interface_50x50.xpm \
pixmaps/playlist_50x50.xpm \
pixmaps/subtitles_50x50.xpm \
pixmaps/video_50x50.xpm
modules/gui/qt4/components/simple_preferences.cpp
View file @ ea92ef2b
...@@ -41,6 +41,10 @@ ...@@ -41,6 +41,10 @@
#include "pixmaps/video_50x50.xpm" #include "pixmaps/video_50x50.xpm"
#include "ui/sprefs_trivial.h" #include "ui/sprefs_trivial.h"
#include "ui/sprefs_audio.h"
#include "ui/sprefs_video.h"
#include "ui/sprefs_subtitles.h"
#include "ui/sprefs_playlist.h"
#define ITEM_HEIGHT 50 #define ITEM_HEIGHT 50
...@@ -115,19 +119,15 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -115,19 +119,15 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
{ {
case SPrefsVideo: case SPrefsVideo:
{ {
Ui::SPrefsTrivial ui; Ui::SPrefsVideo ui;
ui.setupUi( this ); ui.setupUi( this );
module_config_t *p_config =
config_FindConfig( VLC_OBJECT(p_intf), "memcpy" );
ConfigControl *control =
new ModuleConfigControl( VLC_OBJECT(p_intf),
p_config, ui.memcpyLabel, ui.memcpyCombo, false );
controls.append( control );
break; break;
} }
case SPrefsAudio: case SPrefsAudio:
{ {
Ui::SPrefsAudio ui;
ui.setupUi( this );
break; break;
} }
...@@ -138,6 +138,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -138,6 +138,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
case SPrefsPlaylist: case SPrefsPlaylist:
{ {
Ui::SPrefsPlaylist ui;
ui.setupUi( this );
break; break;
} }
...@@ -148,11 +150,21 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -148,11 +150,21 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
case SPrefsSubtitles: case SPrefsSubtitles:
{ {
Ui::SPrefsSubtitles ui;
ui.setupUi( this );
break; break;
} }
case SPrefsAdvanced: case SPrefsAdvanced:
{ {
Ui::SPrefsTrivial ui;
ui.setupUi( this );
module_config_t *p_config =
config_FindConfig( VLC_OBJECT(p_intf), "memcpy" );
ConfigControl *control =
new ModuleConfigControl( VLC_OBJECT(p_intf),
p_config, ui.memcpyLabel, ui.memcpyCombo, false );
controls.append( control );
break; break;
} }
} }
......
modules/gui/qt4/dialogs/prefs_dialog.cpp
View file @ ea92ef2b
...@@ -56,7 +56,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) ...@@ -56,7 +56,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
small = new QRadioButton( "Basic", types ); tl->addWidget( small ); small = new QRadioButton( "Basic", types ); tl->addWidget( small );
all = new QRadioButton( "All", types ); tl->addWidget( all ); all = new QRadioButton( "All", types ); tl->addWidget( all );
types->setLayout(tl); types->setLayout(tl);
all->setChecked( true ); small->setChecked( true );
adv_chk = new QCheckBox("Advanced options"); adv_chk = new QCheckBox("Advanced options");
......
modules/gui/qt4/ui/sprefs_audio.ui
View file @ ea92ef2b
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<author></author> <author></author>
<comment></comment> <comment></comment>
<exportmacro></exportmacro> <exportmacro></exportmacro>
<class>Form</class> <class>SPrefsAudio</class>
<widget class="QWidget" name="Form" > <widget class="QWidget" name="SPrefsAudio" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
<x>0</x> <x>0</x>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="9" column="0" colspan="3" > <item row="9" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox" > <widget class="QGroupBox" name="groupBox" >
<property name="title" > <property name="title" >
<string>Filters</string> <string>Filters</string>
...@@ -34,129 +34,132 @@ ...@@ -34,129 +34,132 @@
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="0" colspan="2" >
<widget class="QCheckBox" name="headphoneEffect" >
<property name="text" >
<string>Headphone effect</string>
</property>
</widget>
</item>
<item row="0" column="2" > <item row="0" column="2" >
<widget class="QComboBox" name="comboBox_5" /> <widget class="QComboBox" name="equalizerPreset" />
</item> </item>
<item row="0" column="1" > <item row="0" column="1" >
<widget class="QLabel" name="label_6" > <widget class="QLabel" name="label_6" >
<property name="layoutDirection" >
<enum>Qt::RightToLeft</enum>
</property>
<property name="text" > <property name="text" >
<string>Preset</string> <string>Preset</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="0" column="0" >
<widget class="QCheckBox" name="checkBox_5" > <widget class="QCheckBox" name="equalizer" >
<property name="text" > <property name="text" >
<string>Parametric equalizer</string> <string>Equalizer</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="2" column="0" colspan="2" >
<widget class="QCheckBox" name="checkBox_4" > <widget class="QCheckBox" name="volumeNormalizer" >
<property name="text" > <property name="text" >
<string>Volume normalizer</string> <string>Volume normalizer</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="3" column="0" colspan="2" >
<widget class="QCheckBox" name="checkBox_3" > <widget class="QCheckBox" name="parametricEqualizer" >
<property name="text" > <property name="text" >
<string>Headphone effect</string> <string>Parametric equalizer</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QCheckBox" name="checkBox_2" >
<property name="text" >
<string>Equalizer</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="8" column="0" > <item row="0" column="0" >
<widget class="QLabel" name="label_5" > <widget class="QCheckBox" name="enableAudio" >
<property name="text" > <property name="text" >
<string>Visualisation</string> <string>Enable audio</string>
</property> </property>
</widget> <property name="checked" >
</item> <bool>true</bool>
<item row="8" column="2" >
<widget class="QComboBox" name="comboBox_4" />
</item>
<item row="7" column="0" colspan="3" >
<widget class="Line" name="line_3" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="3" > <item row="1" column="0" colspan="2" >
<widget class="Line" name="line_2" > <widget class="Line" name="line" >
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="2" > <item row="2" column="0" >
<widget class="QComboBox" name="comboBox_3" /> <widget class="QLabel" name="label" >
</item>
<item row="6" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" > <property name="text" >
<string>Output device</string> <string>Prefered audio language</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="2" > <item row="2" column="1" >
<widget class="QComboBox" name="comboBox_2" /> <widget class="QComboBox" name="preferedAudioLanguage" />
</item> </item>
<item row="5" column="0" colspan="2" > <item row="3" column="0" >
<widget class="QLabel" name="label_3" > <widget class="QLabel" name="label_2" >
<property name="text" > <property name="text" >
<string>Output module</string> <string>Default volume</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2" > <item row="3" column="1" >
<widget class="QSlider" name="horizontalSlider" > <widget class="QSlider" name="defaultVolume" >
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="5" column="0" >
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label_3" >
<property name="text" > <property name="text" >
<string>Default volume</string> <string>Output module</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="2" > <item row="5" column="1" >
<widget class="QComboBox" name="comboBox" /> <widget class="QComboBox" name="outputModule" />
</item> </item>
<item row="2" column="0" colspan="2" > <item row="6" column="0" >
<widget class="QLabel" name="label" > <widget class="QLabel" name="label_4" >
<property name="text" > <property name="text" >
<string>Prefered audio language</string> <string>Output device</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="3" > <item row="6" column="1" >
<widget class="Line" name="line" > <widget class="QComboBox" name="outputDevice" />
</item>
<item row="4" column="0" colspan="2" >
<widget class="Line" name="line_2" >
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="7" column="0" colspan="2" >
<widget class="QCheckBox" name="checkBox" > <widget class="Line" name="line_3" >
<property name="text" > <property name="orientation" >
<string>Enable audio</string> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="checked" > </widget>
<bool>true</bool> </item>
<item row="8" column="1" >
<widget class="QComboBox" name="visualisation" />
</item>
<item row="8" column="0" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>Visualisation</string>
</property> </property>
</widget> </widget>
</item> </item>
......
modules/gui/qt4/ui/sprefs_playlist.ui
View file @ ea92ef2b
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<author></author> <author></author>
<comment></comment> <comment></comment>
<exportmacro></exportmacro> <exportmacro></exportmacro>
<class>Form</class> <class>SPrefsPlaylist</class>
<widget class="QWidget" name="Form" > <widget class="QWidget" name="SPrefsPlaylist" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
<x>0</x> <x>0</x>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<number>6</number> <number>6</number>
</property> </property>
<item> <item>
<widget class="QCheckBox" name="checkBox" > <widget class="QCheckBox" name="playFilesRandomlyForEver" >
<property name="toolTip" > <property name="toolTip" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;/head>&lt;body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;/body>&lt;/html></string> <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;/head>&lt;body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;/body>&lt;/html></string>
</property> </property>
...@@ -45,21 +45,21 @@ ...@@ -45,21 +45,21 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="checkBox_2" > <widget class="QCheckBox" name="repeatAll" >
<property name="text" > <property name="text" >
<string>Repeat all</string> <string>Repeat all</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="checkBox_3" > <widget class="QCheckBox" name="repeatCurrentItem" >
<property name="text" > <property name="text" >
<string>Repeat current item</string> <string>Repeat current item</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="checkBox_4" > <widget class="QCheckBox" name="playAndStop" >
<property name="text" > <property name="text" >
<string>Play and stop</string> <string>Play and stop</string>
</property> </property>
...@@ -91,14 +91,14 @@ ...@@ -91,14 +91,14 @@
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="1" >
<widget class="QLineEdit" name="lineEdit" > <widget class="QLineEdit" name="defaultPlaylist" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2" > <item row="1" column="2" >
<widget class="QPushButton" name="pushButton" > <widget class="QPushButton" name="defaultPlaylistBrowse" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
</property> </property>
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="2" > <item row="0" column="0" colspan="2" >
<widget class="QCheckBox" name="checkBox_5" > <widget class="QCheckBox" name="rememberPlaylist" >
<property name="text" > <property name="text" >
<string>Remember playlist</string> <string>Remember playlist</string>
</property> </property>
......
modules/gui/qt4/ui/sprefs_subtitles.ui
View file @ ea92ef2b
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<author></author> <author></author>
<comment></comment> <comment></comment>
<exportmacro></exportmacro> <exportmacro></exportmacro>
<class>Form</class> <class>SPrefsSubtitles</class>
<widget class="QWidget" name="Form" > <widget class="QWidget" name="SPrefsSubtitles" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
<x>0</x> <x>0</x>
...@@ -49,20 +49,20 @@ ...@@ -49,20 +49,20 @@
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="1" > <item row="0" column="1" >
<widget class="QLineEdit" name="lineEdit" /> <widget class="QLineEdit" name="font" />
</item> </item>
<item row="1" column="1" colspan="2" > <item row="1" column="1" colspan="2" >
<widget class="QComboBox" name="comboBox_3" /> <widget class="QComboBox" name="fontSize" />
</item> </item>
<item row="0" column="2" > <item row="0" column="2" >
<widget class="QPushButton" name="pushButton" > <widget class="QPushButton" name="fontBrowse" >
<property name="text" > <property name="text" >
<string>Browse</string> <string>Browse</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="2" > <item row="2" column="1" colspan="2" >
<widget class="QComboBox" name="comboBox_4" /> <widget class="QComboBox" name="fontColor" />
</item> </item>
<item row="2" column="0" > <item row="2" column="0" >
<widget class="QLabel" name="label_4" > <widget class="QLabel" name="label_4" >
...@@ -89,10 +89,10 @@ ...@@ -89,10 +89,10 @@
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="0" column="1" >
<widget class="QComboBox" name="comboBox" /> <widget class="QComboBox" name="preferedLanguage" />
</item> </item>
<item row="1" column="1" > <item row="1" column="1" >
<widget class="QComboBox" name="comboBox_2" /> <widget class="QComboBox" name="encoding" />
</item> </item>
<item row="3" column="0" colspan="2" > <item row="3" column="0" colspan="2" >
<spacer> <spacer>
......
modules/gui/qt4/ui/sprefs_video.ui
View file @ ea92ef2b
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<author></author> <author></author>
<comment></comment> <comment></comment>
<exportmacro></exportmacro> <exportmacro></exportmacro>
<class>Form</class> <class>SPrefsVideo</class>
<widget class="QWidget" name="Form" > <widget class="QWidget" name="SPrefsVideo" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
<x>0</x> <x>0</x>
...@@ -35,10 +35,10 @@ ...@@ -35,10 +35,10 @@
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="1" colspan="2" > <item row="0" column="1" colspan="2" >
<widget class="QLineEdit" name="lineEdit" /> <widget class="QLineEdit" name="snapshotsDirectory" />
</item> </item>
<item row="0" column="3" > <item row="0" column="3" >
<widget class="QPushButton" name="pushButton" > <widget class="QPushButton" name="snapshotsDirectoryBrowse" >
<property name="text" > <property name="text" >
<string>Browse</string> <string>Browse</string>
</property> </property>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="1" >
<widget class="QLineEdit" name="lineEdit_2" /> <widget class="QLineEdit" name="snapshotsPrefix" />
</item> </item>
<item row="2" column="0" > <item row="2" column="0" >
<widget class="QLabel" name="label_3" > <widget class="QLabel" name="label_3" >
...@@ -70,10 +70,10 @@ ...@@ -70,10 +70,10 @@
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="3" > <item row="2" column="1" colspan="3" >
<widget class="QComboBox" name="comboBox" /> <widget class="QComboBox" name="snapshotsFormat" />
</item> </item>
<item row="1" column="2" colspan="2" > <item row="1" column="2" colspan="2" >
<widget class="QCheckBox" name="checkBox_5" > <widget class="QCheckBox" name="snapshotsSequentialNumbering" >
<property name="text" > <property name="text" >
<string>Sequential numbering</string> <string>Sequential numbering</string>
</property> </property>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<number>6</number> <number>6</number>
</property> </property>
<item row="2" column="1" colspan="2" > <item row="2" column="1" colspan="2" >
<widget class="QComboBox" name="comboBox_2" /> <widget class="QComboBox" name="outputModule" />
</item> </item>
<item row="2" column="0" > <item row="2" column="0" >
<widget class="QLabel" name="label_4" > <widget class="QLabel" name="label_4" >
...@@ -105,28 +105,28 @@ ...@@ -105,28 +105,28 @@
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="2" > <item row="0" column="0" colspan="2" >
<widget class="QCheckBox" name="checkBox_2" > <widget class="QCheckBox" name="fullscreen" >
<property name="text" > <property name="text" >
<string>Fullscreen</string> <string>Fullscreen</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2" > <item row="1" column="2" >
<widget class="QCheckBox" name="checkBox_6" > <widget class="QCheckBox" name="windowDecorations" >
<property name="text" > <property name="text" >
<string>Window decorations</string> <string>Window decorations</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2" > <item row="1" column="0" colspan="2" >
<widget class="QCheckBox" name="checkBox_4" > <widget class="QCheckBox" name="alwaysOnTop" >
<property name="text" > <property name="text" >
<string>Always on top</string> <string>Always on top</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" > <item row="0" column="2" >
<widget class="QCheckBox" name="checkBox_3" > <widget class="QCheckBox" name="overlay" >
<property name="text" > <property name="text" >
<string>Overlay video output</string> <string>Overlay video output</string>
</property> </property>
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QCheckBox" name="checkBox" > <widget class="QCheckBox" name="enableVideo" >
<property name="text" > <property name="text" >
<string>Enable video</string> <string>Enable video</string>
</property> </property>
......
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