Qt4 - Tabs Order. Nick Vercammen's patch on open_network.ui is included.

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

diff --git a/modules/gui/qt4/ui/open.ui b/modules/gui/qt4/ui/open.ui
index 427d5107de18d214eb14c6a8a336d5866484fd17..21fc0e68840405a04bffb0c0cec0c7c968bf2a64 100644 (file)
--- a/modules/gui/qt4/ui/open.ui
+++ b/modules/gui/qt4/ui/open.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>440</width>
-    <height>231</height>
+    <width>448</width>
+    <height>300</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -32,6 +32,9 @@
    </item>
    <item>
     <widget class="QCheckBox" name="advancedCheckBox" >
+     <property name="toolTip" >
+      <string>Show extended options</string>
+     </property>
      <property name="text" >
       <string>Show &amp;more options</string>
      </property>
@@ -50,113 +53,134 @@
      <property name="frameShape" >
       <enum>QFrame::StyledPanel</enum>
      </property>
-     <layout class="QHBoxLayout" >
+     <layout class="QGridLayout" >
       <property name="margin" >
        <number>9</number>
       </property>
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item>
-       <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>0</number>
+      <item row="0" column="4" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
+         <string>Start Time</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="5" colspan="2" >
+       <widget class="QSpinBox" name="startTimeSpinBox" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight</set>
+        </property>
+        <property name="suffix" >
+         <string> s</string>
+        </property>
+        <property name="maximum" >
+         <number>999999</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="cacheLabel" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>5</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>Caching</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1" colspan="7" >
+       <widget class="QLineEdit" name="advancedLineInput" />
+      </item>
+      <item row="2" column="0" colspan="8" >
+       <widget class="QCheckBox" name="slaveCheckbox" >
+        <property name="text" >
+         <string>Play another media synchronously (extra audio file, ...)</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" colspan="5" >
+       <widget class="Line" name="line" >
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="advancedLabel" >
+        <property name="text" >
+         <string>Customize</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label_2" >
+        <property name="enabled" >
+         <bool>false</bool>
+        </property>
+        <property name="text" >
+         <string>Extra media</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="5" >
+       <widget class="QLineEdit" name="slaveText" >
+        <property name="enabled" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="6" colspan="2" >
+       <widget class="QToolButton" name="slaveBrowseButton" >
+        <property name="enabled" >
+         <bool>false</bool>
+        </property>
+        <property name="text" >
+         <string>Browse...</string>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="5" >
+       <widget class="Line" name="line" >
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
         </property>
-        <item row="0" column="0" >
-         <widget class="QLabel" name="cacheLabel" >
-          <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>5</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text" >
-           <string>Caching</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="1" colspan="3" >
-         <widget class="QLineEdit" name="advancedLineInput" />
-        </item>
-        <item row="4" column="0" >
-         <widget class="QLabel" name="advancedLabel" >
-          <property name="text" >
-           <string>Customize</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="2" >
-         <widget class="QLabel" name="label" >
-          <property name="text" >
-           <string>ms</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0" colspan="4" >
-         <widget class="QCheckBox" name="slaveCheckbox" >
-          <property name="text" >
-           <string>Play another media synchronously (extra audio file, ...)</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="3" >
-         <widget class="QToolButton" name="slaveBrowseButton" >
-          <property name="enabled" >
-           <bool>false</bool>
-          </property>
-          <property name="text" >
-           <string>Browse...</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1" colspan="2" >
-         <widget class="QLineEdit" name="slaveText" >
-          <property name="enabled" >
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0" >
-         <widget class="QLabel" name="label_2" >
-          <property name="enabled" >
-           <bool>false</bool>
-          </property>
-          <property name="text" >
-           <string>Extra media</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1" >
-         <widget class="QSpinBox" name="cacheSpinBox" >
-          <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="alignment" >
-           <set>Qt::AlignRight</set>
-          </property>
-          <property name="maximum" >
-           <number>999999</number>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="1" colspan="2" >
-         <widget class="Line" name="line" >
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-         </widget>
-        </item>
-       </layout>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QSpinBox" name="cacheSpinBox" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight</set>
+        </property>
+        <property name="suffix" >
+         <string> ms</string>
+        </property>
+        <property name="maximum" >
+         <number>999999</number>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
@@ -186,44 +210,12 @@
       </spacer>
      </item>
      <item>
-      <widget class="QToolButton" name="cancelButton" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>7</hsizetype>
-         <vsizetype>1</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text" >
-        <string>&amp;Cancel</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="playButton" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>7</hsizetype>
-         <vsizetype>0</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize" >
-        <size>
-         <width>90</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text" >
-        <string>&amp;Play</string>
-       </property>
-       <property name="popupMode" >
-        <enum>QToolButton::MenuButtonPopup</enum>
+      <widget class="QDialogButtonBox" name="buttonsBox" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
        </property>
-       <property name="toolButtonStyle" >
-        <enum>Qt::ToolButtonTextOnly</enum>
+       <property name="standardButtons" >
+        <set>QDialogButtonBox::NoButton</set>
        </property>
       </widget>
      </item>
@@ -232,11 +224,15 @@
   </layout>
  </widget>
  <tabstops>
+  <tabstop>Tab</tabstop>
+  <tabstop>advancedCheckBox</tabstop>
   <tabstop>cacheSpinBox</tabstop>
+  <tabstop>startTimeSpinBox</tabstop>
+  <tabstop>slaveCheckbox</tabstop>
   <tabstop>advancedLineInput</tabstop>
-  <tabstop>Tab</tabstop>
-  <tabstop>playButton</tabstop>
-  <tabstop>cancelButton</tabstop>
+  <tabstop>slaveText</tabstop>
+  <tabstop>slaveBrowseButton</tabstop>
+  <tabstop>buttonsBox</tabstop>
  </tabstops>
  <resources/>
  <connections>