[vlc-devel] commit: Very slight fixes in Open Dialog too. (Jean-Baptiste Kempf )
git version control
git at videolan.org
Sat Mar 15 04:58:18 CET 2008
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Mar 14 20:51:07 2008 -0700| [2d22d0e2f33e7e617a49417418102e3105c038c1]
Very slight fixes in Open Dialog too.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2d22d0e2f33e7e617a49417418102e3105c038c1
---
modules/gui/qt4/ui/open_capture.ui | 6 +-
modules/gui/qt4/ui/open_disk.ui | 136 +++++++++++++++++++----------------
modules/gui/qt4/ui/open_net.ui | 36 ++--------
3 files changed, 84 insertions(+), 94 deletions(-)
diff --git a/modules/gui/qt4/ui/open_capture.ui b/modules/gui/qt4/ui/open_capture.ui
index f52627a..5f9e071 100644
--- a/modules/gui/qt4/ui/open_capture.ui
+++ b/modules/gui/qt4/ui/open_capture.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>314</width>
- <height>147</height>
+ <width>358</width>
+ <height>163</height>
</rect>
</property>
<layout class="QGridLayout" >
@@ -18,7 +18,7 @@
</property>
</widget>
</item>
- <item row="0" column="2" colspan="2">
+ <item row="0" column="2" colspan="2" >
<widget class="QComboBox" name="deviceCombo" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
diff --git a/modules/gui/qt4/ui/open_disk.ui b/modules/gui/qt4/ui/open_disk.ui
index f3782f6..dca975d 100644
--- a/modules/gui/qt4/ui/open_disk.ui
+++ b/modules/gui/qt4/ui/open_disk.ui
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>500</width>
+ <width>537</width>
<height>423</height>
</rect>
</property>
@@ -20,67 +20,20 @@
<string>_("Disc selection")</string>
</property>
<layout class="QGridLayout" >
- <item row="0" column="8" >
- <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="0" column="3" >
+ <item row="0" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
- <width>40</width>
- <height>20</height>
+ <width>16</width>
+ <height>25</height>
</size>
</property>
</spacer>
</item>
- <item row="3" column="2" colspan="5" >
- <widget class="QComboBox" name="deviceCombo" >
- <property name="editable" >
- <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" >
+ <item row="0" column="1" >
<widget class="QRadioButton" name="dvdRadioButton" >
<property name="layoutDirection" >
<enum>Qt::LeftToRight</enum>
@@ -93,6 +46,19 @@
</property>
</widget>
</item>
+ <item row="0" column="2" colspan="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="0" column="4" >
<widget class="QRadioButton" name="vcdRadioButton" >
<property name="text" >
@@ -113,22 +79,22 @@
</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="6" colspan="2" >
+ <widget class="QRadioButton" name="audioCDRadioButton" >
+ <property name="text" >
+ <string>_("Audio CD")</string>
</property>
</widget>
</item>
- <item row="0" column="0" >
+ <item row="0" column="8" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
- <width>21</width>
- <height>20</height>
+ <width>31</width>
+ <height>25</height>
</size>
</property>
</spacer>
@@ -143,13 +109,59 @@
</property>
</widget>
</item>
- <item row="3" column="7" >
+ <item row="2" column="2" colspan="7" >
+ <widget class="Line" name="line" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" colspan="3" >
+ <widget class="QLabel" name="deviceLabel" >
+ <property name="text" >
+ <string>_("Disk device")</string>
+ </property>
+ <property name="buddy" >
+ <cstring>deviceCombo</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="3" colspan="3" >
+ <widget class="QComboBox" name="deviceCombo" >
+ <property name="editable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="6" >
<widget class="QToolButton" name="ejectButton" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Minimum" hsizetype="Fixed" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text" >
<string>E</string>
</property>
</widget>
</item>
+ <item row="3" column="7" colspan="2" >
+ <widget class="QPushButton" name="browseDiscButton" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip" >
+ <string>_("Select the device or the VIDEO_TS folder")</string>
+ </property>
+ <property name="text" >
+ <string>_("Browse...")</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
@@ -291,8 +303,8 @@
</property>
<property name="sizeHint" >
<size>
- <width>444</width>
- <height>10</height>
+ <width>181</width>
+ <height>22</height>
</size>
</property>
</spacer>
diff --git a/modules/gui/qt4/ui/open_net.ui b/modules/gui/qt4/ui/open_net.ui
index c62298f..016ddea 100644
--- a/modules/gui/qt4/ui/open_net.ui
+++ b/modules/gui/qt4/ui/open_net.ui
@@ -6,33 +6,21 @@
<rect>
<x>0</x>
<y>0</y>
- <width>420</width>
- <height>195</height>
+ <width>431</width>
+ <height>233</height>
</rect>
</property>
<property name="windowTitle" >
<string>Form</string>
</property>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
+ <item>
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>_("Network Protocol")</string>
</property>
<layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="1" column="0" >
+ <item row="1" column="0" >
<widget class="QComboBox" name="protocolCombo" >
<property name="toolTip" >
<string>_("Set the protocol for the URL")</string>
@@ -62,9 +50,7 @@
<item row="0" column="1" >
<widget class="QLabel" name="label_2" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>0</vsizetype>
+ <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -94,9 +80,7 @@
<item>
<widget class="QGroupBox" name="groupBox_3" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>0</vsizetype>
+ <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -105,13 +89,7 @@
<string>_("Options")</string>
</property>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
+ <item>
<widget class="QCheckBox" name="timeShift" >
<property name="toolTip" >
<string/>
More information about the vlc-devel
mailing list