[vlc-devel] commit: Qt: make open dialog modal. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: 1.0-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jun 25 12:17:17 2009 +0200| [d87b24615381cc830267c94b2ea7f9d9ee085dbf] | committer: Jean-Baptiste Kempf 

Qt: make open dialog modal.

This ensure consistency with simple Open.
Moreover, with those KDE effects, this is cool.
(cherry picked from commit d2bf95488661a01ac0b8c6b91320b56021acbc35)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d87b24615381cc830267c94b2ea7f9d9ee085dbf
---

 modules/gui/qt4/dialogs/open.cpp |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index c27d260..ec4fe8e 100644
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -51,14 +51,11 @@ OpenDialog* OpenDialog::getInstance( QWidget *parent, intf_thread_t *p_intf,
     else if( !b_rawInstance )
     {
         /* Request the instance but change small details:
-           - Button menu
-           - Modality on top of the parent dialog */
+           - Button menu */
         if( b_selectMode )
-        {
-            instance->setWindowModality( Qt::WindowModal );
             _action_flag = SELECT; /* This should be useless, but we never know
                                       if the call is correct */
-        }
+        instance->setWindowModality( Qt::WindowModal );
         instance->i_action_flag = _action_flag;
         instance->b_pl = _b_pl;
         instance->setMenuAction();
@@ -76,14 +73,12 @@ OpenDialog::OpenDialog( QWidget *parent,
     b_pl =_b_pl;
 
     if( b_selectMode ) /* Select mode */
-    {
         i_action_flag = SELECT;
-        setWindowModality( Qt::WindowModal );
-    }
 
     /* Basic Creation of the Window */
     ui.setupUi( this );
     setWindowTitle( qtr( "Open Media" ) );
+    setWindowModality( Qt::WindowModal );
 
     /* Tab definition and creation */
     fileOpenPanel    = new FileOpenPanel( this, p_intf );