Qt4: Back on open dialog: rewrite the UIs to have consistent forms on resize.

May need a few more vertical spacer, after the last tab (Capture) will be added.

diff --git a/modules/gui/qt4/ui/open_disk.ui b/modules/gui/qt4/ui/open_disk.ui
index 80fa27a088eae423dd4f07a5e200e93530167361..2166c0daa36ba42721282fd9b8b1053123c41c86 100644 (file)
--- a/modules/gui/qt4/ui/open_disk.ui
+++ b/modules/gui/qt4/ui/open_disk.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>448</width>
-    <height>275</height>
+    <width>487</width>
+    <height>254</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -25,60 +25,50 @@
      <property name="title" >
       <string>Disc selection</string>
      </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>
-        </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <item row="0" column="1" >
-         <widget class="QRadioButton" name="vcdRadioButton" >
-          <property name="text" >
-           <string>SVCD/VCD</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0" >
-         <widget class="QRadioButton" name="dvdRadioButton" >
-          <property name="text" >
-           <string>DVD</string>
-          </property>
-          <property name="checked" >
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="2" >
-         <widget class="QRadioButton" name="audioCDRadioButton" >
-          <property name="text" >
-           <string>Audio CD</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0" >
-         <widget class="QLabel" name="label" >
-          <property name="text" >
-           <string>Disk device</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1" colspan="2" >
-         <widget class="QComboBox" name="deviceCombo" >
-          <property name="editable" >
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Disk device</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QRadioButton" name="vcdRadioButton" >
+        <property name="text" >
+         <string>SVCD/VCD</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="QComboBox" name="deviceCombo" >
+        <property name="editable" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QRadioButton" name="audioCDRadioButton" >
+        <property name="text" >
+         <string>Audio CD</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QRadioButton" name="dvdRadioButton" >
+        <property name="text" >
+         <string>DVD</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
@@ -96,72 +86,75 @@
      <property name="title" >
       <string>Starting position</string>
      </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>
-        </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <item row="0" column="1" >
-         <widget class="QSpinBox" name="titleSpin" >
-          <property name="autoFillBackground" >
-           <bool>false</bool>
-          </property>
-          <property name="suffix" >
-           <string/>
-          </property>
-          <property name="minimum" >
-           <number>-1</number>
-          </property>
-          <property name="value" >
-           <number>-1</number>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0" >
-         <widget class="QLabel" name="label_2" >
-          <property name="text" >
-           <string>Title</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0" >
-         <widget class="QLabel" name="label_3" >
-          <property name="text" >
-           <string>Chapter</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1" >
-         <widget class="QSpinBox" name="chapterSpin" >
-          <property name="suffix" >
-           <string/>
-          </property>
-          <property name="prefix" >
-           <string/>
-          </property>
-          <property name="minimum" >
-           <number>-1</number>
-          </property>
-          <property name="value" >
-           <number>-1</number>
-          </property>
-         </widget>
-        </item>
-       </layout>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
+         <string>Chapter</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QSpinBox" name="chapterSpin" >
+        <property name="suffix" >
+         <string/>
+        </property>
+        <property name="prefix" >
+         <string/>
+        </property>
+        <property name="minimum" >
+         <number>-1</number>
+        </property>
+        <property name="value" >
+         <number>-1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Title</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QSpinBox" name="titleSpin" >
+        <property name="autoFillBackground" >
+         <bool>false</bool>
+        </property>
+        <property name="suffix" >
+         <string/>
+        </property>
+        <property name="minimum" >
+         <number>-1</number>
+        </property>
+        <property name="value" >
+         <number>-1</number>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
    </item>
+   <item>
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>

diff --git a/modules/gui/qt4/ui/open_file.ui b/modules/gui/qt4/ui/open_file.ui
index 6500238a00a87a227300b02113cdd9555a401cfd..b7ae83784d356e1aa2d455979f27697dd0b282cc 100644 (file)
--- a/modules/gui/qt4/ui/open_file.ui
+++ b/modules/gui/qt4/ui/open_file.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>487</width>
-    <height>151</height>
+    <height>181</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -21,57 +21,36 @@
   <property name="windowTitle" >
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QGridLayout" >
    <property name="margin" >
     <number>9</number>
    </property>
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="2" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
      </property>
-     <item>
-      <widget class="QLabel" name="label" >
-       <property name="text" >
-        <string>File</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="fileInput" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>7</hsizetype>
-         <vsizetype>0</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="editable" >
-        <bool>true</bool>
-       </property>
-       <property name="maxVisibleItems" >
-        <number>7</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="fileBrowseButton" >
-       <property name="text" >
-        <string>Browse</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    </spacer>
    </item>
-   <item>
+   <item row="1" column="0" colspan="3" >
     <widget class="QGroupBox" name="subGroupBox" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>1</hsizetype>
+       <vsizetype>5</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="title" >
       <string>Use a subtitles file</string>
      </property>
@@ -81,157 +60,169 @@
      <property name="checked" >
       <bool>false</bool>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QGridLayout" >
       <property name="margin" >
        <number>9</number>
       </property>
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item>
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
+      <item row="0" column="4" >
+       <widget class="QPushButton" name="subBrowseButton" >
+        <property name="text" >
+         <string>Browse</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="4" >
+       <widget class="QComboBox" name="subInput" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>7</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="editable" >
+         <bool>true</bool>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QComboBox" name="sizeSubComboBox" >
+        <property name="minimumSize" >
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
         </property>
         <item>
-         <widget class="QComboBox" name="subInput" >
-          <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>7</hsizetype>
-            <vsizetype>0</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="editable" >
-           <bool>true</bool>
-          </property>
-         </widget>
+         <property name="text" >
+          <string>Very Small</string>
+         </property>
         </item>
         <item>
-         <widget class="QPushButton" name="subBrowseButton" >
-          <property name="text" >
-           <string>Browse</string>
-          </property>
-         </widget>
+         <property name="text" >
+          <string>Small</string>
+         </property>
         </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
         <item>
-         <widget class="QLabel" name="sizeSubLabel" >
-          <property name="text" >
-           <string>Size:</string>
-          </property>
-         </widget>
+         <property name="text" >
+          <string>Normal</string>
+         </property>
         </item>
         <item>
-         <widget class="QComboBox" name="sizeSubComboBox" >
-          <property name="minimumSize" >
-           <size>
-            <width>100</width>
-            <height>0</height>
-           </size>
-          </property>
-          <item>
-           <property name="text" >
-            <string>Very Small</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>Small</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>Normal</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>Big</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>Very Big</string>
-           </property>
-          </item>
-         </widget>
+         <property name="text" >
+          <string>Big</string>
+         </property>
         </item>
         <item>
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
+         <property name="text" >
+          <string>Very Big</string>
+         </property>
         </item>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="4" >
+       <widget class="QComboBox" name="alignSubComboBox" >
+        <property name="minimumSize" >
+         <size>
+          <width>80</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="currentIndex" >
+         <number>0</number>
+        </property>
+        <property name="insertPolicy" >
+         <enum>QComboBox::NoInsert</enum>
+        </property>
+        <property name="minimumContentsLength" >
+         <number>0</number>
+        </property>
         <item>
-         <widget class="QLabel" name="alignSubLabel" >
-          <property name="text" >
-           <string>Alignment:</string>
-          </property>
-          <property name="buddy" >
-           <cstring>alignSubLabel</cstring>
-          </property>
-         </widget>
+         <property name="text" >
+          <string>Left</string>
+         </property>
         </item>
         <item>
-         <widget class="QComboBox" name="alignSubComboBox" >
-          <property name="minimumSize" >
-           <size>
-            <width>80</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="currentIndex" >
-           <number>0</number>
-          </property>
-          <property name="insertPolicy" >
-           <enum>QComboBox::NoInsert</enum>
-          </property>
-          <property name="minimumContentsLength" >
-           <number>0</number>
-          </property>
-          <item>
-           <property name="text" >
-            <string>Left</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>Center</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>Right</string>
-           </property>
-          </item>
-         </widget>
+         <property name="text" >
+          <string>Center</string>
+         </property>
         </item>
-       </layout>
+        <item>
+         <property name="text" >
+          <string>Right</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="sizeSubLabel" >
+        <property name="text" >
+         <string>Size:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3" >
+       <widget class="QLabel" name="alignSubLabel" >
+        <property name="text" >
+         <string>Alignment:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>alignSubLabel</cstring>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
    </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>File</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2" >
+    <widget class="QPushButton" name="fileBrowseButton" >
+     <property name="text" >
+      <string>Browse</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QComboBox" name="fileInput" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>7</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="editable" >
+      <bool>true</bool>
+     </property>
+     <property name="maxVisibleItems" >
+      <number>7</number>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>

diff --git a/modules/gui/qt4/ui/open_net.ui b/modules/gui/qt4/ui/open_net.ui
index 0edbf4398b9fef2649a0abf9c11ea9d2f3b08f56..72cd9675b15dc709c22125edc3e4f8258520226f 100644 (file)
--- a/modules/gui/qt4/ui/open_net.ui
+++ b/modules/gui/qt4/ui/open_net.ui
@@ -6,76 +6,79 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>445</width>
-    <height>217</height>
+    <width>487</width>
+    <height>165</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <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="3" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
      </property>
-     <item row="1" column="0" >
-      <widget class="QComboBox" name="protocolCombo" />
-     </item>
-     <item row="0" column="0" >
-      <widget class="QLabel" name="label" >
-       <property name="text" >
-        <string>Protocol</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1" >
-      <widget class="QLabel" name="label_2" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>0</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text" >
-        <string>Address</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="2" >
-      <widget class="QLabel" name="label_4" >
-       <property name="text" >
-        <string>Port</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="2" >
-      <widget class="QSpinBox" name="portSpin" >
-       <property name="maximum" >
-        <number>65535</number>
-       </property>
-       <property name="value" >
-        <number>1234</number>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1" >
-      <widget class="QLineEdit" name="addressText" />
-     </item>
-    </layout>
+    </spacer>
    </item>
-   <item>
+   <item row="1" column="0" >
+    <widget class="QComboBox" name="protocolCombo" />
+   </item>
+   <item row="0" column="1" >
+    <widget class="QLabel" name="label_2" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>Address</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QLineEdit" name="addressText" />
+   </item>
+   <item row="0" column="2" >
+    <widget class="QLabel" name="label_4" >
+     <property name="text" >
+      <string>Port</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Protocol</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2" >
+    <widget class="QSpinBox" name="portSpin" >
+     <property name="maximum" >
+      <number>65535</number>
+     </property>
+     <property name="value" >
+      <number>1234</number>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="3" >
     <widget class="QGroupBox" name="groupBox_3" >
      <property name="sizePolicy" >
       <sizepolicy>