konqbookmark/itemviews/locationbardelegate.cpp konqbookmark/itemviews/locationbardelegate.h @@ -11,10 +11,14 @@ TODO: #6 Wait for EntityTreeView to get out of akonadi_next and into kdepimlibs. - #7 Segfaults with EntityTreeModel. - -Planning: - Fix #1, create own model + #7 Segfaults with EntityTreeModel + + #9 continue work on location bar delegate + + #11 write plugins for the location bar + + #12 add support *in akonadi* for undo & redo +--- * Nepomuk is used by the wrapper class KonqBookmark for accessing to the data. * Akonadi is used to administrate collections and virtual collections and to allow TODO @@ -26,6 +26,8 @@ #include <QtGui/QPainter> #include <QtGui/QPrinter> #include <QtCore/QTimer> +#include <QtCore/QTimer> +#include <QtDBus> #include <Nepomuk/ResourceManager> #include <kconfigdialog.h> @@ -66,7 +68,7 @@ Bookmarks::Bookmarks() setupGUI(); // Start Akonadi - QTimer::singleShot( 0, this, SLOT( delayedInit() ) ); + QTimer::singleShot(0, this, SLOT(delayedInit())); } Bookmarks::~Bookmarks() @@ -88,6 +90,15 @@ void Bookmarks::setupActions() Akonadi::Session* session = new Akonadi::Session(QByteArray( "BookmarksMain-" ) + QByteArray::number( qrand() ), this); Akonadi::Monitor* monitor = new Akonadi::Monitor( this ); + + // create Konqueror Bookmarks Resource if needed + QDBusConnection bus = QDBusConnection::sessionBus(); + QDBusInterface *interface = new QDBusInterface("org.freedesktop.Akonadi", + "/ResourceManager", "org.freedesktop.Akonadi.ResourceManager", bus, + this); + QString resourceName("akonadi_konquerorbookmarks_resource"); + interface->call("addResourceInstance", resourceName); + Akonadi::KonqBookmarkModel* bookmarkModel = new Akonadi::KonqBookmarkModel( session, monitor, this ); KonqBookmarkModelMenu* bookmarksMenu = new KonqBookmarkModelMenu(bookmarkModel, 0, actionCollection(), this); bookmarks_editor/src/bookmarks.cpp @@ -49,7 +49,9 @@ #include <akonadi/collectionfilterproxymodel.h> #include <akonadi/collectionmodel.h> #include <akonadi/collectioncreatejob.h> +#include <akonadi/collectiondeletejob.h> #include <akonadi/itemcreatejob.h> +#include <akonadi/itemdeletejob.h> #include <akonadi/itemfetchscope.h> #include <akonadi/monitor.h> #include <akonadi/session.h> @@ -59,8 +61,6 @@ #include <konqbookmark/konqbookmark.h> #include <konqbookmark/kcompletionview.h> -#include <konqbookmark/kcompletionmodel.h> -#include <konqbookmark/kaggregatedmodel.h> #include <konqbookmark/konqbookmarkproxymodel.h> #include <konqbookmark/konqbookmarkmodel.h> #include <konqbookmark/placesproxymodel.h> @@ -78,7 +78,7 @@ public: Private(BookmarksView *parent); void expand(const QModelIndex& index); - void selectBookmarkFolder(const QModelIndex& index = QModelIndex()); + void selectBookmarkFolder(const QModelIndex& index = QModelIndex(), int start = -1); Akonadi::KonqBookmarkModel *mBookmarkModel; Akonadi::KonqBookmarkProxyModel *mBookmarkProxyModel; @@ -87,8 +87,6 @@ public: ModelWatcher *mModelWatcher; Akonadi::Monitor *mMonitor; BookmarksView *mParent; - - QSortFilterProxyModel* fpModel; }; BookmarksView::Private::Private(BookmarksView *parent) @@ -101,36 +99,33 @@ void BookmarksView::Private::expand(const QModelIndex& index) { // If index is invalid it means that the inserted index is the root index // and thus we need to expand all children - if(!index.isValid()) - { + if (!index.isValid()) { mParent->ui_bookmarksview_base.bookmarksView->expandAll(); } else { mParent->ui_bookmarksview_base.bookmarksView->expand(index); } } -void BookmarksView::Private::selectBookmarkFolder(const QModelIndex& index) +void BookmarksView::Private::selectBookmarkFolder(const QModelIndex& index, int start) { - static QModelIndex savedIndex; + QModelIndex newChild = mParent->ui_bookmarksview_base.collectionsView->model()->index(start, 0, index); - kDebug() << index << index.data(Akonadi::KonqBookmarkModel::Title); + kDebug() << newChild << newChild.data(Akonadi::KonqBookmarkModel::Title); - if(index.isValid()) { - QTimer::singleShot(0, mParent, SLOT(selectBookmarkFolder())); - savedIndex = index; - - disconnect(mParent->ui_bookmarksview_base.collectionsView->model(), - SIGNAL(rowsInserted(const QModelIndex&, int, int)), - mParent, SLOT(selectBookmarkFolder(const QModelIndex&))); - - } else if(savedIndex.isValid()) { - mParent->ui_bookmarksview_base.collectionsView->selectionModel()-> - setCurrentIndex(savedIndex, QItemSelectionModel::SelectCurrent); + if (!newChild.isValid()) { + return; } + + disconnect(mParent->ui_bookmarksview_base.collectionsView->model(), + SIGNAL(rowsInserted(const QModelIndex&, int, int)), + mParent, SLOT(selectBookmarkFolder(const QModelIndex&, int))); + + mParent->ui_bookmarksview_base.collectionsView->selectionModel()-> + setCurrentIndex(newChild, QItemSelectionModel::SelectCurrent); } BookmarksView::BookmarksView(QWidget *) - : d( new Private ( this ) ) + : d(new Private(this)) { ui_bookmarksview_base.setupUi(this); setAutoFillBackground(true); @@ -142,41 +137,25 @@ BookmarksView::~BookmarksView() void BookmarksView::createModels() { - QStringListModel* strlstModel = new QStringListModel(QStringList() << "a" << "b" << "c" << "cd"); - d->fpModel = new QSortFilterProxyModel(); - d->fpModel->setSourceModel(strlstModel); - d->fpModel->setFilterKeyColumn(-1); - d->fpModel->setDynamicSortFilter(true); - -// ui_bookmarksview_base.locationBar->completionView()->setModel(d->fpModel); -// ui_bookmarksview_base.locationBar->setCompletionMode(KGlobalSettings::CompletionPopup); -// ui_bookmarksview_base.locationBar->setView(new QTreeView(ui_bookmarksview_base.locationBar)); - -// connect(ui_bookmarksview_base.locationBar, SIGNAL(textChanged(const QString&)), -// d->fpModel, SLOT(setFilterFixedString(const QString&))); - - KCompletionModel *completionModel = Konqueror::PlacesManager::self()->urlCompletionModel(); - completionModel->setCompletion(new KUrlCompletion()); - d->mBookmarkModel = Konqueror::PlacesManager::self()->bookmarkModel(); - d->mCollectionProxyModel = new Konqueror::CollectionsProxyModel( this ); + d->mCollectionProxyModel = new Konqueror::CollectionsProxyModel(this); d->mCollectionProxyModel->setSourceModel(d->mBookmarkModel); - ui_bookmarksview_base.collectionsView->setModel( d->mCollectionProxyModel ); - ui_bookmarksview_base.navigatorBreadCrumb->setModel( d->mCollectionProxyModel ); - ui_bookmarksview_base.navigatorBreadCrumb->setSelectionModel( ui_bookmarksview_base.collectionsView->selectionModel() ); + ui_bookmarksview_base.collectionsView->setModel(d->mCollectionProxyModel); + ui_bookmarksview_base.navigatorBreadCrumb->setModel(d->mCollectionProxyModel); + ui_bookmarksview_base.navigatorBreadCrumb->setSelectionModel(ui_bookmarksview_base.collectionsView->selectionModel()); KSelectionProxyModel *selectionProxy = new KSelectionProxyModel(ui_bookmarksview_base.collectionsView->selectionModel(), this); selectionProxy->setSourceModel(d->mBookmarkModel); - d->mBookmarkProxyModel = new Akonadi::KonqBookmarkProxyModel( this ); + d->mBookmarkProxyModel = new Akonadi::KonqBookmarkProxyModel(this); d->mBookmarkProxyModel->setSourceModel(selectionProxy); - Akonadi::KonqBookmarkDelegate *itemDelegate = new Akonadi::KonqBookmarkDelegate( this ); - ui_bookmarksview_base.bookmarksView->setModel( d->mBookmarkProxyModel ); - ui_bookmarksview_base.bookmarksView->setItemDelegate( itemDelegate ); - ui_bookmarksview_base.searchBox->setTreeView( ui_bookmarksview_base.bookmarksView ); + Akonadi::KonqBookmarkDelegate *itemDelegate = new Akonadi::KonqBookmarkDelegate(this); + ui_bookmarksview_base.bookmarksView->setModel(d->mBookmarkProxyModel); + ui_bookmarksview_base.bookmarksView->setItemDelegate(itemDelegate); + ui_bookmarksview_base.searchBox->setTreeView(ui_bookmarksview_base.bookmarksView); ui_bookmarksview_base.searchBox->setClickMessage(i18n("Search in bookmarks...")); d->mMapper = new KDataWidgetSelectionMapper(this); @@ -200,8 +179,9 @@ void BookmarksView::createModels() ui_bookmarksview_base.bookmarksView->setFocus(); ui_bookmarksview_base.bookmarksView->setEditTriggers(QAbstractItemView::DoubleClicked); - for(int i = KonqBookmarkModel::Url; i < KonqBookmarkModel::ColumnCount; i++) + for(int i = KonqBookmarkModel::Url; i < KonqBookmarkModel::ColumnCount; i++) { ui_bookmarksview_base.collectionsView->setColumnHidden(i, true); + } ui_bookmarksview_base.collectionsView->setFocusPolicy(Qt::NoFocus); ui_bookmarksview_base.collectionsView->header()->hide(); @@ -210,14 +190,13 @@ void BookmarksView::createModels() ui_bookmarksview_base.collectionsView->setDragEnabled(true); ui_bookmarksview_base.collectionsView->viewport()->setAcceptDrops(true); ui_bookmarksview_base.collectionsView->setDropIndicatorShown(true); -// ui_bookmarksview_base.collectionsView->setDragDropMode(QAbstractItemView::InternalMove); ui_bookmarksview_base.collectionsView->setStyleSheet("QTreeView { background: transparent; border-style: none; }"); connect(ui_bookmarksview_base.collectionsView->model(), SIGNAL(rowsInserted(const QModelIndex&, int, int)), ui_bookmarksview_base.collectionsView, SLOT(expand(const QModelIndex&))); connect(ui_bookmarksview_base.collectionsView->model(), SIGNAL(rowsInserted(const QModelIndex&, int, int)), - this, SLOT(selectBookmarkFolder(const QModelIndex&))); + this, SLOT(selectBookmarkFolder(const QModelIndex&, int))); connect(ui_bookmarksview_base.bookmarksView->model(), SIGNAL(rowsInserted(const QModelIndex&, int, int)), this, SLOT(expand(const QModelIndex&))); @@ -230,8 +209,7 @@ void BookmarksView::addBookmark() QModelIndex current = ui_bookmarksview_base.bookmarksView->selectionModel()->currentIndex(); Collection parent = getParentCollection(current); - if(parent == Collection::root()) - { + if(parent == Collection::root()) { KMessageBox::sorry(this, i18n("Please select first a valid parent folder in which to insert the new bookmark"), i18n("Can't create new bookmark")); return; @@ -240,16 +218,17 @@ void BookmarksView::addBookmark() KonqBookmark bookmark; Item item; - item.setMimeType( KonqBookmark::mimeType() ); - item.setPayload<KonqBookmark>( bookmark ); + item.setMimeType(KonqBookmark::mimeType()); + item.setPayload<KonqBookmark>(bookmark); ItemCreateJob *job = new ItemCreateJob(item, parent); - if( job->exec() ) - { + if (job->exec()) { d->mModelWatcher = new ModelWatcher(job->item().id(), d->mBookmarkProxyModel, this); - connect(d->mModelWatcher, SIGNAL(newEntity(const QModelIndex &)), this, SLOT(slotBookmarkAdded(const QModelIndex &))); - } else + connect(d->mModelWatcher, SIGNAL(newEntity(const QModelIndex &)), + this, SLOT(slotBookmarkAdded(const QModelIndex &))); + } else { kWarning() << "job->exec() failed"; + } } void BookmarksView::slotBookmarkAdded(const QModelIndex &newIndex) @@ -262,37 +241,55 @@ void BookmarksView::slotBookmarkAdded(const QModelIndex &newIndex) void BookmarksView::slotDelete() { - d->mBookmarkModel->removeRows(ui_bookmarksview_base.bookmarksView->currentIndex().row(), 1, ui_bookmarksview_base.bookmarksView->currentIndex().parent()); + QModelIndex currentIndex = ui_bookmarksview_base.bookmarksView->currentIndex(); + kDebug() << currentIndex; + + if (!currentIndex.isValid()) { + return; + } + + Akonadi::Item item = qVariantValue<Akonadi::Item>(currentIndex.data(EntityTreeModel::ItemRole)); + Akonadi::Collection collection = qVariantValue<Akonadi::Collection>(currentIndex.data(EntityTreeModel::CollectionRole)); + if (item.isValid() && !item.remoteId().isEmpty()) { + kDebug() << "removing item remoteId = " << item.remoteId(); + new Akonadi::ItemDeleteJob(item); + } else if (collection.isValid()) { + kDebug() << "removing collection (name, remoteId) = " << collection.name() << collection.remoteId(); + new Akonadi::CollectionDeleteJob(collection); + } } Akonadi::Collection BookmarksView::getParentCollection(QModelIndex current) { - Collection defaultCollection = d->mBookmarkModel->rootCollection(); + QModelIndex defaultIndex = ui_bookmarksview_base.collectionsView->selectionModel()->currentIndex(); + Collection defaultCollection = defaultIndex.data(EntityTreeModel::CollectionRole).value<Akonadi::Collection>(); return getParentCollection(current, defaultCollection); } Akonadi::Collection BookmarksView::getParentCollection(QModelIndex current, Collection defaultCollection) { Akonadi::Collection parent = defaultCollection; - if(!current.isValid()) + if (!current.isValid()) { return parent; + } QVariant var = current.data(EntityTreeModel::ItemRole); Akonadi::Item item = var.value<Akonadi::Item>(); // If current selection is an item, then the parent collection for our new // collection will be the same parent collection as the current item. else // ff current selection is a collection, that will be our new collection's parent - if ( item.isValid() ) - { + if (item.isValid()) { current = current.parent(); - if(!current.isValid()) + if (!current.isValid()) { return parent; + } } var = current.data(EntityTreeModel::CollectionRole); Akonadi::Collection collection = var.value<Akonadi::Collection>(); - if(collection.isValid()) + if (collection.isValid()) { parent = collection; + } return parent; } @@ -302,18 +299,17 @@ void BookmarksView::slotAddFolder(const QString &folderName) // TODO see addBookmark() QModelIndex current = ui_bookmarksview_base.bookmarksView->selectionModel()->currentIndex(); Collection parent = getParentCollection(current); - if(parent == Collection::root()) - { + if (parent == Collection::root()) { KMessageBox::sorry(this, i18n("Please select first a valid parent folder in which to insert the new folder"), i18n("Can't create new folder")); return; } Akonadi::Collection collection; - collection.setParent( parent ); - collection.setName( folderName ); - collection.setContentMimeTypes( QStringList( KonqBookmark::mimeType() ) ); + collection.setParent(parent); + collection.setName(folderName); + collection.setContentMimeTypes(QStringList(KonqBookmark::mimeType())); - new Akonadi::CollectionCreateJob( collection ); + new Akonadi::CollectionCreateJob(collection); } #include "bookmarksview.moc" bookmarks_editor/src/bookmarksview.cpp @@ -90,7 +90,7 @@ private: class Private; QSharedDataPointer<Private> d; Q_PRIVATE_SLOT(d, void expand(const QModelIndex& index)) - Q_PRIVATE_SLOT(d, void selectBookmarkFolder(const QModelIndex& index = QModelIndex())) + Q_PRIVATE_SLOT(d, void selectBookmarkFolder(const QModelIndex& index = QModelIndex(), int start = -1)) }; #endif // BOOKMARSVIEW_H bookmarks_editor/src/bookmarksview.h @@ -57,6 +57,7 @@ set(konqbookmark_LIB_SRCS itemviews/ktreeviewsearchline.cpp itemviews/modelmenusearchline.cpp itemviews/locationbar.cpp + itemviews/locationbardelegate.cpp itemviews/kcompletionview.cpp itemviews/klineeditview.cpp # itemviews/placesdelegate.cpp @@ -75,6 +76,7 @@ target_link_libraries(konqbookmark ${QT_QTCORE_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} + ${KDE4_KIO_LIBS} # for KUrlCompletion ${NEPOMUK_LIBRARIES} ${SOPRANO_LIBRARIES} ) @@ -111,6 +113,7 @@ set(konqbookmark_LIB_HDRS itemviews/konqbookmarkmodelmenu.h itemviews/modelmenusearchline.h itemviews/locationbar.h + itemviews/locationbardelegate.h itemviews/kcompletionview.h itemviews/klineeditview.h # itemviews/placesdelegate.h konqbookmark/CMakeLists.txt @@ -24,7 +24,7 @@ using namespace Konqueror; using namespace Akonadi; -CollectionsProxyModel::CollectionsProxyModel( QObject *parent ) +CollectionsProxyModel::CollectionsProxyModel(QObject *parent) : QSortFilterProxyModel(parent) { setDynamicSortFilter(true); @@ -34,15 +34,15 @@ CollectionsProxyModel::CollectionsProxyModel( QObject *parent ) static int indexTypeHelper(const QModelIndex & index) { QString mimeType = index.data(EntityTreeModel::MimeTypeRole).toString(); - if(mimeType == Collection::mimeType()) { + if (mimeType == Collection::mimeType()) { return EntityTreeModel::CollectionRole; } else { return EntityTreeModel::ItemRole; } } -bool CollectionsProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex &sourceParent ) const +bool CollectionsProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const { - QModelIndex sourceIndex = sourceModel()->index(sourceRow, 0, sourceParent); + QModelIndex sourceIndex = sourceModel()->index(sourceRow, 0, sourceParent); return indexTypeHelper(sourceIndex) == EntityTreeModel::CollectionRole; } konqbookmark/itemmodels/collectionsproxymodel.cpp @@ -27,19 +27,20 @@ namespace Konqueror { /** - * class created because because of some reason EntityFilterProxyModel doesn't - * seem to be working right now. + * Class created because because of some reason EntityFilterProxyModel doesn't + * seem to be working right now. It filters out indexes which are not Akonadi + * Collections. */ class KONQBOOKMARK_EXPORT CollectionsProxyModel : public QSortFilterProxyModel { public: - CollectionsProxyModel( QObject *parent = 0 ); - protected: + CollectionsProxyModel(QObject *parent = 0); + protected: /** - * Reimplemented to show only folders - */ - virtual bool filterAcceptsRow( int sourceRow, const QModelIndex &sourceParent ) const; + * Reimplemented to show only folders + */ + virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const; }; } konqbookmark/itemmodels/collectionsproxymodel.h @@ -92,12 +92,12 @@ int KAggregatedModel::Private::indexRowDiff(const QAbstractItemModel *sourceMode int prevCount = 0; int modelAt = m_sourceModels.indexOf(sourceModel); - if(modelAt == -1) { + if (modelAt == -1) { return -1; } - foreach(const QAbstractItemModel *model, m_sourceModels) { - if(model == sourceModel) { + foreach (const QAbstractItemModel *model, m_sourceModels) { + if (model == sourceModel) { break; } prevCount += model->rowCount(QModelIndex()); @@ -108,11 +108,11 @@ int KAggregatedModel::Private::indexRowDiff(const QAbstractItemModel *sourceMode void KAggregatedModel::Private::rowsAboutToBeInserted(const QModelIndex& sourceParent, int sourceStart, int sourceEnd) { - if(sourceParent.isValid()) { + if (sourceParent.isValid()) { return; } - if(sourceStart < 0 || sourceStart > sourceEnd) { + if (sourceStart < 0 || sourceStart > sourceEnd) { return; } @@ -121,7 +121,7 @@ void KAggregatedModel::Private::rowsAboutToBeInserted(const QModelIndex& sourceP int diff = indexRowDiff(sourceModel, 0); int rowCount = q->rowCount(QModelIndex()); - if(diff < 0 || sourceStart + diff > rowCount) { + if (diff < 0 || sourceStart + diff > rowCount) { return; } int start = sourceStart + diff; @@ -132,11 +132,11 @@ void KAggregatedModel::Private::rowsAboutToBeInserted(const QModelIndex& sourceP void KAggregatedModel::Private::rowsInserted(const QModelIndex& sourceParent, int sourceStart, int sourceEnd) { - if(sourceParent.isValid()) { + if (sourceParent.isValid()) { return; } - if(sourceStart < 0 || sourceStart > sourceEnd) { + if (sourceStart < 0 || sourceStart > sourceEnd) { return; } @@ -144,7 +144,7 @@ void KAggregatedModel::Private::rowsInserted(const QModelIndex& sourceParent, in int diff = indexRowDiff(sourceModel, 0); int rowCount = q->rowCount(QModelIndex()); - if(diff < 0 || sourceEnd + diff > rowCount) { + if (diff < 0 || sourceEnd + diff > rowCount) { return; } @@ -153,11 +153,11 @@ void KAggregatedModel::Private::rowsInserted(const QModelIndex& sourceParent, in void KAggregatedModel::Private::rowsAboutToBeRemoved(const QModelIndex& sourceParent, int sourceStart, int sourceEnd) { - if(sourceParent.isValid()) { + if (sourceParent.isValid()) { return; } - if(sourceStart < 0 || sourceStart > sourceEnd) { + if (sourceStart < 0 || sourceStart > sourceEnd) { return; } @@ -165,7 +165,7 @@ void KAggregatedModel::Private::rowsAboutToBeRemoved(const QModelIndex& sourcePa int diff = indexRowDiff(sourceModel, 0); int rowCount = q->rowCount(QModelIndex()); - if(diff < 0 || sourceStart + diff > rowCount) { + if (diff < 0 || sourceStart + diff > rowCount) { return; } @@ -177,11 +177,11 @@ void KAggregatedModel::Private::rowsAboutToBeRemoved(const QModelIndex& sourcePa void KAggregatedModel::Private::rowsRemoved(const QModelIndex& sourceParent, int sourceStart, int sourceEnd) { - if(sourceParent.isValid()) { + if (sourceParent.isValid()) { return; } - if(sourceStart < 0 || sourceStart > sourceEnd) { + if (sourceStart < 0 || sourceStart > sourceEnd) { return; } @@ -189,7 +189,7 @@ void KAggregatedModel::Private::rowsRemoved(const QModelIndex& sourceParent, int int diff = indexRowDiff(sourceModel, sourceStart); int rowCount = q->rowCount(QModelIndex()); - if(diff < 0 || sourceEnd + diff > rowCount) { + if (diff < 0 || sourceEnd + diff > rowCount) { return; } @@ -210,11 +210,11 @@ KAggregatedModel::~KAggregatedModel() void KAggregatedModel::addSourceModel(QAbstractItemModel *sourceModel) { - if(!sourceModel) { + if (!sourceModel) { return; } - if(d->m_sourceModels.contains(sourceModel)) { + if (d->m_sourceModels.contains(sourceModel)) { return; } @@ -249,7 +249,7 @@ void KAggregatedModel::addSourceModel(QAbstractItemModel *sourceModel) void KAggregatedModel::removeSourceModel(QAbstractItemModel *sourceModel) { - if(!d->m_sourceModels.contains(sourceModel)) { + if (!d->m_sourceModels.contains(sourceModel)) { return; } @@ -283,11 +283,11 @@ void KAggregatedModel::removeSourceModel(QAbstractItemModel *sourceModel) int KAggregatedModel::rowCount(const QModelIndex &parent) const { - if(parent.isValid()) { + if (parent.isValid()) { return 0; } - if(!d->m_sourceModels.isEmpty()) { + if (!d->m_sourceModels.isEmpty()) { const QAbstractItemModel *model = d->m_sourceModels.last(); return d->indexRowDiff(model, model->rowCount(QModelIndex())); @@ -298,7 +298,7 @@ int KAggregatedModel::rowCount(const QModelIndex &parent) const QVariant KAggregatedModel::headerData(int section, Qt::Orientation orientation, int role) const { - if ( role == Qt::DisplayRole && orientation == Qt::Horizontal ) + if (role == Qt::DisplayRole && orientation == Qt::Horizontal) { switch(section) { case 0: @@ -313,16 +313,16 @@ QVariant KAggregatedModel::headerData(int section, Qt::Orientation orientation, QVariant KAggregatedModel::data(const QModelIndex &index, int role) const { - if(!index.isValid()) { + if (!index.isValid()) { return QVariant(); } const QModelIndex sourceIndex = mapToSource(index); - if(!sourceIndex.isValid()) { + if (!sourceIndex.isValid()) { return QVariant(); } - switch(role) { + switch (role) { case Qt::DisplayRole: return sourceIndex.data(role); default: @@ -332,11 +332,11 @@ QVariant KAggregatedModel::data(const QModelIndex &index, int role) const QModelIndex KAggregatedModel::index(int row, int column, const QModelIndex& parent) const { - if(column != 0 || parent.isValid()) { + if (column != 0 || parent.isValid()) { return QModelIndex(); } - if(row < 0 || row > rowCount(QModelIndex())) { + if (row < 0 || row > rowCount(QModelIndex())) { return QModelIndex(); } @@ -357,11 +357,11 @@ int KAggregatedModel::columnCount(const QModelIndex& index) const QModelIndex KAggregatedModel::mapFromSource(const QModelIndex& sourceIndex) const { - if(!sourceIndex.isValid() || sourceIndex.parent().isValid()) { + if (!sourceIndex.isValid() || sourceIndex.parent().isValid()) { return QModelIndex(); } - if(!d->m_sourceModels.contains(sourceIndex.model())) { + if (!d->m_sourceModels.contains(sourceIndex.model())) { return QModelIndex(); } @@ -372,15 +372,15 @@ QModelIndex KAggregatedModel::mapFromSource(const QModelIndex& sourceIndex) cons QModelIndex KAggregatedModel::mapToSource(const QModelIndex& index) const { - if(!index.isValid()) { + if (!index.isValid()) { return QModelIndex(); } int prevRows = 0; - foreach(const QAbstractItemModel *model, d->m_sourceModels) { + foreach (const QAbstractItemModel *model, d->m_sourceModels) { int rowCount = model->rowCount(QModelIndex()); - if(index.row() < prevRows + rowCount) { + if (index.row() < prevRows + rowCount) { return model->index(index.row() - prevRows, 0); } prevRows += rowCount; konqbookmark/itemmodels/kaggregatedmodel.cpp @@ -100,20 +100,21 @@ void KCompletionModel::Private::slotMatches(const QStringList &matches) while (it.hasNext()) { it.next(); - if(!matches.contains(it.key())) { + if (!matches.contains(it.key())) { indexesToRemove.append(it.value()); kDebug() << "removing " << it.key() << "with row =" << it.value().row(); } } - if(!indexesToRemove.empty()) + if (!indexesToRemove.empty()) { removeRows(indexesToRemove); + } QList<QPair<QModelIndex, QVariant> > indexesToAppend; QList<QString>::const_iterator strIt; int count = m_strings.size(); for (strIt = matches.constBegin(); strIt != matches.constEnd(); ++strIt) { - if(!m_reverseIndexes.contains(*strIt)) { + if (!m_reverseIndexes.contains(*strIt)) { QPair<QModelIndex, QVariant> indexPair; indexPair.first = q->createIndex(count++, 0); indexPair.second = *strIt; @@ -123,15 +124,16 @@ void KCompletionModel::Private::slotMatches(const QStringList &matches) } } - if(!indexesToAppend.empty()) + if (!indexesToAppend.empty()) { insertRows(indexesToAppend); + } kDebug() << "rowCount = " << q->rowCount(); } void KCompletionModel::Private::insertRows(const QList<QPair<QModelIndex, QVariant> >& indexes) { - if(indexes.empty()) { + if (indexes.empty()) { return; } @@ -188,7 +190,7 @@ void KCompletionModel::Private::removeRows(const QModelIndexList& list) QModelIndex KCompletionModel::Private::indexForMatch(const QString& match) const { - if(m_reverseIndexes.contains(match)) { + if (m_reverseIndexes.contains(match)) { return m_reverseIndexes.value(match); } @@ -210,7 +212,7 @@ KCompletionModel::~KCompletionModel() int KCompletionModel::rowCount(const QModelIndex &parent) const { - if(parent.isValid()) { + if (parent.isValid()) { return 0; } @@ -220,10 +222,11 @@ int KCompletionModel::rowCount(const QModelIndex &parent) const QVariant KCompletionModel::data(const QModelIndex &index, int role) const { - if (index.row() < 0 || index.row() >= d->m_strings.size()) + if (index.row() < 0 || index.row() >= d->m_strings.size()) { return QVariant(); + } - switch( role ) { + switch(role) { case Qt::DisplayRole: case Qt::EditRole: case CompletionMatchRole: @@ -238,12 +241,11 @@ KCompletion* KCompletionModel::completion() const } void KCompletionModel::setCompletion(KCompletion* completion) { - if(!completion) { + if (!completion) { return; } - if(d->m_completion) - { + if (d->m_completion) { disconnect(d->m_completion, SIGNAL(matches(const QStringList &)), this, SLOT(slotMatches(const QStringList &))); @@ -269,11 +271,10 @@ void KCompletionModel::setCompletion(KCompletion* completion) QModelIndex KCompletionModel::index(int row, int column, const QModelIndex& parent) const { - if(parent.isValid()) - { + if (parent.isValid()) { return QModelIndex(); } - if(row < 0 || row >= d->m_strings.size() || column != 0) { + if (row < 0 || row >= d->m_strings.size() || column != 0) { return QModelIndex(); } @@ -282,11 +283,11 @@ QModelIndex KCompletionModel::index(int row, int column, const QModelIndex& pare QModelIndex KCompletionModel::parent(const QModelIndex& index) const { - if(!index.isValid()) { + if (!index.isValid()) { return QModelIndex(); } - if(index.column() != 0) { + if (index.column() != 0) { QModelIndex index = createIndex(index.row(), 0); return (d->m_indexes.contains(index)) ? index : QModelIndex(); } konqbookmark/itemmodels/kcompletionmodel.cpp @@ -54,8 +54,11 @@ public: enum Roles { CompletionMatchRole = Qt::UserRole + 1 }; + enum {ColumnCount = 1 }; // Qt::DisplayRole + KCompletionModel(QObject * parent); + virtual ~KCompletionModel(); virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; @@ -74,8 +77,8 @@ private: friend class Private; Private* const d; - Q_PRIVATE_SLOT( d, void slotMatches(const QStringList &) ) - Q_PRIVATE_SLOT( d, void slotMatches() ) + Q_PRIVATE_SLOT(d, void slotMatches(const QStringList &)) + Q_PRIVATE_SLOT(d, void slotMatches()) }; #endif // KCOMPLETION_MODEL_H konqbookmark/itemmodels/kcompletionmodel.h @@ -72,7 +72,7 @@ KonqBookmarkModel::KonqBookmarkModel( Akonadi::Session *session, Akonadi::Monito monitor->fetchCollection( true ); monitor->setItemFetchScope( scope ); monitor->setMimeTypeMonitored( mimeType() ); - monitor->setMimeTypeMonitored( Akonadi::Collection::mimeType() ); +// monitor->setMimeTypeMonitored( Akonadi::Collection::mimeType() ); // FIXME Set all monitored because otherwise the model doesn't get updates // from items/collections being removed. monitor->setAllMonitored(true); @@ -83,19 +83,17 @@ KonqBookmarkModel::~KonqBookmarkModel() delete d; } -int KonqBookmarkModel::columnCount( const QModelIndex& index) const +int KonqBookmarkModel::columnCount(const QModelIndex& index) const { Q_UNUSED(index); return 9; } -QVariant KonqBookmarkModel::getHeaderData( int section, Qt::Orientation orientation, int role, int headerSet ) const +QVariant KonqBookmarkModel::getHeaderData(int section, Qt::Orientation orientation, int role, int headerSet ) const { - if ( role == Qt::DisplayRole && orientation == Qt::Horizontal ) - { - switch( section ) - { + if (role == Qt::DisplayRole && orientation == Qt::Horizontal) { + switch(section) { case Title: return i18nc( "@title:column, bookmark title", "Title" ); case Url: @@ -308,12 +306,14 @@ bool KonqBookmarkModel::setData(const QModelIndex &index, const QVariant &value, bool KonqBookmarkModel::removeRows( int row, int count, const QModelIndex & parent) { + kDebug(); Akonadi::TransactionSequence *transaction = new TransactionSequence; - for(int i = row; i < row + count; i++) - { + for (int i = row; i < row + count; i++) { const QModelIndex& entityIndex = index(i, 0, parent); - if(!entityIndex.isValid()) + kDebug() << entityIndex << i << parent; + if (!entityIndex.isValid()) { continue; + } Item item = qVariantValue<Item>(data(entityIndex, EntityTreeModel::ItemRole)); Collection collection = qVariantValue<Collection>(data(entityIndex, EntityTreeModel::CollectionRole)); @@ -326,8 +326,7 @@ bool KonqBookmarkModel::removeRows( int row, int count, const QModelIndex & pare } } - if(!transaction->exec()) - { + if(!transaction->exec()) { kDebug() << transaction->errorString(); return false; } @@ -336,7 +335,7 @@ bool KonqBookmarkModel::removeRows( int row, int count, const QModelIndex & pare QString KonqBookmarkModel::mimeType() const { - return QString("application/x-vnd.kde.konqbookmark"); + return KonqBookmark::mimeType(); } QStringList KonqBookmarkModel::mimeTypes() const konqbookmark/itemmodels/konqbookmarkmodel.cpp @@ -51,12 +51,12 @@ namespace Akonadi }; enum { ColumnCount = 9 }; - KonqBookmarkModel(Akonadi::Session *session, Akonadi::Monitor *monitor, QObject *parent = 0 ); + KonqBookmarkModel(Akonadi::Session *session, Akonadi::Monitor *monitor, QObject *parent = 0); virtual ~KonqBookmarkModel(); - virtual int columnCount( const QModelIndex & parent = QModelIndex() ) const; - virtual QVariant getHeaderData( int section, Qt::Orientation orientation, int role, int headerSet ) const; + virtual int columnCount(const QModelIndex & parent = QModelIndex()) const; + virtual QVariant getHeaderData(int section, Qt::Orientation orientation, int role, int headerSet) const; // We let the delegate know that we are editable Qt::ItemFlags flags(const QModelIndex &index) const; @@ -69,10 +69,11 @@ namespace Akonadi * and also for collections in the next function. EntityTreeModel::data() will then call these * functions. */ - virtual QVariant getData( const Item &item, int column, int role = Qt::DisplayRole ) const; - virtual QVariant getData( const Collection &collection, int column, int role = Qt::DisplayRole ) const; + virtual QVariant getData(const Item &item, int column, int role = Qt::DisplayRole) const; + virtual QVariant getData(const Collection &collection, int column, int role = Qt::DisplayRole) const; - bool removeRows ( int row, int count, const QModelIndex & parent = QModelIndex() ); + bool removeRows(int row, int count, const QModelIndex & parent = QModelIndex()); + // Drag & drop related functions bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent); konqbookmark/itemmodels/konqbookmarkmodel.h @@ -23,7 +23,7 @@ using namespace Akonadi; -KonqBookmarkProxyModel::KonqBookmarkProxyModel( QObject *parent ) +KonqBookmarkProxyModel::KonqBookmarkProxyModel(QObject *parent) : QSortFilterProxyModel(parent) { setDynamicSortFilter(true); @@ -33,22 +33,23 @@ KonqBookmarkProxyModel::KonqBookmarkProxyModel( QObject *parent ) static int indexTypeHelper(const QModelIndex & index) { QString mimeType = index.data(EntityTreeModel::MimeTypeRole).toString(); - if(mimeType == Collection::mimeType()) { + if (mimeType == Collection::mimeType()) { return EntityTreeModel::CollectionRole; } else { return EntityTreeModel::ItemRole; } } -bool KonqBookmarkProxyModel::lessThan ( const QModelIndex & left, const QModelIndex & right ) const +bool KonqBookmarkProxyModel::lessThan(const QModelIndex & left, const QModelIndex & right) const { bool leftIsCollection = indexTypeHelper(left) == EntityTreeModel::CollectionRole; bool rightIsCollection = indexTypeHelper(right) == EntityTreeModel::CollectionRole; - if(leftIsCollection && !rightIsCollection) + if (leftIsCollection && !rightIsCollection) { return true; - else if(!leftIsCollection && rightIsCollection) + } else if (!leftIsCollection && rightIsCollection) { return false; - else + } else { return QSortFilterProxyModel::lessThan(left, right); + } } konqbookmark/itemmodels/konqbookmarkproxymodel.cpp @@ -29,13 +29,13 @@ namespace Akonadi class KONQBOOKMARK_EXPORT KonqBookmarkProxyModel : public QSortFilterProxyModel { public: - KonqBookmarkProxyModel( QObject *parent = 0 ); - protected: + KonqBookmarkProxyModel(QObject *parent = 0); + protected: /** * Reimplemented only to show always folders first */ - bool lessThan ( const QModelIndex & left, const QModelIndex & right ) const; + bool lessThan(const QModelIndex & left, const QModelIndex & right) const; }; } konqbookmark/itemmodels/konqbookmarkproxymodel.h @@ -101,11 +101,12 @@ int PlacesProxyModel::Private::matches(Place* place) matches += place->url().toString().count(m_strQuery, Qt::CaseInsensitive); matches += place->tags().join(",").count(m_strQuery, Qt::CaseInsensitive); matches += place->description().count(m_strQuery, Qt::CaseInsensitive); + kDebug() << place->url() << place->url().toString().count(m_strQuery, Qt::CaseInsensitive) << matches; return matches; } bool PlacesProxyModel::Private::updateRelevance(const QModelIndex& index) -{ +{ Place* place = placeFromIndex(index); QDateTime currentTime = QDateTime::currentDateTime(); @@ -115,13 +116,13 @@ bool PlacesProxyModel::Private::updateRelevance(const QModelIndex& index) int days = place->lastVisited().daysTo(currentTime); - if(days < first_bucket_days) { + if (days < first_bucket_days) { weight = first_bucket_weight; - } else if(days < second_bucket_days) { + } else if (days < second_bucket_days) { weight = second_bucket_weight; - } else if(days < third_bucket_days) { + } else if (days < third_bucket_days) { weight = third_bucket_weight; - } else if(days < fourth_bucket_days) { + } else if (days < fourth_bucket_days) { weight = fourth_bucket_weight; } else { weight = default_bucket_weight; @@ -129,7 +130,7 @@ bool PlacesProxyModel::Private::updateRelevance(const QModelIndex& index) relevance += matches * weight + place->numVisits() * weight; - if(m_relevance[index] == relevance) { + if (m_relevance[index] == relevance) { return false; } @@ -140,7 +141,7 @@ bool PlacesProxyModel::Private::updateRelevance(const QModelIndex& index) void PlacesProxyModel::Private::slotRowsInserted(const QModelIndex& parent, int start, int end) { Q_UNUSED(parent); - for(int i = start; i <= end; i++) { + for (int i = start; i <= end; i++) { QModelIndex index = q->index(i, 0); updateRelevance(index); } @@ -149,7 +150,7 @@ void PlacesProxyModel::Private::slotRowsInserted(const QModelIndex& parent, int void PlacesProxyModel::Private::slotRowsRemoved(const QModelIndex& parent, int start, int end) { Q_UNUSED(parent); - for(int i = start; i <= end; i++) { + for (int i = start; i <= end; i++) { QModelIndex index = q->index(i, 0); m_relevance.remove(index); } @@ -170,6 +171,7 @@ PlacesProxyModel::PlacesProxyModel(QObject *parent) { setSortRole(Place::PlaceRelevanceRole); setSortCaseSensitivity(Qt::CaseInsensitive); + setDynamicSortFilter(false); connect(this, SIGNAL(rowsInserted(const QModelIndex&, int, int)), this, SLOT(slotRowsInserted(const QModelIndex&, int, int))); @@ -191,10 +193,16 @@ PlacesProxyModel::~PlacesProxyModel() void PlacesProxyModel::setQuery(QString query) { - kDebug() << "query"; + if (query.isEmpty()) { + return; + } + + kDebug() << "query=" << query; + emit layoutAboutToBeChanged(); d->m_strQuery = query; - // HACK: triggers a call to d->filter_changed(); - setFilterKeyColumn(0); + d->m_relevance.clear(); + invalidateFilter(); + emit layoutChanged(); } void PlacesProxyModel::setQuery(QVariant query) @@ -209,7 +217,7 @@ QVariant PlacesProxyModel::query() const void PlacesProxyModel::setSourceModel(QAbstractItemModel* sourceModel) { - if(!sourceModel) { + if (!sourceModel) { return; } @@ -224,13 +232,13 @@ void PlacesProxyModel::setSourceModel(QAbstractItemModel* sourceModel) } QVariant PlacesProxyModel::data(const QModelIndex& index, int role) const -{ - switch( role ) - { +{ + switch (role) { case Place::PlaceRelevanceRole: if(!d->m_relevance.contains(index)) { d->updateRelevance(index); } + kDebug() << d->m_relevance[index]; return d->m_relevance[index]; default: return QSortFilterProxyModel::data(index, role); @@ -241,22 +249,25 @@ bool PlacesProxyModel::filterAcceptsRow(int source_row, const QModelIndex& sourc { QModelIndex sourceIndex = sourceModel()->index(source_row, 0, source_parent); - if(!sourceIndex.isValid() || sourceModel()->hasChildren(sourceIndex)) { + if (!sourceIndex.isValid() || sourceModel()->hasChildren(sourceIndex)) { return false; } QVariant variant = sourceIndex.data(Place::PlaceUrlRole); - if(variant == QVariant()) { + if (variant == QVariant()) { return false; } QUrl url = variant.toString(); Place* place = PlacesManager::self()->place(url); + kDebug() << sourceIndex << (d->matches(place) > 0); // Places manager should have all the places! Q_ASSERT_X(place != 0, "placemanager", "Places manager should have all the places!"); - return d->matches(place) > 0; + bool accept = d->matches(place) > 0; + + return accept; } #include "placesproxymodel.moc" konqbookmark/itemmodels/placesproxymodel.cpp @@ -18,6 +18,7 @@ */ #include "locationbar.h" +#include "locationbardelegate.h" #include "kcompletionview.h" #include "placesmanager.h" #include "klineeditview_p.h" @@ -32,6 +33,7 @@ #include <QStringListModel> #include <QStringList> #include <QWidget> +#include <QSortFilterProxyModel> #include <kurlcompletion.h> #include <kurl.h> @@ -72,11 +74,11 @@ void LocationBar::init() { setCompletionMode(KGlobalSettings::CompletionPopup); setClearButtonShown(true); - - // FIXME for now, only one location bar is supported because of this - // completion model. We just need to be able to create new completion models - // that automatically connected to places manager, so it's quite easy. - KCompletionModel* completionModel = PlacesManager::self()->urlCompletionModel(); + completionView()->setItemDelegate(new LocationBarDelegate(this)); + + KCompletionModel *completionModel = new KCompletionModel(this); + completionModel->setCompletion(new KUrlCompletion()); + PlacesManager::self()->registerUrlCompletionModel(completionModel); // connect(this, SIGNAL(textChanged(const QString&)), // completionModel->completion(), SLOT(slotMakeCompletion(const QString &))); @@ -89,11 +91,15 @@ void LocationBar::init() placesProxyModel->setSourceModel(PlacesManager::self()->historyEntriesModel()); KAggregatedModel* aggregatedModel = new KAggregatedModel(this); - aggregatedModel->addSourceModel(completionModel); - aggregatedModel->addSourceModel(historyProxyModel); +// aggregatedModel->addSourceModel(completionModel); +// aggregatedModel->addSourceModel(historyProxyModel); aggregatedModel->addSourceModel(placesProxyModel); - completionView()->setModel(aggregatedModel); + QSortFilterProxyModel *sortModel = new QSortFilterProxyModel(this); + sortModel->setSourceModel(placesProxyModel); + sortModel->setSortRole(Place::PlaceRelevanceRole); + sortModel->setDynamicSortFilter(true); + completionView()->setModel(sortModel); KLineEditViewButton* tempButton = new KLineEditViewButton(this); tempButton->setCursor(Qt::ArrowCursor); konqbookmark/itemviews/locationbar.cpp @@ -70,11 +70,11 @@ KonqBookmark::KonqBookmark(const QUrl& uniqueUri) : d( new Private(uniqueUri.toS { } -KonqBookmark::KonqBookmark() : d( new Private ) +KonqBookmark::KonqBookmark() : d(new Private) { } -KonqBookmark::KonqBookmark( const KonqBookmark &other ) : d( other.d ) +KonqBookmark::KonqBookmark(const KonqBookmark &other) : d(other.d) { } @@ -82,14 +82,20 @@ KonqBookmark::~KonqBookmark() { } -KonqBookmark &KonqBookmark::operator=( const KonqBookmark &other ) +KonqBookmark &KonqBookmark::operator=(const KonqBookmark &other) { - if ( this != &other ) + if (this != &other) { d = other.d; + } return *this; } +bool KonqBookmark::operator==(const KonqBookmark &other) +{ + return other.uniqueUri() == uniqueUri(); +} + Nepomuk::Bookmark KonqBookmark::bookmark() const { return d->m_bookmark; konqbookmark/konqbookmark.cpp @@ -68,24 +68,25 @@ public: * Copy constructor. * @overload */ - KonqBookmark( const KonqBookmark &other ); + KonqBookmark(const KonqBookmark &other); /** * Destructor. */ virtual ~KonqBookmark(); - KonqBookmark &operator=( const KonqBookmark &other ); + KonqBookmark &operator=(const KonqBookmark &other); + bool operator==(const KonqBookmark &other); // Properties Nepomuk::Bookmark bookmark() const; - void setUrl( const QUrl &url ); + void setUrl(const QUrl &url); QUrl url() const; - void setTitle( const QString &title ); + void setTitle(const QString &title); QString title() const; konqbookmark/konqbookmark.h @@ -52,6 +52,7 @@ public: void slotBookmarksInserted(const QModelIndex& parent, int start, int end); void slotBookmarksRemoved(const QModelIndex& parent, int start, int end); + void slotBookmarksChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight); void slotUrlsInserted(const QModelIndex& parent, int start, int end); void slotUrlsRemoved(const QModelIndex& parent, int start, int end); @@ -63,35 +64,28 @@ public: PlacesManager *q; KonqBookmarkModel *m_bookmarksModel; - KCompletionModel *m_urlCompletionModel; QHash<QUrl, KonqHistoryEntry*> m_historyEntries; QHash<QUrl, KonqBookmark*> m_bookmarks; + QHash<QUrl, QUrl> m_uniqueBookmarks; // QHash<uniqueUri(), url()> QHash<QUrl, Place*> m_places; }; PlacesManager::Private::Private(PlacesManager *parent) : q(parent) { - Session* session = new Session(QByteArray( "PlacesManager-" ) + QByteArray::number( qrand() ), q); - Monitor* monitor = new Monitor( q ); - m_bookmarksModel = new KonqBookmarkModel( session, monitor, q ); + Session* session = new Session(QByteArray("PlacesManager-") + QByteArray::number(qrand()), q); + Monitor* monitor = new Monitor(q); + m_bookmarksModel = new KonqBookmarkModel(session, monitor, q); connect(m_bookmarksModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)), q, SLOT(slotBookmarksInserted(const QModelIndex&, int, int))); connect(m_bookmarksModel, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), q, SLOT(slotBookmarksRemoved(const QModelIndex&, int, int))); - - m_urlCompletionModel = new KCompletionModel(q); - // FIXME Undefined reference -// m_urlCompletionModel->setCompletion(new KUrlCompletion()); - - connect(m_urlCompletionModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)), - q, SLOT(slotUrlsInserted(const QModelIndex&, int, int))); - - connect(m_urlCompletionModel, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), - q, SLOT(slotUrlsRemoved(const QModelIndex&, int, int))); + + connect(m_bookmarksModel, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), + q, SLOT(slotBookmarksChanged(const QModelIndex&, const QModelIndex&))); } PlacesManager::Private::~Private() @@ -105,18 +99,17 @@ void PlacesManager::Private::slotBookmarksInserted(const QModelIndex& parent, in if(index.data().toString().isEmpty()) { continue; } - KonqBookmark *konqBookmark = new KonqBookmark(index.data().toString()); + m_uniqueBookmarks[konqBookmark->uniqueUri()] = konqBookmark->url(); + if(konqBookmark->url().toString().isEmpty() || m_bookmarks.contains(konqBookmark->url())) { + continue; + } m_bookmarks[konqBookmark->url()] = konqBookmark; - - kDebug() << konqBookmark->url() << konqBookmark->title(); + kDebug() << konqBookmark->url() << konqBookmark->uniqueUri(); // Update/insert place - Place *place = q->place(konqBookmark->url()); - if(place) { - place->setBookmark(konqBookmark); - } + q->place(konqBookmark->url())->setBookmark(konqBookmark); } } @@ -131,31 +124,85 @@ void PlacesManager::Private::slotBookmarksRemoved(const QModelIndex& parent, int QUrl url(index.data().toString()); if(m_bookmarks.contains(url)) { - // Update/remove place - Place *place = q->place(url); - - Q_ASSERT(place != 0); + Q_ASSERT(m_places[url] != 0); // if history entry is null and the url is not set either, just // remove this place (otherwise we would end up with a place with // both bookmark and history entry unset). Otherwise, we just update the place. m_places[url]->setBookmark(0); - if(!place->historyEntry() && place->url().isEmpty()) { + if(!m_places[url]->historyEntry() && m_places[url]->url().isEmpty()) { delete m_places[url]; m_places.remove(url); } + m_uniqueBookmarks.remove(m_bookmarks[url]->uniqueUri()); delete m_bookmarks[url]; m_bookmarks.remove(url); } } } +void PlacesManager::Private::slotBookmarksChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight) +{ + kDebug() << topLeft << bottomRight; + int start = topLeft.row(); + int end = bottomRight.row(); + if(start > end || start < 0 || topLeft.parent() != bottomRight.parent()) { + return; + } + QModelIndex parent = topLeft.parent(); + + for(int i = start; i <= end; i++) { + QModelIndex index = m_bookmarksModel->index(i, KonqBookmarkModel::UniqueUri, parent); + + kDebug() << index << index.data() << index.data().toString(); + if(index.data().toString().isEmpty() || + !m_uniqueBookmarks.contains(index.data().toString())) { + continue; + } + KonqBookmark *konqBookmark = new KonqBookmark(index.data().toString()); + QUrl oldUrl = m_uniqueBookmarks[index.data().toString()]; + if(!oldUrl.isEmpty() && oldUrl == konqBookmark->url()) { + delete konqBookmark; + continue; + } + // 1. Remove old bookmark + if(!oldUrl.isEmpty()) { + Q_ASSERT(m_places[oldUrl] != 0); + // if history entry is null and the url is not set either, just + // remove this place (otherwise we would end up with a place with + // both bookmark and history entry unset). Otherwise, we just update the place. + m_places[oldUrl]->setBookmark(0); + if(!m_places[oldUrl]->historyEntry() && m_places[oldUrl]->url().isEmpty()) { + delete m_places[oldUrl]; + m_places.remove(oldUrl); + } + + m_uniqueBookmarks[konqBookmark->uniqueUri()] = konqBookmark->url(); + m_bookmarks.remove(oldUrl); + } + + // 2. Add new bookmark if needed + if(konqBookmark->url().toString().isEmpty() || + m_bookmarks.contains(konqBookmark->url())) { + delete konqBookmark; + continue; + } + m_bookmarks[konqBookmark->url()] = konqBookmark; + kDebug() << konqBookmark->url() << konqBookmark->title(); + + // Update/insert place + q->place(konqBookmark->url())->setBookmark(konqBookmark); + + } +} + void PlacesManager::Private::slotUrlsInserted(const QModelIndex& parent, int start, int end) { + KCompletionModel *urlCompletionModel = qobject_cast<KCompletionModel*>(q->sender()); for(int i = start; i <= end; i++) { - QModelIndex index = parent.child(i, 0); + QModelIndex index = urlCompletionModel->index(i, 0, parent); QUrl url = index.data().toString(); @@ -164,17 +211,15 @@ void PlacesManager::Private::slotUrlsInserted(const QModelIndex& parent, int sta } // Update/insert place - Place *place = q->place(url); - if(!place) { - m_places[url] = new Place(url, q); - } + q->place(url); } } void PlacesManager::Private::slotUrlsRemoved(const QModelIndex& parent, int start, int end) { + KCompletionModel *urlCompletionModel = qobject_cast<KCompletionModel*>(q->sender()); for(int i = start; i <= end; i++) { - QModelIndex index = parent.child(i, 0); + QModelIndex index = urlCompletionModel->index(i, 0, parent); QUrl url = index.data().toString(); if(!url.isValid()) { @@ -182,8 +227,7 @@ void PlacesManager::Private::slotUrlsRemoved(const QModelIndex& parent, int star } // Remove - Place *place = q->place(url); - if(place && !place->bookmark() && !place->historyEntry()) { + if(m_places.contains(url) && !m_places[url]->bookmark() && !m_places[url]->historyEntry()) { delete m_places[url]; m_places.remove(url); } @@ -258,9 +302,13 @@ KonqBookmarkModel* PlacesManager::bookmarkModel() return d->m_bookmarksModel; } -KCompletionModel* PlacesManager::urlCompletionModel() +void PlacesManager::registerUrlCompletionModel(KCompletionModel* urlCompletionModel) { - return d->m_urlCompletionModel; + connect(urlCompletionModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)), + this, SLOT(slotUrlsInserted(const QModelIndex&, int, int))); + + connect(urlCompletionModel, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), + this, SLOT(slotUrlsRemoved(const QModelIndex&, int, int))); } konqbookmark/placesmanager.cpp @@ -67,8 +67,8 @@ namespace Konqueror static PlacesManager* self(); virtual Akonadi::KonqBookmarkModel* bookmarkModel(); - virtual KCompletionModel* urlCompletionModel(); virtual QAbstractItemModel* historyEntriesModel() { return 0; } + void registerUrlCompletionModel(KCompletionModel* urlCompletionModel); KonqBookmark* bookmark(const QUrl& url); KonqBookmark* bookmark(const KonqHistoryEntry* historyEntry); @@ -102,6 +102,7 @@ namespace Konqueror Q_PRIVATE_SLOT(d, void slotBookmarksInserted(const QModelIndex&, int, int)) Q_PRIVATE_SLOT(d, void slotBookmarksRemoved(const QModelIndex&, int, int)) + Q_PRIVATE_SLOT(d, void slotBookmarksChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)) Q_PRIVATE_SLOT(d, void slotHistoryEntryAdded(const KonqHistoryEntry &)) Q_PRIVATE_SLOT(d, void slotHistoryEntryRemoved(const KonqHistoryEntry &)) konqbookmark/placesmanager.h @@ -77,32 +77,32 @@ private: }; KonquerorBookmarksResource::Private::Private(KonquerorBookmarksResource *parent) : - mParent( parent ) + mParent(parent) { } KonquerorBookmarksResource::KonquerorBookmarksResource( const QString &id ) - : ResourceBase( id ), d( new Private ( this ) ) + : ResourceBase(id), d(new Private(this)) { kDebug(); Nepomuk::ResourceManager::instance()->init(); - new SettingsAdaptor( Settings::self() ); - QDBusConnection::sessionBus().registerObject( QLatin1String( "/Settings" ), - Settings::self(), QDBusConnection::ExportAdaptors ); + new SettingsAdaptor(Settings::self()); + QDBusConnection::sessionBus().registerObject(QLatin1String("/Settings"), + Settings::self(), QDBusConnection::ExportAdaptors); changeRecorder()->itemFetchScope().fetchFullPayload(); - changeRecorder()->fetchCollection( true ); + changeRecorder()->fetchCollection(true); QStringList mimeTypes; mimeTypes << KonqBookmark::mimeType() << Collection::mimeType(); - d->mBookmarksRootCollection.setParent( Collection::root() ); - d->mBookmarksRootCollection.setRemoteId( "konqbookmark:/" ); - d->mBookmarksRootCollection.setName( i18n("Konqueror Bookmarks") ); - d->mBookmarksRootCollection.setContentMimeTypes( mimeTypes ); + d->mBookmarksRootCollection.setParent(Collection::root()); + d->mBookmarksRootCollection.setRemoteId("konqbookmark:/"); + d->mBookmarksRootCollection.setName(i18n("Konqueror Bookmarks")); + d->mBookmarksRootCollection.setContentMimeTypes(mimeTypes); EntityDisplayAttribute* attr = - d->mBookmarksRootCollection.attribute<EntityDisplayAttribute>( Collection::AddIfMissing ); - attr->setDisplayName( i18n("Konqueror Bookmarks") ); - attr->setIconName( QLatin1String( "bookmarks" ) ); + d->mBookmarksRootCollection.attribute<EntityDisplayAttribute>(Collection::AddIfMissing); + attr->setDisplayName(i18n("Konqueror Bookmarks")); + attr->setIconName(QLatin1String("bookmarks")); QString latestBookmarksQuery = QString( @@ -114,7 +114,7 @@ KonquerorBookmarksResource::KonquerorBookmarksResource( const QString &id ) "?r nao:created ?time . } " "ORDER BY DESC(?time) " "LIMIT 20") - .arg( Soprano::Vocabulary::NAO::naoNamespace().toString() ); + .arg(Soprano::Vocabulary::NAO::naoNamespace().toString()); QString unclasifiedBookmarksQuery = QString( @@ -126,7 +126,7 @@ KonquerorBookmarksResource::KonquerorBookmarksResource( const QString &id ) "?r nao:created ?time . } " "ORDER BY DESC(?time) " "LIMIT 20") - .arg( Soprano::Vocabulary::NAO::naoNamespace().toString() ); + .arg(Soprano::Vocabulary::NAO::naoNamespace().toString()); // TODO: What happens if it aleady exists? we should not create a new one // or at least we should remove the pre-existing virtual collection @@ -191,28 +191,28 @@ Collection::List listRecursive( const Nepomuk::BookmarkFolder& parent, const Col Collection::List list; QStringList mimeTypes; - if(!parent.hasProperty(Nepomuk::BookmarkFolder::containsBookmarkFolderUri())) + if (!parent.hasProperty(Nepomuk::BookmarkFolder::containsBookmarkFolderUri())) { return list; + } QList<Nepomuk::BookmarkFolder> bookmarkFolders = parent.containsBookmarkFolders(); mimeTypes << KonqBookmark::mimeType() << Collection::mimeType(); - foreach( const Nepomuk::BookmarkFolder& bookmarkFolder, bookmarkFolders ) - { + foreach(const Nepomuk::BookmarkFolder& bookmarkFolder, bookmarkFolders) { Collection col; - if(!bookmarkFolder.titles().empty()) - { + if (!bookmarkFolder.titles().empty()) { kDebug() << "folder:" << bookmarkFolder.titles().first() << bookmarkFolder.containsBookmarks().size(); col.setName( bookmarkFolder.titles().first() ); - } else // shouldn't happen + } else { // shouldn't happen col.setName( "" ); + } - col.setRemoteId( bookmarkFolder.resourceUri().toString() ); - col.setParent( parentCol ); - col.setContentMimeTypes( mimeTypes ); + col.setRemoteId(bookmarkFolder.resourceUri().toString()); + col.setParent(parentCol); + col.setContentMimeTypes(mimeTypes); list << col; - list << listRecursive( bookmarkFolder, col ); + list << listRecursive(bookmarkFolder, col); } return list; @@ -221,14 +221,14 @@ Collection::List listRecursive( const Nepomuk::BookmarkFolder& parent, const Col void KonquerorBookmarksResource::retrieveCollections() { kDebug(); - Nepomuk::BookmarkFolder bookmarkFolder( d->mBookmarksRootCollection.remoteId() ); + Nepomuk::BookmarkFolder bookmarkFolder(d->mBookmarksRootCollection.remoteId()); Collection::List list; list << d->mBookmarksRootCollection; - list += listRecursive( bookmarkFolder, d->mBookmarksRootCollection ); - collectionsRetrieved( list ); + list += listRecursive(bookmarkFolder, d->mBookmarksRootCollection); + collectionsRetrieved(list); } -void KonquerorBookmarksResource::retrieveItems( const Akonadi::Collection &collection ) +void KonquerorBookmarksResource::retrieveItems(const Akonadi::Collection &collection) { // this method is called when Akonadi wants to know about all the // items in the given collection. You can but don't have to provide all the @@ -236,26 +236,25 @@ void KonquerorBookmarksResource::retrieveItems( const Akonadi::Collection &colle // Depending on how your resource accesses the data, there are several // different ways to tell Akonadi when you are done. - Nepomuk::BookmarkFolder folder( collection.remoteId() ); + Nepomuk::BookmarkFolder folder(collection.remoteId()); QList<Nepomuk::Bookmark> bookmarks = folder.containsBookmarks(); kDebug() << collection.name() << folder.containsBookmarks().size(); Item::List items; - foreach( const Nepomuk::Bookmark& bookmark, bookmarks ) - { + foreach (const Nepomuk::Bookmark& bookmark, bookmarks) { Item item; - KonqBookmark konqBookmark(bookmark.resourceUri().toString() ); - item.setRemoteId( bookmark.resourceUri().toString() ); - item.setMimeType( KonqBookmark::mimeType() ); - item.setPayload<KonqBookmark>( konqBookmark ); + KonqBookmark konqBookmark(bookmark.resourceUri().toString()); + item.setRemoteId(bookmark.resourceUri().toString()); + item.setMimeType(KonqBookmark::mimeType()); + item.setPayload<KonqBookmark>(konqBookmark); items << item; } - itemsRetrieved( items ); + itemsRetrieved(items); } -bool KonquerorBookmarksResource::retrieveItem( const Akonadi::Item &item, const QSet<QByteArray> &parts ) +bool KonquerorBookmarksResource::retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) { - Q_UNUSED( item ); - Q_UNUSED( parts ); + Q_UNUSED(item); + Q_UNUSED(parts); // this method is called when Akonadi wants more data for a given item. // You can only provide the parts that have been requested but you are allowed @@ -273,136 +272,136 @@ void KonquerorBookmarksResource::aboutToQuit() // to do at the moment } -void KonquerorBookmarksResource::configure( WId windowId ) +void KonquerorBookmarksResource::configure(WId windowId) { - Q_UNUSED( windowId ); + Q_UNUSED(windowId); // TODO Here we will show the "Organize bookmarks.." dialog. } -void KonquerorBookmarksResource::itemAdded( const Akonadi::Item &item, const Akonadi::Collection &collection ) +void KonquerorBookmarksResource::itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) { kDebug() << collection.name(); - if(!item.hasPayload<KonqBookmark>()) - { + if (!item.hasPayload<KonqBookmark>()) { kDebug() << "!item.hasPayload<KonqBookmark>()"; return; } KonqBookmark konqBookmark = item.payload<KonqBookmark>(); - Nepomuk::BookmarkFolder folder( collection.remoteId() ); + Nepomuk::BookmarkFolder folder(collection.remoteId()); folder.addContainsBookmark(konqBookmark.bookmark()); // Set the remote Id (as suggested by vkrause) kDebug() << "Setting item's remote id to " << konqBookmark.uniqueUri(); Akonadi::Item itemCopy = item; - itemCopy.setRemoteId( konqBookmark.uniqueUri() ); + itemCopy.setRemoteId(konqBookmark.uniqueUri()); changeCommitted(itemCopy); } -void KonquerorBookmarksResource::itemChanged( const Akonadi::Item &item, const QSet<QByteArray> &parts ) +void KonquerorBookmarksResource::itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) { kDebug() << item.remoteId(); - Q_UNUSED( parts ); - if(!item.hasPayload<KonqBookmark>()) - { + Q_UNUSED(parts); + if (!item.hasPayload<KonqBookmark>()) { kDebug() << "!item.hasPayload<KonqBookmark>()"; return; } KonqBookmark konqBookmark = item.payload<KonqBookmark>(); - if(item.remoteId() != konqBookmark.uniqueUri()) - { + if(item.remoteId() != konqBookmark.uniqueUri()) { // Set the remote Id (as suggested by vkrause) kDebug() << "Setting item's remote id to " << konqBookmark.uniqueUri(); Akonadi::Item itemCopy = item; - itemCopy.setRemoteId( konqBookmark.uniqueUri() ); + itemCopy.setRemoteId(konqBookmark.uniqueUri()); changeCommitted(itemCopy); } } void KonquerorBookmarksResource::itemRemoved( const Akonadi::Item &item ) { - if(!item.hasPayload<KonqBookmark>()) - { + kDebug(); + if (!item.hasPayload<KonqBookmark>()) { kDebug() << "!item.hasPayload<KonqBookmark>()"; return; } KonqBookmark konqBookmark = item.payload<KonqBookmark>(); - Nepomuk::Bookmark bookmark( konqBookmark.uniqueUri() ); - if(bookmark.isValid()) + Nepomuk::Bookmark bookmark(konqBookmark.uniqueUri()); + if (bookmark.isValid()) { bookmark.remove(); + } + + changeCommitted(item); } -void KonquerorBookmarksResource::collectionAdded( const Akonadi::Collection &collection, const Akonadi::Collection &parent ) +void KonquerorBookmarksResource::collectionAdded(const Akonadi::Collection &collection, const Akonadi::Collection &parent) { QString uniqueUri = KonqBookmark::generateUniqueUri(); kDebug() << "adding " << collection.name() << " with remoteId = " << uniqueUri << " to parent = " << parent.remoteId() << ", parent.name() =" << parent.name(); Akonadi::Collection parentCollection = parent; - if(parent.remoteId().isEmpty()) + if (parent.remoteId().isEmpty()) { parentCollection = d->mBookmarksRootCollection; + } // Create bookmark folder - Nepomuk::BookmarkFolder bookmarkFolder( uniqueUri ); - bookmarkFolder.setTitles( QStringList(collection.name()) ); + Nepomuk::BookmarkFolder bookmarkFolder(uniqueUri); + bookmarkFolder.setTitles(QStringList(collection.name())); // Set parent folder - Nepomuk::BookmarkFolder parentBookmarkFolder( parentCollection.remoteId() ); - if(!parentBookmarkFolder.containsBookmarkFolders().contains(bookmarkFolder)) + Nepomuk::BookmarkFolder parentBookmarkFolder(parentCollection.remoteId()); + if (!parentBookmarkFolder.containsBookmarkFolders().contains(bookmarkFolder)) { parentBookmarkFolder.addContainsBookmarkFolder( bookmarkFolder ); + } // Set the remote Id (as suggested by vkrause) Akonadi::Collection collectionCopy = collection; - collectionCopy.setRemoteId( uniqueUri ); - collectionCopy.setParent( parentCollection ); + collectionCopy.setRemoteId(uniqueUri); + collectionCopy.setParent(parentCollection); changeCommitted(collectionCopy); } -void KonquerorBookmarksResource::collectionChanged( const Akonadi::Collection &collection ) +void KonquerorBookmarksResource::collectionChanged(const Akonadi::Collection &collection) { kDebug() << collection.name(); // At the moment, the only thing a collection can change is it's name - Nepomuk::BookmarkFolder bookmarkFolder( collection.remoteId() ); + Nepomuk::BookmarkFolder bookmarkFolder(collection.remoteId()); // Set parent folder; - if(bookmarkFolder.titles() != QStringList(collection.name())) + if (bookmarkFolder.titles() != QStringList(collection.name())) { bookmarkFolder.setTitles( QStringList(collection.name()) ); + } } -void KonquerorBookmarksResource::collectionRemoved( const Akonadi::Collection &collection ) +void KonquerorBookmarksResource::collectionRemoved(const Akonadi::Collection &collection) { kDebug() << collection.name(); // Root collection cannot be removed - if(collection.remoteId() == "konqbookmark:/") + if (collection.remoteId() == "konqbookmark:/") { return; + } // Remove all the bookmarks inside this folder - Nepomuk::BookmarkFolder bookmarkFolder( collection.remoteId() ); + Nepomuk::BookmarkFolder bookmarkFolder(collection.remoteId()); QList<Nepomuk::Bookmark> bookmarks = bookmarkFolder.containsBookmarks(); - foreach( const Nepomuk::Bookmark& bookmark, bookmarks ) - { + foreach (const Nepomuk::Bookmark& bookmark, bookmarks) { Item item; - item.setRemoteId( bookmark.resourceUri().toString() ); - Akonadi::ItemDeleteJob *job = new Akonadi::ItemDeleteJob( item ); - if ( !job->exec() ) - { + item.setRemoteId(bookmark.resourceUri().toString()); + Akonadi::ItemDeleteJob *job = new Akonadi::ItemDeleteJob(item); + if (!job->exec()) { kDebug() << "Error deleting an bookmark item"; } } // Remove recursively all the subfolders QList<Nepomuk::BookmarkFolder> bookmarkFolders = bookmarkFolder.containsBookmarkFolders(); - foreach( const Nepomuk::BookmarkFolder& subFolder, bookmarkFolders ) - { + foreach (const Nepomuk::BookmarkFolder& subFolder, bookmarkFolders) { Collection subCollection; - subCollection.setRemoteId( subFolder.resourceUri().toString() ); + subCollection.setRemoteId(subFolder.resourceUri().toString()); - Akonadi::CollectionDeleteJob *job = new Akonadi::CollectionDeleteJob( subCollection ); - if ( !job->exec() ) - { + Akonadi::CollectionDeleteJob *job = new Akonadi::CollectionDeleteJob(subCollection); + if (!job->exec()) { kDebug() << "Error deleting a bookmark folder"; } } @@ -410,6 +409,6 @@ void KonquerorBookmarksResource::collectionRemoved( const Akonadi::Collection &c changeCommitted(collection); } -AKONADI_RESOURCE_MAIN( KonquerorBookmarksResource ) +AKONADI_RESOURCE_MAIN(KonquerorBookmarksResource) #include "konquerorbookmarksresource.moc" konquerorbookmarks/konquerorbookmarksresource.cpp @@ -6,5 +6,5 @@ Exec=akonadi_konquerorbookmarks_resource Icon=bookmarks X-Akonadi-MimeTypes=application/x-vnd.kde.konqbookmark -X-Akonadi-Capabilities=Resource +X-Akonadi-Capabilities=Resource,Unique,Autostart X-Akonadi-Identifier=akonadi_konquerorbookmarks_resource konquerorbookmarks/konquerorbookmarksresource.desktop e7c1e58fc76597370c9de4a808b68d6d68bc9dc3 Eduardo RE edulix@edulix-laptop.(none) http://github.com/edulix/gsoc/commit/4e12d9b721f4d8c2c0478598a7735af31aa3569c 4e12d9b721f4d8c2c0478598a7735af31aa3569c 2009-09-03T04:16:40-07:00 2009-09-03T04:16:40-07:00 * delete works again * default selected collection gets set again to the first collection inserted * starts the work on the LocationDelegate * Now it's possible to have more than one location bar, needed if we want to be able to use the loation bar as the editor widget for urls in the bookmarks organizer * adapting the code to kdelibs style (not finished) * location bar now gets newly added bookmarks too * BookmarksView::getParentCollection(): adding a bookmark no longer has problems when no collection is selected in the bookmarks view. f32ac4a4c469d77cc325a156be0178ee0d4b0157 Eduardo RE edulix@edulix-laptop.(none)