From eb4d5bcf7a0b9e2faaeff42204d3d749915f633c Mon Sep 17 00:00:00 2001 From: Francois Cartegnie Date: Thu, 23 Sep 2010 22:26:43 +0200 Subject: [PATCH] Qt: make extended dialog use standard buttons --- modules/gui/qt4/dialogs/extended.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp index 8e7756515f..b527b4a254 100644 --- a/modules/gui/qt4/dialogs/extended.cpp +++ b/modules/gui/qt4/dialogs/extended.cpp @@ -32,6 +32,7 @@ #include #include +#include #include ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf ) @@ -41,7 +42,7 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf ) setWindowTitle( qtr( "Adjustments and Effects" ) ); setWindowRole( "vlc-extended" ); - QGridLayout *layout = new QGridLayout( this ); + QVBoxLayout *layout = new QVBoxLayout( this ); layout->setContentsMargins( 0, 2, 0, 1 ); layout->setSpacing( 3 ); @@ -84,11 +85,12 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf ) mainTabW->addTab( v4l2, qtr( "v4l2 controls" ) ); } - layout->addWidget( mainTabW, 0, 0, 1, 5 ); + layout->addWidget( mainTabW ); - QPushButton *closeButton = new QPushButton( qtr( "&Close" ) ); - layout->addWidget( closeButton, 1, 4, 1, 1 ); - CONNECT( closeButton, clicked(), this, close() ); + QDialogButtonBox *closeButtonBox = + new QDialogButtonBox( QDialogButtonBox::Close, Qt::Horizontal, this ); + layout->addWidget( closeButtonBox ); + CONNECT( closeButtonBox, rejected(), this, close() ); /* Restore geometry or move this dialog on the left pane of the MI */ if( !restoreGeometry( getSettings()->value("EPanel/geometry").toByteArray() ) ) -- 2.39.2