X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/be077d3a0cde5b461fd6d4e7d73054538b44470b..957a6f4f31d6a50682cb3ac16447dc72498afea9:/src/dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 5978ae938..e21262977 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -30,6 +30,9 @@
 #include "views/viewmodecontroller.h"
 #include "views/viewproperties.h"
 
+#ifdef HAVE_KACTIVITIES
+#include <KActivities/ResourceInstance>
+#endif
 #include <KFileItemActions>
 #include <KFilePlacesModel>
 #include <KIO/PreviewJob>
@@ -40,7 +43,6 @@
 #include <KShell>
 #include <KUrlComboBox>
 #include <KUrlNavigator>
-#include <kio_version.h>
 
 #include <QDropEvent>
 #include <QLoggingCategory>
@@ -64,20 +66,20 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
     m_statusBarTimer(nullptr),
     m_statusBarTimestamp(),
     m_autoGrabFocus(true)
-#ifdef KActivities_FOUND
-    , m_activityResourceInstance(0)
+#ifdef HAVE_KACTIVITIES
+    , m_activityResourceInstance(nullptr)
 #endif
 {
     hide();
 
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
-    m_topLayout->setMargin(0);
+    m_topLayout->setContentsMargins(0, 0, 0, 0);
 
     m_navigatorWidget = new QWidget(this);
     QHBoxLayout* navigatorLayout = new QHBoxLayout(m_navigatorWidget);
     navigatorLayout->setSpacing(0);
-    navigatorLayout->setMargin(0);
+    navigatorLayout->setContentsMargins(0, 0, 0, 0);
 
     m_urlNavigator = new KUrlNavigator(DolphinPlacesModelSingleton::instance().placesModel(), url, this);
     connect(m_urlNavigator, &KUrlNavigator::activated,
@@ -222,11 +224,10 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
 
     // Initialize kactivities resource instance
 
-    #ifdef KActivities_FOUND
-    m_activityResourceInstance = new KActivities::ResourceInstance(
-            window()->winId(), url);
+#ifdef HAVE_KACTIVITIES
+    m_activityResourceInstance = new KActivities::ResourceInstance(window()->winId(), url);
     m_activityResourceInstance->setParent(this);
-    #endif
+#endif
 }
 
 DolphinViewContainer::~DolphinViewContainer()
@@ -244,13 +245,13 @@ void DolphinViewContainer::setActive(bool active)
     m_urlNavigator->setActive(active);
     m_view->setActive(active);
 
-    #ifdef KActivities_FOUND
+#ifdef HAVE_KACTIVITIES
     if (active) {
         m_activityResourceInstance->notifyFocusedIn();
     } else {
         m_activityResourceInstance->notifyFocusedOut();
     }
-    #endif
+#endif
 }
 
 bool DolphinViewContainer::isActive() const
@@ -312,6 +313,10 @@ void DolphinViewContainer::showMessage(const QString& msg, MessageType type)
 
     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);
+
     switch (type) {
     case Information: m_messageWidget->setMessageType(KMessageWidget::Information); break;
     case Warning:     m_messageWidget->setMessageType(KMessageWidget::Warning); break;
@@ -466,9 +471,9 @@ void DolphinViewContainer::setUrl(const QUrl& newUrl)
         m_urlNavigator->setLocationUrl(newUrl);
     }
 
-    #ifdef KActivities_FOUND
+#ifdef HAVE_KACTIVITIES
     m_activityResourceInstance->setUri(newUrl);
-    #endif
+#endif
 }
 
 void DolphinViewContainer::setFilterBarVisible(bool visible)
@@ -684,7 +689,6 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const QUrl& url)
 
 void DolphinViewContainer::slotUrlSelectionRequested(const QUrl& url)
 {
-    qCDebug(DolphinDebug) << "slotUrlSelectionRequested: " << url;
     m_view->markUrlsAsSelected({url});
     m_view->markUrlAsCurrent(url); // makes the item scroll into view
 }