]> git.sesse.net Git - vlc/commitdiff
Qt: Simple preferences simplifications
authorJean-Baptiste Kempf <jb@videolan.org>
Sun, 19 Sep 2010 22:08:48 +0000 (00:08 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Sun, 19 Sep 2010 22:09:11 +0000 (00:09 +0200)
modules/gui/qt4/ui/sprefs_audio.ui
modules/gui/qt4/ui/sprefs_input.ui
modules/gui/qt4/ui/sprefs_interface.ui
modules/gui/qt4/ui/sprefs_subtitles.ui
modules/gui/qt4/ui/sprefs_video.ui

index d6c818a9a1a22cf41a811c2ccec070b17863b760..67488df3b82ffb2eaa08049380b9c089c7eeadef 100644 (file)
@@ -7,8 +7,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>661</width>
-    <height>670</height>
+    <width>703</width>
+    <height>656</height>
    </rect>
   </property>
   <property name="sizePolicy">
          <bool>false</bool>
         </property>
         <layout class="QGridLayout" name="gridLayout_2">
-         <item row="0" column="0">
-          <widget class="QLabel" name="dolbyLabel">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>250</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>250</width>
-             <height>16777215</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Dolby Surround:</string>
-           </property>
-           <property name="buddy">
-            <cstring>detectionDolby</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QComboBox" name="detectionDolby">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="currentIndex">
-            <number>-1</number>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="0">
+         <item row="3" column="0">
           <widget class="QCheckBox" name="volNormBox">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            </property>
           </widget>
          </item>
-         <item row="2" column="1">
+         <item row="3" column="1">
           <widget class="QDoubleSpinBox" name="volNormSpin">
            <property name="enabled">
             <bool>true</bool>
            </property>
           </widget>
          </item>
-         <item row="2" column="2">
+         <item row="3" column="2">
           <spacer name="horizontalSpacer">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
           </spacer>
          </item>
-         <item row="3" column="0">
-          <widget class="QLabel" name="replayLabel">
+         <item row="7" column="0">
+          <widget class="QLabel" name="visuLabel">
            <property name="minimumSize">
             <size>
              <width>250</width>
             </size>
            </property>
            <property name="text">
-            <string>Replay gain mode:</string>
+            <string>Visualization:</string>
            </property>
-           <property name="alignment">
-            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           <property name="buddy">
+            <cstring>visualisation</cstring>
            </property>
           </widget>
          </item>
-         <item row="3" column="1" colspan="2">
-          <widget class="QComboBox" name="replayCombo">
+         <item row="7" column="2">
+          <widget class="QComboBox" name="visualisation">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
              <horstretch>0</horstretch>
            </property>
           </widget>
          </item>
-         <item row="4" column="0">
-          <widget class="QLabel" name="visuLabel">
+         <item row="0" column="0">
+          <widget class="QCheckBox" name="autoscaleBox">
+           <property name="text">
+            <string>Enable Time-Stretching audio</string>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="0">
+          <widget class="QLabel" name="dolbyLabel">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="minimumSize">
             <size>
              <width>250</width>
              <height>0</height>
             </size>
            </property>
+           <property name="maximumSize">
+            <size>
+             <width>250</width>
+             <height>16777215</height>
+            </size>
+           </property>
            <property name="text">
-            <string>Visualization:</string>
+            <string>Dolby Surround:</string>
            </property>
            <property name="buddy">
-            <cstring>visualisation</cstring>
+            <cstring>detectionDolby</cstring>
            </property>
           </widget>
          </item>
-         <item row="4" column="1" colspan="2">
-          <widget class="QComboBox" name="visualisation">
+         <item row="5" column="2">
+          <widget class="QComboBox" name="detectionDolby">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
+           <property name="currentIndex">
+            <number>-1</number>
+           </property>
           </widget>
          </item>
-         <item row="5" column="0">
-          <widget class="QCheckBox" name="headphoneEffect">
+         <item row="4" column="0">
+          <widget class="QLabel" name="replayLabel">
+           <property name="minimumSize">
+            <size>
+             <width>250</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Replay gain mode:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="2">
+          <widget class="QComboBox" name="replayCombo">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="text">
-            <string>Headphone surround effect</string>
-           </property>
           </widget>
          </item>
-         <item row="6" column="0" colspan="2">
-          <widget class="QCheckBox" name="autoscaleBox">
+         <item row="6" column="0">
+          <widget class="QCheckBox" name="headphoneEffect">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="text">
-            <string>Enable Time-Stretching audio</string>
+            <string>Headphone surround effect</string>
            </property>
           </widget>
          </item>
index fbb2140419c032bff50b4c0bfdd9bed6a794fb80..33b485625132a3cbcd3e0a7bf0ee65c10ff77e1d 100644 (file)
       <string>Codecs</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="8" column="0">
-       <widget class="QLabel" name="filterLabel">
-        <property name="minimumSize">
-         <size>
-          <width>250</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Skip H.264 in-loop deblocking filter</string>
-        </property>
-        <property name="buddy">
-         <cstring>loopFilterBox</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="1" colspan="2">
+      <item row="8" column="2">
        <widget class="QComboBox" name="loopFilterBox"/>
       </item>
       <item row="14" column="0">
         </property>
        </widget>
       </item>
+      <item row="12" column="0" colspan="3">
+       <widget class="Line" name="line">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="14" column="2">
+       <widget class="QLineEdit" name="levelBox"/>
+      </item>
+      <item row="14" column="1">
+       <widget class="QComboBox" name="profileBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="0">
+       <widget class="QLabel" name="filterLabel">
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Skip H.264 in-loop deblocking filter</string>
+        </property>
+        <property name="buddy">
+         <cstring>loopFilterBox</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="11" column="0" colspan="3">
+       <widget class="QCheckBox" name="systemCodecBox">
+        <property name="text">
+         <string>Use systems codecs if available, for WMV codecs</string>
+        </property>
+       </widget>
+      </item>
       <item row="2" column="1">
        <widget class="QSpinBox" name="PostProcLevel">
         <property name="maximumSize">
         </property>
        </widget>
       </item>
-      <item row="11" column="0" colspan="2">
-       <widget class="QCheckBox" name="systemCodecBox">
-        <property name="text">
-         <string>Use system codecs if available (better quality, but dangerous)</string>
-        </property>
-       </widget>
-      </item>
-      <item row="12" column="0" colspan="3">
-       <widget class="Line" name="line">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-       </widget>
-      </item>
-      <item row="14" column="2">
-       <widget class="QLineEdit" name="levelBox"/>
-      </item>
-      <item row="14" column="1">
-       <widget class="QComboBox" name="profileBox">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
       <string>Files</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
-      <item row="0" column="0">
-       <widget class="QLabel" name="aviLabel">
-        <property name="text">
-         <string>Damaged or incomplete AVI file</string>
-        </property>
-        <property name="buddy">
-         <cstring>AviRepair</cstring>
-        </property>
-       </widget>
-      </item>
       <item row="1" column="0">
        <widget class="QLabel" name="recordLabel">
         <property name="minimumSize">
         </item>
        </layout>
       </item>
-      <item row="0" column="1">
+      <item row="3" column="0">
+       <widget class="QLabel" name="aviLabel">
+        <property name="text">
+         <string>Damaged or incomplete AVI file</string>
+        </property>
+        <property name="buddy">
+         <cstring>AviRepair</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
        <widget class="QComboBox" name="AviRepair"/>
       </item>
+      <item row="2" column="0" colspan="2">
+       <widget class="Line" name="line_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
       <string>Network</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="portLabel">
-        <property name="minimumSize">
-         <size>
-          <width>250</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Default port (server mode)</string>
-        </property>
-        <property name="margin">
-         <number>0</number>
-        </property>
-        <property name="buddy">
-         <cstring>UDPPort</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
+      <item row="2" column="0">
        <widget class="QLabel" name="httpProxyLabel">
         <property name="text">
          <string>HTTP proxy URL</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
+      <item row="2" column="1">
        <widget class="QLineEdit" name="proxy"/>
       </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Default caching policy</string>
-        </property>
-        <property name="buddy">
-         <cstring>cachingCombo</cstring>
-        </property>
-       </widget>
-      </item>
       <item row="3" column="1">
-       <widget class="QComboBox" name="cachingCombo"/>
-      </item>
-      <item row="2" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QRadioButton" name="live555TransportHTTPRadio">
         </item>
        </layout>
       </item>
-      <item row="2" column="0">
+      <item row="3" column="0">
        <widget class="QLabel" name="live555TransportLabel">
         <property name="text">
          <string>Live555 stream transport</string>
         </property>
        </widget>
       </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Default caching policy</string>
+        </property>
+        <property name="buddy">
+         <cstring>cachingCombo</cstring>
+        </property>
+       </widget>
+      </item>
       <item row="0" column="1">
+       <widget class="QComboBox" name="cachingCombo"/>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="portLabel">
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Default port (server mode)</string>
+        </property>
+        <property name="margin">
+         <number>0</number>
+        </property>
+        <property name="buddy">
+         <cstring>UDPPort</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <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>
         <item>
          <widget class="QSpinBox" name="UDPPort">
           <property name="alignment">
           </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>
      </layout>
  <tabstops>
   <tabstop>DVDDevice</tabstop>
   <tabstop>DVDBrowse</tabstop>
-  <tabstop>AviRepair</tabstop>
   <tabstop>recordPath</tabstop>
   <tabstop>recordBrowse</tabstop>
-  <tabstop>UDPPort</tabstop>
   <tabstop>proxy</tabstop>
   <tabstop>live555TransportHTTPRadio</tabstop>
   <tabstop>live555TransportRTSP_TCPRadio</tabstop>
-  <tabstop>cachingCombo</tabstop>
   <tabstop>hwAccelBox</tabstop>
   <tabstop>loopFilterBox</tabstop>
  </tabstops>
index 230254a04f9753f5667b36ced46a06ef81ec21ce..9964545afb7fb238df8bcc2894c2e853c0086d9f 100644 (file)
@@ -7,8 +7,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>664</width>
-    <height>555</height>
+    <width>697</width>
+    <height>590</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -36,9 +36,6 @@
       <string>Instances</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
-      <property name="verticalSpacing">
-       <number>0</number>
-      </property>
       <property name="leftMargin">
        <number>9</number>
       </property>
@@ -48,6 +45,9 @@
       <property name="bottomMargin">
        <number>9</number>
       </property>
+      <property name="verticalSpacing">
+       <number>0</number>
+      </property>
       <item row="0" column="0">
        <widget class="QCheckBox" name="OneInterfaceMode">
         <property name="text">
             </size>
            </property>
            <property name="text">
-            <string>Activate update notifier</string>
+            <string>Activate updates notifier</string>
            </property>
           </widget>
          </item>
       <string>Look and feel</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QRadioButton" name="qt4">
+        <property name="toolTip">
+         <string>This is VLC's default interface, with a native look and feel.</string>
+        </property>
+        <property name="text">
+         <string>Use native style</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QRadioButton" name="skins">
+        <property name="text">
+         <string>Use custom skin</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
       <item row="2" column="0" rowspan="6" colspan="3">
        <widget class="QStackedWidget" name="styleStackedWidget">
         <property name="currentIndex">
         </widget>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QRadioButton" name="qt4">
-        <property name="toolTip">
-         <string>This is VLC's default interface, with a native look and feel.</string>
-        </property>
-        <property name="text">
-         <string>Use native style</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QRadioButton" name="skins">
-        <property name="text">
-         <string>Use custom skin</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <spacer name="horizontalSpacer">
-        <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>
     </widget>
    </item>
index d37b04e8a06799b8baae2ca84af3821e24719447..cc2b3149680c7c55dd39edbd5aa0768f0e5a7835 100644 (file)
@@ -7,7 +7,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>772</width>
+    <width>758</width>
     <height>446</height>
    </rect>
   </property>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
-      <string>Display Settings</string>
+      <string>Subtitles effects</string>
      </property>
      <layout class="QGridLayout" rowstretch="0,0,0,0,0" columnstretch="0,0">
       <item row="3" column="1">
index af9f0e755a399ddfbc6179e1ab963d0a95360a3f..89eb1d657e9725f1abe876701b32ab8783c14a90 100644 (file)
@@ -7,8 +7,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>816</width>
-    <height>626</height>
+    <width>699</width>
+    <height>615</height>
    </rect>
   </property>
   <property name="windowTitle">
         </property>
        </widget>
       </item>
-      <item row="7" column="1" colspan="2">
+      <item row="8" column="1" colspan="2">
        <widget class="QComboBox" name="outputModule">
         <property name="maxVisibleItems">
          <number>15</number>
         </property>
        </widget>
       </item>
-      <item row="7" column="0">
+      <item row="8" column="0">
        <widget class="QLabel" name="voutLabel">
         <property name="text">
          <string>Output</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="2">
-       <widget class="QCheckBox" name="overlay">
+      <item row="2" column="2">
+       <widget class="QCheckBox" name="windowDecorations">
         <property name="text">
-         <string>Accelerated video output (Overlay)</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
+         <string>Window decorations</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
-       <widget class="QCheckBox" name="hwYUVBox">
+      <item row="1" column="0" colspan="2">
+       <widget class="QCheckBox" name="overlay">
         <property name="text">
-         <string>Use hardware YUV-&gt;RGB conversions</string>
+         <string>Accelerated video output (Overlay)</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="2">
-       <widget class="QCheckBox" name="windowDecorations">
+      <item row="1" column="2">
+       <widget class="QCheckBox" name="hwYUVBox">
         <property name="text">
-         <string>Window decorations</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
+         <string>Use hardware YUV-&gt;RGB conversions</string>
         </property>
        </widget>
       </item>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" colspan="2">
+      <item row="0" column="0" colspan="3">
        <widget class="QCheckBox" name="wallpaperMode">
         <property name="text">
          <string>Enable wallpaper mode</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="2" colspan="3">
-       <widget class="QComboBox" name="snapshotsFormat"/>
-      </item>
       <item row="1" column="3" colspan="2">
        <widget class="QCheckBox" name="snapshotsSequentialNumbering">
         <property name="text">
         </property>
        </spacer>
       </item>
+      <item row="2" column="2">
+       <widget class="QComboBox" name="snapshotsFormat"/>
+      </item>
      </layout>
     </widget>
    </item>
  <tabstops>
   <tabstop>enableVideo</tabstop>
   <tabstop>fullscreen</tabstop>
-  <tabstop>overlay</tabstop>
   <tabstop>alwaysOnTop</tabstop>
   <tabstop>windowDecorations</tabstop>
-  <tabstop>hwYUVBox</tabstop>
   <tabstop>outputModule</tabstop>
   <tabstop>wallpaperMode</tabstop>
   <tabstop>dXdisplayDevice</tabstop>
   <tabstop>snapshotsDirectoryBrowse</tabstop>
   <tabstop>snapshotsPrefix</tabstop>
   <tabstop>snapshotsSequentialNumbering</tabstop>
-  <tabstop>snapshotsFormat</tabstop>
-  <tabstop>overlay</tabstop>
  </tabstops>
  <resources/>
  <connections/>