Use nicer split icon

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

diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index a55df9b45db925130330d13cb8a1babb18d7ef26..cb3f3183b1a40cc485f8199466cf53657c0998f9 100644 (file)
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -11,17 +11,15 @@
 
 #include "placespanel.h"
 
 
 #include "placespanel.h"
 

-#include "dolphinplacesmodelsingleton.h"

 #include "dolphin_generalsettings.h"
 #include "dolphin_placespanelsettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_placespanelsettings.h"

-#include "global.h"
-#include "views/draganddrophelper.h"
+#include "dolphinplacesmodelsingleton.h"

 #include "settings/dolphinsettingsdialog.h"
 #include "settings/dolphinsettingsdialog.h"

+#include "views/draganddrophelper.h"

 
 #include <KFilePlacesModel>
 #include <KIO/DropJob>
 #include <KIO/Job>
 
 #include <KFilePlacesModel>
 #include <KIO/DropJob>
 #include <KIO/Job>

-#include <KListOpenFilesJob>

 #include <KLocalizedString>
 #include <KProtocolManager>
 
 #include <KLocalizedString>
 #include <KProtocolManager>
 


@@ -29,16 +27,14 @@
 #include <QMenu>
 #include <QMimeData>
 #include <QShowEvent>
 #include <QMenu>
 #include <QMimeData>
 #include <QShowEvent>

-#include <QTimer>

 
 #include <Solid/StorageAccess>
 
 
 #include <Solid/StorageAccess>
 

-PlacesPanel::PlacesPanel(QWidget* parent)
+PlacesPanel::PlacesPanel(QWidget *parent)

     : KFilePlacesView(parent)
 {
     setDropOnPlaceEnabled(true);
     : KFilePlacesView(parent)
 {
     setDropOnPlaceEnabled(true);

-    connect(this, &PlacesPanel::urlsDropped,
-            this, &PlacesPanel::slotUrlsDropped);
+    connect(this, &PlacesPanel::urlsDropped, this, &PlacesPanel::slotUrlsDropped);

 
     setAutoResizeItemsEnabled(false);
 
 
     setAutoResizeItemsEnabled(false);
 


@@ -46,6 +42,14 @@ PlacesPanel::PlacesPanel(QWidget* parent)
         slotTearDownRequested(index);
     });
 
         slotTearDownRequested(index);
     });
 

+    m_openInSplitView = new QAction(QIcon::fromTheme(QStringLiteral("view-split-left-right")), i18nc("@action:inmenu", "Open in Split View"));
+    m_openInSplitView->setPriority(QAction::HighPriority);
+    connect(m_openInSplitView, &QAction::triggered, this, [this]() {
+        const QUrl url = currentIndex().data(KFilePlacesModel::UrlRole).toUrl();
+        Q_EMIT openInSplitViewRequested(url);
+    });
+    addAction(m_openInSplitView);
+

     m_configureTrashAction = new QAction(QIcon::fromTheme(QStringLiteral("configure")), i18nc("@action:inmenu", "Configure Trash…"));
     m_configureTrashAction->setPriority(QAction::HighPriority);
     connect(m_configureTrashAction, &QAction::triggered, this, &PlacesPanel::slotConfigureTrash);
     m_configureTrashAction = new QAction(QIcon::fromTheme(QStringLiteral("configure")), i18nc("@action:inmenu", "Configure Trash…"));
     m_configureTrashAction->setPriority(QAction::HighPriority);
     connect(m_configureTrashAction, &QAction::triggered, this, &PlacesPanel::slotConfigureTrash);


@@ -53,13 +57,13 @@ PlacesPanel::PlacesPanel(QWidget* parent)
 
     connect(this, &PlacesPanel::contextMenuAboutToShow, this, &PlacesPanel::slotContextMenuAboutToShow);
 
 
     connect(this, &PlacesPanel::contextMenuAboutToShow, this, &PlacesPanel::slotContextMenuAboutToShow);
 

-    connect(this, &PlacesPanel::iconSizeChanged, this, [this](const QSize &newSize) {
+    connect(this, &PlacesPanel::iconSizeChanged, this, [](const QSize &newSize) {

         int iconSize = qMin(newSize.width(), newSize.height());
         if (iconSize == 0) {
             // Don't store 0 size, let's keep -1 for default/small/automatic
             iconSize = -1;
         }
         int iconSize = qMin(newSize.width(), newSize.height());
         if (iconSize == 0) {
             // Don't store 0 size, let's keep -1 for default/small/automatic
             iconSize = -1;
         }

-        PlacesPanelSettings* settings = PlacesPanelSettings::self();
+        PlacesPanelSettings *settings = PlacesPanelSettings::self();

         settings->setIconSize(iconSize);
         settings->save();
     });
         settings->setIconSize(iconSize);
         settings->save();
     });


@@ -75,7 +79,7 @@ void PlacesPanel::setUrl(const QUrl &url)
     KFilePlacesView::setUrl(url);
 }
 
     KFilePlacesView::setUrl(url);
 }
 

-QList<QAction*> PlacesPanel::customContextMenuActions() const
+QList<QAction *> PlacesPanel::customContextMenuActions() const

 {
     return m_customContextMenuActions;
 }
 {
     return m_customContextMenuActions;
 }


@@ -87,11 +91,12 @@ void PlacesPanel::setCustomContextMenuActions(const QList<QAction *> &actions)
 
 void PlacesPanel::proceedWithTearDown()
 {
 
 void PlacesPanel::proceedWithTearDown()
 {

-    Q_ASSERT(m_deviceToTearDown);
-
-    connect(m_deviceToTearDown, &Solid::StorageAccess::teardownDone,
-            this, &PlacesPanel::slotTearDownDone);
-    m_deviceToTearDown->teardown();
+    if (m_indexToTearDown.isValid()) {
+        auto *placesModel = static_cast<KFilePlacesModel *>(model());
+        placesModel->requestTeardown(m_indexToTearDown);
+    } else {
+        qWarning() << "Places entry to tear down is no longer valid";
+    }

 }
 
 void PlacesPanel::readSettings()
 }
 
 void PlacesPanel::readSettings()


@@ -106,7 +111,7 @@ void PlacesPanel::readSettings()
     setIconSize(QSize(iconSize, iconSize));
 }
 
     setIconSize(QSize(iconSize, iconSize));
 }
 

-void PlacesPanel::showEvent(QShowEvent* event)
+void PlacesPanel::showEvent(QShowEvent *event)

 {
     if (!event->spontaneous() && !model()) {
         readSettings();
 {
     if (!event->spontaneous() && !model()) {
         readSettings();


@@ -115,6 +120,7 @@ void PlacesPanel::showEvent(QShowEvent* event)
         setModel(placesModel);
 
         connect(placesModel, &KFilePlacesModel::errorMessage, this, &PlacesPanel::errorMessage);
         setModel(placesModel);
 
         connect(placesModel, &KFilePlacesModel::errorMessage, this, &PlacesPanel::errorMessage);

+        connect(placesModel, &KFilePlacesModel::teardownDone, this, &PlacesPanel::slotTearDownDone);

 
         connect(placesModel, &QAbstractItemModel::rowsInserted, this, &PlacesPanel::slotRowsInserted);
         connect(placesModel, &QAbstractItemModel::rowsAboutToBeRemoved, this, &PlacesPanel::slotRowsAboutToBeRemoved);
 
         connect(placesModel, &QAbstractItemModel::rowsInserted, this, &PlacesPanel::slotRowsInserted);
         connect(placesModel, &QAbstractItemModel::rowsAboutToBeRemoved, this, &PlacesPanel::slotRowsAboutToBeRemoved);


@@ -143,16 +149,20 @@ static bool isInternalDrag(const QMimeData *mimeData)
 
 void PlacesPanel::dragMoveEvent(QDragMoveEvent *event)
 {
 
 void PlacesPanel::dragMoveEvent(QDragMoveEvent *event)
 {

-    const QModelIndex index = indexAt(event->pos());
+    const QModelIndex index = indexAt(event->position().toPoint());

     if (index.isValid()) {
         auto *placesModel = static_cast<KFilePlacesModel *>(model());
 
         // Reject drag ontop of a non-writable protocol
         // We don't know whether we're dropping inbetween or ontop of a place
         // so still allow internal drag events so that re-arranging still works.
     if (index.isValid()) {
         auto *placesModel = static_cast<KFilePlacesModel *>(model());
 
         // Reject drag ontop of a non-writable protocol
         // We don't know whether we're dropping inbetween or ontop of a place
         // so still allow internal drag events so that re-arranging still works.

-        const QUrl url = placesModel->url(index);
-        if (url.isValid() && !isInternalDrag(event->mimeData()) && !KProtocolManager::supportsWriting(url)) {
-            event->setDropAction(Qt::IgnoreAction);
+        if (!isInternalDrag(event->mimeData())) {
+            const QUrl url = placesModel->url(index);
+            if (!url.isValid() || !KProtocolManager::supportsWriting(url)) {
+                event->setDropAction(Qt::IgnoreAction);
+            } else {
+                DragAndDropHelper::updateDropAction(event, url);
+            }

         }
     }
 
         }
     }
 


@@ -163,17 +173,21 @@ void PlacesPanel::slotConfigureTrash()
 {
     const QUrl url = currentIndex().data(KFilePlacesModel::UrlRole).toUrl();
 
 {
     const QUrl url = currentIndex().data(KFilePlacesModel::UrlRole).toUrl();
 

-    DolphinSettingsDialog* settingsDialog = new DolphinSettingsDialog(url, this);
+    DolphinSettingsDialog *settingsDialog = new DolphinSettingsDialog(url, this);

     settingsDialog->setCurrentPage(settingsDialog->trashSettings);
     settingsDialog->setAttribute(Qt::WA_DeleteOnClose);
     settingsDialog->show();
 }
 
     settingsDialog->setCurrentPage(settingsDialog->trashSettings);
     settingsDialog->setAttribute(Qt::WA_DeleteOnClose);
     settingsDialog->show();
 }
 

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

 {
     KIO::DropJob *job = DragAndDropHelper::dropUrls(dest, event, parent);
     if (job) {
 {
     KIO::DropJob *job = DragAndDropHelper::dropUrls(dest, event, parent);
     if (job) {

-        connect(job, &KIO::DropJob::result, this, [this](KJob *job) { if (job->error()) Q_EMIT errorMessage(job->errorString()); });
+        connect(job, &KIO::DropJob::result, this, [this](KJob *job) {
+            if (job->error() && job->error() != KIO::ERR_USER_CANCELED) {
+                Q_EMIT errorMessage(job->errorString());
+            }
+        });

     }
 }
 
     }
 }
 


@@ -186,6 +200,7 @@ void PlacesPanel::slotContextMenuAboutToShow(const QModelIndex &index, QMenu *me
     const Solid::Device device = placesModel->deviceForIndex(index);
 
     m_configureTrashAction->setVisible(url.scheme() == QLatin1String("trash"));
     const Solid::Device device = placesModel->deviceForIndex(index);
 
     m_configureTrashAction->setVisible(url.scheme() == QLatin1String("trash"));

+    m_openInSplitView->setVisible(url.isValid());

 
     // show customContextMenuActions only on the view's context menu
     if (!url.isValid() && !device.isValid()) {
 
     // show customContextMenuActions only on the view's context menu
     if (!url.isValid() && !device.isValid()) {


@@ -209,7 +224,7 @@ void PlacesPanel::slotTearDownRequested(const QModelIndex &index)
         return;
     }
 
         return;
     }
 

-    m_deviceToTearDown = storageAccess;
+    m_indexToTearDown = QPersistentModelIndex(index);

 
     // disconnect the Solid::StorageAccess::teardownRequested
     // to prevent emitting PlacesPanel::storageTearDownExternallyRequested
 
     // disconnect the Solid::StorageAccess::teardownRequested
     // to prevent emitting PlacesPanel::storageTearDownExternallyRequested


@@ -221,52 +236,28 @@ void PlacesPanel::slotTearDownRequested(const QModelIndex &index)
 void PlacesPanel::slotTearDownRequestedExternally(const QString &udi)
 {
     Q_UNUSED(udi);
 void PlacesPanel::slotTearDownRequestedExternally(const QString &udi)
 {
     Q_UNUSED(udi);

-    auto *storageAccess = static_cast<Solid::StorageAccess*>(sender());
+    auto *storageAccess = static_cast<Solid::StorageAccess *>(sender());

 
     Q_EMIT storageTearDownExternallyRequested(storageAccess->filePath());
 }
 
 
     Q_EMIT storageTearDownExternallyRequested(storageAccess->filePath());
 }
 

-void PlacesPanel::slotTearDownDone(Solid::ErrorType error, const QVariant& errorData)
+void PlacesPanel::slotTearDownDone(const QModelIndex &index, Solid::ErrorType error, const QVariant &errorData)

 {
 {

-    if (error && errorData.isValid()) {
-        if (error == Solid::ErrorType::UserCanceled) {
-            // No need to tell the user what they just did.
-        } else if (error == Solid::ErrorType::DeviceBusy) {
-            KListOpenFilesJob* listOpenFilesJob = new KListOpenFilesJob(m_deviceToTearDown->filePath());
-            connect(listOpenFilesJob, &KIO::Job::result, this, [this, listOpenFilesJob](KJob*) {
-                const KProcessList::KProcessInfoList blockingProcesses = listOpenFilesJob->processInfoList();
-                QString errorString;
-                if (blockingProcesses.isEmpty()) {
-                    errorString = i18n("One or more files on this device are open within an application.");
-                } else {
-                    QStringList blockingApps;
-                    for (const auto& process : blockingProcesses) {
-                        blockingApps << process.name();
-                    }
-                    blockingApps.removeDuplicates();
-                    errorString = xi18np("One or more files on this device are opened in application <application>\"%2\"</application>.",
-                            "One or more files on this device are opened in following applications: <application>%2</application>.",
-                            blockingApps.count(), blockingApps.join(i18nc("separator in list of apps blocking device unmount", ", ")));
-                }
-                Q_EMIT errorMessage(errorString);
-            });
-            listOpenFilesJob->start();
-        } else {
-            Q_EMIT errorMessage(errorData.toString());
+    Q_UNUSED(errorData); // All error handling is currently done in frameworks.
+
+    if (index == m_indexToTearDown) {
+        if (error == Solid::ErrorType::NoError) {
+            // No error; it must have been unmounted successfully
+            Q_EMIT storageTearDownSuccessful();

         }
         }

-    } else {
-        // No error; it must have been unmounted successfully
-        Q_EMIT storageTearDownSuccessful();
+        m_indexToTearDown = QPersistentModelIndex();

     }
     }

-    disconnect(m_deviceToTearDown, &Solid::StorageAccess::teardownDone,
-               this, &PlacesPanel::slotTearDownDone);
-    m_deviceToTearDown = nullptr;

 }
 
 void PlacesPanel::slotRowsInserted(const QModelIndex &parent, int first, int last)
 {
     for (int i = first; i <= last; ++i) {
 }
 
 void PlacesPanel::slotRowsInserted(const QModelIndex &parent, int first, int last)
 {
     for (int i = first; i <= last; ++i) {

-        connectDeviceSignals(model()->index(first, 0, parent));
+        connectDeviceSignals(model()->index(i, 0, parent));

     }
 }
 
     }
 }
 


@@ -297,3 +288,5 @@ void PlacesPanel::connectDeviceSignals(const QModelIndex &index)
 
     connect(storageAccess, &Solid::StorageAccess::teardownRequested, this, &PlacesPanel::slotTearDownRequestedExternally);
 }
 
     connect(storageAccess, &Solid::StorageAccess::teardownRequested, this, &PlacesPanel::slotTearDownRequestedExternally);
 }

+
+#include "moc_placespanel.cpp"