Merge branch 'Applications/19.04'

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

diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index 50ed7e73aacfa6483122f32f7149232ab58fb302..a2f0e06556769d122afad8176843dffefc2d28af 100644 (file)
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -24,46 +24,45 @@
 #include "placespanel.h"
 
 #include "dolphin_generalsettings.h"
 #include "placespanel.h"
 
 #include "dolphin_generalsettings.h"

-
-#include <KFileItem>
-#include "dolphindebug.h"
-#include <KDirNotify>
-#include <QIcon>
-#include <KIO/Job>
-#include <KIO/DropJob>
-#include <KIO/EmptyTrashJob>
-#include <KIO/JobUiDelegate>
-#include <KJobWidgets>
-#include <KLocalizedString>
-#include <KIconLoader>
-#include <kitemviews/kitemlistcontainer.h>
-#include <kitemviews/kitemlistcontroller.h>
-#include <kitemviews/kitemlistselectionmanager.h>
-#include <kitemviews/kstandarditem.h>
-#include <QMenu>
-#include <KMessageBox>
-#include <KNotification>
+#include "global.h"
+#include "kitemviews/kitemlistcontainer.h"
+#include "kitemviews/kitemlistcontroller.h"
+#include "kitemviews/kitemlistselectionmanager.h"
+#include "kitemviews/kstandarditem.h"

 #include "placesitem.h"
 #include "placesitem.h"

-#include "placesitemeditdialog.h"

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

-#include <views/draganddrophelper.h>
+#include "trash/dolphintrash.h"
+#include "views/draganddrophelper.h"
+
+#include <KFilePlaceEditDialog>
+#include <KFilePlacesModel>
+#include <KIO/DropJob>
+#include <KIO/EmptyTrashJob>
+#include <KIO/Job>
+#include <KIconLoader>
+#include <KLocalizedString>
+#include <KMountPoint>
+#include <KPropertiesDialog>
+

 #include <QGraphicsSceneDragDropEvent>
 #include <QGraphicsSceneDragDropEvent>

-#include <QVBoxLayout>
-#include <QShowEvent>
+#include <QIcon>
+#include <QMenu>

 #include <QMimeData>
 #include <QMimeData>

+#include <QVBoxLayout>

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

-    m_controller(0),
-    m_model(0),
+    m_controller(nullptr),
+    m_model(nullptr),
+    m_view(nullptr),

     m_storageSetupFailedUrl(),
     m_triggerStorageSetupButton(),
     m_itemDropEventIndex(-1),
     m_storageSetupFailedUrl(),
     m_triggerStorageSetupButton(),
     m_itemDropEventIndex(-1),

-    m_itemDropEventMimeData(0),
-    m_itemDropEvent(0)
+    m_itemDropEventMimeData(nullptr),
+    m_itemDropEvent(nullptr)

 {
 }
 
 {
 }
 


@@ -71,9 +70,14 @@ PlacesPanel::~PlacesPanel()
 {
 }
 
 {
 }
 

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

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

-    if (!url().isValid() || url().scheme().contains("search")) {
+    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;
         // Skip results shown by a search, as possible identical
         // directory names are useless without parent-path information.
         return false;


@@ -89,8 +93,8 @@ bool PlacesPanel::urlChanged()
 void PlacesPanel::readSettings()
 {
     if (m_controller) {
 void PlacesPanel::readSettings()
 {
     if (m_controller) {

-       const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1;
-       m_controller->setAutoActivationDelay(delay);
+        const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1;
+        m_controller->setAutoActivationDelay(delay);

     }
 }
 
     }
 }
 


@@ -109,6 +113,10 @@ void PlacesPanel::showEvent(QShowEvent* event)
         m_model->setGroupedSorting(true);
         connect(m_model, &PlacesItemModel::errorMessage,
                 this, &PlacesPanel::errorMessage);
         m_model->setGroupedSorting(true);
         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 = new PlacesView();
         m_view->setWidgetCreator(new KItemListWidgetCreator<PlacesItemListWidget>());


@@ -131,7 +139,7 @@ void PlacesPanel::showEvent(QShowEvent* event)
         container->setEnabledFrame(false);
 
         QVBoxLayout* layout = new QVBoxLayout(this);
         container->setEnabledFrame(false);
 
         QVBoxLayout* layout = new QVBoxLayout(this);

-        layout->setMargin(0);
+        layout->setContentsMargins(0, 0, 0, 0);

         layout->addWidget(container);
 
         selectClosestItem();
         layout->addWidget(container);
 
         selectClosestItem();


@@ -159,16 +167,30 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
 
     QMenu menu(this);
 
 
     QMenu menu(this);
 

-    QAction* emptyTrashAction = 0;
-    QAction* addAction = 0;
-    QAction* mainSeparator = 0;
-    QAction* editAction = 0;
-    QAction* teardownAction = 0;
-    QAction* ejectAction = 0;
-
-    const QString label = item->text();
+    QAction* emptyTrashAction = nullptr;
+    QAction* editAction = nullptr;
+    QAction* teardownAction = nullptr;
+    QAction* ejectAction = nullptr;
+    QAction* mountAction = nullptr;

 
     const bool isDevice = !item->udi().isEmpty();
 
     const bool isDevice = !item->udi().isEmpty();

+    const bool isTrash = (item->url().scheme() == QLatin1String("trash"));
+    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(QStringLiteral("window-new")), i18nc("@item:inmenu", "Open in New Window"));
+    QAction* openInNewTabAction = menu.addAction(QIcon::fromTheme(QStringLiteral("tab-new")), i18nc("@item:inmenu", "Open in New Tab"));
+    QAction* propertiesAction = nullptr;
+    if (item->url().isLocalFile()) {
+        propertiesAction = menu.addAction(QIcon::fromTheme(QStringLiteral("document-properties")), i18nc("@action:inmenu", "Properties"));
+    }
+    if (!isDevice && !isTrash) {
+        menu.addSeparator();
+    }
+    

     if (isDevice) {
         ejectAction = m_model->ejectAction(index);
         if (ejectAction) {
     if (isDevice) {
         ejectAction = m_model->ejectAction(index);
         if (ejectAction) {


@@ -178,51 +200,104 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
 
         teardownAction = m_model->teardownAction(index);
         if (teardownAction) {
 
         teardownAction = m_model->teardownAction(index);
         if (teardownAction) {

+            // Disable teardown option for root and home partitions
+            bool teardownEnabled = item->url() != QUrl::fromLocalFile(QDir::rootPath());
+            if (teardownEnabled) {
+                KMountPoint::Ptr mountPoint = KMountPoint::currentMountPoints().findByPath(QDir::homePath());
+                if (mountPoint && item->url() == QUrl::fromLocalFile(mountPoint->mountPoint())) {
+                    teardownEnabled = false;
+                }
+            }
+            teardownAction->setEnabled(teardownEnabled);
+

             teardownAction->setParent(&menu);
             menu.addAction(teardownAction);
         }
 
             teardownAction->setParent(&menu);
             menu.addAction(teardownAction);
         }
 

-        if (teardownAction || ejectAction) {
-            mainSeparator = menu.addSeparator();
+        if (item->storageSetupNeeded()) {
+            mountAction = menu.addAction(QIcon::fromTheme(QStringLiteral("media-mount")), i18nc("@action:inmenu", "Mount"));

         }
         }

-    } else {
-        if (item->url() == QUrl("trash:/")) {
-            emptyTrashAction = menu.addAction(QIcon::fromTheme("trash-empty"), i18nc("@action:inmenu", "Empty Trash"));
-            emptyTrashAction->setEnabled(item->icon() == "user-trash-full");
+
+        if (teardownAction || ejectAction || mountAction) {

             menu.addSeparator();
         }
             menu.addSeparator();
         }

-        addAction = menu.addAction(QIcon::fromTheme("document-new"), i18nc("@item:inmenu", "Add Entry..."));
-        mainSeparator = menu.addSeparator();
-        editAction = menu.addAction(QIcon::fromTheme("document-properties"), i18nc("@item:inmenu", "Edit '%1'...", label));

     }
 
     }
 

-    if (!addAction) {
-        addAction = menu.addAction(QIcon::fromTheme("document-new"), i18nc("@item:inmenu", "Add Entry..."));
+    if (!isDevice) {
+        editAction = menu.addAction(QIcon::fromTheme(QStringLiteral("edit-entry")), i18nc("@item:inmenu", "Edit..."));

     }
 
     }
 

-    QAction* openInNewTabAction = menu.addAction(i18nc("@item:inmenu", "Open '%1' in New Tab", label));
-    openInNewTabAction->setIcon(QIcon::fromTheme("tab-new"));
-
-    QAction* removeAction = 0;
+    QAction* removeAction = nullptr;

     if (!isDevice && !item->isSystemItem()) {
     if (!isDevice && !item->isSystemItem()) {

-        removeAction = menu.addAction(QIcon::fromTheme("edit-delete"), i18nc("@item:inmenu", "Remove '%1'", label));
+        removeAction = menu.addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18nc("@item:inmenu", "Remove"));

     }
 
     }
 

-    QAction* hideAction = menu.addAction(i18nc("@item:inmenu", "Hide '%1'", label));
+    QAction* hideAction = menu.addAction(QIcon::fromTheme(QStringLiteral("hint")), i18nc("@item:inmenu", "Hide"));

     hideAction->setCheckable(true);
     hideAction->setChecked(item->isHidden());
 
     hideAction->setCheckable(true);
     hideAction->setChecked(item->isHidden());
 

-    QAction* showAllAction = 0;
-    if (m_model->hiddenCount() > 0) {
-        if (!mainSeparator) {
-            mainSeparator = menu.addSeparator();
+    buildGroupContextMenu(&menu, index);
+
+    QAction* action = menu.exec(pos.toPoint());
+    if (action) {
+        if (action == emptyTrashAction) {
+            Trash::empty(this);
+        } 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());
+                if (!m_model->hiddenCount()) {
+                    showHiddenEntries(false);
+                }
+            } 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 == mountAction) {
+                m_model->requestStorageSetup(index);
+            } else if (action == teardownAction) {
+                m_model->requestTearDown(index);
+            } else if (action == ejectAction) {
+                m_model->requestEject(index);
+            } else if (action == propertiesAction) {
+                KPropertiesDialog* dialog = new KPropertiesDialog(item->url(), this);
+                dialog->setAttribute(Qt::WA_DeleteOnClose);
+                dialog->show();
+            }

         }
         }

-        showAllAction = menu.addAction(i18nc("@item:inmenu", "Show All Entries"));
-        showAllAction->setCheckable(true);
-        showAllAction->setChecked(m_model->hiddenItemsShown());

     }
 
     }
 

-    menu.addSeparator();
+    selectClosestItem();
+}
+
+void PlacesPanel::slotViewContextMenuRequested(const QPointF& pos)
+{
+    QMenu menu(this);
+
+    QAction* addAction = menu.addAction(QIcon::fromTheme(QStringLiteral("document-new")), i18nc("@item:inmenu", "Add Entry..."));
+
+    QAction* showAllAction = menu.addAction(i18nc("@item:inmenu", "Show Hidden Places"));
+    showAllAction->setCheckable(true);
+    showAllAction->setChecked(m_model->hiddenItemsShown());
+    showAllAction->setIcon(QIcon::fromTheme(m_model->hiddenItemsShown() ? QStringLiteral("visibility") : QStringLiteral("hint")));
+    showAllAction->setEnabled(m_model->hiddenCount());
+
+    buildGroupContextMenu(&menu, m_controller->indexCloseToMousePressedPosition());
+

     QMenu* iconSizeSubMenu = new QMenu(i18nc("@item:inmenu", "Icon Size"), &menu);
 
     struct IconSizeInfo
     QMenu* iconSizeSubMenu = new QMenu(i18nc("@item:inmenu", "Icon Size"), &menu);
 
     struct IconSizeInfo


@@ -240,7 +315,7 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
         {KIconLoader::SizeLarge,        I18N_NOOP2_NOSTRIP("Huge icon size", "Huge (%1x%2)")}
     };
 
         {KIconLoader::SizeLarge,        I18N_NOOP2_NOSTRIP("Huge icon size", "Huge (%1x%2)")}
     };
 

-    QMap<QAction*, int> iconSizeActionMap;
+    QHash<QAction*, int> iconSizeActionMap;

     QActionGroup* iconSizeGroup = new QActionGroup(iconSizeSubMenu);
 
     for (int i = 0; i < iconSizeCount; ++i) {
     QActionGroup* iconSizeGroup = new QActionGroup(iconSizeSubMenu);
 
     for (int i = 0; i < iconSizeCount; ++i) {


@@ -264,75 +339,37 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
 
     QAction* action = menu.exec(pos.toPoint());
     if (action) {
 
     QAction* action = menu.exec(pos.toPoint());
     if (action) {

-        if (action == emptyTrashAction) {
-            emptyTrash();
-        } else if (action == addAction) {
+        if (action == addAction) {

             addEntry();
         } else if (action == showAllAction) {
             addEntry();
         } else if (action == showAllAction) {

-            m_model->setHiddenItemsShown(showAllAction->isChecked());
+            showHiddenEntries(showAllAction->isChecked());

         } else if (iconSizeActionMap.contains(action)) {
             m_view->setIconSize(iconSizeActionMap.value(action));
         } else if (iconSizeActionMap.contains(action)) {
             m_view->setIconSize(iconSizeActionMap.value(action));

-        } 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->removeItem(index);
-                m_model->saveBookmarks();
-            } else if (action == hideAction) {
-                item->setHidden(hideAction->isChecked());
-                m_model->saveBookmarks();
-            } 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();
 }
 
         }
     }
 
     selectClosestItem();
 }
 

-void PlacesPanel::slotViewContextMenuRequested(const QPointF& pos)
+QAction *PlacesPanel::buildGroupContextMenu(QMenu *menu, int index)

 {
 {

-    QMenu menu(this);
-
-    QAction* addAction = menu.addAction(QIcon::fromTheme("document-new"), i18nc("@item:inmenu", "Add Entry..."));
-
-    QAction* showAllAction = 0;
-    if (m_model->hiddenCount() > 0) {
-        showAllAction = menu.addAction(i18nc("@item:inmenu", "Show All Entries"));
-        showAllAction->setCheckable(true);
-        showAllAction->setChecked(m_model->hiddenItemsShown());
+    if (index == -1) {
+        return nullptr;

     }
 
     }
 

-    menu.addSeparator();
-    foreach (QAction* action, customContextMenuActions()) {
-        menu.addAction(action);
-    }
+    KFilePlacesModel::GroupType groupType = m_model->groupType(index);
+    QAction *hideGroupAction = menu->addAction(QIcon::fromTheme(QStringLiteral("hint")), i18nc("@item:inmenu", "Hide Section '%1'", m_model->item(index)->group()));
+    hideGroupAction->setCheckable(true);
+    hideGroupAction->setChecked(m_model->isGroupHidden(groupType));

 
 

-    QAction* action = menu.exec(pos.toPoint());
-    if (action) {
-        if (action == addAction) {
-            addEntry();
-        } else if (action == showAllAction) {
-            m_model->setHiddenItemsShown(showAllAction->isChecked());
+    connect(hideGroupAction, &QAction::triggered, this, [this, groupType, hideGroupAction]{
+        m_model->setGroupHidden(groupType, hideGroupAction->isChecked());
+        if (!m_model->hiddenCount()) {
+            showHiddenEntries(false);

         }
         }

-    }
+    });

 
 

-    selectClosestItem();
+    return hideGroupAction;

 }
 
 void PlacesPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
 }
 
 void PlacesPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)


@@ -342,8 +379,8 @@ void PlacesPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
     }
 
     const PlacesItem* destItem = m_model->placesItem(index);
     }
 
     const PlacesItem* destItem = m_model->placesItem(index);

-    const PlacesItem::GroupType group = destItem->groupType();
-    if (group == PlacesItem::SearchForType || group == PlacesItem::RecentlySavedType) {
+
+    if (destItem->isSearchOrTimelineUrl()) {

         return;
     }
 
         return;
     }
 


@@ -396,15 +433,14 @@ void PlacesPanel::slotItemDropEventStorageSetupDone(int index, bool success)
         delete m_itemDropEvent;
 
         m_itemDropEventIndex = -1;
         delete m_itemDropEvent;
 
         m_itemDropEventIndex = -1;

-        m_itemDropEventMimeData = 0;
-        m_itemDropEvent = 0;
+        m_itemDropEventMimeData = nullptr;
+        m_itemDropEvent = nullptr;

     }
 }
 
 void PlacesPanel::slotAboveItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
 {
     m_model->dropMimeDataBefore(index, event->mimeData());
     }
 }
 
 void PlacesPanel::slotAboveItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
 {
     m_model->dropMimeDataBefore(index, event->mimeData());

-    m_model->saveBookmarks();

 }
 
 void PlacesPanel::slotUrlsDropped(const QUrl& dest, QDropEvent* event, QWidget* parent)
 }
 
 void PlacesPanel::slotUrlsDropped(const QUrl& dest, QDropEvent* event, QWidget* parent)


@@ -415,15 +451,6 @@ void PlacesPanel::slotUrlsDropped(const QUrl& dest, QDropEvent* event, QWidget*
     }
 }
 
     }
 }
 

-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("Trash: emptied", QString(), QPixmap(), 0, KNotification::DefaultEvent);
-}
-

 void PlacesPanel::slotStorageSetupDone(int index, bool success)
 {
     disconnect(m_model, &PlacesItemModel::storageSetupDone,
 void PlacesPanel::slotStorageSetupDone(int index, bool success)
 {
     disconnect(m_model, &PlacesItemModel::storageSetupDone,


@@ -443,30 +470,16 @@ void PlacesPanel::slotStorageSetupDone(int index, bool success)
     }
 }
 
     }
 }
 

-void PlacesPanel::emptyTrash()
-{
-    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);
-    }
-}
-

 void PlacesPanel::addEntry()
 {
     const int index = m_controller->selectionManager()->currentItem();
 void PlacesPanel::addEntry()
 {
     const int index = m_controller->selectionManager()->currentItem();

-    const QUrl url = m_model->data(index).value("url").value<QUrl>();
+    const QUrl url = m_model->data(index).value("url").toUrl();
+    const QString text = url.fileName().isEmpty() ? url.toDisplayString(QUrl::PreferLocalFile) : url.fileName();

 
 

-    QPointer<PlacesItemEditDialog> dialog = new PlacesItemEditDialog(this);
-    dialog->setWindowTitle(i18nc("@title:window", "Add Places Entry"));
-    dialog->setAllowGlobal(true);
-    dialog->setUrl(url);
+    QPointer<KFilePlaceEditDialog> dialog = new KFilePlaceEditDialog(true, url, text, QString(), true, false, KIconLoader::SizeMedium, this);

     if (dialog->exec() == QDialog::Accepted) {
     if (dialog->exec() == QDialog::Accepted) {

-        PlacesItem* item = m_model->createPlacesItem(dialog->text(), dialog->url(), dialog->icon());
-        m_model->appendItemToGroup(item);
-        m_model->saveBookmarks();
+        const QString appName = dialog->applicationLocal() ? QCoreApplication::applicationName() : QString();
+        m_model->createPlacesItem(dialog->label(), dialog->url(), dialog->icon(), appName);

     }
 
     delete dialog;
     }
 
     delete dialog;


@@ -475,20 +488,21 @@ void PlacesPanel::addEntry()
 void PlacesPanel::editEntry(int index)
 {
     QHash<QByteArray, QVariant> data = m_model->data(index);
 void PlacesPanel::editEntry(int index)
 {
     QHash<QByteArray, QVariant> data = m_model->data(index);

+    const QUrl url = data.value("url").toUrl();
+    const QString text = data.value("text").toString();
+    const QString iconName = data.value("iconName").toString();
+    const bool applicationLocal = !data.value("applicationName").toString().isEmpty();

 
 

-    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").value<QUrl>());
-    dialog->setAllowGlobal(true);
+    QPointer<KFilePlaceEditDialog> dialog = new KFilePlaceEditDialog(true, url, text, iconName, true, applicationLocal, KIconLoader::SizeMedium, this);

     if (dialog->exec() == QDialog::Accepted) {
         PlacesItem* oldItem = m_model->placesItem(index);
         if (oldItem) {
     if (dialog->exec() == QDialog::Accepted) {
         PlacesItem* oldItem = m_model->placesItem(index);
         if (oldItem) {

-            oldItem->setText(dialog->text());
+            const QString appName = dialog->applicationLocal() ? QCoreApplication::applicationName() : QString();
+            oldItem->setApplicationName(appName);
+            oldItem->setText(dialog->label());

             oldItem->setUrl(dialog->url());
             oldItem->setIcon(dialog->icon());
             oldItem->setUrl(dialog->url());
             oldItem->setIcon(dialog->icon());

-            m_model->saveBookmarks();
+            m_model->refresh();

         }
     }
 
         }
     }
 


@@ -522,13 +536,27 @@ void PlacesPanel::triggerItem(int index, Qt::MouseButton button)
     } else {
         m_triggerStorageSetupButton = Qt::NoButton;
 
     } else {
         m_triggerStorageSetupButton = Qt::NoButton;
 

-        const QUrl url = m_model->data(index).value("url").value<QUrl>();
+        const QUrl url = m_model->data(index).value("url").toUrl();

         if (!url.isEmpty()) {
             if (button == Qt::MiddleButton) {
         if (!url.isEmpty()) {
             if (button == Qt::MiddleButton) {

-                emit placeMiddleClicked(PlacesItemModel::convertedUrl(url));
+                emit placeMiddleClicked(KFilePlacesModel::convertedUrl(url));

             } else {
             } else {

-                emit placeActivated(PlacesItemModel::convertedUrl(url));
+                emit placeActivated(KFilePlacesModel::convertedUrl(url));

             }
         }
     }
 }
             }
         }
     }
 }

+
+void PlacesPanel::showHiddenEntries(bool shown)
+{
+    m_model->setHiddenItemsShown(shown);
+    emit showHiddenEntriesChanged(shown);
+}
+
+int PlacesPanel::hiddenListCount()
+{
+    if(!m_model) {
+        return 0;
+    }
+    return m_model->hiddenCount();
+}