vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Feb 23 00:38:21 2009 +0100| [01e557cb91df82859ce133fa27df71a318d979d3] | committer: Jean-Baptiste Kempf
Qt: fix the weird size of the open dialog.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=01e557cb91df82859ce133fa27df71a318d979d3
---
modules/gui/qt4/dialogs/open.cpp | 11 ++++++-----
modules/gui/qt4/ui/open_capture.ui | 4 ++--
modules/gui/qt4/ui/open_file.ui | 6 +++---
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index 89cad1f..003700a 100644
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -88,10 +88,10 @@ OpenDialog::OpenDialog( QWidget *parent,
setWindowTitle( qtr( "Open a Media" ) );
/* Tab definition and creation */
- fileOpenPanel = new FileOpenPanel( ui.Tab, p_intf );
- discOpenPanel = new DiscOpenPanel( ui.Tab, p_intf );
- netOpenPanel = new NetOpenPanel( ui.Tab, p_intf );
- captureOpenPanel = new CaptureOpenPanel( ui.Tab, p_intf );
+ fileOpenPanel = new FileOpenPanel( this, p_intf );
+ discOpenPanel = new DiscOpenPanel( this, p_intf );
+ netOpenPanel = new NetOpenPanel( this, p_intf );
+ captureOpenPanel = new CaptureOpenPanel( this, p_intf );
/* Insert the tabs */
ui.Tab->insertTab( OPEN_FILE_TAB, fileOpenPanel, qtr( "&File" ) );
@@ -179,7 +179,8 @@ OpenDialog::OpenDialog( QWidget *parent,
storedMethod = "";
newCachingMethod( "file-caching" );
- resize( getSettings()->value( "opendialog-size", QSize( 400, 490 ) ).toSize() );
+ setMinimumSize( sizeHint() );
+ resize( getSettings()->value( "opendialog-size", QSize( 500, 490 ) ).toSize() );
}
OpenDialog::~OpenDialog()
diff --git a/modules/gui/qt4/ui/open_capture.ui b/modules/gui/qt4/ui/open_capture.ui
index 37b433e..a8a0a37 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>365</width>
- <height>129</height>
+ <width>392</width>
+ <height>134</height>
</rect>
</property>
<layout class="QGridLayout" >
diff --git a/modules/gui/qt4/ui/open_file.ui b/modules/gui/qt4/ui/open_file.ui
index c7faba3..769e980 100644
--- a/modules/gui/qt4/ui/open_file.ui
+++ b/modules/gui/qt4/ui/open_file.ui
@@ -6,12 +6,12 @@
<rect>
<x>0</x>
<y>0</y>
- <width>519</width>
- <height>282</height>
+ <width>571</width>
+ <height>271</height>
</rect>
</property>
<property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
+ <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>