Merge branch 'work/zakharafoniam/useful-groups' into 'master'

Separate criteria for grouping and sorting (like Explorer and Finder do)

See merge request system/dolphin!785

src/dolphinmainwindow.cpp

@@ -184,7 +184,7 @@ DolphinMainWindow::DolphinMainWindow()
 
     m_disabledActionNotifier = new DisabledActionNotifier(this);
     connect(m_disabledActionNotifier, &DisabledActionNotifier::disabledActionTriggered, this, [this](const QAction *, QString reason) {
-        m_activeViewContainer->showMessage(reason, KMessageWidget::Warning);
+        m_activeViewContainer->showMessage(reason, DolphinViewContainer::Warning);
     });
 
     setupDockWidgets();
@@ -562,7 +562,7 @@ void DolphinMainWindow::showTarget()
         KIO::StatJob *statJob = static_cast<KIO::StatJob *>(job);
 
         if (statJob->error()) {
-            m_activeViewContainer->showMessage(job->errorString(), KMessageWidget::Error);
+            m_activeViewContainer->showMessage(job->errorString(), DolphinViewContainer::Error);
         } else {
             KIO::highlightInFileManager({destinationUrl});
         }
@@ -801,7 +801,7 @@ void DolphinMainWindow::quit()
 
 void DolphinMainWindow::showErrorMessage(const QString &message)
 {
-    m_activeViewContainer->showMessage(message, KMessageWidget::Error);
+    m_activeViewContainer->showMessage(message, DolphinViewContainer::Error);
 }
 
 void DolphinMainWindow::slotUndoAvailable(bool available)
@@ -2899,7 +2899,7 @@ void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job *job)
     DolphinMainWindow *mainWin = qobject_cast<DolphinMainWindow *>(parentWidget());
     if (mainWin) {
         DolphinViewContainer *container = mainWin->activeViewContainer();
-        container->showMessage(job->errorString(), KMessageWidget::Error);
+        container->showMessage(job->errorString(), DolphinViewContainer::Error);
     } else {
         KIO::FileUndoManager::UiInterface::jobError(job);
     }

src/dolphinviewcontainer.cpp

@@ -109,7 +109,7 @@ DolphinViewContainer::DolphinViewContainer(const QUrl &url, QWidget *parent)
 #if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU)
     if (getuid() == 0) {
         // We must be logged in as the root user; show a big scary warning
-        showMessage(i18n("Running Dolphin as root can be dangerous. Please be careful."), KMessageWidget::Warning);
+        showMessage(i18n("Running Dolphin as root can be dangerous. Please be careful."), Warning);
     }
 #endif
 
@@ -366,7 +366,9 @@ void DolphinViewContainer::setSelectionModeEnabled(bool enabled, KActionCollecti
         connect(m_view, &DolphinView::selectionChanged, this, [this](const KFileItemList &selection) {
             m_selectionModeBottomBar->slotSelectionChanged(selection, m_view->url());
         });
-        connect(m_selectionModeBottomBar, &SelectionMode::BottomBar::error, this, &DolphinViewContainer::showErrorMessage);
+        connect(m_selectionModeBottomBar, &SelectionMode::BottomBar::error, this, [this](const QString &errorMessage) {
+            showErrorMessage(errorMessage);
+        });
         connect(m_selectionModeBottomBar, &SelectionMode::BottomBar::selectionModeLeavingRequested, this, [this]() {
             setSelectionModeEnabled(false);
         });
@@ -406,18 +408,32 @@ void DolphinViewContainer::slotSplitTabDisabled()
     }
 }
 
-void DolphinViewContainer::showMessage(const QString &message, KMessageWidget::MessageType messageType)
+void DolphinViewContainer::showMessage(const QString &msg, MessageType type)
 {
-    if (message.isEmpty()) {
+    if (msg.isEmpty()) {
         return;
     }
 
-    m_messageWidget->setText(message);
+    m_messageWidget->setText(msg);
 
     // TODO: wrap at arbitrary character positions once QLabel can do this
     // https://bugreports.qt.io/browse/QTBUG-1276
     m_messageWidget->setWordWrap(true);
-    m_messageWidget->setMessageType(messageType);
+
+    switch (type) {
+    case Information:
+        m_messageWidget->setMessageType(KMessageWidget::Information);
+        break;
+    case Warning:
+        m_messageWidget->setMessageType(KMessageWidget::Warning);
+        break;
+    case Error:
+        m_messageWidget->setMessageType(KMessageWidget::Error);
+        break;
+    default:
+        Q_ASSERT(false);
+        break;
+    }
 
     m_messageWidget->setWordWrap(false);
     const int unwrappedWidth = m_messageWidget->sizeHint().width();
@@ -812,18 +828,18 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const QUrl &url)
         if (url.scheme().startsWith(QLatin1String("http"))) {
             showMessage(i18nc("@info:status", // krazy:exclude=qmethods
                               "Dolphin does not support web pages, the web browser has been launched"),
-                        KMessageWidget::Information);
+                        Information);
         } else {
-            showMessage(i18nc("@info:status", "Protocol not supported by Dolphin, default application has been launched"), KMessageWidget::Information);
+            showMessage(i18nc("@info:status", "Protocol not supported by Dolphin, default application has been launched"), Information);
         }
 
         QDesktopServices::openUrl(url);
         redirect(QUrl(), m_urlNavigator->locationUrl(1));
     } else {
         if (!url.scheme().isEmpty()) {
-            showMessage(i18nc("@info:status", "Invalid protocol '%1'", url.scheme()), KMessageWidget::Error);
+            showMessage(i18nc("@info:status", "Invalid protocol '%1'", url.scheme()), Error);
         } else {
-            showMessage(i18nc("@info:status", "Invalid protocol"), KMessageWidget::Error);
+            showMessage(i18nc("@info:status", "Invalid protocol"), Error);
         }
         m_urlNavigator->goBack();
     }
@@ -898,9 +914,9 @@ void DolphinViewContainer::slotStatusBarZoomLevelChanged(int zoomLevel)
     m_view->setZoomLevel(zoomLevel);
 }
 
-void DolphinViewContainer::showErrorMessage(const QString &message)
+void DolphinViewContainer::showErrorMessage(const QString &msg)
 {
-    showMessage(message, KMessageWidget::Error);
+    showMessage(msg, Error);
 }
 
 void DolphinViewContainer::slotPlacesModelChanged()
@@ -934,7 +950,7 @@ void DolphinViewContainer::slotCurrentDirectoryRemoved()
         setUrl(newUrl);
     }
 
-    showMessage(xi18n("Current location changed, <filename>%1</filename> is no longer accessible.", location), KMessageWidget::Warning);
+    showMessage(xi18n("Current location changed, <filename>%1</filename> is no longer accessible.", location), Warning);
 }
 
 void DolphinViewContainer::slotOpenUrlFinished(KJob *job)

src/dolphinviewcontainer.h

@@ -14,7 +14,6 @@
 
 #include <KFileItem>
 #include <KIO/Job>
-#include <KMessageWidget>
 #include <KUrlNavigator>
 
 #include <QElapsedTimer>
@@ -26,6 +25,7 @@ namespace Admin
 class Bar;
 }
 class FilterBar;
+class KMessageWidget;
 class QAction;
 class QGridLayout;
 class QUrl;
@@ -53,6 +53,8 @@ class DolphinViewContainer : public QWidget
     Q_OBJECT
 
 public:
+    enum MessageType { Information, Warning, Error };
+
     DolphinViewContainer(const QUrl &url, QWidget *parent);
     ~DolphinViewContainer() override;
 
@@ -149,9 +151,10 @@ public:
     bool isSelectionModeEnabled() const;
 
     /**
-     * Shows the message \message with the given type \messageType non-modal above the view-content.
+     * Shows the message \msg with the given type non-modal above
+     * the view-content.
      */
-    void showMessage(const QString &message, KMessageWidget::MessageType messageType);
+    void showMessage(const QString &msg, MessageType type);
 
     /**
      * Refreshes the view container to get synchronized with the (updated) Dolphin settings.
@@ -390,9 +393,9 @@ private Q_SLOTS:
     void slotStatusBarZoomLevelChanged(int zoomLevel);
 
     /**
-     * Slot that calls showMessage(message, KMessageWidget::Error).
+     * Slot that calls showMessage(msg, Error).
      */
-    void showErrorMessage(const QString &message);
+    void showErrorMessage(const QString &msg);
 
     /**
      * Is invoked when a KFilePlacesModel has been changed