Merge branch 'Applications/18.04'

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 1620f3c368625c804d497111126a61c41940f9cd..f473752dc11af6de163e80cfcb443a20d28fd977 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -20,16 +20,17 @@
 #include "dolphinviewcontainer.h"
 
 #include "dolphin_generalsettings.h"
+#include "dolphinplacesmodelsingleton.h"
 #include "dolphindebug.h"
 #include "filterbar/filterbar.h"
 #include "global.h"
 #include "search/dolphinsearchbox.h"
 #include "statusbar/dolphinstatusbar.h"
+#include "trash/dolphintrash.h"
 #include "views/viewmodecontroller.h"
 #include "views/viewproperties.h"
 
 #include <KFileItemActions>
-#include <KFilePlacesModel>
 #include <KIO/PreviewJob>
 #include <KLocalizedString>
 #include <KMessageWidget>
@@ -50,7 +51,9 @@
 DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
     QWidget(parent),
     m_topLayout(nullptr),
+    m_navigatorWidget(nullptr),
     m_urlNavigator(nullptr),
+    m_emptyTrashButton(nullptr),
     m_searchBox(nullptr),
     m_messageWidget(nullptr),
     m_view(nullptr),
@@ -69,7 +72,12 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 
-    m_urlNavigator = new KUrlNavigator(new KFilePlacesModel(this), url, this);
+    m_navigatorWidget = new QWidget(this);
+    QHBoxLayout* navigatorLayout = new QHBoxLayout(m_navigatorWidget);
+    navigatorLayout->setSpacing(0);
+    navigatorLayout->setMargin(0);
+
+    m_urlNavigator = new KUrlNavigator(DolphinPlacesModelSingleton::instance().placesModel(), url, this);
     connect(m_urlNavigator, &KUrlNavigator::activated,
             this, &DolphinViewContainer::activate);
     connect(m_urlNavigator->editor(), &KUrlComboBox::completionModeChanged,
@@ -82,6 +90,13 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
     KUrlComboBox* editor = m_urlNavigator->editor();
     editor->setCompletionMode(KCompletion::CompletionMode(settings->urlCompletionMode()));
 
+    m_emptyTrashButton = new QPushButton(QIcon::fromTheme(QStringLiteral("user-trash")), i18nc("@action:button", "Empty Trash"), this);
+    m_emptyTrashButton->setFlat(true);
+    connect(m_emptyTrashButton, &QPushButton::clicked, this, [this]() { Trash::empty(this); });
+    connect(&Trash::instance(), &Trash::emptinessChanged, m_emptyTrashButton, &QPushButton::setDisabled);
+    m_emptyTrashButton->setDisabled(Trash::isEmpty());
+    m_emptyTrashButton->hide();
+
     m_searchBox = new DolphinSearchBox(this);
     m_searchBox->hide();
     connect(m_searchBox, &DolphinSearchBox::activated, this, &DolphinViewContainer::activate);
@@ -93,6 +108,14 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
     m_messageWidget->setCloseButtonVisible(true);
     m_messageWidget->hide();
 
+#ifndef Q_OS_WIN
+    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."), Warning);
+    }
+#endif
+
     m_view = new DolphinView(url, this);
     connect(m_view, &DolphinView::urlChanged,
             m_urlNavigator, &KUrlNavigator::setLocationUrl);
@@ -138,12 +161,11 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
     connect(m_urlNavigator, &KUrlNavigator::returnPressed,
             this, &DolphinViewContainer::slotReturnPressed);
     connect(m_urlNavigator, &KUrlNavigator::urlsDropped, this, [=](const QUrl &destination, QDropEvent *event) {
-#if KIO_VERSION >= QT_VERSION_CHECK(5, 37, 0)
         m_view->dropUrls(destination, event, m_urlNavigator->dropWidget());
-#else
-        // TODO: remove as soon as we can hard-depend of KF5 >= 5.37
-        m_view->dropUrls(destination, event, m_view);
-#endif
+    });
+
+    connect(m_view, &DolphinView::directoryLoadingCompleted, this, [this]() {
+        m_emptyTrashButton->setVisible(m_view->url().scheme() == QLatin1String("trash"));
     });
 
     // Initialize status bar
@@ -184,7 +206,10 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
     connect(m_view, &DolphinView::urlChanged,
             m_filterBar, &FilterBar::slotUrlChanged);
 
-    m_topLayout->addWidget(m_urlNavigator);
+    navigatorLayout->addWidget(m_urlNavigator);
+    navigatorLayout->addWidget(m_emptyTrashButton);
+
+    m_topLayout->addWidget(m_navigatorWidget);
     m_topLayout->addWidget(m_searchBox);
     m_topLayout->addWidget(m_messageWidget);
     m_topLayout->addWidget(m_view);
@@ -336,7 +361,7 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
     }
 
     m_searchBox->setVisible(enabled);
-    m_urlNavigator->setVisible(!enabled);
+    m_navigatorWidget->setVisible(!enabled);
 
     if (enabled) {
         const QUrl& locationUrl = m_urlNavigator->locationUrl();