From a6423aab59e5a9e280d3c49630e5edf9f1265911 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Tue, 29 Jul 2008 10:43:49 -0700 Subject: [PATCH] Fix Bookmarks: missing button, missing tooltips, wrong resize on startup. --- modules/gui/qt4/dialogs/bookmarks.cpp | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/modules/gui/qt4/dialogs/bookmarks.cpp b/modules/gui/qt4/dialogs/bookmarks.cpp index c4be8e94cb..68f0fa4ff0 100644 --- a/modules/gui/qt4/dialogs/bookmarks.cpp +++ b/modules/gui/qt4/dialogs/bookmarks.cpp @@ -41,10 +41,17 @@ BookmarksDialog::BookmarksDialog( intf_thread_t *_p_intf ):QVLCFrame( _p_intf ) QGridLayout *layout = new QGridLayout( this ); - QPushButton *addButton = new QPushButton( qtr( "Add" ) ); + QPushButton *addButton = new QPushButton( qtr( "Create" ) ); + addButton->setToolTip( qtr( "Create a new bookmark" ) ); QPushButton *delButton = new QPushButton( qtr( "Delete" ) ); + delButton->setToolTip( qtr( "Delete the selected item" ) ); QPushButton *clearButton = new QPushButton( qtr( "Clear" ) ); + clearButton->setToolTip( qtr( "Delete all the bookmarks" ) ); +#if 0 QPushButton *extractButton = new QPushButton( qtr( "Extract" ) ); + extractButton->setToolTip( qtr() ); +#endif + QPushButton *closeButton = new QPushButton( qtr( "&Close" ) ); bookmarksList = new QTreeWidget( this ); bookmarksList->setRootIsDecorated( false ); @@ -53,6 +60,8 @@ BookmarksDialog::BookmarksDialog( intf_thread_t *_p_intf ):QVLCFrame( _p_intf ) bookmarksList->setSelectionBehavior( QAbstractItemView::SelectRows ); bookmarksList->setEditTriggers( QAbstractItemView::SelectedClicked ); bookmarksList->setColumnCount( 3 ); + bookmarksList->resize( sizeHint() ); + QStringList headerLabels; headerLabels << qtr( "Description" ); headerLabels << qtr( "Bytes" ); @@ -64,18 +73,25 @@ BookmarksDialog::BookmarksDialog( intf_thread_t *_p_intf ):QVLCFrame( _p_intf ) 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 ); - layout->addWidget( bookmarksList, 0, 1, 6, 1); +#endif + layout->addWidget( bookmarksList, 0, 1, 6, 2); layout->setColumnStretch( 1, 1 ); + layout->addWidget( closeButton, 7, 2 ); CONNECT( bookmarksList, activated( QModelIndex ), this, activateItem( QModelIndex ) ); - CONNECT( bookmarksList, itemChanged( QTreeWidgetItem*, int ), this, edit( QTreeWidgetItem*, int ) ); + CONNECT( bookmarksList, itemChanged( QTreeWidgetItem*, int ), + this, edit( QTreeWidgetItem*, int ) ); BUTTONACT( addButton, add() ); BUTTONACT( delButton, del() ); BUTTONACT( clearButton, clear() ); +#if 0 BUTTONACT( extractButton, extract() ); +#endif + BUTTONACT( closeButton, close() ); readSettings( "Bookmarks" ); updateGeometry(); -- 2.39.2