From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Sun, 6 Oct 2019 09:51:34 +0000 (+0200)
Subject: Merge branch 'Applications/19.08'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/fcf2d98447a1103af2dae5b1da0e673a6a42122e?hp=-c

Merge branch 'Applications/19.08'
---

fcf2d98447a1103af2dae5b1da0e673a6a42122e
diff --combined src/dolphinviewcontainer.cpp
index 13b88f601,536ab0fa8..41706288c
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@@ -385,6 -385,9 +385,9 @@@ bool DolphinViewContainer::isFilterBarV
  
  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);
@@@ -398,9 -401,6 +401,6 @@@
          return;
      }
  
-     m_searchBox->setVisible(enabled);
-     m_navigatorWidget->setVisible(!enabled);
- 
      if (!enabled) {
          m_view->setViewPropertiesContext(QString());
  
@@@ -414,8 -414,6 +414,8 @@@
      }
  
      m_searchModeEnabled = enabled;
 +
 +    emit searchModeEnabledChanged(enabled);
  }
  
  bool DolphinViewContainer::isSearchModeEnabled() const
@@@ -458,7 -456,7 +458,7 @@@ QString DolphinViewContainer::caption(
      }
  
      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());
@@@ -701,7 -699,7 +701,7 @@@ void DolphinViewContainer::slotUrlNavig
                  app = browser;
                  if (app.startsWith('!')) {
                      // a literal command has been configured, remove the '!' prefix
 -                    app = app.mid(1);
 +                    app.remove(0, 1);
                  }
              }
          } else {
@@@ -789,7 -787,7 +789,7 @@@ void DolphinViewContainer::showErrorMes
  
  bool DolphinViewContainer::isSearchUrl(const QUrl& url) const
  {
 -    return url.scheme().contains(QStringLiteral("search"));
 +    return url.scheme().contains(QLatin1String("search"));
  }
  
  void DolphinViewContainer::saveViewState()