The folders-panel signals have been adjusted too for consistency.
}
}
+void DolphinMainWindow::openNewActivatedTab(const KUrl& url)
+{
+ openNewTab(url);
+ m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
+}
+
void DolphinMainWindow::activateNextTab()
{
if (m_viewTab.count() >= 2) {
m_tabIndex = m_tabBar->currentIndex();
}
-void DolphinMainWindow::handlePlacesClick(const KUrl& url, Qt::MouseButtons buttons)
-{
- if (buttons & Qt::MidButton) {
- openNewTab(url);
- m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
- } else {
- changeUrl(url);
- }
-}
-
void DolphinMainWindow::slotTestCanDecode(const QDragMoveEvent* event, bool& canDecode)
{
canDecode = KUrl::List::canDecode(event->mimeData());
addDockWidget(Qt::LeftDockWidgetArea, foldersDock);
connect(this, SIGNAL(urlChanged(KUrl)),
foldersPanel, SLOT(setUrl(KUrl)));
- connect(foldersPanel, SIGNAL(changeUrl(KUrl,Qt::MouseButtons)),
- this, SLOT(handlePlacesClick(KUrl,Qt::MouseButtons)));
+ connect(foldersPanel, SIGNAL(folderActivated(KUrl)),
+ this, SLOT(changeUrl(KUrl)));
+ connect(foldersPanel, SIGNAL(folderMiddleClicked(KUrl)),
+ this, SLOT(openNewActivatedTab(KUrl)));
// Setup "Terminal"
#ifndef Q_OS_WIN
createPanelAction(KIcon("bookmarks"), Qt::Key_F9, placesAction, "show_places_panel");
addDockWidget(Qt::LeftDockWidgetArea, placesDock);
- //connect(placesPanel, SIGNAL(urlChanged(KUrl,Qt::MouseButtons)),
- // this, SLOT(handlePlacesClick(KUrl,Qt::MouseButtons)));
+ connect(placesPanel, SIGNAL(placeActivated(KUrl)),
+ this, SLOT(changeUrl(KUrl)));
+ connect(placesPanel, SIGNAL(placeMiddleClicked(KUrl)),
+ this, SLOT(openNewActivatedTab(KUrl)));
connect(this, SIGNAL(urlChanged(KUrl)),
placesPanel, SLOT(setUrl(KUrl)));
connect(placesDock, SIGNAL(visibilityChanged(bool)),
void openNewTab();
/**
- * Opens a new tab showing the URL \a url.
+ * Opens a new tab in the background showing the URL \a url.
*/
void openNewTab(const KUrl& url);
+ /**
+ * Opens a new tab showing the URL \a url and activates
+ * the tab.
+ */
+ void openNewActivatedTab(const KUrl& url);
+
void activateNextTab();
void activatePrevTab();
*/
void slotTabMoved(int from, int to);
- /**
- * Handles a click on a places item: if the middle mouse button is
- * clicked, a new tab is opened for \a url, otherwise the current
- * view is replaced by \a url.
- */
- void handlePlacesClick(const KUrl& url, Qt::MouseButtons buttons);
-
/**
* Is connected to the KTabBar signal testCanDecode() and adjusts
* the output parameter \a accept.
#include "kstandarditem.h"
+#include <KDebug>
+
KStandardItem::KStandardItem(KStandardItem* parent) :
- m_text(),
- m_icon(),
- m_group(),
m_parent(parent),
m_children(),
- m_model(0)
+ m_model(0),
+ m_data()
{
}
KStandardItem::KStandardItem(const QString& text, KStandardItem* parent) :
- m_text(text),
- m_icon(),
- m_group(),
m_parent(parent),
m_children(),
- m_model(0)
+ m_model(0),
+ m_data()
{
+ setText(text);
}
KStandardItem::KStandardItem(const QIcon& icon, const QString& text, KStandardItem* parent) :
- m_text(text),
- m_icon(icon),
- m_group(),
m_parent(parent),
m_children(),
- m_model(0)
+ m_model(0),
+ m_data()
{
+ setIcon(icon);
+ setText(text);
}
KStandardItem::~KStandardItem()
void KStandardItem::setText(const QString& text)
{
- m_text = text;
+ m_data.insert("text", text);
}
QString KStandardItem::text() const
{
- return m_text;
+ return m_data["text"].toString();
}
void KStandardItem::setIcon(const QIcon& icon)
{
- m_icon = icon;
+ m_data.insert("iconName", icon.name());
}
QIcon KStandardItem::icon() const
{
- return m_icon;
+ return QIcon(m_data["iconName"].toString());
}
void KStandardItem::setGroup(const QString& group)
{
- m_group = group;
+ m_data.insert("group", group);
}
QString KStandardItem::group() const
{
- return m_group;
+ return m_data["group"].toString();
+}
+
+void KStandardItem::setDataValue(const QByteArray& role, const QVariant& value)
+{
+ m_data.insert(role, value);
+}
+
+QVariant KStandardItem::dataValue(const QByteArray& role) const
+{
+ return m_data[role];
}
void KStandardItem::setParent(KStandardItem* parent)
return m_parent;
}
+QHash<QByteArray, QVariant> KStandardItem::data() const
+{
+ return m_data;
+}
+
QList<KStandardItem*> KStandardItem::children() const
{
return m_children;
#include <libdolphin_export.h>
+#include <QByteArray>
+#include <QHash>
#include <QIcon>
#include <QList>
+#include <QVariant>
class KStandardItemModel;
/**
* @brief Represents and item of KStandardItemModel.
*
- * Provides setter- and getter-methods for most commonly
- * used properties.
+ * Provides setter- and getter-methods for the most commonly
+ * used roles. It is possible to assign values for custom
+ * roles by using setDataValue().
*/
class LIBDOLPHINPRIVATE_EXPORT KStandardItem
{
KStandardItem(const QIcon& icon, const QString& text, KStandardItem* parent = 0);
virtual ~KStandardItem();
+ /**
+ * Sets the text for the "text"-role.
+ */
void setText(const QString& text);
QString text() const;
+ /**
+ * Sets the icon for the "iconName"-role.
+ */
void setIcon(const QIcon& icon);
QIcon icon() const;
+ /**
+ * Sets the group for the "group"-role.
+ */
void setGroup(const QString& group);
QString group() const;
+ void setDataValue(const QByteArray& role, const QVariant& value);
+ QVariant dataValue(const QByteArray& role) const;
+
void setParent(KStandardItem* parent);
KStandardItem* parent() const;
+ QHash<QByteArray, QVariant> data() const;
QList<KStandardItem*> children() const;
private:
- QString m_text;
- QIcon m_icon;
- QString m_group;
KStandardItem* m_parent;
QList<KStandardItem*> m_children;
KStandardItemModel* m_model;
+ QHash<QByteArray, QVariant> m_data;
+
friend class KStandardItemModel;
};
case DetailsLayout: {
QRectF rect = m_textRect;
- const TextInfo* textInfo = m_textInfo.value(m_sortedVisibleRoles.first());
+ const TextInfo* textInfo = m_textInfo.value(m_sortedVisibleRoles.first());
rect.setTop(textInfo->pos.y());
rect.setBottom(textInfo->pos.y() + textInfo->staticText.size().height());
+
+ const KItemListStyleOption& option = styleOption();
+ if (option.extendedSelectionRegion) {
+ const QString text = textInfo->staticText.text();
+ rect.setWidth(option.fontMetrics.width(text) + 2 * option.padding);
+ }
+
return rect;
}
m_indexesForItems.insert(item, index);
item->m_model = this;
// TODO: no hierarchical items are handled yet
+
+ emit itemsInserted(KItemRangeList() << KItemRange(index, 1));
}
}
QHash<QByteArray, QVariant> KStandardItemModel::data(int index) const
{
- // TODO: Ugly hack
- QHash<QByteArray, QVariant> values;
const KStandardItem* item = m_items[index];
- values.insert("text", item->text());
- values.insert("iconName", item->icon().name());
- return values;
+ if (item) {
+ return item->data();
+ }
+ return QHash<QByteArray, QVariant>();
}
bool KStandardItemModel::setData(int index, const QHash<QByteArray, QVariant>& values)
{
const KFileItem item = m_model->fileItem(index);
if (!item.isNull()) {
- emit changeUrl(item.url(), Qt::LeftButton);
+ emit folderActivated(item.url());
}
}
{
const KFileItem item = m_model->fileItem(index);
if (!item.isNull()) {
- emit changeUrl(item.url(), Qt::MiddleButton);
+ emit folderMiddleClicked(item.url());
}
}
void rename(const KFileItem& item);
signals:
- /**
- * Is emitted if the an URL change is requested.
- */
- void changeUrl(const KUrl& url, Qt::MouseButtons buttons);
+ void folderActivated(const KUrl& url);
+ void folderMiddleClicked(const KUrl& url);
protected:
/** @see Panel::urlChanged() */
/***************************************************************************
* Copyright (C) 2008-2012 by Peter Penz <peter.penz19@gmail.com> *
- * Copyright (C) 2010 by Christian Muehlhaeuser <muesli@gmail.com> *
+ * *
+ * Based on KFilePlacesModel from kdelibs: *
+ * Copyright (C) 2007 Kevin Ottens <ervin@kde.org> *
+ * Copyright (C) 2007 David Faure <faure@kde.org> *
* *
* 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 *
#include "placespanel.h"
+#include <KBookmark>
+#include <KBookmarkGroup>
+#include <KBookmarkManager>
+#include <KComponentData>
+#include <KDebug>
#include <KIcon>
#include <kitemviews/kitemlistcontainer.h>
#include <kitemviews/kitemlistcontroller.h>
#include <kitemviews/kstandarditem.h>
#include <kitemviews/kstandarditemlistview.h>
#include <kitemviews/kstandarditemmodel.h>
+#include <KStandardDirs>
#include <views/draganddrophelper.h>
#include <QVBoxLayout>
#include <QShowEvent>
PlacesPanel::PlacesPanel(QWidget* parent) :
Panel(parent),
m_controller(0),
- m_model(0)
+ m_model(0),
+ m_availableDevices(),
+ m_bookmarkManager(0)
{
}
// Postpone the creating of the controller to the first show event.
// This assures that no performance and memory overhead is given when the folders panel is not
// used at all and stays invisible.
- KStandardItemListView* view = new KStandardItemListView();
+ const QString file = KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml");
+ m_bookmarkManager = KBookmarkManager::managerForFile(file, "kfileplaces");
m_model = new KStandardItemModel(this);
- m_model->appendItem(new KStandardItem("Temporary"));
- m_model->appendItem(new KStandardItem("out of"));
- m_model->appendItem(new KStandardItem("order. Press"));
- m_model->appendItem(new KStandardItem("F9 and use"));
- m_model->appendItem(new KStandardItem("the left icon"));
- m_model->appendItem(new KStandardItem("of the location"));
- m_model->appendItem(new KStandardItem("bar instead."));
+ loadBookmarks();
+
+ KStandardItemListView* view = new KStandardItemListView();
m_controller = new KItemListController(m_model, view, this);
+ m_controller->setSelectionBehavior(KItemListController::SingleSelection);
+ connect(m_controller, SIGNAL(itemActivated(int)), this, SLOT(slotItemActivated(int)));
+ connect(m_controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int)));
KItemListContainer* container = new KItemListContainer(m_controller, this);
container->setEnabledFrame(false);
Panel::showEvent(event);
}
+void PlacesPanel::slotItemActivated(int index)
+{
+ const KStandardItem* item = m_model->item(index);
+ if (item) {
+ const KUrl url = item->dataValue("url").value<KUrl>();
+ emit placeActivated(url);
+ }
+}
+
+void PlacesPanel::slotItemMiddleClicked(int index)
+{
+ const KStandardItem* item = m_model->item(index);
+ if (item) {
+ const KUrl url = item->dataValue("url").value<KUrl>();
+ emit placeMiddleClicked(url);
+ }
+}
+
void PlacesPanel::slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent)
{
Q_UNUSED(parent);
DragAndDropHelper::dropUrls(KFileItem(), dest, event);
}
+void PlacesPanel::loadBookmarks()
+{
+ KBookmarkGroup root = m_bookmarkManager->root();
+ KBookmark bookmark = root.first();
+ QSet<QString> devices = m_availableDevices;
+
+ while (!bookmark.isNull()) {
+ const QString udi = bookmark.metaDataItem("UDI");
+ const QString appName = bookmark.metaDataItem("OnlyInApp");
+ const bool deviceAvailable = devices.remove(udi);
+
+ const bool allowedHere = appName.isEmpty() || (appName == KGlobal::mainComponent().componentName());
+
+ if ((udi.isEmpty() && allowedHere) || deviceAvailable) {
+ KStandardItem* item = new KStandardItem();
+ item->setIcon(KIcon(bookmark.icon()));
+ item->setText(bookmark.text());
+ item->setDataValue("address", bookmark.address());
+ item->setDataValue("url", bookmark.url());
+ if (deviceAvailable) {
+ item->setDataValue("udi", udi);
+ }
+ m_model->appendItem(item);
+ }
+
+ bookmark = root.next(bookmark);
+ }
+}
+
#include "placespanel.moc"
#define PLACESPANEL_H
#include <panels/panel.h>
+#include <QSet>
+class KBookmarkManager;
class KItemListController;
class KStandardItemModel;
PlacesPanel(QWidget* parent);
virtual ~PlacesPanel();
+signals:
+ void placeActivated(const KUrl& url);
+ void placeMiddleClicked(const KUrl& url);
+
protected:
virtual bool urlChanged();
virtual void showEvent(QShowEvent* event);
private slots:
+ void slotItemActivated(int index);
+ void slotItemMiddleClicked(int index);
void slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent);
+private:
+ void loadBookmarks();
+
private:
KItemListController* m_controller;
KStandardItemModel* m_model;
+ QSet<QString> m_availableDevices;
+ KBookmarkManager* m_bookmarkManager;
};
#endif // PLACESPANEL_H
projects / dolphin.git / commitdiff