Merge branch 'master' of git://git.videolan.org/vlc

[vlc] / modules / gui / qt4 / ui / open_disk.ui

diff --git a/modules/gui/qt4/ui/open_disk.ui b/modules/gui/qt4/ui/open_disk.ui
index f3782f6b2a50deea559ce51f4ea603e8d5bd8318..57cb40a3cb578f7b3cb506f622bda236c8084cb9 100644 (file)
--- a/modules/gui/qt4/ui/open_disk.ui
+++ b/modules/gui/qt4/ui/open_disk.ui
@@ -1,213 +1,258 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <author>Jean-Baptiste Kempf</author>
  <class>OpenDisk</class>
- <widget class="QWidget" name="OpenDisk" >
-  <property name="geometry" >
+ <widget class="QWidget" name="OpenDisk">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>500</width>
-    <height>423</height>
+    <height>319</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="minimumSize">
+   <size>
+    <width>500</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QGroupBox" name="diskGroupBox" >
-     <property name="title" >
-      <string>_("Disc selection")</string>
+    <widget class="QGroupBox" name="diskGroupBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Disc Selection</string>
      </property>
-     <layout class="QGridLayout" >
-      <item row="0" column="8" >
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
-          <width>40</width>
-          <height>20</height>
+          <width>16</width>
+          <height>25</height>
          </size>
         </property>
        </spacer>
       </item>
-      <item row="0" column="3" >
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
+      <item row="0" column="1">
+       <widget class="QRadioButton" name="dvdRadioButton">
+        <property name="layoutDirection">
+         <enum>Qt::LeftToRight</enum>
         </property>
-        <property name="sizeHint" >
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
+        <property name="text">
+         <string>DVD</string>
         </property>
-       </spacer>
-      </item>
-      <item row="3" column="2" colspan="5" >
-       <widget class="QComboBox" name="deviceCombo" >
-        <property name="editable" >
+        <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="3" column="8" >
-       <widget class="QPushButton" name="browseDiscButton" >
-        <property name="toolTip" >
-         <string>_("Select the device or the VIDEO_TS folder")</string>
-        </property>
-        <property name="text" >
-         <string>_("Browse...")</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="2" >
-       <widget class="QLabel" name="deviceLabel" >
-        <property name="text" >
-         <string>_("Disk device")</string>
-        </property>
-        <property name="buddy" >
-         <cstring>deviceCombo</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="6" >
-       <widget class="QRadioButton" name="audioCDRadioButton" >
-        <property name="text" >
-         <string>_("Audio CD")</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" colspan="2" >
-       <widget class="QRadioButton" name="dvdRadioButton" >
-        <property name="layoutDirection" >
-         <enum>Qt::LeftToRight</enum>
-        </property>
-        <property name="text" >
-         <string>DVD</string>
+      <item row="0" column="2">
+       <spacer>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
         </property>
-        <property name="checked" >
-         <bool>true</bool>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>20</height>
+         </size>
         </property>
-       </widget>
+       </spacer>
       </item>
-      <item row="0" column="4" >
-       <widget class="QRadioButton" name="vcdRadioButton" >
-        <property name="text" >
-         <string>SVCD/VCD</string>
+      <item row="0" column="3">
+       <widget class="QRadioButton" name="audioCDRadioButton">
+        <property name="text">
+         <string>Audio CD</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="5" >
+      <item row="0" column="4">
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
-          <width>40</width>
+          <width>20</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
-      <item row="2" column="1" colspan="6" >
-       <widget class="Line" name="line" >
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
+      <item row="0" column="5">
+       <widget class="QRadioButton" name="vcdRadioButton">
+        <property name="text">
+         <string>SVCD/VCD</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
+      <item row="0" column="6">
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
-          <width>21</width>
-          <height>20</height>
+          <width>31</width>
+          <height>25</height>
          </size>
         </property>
        </spacer>
       </item>
-      <item row="1" column="1" colspan="3" >
-       <widget class="QCheckBox" name="dvdsimple" >
-        <property name="toolTip" >
-         <string>_("Disable DVD Menus (for compatibility)")</string>
+      <item row="1" column="1" colspan="3">
+       <widget class="QCheckBox" name="dvdsimple">
+        <property name="toolTip">
+         <string>Disable DVD Menus (for compatibility)</string>
         </property>
-        <property name="text" >
-         <string>_("No DVD Menus")</string>
+        <property name="text">
+         <string>No DVD menus</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="7" >
-       <widget class="QToolButton" name="ejectButton" >
-        <property name="text" >
-         <string>E</string>
+      <item row="2" column="2" colspan="5">
+       <widget class="Line" name="line">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
+      <item row="3" column="0" colspan="7">
+       <layout class="QHBoxLayout" name="horizontalLayout_5">
+        <item>
+         <widget class="QLabel" name="deviceLabel">
+          <property name="text">
+           <string>Disc device</string>
+          </property>
+          <property name="buddy">
+           <cstring>deviceCombo</cstring>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="deviceCombo">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="editable">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="ejectButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="browseDiscButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Browse...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
      </layout>
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="diskOptionBox" >
-     <property name="title" >
-      <string>_("Starting position")</string>
+    <widget class="QGroupBox" name="diskOptionBox">
+     <property name="title">
+      <string>Starting Position</string>
      </property>
-     <layout class="QGridLayout" >
-      <item row="1" column="0" >
-       <widget class="QLabel" name="chapterLabel" >
-        <property name="text" >
-         <string>_("Chapter")</string>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QLabel" name="titleLabel">
+        <property name="text">
+         <string>Title</string>
+        </property>
+        <property name="buddy">
+         <cstring>titleSpin</cstring>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <widget class="QSpinBox" name="chapterSpin" >
-        <property name="alignment" >
-         <set>Qt::AlignRight</set>
-        </property>
-        <property name="suffix" >
-         <string/>
-        </property>
-        <property name="prefix" >
-         <string/>
+      <item>
+       <widget class="QSpinBox" name="titleSpin">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="autoFillBackground">
+         <bool>false</bool>
         </property>
-        <property name="minimum" >
-         <number>0</number>
+        <property name="alignment">
+         <set>Qt::AlignRight</set>
         </property>
-        <property name="value" >
+        <property name="value">
          <number>0</number>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="titleLabel" >
-        <property name="text" >
-         <string>_("Title")</string>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
         </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QSpinBox" name="titleSpin" >
-        <property name="autoFillBackground" >
-         <bool>false</bool>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
         </property>
-        <property name="alignment" >
-         <set>Qt::AlignRight</set>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>20</height>
+         </size>
         </property>
-        <property name="suffix" >
-         <string/>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLabel" name="chapterLabel">
+        <property name="text">
+         <string>Chapter</string>
         </property>
-        <property name="minimum" >
-         <number>0</number>
+        <property name="buddy">
+         <cstring>chapterSpin</cstring>
         </property>
-        <property name="value" >
-         <number>0</number>
+       </widget>
+      </item>
+      <item>
+       <widget class="QSpinBox" name="chapterSpin">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight</set>
         </property>
        </widget>
       </item>
@@ -215,65 +260,93 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="diskOptionBox_2" >
-     <property name="title" >
-      <string>_("Audio and Subtitles")</string>
+    <widget class="QGroupBox" name="diskOptionBox_2">
+     <property name="title">
+      <string>Audio and Subtitles</string>
      </property>
-     <layout class="QGridLayout" >
-      <item row="1" column="0" >
-       <widget class="QLabel" name="audioLabel" >
-        <property name="text" >
-         <string>_("Audio track")</string>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="audioLabel">
+        <property name="text">
+         <string>Audio track</string>
+        </property>
+        <property name="buddy">
+         <cstring>audioSpin</cstring>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <widget class="QSpinBox" name="audioSpin" >
-        <property name="alignment" >
+      <item row="0" column="1">
+       <widget class="QSpinBox" name="audioSpin">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="alignment">
          <set>Qt::AlignRight</set>
         </property>
-        <property name="suffix" >
-         <string/>
-        </property>
-        <property name="prefix" >
-         <string/>
-        </property>
-        <property name="minimum" >
+        <property name="minimum">
          <number>-1</number>
         </property>
-        <property name="maximum" >
-         <number>7</number>
+        <property name="maximum">
+         <number>10</number>
         </property>
-        <property name="value" >
+        <property name="value">
          <number>-1</number>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="subtitlesLabel" >
-        <property name="text" >
-         <string>_("Subtitles track")</string>
+      <item row="0" column="2">
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="3">
+       <widget class="QLabel" name="subtitlesLabel">
+        <property name="text">
+         <string>Subtitles track</string>
+        </property>
+        <property name="buddy">
+         <cstring>subtitlesSpin</cstring>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QSpinBox" name="subtitlesSpin" >
-        <property name="autoFillBackground" >
+      <item row="0" column="4">
+       <widget class="QSpinBox" name="subtitlesSpin">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="autoFillBackground">
          <bool>false</bool>
         </property>
-        <property name="alignment" >
+        <property name="alignment">
          <set>Qt::AlignRight</set>
         </property>
-        <property name="suffix" >
+        <property name="suffix">
          <string/>
         </property>
-        <property name="minimum" >
+        <property name="minimum">
          <number>-1</number>
         </property>
-        <property name="maximum" >
+        <property name="maximum">
          <number>31</number>
         </property>
-        <property name="value" >
+        <property name="value">
          <number>-1</number>
         </property>
        </widget>
@@ -283,16 +356,16 @@
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
-       <width>444</width>
-       <height>10</height>
+       <width>181</width>
+       <height>0</height>
       </size>
      </property>
     </spacer>
@@ -301,10 +374,12 @@
  </widget>
  <tabstops>
   <tabstop>dvdRadioButton</tabstop>
-  <tabstop>vcdRadioButton</tabstop>
   <tabstop>audioCDRadioButton</tabstop>
+  <tabstop>vcdRadioButton</tabstop>
   <tabstop>dvdsimple</tabstop>
   <tabstop>deviceCombo</tabstop>
+  <tabstop>ejectButton</tabstop>
+  <tabstop>browseDiscButton</tabstop>
   <tabstop>titleSpin</tabstop>
   <tabstop>chapterSpin</tabstop>
   <tabstop>subtitlesSpin</tabstop>