Qt: fix bookmarks dialog

diff --git a/modules/gui/qt4/dialogs/bookmarks.cpp b/modules/gui/qt4/dialogs/bookmarks.cpp
index fb1c85e0fcf27869f9b240d212bffd20bfdf20aa..7fb54ddd308f9cd0f47898e35455ffcbeb5caced 100644 (file)
--- a/modules/gui/qt4/dialogs/bookmarks.cpp
+++ b/modules/gui/qt4/dialogs/bookmarks.cpp
@@ -27,9 +27,10 @@
 #include "dialogs/bookmarks.hpp"
 #include "input_manager.hpp"
 
-#include <QGridLayout>
+#include <QHBoxLayout>
 #include <QSpacerItem>
 #include <QPushButton>
+#include <QDialogButtonBox>
 
 BookmarksDialog::BookmarksDialog( intf_thread_t *_p_intf ):QVLCFrame( _p_intf )
 {
@@ -38,19 +39,26 @@ BookmarksDialog::BookmarksDialog( intf_thread_t *_p_intf ):QVLCFrame( _p_intf )
     setWindowTitle( qtr( "Edit Bookmarks" ) );
     setWindowRole( "vlc-bookmarks" );
 
-    QGridLayout *layout = new QGridLayout( this );
+    QHBoxLayout *layout = new QHBoxLayout( this );
 
+    QDialogButtonBox *buttonsBox = new QDialogButtonBox( Qt::Vertical );
     QPushButton *addButton = new QPushButton( qtr( "Create" ) );
     addButton->setToolTip( qtr( "Create a new bookmark" ) );
+    buttonsBox->addButton( addButton, QDialogButtonBox::ActionRole );
     QPushButton *delButton = new QPushButton( qtr( "Delete" ) );
     delButton->setToolTip( qtr( "Delete the selected item" ) );
+    buttonsBox->addButton( delButton, QDialogButtonBox::ActionRole );
     QPushButton *clearButton = new QPushButton( qtr( "Clear" ) );
     clearButton->setToolTip( qtr( "Delete all the bookmarks" ) );
+    buttonsBox->addButton( clearButton, QDialogButtonBox::ResetRole );
 #if 0
     QPushButton *extractButton = new QPushButton( qtr( "Extract" ) );
     extractButton->setToolTip( qtr() );
+    buttonsBox->addButton( extractButton, QDialogButtonBox::ActionRole );
 #endif
-    QPushButton *closeButton = new QPushButton( qtr( "&Close" ) );
+    /* ?? Feels strange as Qt guidelines will put reject on top */
+    buttonsBox->addButton( new QPushButton( qtr( "&Close" ) ),
+                          QDialogButtonBox::RejectRole);
 
     bookmarksList = new QTreeWidget( this );
     bookmarksList->setRootIsDecorated( false );
@@ -67,17 +75,8 @@ BookmarksDialog::BookmarksDialog( intf_thread_t *_p_intf ):QVLCFrame( _p_intf )
     headerLabels << qtr( "Time" );
     bookmarksList->setHeaderLabels( headerLabels );
 
-
-    layout->addWidget( addButton, 0, 0 );
-    layout->addWidget( delButton, 1, 0 );
-    layout->addWidget( clearButton, 2, 0 );
-    layout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding ), 4, 0 );
-#if 0
-    layout->addWidget( extractButton, 5, 0 );
-#endif
-    layout->addWidget( bookmarksList, 0, 1, 6, 2);
-    layout->setColumnStretch( 1, 1 );
-    layout->addWidget( closeButton, 7, 2 );
+    layout->addWidget( buttonsBox );
+    layout->addWidget( bookmarksList );
 
     CONNECT( THEMIM->getIM(), bookmarksChanged(),
              this, update() );
@@ -93,7 +92,7 @@ BookmarksDialog::BookmarksDialog( intf_thread_t *_p_intf ):QVLCFrame( _p_intf )
 #if 0
     BUTTONACT( extractButton, extract() );
 #endif
-    BUTTONACT( closeButton, close() );
+    CONNECT( buttonsBox, rejected(), this, close() );
 
     readSettings( "Bookmarks", QSize( 435, 280 ) );
     updateGeometry();