X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fui%2Fsprefs_subtitles.ui;h=cc2b3149680c7c55dd39edbd5aa0768f0e5a7835;hb=9cc1540b8c973407d32c013489e2e1277141ef1e;hp=390b6fe5ba43e53a826b7f198438300d0452f544;hpb=c40effe24836a594e519d445ac77c64ce1ebb32f;p=vlc

diff --git a/modules/gui/qt4/ui/sprefs_subtitles.ui b/modules/gui/qt4/ui/sprefs_subtitles.ui
index 390b6fe5ba..cc2b314968 100644
--- a/modules/gui/qt4/ui/sprefs_subtitles.ui
+++ b/modules/gui/qt4/ui/sprefs_subtitles.ui
@@ -1,46 +1,40 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <author>Jean-Baptiste Kempf</author>
  <class>SPrefsSubtitles</class>
- <widget class="QWidget" name="SPrefsSubtitles" >
-  <property name="geometry" >
+ <widget class="QWidget" name="SPrefsSubtitles">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>427</width>
-    <height>365</height>
+    <width>758</width>
+    <height>446</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>10</number>
    </property>
    <item>
-    <widget class="QGroupBox" name="groupBox_3" >
-     <property name="title" >
+    <widget class="QGroupBox" name="groupBox_3">
+     <property name="title">
       <string>On Screen Display</string>
      </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
+     <layout class="QVBoxLayout">
       <item>
-       <widget class="QCheckBox" name="OSDBox" >
-        <property name="text" >
-         <string>Enable OSD</string>
-        </property>
-        <property name="checked" >
-         <bool>true</bool>
+       <widget class="QCheckBox" name="OSDBox">
+        <property name="text">
+         <string>Enable On Screen Display (OSD)</string>
         </property>
-        <property name="tristate" >
-         <bool>false</bool>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="OSDTitleBox">
+        <property name="text">
+         <string>Show media title on video start</string>
         </property>
        </widget>
       </item>
@@ -48,49 +42,56 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_2" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>5</hsizetype>
-       <vsizetype>5</vsizetype>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="title" >
-      <string>Subtitles languages</string>
+     <property name="title">
+      <string>Subtitles Language</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="label" >
-        <property name="text" >
-         <string>Subtitles preferred language</string>
+     <layout class="QGridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="subLangLabel">
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Preferred subtitles language</string>
+        </property>
+        <property name="buddy">
+         <cstring>preferredLanguage</cstring>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <widget class="QComboBox" name="encoding" >
-       <property name="maxVisibleItems" >
+      <item row="1" column="1">
+       <widget class="QComboBox" name="encoding">
+        <property name="maxVisibleItems">
          <number>12</number>
         </property>
-        <property name="frame" >
-         <bool>false</bool>
-        </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QLineEdit" name="preferredLanguage" />
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="preferredLanguage"/>
       </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="label_2" >
-        <property name="text" >
-         <string>Default Encoding</string>
+      <item row="1" column="0">
+       <widget class="QLabel" name="encodLabel">
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Default encoding</string>
+        </property>
+        <property name="buddy">
+         <cstring>encoding</cstring>
         </property>
        </widget>
       </item>
@@ -98,61 +99,143 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
-      <string>Display Settings</string>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Subtitles effects</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="3" column="1" colspan="2" >
-       <widget class="QComboBox" name="effect" />
-      </item>
-      <item row="3" column="0" >
-       <widget class="QLabel" name="label_6" >
-        <property name="text" >
+     <layout class="QGridLayout" rowstretch="0,0,0,0,0" columnstretch="0,0">
+      <item row="3" column="1">
+       <widget class="QComboBox" name="effect">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="fontEffectLabel">
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
          <string>Effect</string>
         </property>
+        <property name="buddy">
+         <cstring>effect</cstring>
+        </property>
        </widget>
       </item>
-      <item row="2" column="1" colspan="2" >
-       <widget class="QComboBox" name="fontColor" />
+      <item row="2" column="1">
+       <widget class="QComboBox" name="fontColor">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
       </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="label_4" >
-        <property name="text" >
-         <string>Font Color</string>
+      <item row="2" column="0">
+       <widget class="QLabel" name="fontColorLabel">
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Font color</string>
+        </property>
+        <property name="buddy">
+         <cstring>fontColor</cstring>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" colspan="2" >
-       <widget class="QComboBox" name="fontSize" />
+      <item row="1" column="1">
+       <widget class="QComboBox" name="fontSize">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="label_3" >
-        <property name="text" >
+      <item row="1" column="0">
+       <widget class="QLabel" name="fontSizeLabel">
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
          <string>Font size</string>
         </property>
+        <property name="buddy">
+         <cstring>fontSize</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="fontLabel">
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Font</string>
+        </property>
+        <property name="buddy">
+         <cstring>font</cstring>
+        </property>
        </widget>
       </item>
-      <item row="0" column="2" >
-       <widget class="QPushButton" name="fontBrowse" >
-        <property name="text" >
-         <string>Browse...</string>
+      <item row="4" column="0">
+       <widget class="QLabel" name="subsPosLabel">
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Force subtitle position</string>
+        </property>
+        <property name="buddy">
+         <cstring>subsPosition</cstring>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QLineEdit" name="font" />
+      <item row="0" column="1">
+       <widget class="QFontComboBox" name="font"/>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="label_5" >
-        <property name="text" >
-         <string>Font</string>
+      <item row="4" column="1">
+       <widget class="QSpinBox" name="subsPosition">
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <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>
@@ -161,6 +244,15 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>OSDBox</tabstop>
+  <tabstop>preferredLanguage</tabstop>
+  <tabstop>encoding</tabstop>
+  <tabstop>font</tabstop>
+  <tabstop>fontSize</tabstop>
+  <tabstop>fontColor</tabstop>
+  <tabstop>effect</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>