From d3100ba4173d0881e411f18eddb594f69a87ab79 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Thu, 5 Apr 2007 21:45:51 +0000 Subject: [PATCH] Qt4 - Update Preferences buttons to please any OS/DE. --- modules/gui/qt4/dialogs/preferences.cpp | 19 +++++++++++-------- modules/gui/qt4/dialogs/preferences.hpp | 3 +-- modules/gui/qt4/util/qvlcframe.hpp | 8 ++++++++ 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/modules/gui/qt4/dialogs/preferences.cpp b/modules/gui/qt4/dialogs/preferences.cpp index 1b9a9968bd..13a0f076ba 100644 --- a/modules/gui/qt4/dialogs/preferences.cpp +++ b/modules/gui/qt4/dialogs/preferences.cpp @@ -38,7 +38,7 @@ #include #include #include - +#include PrefsDialog *PrefsDialog::instance = NULL; @@ -85,14 +85,17 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) setSmall(); - QPushButton *save, *cancel, *reset; - QHBoxLayout *buttonsLayout = QVLCFrame::doButtons( this, NULL, - &save, _("Save"), - &cancel, _("Cancel"), - &reset, _( "Reset Preferences" ) ); - main_layout->addLayout( buttonsLayout, 4, 0, 1 ,3 ); - setLayout( main_layout ); + QDialogButtonBox *buttonsBox = new QDialogButtonBox(); + QPushButton *save = new QPushButton( qtr( "&Save" ) ); + QPushButton *cancel = new QPushButton( qtr( "&Cancel" ) ); + QPushButton *reset = new QPushButton( qtr( "&Reset Preferences" ) ); + buttonsBox->addButton( save, QDialogButtonBox::AcceptRole ); + buttonsBox->addButton( cancel, QDialogButtonBox::RejectRole ); + buttonsBox->addButton( reset, QDialogButtonBox::ActionRole ); + + main_layout->addWidget( buttonsBox, 4, 0, 1 ,3 ); + setLayout( main_layout ); BUTTONACT( save, save() ); BUTTONACT( cancel, cancel() ); diff --git a/modules/gui/qt4/dialogs/preferences.hpp b/modules/gui/qt4/dialogs/preferences.hpp index e43256dfcb..dd3cc22581 100644 --- a/modules/gui/qt4/dialogs/preferences.hpp +++ b/modules/gui/qt4/dialogs/preferences.hpp @@ -75,8 +75,6 @@ private: QGridLayout *main_layout; -// QLabel *panel_label; - static PrefsDialog *instance; private slots: void changePanel( QTreeWidgetItem * ); @@ -86,6 +84,7 @@ private slots: void save(); void cancel(); void reset(); + void close(){ save(); }; }; #endif diff --git a/modules/gui/qt4/util/qvlcframe.hpp b/modules/gui/qt4/util/qvlcframe.hpp index de2cc6ea92..1bf5ee8445 100644 --- a/modules/gui/qt4/util/qvlcframe.hpp +++ b/modules/gui/qt4/util/qvlcframe.hpp @@ -110,12 +110,20 @@ protected: { hide(); } + void close() + { + hide(); + } void keyPressEvent( QKeyEvent *keyEvent ) { if( keyEvent->key() == Qt::Key_Escape ) { cancel(); } + else if( keyEvent->key() == Qt::Key_Enter ) + { + close(); + } } }; -- 2.20.1