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 @@
<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,21 +25,20 @@
<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>
<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" >
......@@ -47,12 +46,9 @@
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QRadioButton" name="dvdRadioButton" >
<property name="text" >
<string>DVD</string>
</property>
<property name="checked" >
<item row="1" column="1" colspan="2" >
<widget class="QComboBox" name="deviceCombo" >
<property name="editable" >
<bool>true</bool>
</property>
</widget>
......@@ -64,23 +60,17 @@
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label" >
<item row="0" column="0" >
<widget class="QRadioButton" name="dvdRadioButton" >
<property name="text" >
<string>Disk device</string>
<string>DVD</string>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2" >
<widget class="QComboBox" name="deviceCombo" >
<property name="editable" >
<property name="checked" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
......@@ -96,29 +86,28 @@
<property name="title" >
<string>Starting position</string>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
<number>9</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>
<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>
......@@ -134,21 +123,14 @@
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Chapter</string>
<item row="0" column="1" >
<widget class="QSpinBox" name="titleSpin" >
<property name="autoFillBackground" >
<bool>false</bool>
</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>
......@@ -158,10 +140,21 @@
</widget>
</item>
</layout>
</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/>
......
modules/gui/qt4/ui/open_file.ui
View file @ deb83e3b
......@@ -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>
</property>
<property name="spacing" >
<number>6</number>
<item row="2" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<item>
<widget class="QLabel" name="label" >
<property name="text" >
<string>File</string>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</widget>
</spacer>
</item>
<item>
<widget class="QComboBox" name="fileInput" >
<item row="1" column="0" colspan="3" >
<widget class="QGroupBox" name="subGroupBox" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<hsizetype>1</hsizetype>
<vsizetype>5</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>
</item>
<item>
<widget class="QGroupBox" name="subGroupBox" >
<property name="title" >
<string>Use a subtitles file</string>
</property>
......@@ -81,22 +60,21 @@
<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>
</property>
<property name="spacing" >
<number>6</number>
<item row="0" column="4" >
<widget class="QPushButton" name="subBrowseButton" >
<property name="text" >
<string>Browse</string>
</property>
<item>
</widget>
</item>
<item row="0" column="0" colspan="4" >
<widget class="QComboBox" name="subInput" >
<property name="sizePolicy" >
<sizepolicy>
......@@ -111,31 +89,7 @@
</property>
</widget>
</item>
<item>
<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>
<item row="1" column="1" >
<widget class="QComboBox" name="sizeSubComboBox" >
<property name="minimumSize" >
<size>
......@@ -170,7 +124,7 @@
</item>
</widget>
</item>
<item>
<item row="1" column="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
......@@ -183,17 +137,7 @@
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="alignSubLabel" >
<property name="text" >
<string>Alignment:</string>
</property>
<property name="buddy" >
<cstring>alignSubLabel</cstring>
</property>
</widget>
</item>
<item>
<item row="1" column="4" >
<widget class="QComboBox" name="alignSubComboBox" >
<property name="minimumSize" >
<size>
......@@ -227,11 +171,58 @@
</item>
</widget>
</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>
</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/>
......
modules/gui/qt4/ui/open_net.ui
View file @ deb83e3b
......@@ -6,38 +6,36 @@
<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>
</spacer>
</item>
<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" >
......@@ -53,6 +51,9 @@
</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" >
......@@ -60,6 +61,13 @@
</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" >
......@@ -70,12 +78,7 @@
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLineEdit" name="addressText" />
</item>
</layout>
</item>
<item>
<item row="2" column="0" colspan="3" >
<widget class="QGroupBox" name="groupBox_3" >
<property name="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