Merge branch 'Applications/16.04'

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 761062585e8681cda2497499364b5bdc1e0fb68a..73ffd5c2d42d7a188bc8732b22f6dbeccfd23c2e 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -20,45 +20,34 @@
 #include "dolphinviewcontainer.h"
 #include <KProtocolManager>
 
 #include "dolphinviewcontainer.h"
 #include <KProtocolManager>
 

-#include <QApplication>
-#include <QKeyEvent>
-#include <QItemSelection>
-#include <QBoxLayout>
+#include <QDropEvent>

 #include <QTimer>
 #include <QTimer>

-#include <QScrollBar>

 #include <QMimeData>
 #include <QMimeData>

+#include <QVBoxLayout>

 
 

-#include <KDesktopFile>
-#include <KFileItemDelegate>

 #include <KFileItemActions>
 #include <KFilePlacesModel>
 #include <KFileItemActions>
 #include <KFilePlacesModel>

-#include <KLocale>
-#include <KIconEffect>
-#include <KIO/NetAccess>
+#include <KLocalizedString>

 #include <KIO/PreviewJob>
 #include <KMessageWidget>
 #include <KIO/PreviewJob>
 #include <KMessageWidget>

-#include <KNewFileMenu>
-#include <konqmimedata.h>
-#include <konq_operations.h>

 #include <KShell>
 #include <KShell>

-#include <KUrl>
+#include <QUrl>

 #include <KUrlComboBox>
 #include <KUrlNavigator>
 #include <KRun>
 
 #ifdef KActivities_FOUND
 #include <KUrlComboBox>
 #include <KUrlNavigator>
 #include <KRun>
 
 #ifdef KActivities_FOUND

-#include <KActivities/ResourceInstance>

 #endif
 
 #endif
 

+#include "global.h"

 #include "dolphin_generalsettings.h"
 #include "filterbar/filterbar.h"
 #include "search/dolphinsearchbox.h"
 #include "statusbar/dolphinstatusbar.h"
 #include "dolphin_generalsettings.h"
 #include "filterbar/filterbar.h"
 #include "search/dolphinsearchbox.h"
 #include "statusbar/dolphinstatusbar.h"

-#include "views/draganddrophelper.h"

 #include "views/viewmodecontroller.h"
 #include "views/viewproperties.h"
 
 #include "views/viewmodecontroller.h"
 #include "views/viewproperties.h"
 

-DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
+DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :

     QWidget(parent),
     m_topLayout(0),
     m_urlNavigator(0),
     QWidget(parent),
     m_topLayout(0),
     m_urlNavigator(0),


@@ -69,9 +58,7 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     m_statusBar(0),
     m_statusBarTimer(0),
     m_statusBarTimestamp(),
     m_statusBar(0),
     m_statusBarTimer(0),
     m_statusBarTimestamp(),

-    m_autoGrabFocus(true),
-    m_dropDestination(),
-    m_dropEvent(0)
+    m_autoGrabFocus(true)

 #ifdef KActivities_FOUND
     , m_activityResourceInstance(0)
 #endif
 #ifdef KActivities_FOUND
     , m_activityResourceInstance(0)
 #endif


@@ -83,8 +70,6 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     m_topLayout->setMargin(0);
 
     m_urlNavigator = new KUrlNavigator(new KFilePlacesModel(this), url, this);
     m_topLayout->setMargin(0);
 
     m_urlNavigator = new KUrlNavigator(new KFilePlacesModel(this), url, this);

-    connect(m_urlNavigator, &KUrlNavigator::urlsDropped,
-            this, &DolphinViewContainer::dropUrls);

     connect(m_urlNavigator, &KUrlNavigator::activated,
             this, &DolphinViewContainer::activate);
     connect(m_urlNavigator->editor(), &KUrlComboBox::completionModeChanged,
     connect(m_urlNavigator, &KUrlNavigator::activated,
             this, &DolphinViewContainer::activate);
     connect(m_urlNavigator->editor(), &KUrlComboBox::completionModeChanged,


@@ -93,7 +78,7 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     const GeneralSettings* settings = GeneralSettings::self();
     m_urlNavigator->setUrlEditable(settings->editableUrl());
     m_urlNavigator->setShowFullPath(settings->showFullPath());
     const GeneralSettings* settings = GeneralSettings::self();
     m_urlNavigator->setUrlEditable(settings->editableUrl());
     m_urlNavigator->setShowFullPath(settings->showFullPath());

-    m_urlNavigator->setHomeUrl(KUrl(settings->homeUrl()));
+    m_urlNavigator->setHomeUrl(Dolphin::homeUrl());

     KUrlComboBox* editor = m_urlNavigator->editor();
     editor->setCompletionMode(KCompletion::CompletionMode(settings->urlCompletionMode()));
 
     KUrlComboBox* editor = m_urlNavigator->editor();
     editor->setCompletionMode(KCompletion::CompletionMode(settings->urlCompletionMode()));
 


@@ -113,6 +98,8 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
             m_urlNavigator, &KUrlNavigator::setUrl);
     connect(m_view, &DolphinView::urlChanged,
             m_messageWidget, &KMessageWidget::hide);
             m_urlNavigator, &KUrlNavigator::setUrl);
     connect(m_view, &DolphinView::urlChanged,
             m_messageWidget, &KMessageWidget::hide);

+    connect(m_view, &DolphinView::directoryLoadingCompleted,
+            m_messageWidget, &KMessageWidget::hide);

     connect(m_view, &DolphinView::writeStateChanged,
             this, &DolphinViewContainer::writeStateChanged);
     connect(m_view, &DolphinView::requestItemInfo,
     connect(m_view, &DolphinView::writeStateChanged,
             this, &DolphinViewContainer::writeStateChanged);
     connect(m_view, &DolphinView::requestItemInfo,


@@ -143,6 +130,8 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
             this, &DolphinViewContainer::showErrorMessage);
     connect(m_view, &DolphinView::urlIsFileError,
             this, &DolphinViewContainer::slotUrlIsFileError);
             this, &DolphinViewContainer::showErrorMessage);
     connect(m_view, &DolphinView::urlIsFileError,
             this, &DolphinViewContainer::slotUrlIsFileError);

+    connect(m_view, &DolphinView::activated,
+            this, &DolphinViewContainer::activate);

 
     connect(m_urlNavigator, &KUrlNavigator::urlAboutToBeChanged,
             this, &DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged);
 
     connect(m_urlNavigator, &KUrlNavigator::urlAboutToBeChanged,
             this, &DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged);


@@ -152,6 +141,8 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
             this, &DolphinViewContainer::slotHistoryChanged);
     connect(m_urlNavigator, &KUrlNavigator::returnPressed,
             this, &DolphinViewContainer::slotReturnPressed);
             this, &DolphinViewContainer::slotHistoryChanged);
     connect(m_urlNavigator, &KUrlNavigator::returnPressed,
             this, &DolphinViewContainer::slotReturnPressed);

+    connect(m_urlNavigator, &KUrlNavigator::urlsDropped,
+            m_view, &DolphinView::dropUrls);

 
     // Initialize status bar
     m_statusBar = new DolphinStatusBar(this);
 
     // Initialize status bar
     m_statusBar = new DolphinStatusBar(this);


@@ -213,7 +204,7 @@ DolphinViewContainer::~DolphinViewContainer()
 {
 }
 
 {
 }
 

-KUrl DolphinViewContainer::url() const
+QUrl DolphinViewContainer::url() const

 {
     return m_view->url();
 }
 {
     return m_view->url();
 }


@@ -300,6 +291,9 @@ void DolphinViewContainer::showMessage(const QString& msg, MessageType type)
     const int unwrappedWidth = m_messageWidget->sizeHint().width();
     m_messageWidget->setWordWrap(unwrappedWidth > size().width());
 
     const int unwrappedWidth = m_messageWidget->sizeHint().width();
     m_messageWidget->setWordWrap(unwrappedWidth > size().width());
 

+    if (m_messageWidget->isVisible()) {
+        m_messageWidget->hide();
+    }

     m_messageWidget->animatedShow();
 }
 
     m_messageWidget->animatedShow();
 }
 


@@ -311,7 +305,7 @@ void DolphinViewContainer::readSettings()
         // settings of the URL navigator and the filterbar.
         m_urlNavigator->setUrlEditable(GeneralSettings::editableUrl());
         m_urlNavigator->setShowFullPath(GeneralSettings::showFullPath());
         // settings of the URL navigator and the filterbar.
         m_urlNavigator->setUrlEditable(GeneralSettings::editableUrl());
         m_urlNavigator->setShowFullPath(GeneralSettings::showFullPath());

-        m_urlNavigator->setHomeUrl(KUrl(GeneralSettings::homeUrl()));
+        m_urlNavigator->setHomeUrl(Dolphin::homeUrl());

         setFilterBarVisible(GeneralSettings::filterBar());
     }
 
         setFilterBarVisible(GeneralSettings::filterBar());
     }
 


@@ -338,16 +332,16 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
     m_urlNavigator->setVisible(!enabled);
 
     if (enabled) {
     m_urlNavigator->setVisible(!enabled);
 
     if (enabled) {

-        const KUrl& locationUrl = m_urlNavigator->locationUrl();
+        const QUrl& locationUrl = m_urlNavigator->locationUrl();

         m_searchBox->fromSearchUrl(locationUrl);
     } else {
         m_view->setViewPropertiesContext(QString());
 
         // Restore the URL for the URL navigator. If Dolphin has been
         // started with a search-URL, the home URL is used as fallback.
         m_searchBox->fromSearchUrl(locationUrl);
     } else {
         m_view->setViewPropertiesContext(QString());
 
         // Restore the URL for the URL navigator. If Dolphin has been
         // started with a search-URL, the home URL is used as fallback.

-        KUrl url = m_searchBox->searchPath();
+        QUrl url = m_searchBox->searchPath();

         if (url.isEmpty() || !url.isValid() || isSearchUrl(url)) {
         if (url.isEmpty() || !url.isValid() || isSearchUrl(url)) {

-            url = GeneralSettings::self()->homeUrl();
+            url = Dolphin::homeUrl();

         }
         m_urlNavigator->setLocationUrl(url);
     }
         }
         m_urlNavigator->setLocationUrl(url);
     }


@@ -374,7 +368,7 @@ QString DolphinViewContainer::placesText() const
     return text;
 }
 
     return text;
 }
 

-void DolphinViewContainer::setUrl(const KUrl& newUrl)
+void DolphinViewContainer::setUrl(const QUrl& newUrl)

 {
     if (newUrl != m_urlNavigator->locationUrl()) {
         m_urlNavigator->setLocationUrl(newUrl);
 {
     if (newUrl != m_urlNavigator->locationUrl()) {
         m_urlNavigator->setLocationUrl(newUrl);


@@ -479,10 +473,19 @@ void DolphinViewContainer::slotDirectoryLoadingCanceled()
     m_statusBar->setText(QString());
 }
 
     m_statusBar->setText(QString());
 }
 

-void DolphinViewContainer::slotUrlIsFileError(const KUrl& url)
+void DolphinViewContainer::slotUrlIsFileError(const QUrl& url)

 {
 {

-    const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
-    slotItemActivated(item);
+    const KFileItem item(url);
+
+    // Find out if the file can be opened in the view (for example, this is the
+    // case if the file is an archive). The mime type must be known for that.
+    item.determineMimeType();
+    const QUrl& folderUrl = DolphinView::openItemAsFolderUrl(item, true);
+    if (!folderUrl.isEmpty()) {
+        m_view->setUrl(folderUrl);
+    } else {
+        slotItemActivated(item);
+    }

 }
 
 void DolphinViewContainer::slotItemActivated(const KFileItem& item)
 }
 
 void DolphinViewContainer::slotItemActivated(const KFileItem& item)


@@ -492,13 +495,14 @@ void DolphinViewContainer::slotItemActivated(const KFileItem& item)
     // results in an active view.
     m_view->setActive(true);
 
     // results in an active view.
     m_view->setActive(true);
 

-    const KUrl& url = DolphinView::openItemAsFolderUrl(item, GeneralSettings::browseThroughArchives());
+    const QUrl& url = DolphinView::openItemAsFolderUrl(item, GeneralSettings::browseThroughArchives());

     if (!url.isEmpty()) {
         m_view->setUrl(url);
         return;
     }
 
     if (!url.isEmpty()) {
         m_view->setUrl(url);
         return;
     }
 

-    new KRun(item.targetUrl(), this);
+    KRun *run = new KRun(item.targetUrl(), this);
+    run->setShowScriptExecutionPrompt(true);

 }
 
 void DolphinViewContainer::slotItemsActivated(const KFileItemList& items)
 }
 
 void DolphinViewContainer::slotItemsActivated(const KFileItemList& items)


@@ -536,7 +540,7 @@ void DolphinViewContainer::activate()
     setActive(true);
 }
 
     setActive(true);
 }
 

-void DolphinViewContainer::slotViewUrlAboutToBeChanged(const KUrl& url)
+void DolphinViewContainer::slotViewUrlAboutToBeChanged(const QUrl& url)

 {
     // URL changes of the view can happen in two ways:
     // 1. The URL navigator gets changed and will trigger the view to update its URL
 {
     // URL changes of the view can happen in two ways:
     // 1. The URL navigator gets changed and will trigger the view to update its URL


@@ -548,7 +552,7 @@ void DolphinViewContainer::slotViewUrlAboutToBeChanged(const KUrl& url)
     }
 }
 
     }
 }
 

-void DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged(const KUrl& url)
+void DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged(const QUrl& url)

 {
     // URL changes of the view can happen in two ways:
     // 1. The URL navigator gets changed and will trigger the view to update its URL
 {
     // URL changes of the view can happen in two ways:
     // 1. The URL navigator gets changed and will trigger the view to update its URL


@@ -560,7 +564,7 @@ void DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged(const KUrl&
     }
 }
 
     }
 }
 

-void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url)
+void DolphinViewContainer::slotUrlNavigatorLocationChanged(const QUrl& url)

 {
     slotReturnPressed();
 
 {
     slotReturnPressed();
 


@@ -572,16 +576,16 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url)
             // When an URL has been entered, the view should get the focus.
             // The focus must be requested asynchronously, as changing the URL might create
             // a new view widget.
             // When an URL has been entered, the view should get the focus.
             // The focus must be requested asynchronously, as changing the URL might create
             // a new view widget.

-            QTimer::singleShot(0, this, SLOT(requestFocus()));
+            QTimer::singleShot(0, this, &DolphinViewContainer::requestFocus);

         }
     } else if (KProtocolManager::isSourceProtocol(url)) {
         }
     } else if (KProtocolManager::isSourceProtocol(url)) {

-        QString app = "konqueror";
-        if (url.protocol().startsWith(QLatin1String("http"))) {
+        QString app = QStringLiteral("konqueror");
+        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"),
                         Information);
 
             showMessage(i18nc("@info:status", // krazy:exclude=qmethods
                               "Dolphin does not support web pages, the web browser has been launched"),
                         Information);
 

-            const KConfigGroup config(KSharedConfig::openConfig("kdeglobals"), "General");
+            const KConfigGroup config(KSharedConfig::openConfig(QStringLiteral("kdeglobals")), "General");

             const QString browser = config.readEntry("BrowserApplication");
             if (!browser.isEmpty()) {
                 app = browser;
             const QString browser = config.readEntry("BrowserApplication");
             if (!browser.isEmpty()) {
                 app = browser;


@@ -596,7 +600,7 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url)
                         Information);
         }
 
                         Information);
         }
 

-        const QString secureUrl = KShell::quoteArg(url.pathOrUrl());
+        const QString secureUrl = KShell::quoteArg(url.toDisplayString(QUrl::PreferLocalFile));

         const QString command = app + ' ' + secureUrl;
         KRun::runCommand(command, app, app, this);
     } else {
         const QString command = app + ' ' + secureUrl;
         KRun::runCommand(command, app, app, this);
     } else {


@@ -604,42 +608,7 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url)
     }
 }
 
     }
 }
 

-void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event)
-{
-    m_dropDestination = destination;
-
-    const QMimeData* mimeData = event->mimeData();
-    QMimeData* mimeDataCopy = new QMimeData;
-    foreach (const QString& format, mimeData->formats()) {
-        mimeDataCopy->setData(format, mimeData->data(format));
-    }
-
-    m_dropEvent.reset(new QDropEvent(event->pos(),
-                                     event->possibleActions(),
-                                     mimeDataCopy,
-                                     event->mouseButtons(),
-                                     event->keyboardModifiers()));
-
-    QTimer::singleShot(0, this, SLOT(dropUrlsDelayed()));
-}
-
-void DolphinViewContainer::dropUrlsDelayed()
-{
-    if (m_dropEvent.isNull()) {
-        return;
-    }
-
-    QString error;
-    DragAndDropHelper::dropUrls(KFileItem(), m_dropDestination, m_dropEvent.data(), error);
-    if (!error.isEmpty()) {
-        showMessage(error, Error);
-    }
-
-    delete m_dropEvent->mimeData();
-    m_dropEvent.reset();
-}
-
-void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl)
+void DolphinViewContainer::redirect(const QUrl& oldUrl, const QUrl& newUrl)

 {
     Q_UNUSED(oldUrl);
     const bool block = m_urlNavigator->signalsBlocked();
 {
     Q_UNUSED(oldUrl);
     const bool block = m_urlNavigator->signalsBlocked();


@@ -683,9 +652,9 @@ void DolphinViewContainer::slotReturnPressed()
 
 void DolphinViewContainer::startSearching()
 {
 
 void DolphinViewContainer::startSearching()
 {

-    const KUrl url = m_searchBox->urlForSearching();
+    const QUrl url = m_searchBox->urlForSearching();

     if (url.isValid() && !url.isEmpty()) {
     if (url.isValid() && !url.isEmpty()) {

-        m_view->setViewPropertiesContext("search");
+        m_view->setViewPropertiesContext(QStringLiteral("search"));

         m_urlNavigator->setLocationUrl(url);
     }
 }
         m_urlNavigator->setLocationUrl(url);
     }
 }


@@ -711,10 +680,9 @@ void DolphinViewContainer::showErrorMessage(const QString& msg)
     showMessage(msg, Error);
 }
 
     showMessage(msg, Error);
 }
 

-bool DolphinViewContainer::isSearchUrl(const KUrl& url) const
+bool DolphinViewContainer::isSearchUrl(const QUrl& url) const

 {
 {

-    const QString protocol = url.protocol();
-    return protocol.contains("search");
+    return url.scheme().contains(QStringLiteral("search"));

 }
 
 void DolphinViewContainer::saveViewState()
 }
 
 void DolphinViewContainer::saveViewState()


@@ -724,5 +692,3 @@ void DolphinViewContainer::saveViewState()
     m_view->saveState(stream);
     m_urlNavigator->saveLocationState(locationState);
 }
     m_view->saveState(stream);
     m_urlNavigator->saveLocationState(locationState);
 }

-
-#include "dolphinviewcontainer.moc"