Don't block unmounting when terminal panel's cwd is the mountpoint

[dolphin.git] / src / views / dolphinview.cpp

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index c3df3a9a8c9a81fe84688b38e5e0672b2096166f..2ca51f52dc8dc07988d4899c2a16ac7243a559af 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -29,6 +29,7 @@
 #include <QGraphicsSceneDragDropEvent>
 #include <QTimer>
 #include <QScrollBar>
 #include <QGraphicsSceneDragDropEvent>
 #include <QTimer>
 #include <QScrollBar>

+#include <QPixmapCache>

 #include <QPointer>
 #include <QMenu>
 #include <QVBoxLayout>
 #include <QPointer>
 #include <QMenu>
 #include <QVBoxLayout>


@@ -75,10 +76,6 @@
 #endif
 #include <KFormat>
 
 #endif
 #include <KFormat>
 

-namespace {
-    const int MaxModeEnum = DolphinView::CompactView;
-}
-

 DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
     QWidget(parent),
     m_active(true),
 DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
     QWidget(parent),
     m_active(true),


@@ -185,6 +182,7 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
             this, &DolphinView::slotSelectionChanged);
 
     m_toolTipManager = new ToolTipManager(this);
             this, &DolphinView::slotSelectionChanged);
 
     m_toolTipManager = new ToolTipManager(this);

+    connect(m_toolTipManager, &ToolTipManager::urlActivated, this, &DolphinView::urlActivated);

 
     m_versionControlObserver = new VersionControlObserver(this);
     m_versionControlObserver->setModel(m_model);
 
     m_versionControlObserver = new VersionControlObserver(this);
     m_versionControlObserver->setModel(m_model);


@@ -215,19 +213,7 @@ void DolphinView::setActive(bool active)
 
     m_active = active;
 
 
     m_active = active;
 

-    QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
-    if (!active) {
-        color.setAlpha(150);
-    }
-
-    QWidget* viewport = m_container->viewport();
-    if (viewport) {
-        QPalette palette;
-        palette.setColor(viewport->backgroundRole(), color);
-        viewport->setPalette(palette);
-    }
-
-    update();
+    updatePalette();

 
     if (active) {
         m_container->setFocus();
 
     if (active) {
         m_container->setFocus();


@@ -469,10 +455,6 @@ void DolphinView::reload()
     QDataStream saveStream(&viewState, QIODevice::WriteOnly);
     saveState(saveStream);
 
     QDataStream saveStream(&viewState, QIODevice::WriteOnly);
     saveState(saveStream);
 

-    const KFileItemList itemList = selectedItems();
-    m_selectedUrls.clear();
-    m_selectedUrls = itemList.urlList();
-

     setUrl(url());
     loadDirectory(url(), true);
 
     setUrl(url());
     loadDirectory(url(), true);
 


@@ -600,7 +582,6 @@ void DolphinView::setUrl(const QUrl& url)
 
     clearSelection();
 
 
     clearSelection();
 

-    emit urlAboutToBeChanged(url);

     m_url = url;
 
     hideToolTip();
     m_url = url;
 
     hideToolTip();


@@ -654,6 +635,9 @@ void DolphinView::renameSelectedItems()
                 this, &DolphinView::slotRoleEditingFinished);
     } else {
         RenameDialog* dialog = new RenameDialog(this, items);
                 this, &DolphinView::slotRoleEditingFinished);
     } else {
         RenameDialog* dialog = new RenameDialog(this, items);

+
+        connect(dialog, &RenameDialog::renamingFinished, this, &DolphinView::slotRenameDialogRenamingFinished);
+

         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();
         dialog->raise();
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();
         dialog->raise();


@@ -725,9 +709,40 @@ void DolphinView::stopLoading()
     m_model->cancelDirectoryLoading();
 }
 
     m_model->cancelDirectoryLoading();
 }
 

+void DolphinView::updatePalette()
+{
+    QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
+    if (!m_active) {
+        color.setAlpha(150);
+    }
+
+    QWidget* viewport = m_container->viewport();
+    if (viewport) {
+        QPalette palette;
+        palette.setColor(viewport->backgroundRole(), color);
+        viewport->setPalette(palette);
+    }
+
+    update();
+}
+

 bool DolphinView::eventFilter(QObject* watched, QEvent* event)
 {
     switch (event->type()) {
 bool DolphinView::eventFilter(QObject* watched, QEvent* event)
 {
     switch (event->type()) {

+    case QEvent::PaletteChange:
+        updatePalette();
+        QPixmapCache::clear();
+        break;
+
+    case QEvent::KeyPress:
+        if (GeneralSettings::useTabForSwitchingSplitView()) {
+            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+            if (keyEvent->key() == Qt::Key_Tab && keyEvent->modifiers() == Qt::NoModifier) {
+                emit toggleActiveViewRequested();
+                return true;
+            }
+        }
+        break;

     case QEvent::FocusIn:
         if (watched == m_container) {
             setActive(true);
     case QEvent::FocusIn:
         if (watched == m_container) {
             setActive(true);


@@ -1007,7 +1022,7 @@ void DolphinView::slotItemHovered(int index)
         const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint());
         itemRect.moveTo(pos);
 
         const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint());
         itemRect.moveTo(pos);
 

-        m_toolTipManager->showToolTip(item, itemRect);
+        m_toolTipManager->showToolTip(item, itemRect, nativeParentWidget()->windowHandle());

     }
 
     emit requestItemInfo(item);
     }
 
     emit requestItemInfo(item);


@@ -1031,7 +1046,7 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
         destUrl = url();
     } else {
         // The item represents a directory or desktop-file
         destUrl = url();
     } else {
         // The item represents a directory or desktop-file

-        destUrl = destItem.url();
+        destUrl = destItem.mostLocalUrl();

     }
 
     QDropEvent dropEvent(event->pos().toPoint(),
     }
 
     QDropEvent dropEvent(event->pos().toPoint(),


@@ -1039,14 +1054,14 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
                          event->mimeData(),
                          event->buttons(),
                          event->modifiers());
                          event->mimeData(),
                          event->buttons(),
                          event->modifiers());

-    dropUrls(destUrl, &dropEvent);
+    dropUrls(destUrl, &dropEvent, this);

 
     setActive(true);
 }
 
 
     setActive(true);
 }
 

-void DolphinView::dropUrls(const QUrl &destUrl, QDropEvent *dropEvent)
+void DolphinView::dropUrls(const QUrl &destUrl, QDropEvent *dropEvent, QWidget *dropWidget)

 {
 {

-    KIO::DropJob* job = DragAndDropHelper::dropUrls(destUrl, dropEvent, this);
+    KIO::DropJob* job = DragAndDropHelper::dropUrls(destUrl, dropEvent, dropWidget);

 
     if (job) {
         connect(job, &KIO::DropJob::result, this, &DolphinView::slotPasteJobResult);
 
     if (job) {
         connect(job, &KIO::DropJob::result, this, &DolphinView::slotPasteJobResult);


@@ -1196,6 +1211,9 @@ void DolphinView::restoreState(QDataStream& stream)
     // Restore the current item that had the keyboard focus
     stream >> m_currentItemUrl;
 
     // Restore the current item that had the keyboard focus
     stream >> m_currentItemUrl;
 

+    // Restore the previously selected items
+    stream >> m_selectedUrls;
+

     // Restore the view position
     stream >> m_restoredContentsPosition;
 
     // Restore the view position
     stream >> m_restoredContentsPosition;
 


@@ -1220,6 +1238,9 @@ void DolphinView::saveState(QDataStream& stream)
         stream << QUrl();
     }
 
         stream << QUrl();
     }
 

+    // Save the selected urls
+    stream << selectedItems().urlList();
+

     // Save view position
     const qreal x = m_container->horizontalScrollBar()->value();
     const qreal y = m_container->verticalScrollBar()->value();
     // Save view position
     const qreal x = m_container->horizontalScrollBar()->value();
     const qreal y = m_container->verticalScrollBar()->value();


@@ -1278,7 +1299,7 @@ QUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseTh
             if (desktopFile.hasLinkType()) {
                 const QString linkUrl = desktopFile.readUrl();
                 if (!linkUrl.startsWith(QLatin1String("http"))) {
             if (desktopFile.hasLinkType()) {
                 const QString linkUrl = desktopFile.readUrl();
                 if (!linkUrl.startsWith(QLatin1String("http"))) {

-                    return linkUrl;
+                    return QUrl::fromUserInput(linkUrl);

                 }
             }
         }
                 }
             }
         }


@@ -1290,9 +1311,7 @@ QUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseTh
 void DolphinView::observeCreatedItem(const QUrl& url)
 {
     if (m_active) {
 void DolphinView::observeCreatedItem(const QUrl& url)
 {
     if (m_active) {

-        clearSelection();
-        markUrlAsCurrent(url);
-        markUrlsAsSelected({url});
+        forceUrlsSelection(url, {url});

     }
 }
 
     }
 }
 


@@ -1354,6 +1373,7 @@ void DolphinView::updateViewState()
             }
         }
 
             }
         }
 

+        selectionManager->beginAnchoredSelection(selectionManager->currentItem());

         selectionManager->setSelectedItems(selectedItems);
     }
 }
         selectionManager->setSelectedItems(selectedItems);
     }
 }


@@ -1520,7 +1540,9 @@ void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, con
             KIO::Job * job = KIO::moveAs(oldUrl, newUrl);
             KJobWidgets::setWindow(job, this);
             KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, {oldUrl}, newUrl, job);
             KIO::Job * job = KIO::moveAs(oldUrl, newUrl);
             KJobWidgets::setWindow(job, this);
             KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, {oldUrl}, newUrl, job);

-            job->ui()->setAutoErrorHandlingEnabled(true);
+            job->uiDelegate()->setAutoErrorHandlingEnabled(true);
+
+            forceUrlsSelection(newUrl, {newUrl});

 
             if (!newNameExistsAlready) {
                 // Only connect the result signal if there is no item with the new name
 
             if (!newNameExistsAlready) {
                 // Only connect the result signal if there is no item with the new name


@@ -1728,3 +1750,16 @@ QUrl DolphinView::viewPropertiesUrl() const
     url.setPath(m_viewPropertiesContext);
     return url;
 }
     url.setPath(m_viewPropertiesContext);
     return url;
 }

+
+void DolphinView::slotRenameDialogRenamingFinished(const QList<QUrl>& urls)
+{
+    forceUrlsSelection(urls.first(), urls);
+}
+
+void DolphinView::forceUrlsSelection(const QUrl& current, const QList<QUrl>& selected)
+{
+    clearSelection();
+    m_clearSelectionBeforeSelectingNewItems = true;
+    markUrlAsCurrent(current);
+    markUrlsAsSelected(selected);
+}