Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
5364ae67
Commit
5364ae67
authored
Dec 01, 2006
by
Rafaël Carré
Browse files
Simplification of Advanced Open
Control & Playback buttons have the same size
parent
32616498
Changes
9
Hide whitespace changes
Inline
Side-by-side
modules/gui/qt4/components/open.cpp
View file @
5364ae67
...
...
@@ -41,9 +41,7 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
OpenPanel
(
_parent
,
_p_intf
)
{
ui
.
setupUi
(
this
);
ui
.
audioGroupBox
->
hide
();
BUTTONACT
(
ui
.
extraAudioButton
,
toggleExtraAudio
()
);
BUTTONACT
(
ui
.
fileBrowseButton
,
browseFile
()
);
BUTTONACT
(
ui
.
subBrowseButton
,
browseFileSub
()
);
BUTTONACT
(
ui
.
audioBrowseButton
,
browseFileAudio
()
);
...
...
@@ -108,18 +106,6 @@ QString FileOpenPanel::getUpdatedMRL()
return
ui
.
fileInput
->
currentText
();
}
void
FileOpenPanel
::
toggleExtraAudio
()
{
if
(
ui
.
audioGroupBox
->
isVisible
())
{
ui
.
audioGroupBox
->
hide
();
}
else
{
ui
.
audioGroupBox
->
show
();
}
}
void
FileOpenPanel
::
clear
()
{
ui
.
fileInput
->
setEditText
(
""
);
...
...
modules/gui/qt4/components/open.hpp
View file @
5364ae67
...
...
@@ -62,7 +62,6 @@ private:
void
updateSubsMRL
();
public
slots
:
virtual
void
sendUpdate
()
;
void
toggleExtraAudio
()
;
void
updateMRL
();
void
browseFile
();
void
browseFileSub
();
...
...
@@ -79,7 +78,7 @@ public:
virtual
~
NetOpenPanel
();
virtual
QString
getUpdatedMRL
();
private:
Ui
::
OpenNet
ui
;
Ui
::
OpenNet
work
ui
;
public
slots
:
virtual
void
sendUpdate
()
;
signals:
...
...
@@ -103,6 +102,4 @@ signals:
};
#endif
modules/gui/qt4/dialogs/open.cpp
View file @
5364ae67
...
...
@@ -39,6 +39,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
{
setWindowTitle
(
qtr
(
"Open"
)
);
ui
.
setupUi
(
this
);
ui
.
vboxLayout
->
setSizeConstraint
(
QLayout
::
SetFixedSize
);
fileOpenPanel
=
new
FileOpenPanel
(
this
,
_p_intf
);
diskOpenPanel
=
new
DiskOpenPanel
(
this
,
_p_intf
);
netOpenPanel
=
new
NetOpenPanel
(
this
,
_p_intf
);
...
...
modules/gui/qt4/main_interface.cpp
View file @
5364ae67
...
...
@@ -164,7 +164,7 @@ void MainInterface::handleMainUi( QSettings *settings )
ui
.
setupUi
(
centralWidget
()
);
slider
=
new
InputSlider
(
Qt
::
Horizontal
,
NULL
);
ui
.
h
boxLayout
->
insertWidget
(
0
,
slider
);
ui
.
v
boxLayout
->
insertWidget
(
0
,
slider
);
ui
.
discFrame
->
hide
();
BUTTON_SET_IMG
(
ui
.
prevSectionButton
,
""
,
previous
.
png
,
""
);
BUTTON_SET_IMG
(
ui
.
nextSectionButton
,
""
,
next
.
png
,
""
);
...
...
modules/gui/qt4/ui/main_interface.ui
View file @
5364ae67
...
...
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>
819
</width>
<height>
384
</height>
<width>
502
</width>
<height>
201
</height>
</rect>
</property>
<property name="sizePolicy" >
...
...
@@ -93,7 +93,7 @@
</property>
<property name="maximumSize" >
<size>
<width>
3
5</width>
<width>
4
5</width>
<height>26</height>
</size>
</property>
...
...
@@ -117,7 +117,7 @@
</property>
<property name="maximumSize" >
<size>
<width>
3
5</width>
<width>
4
5</width>
<height>26</height>
</size>
</property>
...
...
@@ -144,7 +144,7 @@
</property>
<property name="maximumSize" >
<size>
<width>
3
5</width>
<width>
4
5</width>
<height>26</height>
</size>
</property>
...
...
@@ -171,7 +171,7 @@
</property>
<property name="maximumSize" >
<size>
<width>
3
5</width>
<width>
4
5</width>
<height>26</height>
</size>
</property>
...
...
@@ -193,8 +193,8 @@
</property>
<property name="sizeHint" >
<size>
<width>
4
0</width>
<height>2
0
</height>
<width>
8
0</width>
<height>2
7
</height>
</size>
</property>
</spacer>
...
...
@@ -229,6 +229,20 @@
</item>
<item>
<widget class="QPushButton" name="playlistButton" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>4</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize" >
<size>
<width>45</width>
<height>26</height>
</size>
</property>
<property name="text" >
<string/>
</property>
...
...
modules/gui/qt4/ui/open.ui
View file @
5364ae67
...
...
@@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>435</width>
<height>
339
</height>
<height>
441
</height>
</rect>
</property>
<property name="windowTitle" >
...
...
@@ -25,6 +25,20 @@
</property>
<item>
<widget class="QTabWidget" name="Tab" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>417</width>
<height>290</height>
</size>
</property>
<property name="currentIndex" >
<number>-1</number>
</property>
...
...
modules/gui/qt4/ui/open_disk.ui
View file @
5364ae67
...
...
@@ -6,289 +6,149 @@
<rect>
<x>0</x>
<y>0</y>
<width>
569
</width>
<height>2
14
</height>
<width>
448
</width>
<height>2
32
</height>
</rect>
</property>
<property name="windowTitle" >
<string>Form</string>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>9</number>
<widget class="QGroupBox" name="diskTypeGroupBox" >
<property name="geometry" >
<rect>
<x>10</x>
<y>10</y>
<width>391</width>
<height>121</height>
</rect>
</property>
<property name="
spacing
" >
<
number>6</number
>
<property name="
title
" >
<
string>Disc Type</string
>
</property>
<item>
<widget class="QGroupBox" name="diskTypeGroupBox" >
<property name="title" >
<string>Disc Type</string>
<widget class="QWidget" name="layoutWidget" >
<property name="geometry" >
<rect>
<x>10</x>
<y>20</y>
<width>159</width>
<height>85</height>
</rect>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<layout class="QVBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QRadioButton" name="dvdRadioButton" >
<property name="text" >
<string>DVD</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="menuDVDButton" >
<property name="text" >
<string>Show Menus</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QRadioButton" name="vcdRadioButton" >
<property name="text" >
<string>SVCD/VCD</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="audioCDRAdioButton" >
<property name="text" >
<string>Audio CD</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
<widget class="QGroupBox" name="diskOptionGroupBox" >
<property name="geometry" >
<rect>
<x>10</x>
<y>130</y>
<width>391</width>
<height>69</height>
</rect>
</property>
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title" >
<string>Device</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>
9
</number>
<number>
0
</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QRadioButton" name="dvdRadioButton" >
<property name="text" >
<string>DVD</string>
</property>
<property name="checked" >
<widget class="QComboBox" name="diskBrowseLine" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" >
<size>
<width>8</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="menuDVDButton" >
<property name="text" >
<string>Show Menus</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="QRadioButton" name="vcdRadioButton" >
<property name="text" >
<string>SVCD/VCD</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="audioCDRAdioButton" >
<widget class="QPushButton" name="browseDiskButton" >
<property name="text" >
<string>
Audio CD
</string>
<string>
Browse
</string>
</property>
</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>
</item>
<item>
<widget class="QGroupBox" name="diskOptionGroupBox" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title" >
<string>Options</string>
</property>
<layout class="QVBoxLayout" >
<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>
</property>
<item>
<widget class="QLabel" name="pathDiskLabel" >
<property name="text" >
<string>Path:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="diskBrowseLine" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="browseDiskButton" >
<property name="text" >
<string>Browse</string>
</property>
</widget>
</item>
</layout>
</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>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLabel" name="diskOptionsLabel1" >
<property name="text" >
<string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">Entry:</p></body></html></string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="diskOptionBox1" />
</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="diskOptionsLabel2" >
<property name="text" >
<string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">Chapter:</p></body></html></string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="diskOptionBox2" />
</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="diskOptionsLabel3" >
<property name="text" >
<string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">Subtitles:</p></body></html></string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="diskOptionBox3" />
</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="diskOptionsLabel4" >
<property name="text" >
<string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">Audio Channel:</p></body></html></string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="diskOptionBox4" />
</item>
</layout>
</item>
</layout>
</
widget
>
</
item
>
</
layou
t>
</
item
>
</
layout
>
</
widge
t>
</widget>
<resources/>
<connections/>
...
...
modules/gui/qt4/ui/open_file.ui
View file @
5364ae67
...
...
@@ -6,317 +6,144 @@
<rect>
<x>0</x>
<y>0</y>
<width>4
33
</width>
<height>
421
</height>
<width>4
15
</width>
<height>
305
</height>
</rect>
</property>
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>3</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle" >
<string>Form</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
<widget class="QGroupBox" name="fileGroupBox" >
<property name="geometry" >
<rect>
<x>9</x>
<y>9</y>
<width>397</width>
<height>67</height>
</rect>
</property>
<property name="
spacing
" >
<
number>6</number
>
<property name="
title
" >
<
string>Media File</string
>
</property>
<item>
<widget class="QGroupBox" name="fileGroupBox" >
<property name="title" >
<string>Media File</string>
<widget class="QWidget" name="" >
<property name="geometry" >
<rect>
<x>11</x>
<y>28</y>
<width>371</width>
<height>29</height>
</rect>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<layout class="QHBoxLayout" >