Build TerminalPanel also on Windows

[dolphin.git] / src / panels / places / placespanel.cpp

diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index 09287169ce1fda60f70e0d8beb9770af7e583c76..f7ca7d010dea5487c91d4fdc9e17dd3c711dd3de 100644 (file)
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2008-2012 by Peter Penz <peter.penz19@gmail.com>        *
  *                                                                         *
 /***************************************************************************
  *   Copyright (C) 2008-2012 by Peter Penz <peter.penz19@gmail.com>        *
  *                                                                         *

- *   Based on KFilePlacesModel from kdelibs:                               *
+ *   Based on KFilePlacesView from kdelibs:                                *

  *   Copyright (C) 2007 Kevin Ottens <ervin@kde.org>                       *
  *   Copyright (C) 2007 David Faure <faure@kde.org>                        *
  *                                                                         *
  *   Copyright (C) 2007 Kevin Ottens <ervin@kde.org>                       *
  *   Copyright (C) 2007 David Faure <faure@kde.org>                        *
  *                                                                         *


@@ -23,45 +23,50 @@
 
 #include "placespanel.h"
 
 
 #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 "dolphin_generalsettings.h"
+
+#include "global.h"
+#include <KFileItem>
+#include "dolphindebug.h"
+#include <KDirNotify>
+#include <QIcon>
+#include <KIO/Job>
+#include <KIO/DropJob>
+#include <KIO/EmptyTrashJob>
+#include <KIO/JobUiDelegate>
+#include <KFilePlacesModel>
+#include <KJobWidgets>
+#include <KLocalizedString>
+#include <KIconLoader>

 #include <kitemviews/kitemlistcontainer.h>
 #include <kitemviews/kitemlistcontroller.h>
 #include <kitemviews/kitemlistcontainer.h>
 #include <kitemviews/kitemlistcontroller.h>

+#include <kitemviews/kitemlistselectionmanager.h>

 #include <kitemviews/kstandarditem.h>
 #include <kitemviews/kstandarditem.h>

-#include <kitemviews/kstandarditemlistview.h>
-#include <kitemviews/kstandarditemmodel.h>
-#include <KStandardDirs>
-#include <KUser>
+#include <QMenu>
+#include <KMessageBox>
+#include <KNotification>
+#include "placesitem.h"
+#include "placesitemeditdialog.h"

 #include "placesitemlistgroupheader.h"
 #include "placesitemlistgroupheader.h"

+#include "placesitemlistwidget.h"
+#include "placesitemmodel.h"
+#include "placesview.h"

 #include <views/draganddrophelper.h>
 #include <views/draganddrophelper.h>

-#include <QDir>
+#include <QGraphicsSceneDragDropEvent>

 #include <QVBoxLayout>
 #include <QShowEvent>
 #include <QVBoxLayout>
 #include <QShowEvent>

+#include <QMimeData>

 
 PlacesPanel::PlacesPanel(QWidget* parent) :
     Panel(parent),
 
 PlacesPanel::PlacesPanel(QWidget* parent) :
     Panel(parent),

-    m_nepomukRunning(false),
-    m_controller(0),
-    m_model(0),
-    m_availableDevices(),
-    m_bookmarkManager(0),
-    m_defaultBookmarks(),
-    m_defaultBookmarksIndexes()
+    m_controller(nullptr),
+    m_model(nullptr),
+    m_view(nullptr),
+    m_storageSetupFailedUrl(),
+    m_triggerStorageSetupButton(),
+    m_itemDropEventIndex(-1),
+    m_itemDropEventMimeData(nullptr),
+    m_itemDropEvent(nullptr)

 {
 }
 
 {
 }
 


@@ -69,11 +74,34 @@ PlacesPanel::~PlacesPanel()
 {
 }
 
 {
 }
 

+void PlacesPanel::proceedWithTearDown()
+{
+    m_model->proceedWithTearDown();
+}
+

 bool PlacesPanel::urlChanged()
 {
 bool PlacesPanel::urlChanged()
 {

+    if (!url().isValid() || url().scheme().contains(QStringLiteral("search"))) {
+        // Skip results shown by a search, as possible identical
+        // directory names are useless without parent-path information.
+        return false;
+    }
+
+    if (m_controller) {
+        selectClosestItem();
+    }
+

     return true;
 }
 
     return true;
 }
 

+void PlacesPanel::readSettings()
+{
+    if (m_controller) {
+       const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1;
+       m_controller->setAutoActivationDelay(delay);
+    }
+}
+

 void PlacesPanel::showEvent(QShowEvent* event)
 {
     if (event->spontaneous()) {
 void PlacesPanel::showEvent(QShowEvent* event)
 {
     if (event->spontaneous()) {


@@ -85,27 +113,31 @@ 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.
         // 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_model = new KStandardItemModel(this);
+        m_model = new PlacesItemModel(this);

         m_model->setGroupedSorting(true);
         m_model->setGroupedSorting(true);

-        m_model->setSortRole("group");
-        loadBookmarks();
+        connect(m_model, &PlacesItemModel::errorMessage,
+                this, &PlacesPanel::errorMessage);
+        connect(m_model, &PlacesItemModel::storageTearDownRequested,
+                this, &PlacesPanel::storageTearDownRequested);
+        connect(m_model, &PlacesItemModel::storageTearDownExternallyRequested,
+                this, &PlacesPanel::storageTearDownExternallyRequested);
+
+        m_view = new PlacesView();
+        m_view->setWidgetCreator(new KItemListWidgetCreator<PlacesItemListWidget>());
+        m_view->setGroupHeaderCreator(new KItemListGroupHeaderCreator<PlacesItemListGroupHeader>());
+
+        m_controller = new KItemListController(m_model, m_view, this);
+        m_controller->setSelectionBehavior(KItemListController::SingleSelection);
+        m_controller->setSingleClickActivationEnforced(true);

 
 

-        KStandardItemListView* view = new KStandardItemListView();
-        view->setGroupHeaderCreator(new KItemListGroupHeaderCreator<PlacesItemListGroupHeader>());
+        readSettings();

 
 

-        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)));
+        connect(m_controller, &KItemListController::itemActivated, this, &PlacesPanel::slotItemActivated);
+        connect(m_controller, &KItemListController::itemMiddleClicked, this, &PlacesPanel::slotItemMiddleClicked);
+        connect(m_controller, &KItemListController::itemContextMenuRequested, this, &PlacesPanel::slotItemContextMenuRequested);
+        connect(m_controller, &KItemListController::viewContextMenuRequested, this, &PlacesPanel::slotViewContextMenuRequested);
+        connect(m_controller, &KItemListController::itemDropEvent, this, &PlacesPanel::slotItemDropEvent);
+        connect(m_controller, &KItemListController::aboveItemDropEvent, this, &PlacesPanel::slotAboveItemDropEvent);

 
         KItemListContainer* container = new KItemListContainer(m_controller, this);
         container->setEnabledFrame(false);
 
         KItemListContainer* container = new KItemListContainer(m_controller, this);
         container->setEnabledFrame(false);


@@ -113,6 +145,8 @@ void PlacesPanel::showEvent(QShowEvent* event)
         QVBoxLayout* layout = new QVBoxLayout(this);
         layout->setMargin(0);
         layout->addWidget(container);
         QVBoxLayout* layout = new QVBoxLayout(this);
         layout->setMargin(0);
         layout->addWidget(container);

+
+        selectClosestItem();

     }
 
     Panel::showEvent(event);
     }
 
     Panel::showEvent(event);


@@ -120,263 +154,391 @@ void PlacesPanel::showEvent(QShowEvent* event)
 
 void PlacesPanel::slotItemActivated(int index)
 {
 
 void PlacesPanel::slotItemActivated(int index)
 {

-    const KUrl url = urlForIndex(index);
-    if (!url.isEmpty()) {
-        emit placeActivated(url);
-    }
+    triggerItem(index, Qt::LeftButton);

 }
 
 void PlacesPanel::slotItemMiddleClicked(int index)
 {
 }
 
 void PlacesPanel::slotItemMiddleClicked(int index)
 {

-    const KUrl url = urlForIndex(index);
-    if (!url.isEmpty()) {
-        emit placeMiddleClicked(url);
-    }
+    triggerItem(index, Qt::MiddleButton);

 }
 
 void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
 {
 }
 
 void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
 {

-    Q_UNUSED(index);
-    Q_UNUSED(pos);
+    PlacesItem* item = m_model->placesItem(index);
+    if (!item) {
+        return;
+    }
+
+    QMenu menu(this);
+
+    QAction* emptyTrashAction = nullptr;
+    QAction* editAction = nullptr;
+    QAction* teardownAction = nullptr;
+    QAction* ejectAction = nullptr;
+
+    const QString label = item->text();
+
+    const bool isDevice = !item->udi().isEmpty();
+    const bool isTrash = (item->url().scheme() == QLatin1String("trash"));
+    if (isDevice) {
+        ejectAction = m_model->ejectAction(index);
+        if (ejectAction) {
+            ejectAction->setParent(&menu);
+            menu.addAction(ejectAction);
+        }
+
+        teardownAction = m_model->teardownAction(index);
+        if (teardownAction) {
+            teardownAction->setParent(&menu);
+            menu.addAction(teardownAction);
+        }
+
+        if (teardownAction || ejectAction) {
+            menu.addSeparator();
+        }
+    } else {
+        if (isTrash) {
+            emptyTrashAction = menu.addAction(QIcon::fromTheme(QStringLiteral("trash-empty")), i18nc("@action:inmenu", "Empty Trash"));
+            emptyTrashAction->setEnabled(item->icon() == QLatin1String("user-trash-full"));
+            menu.addSeparator();
+        }
+    }
+
+    QAction* openInNewWindowAction = menu.addAction(QIcon::fromTheme("window-new"), i18nc("@item:inmenu", "Open in New Window"));
+    QAction* openInNewTabAction = menu.addAction(QIcon::fromTheme("tab-new"), i18nc("@item:inmenu", "Open in New Tab"));
+    if (!isDevice && !isTrash) {
+        menu.addSeparator();
+    }
+
+    if (!isDevice) {
+        editAction = menu.addAction(QIcon::fromTheme("document-properties"), i18nc("@item:inmenu", "Edit..."));
+    }
+
+    QAction* removeAction = nullptr;
+    if (!isDevice && !item->isSystemItem()) {
+        removeAction = menu.addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18nc("@item:inmenu", "Remove"));
+    }
+
+    QAction* hideAction = menu.addAction(i18nc("@item:inmenu", "Hide"));
+    hideAction->setCheckable(true);
+    hideAction->setChecked(item->isHidden());
+
+    buildGroupContextMenu(&menu, index);
+
+    QAction* action = menu.exec(pos.toPoint());
+    if (action) {
+        if (action == emptyTrashAction) {
+            emptyTrash();
+        } else {
+            // The index might have changed if devices were added/removed while
+            // the context menu was open.
+            index = m_model->index(item);
+            if (index < 0) {
+                // The item is not in the model any more, probably because it was an
+                // external device that has been removed while the context menu was open.
+                return;
+            }
+
+            if (action == editAction) {
+                editEntry(index);
+            } else if (action == removeAction) {
+                m_model->deleteItem(index);
+            } else if (action == hideAction) {
+                item->setHidden(hideAction->isChecked());
+            } else if (action == openInNewWindowAction) {
+                Dolphin::openNewWindow({KFilePlacesModel::convertedUrl(m_model->data(index).value("url").toUrl())}, this);
+            } else if (action == openInNewTabAction) {
+                // TriggerItem does set up the storage first and then it will
+                // emit the slotItemMiddleClicked signal, because of Qt::MiddleButton.
+                triggerItem(index, Qt::MiddleButton);
+            } else if (action == teardownAction) {
+                m_model->requestTearDown(index);
+            } else if (action == ejectAction) {
+                m_model->requestEject(index);
+            }
+        }
+    }
+
+    selectClosestItem();

 }
 
 void PlacesPanel::slotViewContextMenuRequested(const QPointF& pos)
 {
 }
 
 void PlacesPanel::slotViewContextMenuRequested(const QPointF& pos)
 {

-    Q_UNUSED(pos);
-}
+    QMenu menu(this);

 
 

-void PlacesPanel::slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent)
-{
-    Q_UNUSED(parent);
-    DragAndDropHelper::dropUrls(KFileItem(), dest, event);
+    QAction* addAction = menu.addAction(QIcon::fromTheme(QStringLiteral("document-new")), i18nc("@item:inmenu", "Add Entry..."));
+
+    QAction* showAllAction = nullptr;
+    if (m_model->hiddenCount() > 0) {
+        showAllAction = menu.addAction(i18nc("@item:inmenu", "Show All Entries"));
+        showAllAction->setCheckable(true);
+        showAllAction->setChecked(m_model->hiddenItemsShown());
+    }
+
+    buildGroupContextMenu(&menu, m_controller->indexCloseToMousePressedPosition());
+
+    QMenu* iconSizeSubMenu = new QMenu(i18nc("@item:inmenu", "Icon Size"), &menu);
+
+    struct IconSizeInfo
+    {
+        int size;
+        const char* context;
+        const char* text;
+    };
+
+    const int iconSizeCount = 4;
+    static const IconSizeInfo iconSizes[iconSizeCount] = {
+        {KIconLoader::SizeSmall,        I18N_NOOP2_NOSTRIP("Small icon size", "Small (%1x%2)")},
+        {KIconLoader::SizeSmallMedium,  I18N_NOOP2_NOSTRIP("Medium icon size", "Medium (%1x%2)")},
+        {KIconLoader::SizeMedium,       I18N_NOOP2_NOSTRIP("Large icon size", "Large (%1x%2)")},
+        {KIconLoader::SizeLarge,        I18N_NOOP2_NOSTRIP("Huge icon size", "Huge (%1x%2)")}
+    };
+
+    QMap<QAction*, int> iconSizeActionMap;
+    QActionGroup* iconSizeGroup = new QActionGroup(iconSizeSubMenu);
+
+    for (int i = 0; i < iconSizeCount; ++i) {
+        const int size = iconSizes[i].size;
+        const QString text = i18nc(iconSizes[i].context, iconSizes[i].text,
+                                   size, size);
+
+        QAction* action = iconSizeSubMenu->addAction(text);
+        iconSizeActionMap.insert(action, size);
+        action->setActionGroup(iconSizeGroup);
+        action->setCheckable(true);
+        action->setChecked(m_view->iconSize() == size);
+    }
+
+    menu.addMenu(iconSizeSubMenu);
+
+    menu.addSeparator();
+    foreach (QAction* action, customContextMenuActions()) {
+        menu.addAction(action);
+    }
+
+    QAction* action = menu.exec(pos.toPoint());
+    if (action) {
+        if (action == addAction) {
+            addEntry();
+        } else if (action == showAllAction) {
+            m_model->setHiddenItemsShown(showAllAction->isChecked());
+        } else if (iconSizeActionMap.contains(action)) {
+            m_view->setIconSize(iconSizeActionMap.value(action));
+        }
+    }
+
+    selectClosestItem();

 }
 
 }
 

-void PlacesPanel::createDefaultBookmarks()
+QAction *PlacesPanel::buildGroupContextMenu(QMenu *menu, int index)

 {
 {

-    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:/audio"),
-                                                      "folder-sound",
-                                                      i18nc("@item Commonly Accessed", "Audio"),
-                                                      searchForGroup));
-        m_defaultBookmarks.append(DefaultBookmarkData(KUrl("search:/videos"),
-                                                      "folder-video",
-                                                      i18nc("@item Commonly Accessed", "Videos"),
-                                                      searchForGroup));
+    if (index == -1) {
+        return nullptr;

     }
 
     }
 

-    for (int i = 0; i < m_defaultBookmarks.count(); ++i) {
-        m_defaultBookmarksIndexes.insert(m_defaultBookmarks[i].url, i);
-    }
+    KFilePlacesModel::GroupType groupType = m_model->groupType(index);
+    QAction *hideGroupAction = menu->addAction(i18nc("@item:inmenu", "Hide Section '%1'", m_model->item(index)->group()));
+    hideGroupAction->setCheckable(true);
+    hideGroupAction->setChecked(m_model->isGroupHidden(groupType));
+
+    connect(hideGroupAction, &QAction::triggered, this, [this, groupType, hideGroupAction]{
+        m_model->setGroupHidden(groupType, hideGroupAction->isChecked());
+    });
+
+    return hideGroupAction;

 }
 
 }
 

-void PlacesPanel::loadBookmarks()
+void PlacesPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)

 {
 {

-    KBookmarkGroup root = m_bookmarkManager->root();
-    KBookmark bookmark = root.first();
-    QSet<QString> devices = m_availableDevices;
+    if (index < 0) {
+        return;
+    }

 
 

-    QSet<KUrl> missingDefaultBookmarks;
-    foreach (const DefaultBookmarkData& data, m_defaultBookmarks) {
-        missingDefaultBookmarks.insert(data.url);
+    const PlacesItem* destItem = m_model->placesItem(index);
+
+    if (destItem->isSearchOrTimelineUrl()) {
+        return;

     }
 
     }
 

-    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())
-                                 && (m_nepomukRunning || url.protocol() != QLatin1String("timeline"));
-
-        if ((udi.isEmpty() && allowedHere) || deviceAvailable) {
-            KStandardItem* item = new KStandardItem();
-            item->setIcon(KIcon(bookmark.icon()));
-            item->setDataValue("address", bookmark.address());
-            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 (m_model->storageSetupNeeded(index)) {
+        connect(m_model, &PlacesItemModel::storageSetupDone,
+                this, &PlacesPanel::slotItemDropEventStorageSetupDone);

 
 

-            if (deviceAvailable) {
-                item->setDataValue("udi", udi);
-                item->setGroup(i18nc("@item", "Devices"));
-            } else {
-                item->setGroup(i18nc("@item", "Places"));
-            }
+        m_itemDropEventIndex = index;

 
 

-            m_model->appendItem(item);
-        }
+        // Make a full copy of the Mime-Data
+        m_itemDropEventMimeData = new QMimeData;
+        m_itemDropEventMimeData->setText(event->mimeData()->text());
+        m_itemDropEventMimeData->setHtml(event->mimeData()->html());
+        m_itemDropEventMimeData->setUrls(event->mimeData()->urls());
+        m_itemDropEventMimeData->setImageData(event->mimeData()->imageData());
+        m_itemDropEventMimeData->setColorData(event->mimeData()->colorData());

 
 

-        bookmark = root.next(bookmark);
+        m_itemDropEvent = new QDropEvent(event->pos().toPoint(),
+                                         event->possibleActions(),
+                                         m_itemDropEventMimeData,
+                                         event->buttons(),
+                                         event->modifiers());
+
+        m_model->requestStorageSetup(index);
+        return;

     }
 
     }
 

-    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);
-            }
+    QUrl destUrl = destItem->url();
+    QDropEvent dropEvent(event->pos().toPoint(),
+                         event->possibleActions(),
+                         event->mimeData(),
+                         event->buttons(),
+                         event->modifiers());
+
+    slotUrlsDropped(destUrl, &dropEvent, this);
+}
+
+void PlacesPanel::slotItemDropEventStorageSetupDone(int index, bool success)
+{
+    disconnect(m_model, &PlacesItemModel::storageSetupDone,
+               this, &PlacesPanel::slotItemDropEventStorageSetupDone);
+
+    if ((index == m_itemDropEventIndex) && m_itemDropEvent && m_itemDropEventMimeData) {
+        if (success) {
+            QUrl destUrl = m_model->placesItem(index)->url();
+            slotUrlsDropped(destUrl, m_itemDropEvent, this);

         }
         }

+
+        delete m_itemDropEventMimeData;
+        delete m_itemDropEvent;
+
+        m_itemDropEventIndex = -1;
+        m_itemDropEventMimeData = nullptr;
+        m_itemDropEvent = nullptr;

     }
 }
 
     }
 }
 

-KUrl PlacesPanel::urlForIndex(int index) const
+void PlacesPanel::slotAboveItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)

 {
 {

-    const KStandardItem* item = m_model->item(index);
-    if (!item) {
-        return KUrl();
-    }
+    m_model->dropMimeDataBefore(index, event->mimeData());
+}

 
 

-    KUrl url = item->dataValue("url").value<KUrl>();
-    if (url.protocol() == QLatin1String("timeline")) {
-        url = createTimelineUrl(url);
-    } else if (url.protocol() == QLatin1String("search")) {
-        url = createSearchUrl(url);
+void PlacesPanel::slotUrlsDropped(const QUrl& dest, QDropEvent* event, QWidget* parent)
+{
+    KIO::DropJob *job = DragAndDropHelper::dropUrls(dest, event, parent);
+    if (job) {
+        connect(job, &KIO::DropJob::result, this, [this](KJob *job) { if (job->error()) emit errorMessage(job->errorString()); });

     }
     }

+}

 
 

-    return url;
+void PlacesPanel::slotTrashUpdated(KJob* job)
+{
+    if (job->error()) {
+        emit errorMessage(job->errorString());
+    }
+    // as long as KIO doesn't do this, do it ourselves
+    KNotification::event(QStringLiteral("Trash: emptied"), QString(), QPixmap(), nullptr, KNotification::DefaultEvent);

 }
 
 }
 

-KUrl PlacesPanel::createTimelineUrl(const KUrl& url)
+void PlacesPanel::slotStorageSetupDone(int index, bool success)

 {
 {

-    // 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;
+    disconnect(m_model, &PlacesItemModel::storageSetupDone,
+               this, &PlacesPanel::slotStorageSetupDone);
+
+    if (m_triggerStorageSetupButton == Qt::NoButton) {
+        return;

     }
 
     }
 

-    return timelineUrl;
+    if (success) {
+        Q_ASSERT(!m_model->storageSetupNeeded(index));
+        triggerItem(index, m_triggerStorageSetupButton);
+        m_triggerStorageSetupButton = Qt::NoButton;
+    } else {
+        setUrl(m_storageSetupFailedUrl);
+        m_storageSetupFailedUrl = QUrl();
+    }

 }
 
 }
 

-QString PlacesPanel::timelineDateString(int year, int month, int day)
+void PlacesPanel::emptyTrash()

 {
 {

-    QString date = QString::number(year) + '-';
-    if (month < 10) {
-        date += '0';
+    KIO::JobUiDelegate uiDelegate;
+    uiDelegate.setWindow(window());
+    if (uiDelegate.askDeleteConfirmation(QList<QUrl>(), KIO::JobUiDelegate::EmptyTrash, KIO::JobUiDelegate::DefaultConfirmation)) {
+        KIO::Job* job = KIO::emptyTrash();
+        KJobWidgets::setWindow(job, window());
+        connect(job, &KIO::Job::result, this, &PlacesPanel::slotTrashUpdated);

     }
     }

-    date += QString::number(month);
+}

 
 

-    if (day >= 1) {
-        date += '-';
-        if (day < 10) {
-            date += '0';
-        }
-        date += QString::number(day);
+void PlacesPanel::addEntry()
+{
+    const int index = m_controller->selectionManager()->currentItem();
+    const QUrl url = m_model->data(index).value("url").toUrl();
+
+    QPointer<PlacesItemEditDialog> dialog = new PlacesItemEditDialog(this);
+    dialog->setWindowTitle(i18nc("@title:window", "Add Places Entry"));
+    dialog->setAllowGlobal(true);
+    dialog->setUrl(url);
+    if (dialog->exec() == QDialog::Accepted) {
+        m_model->createPlacesItem(dialog->text(), dialog->url(), dialog->icon());

     }
 
     }
 

-    return date;
+    delete dialog;

 }
 
 }
 

-KUrl PlacesPanel::createSearchUrl(const KUrl& url)
+void PlacesPanel::editEntry(int index)

 {
 {

-    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("audio")) {
-        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);
+    QHash<QByteArray, QVariant> data = m_model->data(index);
+
+    QPointer<PlacesItemEditDialog> dialog = new PlacesItemEditDialog(this);
+    dialog->setWindowTitle(i18nc("@title:window", "Edit Places Entry"));
+    dialog->setIcon(data.value("iconName").toString());
+    dialog->setText(data.value("text").toString());
+    dialog->setUrl(data.value("url").toUrl());
+    dialog->setAllowGlobal(true);
+    if (dialog->exec() == QDialog::Accepted) {
+        PlacesItem* oldItem = m_model->placesItem(index);
+        if (oldItem) {
+            oldItem->setText(dialog->text());
+            oldItem->setUrl(dialog->url());
+            oldItem->setIcon(dialog->icon());
+            m_model->refresh();
+        }

     }
     }

-#endif

 
 

-    return searchUrl;
+    delete dialog;

 }
 
 }
 

-#ifdef HAVE_NEPOMUK
-KUrl PlacesPanel::searchUrlForTerm(const Nepomuk::Query::Term& term)
+void PlacesPanel::selectClosestItem()

 {
 {

-    const Nepomuk::Query::Query query(term);
-    return query.toSearchUrl();
+    const int index = m_model->closestItem(url());
+    KItemListSelectionManager* selectionManager = m_controller->selectionManager();
+    selectionManager->setCurrentItem(index);
+    selectionManager->clearSelection();
+    selectionManager->setSelected(index);

 }
 }

-#endif

 
 

-#include "placespanel.moc"
+void PlacesPanel::triggerItem(int index, Qt::MouseButton button)
+{
+    const PlacesItem* item = m_model->placesItem(index);
+    if (!item) {
+        return;
+    }
+
+    if (m_model->storageSetupNeeded(index)) {
+        m_triggerStorageSetupButton = button;
+        m_storageSetupFailedUrl = url();
+
+        connect(m_model, &PlacesItemModel::storageSetupDone,
+                this, &PlacesPanel::slotStorageSetupDone);
+
+        m_model->requestStorageSetup(index);
+    } else {
+        m_triggerStorageSetupButton = Qt::NoButton;
+
+        const QUrl url = m_model->data(index).value("url").toUrl();
+        if (!url.isEmpty()) {
+            if (button == Qt::MiddleButton) {
+                emit placeMiddleClicked(KFilePlacesModel::convertedUrl(url));
+            } else {
+                emit placeActivated(KFilePlacesModel::convertedUrl(url));
+            }
+        }
+    }
+}