GIT_SILENT made messages (after extraction)

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 9af1bc92608c34cc8c491d09c80c65215599c36a..bd3c8ed20f1d18f05ab15a61e8f86b2038f700b8 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,13 +402,7 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
         return;
     }
 
         return;
     }
 

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

         m_view->setViewPropertiesContext(QString());
 
         // Restore the URL for the URL navigator. If Dolphin has been
         m_view->setViewPropertiesContext(QString());
 
         // Restore the URL for the URL navigator. If Dolphin has been


@@ -456,7 +459,7 @@ QString DolphinViewContainer::caption() const
     }
 
     KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel();
     }
 
     KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel();

-    const auto& matchedPlaces = placesModel->match(placesModel->index(0,0), KFilePlacesModel::UrlRole, url(), 1, Qt::MatchExactly);
+    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 (!matchedPlaces.isEmpty()) {
         return placesModel->text(matchedPlaces.first());


@@ -508,6 +511,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();


@@ -657,6 +661,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();
 }


@@ -687,30 +692,18 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const QUrl& url)
             QTimer::singleShot(0, this, &DolphinViewContainer::requestFocus);
         }
     } else if (KProtocolManager::isSourceProtocol(url)) {
             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.remove(0, 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);
     }


@@ -724,7 +717,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);