Qt4 - Small modifications to messages dialog.

diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
index d625a05bb10e8ddb81374bb0626343db73684c5c..57e1c4a56fbad65256d4739a582411311c450b54 100644 (file)
--- a/modules/gui/qt4/dialogs/messages.cpp
+++ b/modules/gui/qt4/dialogs/messages.cpp
@@ -45,12 +45,16 @@ MessagesDialog::MessagesDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
     QPushButton *closeButton = new QPushButton( qtr( "&Close" ) );
     QPushButton *clearButton = new QPushButton( qtr( "&Clear" ) );
     QPushButton *saveLogButton = new QPushButton( qtr( "&Save as..." ) );
+    closeButton->setDefault( true );
+
     verbosityBox = new QSpinBox();
     verbosityBox->setRange( 0, 2 );
     verbosityBox->setValue( config_GetInt( p_intf, "verbose" ) );
     verbosityBox->setWrapping( true );
     verbosityBox->setMaximumWidth( 50 );
+
     QLabel *verbosityLabel = new QLabel(qtr( "Verbosity Level" ) );
+
     messages = new QTextEdit();
     messages->setReadOnly( true );
     messages->setGeometry( 0, 0, 440, 600 );
@@ -142,7 +146,7 @@ void MessagesDialog::updateLog()
 
 void MessagesDialog::close()
 {
-    this->toggleVisible();
+    this->hide();
 }
 
 void MessagesDialog::clear()

diff --git a/modules/gui/qt4/util/qvlcframe.hpp b/modules/gui/qt4/util/qvlcframe.hpp
index 776084f753fedd717576f372a4d1d2fa317036e1..5acbee51a6409d49f3b6cba4734d15666a9c0987 100644 (file)
--- a/modules/gui/qt4/util/qvlcframe.hpp
+++ b/modules/gui/qt4/util/qvlcframe.hpp
@@ -114,17 +114,19 @@ protected:
     {
         hide();
     }
-    void keyPressEvent( QKeyEvent *keyEvent )
+    virtual void keyPressEvent( QKeyEvent *keyEvent )
     {
         if( keyEvent->key() == Qt::Key_Escape )
         {
+            msg_Dbg( p_intf, "Escp Key pressed" );
             cancel();
         }
-        else if( keyEvent->key() == Qt::Key_Enter )
+        else if( keyEvent->key() == Qt::Key_Return )
         {
-            msg_Dbg( p_intf, "Enter Key pressed" );
-            close();
-        }
+             msg_Dbg( p_intf, "Enter Key pressed" );
+             close();
+         }
+
     }
 };
 
@@ -152,16 +154,17 @@ protected:
     {
         hide();
     }
-    void keyPressEvent( QKeyEvent *keyEvent )
+    virtual void keyPressEvent( QKeyEvent *keyEvent )
     {
         if( keyEvent->key() == Qt::Key_Escape )
         {
+            msg_Dbg( p_intf, "Escp Key pressed" );
             cancel();
         }
-        else if( keyEvent->key() == Qt::Key_Enter )
+        else if( keyEvent->key() == Qt::Key_Return )
         {
-            msg_Dbg( p_intf, "Enter Key pressed" );
-            close();
+             msg_Dbg( p_intf, "Enter Key pressed" );
+             close();
         }
     }
 };