From 9461c52f07a2bf8b9bc25f037b17805cda51b2b0 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 10 Mar 2013 19:02:12 +0100 Subject: Supporting panel (again) :) - Move to a pure QWidget base window (instead of TabWidget one) (this to properly store panels position) - Restoring && rewamping panels code - Restoring actions to activate/deactivate them BUG: 312354 --- src/bookmarks/bookmarkowner.cpp | 11 +- src/bookmarks/bookmarkstreemodel.cpp | 406 +++++++++++++++++++++++++++++++++++ src/bookmarks/bookmarkstreemodel.h | 116 ++++++++++ 3 files changed, 528 insertions(+), 5 deletions(-) create mode 100644 src/bookmarks/bookmarkstreemodel.cpp create mode 100644 src/bookmarks/bookmarkstreemodel.h (limited to 'src/bookmarks') diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp index 11c3585d..b7fe443b 100644 --- a/src/bookmarks/bookmarkowner.cpp +++ b/src/bookmarks/bookmarkowner.cpp @@ -35,7 +35,8 @@ #include "bookmarkmanager.h" #include "application.h" -#include "tabwindow.h" +#include "rekonqwindow.h" +#include "tabwidget.h" #include "webwindow.h" // KDE Includes @@ -119,20 +120,20 @@ KAction* BookmarkOwner::createAction(const KBookmark &bookmark, const BookmarkAc QString BookmarkOwner::currentTitle() const { - return rApp->tabWindow()->currentWebWindow()->title(); + return rApp->rekonqWindow()->currentWebWindow()->title(); } QString BookmarkOwner::currentUrl() const { - return rApp->tabWindow()->currentWebWindow()->url().url(); + return rApp->rekonqWindow()->currentWebWindow()->url().url(); } QList< QPair > BookmarkOwner::currentBookmarkList() const { QList< QPair > bkList; - TabWindow *view = rApp->tabWindow(); + TabWidget *view = rApp->rekonqWindow()->tabWidget(); int tabNumber = view->count(); for (int i = 0; i < tabNumber; ++i) @@ -165,7 +166,7 @@ void BookmarkOwner::openFolderinTabs(const KBookmarkGroup &bkGoup) if (urlList.length() > 8) { if (KMessageBox::warningContinueCancel( - rApp->tabWindow(), + rApp->rekonqWindow(), i18ncp("%1=Number of tabs. Value is always >=8", "You are about to open %1 tabs.\nAre you sure?", "You are about to open %1 tabs.\nAre you sure?", urlList.length())) diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp new file mode 100644 index 00000000..8a74e3e6 --- /dev/null +++ b/src/bookmarks/bookmarkstreemodel.cpp @@ -0,0 +1,406 @@ +/* ============================================================ +* +* This file is a part of the rekonq project +* +* Copyright (C) 2009 by Nils Weigel +* Copyright (C) 2010-2013 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 "bookmarkstreemodel.h" +#include "bookmarkstreemodel.moc" + +// Local Includes +#include "bookmarkmanager.h" +#include "iconmanager.h" + +// KDE Includes +#include +#include +#include + +// Qt Includes +#include + + +BtmItem::BtmItem(const KBookmark &bm) + : m_parent(0) + , m_kbm(bm) +{ +} + + +BtmItem::~BtmItem() +{ + qDeleteAll(m_children); +} + + +QVariant BtmItem::data(int role) const +{ + if (m_kbm.isNull()) + return QVariant(); // should only happen for root item + + if (role == Qt::DisplayRole) + return m_kbm.text(); + + if (role == Qt::DecorationRole) + { + // NOTE + // this should be: + // return KIcon(m_kbm.icon()); + // but I cannot let it work :( + // I really cannot understand how let this work properly... + if (m_kbm.isGroup() || m_kbm.isSeparator()) + return KIcon(m_kbm.icon()); + else + return IconManager::self()->iconForUrl(KUrl(m_kbm.url())); + } + + if (role == Qt::UserRole) + return m_kbm.url(); + + if (role == Qt::ToolTipRole) + { + QString tooltip = m_kbm.fullText(); + if (m_kbm.isGroup()) + tooltip += i18ncp("%1=Number of items in bookmark folder", " (1 item)", " (%1 items)", childCount()); + + QString url = m_kbm.url().url(); + if (!url.isEmpty()) + { + if (!tooltip.isEmpty()) + tooltip += '\n'; + tooltip += url; + } + + if (!m_kbm.description().isEmpty()) + { + if (!tooltip.isEmpty()) + tooltip += '\n'; + tooltip += m_kbm.description(); + } + + return tooltip; + } + + return QVariant(); +} + + +int BtmItem::row() const +{ + if (m_parent) + return m_parent->m_children.indexOf(const_cast< BtmItem* >(this)); + return 0; +} + + +int BtmItem::childCount() const +{ + return m_children.count(); +} + + +BtmItem* BtmItem::child(int n) +{ + Q_ASSERT(n >= 0); + Q_ASSERT(n < childCount()); + + return m_children.at(n); +} + + +BtmItem* BtmItem::parent() const +{ + return m_parent; +} + + +void BtmItem::appendChild(BtmItem *child) +{ + if (!child) + return; + + child->m_parent = this; + m_children << child; +} + + +void BtmItem::clear() +{ + qDeleteAll(m_children); + m_children.clear(); +} + +KBookmark BtmItem::getBkm() const +{ + return m_kbm; +} + + +// ------------------------------------------------------------------------------------- + + +BookmarksTreeModel::BookmarksTreeModel(QObject *parent) + : QAbstractItemModel(parent) + , m_root(0) +{ + resetModel(); + connect(BookmarkManager::self()->manager(), SIGNAL(changed(QString, QString)), + this, SLOT(bookmarksChanged(QString))); +} + + +BookmarksTreeModel::~BookmarksTreeModel() +{ + delete m_root; +} + + +int BookmarksTreeModel::rowCount(const QModelIndex &parent) const +{ + BtmItem *parentItem = 0; + if (!parent.isValid()) + { + parentItem = m_root; + } + else + { + parentItem = static_cast(parent.internalPointer()); + } + + return parentItem->childCount(); +} + + +int BookmarksTreeModel::columnCount(const QModelIndex& /*parent*/) const +{ + return 1; +} + + +Qt::ItemFlags BookmarksTreeModel::flags(const QModelIndex &index) const +{ + Qt::ItemFlags flags = QAbstractItemModel::flags(index); + + if (!index.isValid()) + return flags | Qt::ItemIsDropEnabled; + + flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled; + + if (bookmarkForIndex(index).isGroup()) + flags |= Qt::ItemIsDropEnabled; + + return flags; +} + + +QModelIndex BookmarksTreeModel::index(int row, int column, const QModelIndex &parent) const +{ + if (!hasIndex(row, column, parent)) + return QModelIndex(); + + BtmItem *parentItem; + + if (!parent.isValid()) + parentItem = m_root; + else + parentItem = static_cast(parent.internalPointer()); + + BtmItem *childItem = parentItem->child(row); + if (childItem) + return createIndex(row, column, childItem); + + return QModelIndex(); +} + + +QModelIndex BookmarksTreeModel::parent(const QModelIndex &index) const +{ + if (!index.isValid()) + return QModelIndex(); + + BtmItem *childItem = static_cast(index.internalPointer()); + BtmItem *parentItem = childItem->parent(); + + if (parentItem == m_root) + return QModelIndex(); + + return createIndex(parentItem->row(), 0, parentItem); +} + + +QVariant BookmarksTreeModel::data(const QModelIndex &index, int role) const +{ + if (!index.isValid()) + return QVariant(); + + BtmItem *node = static_cast(index.internalPointer()); + if (node && node == m_root) + { + if (role == Qt::DisplayRole) + return i18n("Bookmarks"); + if (role == Qt::DecorationRole) + return KIcon("bookmarks"); + } + else + { + if (node) + return node->data(role); + } + + return QVariant(); +} + + +QStringList BookmarksTreeModel::mimeTypes() const +{ + return QStringList(BookmarkManager::bookmark_mime_type()); +} + + +bool BookmarksTreeModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) +{ + if (action != Qt::MoveAction || !data->hasFormat(BookmarkManager::bookmark_mime_type())) + return false; + + QByteArray addresses = data->data(BookmarkManager::bookmark_mime_type()); + KBookmark bookmark = BookmarkManager::self()->findByAddress(QString::fromLatin1(addresses.data())); + + KBookmarkGroup root; + if (parent.isValid()) + root = bookmarkForIndex(parent).toGroup(); + else + root = BookmarkManager::self()->rootGroup(); + + QModelIndex destIndex = index(row, column, parent); + + if (destIndex.isValid() && row != -1) + { + root.moveBookmark(bookmark, root.previous(bookmarkForIndex(destIndex))); + } + else + { + root.deleteBookmark(bookmark); + root.addBookmark(bookmark); + } + + BookmarkManager::self()->emitChanged(); + + return true; +} + + +Qt::DropActions BookmarksTreeModel::supportedDropActions() const +{ + return Qt::MoveAction; +} + + +QMimeData* BookmarksTreeModel::mimeData(const QModelIndexList &indexes) const +{ + QMimeData *mimeData = new QMimeData; + + QByteArray address = bookmarkForIndex(indexes.first()).address().toLatin1(); + mimeData->setData(BookmarkManager::bookmark_mime_type(), address); + bookmarkForIndex(indexes.first()).populateMimeData(mimeData); + + return mimeData; +} + + +void BookmarksTreeModel::bookmarksChanged(const QString &groupAddress) +{ + if (groupAddress.isEmpty()) + { + resetModel(); + } + else + { + beginResetModel(); + BtmItem *node = m_root; + QModelIndex nodeIndex; + + QStringList indexChain(groupAddress.split('/', QString::SkipEmptyParts)); + bool ok; + int i; + Q_FOREACH(const QString & sIndex, indexChain) + { + i = sIndex.toInt(&ok); + if (!ok) + break; + + if (i < 0 || i >= node->childCount()) + break; + + node = node->child(i); + nodeIndex = index(i, 0, nodeIndex); + } + populate(node, BookmarkManager::self()->findByAddress(groupAddress).toGroup()); + endResetModel(); + } + + emit bookmarksUpdated(); +} + + +void BookmarksTreeModel::resetModel() +{ + setRoot(BookmarkManager::self()->rootGroup()); +} + + +void BookmarksTreeModel::setRoot(KBookmarkGroup bmg) +{ + beginResetModel(); + delete m_root; + m_root = new BtmItem(KBookmark()); + populate(m_root, bmg); + endResetModel(); +} + + +void BookmarksTreeModel::populate(BtmItem *node, KBookmarkGroup bmg) +{ + node->clear(); + + if (bmg.isNull()) + return; + + KBookmark bm = bmg.first(); + while (!bm.isNull()) + { + BtmItem *newChild = new BtmItem(bm); + if (bm.isGroup()) + populate(newChild, bm.toGroup()); + + node->appendChild(newChild); + bm = bmg.next(bm); + } +} + + +KBookmark BookmarksTreeModel::bookmarkForIndex(const QModelIndex &index) const +{ + return static_cast(index.internalPointer())->getBkm(); +} diff --git a/src/bookmarks/bookmarkstreemodel.h b/src/bookmarks/bookmarkstreemodel.h new file mode 100644 index 00000000..d12c898d --- /dev/null +++ b/src/bookmarks/bookmarkstreemodel.h @@ -0,0 +1,116 @@ +/* ============================================================ +* +* This file is a part of the rekonq project +* +* Copyright (C) 2009 by Nils Weigel +* Copyright (C) 2010-2013 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 BOOKMARKS_TREE_MODEL_H +#define BOOKMARKS_TREE_MODEL_H + + +// Rekonq Includes +#include "rekonq_defines.h" + +// KDE includes +#include + +// Qt Includes +#include + + +class BtmItem +{ +public: + BtmItem(const KBookmark &bm); + ~BtmItem(); + + QVariant data(int role = Qt::DisplayRole) const; + int row() const; + int childCount() const; + BtmItem* child(int n); + BtmItem* parent() const; + void appendChild(BtmItem *child); + void clear(); + KBookmark getBkm() const; + +private: + BtmItem *m_parent; + QList< BtmItem* > m_children; + KBookmark m_kbm; +}; + + +// ------------------------------------------------------------------------------------------------- + + +class REKONQ_TESTS_EXPORT BookmarksTreeModel : public QAbstractItemModel +{ + Q_OBJECT + +public: + explicit BookmarksTreeModel(QObject *parent = 0); + virtual ~BookmarksTreeModel(); + + /** + * @return number of rows under the given parent. + */ + virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; + /** + * @return number of columns (always 1). + */ + virtual int columnCount(const QModelIndex &parent = QModelIndex()) const; + + virtual Qt::ItemFlags flags(const QModelIndex &index) const; + + /** + * @return index in the model specified by the given row, column and parent. + */ + virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; + /** + * @return parent of the given index. + */ + virtual QModelIndex parent(const QModelIndex &index) const; + virtual QVariant data(const QModelIndex &index, int role) const; + + virtual QStringList mimeTypes() const; + virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent); + virtual Qt::DropActions supportedDropActions() const; + virtual QMimeData *mimeData(const QModelIndexList &indexes) const; + +private Q_SLOTS: + void bookmarksChanged(const QString &groupAddress); + +Q_SIGNALS: + void bookmarksUpdated(); + +private: + void resetModel(); + void setRoot(KBookmarkGroup bmg); + void populate(BtmItem *node, KBookmarkGroup bmg); + KBookmark bookmarkForIndex(const QModelIndex &index) const; + + BtmItem *m_root; +}; + +#endif // BOOKMARKS_TREE_MODEL_H -- cgit v1.2.1