Merge branch 'release/20.04'

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 8e821d8aae23ed497eba4bb88aad947ef9991c6c..0681c67d9929ed41f2706a3fb644484b6316c0b5 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -50,6 +50,7 @@
 #include <QTimer>
 #include <QUrl>
 #include <QVBoxLayout>
 #include <QTimer>
 #include <QUrl>
 #include <QVBoxLayout>

+#include <QDesktopServices>

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


@@ -385,6 +386,14 @@ bool DolphinViewContainer::isFilterBarVisible() const
 
 void DolphinViewContainer::setSearchModeEnabled(bool enabled)
 {
 
 void DolphinViewContainer::setSearchModeEnabled(bool enabled)
 {

+    m_searchBox->setVisible(enabled);
+    m_navigatorWidget->setVisible(!enabled);
+
+    if (enabled) {
+        const QUrl& locationUrl = m_urlNavigator->locationUrl();
+        m_searchBox->fromSearchUrl(locationUrl);
+    }
+

     if (enabled == isSearchModeEnabled()) {
         if (enabled && !m_searchBox->hasFocus()) {
             m_searchBox->setFocus();
     if (enabled == isSearchModeEnabled()) {
         if (enabled && !m_searchBox->hasFocus()) {
             m_searchBox->setFocus();


@@ -393,9 +402,6 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
         return;
     }
 
         return;
     }
 

-    m_searchBox->setVisible(enabled);
-    m_navigatorWidget->setVisible(!enabled);
-

     if (!enabled) {
         m_view->setViewPropertiesContext(QString());
 
     if (!enabled) {
         m_view->setViewPropertiesContext(QString());
 


@@ -409,6 +415,8 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
     }
 
     m_searchModeEnabled = enabled;
     }
 
     m_searchModeEnabled = enabled;

+
+    emit searchModeEnabledChanged(enabled);

 }
 
 bool DolphinViewContainer::isSearchModeEnabled() const
 }
 
 bool DolphinViewContainer::isSearchModeEnabled() const


@@ -441,22 +449,20 @@ void DolphinViewContainer::reload()
     m_messageWidget->hide();
 }
 
     m_messageWidget->hide();
 }
 

-QString DolphinViewContainer::caption() const
+QString DolphinViewContainer::captionWindowTitle() const

 {
 {

-    if (GeneralSettings::showFullPathInTitlebar()) {
+    if (GeneralSettings::showFullPathInTitlebar() && !isSearchModeEnabled()) {

         if (!url().isLocalFile()) {
             return url().adjusted(QUrl::StripTrailingSlash).toString();
         }
         return url().adjusted(QUrl::StripTrailingSlash).path();
         if (!url().isLocalFile()) {
             return url().adjusted(QUrl::StripTrailingSlash).toString();
         }
         return url().adjusted(QUrl::StripTrailingSlash).path();

+    } else {
+        return DolphinViewContainer::caption();

     }
     }

+}

 
 

-    KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel();
-    const auto& matchedPlaces = placesModel->match(placesModel->index(0,0), KFilePlacesModel::UrlRole, url(), 1, Qt::MatchExactly);
-
-    if (!matchedPlaces.isEmpty()) {
-        return placesModel->text(matchedPlaces.first());
-    }
-
+QString DolphinViewContainer::caption() const
+{

     if (isSearchModeEnabled()) {
         if (currentSearchText().isEmpty()){
             return i18n("Search");
     if (isSearchModeEnabled()) {
         if (currentSearchText().isEmpty()){
             return i18n("Search");


@@ -465,6 +471,14 @@ QString DolphinViewContainer::caption() const
         }
     }
 
         }
     }
 

+    KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel();
+    const auto& matchedPlaces = placesModel->match(placesModel->index(0,0), KFilePlacesModel::UrlRole, QUrl(url().adjusted(QUrl::StripTrailingSlash).toString(QUrl::FullyEncoded).append("/?")), 1, Qt::MatchRegExp);
+
+    if (!matchedPlaces.isEmpty()) {
+        return placesModel->text(matchedPlaces.first());
+    }
+
+

     if (!url().isLocalFile()) {
         QUrl adjustedUrl = url().adjusted(QUrl::StripTrailingSlash);
         QString caption;
     if (!url().isLocalFile()) {
         QUrl adjustedUrl = url().adjusted(QUrl::StripTrailingSlash);
         QString caption;


@@ -503,6 +517,7 @@ void DolphinViewContainer::setFilterBarVisible(bool visible)
 {
     Q_ASSERT(m_filterBar);
     if (visible) {
 {
     Q_ASSERT(m_filterBar);
     if (visible) {

+        m_view->hideToolTip(ToolTipManager::HideBehavior::Instantly);

         m_filterBar->show();
         m_filterBar->setFocus();
         m_filterBar->selectAll();
         m_filterBar->show();
         m_filterBar->setFocus();
         m_filterBar->selectAll();


@@ -652,6 +667,7 @@ void DolphinViewContainer::closeFilterBar()
 
 void DolphinViewContainer::setNameFilter(const QString& nameFilter)
 {
 
 void DolphinViewContainer::setNameFilter(const QString& nameFilter)
 {

+    m_view->hideToolTip(ToolTipManager::HideBehavior::Instantly);

     m_view->setNameFilter(nameFilter);
     delayedStatusBarUpdate();
 }
     m_view->setNameFilter(nameFilter);
     delayedStatusBarUpdate();
 }


@@ -671,45 +687,29 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const QUrl& url)
     slotReturnPressed();
 
     if (KProtocolManager::supportsListing(url)) {
     slotReturnPressed();
 
     if (KProtocolManager::supportsListing(url)) {

-        const bool searchUrl = isSearchUrl(url);
-        if (searchUrl) {
-            m_searchBox->fromSearchUrl(url);
-        }
-        setSearchModeEnabled(searchUrl);
+        setSearchModeEnabled(isSearchUrl(url));

         m_view->setUrl(url);
         tryRestoreViewState();
 
         m_view->setUrl(url);
         tryRestoreViewState();
 

-        if (m_autoGrabFocus && isActive() && !searchUrl) {
+        if (m_autoGrabFocus && isActive() && !isSearchUrl(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.
             QTimer::singleShot(0, this, &DolphinViewContainer::requestFocus);
         }
     } else if (KProtocolManager::isSourceProtocol(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.
             QTimer::singleShot(0, this, &DolphinViewContainer::requestFocus);
         }
     } else if (KProtocolManager::isSourceProtocol(url)) {

-        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);
         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);

-
-            const KConfigGroup config(KSharedConfig::openConfig(QStringLiteral("kdeglobals")), "General");
-            const QString browser = config.readEntry("BrowserApplication");
-            if (!browser.isEmpty()) {
-                app = browser;
-                if (app.startsWith('!')) {
-                    // a literal command has been configured, remove the '!' prefix
-                    app = app.mid(1);
-                }
-            }

         } else {
             showMessage(i18nc("@info:status",
         } else {
             showMessage(i18nc("@info:status",

-                              "Protocol not supported by Dolphin, Konqueror has been launched"),
+                              "Protocol not supported by Dolphin, default application has been launched"),

                         Information);
         }
 
                         Information);
         }
 

-        const QString secureUrl = KShell::quoteArg(url.toDisplayString(QUrl::PreferLocalFile));
-        const QString command = app + ' ' + secureUrl;
-        KRun::runCommand(command, app, app, this);
+        QDesktopServices::openUrl(url);
+        redirect(QUrl(), m_urlNavigator->locationUrl(1));

     } else {
         showMessage(i18nc("@info:status", "Invalid protocol"), Error);
     }
     } else {
         showMessage(i18nc("@info:status", "Invalid protocol"), Error);
     }


@@ -723,7 +723,7 @@ void DolphinViewContainer::slotUrlSelectionRequested(const QUrl& url)
 
 void DolphinViewContainer::redirect(const QUrl& oldUrl, const QUrl& newUrl)
 {
 
 void DolphinViewContainer::redirect(const QUrl& oldUrl, const QUrl& newUrl)
 {

-    Q_UNUSED(oldUrl);
+    Q_UNUSED(oldUrl)

     const bool block = m_urlNavigator->signalsBlocked();
     m_urlNavigator->blockSignals(true);
 
     const bool block = m_urlNavigator->signalsBlocked();
     m_urlNavigator->blockSignals(true);
 


@@ -786,7 +786,7 @@ void DolphinViewContainer::showErrorMessage(const QString& msg)
 
 bool DolphinViewContainer::isSearchUrl(const QUrl& url) const
 {
 
 bool DolphinViewContainer::isSearchUrl(const QUrl& url) const
 {

-    return url.scheme().contains(QStringLiteral("search"));
+    return url.scheme().contains(QLatin1String("search"));

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