Skip to content

V
vlc-1.1
Commit deb83e3b authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

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.
parent 63f55615
Show whitespace changes
Inline Side-by-side
Showing with 316 additions and 329 deletions
modules/gui/qt4/ui/open_disk.ui
View file @ deb83e3b
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>448</width> <width>487</width>
<height>275</height> <height>254</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
...@@ -25,21 +25,20 @@ ...@@ -25,21 +25,20 @@
<property name="title" > <property name="title" >
<string>Disc selection</string> <string>Disc selection</string>
</property> </property>
<layout class="QHBoxLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="margin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item> <item row="1" column="0" >
<layout class="QGridLayout" > <widget class="QLabel" name="label" >
<property name="margin" > <property name="text" >
<number>0</number> <string>Disk device</string>
</property>
<property name="spacing" >
<number>6</number>
</property> </property>
</widget>
</item>
<item row="0" column="1" > <item row="0" column="1" >
<widget class="QRadioButton" name="vcdRadioButton" > <widget class="QRadioButton" name="vcdRadioButton" >
<property name="text" > <property name="text" >
...@@ -47,12 +46,9 @@ ...@@ -47,12 +46,9 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="1" column="1" colspan="2" >
<widget class="QRadioButton" name="dvdRadioButton" > <widget class="QComboBox" name="deviceCombo" >
<property name="text" > <property name="editable" >
<string>DVD</string>
</property>
<property name="checked" >
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
...@@ -64,23 +60,17 @@ ...@@ -64,23 +60,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="0" column="0" >
<widget class="QLabel" name="label" > <widget class="QRadioButton" name="dvdRadioButton" >
<property name="text" > <property name="text" >
<string>Disk device</string> <string>DVD</string>
</property> </property>
</widget> <property name="checked" >
</item>
<item row="1" column="1" colspan="2" >
<widget class="QComboBox" name="deviceCombo" >
<property name="editable" >
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
</item> </item>
<item> <item>
...@@ -96,29 +86,28 @@ ...@@ -96,29 +86,28 @@
<property name="title" > <property name="title" >
<string>Starting position</string> <string>Starting position</string>
</property> </property>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="margin" >
<number>0</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="1" > <item row="1" column="0" >
<widget class="QSpinBox" name="titleSpin" > <widget class="QLabel" name="label_3" >
<property name="autoFillBackground" > <property name="text" >
<bool>false</bool> <string>Chapter</string>
</property> </property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QSpinBox" name="chapterSpin" >
<property name="suffix" > <property name="suffix" >
<string/> <string/>
</property> </property>
<property name="prefix" >
<string/>
</property>
<property name="minimum" > <property name="minimum" >
<number>-1</number> <number>-1</number>
</property> </property>
...@@ -134,21 +123,14 @@ ...@@ -134,21 +123,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="0" column="1" >
<widget class="QLabel" name="label_3" > <widget class="QSpinBox" name="titleSpin" >
<property name="text" > <property name="autoFillBackground" >
<string>Chapter</string> <bool>false</bool>
</property> </property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QSpinBox" name="chapterSpin" >
<property name="suffix" > <property name="suffix" >
<string/> <string/>
</property> </property>
<property name="prefix" >
<string/>
</property>
<property name="minimum" > <property name="minimum" >
<number>-1</number> <number>-1</number>
</property> </property>
...@@ -158,10 +140,21 @@ ...@@ -158,10 +140,21 @@
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
</item> </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> </layout>
</widget> </widget>
<resources/> <resources/>
......
modules/gui/qt4/ui/open_file.ui
View file @ deb83e3b
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>487</width> <width>487</width>
<height>151</height> <height>181</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
...@@ -21,57 +21,36 @@ ...@@ -21,57 +21,36 @@
<property name="windowTitle" > <property name="windowTitle" >
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="margin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item> <item row="2" column="1" >
<layout class="QHBoxLayout" > <spacer>
<property name="margin" > <property name="orientation" >
<number>0</number> <enum>Qt::Vertical</enum>
</property>
<property name="spacing" >
<number>6</number>
</property> </property>
<item> <property name="sizeHint" >
<widget class="QLabel" name="label" > <size>
<property name="text" > <width>20</width>
<string>File</string> <height>40</height>
</size>
</property> </property>
</widget> </spacer>
</item> </item>
<item> <item row="1" column="0" colspan="3" >
<widget class="QComboBox" name="fileInput" > <widget class="QGroupBox" name="subGroupBox" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy>
<hsizetype>7</hsizetype> <hsizetype>1</hsizetype>
<vsizetype>0</vsizetype> <vsizetype>5</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </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>
</item>
<item>
<widget class="QGroupBox" name="subGroupBox" >
<property name="title" > <property name="title" >
<string>Use a subtitles file</string> <string>Use a subtitles file</string>
</property> </property>
...@@ -81,22 +60,21 @@ ...@@ -81,22 +60,21 @@
<property name="checked" > <property name="checked" >
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="margin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item> <item row="0" column="4" >
<layout class="QHBoxLayout" > <widget class="QPushButton" name="subBrowseButton" >
<property name="margin" > <property name="text" >
<number>0</number> <string>Browse</string>
</property>
<property name="spacing" >
<number>6</number>
</property> </property>
<item> </widget>
</item>
<item row="0" column="0" colspan="4" >
<widget class="QComboBox" name="subInput" > <widget class="QComboBox" name="subInput" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy>
...@@ -111,31 +89,7 @@ ...@@ -111,31 +89,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="1" >
<widget class="QPushButton" name="subBrowseButton" >
<property name="text" >
<string>Browse</string>
</property>
</widget>
</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>
</item>
<item>
<widget class="QComboBox" name="sizeSubComboBox" > <widget class="QComboBox" name="sizeSubComboBox" >
<property name="minimumSize" > <property name="minimumSize" >
<size> <size>
...@@ -170,7 +124,7 @@ ...@@ -170,7 +124,7 @@
</item> </item>
</widget> </widget>
</item> </item>
<item> <item row="1" column="2" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
...@@ -183,17 +137,7 @@ ...@@ -183,17 +137,7 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item> <item row="1" column="4" >
<widget class="QLabel" name="alignSubLabel" >
<property name="text" >
<string>Alignment:</string>
</property>
<property name="buddy" >
<cstring>alignSubLabel</cstring>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="alignSubComboBox" > <widget class="QComboBox" name="alignSubComboBox" >
<property name="minimumSize" > <property name="minimumSize" >
<size> <size>
...@@ -227,11 +171,58 @@ ...@@ -227,11 +171,58 @@
</item> </item>
</widget> </widget>
</item> </item>
</layout> <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> </item>
</layout> </layout>
</widget> </widget>
</item> </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> </layout>
</widget> </widget>
<resources/> <resources/>
......
modules/gui/qt4/ui/open_net.ui
View file @ deb83e3b
...@@ -6,38 +6,36 @@ ...@@ -6,38 +6,36 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>445</width> <width>487</width>
<height>217</height> <height>165</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="margin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item> <item row="3" column="1" >
<layout class="QGridLayout" > <spacer>
<property name="margin" > <property name="orientation" >
<number>0</number> <enum>Qt::Vertical</enum>
</property> </property>
<property name="spacing" > <property name="sizeHint" >
<number>6</number> <size>
<width>20</width>
<height>40</height>
</size>
</property> </property>
</spacer>
</item>
<item row="1" column="0" > <item row="1" column="0" >
<widget class="QComboBox" name="protocolCombo" /> <widget class="QComboBox" name="protocolCombo" />
</item> </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" > <item row="0" column="1" >
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label_2" >
<property name="sizePolicy" > <property name="sizePolicy" >
...@@ -53,6 +51,9 @@ ...@@ -53,6 +51,9 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" >
<widget class="QLineEdit" name="addressText" />
</item>
<item row="0" column="2" > <item row="0" column="2" >
<widget class="QLabel" name="label_4" > <widget class="QLabel" name="label_4" >
<property name="text" > <property name="text" >
...@@ -60,6 +61,13 @@ ...@@ -60,6 +61,13 @@
</property> </property>
</widget> </widget>
</item> </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" > <item row="1" column="2" >
<widget class="QSpinBox" name="portSpin" > <widget class="QSpinBox" name="portSpin" >
<property name="maximum" > <property name="maximum" >
...@@ -70,12 +78,7 @@ ...@@ -70,12 +78,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="2" column="0" colspan="3" >
<widget class="QLineEdit" name="addressText" />
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="groupBox_3" > <widget class="QGroupBox" name="groupBox_3" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment