From 02980eb506e2b624d539a2dfb29bbe1834dd07a0 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Mon, 4 Sep 2017 16:20:09 +0200 Subject: Split off Bookmarks into static lib --- src/forms/bookmarksform.ui | 104 ---------------------------------------- src/forms/bookmarkswidget.cpp | 108 ------------------------------------------ src/forms/bookmarkswidget.h | 61 ------------------------ src/forms/profilesdialog.cpp | 2 + 4 files changed, 2 insertions(+), 273 deletions(-) delete mode 100644 src/forms/bookmarksform.ui delete mode 100644 src/forms/bookmarkswidget.cpp delete mode 100644 src/forms/bookmarkswidget.h (limited to 'src/forms') diff --git a/src/forms/bookmarksform.ui b/src/forms/bookmarksform.ui deleted file mode 100644 index 2df0c4b..0000000 --- a/src/forms/bookmarksform.ui +++ /dev/null @@ -1,104 +0,0 @@ - - - BookmarksDialog - - - - 0 - 0 - 420 - 600 - - - - - 420 - 600 - - - - Bookmarks - - - - - - - - ... - - - - - - - ... - - - - - - - ... - - - - - - - ... - - - - - - - - - true - - - QAbstractItemView::InternalMove - - - Qt::MoveAction - - - - Title - - - - - href - - - - - - - - Details - - - - - - href - - - - - - - - - - - - - - - - - diff --git a/src/forms/bookmarkswidget.cpp b/src/forms/bookmarkswidget.cpp deleted file mode 100644 index 9a43224..0000000 --- a/src/forms/bookmarkswidget.cpp +++ /dev/null @@ -1,108 +0,0 @@ -/******************************************************************************* - ** - ** smolbote: yet another qute browser - ** Copyright (C) 2017 Xian Nox - ** - ** This program is free software: you can redistribute it and/or modify - ** it under the terms of the GNU General Public License as published by - ** the Free Software Foundation, either version 3 of the License, or - ** (at your option) any later version. - ** - ** This program is distributed in the hope that it will be useful, - ** but WITHOUT ANY WARRANTY; without even the implied warranty of - ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ** GNU General Public License for more details. - ** - ** You should have received a copy of the GNU General Public License - ** along with this program. If not, see . - ** - ******************************************************************************/ - -#include "bookmarkswidget.h" -#include "ui_bookmarksform.h" -#include "browser.h" -#include - -BookmarksWidget::BookmarksWidget(QWidget *parent) : - DockingWidget(tr("Bookmarks"), parent), - ui(new Ui::BookmarksDialog) -{ - // make sure this dialog does not get deleted on close - setAttribute(Qt::WA_DeleteOnClose, false); - - ui->setupUi(this); - ui->treeWidget->header()->setSectionResizeMode(QHeaderView::Stretch); - - QStyle *style = ui->treeWidget->style(); - ui->addFolder_toolButton->setIcon(style->standardPixmap(QStyle::SP_DirIcon)); - ui->addBookmark_toolButton->setIcon(style->standardPixmap(QStyle::SP_FileIcon)); - ui->addSeparator_toolButton->setText("---"); - ui->deleteItem_toolButton->setIcon(style->standardPixmap(QStyle::SP_TrashIcon)); - - connect(ui->treeWidget, SIGNAL(itemSelectionChanged()), this, SLOT(showItemDetails())); - connect(ui->treeWidget, SIGNAL(itemActivated(QTreeWidgetItem*,int)), this, SLOT(openItem(QTreeWidgetItem*,int))); - - ui->deleteItem_toolButton->setShortcut(QKeySequence::Delete); - connect(ui->deleteItem_toolButton, SIGNAL(clicked(bool)), this, SLOT(deleteCurrentItem())); - - xbel = new Xbel(ui->treeWidget); - xbel->read(sSettings->value("bookmarks.path").toString()); - - connect(ui->addFolder_toolButton, &QToolButton::clicked, [this]() { - xbel->addFolder(ui->treeWidget->currentItem()); - }); - connect(ui->addBookmark_toolButton, &QToolButton::clicked, [this]() { - xbel->addBookmark(ui->treeWidget->currentItem()); - }); - connect(ui->addSeparator_toolButton, &QToolButton::clicked, [this]() { - xbel->addSeparator(ui->treeWidget->currentItem()); - }); -} - -BookmarksWidget::~BookmarksWidget() -{ - qDebug("Destroying BookmarksManager"); - - if(ui->treeWidget->topLevelItemCount() > 0) { - xbel->write(sSettings->value("bookmarks.path").toString()); - } - - delete xbel; - delete ui; -} - -void BookmarksWidget::show() -{ - // show() gets called by a QAction in MainWindow - window = qobject_cast(sender()->parent()); - - DockingWidget::show(); -} - -void BookmarksWidget::deleteCurrentItem() -{ - delete ui->treeWidget->currentItem(); -} - -void BookmarksWidget::openItem(QTreeWidgetItem *item, int column) -{ - Q_UNUSED(column) - - if(window) { - window->newTab(QUrl::fromUserInput(item->text(1))); - } else { - qWarning("Trying to open a link without a MainWindow set"); - } -} - -void BookmarksWidget::showItemDetails() -{ - QTreeWidgetItem *item = ui->treeWidget->currentItem(); - if(!item) { - ui->title_lineEdit->setText(""); - ui->href_label->setText(""); - return; - } - ui->title_lineEdit->setText(item->text(0)); - ui->href_lineEdit->setText(item->text(1)); -} diff --git a/src/forms/bookmarkswidget.h b/src/forms/bookmarkswidget.h deleted file mode 100644 index ba0b361..0000000 --- a/src/forms/bookmarkswidget.h +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************************* - ** - ** smolbote: yet another qute browser - ** Copyright (C) 2017 Xian Nox - ** - ** This program is free software: you can redistribute it and/or modify - ** it under the terms of the GNU General Public License as published by - ** the Free Software Foundation, either version 3 of the License, or - ** (at your option) any later version. - ** - ** This program is distributed in the hope that it will be useful, - ** but WITHOUT ANY WARRANTY; without even the implied warranty of - ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ** GNU General Public License for more details. - ** - ** You should have received a copy of the GNU General Public License - ** along with this program. If not, see . - ** - ******************************************************************************/ - -#ifndef BOOKMARKSDIALOG_H -#define BOOKMARKSDIALOG_H - -#include "widgets/dockingwidget.h" -#include -#include "xbel.h" -#include "mainwindow.h" - -namespace Ui { -class BookmarksDialog; -} - -class BookmarksWidget : public DockingWidget -{ - Q_OBJECT - -public: - explicit BookmarksWidget(QWidget *parent = 0); - ~BookmarksWidget(); - -signals: - void openUrl(const QUrl &url); - -public slots: - void show(); - // void addFolder(const QString &title); - // void addBookmark(const QString &title, const QString &href); - // void addSeparator(); - void deleteCurrentItem(); - -private slots: - void openItem(QTreeWidgetItem *item, int column); - void showItemDetails(); - -private: - MainWindow *window; - Ui::BookmarksDialog *ui; - Xbel *xbel; -}; - -#endif // BOOKMARKSDIALOG_H diff --git a/src/forms/profilesdialog.cpp b/src/forms/profilesdialog.cpp index 557d865..00e4920 100644 --- a/src/forms/profilesdialog.cpp +++ b/src/forms/profilesdialog.cpp @@ -28,6 +28,8 @@ #include #include +#include "mainwindow.h" + ProfilesDialog::ProfilesDialog(MainWindow *window, QWidget *parent) : QDialog(parent), ui(new Ui::ProfilesDialog) -- cgit v1.2.1