Skip to content

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

Qt4 - SPrefs: interface small change

parent 0b4bd344
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 34 deletions
modules/gui/qt4/components/simple_preferences.cpp
View file @ 6f7987fa
......@@ -229,8 +229,11 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
/* Interface Panel */
START_SPREFS_CAT( Interface, "Interfaces settings" );
CONFIG_GENERIC( "language", StringList, NULL, language );
CONFIG_GENERIC( "language", StringList, NULL, language );
#if !defined( WIN32 ) && !defined( HAVE_DBUS_3 )
ui.OneInterfaceBox->hide();
#endif
/* interface */
/* p_config = config_FindConfig( VLC_OBJECT(p_intf), "intf" );
if( p_config->value.psz && strcmp( p_config->value.psz, "qt4" ))
......@@ -241,9 +244,11 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo );
CONFIG_GENERIC( "skins2-last", String, NULL, fileSkin);
//FIXME File
#if defined( WIN32 ) || defined(HAVE_DBUS_3)
CONFIG_GENERIC( "one-instance", Bool, NULL, OneInterfaceMode );
CONFIG_GENERIC( "playlist-enqueue", Bool, NULL,
EnqueueOneInterfaceMode );
#endif
END_SPREFS_CAT;
START_SPREFS_CAT( Subtitles, "Subtitles & OSD settings" );
......
modules/gui/qt4/ui/sprefs_interface.ui
View file @ 6f7987fa
......@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>440</width>
<height>373</height>
<width>444</width>
<height>362</height>
</rect>
</property>
<property name="windowTitle" >
......@@ -31,31 +31,68 @@
<property name="spacing" >
<number>6</number>
</property>
<item row="5" column="2" >
<widget class="QPushButton" name="skinBrowse" >
<property name="text" >
<string>Browse</string>
<item row="2" column="0" colspan="3" >
<widget class="Line" name="line" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="5" column="1" >
<widget class="QLineEdit" name="fileSkin" />
</item>
<item row="4" column="1" colspan="2" >
<item row="3" column="1" colspan="2" >
<widget class="QLabel" name="label_3" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>3</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
</property>
<property name="text" >
<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;">&lt;span style=" font-style:italic;">This is VLC's skinnable interface. You can download skins on &lt;/span>&lt;a href="http://www.videolan.org/">&lt;span style=" font-style:italic; text-decoration: underline; color:#0000ff;">http://www.videolan.org/vlc/skins.php&lt;/span>&lt;/a>&lt;span style=" font-style:italic;"> to customize your player.&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property>
<property name="alignment" >
<set>Qt::AlignBottom|Qt::AlignJustify</set>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="margin" >
<number>10</number>
</property>
<property name="openExternalLinks" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2" >
<item row="4" column="2" >
<widget class="QPushButton" name="skinBrowse" >
<property name="text" >
<string>Browse</string>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Skin File</string>
</property>
</widget>
</item>
<item row="4" column="1" >
<widget class="QLineEdit" name="fileSkin" />
</item>
<item row="0" column="1" colspan="2" >
<widget class="QLabel" name="label_2" >
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
</property>
<property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
......@@ -65,41 +102,47 @@ p, li { white-space: pre-wrap; }
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="margin" >
<number>10</number>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2" >
<item row="0" column="0" >
<widget class="QRadioButton" name="qt4" >
<property name="text" >
<string>Default</string>
</property>
</widget>
</item>
<item row="5" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Skin File</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2" >
<item row="3" column="0" >
<widget class="QRadioButton" name="skins" >
<property name="text" >
<string>Skins</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<item row="1" column="1" colspan="2" >
<widget class="QCheckBox" name="qtAlwaysVideo" >
<property name="text" >
<string>Display always the video</string>
<string>Always display the video</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="1" >
<widget class="QComboBox" name="language" />
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Language</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox_2" >
<widget class="QGroupBox" name="OneInterfaceBox" >
<property name="title" >
<string>Instances</string>
</property>
......@@ -127,16 +170,6 @@ p, li { white-space: pre-wrap; }
</layout>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Language</string>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QComboBox" name="language" />
</item>
</layout>
</widget>
<resources/>
......
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