Qt4: Sprefs, add sub-margin.

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 0bf9d97692ea6d17342acf074c07d3fb59a2cf5b..9ffacc074082c0e9971a794c426faeb23f3cd443 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -524,6 +524,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, NULL,
                             fontSize );
             CONFIG_GENERIC( "freetype-effect", IntegerList, NULL, effect );
+            CONFIG_GENERIC( "sub-margin", Integer, NULL, subsPosition );
 
         END_SPREFS_CAT;
 

diff --git a/modules/gui/qt4/ui/sprefs_subtitles.ui b/modules/gui/qt4/ui/sprefs_subtitles.ui
index d4e3d3b7602e0df08047e47927c0b402f4fcbf20..7f8fab3d75fa2f7b5ab81a678e9cb1f13ece2584 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_subtitles.ui
+++ b/modules/gui/qt4/ui/sprefs_subtitles.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>427</width>
-    <height>380</height>
+    <width>434</width>
+    <height>410</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -148,6 +148,32 @@
         </property>
        </widget>
       </item>
+      <item row="4" column="1" colspan="2" >
+       <widget class="QSpinBox" name="subsPosition" >
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="suffix" >
+         <string> px</string>
+        </property>
+        <property name="minimum" >
+         <number>-1024</number>
+        </property>
+        <property name="maximum" >
+         <number>1024</number>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="label_7" >
+        <property name="text" >
+         <string>_("Force subtitle position")</string>
+        </property>
+        <property name="buddy" >
+         <cstring>subsPosition</cstring>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>