port to KIO::createDefaultJobUiDelegate

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

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 56867dd13bf95b58f2ac6b96d301462679e2a8d8..6372266d4f50531c4d4c17bf5c9f9456d3477073 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -40,7 +40,6 @@
 #include <KIO/JobUiDelegate>
 #include <KIO/Paste>
 #include <KIO/PasteJob>
 #include <KIO/JobUiDelegate>
 #include <KIO/Paste>
 #include <KIO/PasteJob>

-#include <KIO/PreviewJob>

 #include <KIO/RenameFileDialog>
 #include <KJobWidgets>
 #include <KLocalizedString>
 #include <KIO/RenameFileDialog>
 #include <KJobWidgets>
 #include <KLocalizedString>


@@ -111,7 +110,7 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
 
     m_model = new KFileItemModel(this);
     m_view = new DolphinItemListView();
 
     m_model = new KFileItemModel(this);
     m_view = new DolphinItemListView();

-    m_view->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle());
+    m_view->setEnabledSelectionToggles(DolphinItemListView::SelectionTogglesEnabled::FollowSetting);

     m_view->setVisibleRoles({"text"});
     applyModeToView();
 
     m_view->setVisibleRoles({"text"});
     applyModeToView();
 


@@ -173,7 +172,7 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
     connect(controller, &KItemListController::increaseZoom, this, &DolphinView::slotIncreaseZoom);
     connect(controller, &KItemListController::decreaseZoom, this, &DolphinView::slotDecreaseZoom);
     connect(controller, &KItemListController::swipeUp, this, &DolphinView::slotSwipeUp);
     connect(controller, &KItemListController::increaseZoom, this, &DolphinView::slotIncreaseZoom);
     connect(controller, &KItemListController::decreaseZoom, this, &DolphinView::slotDecreaseZoom);
     connect(controller, &KItemListController::swipeUp, this, &DolphinView::slotSwipeUp);

-    connect(controller, &KItemListController::selectionModeRequested, this, &DolphinView::selectionModeRequested);
+    connect(controller, &KItemListController::selectionModeChangeRequested, this, &DolphinView::selectionModeChangeRequested);

 
     connect(m_model, &KFileItemModel::directoryLoadingStarted,       this, &DolphinView::slotDirectoryLoadingStarted);
     connect(m_model, &KFileItemModel::directoryLoadingCompleted,     this, &DolphinView::slotDirectoryLoadingCompleted);
 
     connect(m_model, &KFileItemModel::directoryLoadingStarted,       this, &DolphinView::slotDirectoryLoadingStarted);
     connect(m_model, &KFileItemModel::directoryLoadingCompleted,     this, &DolphinView::slotDirectoryLoadingCompleted);


@@ -235,6 +234,7 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
 
 DolphinView::~DolphinView()
 {
 
 DolphinView::~DolphinView()
 {

+    disconnect(m_container->controller(), &KItemListController::modelChanged, this, &DolphinView::slotModelChanged);

 }
 
 QUrl DolphinView::url() const
 }
 
 QUrl DolphinView::url() const


@@ -283,17 +283,19 @@ DolphinView::Mode DolphinView::viewMode() const
     return m_mode;
 }
 
     return m_mode;
 }
 

-void DolphinView::setSelectionMode(const bool enabled)
+void DolphinView::setSelectionModeEnabled(const bool enabled)

 {
     if (enabled) {
 {
     if (enabled) {

-        m_proxyStyle = std::make_unique<SingleClickSelectionProxyStyle>();
+        m_proxyStyle = std::make_unique<SelectionMode::SingleClickSelectionProxyStyle>();

         setStyle(m_proxyStyle.get());
         m_view->setStyle(m_proxyStyle.get());
         setStyle(m_proxyStyle.get());
         m_view->setStyle(m_proxyStyle.get());

+        m_view->setEnabledSelectionToggles(DolphinItemListView::SelectionTogglesEnabled::False);

     } else {
         setStyle(QApplication::style());
         m_view->setStyle(QApplication::style());
     } else {
         setStyle(QApplication::style());
         m_view->setStyle(QApplication::style());

+        m_view->setEnabledSelectionToggles(DolphinItemListView::SelectionTogglesEnabled::FollowSetting);

     }
     }

-    m_container->controller()->setSelectionMode(enabled);
+    m_container->controller()->setSelectionModeEnabled(enabled);

 }
 
 bool DolphinView::selectionMode() const
 }
 
 bool DolphinView::selectionMode() const


@@ -301,7 +303,6 @@ bool DolphinView::selectionMode() const
     return m_container->controller()->selectionMode();
 }
 
     return m_container->controller()->selectionMode();
 }
 

-

 void DolphinView::setPreviewsShown(bool show)
 {
     if (previewsShown() == show) {
 void DolphinView::setPreviewsShown(bool show)
 {
     if (previewsShown() == show) {


@@ -1366,7 +1367,7 @@ void DolphinView::slotItemCreated(const QUrl& url)
 
 void DolphinView::slotJobResult(KJob *job)
 {
 
 void DolphinView::slotJobResult(KJob *job)
 {

-    if (job->error()) {
+    if (job->error() && job->error() != KIO::ERR_USER_CANCELED) {

         Q_EMIT errorMessage(job->errorString());
     }
     if (!m_selectedUrls.isEmpty()) {
         Q_EMIT errorMessage(job->errorString());
     }
     if (!m_selectedUrls.isEmpty()) {