From 0d53995507a369d5b4cfddbe365fc8a438fcf3cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Ander=20Pe=C3=B1alba?= Date: Mon, 30 Aug 2010 01:40:33 +0200 Subject: New general panel class created and used by the bookmarks and history panel --- src/CMakeLists.txt | 1 + src/bookmarks/bookmarkspanel.cpp | 107 ++++++++++++------------------------ src/bookmarks/bookmarkspanel.h | 20 +++---- src/history/historypanel.cpp | 94 ++++++++------------------------ src/history/historypanel.h | 27 +++------ src/panels/urlpanel.cpp | 115 +++++++++++++++++++++++++++++++++++++++ src/panels/urlpanel.h | 76 ++++++++++++++++++++++++++ 7 files changed, 269 insertions(+), 171 deletions(-) create mode 100644 src/panels/urlpanel.cpp create mode 100644 src/panels/urlpanel.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 15f0ccac..276a2f25 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,6 +33,7 @@ SET( rekonq_KDEINIT_SRCS zoombar.cpp #---------------------------------------- panels/urlfilterproxymodel.cpp + panels/urlpanel.cpp #---------------------------------------- history/autosaver.cpp history/historymanager.cpp diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp index 53f22232..118074d0 100644 --- a/src/bookmarks/bookmarkspanel.cpp +++ b/src/bookmarks/bookmarkspanel.cpp @@ -28,6 +28,9 @@ // Self Includes #include "bookmarkspanel.h" +// Auto Includes +#include "rekonq.h" + // Local Includes #include "panels/urlfilterproxymodel.h" #include "application.h" @@ -37,27 +40,12 @@ #include "bookmarkowner.h" #include "paneltreeview.h" -// Auto Includes -#include "rekonq.h" - -// Qt includes -#include -#include -#include - -// KDE includes -#include BookmarksPanel::BookmarksPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags) - : QDockWidget(title, parent, flags) - , m_treeView(new PanelTreeView(this)) + : UrlPanel(title, parent, flags) , m_loadingState(false) - , m_loaded(false) { setObjectName("bookmarksPanel"); - setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - - connect(this, SIGNAL(visibilityChanged(bool)), this, SLOT(showing(bool))); setVisible(ReKonfig::showBookmarksPanel()); } @@ -65,14 +53,7 @@ BookmarksPanel::BookmarksPanel(const QString &title, QWidget *parent, Qt::Window BookmarksPanel::~BookmarksPanel() { - ReKonfig::setShowBookmarksPanel(false); -} - - -void BookmarksPanel::showing(bool b) -{ - if(b && !m_loaded) - setup(); + ReKonfig::setShowBookmarksPanel(!isHidden()); } @@ -99,6 +80,24 @@ void BookmarksPanel::contextMenu(const QPoint &pos) } +void BookmarksPanel::contextMenuItem(const QPoint &pos) +{ + contextMenu(pos); +} + + +void BookmarksPanel::contextMenuGroup(const QPoint &pos) +{ + contextMenu(pos); +} + + +void BookmarksPanel::contextMenuEmpty(const QPoint &pos) +{ + contextMenu(pos); +} + + void BookmarksPanel::deleteBookmark() { QModelIndex index = m_treeView->currentIndex(); @@ -131,12 +130,13 @@ void BookmarksPanel::onExpand(const QModelIndex &index) void BookmarksPanel::loadFoldedState(const QModelIndex &root) { - int count = m_treeView->model()->rowCount(root); + QAbstractItemModel *model = m_treeView->model(); + int count = model->rowCount(root); QModelIndex index; for (int i = 0; i < count; ++i) { - index = m_treeView->model()->index(i, 0, root); + index = model->index(i, 0, root); if (index.isValid()) { KBookmark bm = bookmarkForIndex(index); @@ -152,57 +152,14 @@ void BookmarksPanel::loadFoldedState(const QModelIndex &root) void BookmarksPanel::setup() { - kDebug() << "Loading bookmarks panel setup..."; - - QWidget *ui = new QWidget(this); - - // setup search bar - QHBoxLayout *searchLayout = new QHBoxLayout; - searchLayout->setContentsMargins(5, 0, 0, 0); - QLabel *searchLabel = new QLabel(i18n("&Search:")); - searchLayout->addWidget(searchLabel); - KLineEdit *search = new KLineEdit; - search->setClearButtonShown(true); - searchLayout->addWidget(search); - searchLabel->setBuddy(search); - - // setup tree view - m_treeView->setUniformRowHeights(true); - m_treeView->header()->hide(); - m_treeView->setDragEnabled(true); - m_treeView->setAutoExpandDelay(750); - m_treeView->setDefaultDropAction(Qt::MoveAction); - m_treeView->viewport()->setAcceptDrops(true); - - // put everything together - QVBoxLayout *vBoxLayout = new QVBoxLayout; - vBoxLayout->setContentsMargins(0, 0, 0, 0); - vBoxLayout->addLayout(searchLayout); - vBoxLayout->addWidget(m_treeView); - - // add it to the UI - ui->setLayout(vBoxLayout); - setWidget(ui); - - BookmarksTreeModel *model = new BookmarksTreeModel(this); - UrlFilterProxyModel *proxy = new UrlFilterProxyModel(ui); - proxy->setSourceModel(model); - m_treeView->setModel(proxy); - - connect(search, SIGNAL(textChanged(const QString &)), proxy, SLOT(setFilterFixedString(const QString &))); + UrlPanel::setup(); + kDebug() << "Bookmarks panel..."; - connect(model, SIGNAL(bookmarksUpdated()), this, SLOT(startLoadFoldedState())); - - connect(m_treeView, SIGNAL(contextMenuItemRequested(const QPoint &)), this, SLOT(contextMenu(const QPoint &))); - connect(m_treeView, SIGNAL(contextMenuGroupRequested(const QPoint &)), this, SLOT(contextMenu(const QPoint &))); - connect(m_treeView, SIGNAL(contextMenuEmptyRequested(const QPoint &)), this, SLOT(contextMenu(const QPoint &))); connect(m_treeView, SIGNAL(delKeyPressed()), this, SLOT(deleteBookmark())); connect(m_treeView, SIGNAL(collapsed(const QModelIndex &)), this, SLOT(onCollapse(const QModelIndex &))); connect(m_treeView, SIGNAL(expanded(const QModelIndex &)), this, SLOT(onExpand(const QModelIndex &))); startLoadFoldedState(); - - m_loaded = true; } @@ -217,3 +174,11 @@ KBookmark BookmarksPanel::bookmarkForIndex(const QModelIndex &index) BtmItem *node = static_cast(originalIndex.internalPointer()); return node->getBkm(); } + + +QAbstractItemModel* BookmarksPanel::getModel() +{ + BookmarksTreeModel *model = new BookmarksTreeModel(this); + connect(model, SIGNAL(bookmarksUpdated()), this, SLOT(startLoadFoldedState())); + return model; +} diff --git a/src/bookmarks/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h index 4afa953b..e39158d3 100644 --- a/src/bookmarks/bookmarkspanel.h +++ b/src/bookmarks/bookmarkspanel.h @@ -33,15 +33,14 @@ // Rekonq Includes #include "rekonq_defines.h" -// Qt Includes -#include +// Local Includes +#include "panels/urlpanel.h" // Forward Declarations -class PanelTreeView; class KBookmark; class QModelIndex; -class REKONQ_TESTS_EXPORT BookmarksPanel : public QDockWidget +class REKONQ_TESTS_EXPORT BookmarksPanel : public UrlPanel { Q_OBJECT @@ -50,16 +49,16 @@ public: virtual ~BookmarksPanel(); signals: - void openUrl(const KUrl &, const Rekonq::OpenType &); - void itemHovered(const QString &); void expansionChanged(); public slots: - void showing(bool); void startLoadFoldedState(); private slots: void contextMenu(const QPoint &pos); + virtual void contextMenuItem(const QPoint &pos); + virtual void contextMenuGroup(const QPoint &pos); + virtual void contextMenuEmpty(const QPoint &pos); void deleteBookmark(); void onCollapse(const QModelIndex &index); @@ -67,11 +66,12 @@ private slots: void loadFoldedState(const QModelIndex &root); private: - void setup(); + virtual void setup(); KBookmark bookmarkForIndex(const QModelIndex &index); - PanelTreeView *m_treeView; - bool m_loadingState, m_loaded; + virtual QAbstractItemModel* getModel(); + + bool m_loadingState; }; #endif // BOOKMARKSPANEL_H diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp index 4c1dc732..79efb2b1 100644 --- a/src/history/historypanel.cpp +++ b/src/history/historypanel.cpp @@ -33,105 +33,44 @@ // Local Includes #include "panels/urlfilterproxymodel.h" + #include "application.h" #include "paneltreeview.h" #include "historymodels.h" -// Qt Includes -#include -#include -#include -#include - - // KDE Includes -#include #include #include #include #include +// Qt Includes +#include + HistoryPanel::HistoryPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags) - : QDockWidget(title, parent, flags) - , m_treeView(new PanelTreeView(this)) - , _loaded(false) + : UrlPanel(title, parent, flags) { setObjectName("historyPanel"); - setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - - connect(this, SIGNAL(visibilityChanged(bool)), this, SLOT(showing(bool))); - - setShown(ReKonfig::showHistoryPanel()); + setVisible(ReKonfig::showHistoryPanel()); } HistoryPanel::~HistoryPanel() { - // Save side panel's state ReKonfig::setShowHistoryPanel(!isHidden()); } - -void HistoryPanel::showing(bool b) -{ - if(b && !_loaded) - setup(); -} - - void HistoryPanel::setup() { - kDebug() << "Loading history panel setup..."; - - QWidget *ui = new QWidget(this); - - m_treeView->setUniformRowHeights(true); - m_treeView->setSelectionBehavior(QAbstractItemView::SelectRows); - m_treeView->setTextElideMode(Qt::ElideMiddle); - m_treeView->setAlternatingRowColors(true); - m_treeView->header()->hide(); - - // add search bar - QHBoxLayout *hBoxLayout = new QHBoxLayout; - hBoxLayout->setContentsMargins(5, 0, 0, 0); - QLabel *searchLabel = new QLabel(i18n("Search:")); - hBoxLayout->addWidget(searchLabel); - KLineEdit *search = new KLineEdit; - search->setClearButtonShown(true); - hBoxLayout->addWidget(search); - QWidget *searchBar = new QWidget; - searchBar->setLayout(hBoxLayout); - - // setup layout - QVBoxLayout *vBoxLayout = new QVBoxLayout; - vBoxLayout->setContentsMargins(0, 0, 0, 0); - vBoxLayout->addWidget(searchBar); - vBoxLayout->addWidget(m_treeView); - - // add it to the UI - ui->setLayout(vBoxLayout); - setWidget(ui); - - //- - HistoryManager *historyManager = Application::historyManager(); - QAbstractItemModel *model = historyManager->historyTreeModel(); - - UrlFilterProxyModel *proxy = new UrlFilterProxyModel(this); - proxy->setSourceModel(model); - m_treeView->setModel(proxy); - m_treeView->setExpanded(proxy->index(0, 0), true); - m_treeView->header()->hideSection(1); - QFontMetrics fm(font()); - int header = fm.width( QL1C('m') ) * 40; - m_treeView->header()->resizeSection(0, header); + UrlPanel::setup(); + kDebug() << "History panel..."; - connect(search, SIGNAL(textChanged(QString)), proxy, SLOT(setFilterFixedString(QString))); - connect(m_treeView, SIGNAL(contextMenuItemRequested(const QPoint &)), this, SLOT(contextMenuItem(const QPoint &))); - connect(m_treeView, SIGNAL(contextMenuGroupRequested(const QPoint &)), this, SLOT(contextMenuGroup(const QPoint &))); + m_treeView->header()->hideSection(1); - _loaded = true; + const UrlFilterProxyModel *proxy = static_cast(m_treeView->model()); + m_treeView->expand(proxy->index(0, 0)); } @@ -173,6 +112,11 @@ void HistoryPanel::contextMenuGroup(const QPoint &pos) } +void HistoryPanel::contextMenuEmpty(const QPoint& /*pos*/) +{ +} + + void HistoryPanel::openAll() { QModelIndex index = m_treeView->currentIndex(); @@ -199,3 +143,9 @@ void HistoryPanel::openAll() emit openUrl(allChild.at(i).url(), Rekonq::NewTab); } + +QAbstractItemModel* HistoryPanel::getModel() +{ + return Application::historyManager()->historyTreeModel(); +} + diff --git a/src/history/historypanel.h b/src/history/historypanel.h index 5a511e47..12ffe953 100644 --- a/src/history/historypanel.h +++ b/src/history/historypanel.h @@ -32,14 +32,11 @@ // Rekonq Includes #include "rekonq_defines.h" -// Qt Includes -#include +// Local Includes +#include "panels/urlpanel.h" -// Forward Declarations -class PanelTreeView; - -class REKONQ_TESTS_EXPORT HistoryPanel : public QDockWidget +class REKONQ_TESTS_EXPORT HistoryPanel : public UrlPanel { Q_OBJECT @@ -47,23 +44,17 @@ public: explicit HistoryPanel(const QString &title, QWidget *parent = 0, Qt::WindowFlags flags = 0); virtual ~HistoryPanel(); -public slots: - void showing(bool); - -signals: - void openUrl(const KUrl &, const Rekonq::OpenType &); - void itemHovered(const QString &); - private slots: - void contextMenuItem(const QPoint &pos); - void contextMenuGroup(const QPoint &pos); + virtual void contextMenuItem(const QPoint &pos); + virtual void contextMenuGroup(const QPoint &pos); + virtual void contextMenuEmpty(const QPoint &pos); + void openAll(); private: - void setup(); + virtual void setup(); - PanelTreeView *m_treeView; - bool _loaded; + virtual QAbstractItemModel* getModel(); }; #endif // HISTORYPANEL_H diff --git a/src/panels/urlpanel.cpp b/src/panels/urlpanel.cpp new file mode 100644 index 00000000..a4cfe682 --- /dev/null +++ b/src/panels/urlpanel.cpp @@ -0,0 +1,115 @@ +/* ============================================================ +* +* This file is a part of the rekonq project +* +* Copyright (C) 2009 by Domrachev Alexandr +* Copyright (C) 2009-2010 by Andrea Diamantini +* +* +* 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 2 of +* the License or (at your option) version 3 or any later version +* accepted by the membership of KDE e.V. (or its successor approved +* by the membership of KDE e.V.), which shall act as a proxy +* defined in Section 14 of version 3 of the license. +* +* 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 . +* +* ============================================================ */ + + +// Self Includes +#include "urlpanel.h" + +// Auto Includes +#include "rekonq.h" + +// Local Includes +#include "panels/urlfilterproxymodel.h" + +#include "paneltreeview.h" + +// KDE Includes +#include +#include + +// Qt Includes +#include +#include +#include + + +UrlPanel::UrlPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags) + : QDockWidget(title, parent, flags) + , m_treeView(new PanelTreeView(this)) + , _loaded(false) +{ + setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); + + connect(this, SIGNAL(visibilityChanged(bool)), this, SLOT(showing(bool))); +} + + +UrlPanel::~UrlPanel() +{ +} + + +void UrlPanel::showing(bool b) +{ + if(b && !_loaded) + { + setup(); + _loaded = true; + } +} + + +void UrlPanel::setup() +{ + kDebug() << "Loading panel setup..."; + + QWidget *ui = new QWidget(this); + + // setup search bar + QHBoxLayout *searchLayout = new QHBoxLayout; + searchLayout->setContentsMargins(5, 0, 0, 0); + QLabel *searchLabel = new QLabel(i18n("&Search:")); + searchLayout->addWidget(searchLabel); + KLineEdit *search = new KLineEdit; + search->setClearButtonShown(true); + searchLayout->addWidget(search); + searchLabel->setBuddy(search); + + // setup tree view + m_treeView->setUniformRowHeights(true); + m_treeView->header()->hide(); + + // put everything together + QVBoxLayout *vBoxLayout = new QVBoxLayout; + vBoxLayout->setContentsMargins(0, 0, 0, 0); + vBoxLayout->addLayout(searchLayout); + vBoxLayout->addWidget(m_treeView); + + // add it to the UI + ui->setLayout(vBoxLayout); + setWidget(ui); + + QAbstractItemModel *model = getModel(); + UrlFilterProxyModel *proxy = new UrlFilterProxyModel(this); + proxy->setSourceModel(model); + m_treeView->setModel(proxy); + + connect(search, SIGNAL(textChanged(QString)), proxy, SLOT(setFilterFixedString(QString))); + + connect(m_treeView, SIGNAL(contextMenuItemRequested(const QPoint &)), this, SLOT(contextMenuItem(const QPoint &))); + connect(m_treeView, SIGNAL(contextMenuGroupRequested(const QPoint &)), this, SLOT(contextMenuGroup(const QPoint &))); + connect(m_treeView, SIGNAL(contextMenuEmptyRequested(const QPoint &)), this, SLOT(contextMenuEmpty(const QPoint &))); +} diff --git a/src/panels/urlpanel.h b/src/panels/urlpanel.h new file mode 100644 index 00000000..b4ca2aa5 --- /dev/null +++ b/src/panels/urlpanel.h @@ -0,0 +1,76 @@ +/* ============================================================ +* +* This file is a part of the rekonq project +* +* Copyright (C) 2009 by Domrachev Alexandr +* Copyright (C) 2009-2010 by Andrea Diamantini +* +* +* 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 2 of +* the License or (at your option) version 3 or any later version +* accepted by the membership of KDE e.V. (or its successor approved +* by the membership of KDE e.V.), which shall act as a proxy +* defined in Section 14 of version 3 of the license. +* +* 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 URLPANEL_H +#define URLPANEL_H + + +// Rekonq Includes +#include "rekonq_defines.h" + +// Qt Includes +#include + +// Forward Declarations +class PanelTreeView; + +class QAbstractItemModel; + + +class REKONQ_TESTS_EXPORT UrlPanel : public QDockWidget +{ + Q_OBJECT + +public: + explicit UrlPanel(const QString &title, QWidget *parent = 0, Qt::WindowFlags flags = 0); + virtual ~UrlPanel(); + +public slots: + void showing(bool); + +signals: + void openUrl(const KUrl &, const Rekonq::OpenType &); + void itemHovered(const QString &); + +protected slots: + virtual void contextMenuItem(const QPoint &pos) = 0; + virtual void contextMenuGroup(const QPoint &pos) = 0; + virtual void contextMenuEmpty(const QPoint &pos) = 0; + +protected: + virtual void setup(); + + virtual QAbstractItemModel* getModel() = 0; + + PanelTreeView *m_treeView; + +private: + bool _loaded; +}; + + +#endif // URLPANEL_H -- cgit v1.2.1