From: Jean-Baptiste Kempf Date: Thu, 5 Apr 2007 23:28:04 +0000 (+0000) Subject: Qt4 - Small modifications to messages dialog. X-Git-Tag: 0.9.0-test0~7809 X-Git-Url: https://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=commitdiff_plain;h=3ad0ad05dc172f454c9806709e768c1a07184d1c;hp=19775ff82740cebdb58f4106b078784006c8c9d5 Qt4 - Small modifications to messages dialog. --- diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp index d625a05bb1..57e1c4a56f 100644 --- 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 776084f753..5acbee51a6 100644 --- 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(); } } };