[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [dolphin] src: Fix window / tab caption in search mode
From:       Kai Uwe Broulik <null () kde ! org>
Date:       2018-09-27 10:56:33
Message-ID: E1g5TyD-0001Ei-Q8 () code ! kde ! org
[Download RAW message or body]

Git commit 0483b8a77f859b8466e2bffe669698ec81663640 by Kai Uwe Broulik.
Committed on 27/09/2018 at 10:56.
Pushed by broulik into branch 'master'.

Fix window / tab caption in search mode

A search URL is never local, so this part of the code was never reached, resulting in \
raw baloosearch or filenamesearch URLs showing up as window and tab title

Differential Revision: https://phabricator.kde.org/D15772

M  +9    -8    src/dolphinviewcontainer.cpp

https://commits.kde.org/dolphin/0483b8a77f859b8466e2bffe669698ec81663640

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index f747d442ee..71a1ae872f 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -425,6 +425,15 @@ QString DolphinViewContainer::caption() const
     if (!matchedPlaces.isEmpty()) {
         return placesModel->text(matchedPlaces.first());
     }
+
+    if (isSearchModeEnabled()) {
+        if (currentSearchText().isEmpty()){
+            return i18n("Search");
+        } else {
+            return i18n("Search for %1", currentSearchText());
+        }
+    }
+
     if (!url().isLocalFile()) {
         QUrl adjustedUrl = url().adjusted(QUrl::StripTrailingSlash);
         QString caption;
@@ -445,14 +454,6 @@ QString DolphinViewContainer::caption() const
         fileName = '/';
     }
 
-    if (isSearchModeEnabled()) {
-        if(currentSearchText().isEmpty()){
-            return i18n("Search");
-        } else {
-            return i18n("Search for %1", currentSearchText());
-        }
-    }
-
     return fileName;
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]