From da688a422ec94e342467f102c3361c0be3d7fd44 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Mon, 20 Mar 2017 18:44:46 +0100 Subject: Dockable DownloadsWidget --- src/forms/bookmarkswidget.cpp | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) (limited to 'src/forms/bookmarkswidget.cpp') diff --git a/src/forms/bookmarkswidget.cpp b/src/forms/bookmarkswidget.cpp index ee945cb..63062a2 100644 --- a/src/forms/bookmarkswidget.cpp +++ b/src/forms/bookmarkswidget.cpp @@ -23,19 +23,8 @@ #include "browser.h" #include -DockWidget::DockWidget(const QString &title, QWidget *parent, Qt::WindowFlags flags) : - QDockWidget(title, parent, flags) -{ -} - -void DockWidget::closeEvent(QCloseEvent *event) -{ - setParent(0); - event->ignore(); -} - BookmarksWidget::BookmarksWidget(QWidget *parent) : - QWidget(parent), + DockingWidget(tr("Bookmarks"), parent), ui(new Ui::BookmarksDialog) { // make sure this dialog does not get deleted on close @@ -44,11 +33,6 @@ BookmarksWidget::BookmarksWidget(QWidget *parent) : ui->setupUi(this); ui->treeWidget->header()->setSectionResizeMode(QHeaderView::Stretch); - window = nullptr; - dock = new DockWidget(tr("Bookmarks"), 0); - dock->setWidget(this); - dock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - QStyle *style = ui->treeWidget->style(); ui->addFolder_toolButton->setIcon(style->standardPixmap(QStyle::SP_DirIcon)); ui->addBookmark_toolButton->setIcon(style->standardPixmap(QStyle::SP_FileIcon)); @@ -91,17 +75,8 @@ void BookmarksWidget::show() { // show() gets called by a QAction in MainWindow window = qobject_cast(sender()->parent()); - if(window) { - - // dockable widgets - dock->setParent(window); - window->addDockWidget(Qt::RightDockWidgetArea, dock); - - } else { - qWarning("BookmarksWidget not called by MainWindow"); - } - QWidget::show(); + DockingWidget::show(); } void BookmarksWidget::deleteCurrentItem() -- cgit v1.2.1