Skip to content

V
vlc-2-2
Commit 68171b34 authored by Clément Stenac's avatar Clément Stenac
Browse files
Options

Don't show visualizations selector (unused). 

A bit of cleanup in simple prefs
parent 5e253797
Show whitespace changes
Inline Side-by-side
Showing with 192 additions and 242 deletions
modules/gui/qt4/Modules.am
View file @ 68171b34
...@@ -20,7 +20,6 @@ TOUI = \ ...@@ -20,7 +20,6 @@ TOUI = \
ui/sprefs_interface \ ui/sprefs_interface \
ui/sprefs_playlist \ ui/sprefs_playlist \
ui/sprefs_subtitles \ ui/sprefs_subtitles \
ui/sprefs_trivial \
ui/sprefs_video \ ui/sprefs_video \
ui/streampanel ui/streampanel
...@@ -160,7 +159,6 @@ EXTRA_DIST += \ ...@@ -160,7 +159,6 @@ EXTRA_DIST += \
ui/sprefs_interface.ui \ ui/sprefs_interface.ui \
ui/sprefs_playlist.ui \ ui/sprefs_playlist.ui \
ui/sprefs_subtitles.ui \ ui/sprefs_subtitles.ui \
ui/sprefs_trivial.ui \
ui/sprefs_video.ui \ ui/sprefs_video.ui \
ui/streampanel.ui \ ui/streampanel.ui \
pixmaps/advanced.xpm \ pixmaps/advanced.xpm \
......
modules/gui/qt4/menus.cpp
View file @ 68171b34
...@@ -186,10 +186,12 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi, ...@@ -186,10 +186,12 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
mi, SLOT( advanced() ) ); mi, SLOT( advanced() ) );
adv->setCheckable( true ); adv->setCheckable( true );
if( adv_controls_enabled ) adv->setChecked( true ); if( adv_controls_enabled ) adv->setChecked( true );
#if 0
adv = menu->addAction( qtr("Visualizations selector" ), adv = menu->addAction( qtr("Visualizations selector" ),
mi, SLOT( visual() ) ); mi, SLOT( visual() ) );
adv->setCheckable( true ); adv->setCheckable( true );
if( visual_selector_enabled ) adv->setChecked( true ); if( visual_selector_enabled ) adv->setChecked( true );
#endif
} }
menu->addSeparator(); menu->addSeparator();
DP_SADD( qtr("Preferences"), "", "", prefsDialog() ); DP_SADD( qtr("Preferences"), "", "", prefsDialog() );
......
modules/gui/qt4/ui/sprefs_audio.ui
View file @ 68171b34
<ui version="4.0" > <ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>SPrefsAudio</class> <class>SPrefsAudio</class>
<widget class="QWidget" name="SPrefsAudio" > <widget class="QWidget" name="SPrefsAudio" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>685</width>
<height>408</height> <height>565</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QHBoxLayout" >
<property name="margin" > <property name="margin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="9" column="0" colspan="2" > <item>
<widget class="QGroupBox" name="groupBox" > <layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="2" column="1" >
<widget class="QSlider" name="defaultVolume" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>1</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize" >
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox_2" >
<property name="title" > <property name="title" >
<string>Filters</string> <string>Output</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="margin" >
...@@ -34,129 +60,141 @@ ...@@ -34,129 +60,141 @@
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="0" colspan="2" > <item row="0" column="1" >
<widget class="QCheckBox" name="headphoneEffect" > <widget class="QComboBox" name="outputModule" />
<property name="text" > </item>
<string>Headphone effect</string> <item row="2" column="1" >
<widget class="QSpinBox" name="directXDevice" >
<property name="maximumSize" >
<size>
<width>200</width>
<height>16777215</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" > <item row="3" column="1" >
<widget class="QComboBox" name="equalizerPreset" /> <widget class="QLineEdit" name="lineEdit" />
</item> </item>
<item row="0" column="1" > <item row="0" column="0" >
<widget class="QLabel" name="label_6" > <widget class="QLabel" name="label_3" >
<property name="layoutDirection" >
<enum>Qt::RightToLeft</enum>
</property>
<property name="text" > <property name="text" >
<string>Preset</string> <string>Type</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="1" column="0" >
<widget class="QCheckBox" name="equalizer" > <widget class="QLabel" name="label_4" >
<property name="text" > <property name="text" >
<string>Equalizer</string> <string>Device</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2" > <item row="1" column="1" >
<widget class="QCheckBox" name="volumeNormalizer" > <widget class="QComboBox" name="alsaDevice" />
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_6" >
<property name="text" > <property name="text" >
<string>Volume normalizer</string> <string>Device</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="2" > <item row="3" column="0" >
<widget class="QCheckBox" name="parametricEqualizer" > <widget class="QLabel" name="label_7" >
<property name="text" > <property name="text" >
<string>Parametric equalizer</string> <string>File</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="1" column="0" >
<widget class="QCheckBox" name="enableAudio" > <widget class="QLabel" name="label" >
<property name="text" > <property name="text" >
<string>Enable audio</string> <string>Preferred audio language</string>
</property>
<property name="checked" >
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2" > <item row="1" column="1" >
<widget class="Line" name="line" > <widget class="QComboBox" name="preferredAudioLanguage" >
<property name="orientation" > <property name="sizePolicy" >
<enum>Qt::Horizontal</enum> <sizepolicy>
<hsizetype>1</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
</widget> <property name="maximumSize" >
</item> <size>
<item row="2" column="0" > <width>300</width>
<widget class="QLabel" name="label" > <height>16777215</height>
<property name="text" > </size>
<string>Preferred audio language</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" > <item row="2" column="0" >
<widget class="QComboBox" name="preferredAudioLanguage" />
</item>
<item row="3" column="0" >
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label_2" >
<property name="text" > <property name="text" >
<string>Default volume</string> <string>Default volume</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1" > <item row="0" column="0" >
<widget class="QSlider" name="defaultVolume" > <widget class="QCheckBox" name="enableAudio" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="5" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" > <property name="text" >
<string>Output module</string> <string>Enable audio</string>
</property> </property>
</widget> <property name="checked" >
</item> <bool>true</bool>
<item row="5" column="1" >
<widget class="QComboBox" name="outputModule" />
</item>
<item row="6" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Output device</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1" >
<widget class="QComboBox" name="outputDevice" />
</item>
<item row="4" column="0" colspan="2" > <item row="4" column="0" colspan="2" >
<widget class="Line" name="line_2" > <widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>Effects</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="1" column="1" >
<widget class="QSlider" name="horizontalSlider" >
<property name="toolTip" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Maximum volume when using the volume normalizer&lt;/p>&lt;/body>&lt;/html></string>
</property>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0" colspan="2" > <item row="2" column="1" >
<widget class="Line" name="line_3" > <widget class="QComboBox" name="visualisation" />
<property name="orientation" > </item>
<enum>Qt::Horizontal</enum> <item row="0" column="0" >
<widget class="QCheckBox" name="headphoneEffect" >
<property name="text" >
<string>Headphone surround effect</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="1" > <item row="1" column="0" >
<widget class="QComboBox" name="visualisation" /> <widget class="QCheckBox" name="volumeNormalizer" >
<property name="text" >
<string>Volume normalizer</string>
</property>
</widget>
</item> </item>
<item row="8" column="0" > <item row="2" column="0" >
<widget class="QLabel" name="label_5" > <widget class="QLabel" name="label_5" >
<property name="text" > <property name="text" >
<string>Visualisation</string> <string>Visualisation</string>
...@@ -165,7 +203,11 @@ ...@@ -165,7 +203,11 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<pixmapfunction></pixmapfunction> </item>
</layout>
</item>
</layout>
</widget>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>
modules/gui/qt4/ui/sprefs_interface.ui
View file @ 68171b34
<ui version="4.0" > <ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>SPrefsInterface</class> <class>SPrefsInterface</class>
<widget class="QWidget" name="SPrefsInterface" > <widget class="QWidget" name="SPrefsInterface" >
<property name="geometry" > <property name="geometry" >
...@@ -37,7 +34,7 @@ ...@@ -37,7 +34,7 @@
<item row="3" column="0" colspan="2" > <item row="3" column="0" colspan="2" >
<widget class="QLabel" name="label_3" > <widget class="QLabel" name="label_3" >
<property name="text" > <property name="text" >
<string>This is VLC's skinable interface. You can download skins on http://www.videolan.org/ to customize your player.</string> <string>This is VLC's skinnable interface. You can download skins on http://www.videolan.org/ to customize your player.</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap" >
<bool>true</bool> <bool>true</bool>
...@@ -47,33 +44,13 @@ ...@@ -47,33 +44,13 @@
<item row="1" column="0" colspan="2" > <item row="1" column="0" colspan="2" >
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label_2" >
<property name="text" > <property name="text" >
<string>This is the new VLC default interface. Its dialogs give access to most VLC features.</string> <string>VLC's default interface, with native look and feel</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap" >
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="2" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>This is the legacy VLC default interface. It will be removed once the Qt4 interface is completed and tested.</string>
</property>
<property name="textFormat" >
<enum>Qt::AutoText</enum>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QRadioButton" name="wxwidgets" >
<property name="text" >
<string>wxWidgets</string>
</property>
</widget>
</item>
<item row="2" column="0" > <item row="2" column="0" >
<widget class="QRadioButton" name="skins" > <widget class="QRadioButton" name="skins" >
<property name="text" > <property name="text" >
...@@ -84,7 +61,7 @@ ...@@ -84,7 +61,7 @@
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QRadioButton" name="qt4" > <widget class="QRadioButton" name="qt4" >
<property name="text" > <property name="text" >
<string>Qt4</string> <string>Default</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -103,7 +80,6 @@ ...@@ -103,7 +80,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<pixmapfunction></pixmapfunction>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>
modules/gui/qt4/ui/sprefs_trivial.ui deleted 100644 → 0
View file @ 5e253797
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>SPrefsTrivial</class>
<widget class="QWidget" name="SPrefsTrivial" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>681</width>
<height>300</height>
</rect>
</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="4" column="1" >
<widget class="QSpinBox" name="crSpin" />
</item>
<item row="0" column="0" >
<widget class="QComboBox" name="memcpyCombo" />
</item>
<item row="5" column="0" colspan="2" >
<widget class="QDateTimeEdit" name="dateTimeEdit" />
</item>
<item row="4" column="0" >
<widget class="QLabel" name="crLabel" >
<property name="text" >
<string>That's the question</string>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLabel" name="memcpyLabel" >
<property name="text" >
<string>Should labels be set in Designer or by program ?.</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLCDNumber" name="lcdNumber" >
<property name="numDigits" >
<number>3</number>
</property>
<property name="value" stdset="0" >
<double>42</double>
</property>
</widget>
</item>
</layout>
</widget>
<pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
modules/gui/qt4/ui/sprefs_video.ui
View file @ 68171b34
<ui version="4.0" > <ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>SPrefsVideo</class> <class>SPrefsVideo</class>
<widget class="QWidget" name="SPrefsVideo" > <widget class="QWidget" name="SPrefsVideo" >
<property name="geometry" > <property name="geometry" >
...@@ -64,8 +61,7 @@ ...@@ -64,8 +61,7 @@
<item row="2" column="0" > <item row="2" column="0" >
<widget class="QLabel" name="label_3" > <widget class="QLabel" name="label_3" >
<property name="text" > <property name="text" >
<string>Format <string>Format</string>
</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -100,7 +96,7 @@ ...@@ -100,7 +96,7 @@
<item row="2" column="0" > <item row="2" column="0" >
<widget class="QLabel" name="label_4" > <widget class="QLabel" name="label_4" >
<property name="text" > <property name="text" >
<string>Output module</string> <string>Output</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -128,7 +124,7 @@ ...@@ -128,7 +124,7 @@
<item row="0" column="2" > <item row="0" column="2" >
<widget class="QCheckBox" name="overlay" > <widget class="QCheckBox" name="overlay" >
<property name="text" > <property name="text" >
<string>Overlay video output</string> <string>Accelerated video output</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -144,7 +140,6 @@ ...@@ -144,7 +140,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<pixmapfunction></pixmapfunction>
<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