From 4587e35963d1bb0587fc7ac6ff426afa2c4242ab Mon Sep 17 00:00:00 2001
From: Antoine Cellerier <dionoea@videolan.org>
Date: Sun, 27 Aug 2006 21:41:05 +0000
Subject: [PATCH] Add subtitles display effect to simple prefs panel
---
.../gui/qt4/components/simple_preferences.cpp | 1 +
modules/gui/qt4/ui/sprefs_subtitles.ui | 60 +++++++++++--------
2 files changed, 36 insertions(+), 25 deletions(-)
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 6dc21c0c7106..1e2c94c05db3 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -174,6 +174,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor );
CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, NULL,
fontSize );
+ CONFIG_GENERIC( "freetype-effect", IntegerList, NULL, effect );
END_SPREFS_CAT;
diff --git a/modules/gui/qt4/ui/sprefs_subtitles.ui b/modules/gui/qt4/ui/sprefs_subtitles.ui
index f511c01d4d84..9e1d8d5715b0 100644
--- a/modules/gui/qt4/ui/sprefs_subtitles.ui
+++ b/modules/gui/qt4/ui/sprefs_subtitles.ui
@@ -22,23 +22,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <item row="0" column="1" >
- <widget class="QLineEdit" name="preferedLanguage" />
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="label" >
- <property name="text" >
- <string>Subtitles prefered language</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_2" >
- <property name="text" >
- <string>Default Encoding</string>
- </property>
- </widget>
- </item>
<item row="2" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
@@ -51,16 +34,13 @@
<property name="spacing" >
<number>6</number>
</property>
- <item row="0" column="1" >
- <widget class="QLineEdit" name="font" />
- </item>
- <item row="1" column="1" colspan="2" >
- <widget class="QComboBox" name="fontSize" />
+ <item row="3" column="1" colspan="2" >
+ <widget class="QComboBox" name="effect" />
</item>
- <item row="0" column="2" >
- <widget class="QPushButton" name="fontBrowse" >
+ <item row="3" column="0" >
+ <widget class="QLabel" name="label_6" >
<property name="text" >
- <string>Browse</string>
+ <string>Effect</string>
</property>
</widget>
</item>
@@ -74,6 +54,9 @@
</property>
</widget>
</item>
+ <item row="1" column="1" colspan="2" >
+ <widget class="QComboBox" name="fontSize" />
+ </item>
<item row="1" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
@@ -81,6 +64,16 @@
</property>
</widget>
</item>
+ <item row="0" column="2" >
+ <widget class="QPushButton" name="fontBrowse" >
+ <property name="text" >
+ <string>Browse</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QLineEdit" name="font" />
+ </item>
<item row="0" column="0" >
<widget class="QLabel" name="label_5" >
<property name="text" >
@@ -94,6 +87,23 @@
<item row="1" column="1" >
<widget class="QComboBox" name="encoding" />
</item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="label_2" >
+ <property name="text" >
+ <string>Default Encoding</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QLabel" name="label" >
+ <property name="text" >
+ <string>Subtitles prefered language</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QLineEdit" name="preferedLanguage" />
+ </item>
</layout>
</widget>
<pixmapfunction></pixmapfunction>
--
GitLab