Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
9a801558
Commit
9a801558
authored
Mar 27, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix most of the Open Dialog resizing on linux Close #1446
Patch by Lahiru Lakmal Priyadarshana with small modifications.
parent
8c613dbf
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
82 additions
and
62 deletions
+82
-62
modules/gui/qt4/dialogs/open.cpp
modules/gui/qt4/dialogs/open.cpp
+9
-3
modules/gui/qt4/ui/open.ui
modules/gui/qt4/ui/open.ui
+68
-38
modules/gui/qt4/ui/open_file.ui
modules/gui/qt4/ui/open_file.ui
+5
-21
No files found.
modules/gui/qt4/dialogs/open.cpp
View file @
9a801558
...
@@ -70,7 +70,8 @@ OpenDialog::OpenDialog( QWidget *parent,
...
@@ -70,7 +70,8 @@ OpenDialog::OpenDialog( QWidget *parent,
/* Basic Creation of the Window */
/* Basic Creation of the Window */
ui
.
setupUi
(
this
);
ui
.
setupUi
(
this
);
setWindowTitle
(
qtr
(
"Open"
)
);
setWindowTitle
(
qtr
(
"Open"
)
);
resize
(
410
,
300
);
/* resize( 410, 600 ); */
setMinimumSize
(
520
,
460
);
/* Tab definition and creation */
/* Tab definition and creation */
fileOpenPanel
=
new
FileOpenPanel
(
ui
.
Tab
,
p_intf
);
fileOpenPanel
=
new
FileOpenPanel
(
ui
.
Tab
,
p_intf
);
...
@@ -212,13 +213,18 @@ void OpenDialog::toggleAdvancedPanel()
...
@@ -212,13 +213,18 @@ void OpenDialog::toggleAdvancedPanel()
if
(
ui
.
advancedFrame
->
isVisible
()
)
if
(
ui
.
advancedFrame
->
isVisible
()
)
{
{
ui
.
advancedFrame
->
hide
();
ui
.
advancedFrame
->
hide
();
//
FIXME: Clear Bug here. Qt ?
//
setMinimumSize( 520, 460 );
if
(
size
().
isValid
()
)
if
(
size
().
isValid
()
)
resize
(
size
().
width
(),
size
().
height
()
-
ui
.
advancedFrame
->
height
()
);
resize
(
size
().
width
(),
size
().
height
()
-
ui
.
advancedFrame
->
height
()
);
}
}
else
else
{
{
ui
.
advancedFrame
->
show
();
ui
.
advancedFrame
->
show
();
//setMinimumSize( 520, 460 + ui.advancedFrame->height() );
if
(
size
().
isValid
()
)
resize
(
size
().
width
(),
size
().
height
()
+
ui
.
advancedFrame
->
height
()
);
}
}
}
}
...
...
modules/gui/qt4/ui/open.ui
View file @
9a801558
...
@@ -9,31 +9,43 @@
...
@@ -9,31 +9,43 @@
<rect>
<rect>
<x>0</x>
<x>0</x>
<y>0</y>
<y>0</y>
<width>
606
</width>
<width>
520
</width>
<height>
300
</height>
<height>
543
</height>
</rect>
</rect>
</property>
</property>
<property name="sizePolicy" >
<property name="sizePolicy" >
<sizepolicy vsizetype="
Maximum
" hsizetype="Preferred" >
<sizepolicy vsizetype="
Preferred
" hsizetype="Preferred" >
<horstretch>0</horstretch>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
<verstretch>0</verstretch>
</sizepolicy>
</sizepolicy>
</property>
</property>
<property name="minimumSize" >
<size>
<width>400</width>
<height>0</height>
</size>
</property>
<property name="windowTitle" >
<property name="windowTitle" >
<string>Dialog</string>
<string>Dialog</string>
</property>
</property>
<layout class="Q
Grid
Layout" >
<layout class="Q
VBox
Layout" >
<item
row="0" column="0" colspan="3"
>
<item>
<widget class="QTabWidget" name="Tab" >
<widget class="QTabWidget" name="Tab" >
<property name="sizePolicy" >
<property name="sizePolicy" >
<sizepolicy vsizetype="
Fixed" hsizetype="Preferred
" >
<sizepolicy vsizetype="
MinimumExpanding" hsizetype="Expanding
" >
<horstretch>0</horstretch>
<horstretch>0</horstretch>
<verstretch>
0
</verstretch>
<verstretch>
1
</verstretch>
</sizepolicy>
</sizepolicy>
</property>
</property>
<property name="minimumSize" >
<size>
<width>500</width>
<height>400</height>
</size>
</property>
</widget>
</widget>
</item>
</item>
<item
row="1" column="0" colspan="3"
>
<item>
<widget class="QCheckBox" name="advancedCheckBox" >
<widget class="QCheckBox" name="advancedCheckBox" >
<property name="toolTip" >
<property name="toolTip" >
<string>_("Show extended options")</string>
<string>_("Show extended options")</string>
...
@@ -43,7 +55,7 @@
...
@@ -43,7 +55,7 @@
</property>
</property>
</widget>
</widget>
</item>
</item>
<item
row="2" column="0" colspan="3"
>
<item>
<widget class="QFrame" name="advancedFrame" >
<widget class="QFrame" name="advancedFrame" >
<property name="frameShape" >
<property name="frameShape" >
<enum>QFrame::StyledPanel</enum>
<enum>QFrame::StyledPanel</enum>
...
@@ -171,27 +183,24 @@
...
@@ -171,27 +183,24 @@
</layout>
</layout>
</widget>
</widget>
</item>
</item>
<item row="3" column="0" >
<item>
<layout class="QHBoxLayout" >
<property name="spacing" >
<number>0</number>
</property>
<item>
<spacer>
<spacer>
<property name="orientation" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" >
<size>
<size>
<width>151
</width>
<width>40
</width>
<height>20</height>
<height>20</height>
</size>
</size>
</property>
</property>
</spacer>
</spacer>
</item>
</item>
<item row="3" column="1" >
<layout class="QHBoxLayout" >
<property name="spacing" >
<number>0</number>
</property>
<item>
<item>
<widget class="QPushButton" name="menuButton" >
<widget class="QPushButton" name="menuButton" >
<property name="sizePolicy" >
<property name="sizePolicy" >
...
@@ -218,10 +227,16 @@
...
@@ -218,10 +227,16 @@
<widget class="QPushButton" name="playButton" >
<widget class="QPushButton" name="playButton" >
<property name="sizePolicy" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
<sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
<horstretch>
1
</horstretch>
<horstretch>
0
</horstretch>
<verstretch>0</verstretch>
<verstretch>0</verstretch>
</sizepolicy>
</sizepolicy>
</property>
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="text" >
<property name="text" >
<string>Play</string>
<string>Play</string>
</property>
</property>
...
@@ -230,9 +245,7 @@
...
@@ -230,9 +245,7 @@
</property>
</property>
</widget>
</widget>
</item>
</item>
</layout>
<item>
</item>
<item row="3" column="2" >
<widget class="QDialogButtonBox" name="buttonsBox" >
<widget class="QDialogButtonBox" name="buttonsBox" >
<property name="sizePolicy" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
<sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
...
@@ -246,6 +259,24 @@
...
@@ -246,6 +259,24 @@
</widget>
</widget>
</item>
</item>
</layout>
</layout>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>5</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
<tabstops>
<tabstops>
<tabstop>Tab</tabstop>
<tabstop>Tab</tabstop>
...
@@ -258,7 +289,6 @@
...
@@ -258,7 +289,6 @@
<tabstop>slaveBrowseButton</tabstop>
<tabstop>slaveBrowseButton</tabstop>
<tabstop>buttonsBox</tabstop>
<tabstop>buttonsBox</tabstop>
</tabstops>
</tabstops>
<includes/>
<resources/>
<resources/>
<connections>
<connections>
<connection>
<connection>
...
...
modules/gui/qt4/ui/open_file.ui
View file @
9a801558
...
@@ -20,14 +20,14 @@
...
@@ -20,14 +20,14 @@
<string>_("Open File")</string>
<string>_("Open File")</string>
</property>
</property>
<layout class="QGridLayout" >
<layout class="QGridLayout" >
<item row="0" column="0"
colspan="3"
>
<item row="0" column="0" >
<widget class="QWidget" native="1" name="tempWidget" >
<widget class="QWidget" native="1" name="tempWidget" >
<property name="toolTip" >
<property name="toolTip" >
<string>_("Choose one or more media file to open")</string>
<string>_("Choose one or more media file to open")</string>
</property>
</property>
</widget>
</widget>
</item>
</item>
<item row="
2" column="2
" >
<item row="
1" column="0
" >
<spacer>
<spacer>
<property name="orientation" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
<enum>Qt::Vertical</enum>
...
@@ -38,12 +38,12 @@
...
@@ -38,12 +38,12 @@
<property name="sizeHint" >
<property name="sizeHint" >
<size>
<size>
<width>273</width>
<width>273</width>
<height>1
4
</height>
<height>1
6
</height>
</size>
</size>
</property>
</property>
</spacer>
</spacer>
</item>
</item>
<item row="
3" column="0" colspan="2
" >
<item row="
2" column="0
" >
<widget class="QCheckBox" name="subCheckBox" >
<widget class="QCheckBox" name="subCheckBox" >
<property name="toolTip" >
<property name="toolTip" >
<string>_("Add a subtitle file")</string>
<string>_("Add a subtitle file")</string>
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
</property>
</property>
</widget>
</widget>
</item>
</item>
<item row="
4" column="0" colspan="3
" >
<item row="
3" column="0
" >
<widget class="QFrame" name="subFrame" >
<widget class="QFrame" name="subFrame" >
<property name="sizePolicy" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
<sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
...
@@ -185,22 +185,6 @@
...
@@ -185,22 +185,6 @@
</layout>
</layout>
</widget>
</widget>
</item>
</item>
<item row="5" column="0" colspan="3" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>200</width>
<height>2</height>
</size>
</property>
</spacer>
</item>
</layout>
</layout>
</widget>
</widget>
<tabstops>
<tabstops>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment