kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Provide additional default groups for the Places Panel

Browse source 
If Nepomuk is enabled, it is now possible to easily search for
some most common queries by having additional groups.
This commit is contained in:
Peter Penz 2012-04-24 23:16:35 +02:00
parent ba2593247b
commit d9de391720
19 changed files with 464 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/CMakeLists.txt
View file

@ -18,7 +18,6 @@ add_subdirectory(tests)
########### next target ###############
set(dolphinprivate_LIB_SRCS
kitemviews/kfileitemlistgroupheader.cpp
kitemviews/kfileitemlistview.cpp
kitemviews/kfileitemlistwidget.cpp
kitemviews/kfileitemmodel.cpp
@ -33,6 +32,7 @@ set(dolphinprivate_LIB_SRCS
kitemviews/kitemlistwidget.cpp
kitemviews/kitemmodelbase.cpp
kitemviews/kstandarditem.cpp
kitemviews/kstandarditemlistgroupheader.cpp
kitemviews/kstandarditemlistview.cpp
kitemviews/kstandarditemlistwidget.cpp
kitemviews/kstandarditemmodel.cpp
@ -143,6 +143,7 @@ set(dolphin_SRCS
panels/information/pixmapviewer.cpp
panels/information/phononwidget.cpp
panels/places/placespanel.cpp
panels/places/placesitemlistgroupheader.cpp
panels/panel.cpp
panels/folders/treeviewcontextmenu.cpp
panels/folders/folderspanel.cpp

6
src/kitemviews/kfileitemlistview.cpp
View file

@ -19,7 +19,6 @@
#include "kfileitemlistview.h"
#include "kfileitemlistgroupheader.h"
#include "kfileitemmodelrolesupdater.h"
#include "kfileitemlistwidget.h"
#include "kfileitemmodel.h"
@ -190,11 +189,6 @@ KItemListWidgetCreatorBase* KFileItemListView::defaultWidgetCreator() const
return new KItemListWidgetCreator<KFileItemListWidget>();
}
KItemListGroupHeaderCreatorBase* KFileItemListView::defaultGroupHeaderCreator() const
{
return new KItemListGroupHeaderCreator<KFileItemListGroupHeader>();
}
void KFileItemListView::onPreviewsShownChanged(bool shown)
{
Q_UNUSED(shown);

1
src/kitemviews/kfileitemlistview.h
View file

@ -77,7 +77,6 @@ public:
protected:
virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const;
virtual KItemListGroupHeaderCreatorBase* defaultGroupHeaderCreator() const;
virtual void onPreviewsShownChanged(bool shown);
virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous);
virtual void onModelChanged(KItemModelBase* current, KItemModelBase* previous);

31
src/kitemviews/kitemlistgroupheader.cpp
View file

@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include "kitemlistgroupheader.h"
#include "kstandarditemlistgroupheader.h"
#include "kitemlistview.h"
@ -37,7 +37,7 @@ KItemListGroupHeader::KItemListGroupHeader(QGraphicsWidget* parent) :
m_styleOption(),
m_scrollOrientation(Qt::Vertical),
m_itemIndex(-1),
m_lineColor(),
m_separatorColor(),
m_roleColor(),
m_roleBounds()
{
@ -124,6 +124,7 @@ Qt::Orientation KItemListGroupHeader::scrollOrientation() const
void KItemListGroupHeader::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
{
Q_UNUSED(painter);
Q_UNUSED(option);
Q_UNUSED(widget);
@ -131,28 +132,8 @@ void KItemListGroupHeader::paint(QPainter* painter, const QStyleOptionGraphicsIt
updateCache();
}
if (m_itemIndex == 0) {
// No top- or left-line should be drawn for the first group-header
return;
}
painter->setPen(m_lineColor);
if (m_scrollOrientation == Qt::Horizontal) {
painter->drawLine(0, 0, 0, size().height() - 1);
} else {
painter->drawLine(0, 0, size().width() - 1, 0);
}
}
QRectF KItemListGroupHeader::roleBounds() const
{
return m_roleBounds;
}
QColor KItemListGroupHeader::roleColor() const
{
return m_roleColor;
paintSeparator(painter, m_separatorColor);
paintRole(painter, m_roleBounds, m_roleColor);
}
void KItemListGroupHeader::roleChanged(const QByteArray& current, const QByteArray& previous)
@ -201,7 +182,7 @@ void KItemListGroupHeader::updateCache()
// performance reasons.
const QColor c1 = m_styleOption.palette.text().color();
const QColor c2 = m_styleOption.palette.base().color();
m_lineColor = mixedColor(c1, c2, 10);
m_separatorColor = mixedColor(c1, c2, 10);
m_roleColor = mixedColor(c1, c2, 70);
const int padding = qMax(1, m_styleOption.padding);

9
src/kitemviews/kitemlistgroupheader.h
View file

@ -68,11 +68,8 @@ public:
virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
protected:
/** @return Bounding rectangle where the role should be drawn into. */
QRectF roleBounds() const;
/** @return Primary color that should be used for drawing the role. */
QColor roleColor() const;
virtual void paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color) = 0;
virtual void paintSeparator(QPainter* painter, const QColor& color) = 0;
/**
* Is called after the role has been changed and allows the derived class
@ -120,7 +117,7 @@ private:
Qt::Orientation m_scrollOrientation;
int m_itemIndex;
QColor m_lineColor;
QColor m_separatorColor;
QColor m_roleColor;
QRectF m_roleBounds;
};

2
src/kitemviews/kitemlistview.cpp
View file

@ -1850,7 +1850,7 @@ void KItemListView::updateGroupHeaderForWidget(KItemListWidget* widget)
}
const QList<QPair<int, QVariant> > groups = model()->groups();
if (groups.isEmpty()) {
if (groups.isEmpty() || !groupHeaderCreator()) {
return;
}

2
src/kitemviews/kitemlistview.h
View file

@ -25,7 +25,7 @@
#include <libdolphin_export.h>
#include <kitemviews/kitemlistgroupheader.h>
#include <kitemviews/kstandarditemlistgroupheader.h>
#include <kitemviews/kitemliststyleoption.h>
#include <kitemviews/kitemlistwidget.h>
#include <kitemviews/kitemmodelbase.h>

46
src/kitemviews/kfileitemlistgroupheader.cpp → src/kitemviews/kstandarditemlistgroupheader.cpp
View file

@ -20,12 +20,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include "kfileitemlistgroupheader.h"
#include "kstandarditemlistgroupheader.h"
#include <kratingpainter.h>
#include <QPainter>
KFileItemListGroupHeader::KFileItemListGroupHeader(QGraphicsWidget* parent) :
KStandardItemListGroupHeader::KStandardItemListGroupHeader(QGraphicsWidget* parent) :
KItemListGroupHeader(parent),
m_dirtyCache(true),
m_text(),
@ -35,47 +35,65 @@ KFileItemListGroupHeader::KFileItemListGroupHeader(QGraphicsWidget* parent) :
m_text.setPerformanceHint(QStaticText::AggressiveCaching);
}
KFileItemListGroupHeader::~KFileItemListGroupHeader()
KStandardItemListGroupHeader::~KStandardItemListGroupHeader()
{
}
void KFileItemListGroupHeader::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
void KStandardItemListGroupHeader::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
{
KItemListGroupHeader::paint(painter, option, widget);
if (m_dirtyCache) {
updateCache();
}
KItemListGroupHeader::paint(painter, option, widget);
}
void KStandardItemListGroupHeader::paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color)
{
if (m_pixmap.isNull()) {
painter->setPen(roleColor());
painter->drawStaticText(roleBounds().topLeft(), m_text);
painter->setPen(color);
painter->drawStaticText(roleBounds.topLeft(), m_text);
} else {
painter->drawPixmap(roleBounds().topLeft(), m_pixmap);
painter->drawPixmap(roleBounds.topLeft(), m_pixmap);
}
}
void KFileItemListGroupHeader::roleChanged(const QByteArray &current, const QByteArray &previous)
void KStandardItemListGroupHeader::paintSeparator(QPainter* painter, const QColor& color)
{
if (itemIndex() == 0) {
// No top- or left-line should be drawn for the first group-header
return;
}
painter->setPen(color);
if (scrollOrientation() == Qt::Horizontal) {
painter->drawLine(0, 0, 0, size().height() - 1);
} else {
painter->drawLine(0, 0, size().width() - 1, 0);
}
}
void KStandardItemListGroupHeader::roleChanged(const QByteArray &current, const QByteArray &previous)
{
Q_UNUSED(current);
Q_UNUSED(previous);
m_dirtyCache = true;
}
void KFileItemListGroupHeader::dataChanged(const QVariant& current, const QVariant& previous)
void KStandardItemListGroupHeader::dataChanged(const QVariant& current, const QVariant& previous)
{
Q_UNUSED(current);
Q_UNUSED(previous);
m_dirtyCache = true;
}
void KFileItemListGroupHeader::resizeEvent(QGraphicsSceneResizeEvent* event)
void KStandardItemListGroupHeader::resizeEvent(QGraphicsSceneResizeEvent* event)
{
QGraphicsWidget::resizeEvent(event);
m_dirtyCache = true;
}
void KFileItemListGroupHeader::updateCache()
void KStandardItemListGroupHeader::updateCache()
{
Q_ASSERT(m_dirtyCache);
m_dirtyCache = false;
@ -104,4 +122,4 @@ void KFileItemListGroupHeader::updateCache()
}
}
#include "kfileitemlistgroupheader.moc"
#include "kstandarditemlistgroupheader.moc"

12
src/kitemviews/kfileitemlistgroupheader.h → src/kitemviews/kstandarditemlistgroupheader.h
View file

@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#ifndef KFILEITEMLISTGROUPHEADER_H
#define KFILEITEMLISTGROUPHEADER_H
#ifndef KSTANDARDITEMLISTGROUPHEADER_H
#define KSTANDARDITEMLISTGROUPHEADER_H
#include <libdolphin_export.h>
@ -27,17 +27,19 @@
#include <QPixmap>
#include <QStaticText>
class LIBDOLPHINPRIVATE_EXPORT KFileItemListGroupHeader : public KItemListGroupHeader
class LIBDOLPHINPRIVATE_EXPORT KStandardItemListGroupHeader : public KItemListGroupHeader
{
Q_OBJECT
public:
KFileItemListGroupHeader(QGraphicsWidget* parent = 0);
virtual ~KFileItemListGroupHeader();
KStandardItemListGroupHeader(QGraphicsWidget* parent = 0);
virtual ~KStandardItemListGroupHeader();
virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
protected:
virtual void paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color);
virtual void paintSeparator(QPainter* painter, const QColor& color);
virtual void roleChanged(const QByteArray &current, const QByteArray &previous);
virtual void dataChanged(const QVariant& current, const QVariant& previous);
virtual void resizeEvent(QGraphicsSceneResizeEvent* event);

3
src/kitemviews/kstandarditemlistview.cpp
View file

@ -22,6 +22,7 @@
#include <KDebug>
#include <KIconLoader>
#include "kstandarditemlistwidget.h"
#include "kstandarditemlistgroupheader.h"
KStandardItemListView::KStandardItemListView(QGraphicsWidget* parent) :
KItemListView(parent),
@ -82,7 +83,7 @@ KItemListWidgetCreatorBase* KStandardItemListView::defaultWidgetCreator() const
KItemListGroupHeaderCreatorBase* KStandardItemListView::defaultGroupHeaderCreator() const
{
return 0; // TODO: new KItemListGroupHeaderCreator<KStandardItemListGroupHeader>()
return new KItemListGroupHeaderCreator<KStandardItemListGroupHeader>();
}
void KStandardItemListView::initializeItemListWidget(KItemListWidget* item)

17
src/kitemviews/kstandarditemmodel.cpp
View file

@ -123,7 +123,22 @@ QString KStandardItemModel::roleDescription(const QByteArray& role) const
QList<QPair<int, QVariant> > KStandardItemModel::groups() const
{
return QList<QPair<int, QVariant> >();
QList<QPair<int, QVariant> > groups;
const QByteArray role = sortRole();
bool isFirstGroupValue = true;
QString groupValue;
const int maxIndex = count() - 1;
for (int i = 0; i <= maxIndex; ++i) {
const QString newGroupValue = m_items.at(i)->dataValue(role).toString();
if (newGroupValue != groupValue || isFirstGroupValue) {
groupValue = newGroupValue;
groups.append(QPair<int, QVariant>(i, newGroupValue));
isFirstGroupValue = false;
}
}
return groups;
}
#include "kstandarditemmodel.moc"

40
src/panels/places/placesitemlistgroupheader.cpp Normal file
View file

@ -0,0 +1,40 @@
/***************************************************************************
* Copyright (C) 2012 by Peter Penz <peter.penz19@gmail.com> *
* *
* Based on the Itemviews NG project from Trolltech Labs: *
* http://qt.gitorious.org/qt-labs/itemviews-ng *
* *
* 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) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include "placesitemlistgroupheader.h"
PlacesItemListGroupHeader::PlacesItemListGroupHeader(QGraphicsWidget* parent) :
KStandardItemListGroupHeader(parent)
{
}
PlacesItemListGroupHeader::~PlacesItemListGroupHeader()
{
}
void PlacesItemListGroupHeader::paintSeparator(QPainter* painter, const QColor& color)
{
Q_UNUSED(painter);
Q_UNUSED(color);
}
#include "placesitemlistgroupheader.moc"

38
src/panels/places/placesitemlistgroupheader.h Normal file
View file

@ -0,0 +1,38 @@
/***************************************************************************
* Copyright (C) 2012 by Peter Penz <peter.penz19@gmail.com> *
* *
* 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) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#ifndef PLACESITEMLISTGROUPHEADER_H
#define PLACESITEMLISTGROUPHEADER_H
#include <kitemviews/kstandarditemlistgroupheader.h>
class PlacesItemListGroupHeader : public KStandardItemListGroupHeader
{
Q_OBJECT
public:
PlacesItemListGroupHeader(QGraphicsWidget* parent = 0);
virtual ~PlacesItemListGroupHeader();
protected:
virtual void paintSeparator(QPainter* painter, const QColor& color);
};
#endif

257
src/panels/places/placespanel.cpp
View file

@ -23,28 +23,45 @@
#include "placespanel.h"
#ifdef HAVE_NEPOMUK
#include <Nepomuk/ResourceManager>
#include <Nepomuk/Query/ComparisonTerm>
#include <Nepomuk/Query/LiteralTerm>
#include <Nepomuk/Query/Query>
#include <Nepomuk/Query/ResourceTypeTerm>
#include <Nepomuk/Vocabulary/NFO>
#include <Nepomuk/Vocabulary/NIE>
#endif
#include <KBookmark>
#include <KBookmarkGroup>
#include <KBookmarkManager>
#include <KComponentData>
#include <KDebug>
#include <KIcon>
#include <KLocale>
#include <kitemviews/kitemlistcontainer.h>
#include <kitemviews/kitemlistcontroller.h>
#include <kitemviews/kstandarditem.h>
#include <kitemviews/kstandarditemlistview.h>
#include <kitemviews/kstandarditemmodel.h>
#include <KStandardDirs>
#include <KUser>
#include "placesitemlistgroupheader.h"
#include <views/draganddrophelper.h>
#include <QDir>
#include <QVBoxLayout>
#include <QShowEvent>
PlacesPanel::PlacesPanel(QWidget* parent) :
Panel(parent),
m_nepomukRunning(false),
m_controller(0),
m_model(0),
m_availableDevices(),
m_bookmarkManager(0)
m_bookmarkManager(0),
m_defaultBookmarks(),
m_defaultBookmarksIndexes()
{
}
@ -68,17 +85,27 @@ void PlacesPanel::showEvent(QShowEvent* event)
// 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.
#ifdef HAVE_NEPOMUK
m_nepomukRunning = (Nepomuk::ResourceManager::instance()->initialized());
#endif
createDefaultBookmarks();
const QString file = KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml");
m_bookmarkManager = KBookmarkManager::managerForFile(file, "kfileplaces");
m_bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces");
m_model = new KStandardItemModel(this);
m_model->setGroupedSorting(true);
m_model->setSortRole("group");
loadBookmarks();
KStandardItemListView* view = new KStandardItemListView();
view->setGroupHeaderCreator(new KItemListGroupHeaderCreator<PlacesItemListGroupHeader>());
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)));
connect(m_controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF)));
connect(m_controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF)));
KItemListContainer* container = new KItemListContainer(m_controller, this);
container->setEnabledFrame(false);
@ -93,55 +120,263 @@ void PlacesPanel::showEvent(QShowEvent* event)
void PlacesPanel::slotItemActivated(int index)
{
const KStandardItem* item = m_model->item(index);
if (item) {
const KUrl url = item->dataValue("url").value<KUrl>();
const KUrl url = urlForIndex(index);
if (!url.isEmpty()) {
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>();
const KUrl url = urlForIndex(index);
if (!url.isEmpty()) {
emit placeMiddleClicked(url);
}
}
void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
{
Q_UNUSED(index);
Q_UNUSED(pos);
}
void PlacesPanel::slotViewContextMenuRequested(const QPointF& pos)
{
Q_UNUSED(pos);
}
void PlacesPanel::slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent)
{
Q_UNUSED(parent);
DragAndDropHelper::dropUrls(KFileItem(), dest, event);
}
void PlacesPanel::createDefaultBookmarks()
{
Q_ASSERT(m_defaultBookmarks.isEmpty());
Q_ASSERT(m_defaultBookmarksIndexes.isEmpty());
const QString placesGroup = i18nc("@item", "Places");
const QString recentlyAccessedGroup = i18nc("@item", "Recently Accessed");
const QString searchForGroup = i18nc("@item", "Search For");
const QString timeLineIcon = "package_utility_time"; // TODO: Ask the Oxygen team to create
// a custom icon for the timeline-protocol
m_defaultBookmarks.append(DefaultBookmarkData(KUrl(KUser().homeDir()),
"user-home",
i18nc("@item", "Home"),
placesGroup));
m_defaultBookmarks.append(DefaultBookmarkData(KUrl("remote:/"),
"network-workgroup",
i18nc("@item", "Network"),
placesGroup));
m_defaultBookmarks.append(DefaultBookmarkData(KUrl("/"),
"folder-red",
i18nc("@item", "Root"),
placesGroup));
m_defaultBookmarks.append(DefaultBookmarkData(KUrl("trash:/"),
"user-trash",
i18nc("@item", "Trash"),
placesGroup));
if (m_nepomukRunning) {
m_defaultBookmarks.append(DefaultBookmarkData(KUrl("timeline:/today"),
timeLineIcon,
i18nc("@item Recently Accessed", "Today"),
recentlyAccessedGroup));
m_defaultBookmarks.append(DefaultBookmarkData(KUrl("timeline:/yesterday"),
timeLineIcon,
i18nc("@item Recently Accessed", "Yesterday"),
recentlyAccessedGroup));
m_defaultBookmarks.append(DefaultBookmarkData(KUrl("timeline:/thismonth"),
timeLineIcon,
i18nc("@item Recently Accessed", "This Month"),
recentlyAccessedGroup));
m_defaultBookmarks.append(DefaultBookmarkData(KUrl("timeline:/lastmonth"),
timeLineIcon,
i18nc("@item Recently Accessed", "Last Month"),
recentlyAccessedGroup));
m_defaultBookmarks.append(DefaultBookmarkData(KUrl("search:/documents"),
"folder-txt",
i18nc("@item Commonly Accessed", "Documents"),
searchForGroup));
m_defaultBookmarks.append(DefaultBookmarkData(KUrl("search:/images"),
"folder-image",
i18nc("@item Commonly Accessed", "Images"),
searchForGroup));
m_defaultBookmarks.append(DefaultBookmarkData(KUrl("search:/music"),
"folder-sound",
i18nc("@item Commonly Accessed", "Music"),
searchForGroup));
m_defaultBookmarks.append(DefaultBookmarkData(KUrl("search:/videos"),
"folder-video",
i18nc("@item Commonly Accessed", "Videos"),
searchForGroup));
}
for (int i = 0; i < m_defaultBookmarks.count(); ++i) {
m_defaultBookmarksIndexes.insert(m_defaultBookmarks[i].url, i);
}
}
void PlacesPanel::loadBookmarks()
{
KBookmarkGroup root = m_bookmarkManager->root();
KBookmark bookmark = root.first();
QSet<QString> devices = m_availableDevices;
QSet<KUrl> missingDefaultBookmarks;
foreach (const DefaultBookmarkData& data, m_defaultBookmarks) {
missingDefaultBookmarks.insert(data.url);
}
while (!bookmark.isNull()) {
const QString udi = bookmark.metaDataItem("UDI");
const KUrl url = bookmark.url();
const QString appName = bookmark.metaDataItem("OnlyInApp");
const bool deviceAvailable = devices.remove(udi);
const bool allowedHere = appName.isEmpty() || (appName == KGlobal::mainComponent().componentName());
const bool allowedHere = (appName.isEmpty() || appName == KGlobal::mainComponent().componentName())
&& (m_nepomukRunning || url.protocol() != QLatin1String("timeline"));
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());
item->setDataValue("url", url);
if (missingDefaultBookmarks.contains(url)) {
missingDefaultBookmarks.remove(url);
// Always apply the translated text to the default bookmarks, otherwise an outdated
// translation might be shown.
const int index = m_defaultBookmarksIndexes.value(url);
item->setText(m_defaultBookmarks[index].text);
} else {
item->setText(bookmark.text());
}
if (deviceAvailable) {
item->setDataValue("udi", udi);
item->setGroup(i18nc("@item", "Devices"));
} else {
item->setGroup(i18nc("@item", "Places"));
}
m_model->appendItem(item);
}
bookmark = root.next(bookmark);
}
if (!missingDefaultBookmarks.isEmpty()) {
foreach (const DefaultBookmarkData& data, m_defaultBookmarks) {
if (missingDefaultBookmarks.contains(data.url)) {
KStandardItem* item = new KStandardItem();
item->setIcon(KIcon(data.icon));
item->setText(data.text);
item->setDataValue("url", data.url);
item->setGroup(data.group);
m_model->appendItem(item);
}
}
}
}
KUrl PlacesPanel::urlForIndex(int index) const
{
const KStandardItem* item = m_model->item(index);
if (!item) {
return KUrl();
}
KUrl url = item->dataValue("url").value<KUrl>();
if (url.protocol() == QLatin1String("timeline")) {
url = createTimelineUrl(url);
} else if (url.protocol() == QLatin1String("search")) {
url = createSearchUrl(url);
}
return url;
}
KUrl PlacesPanel::createTimelineUrl(const KUrl& url)
{
// TODO: Clarify with the Nepomuk-team whether it makes sense
// provide default-timeline-URLs like 'yesterday', 'this month'
// and 'last month'.
KUrl timelineUrl;
const QString path = url.pathOrUrl();
if (path.endsWith("yesterday")) {
const QDate date = QDate::currentDate().addDays(-1);
const int year = date.year();
const int month = date.month();
const int day = date.day();
timelineUrl = "timeline:/" + timelineDateString(year, month) +
'/' + timelineDateString(year, month, day);
} else if (path.endsWith("thismonth")) {
const QDate date = QDate::currentDate();
timelineUrl = "timeline:/" + timelineDateString(date.year(), date.month());
} else if (path.endsWith("lastmonth")) {
const QDate date = QDate::currentDate().addMonths(-1);
timelineUrl = "timeline:/" + timelineDateString(date.year(), date.month());
} else {
Q_ASSERT(path.endsWith("today"));
timelineUrl= url;
}
return timelineUrl;
}
QString PlacesPanel::timelineDateString(int year, int month, int day)
{
QString date = QString::number(year) + '-';
if (month < 10) {
date += '0';
}
date += QString::number(month);
if (day >= 1) {
date += '-';
if (day < 10) {
date += '0';
}
date += QString::number(day);
}
return date;
}
KUrl PlacesPanel::createSearchUrl(const KUrl& url)
{
KUrl searchUrl;
#ifdef HAVE_NEPOMUK
const QString path = url.pathOrUrl();
if (path.endsWith("documents")) {
searchUrl = searchUrlForTerm(Nepomuk::Query::ResourceTypeTerm(Nepomuk::Vocabulary::NFO::Document()));
} else if (path.endsWith("images")) {
searchUrl = searchUrlForTerm(Nepomuk::Query::ResourceTypeTerm(Nepomuk::Vocabulary::NFO::Image()));
} else if (path.endsWith("music")) {
searchUrl = searchUrlForTerm(Nepomuk::Query::ComparisonTerm(Nepomuk::Vocabulary::NIE::mimeType(),
Nepomuk::Query::LiteralTerm("audio")));
} else if (path.endsWith("videos")) {
searchUrl = searchUrlForTerm(Nepomuk::Query::ComparisonTerm(Nepomuk::Vocabulary::NIE::mimeType(),
Nepomuk::Query::LiteralTerm("video")));
} else {
Q_ASSERT(false);
}
#endif
return searchUrl;
}
#ifdef HAVE_NEPOMUK
KUrl PlacesPanel::searchUrlForTerm(const Nepomuk::Query::Term& term)
{
const Nepomuk::Query::Query query(term);
return query.toSearchUrl();
}
#endif
#include "placespanel.moc"

66
src/panels/places/placespanel.h
View file

@ -21,13 +21,28 @@
#ifndef PLACESPANEL_H
#define PLACESPANEL_H
#include <config-nepomuk.h>
#include <KUrl>
#include <panels/panel.h>
#include <QHash>
#include <QList>
#include <QSet>
class KBookmarkManager;
class KItemListController;
class KStandardItemModel;
#ifdef HAVE_NEPOMUK
namespace Nepomuk
{
namespace Query
{
class Term;
}
}
#endif
/**
* @brief Combines bookmarks and mounted devices as list.
*/
@ -50,16 +65,67 @@ protected:
private slots:
void slotItemActivated(int index);
void slotItemMiddleClicked(int index);
void slotItemContextMenuRequested(int index, const QPointF& pos);
void slotViewContextMenuRequested(const QPointF& pos);
void slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent);
private:
void createDefaultBookmarks();
void loadBookmarks();
KUrl urlForIndex(int index) const;
/**
* @return URL using the timeline-protocol for searching.
*/
static KUrl createTimelineUrl(const KUrl& url);
/**
* Helper method for createTimelineUrl().
* @return String that represents a date-path in the format that
* the timeline-protocol expects.
*/
static QString timelineDateString(int year, int month, int day = 0);
/**
* @return URL that can be listed by KIO and results in searching
* for a given term. The URL \a url represents a places-internal
* URL like e.g. "search:/documents"
*/
static KUrl createSearchUrl(const KUrl& url);
#ifdef HAVE_NEPOMUK
/**
* Helper method for createSearchUrl().
* @return URL that can be listed by KIO and results in searching
* for the given term.
*/
static KUrl searchUrlForTerm(const Nepomuk::Query::Term& term);
#endif
private:
bool m_nepomukRunning;
KItemListController* m_controller;
KStandardItemModel* m_model;
QSet<QString> m_availableDevices;
KBookmarkManager* m_bookmarkManager;
struct DefaultBookmarkData
{
DefaultBookmarkData(const KUrl& url,
const QString& icon,
const QString& text,
const QString& group) :
url(url), icon(icon), text(text), group(group) {}
KUrl url;
QString icon;
QString text;
QString group;
};
QList<DefaultBookmarkData> m_defaultBookmarks;
QHash<KUrl, int> m_defaultBookmarksIndexes;
};
#endif // PLACESPANEL_H

2
src/search/dolphinsearchinformation.cpp
View file

@ -90,7 +90,7 @@ DolphinSearchInformation::DolphinSearchInformation() :
m_indexingEnabled(false)
{
#ifdef HAVE_NEPOMUK
if (Nepomuk::ResourceManager::instance()->init() == 0) {
if (Nepomuk::ResourceManager::instance()->initialized()) {
KConfig config("nepomukserverrc");
m_indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", false);
}

2
src/settings/additionalinfodialog.cpp
View file

@ -53,7 +53,7 @@ AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
bool nepomukRunning = false;
bool indexingEnabled = false;
#ifdef HAVE_NEPOMUK
nepomukRunning = (Nepomuk::ResourceManager::instance()->init() == 0);
nepomukRunning = (Nepomuk::ResourceManager::instance()->initialized());
if (nepomukRunning) {
KConfig config("nepomukserverrc");
indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", false);

2
src/views/dolphinview.cpp
View file

@ -796,7 +796,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
bool nepomukRunning = false;
bool indexingEnabled = false;
#ifdef HAVE_NEPOMUK
nepomukRunning = (Nepomuk::ResourceManager::instance()->init() == 0);
nepomukRunning = (Nepomuk::ResourceManager::instance()->initialized());
if (nepomukRunning) {
KConfig config("nepomukserverrc");
indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", false);

2
src/views/dolphinviewactionhandler.cpp
View file

@ -237,7 +237,7 @@ QActionGroup* DolphinViewActionHandler::createFileItemRolesActionGroup(const QSt
bool nepomukRunning = false;
bool indexingEnabled = false;
#ifdef HAVE_NEPOMUK
nepomukRunning = (Nepomuk::ResourceManager::instance()->init() == 0);
nepomukRunning = (Nepomuk::ResourceManager::instance()->initialized());
if (nepomukRunning) {
KConfig config("nepomukserverrc");
indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", false);