Qt: Various updates on the simple preferences.

diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui
index c26639293c827a16889e9436f3628b2818bdef63..12903cbb06dfe9485c99d7e3c6efd5c5093199e0 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_input.ui
+++ b/modules/gui/qt4/ui/sprefs_input.ui
@@ -7,8 +7,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>622</width>
-    <height>514</height>
+    <width>687</width>
+    <height>507</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -66,12 +66,15 @@
      <property name="title">
       <string>Network</string>
      </property>
-     <layout class="QGridLayout">
+     <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0">
        <widget class="QLabel" name="portLabel">
         <property name="text">
          <string>Server default port</string>
         </property>
+        <property name="margin">
+         <number>0</number>
+        </property>
         <property name="buddy">
          <cstring>UDPPort</cstring>
         </property>
@@ -114,8 +117,8 @@
      <property name="title">
       <string>Caching</string>
      </property>
-     <layout class="QHBoxLayout">
-      <item>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string>Default caching level</string>
@@ -125,7 +128,7 @@
         </property>
        </widget>
       </item>
-      <item>
+      <item row="0" column="1">
        <widget class="QComboBox" name="cachingCombo"/>
       </item>
      </layout>

diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index 56962a15477a0e2433987b28587d0cfeed6724cf..9bde372db0020e77502a89bd7bbf64cc05b5e080 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
+ <author>Jean-Baptiste Kempf</author>
  <class>SPrefsInterface</class>
  <widget class="QWidget" name="SPrefsInterface">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>732</width>
+    <width>758</width>
     <height>657</height>
    </rect>
   </property>
@@ -48,7 +49,7 @@
      <property name="title">
       <string>Privacy / Network Interaction</string>
      </property>
-     <layout class="QGridLayout">
+     <layout class="QGridLayout" name="gridLayout_5">
       <item row="0" column="0">
        <widget class="QLabel" name="artFetchLabel">
         <property name="minimumSize">
@@ -62,6 +63,9 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="2" colspan="2">
+       <widget class="QComboBox" name="artFetcher"/>
+      </item>
       <item row="1" column="0">
        <widget class="QCheckBox" name="updatesBox">
         <property name="text">
@@ -69,6 +73,39 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="1">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Every</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QSpinBox" name="updatesDays">
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="suffix">
+         <string> days</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>320</width>
+          <height>27</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
       <item row="2" column="0">
        <widget class="QCheckBox" name="saveRecentlyPlayed">
         <property name="text">
@@ -76,76 +113,30 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1" colspan="2">
-       <widget class="QComboBox" name="artFetcher"/>
-      </item>
-      <item row="2" column="1" colspan="2">
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QLabel" name="filterLabel">
-          <property name="text">
-           <string>Filter:</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-          <property name="margin">
-           <number>5</number>
-          </property>
-          <property name="indent">
-           <number>10</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="recentlyPlayedFilters">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="toolTip">
-           <string>Separate words by | (without space)</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
+      <item row="2" column="1">
+       <widget class="QLabel" name="filterLabel">
+        <property name="text">
+         <string>Filter:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="margin">
+         <number>5</number>
+        </property>
+       </widget>
       </item>
-      <item row="1" column="1" colspan="2">
-       <widget class="QWidget" name="updatenotifier_zone" native="true">
-        <layout class="QHBoxLayout" name="horizontalLayout_5">
-         <item>
-          <widget class="QLabel" name="label">
-           <property name="text">
-            <string>every</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QSpinBox" name="updatesDays">
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
-           <property name="suffix">
-            <string> days</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer_2">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
+      <item row="2" column="2" colspan="2">
+       <widget class="QLineEdit" name="recentlyPlayedFilters">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Separate words by | (without space)</string>
+        </property>
        </widget>
       </item>
      </layout>

diff --git a/modules/gui/qt4/ui/sprefs_subtitles.ui b/modules/gui/qt4/ui/sprefs_subtitles.ui
index 3ad83e9b991dd0cd480e5911bd31e725fcba3adb..25bff1da337aa6b7542d177ccadfb628a4256d8f 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_subtitles.ui
+++ b/modules/gui/qt4/ui/sprefs_subtitles.ui
@@ -1,38 +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>434</width>
-    <height>442</height>
+    <width>772</width>
+    <height>444</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <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" >
+     <layout class="QVBoxLayout">
       <item>
-       <widget class="QCheckBox" name="OSDBox" >
-        <property name="text" >
-         <string>Enable OSD</string>
+       <widget class="QCheckBox" name="OSDBox">
+        <property name="text">
+         <string>Enable On Screen Display (OSD)</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="OSDTitleBox" >
-        <property name="text" >
-         <string>Show media title on video</string>
+       <widget class="QCheckBox" name="OSDTitleBox">
+        <property name="text">
+         <string>Show media title on video start</string>
         </property>
        </widget>
       </item>
@@ -40,43 +42,43 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_2" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+    <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" >
+     <property name="title">
       <string>Subtitles Language</string>
      </property>
-     <layout class="QGridLayout" >
-      <item row="0" column="0" >
-       <widget class="QLabel" name="subLangLabel" >
-        <property name="text" >
+     <layout class="QGridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="subLangLabel">
+        <property name="text">
          <string>Preferred subtitles language</string>
         </property>
-        <property name="buddy" >
+        <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>
        </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="encodLabel" >
-        <property name="text" >
+      <item row="1" column="0">
+       <widget class="QLabel" name="encodLabel">
+        <property name="text">
          <string>Default encoding</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>encoding</cstring>
         </property>
        </widget>
@@ -85,92 +87,92 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
       <string>Display Settings</string>
      </property>
-     <layout class="QGridLayout" >
-      <item row="3" column="1" colspan="2" >
-       <widget class="QComboBox" name="effect" />
+     <layout class="QGridLayout">
+      <item row="3" column="1" colspan="2">
+       <widget class="QComboBox" name="effect"/>
       </item>
-      <item row="3" column="0" >
-       <widget class="QLabel" name="fontEffectLabel" >
-        <property name="text" >
+      <item row="3" column="0">
+       <widget class="QLabel" name="fontEffectLabel">
+        <property name="text">
          <string>Effect</string>
         </property>
-        <property name="buddy" >
+        <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" colspan="2">
+       <widget class="QComboBox" name="fontColor"/>
       </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="fontColorLabel" >
-        <property name="text" >
+      <item row="2" column="0">
+       <widget class="QLabel" name="fontColorLabel">
+        <property name="text">
          <string>Font color</string>
         </property>
-        <property name="buddy" >
+        <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" colspan="2">
+       <widget class="QComboBox" name="fontSize"/>
       </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="fontSizeLabel" >
-        <property name="text" >
+      <item row="1" column="0">
+       <widget class="QLabel" name="fontSizeLabel">
+        <property name="text">
          <string>Font size</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>fontSize</cstring>
         </property>
        </widget>
       </item>
-      <item row="0" column="2" >
-       <widget class="QPushButton" name="fontBrowse" >
-        <property name="text" >
+      <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 row="0" column="1">
+       <widget class="QLineEdit" name="font"/>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="fontLabel" >
-        <property name="text" >
+      <item row="0" column="0">
+       <widget class="QLabel" name="fontLabel">
+        <property name="text">
          <string>Font</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>font</cstring>
         </property>
        </widget>
       </item>
-      <item row="4" column="1" colspan="2" >
-       <widget class="QSpinBox" name="subsPosition" >
-        <property name="alignment" >
+      <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" >
+        <property name="suffix">
          <string> px</string>
         </property>
-        <property name="minimum" >
+        <property name="minimum">
          <number>-1024</number>
         </property>
-        <property name="maximum" >
+        <property name="maximum">
          <number>1024</number>
         </property>
        </widget>
       </item>
-      <item row="4" column="0" >
-       <widget class="QLabel" name="subsPosLabel" >
-        <property name="text" >
+      <item row="4" column="0">
+       <widget class="QLabel" name="subsPosLabel">
+        <property name="text">
          <string>Force subtitle position</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>subsPosition</cstring>
         </property>
        </widget>