Use placeholder for search action

Summary:
See https://hig.kde.org/style/writing/placeholder.html

Screenshot:

Old: {F6691712}
New: {F6698685}

Test Plan: Compile and run

Reviewers: #dolphin, #vdg, ngraham, elvisangelaccio

Reviewed By: #dolphin, #vdg, ngraham

Subscribers: GB_2, kde-doc-english, elvisangelaccio, ngraham, yurchor, kfm-devel

Tags: #dolphin, #documentation

Maniphest Tasks: T10258

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

diff --git a/doc/index.docbook b/doc/index.docbook
index 4a38a157aaac5e83db40335e44f42819ccd58f9e..3495ee9bcfe711d218a2f8a04ef972756d60a0b4 100644 (file)
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -782,7 +782,7 @@ current folder, &RMB; click in the work space and click
 <para>
 &dolphin; is capable of searching for files and for content in files. If <keycombo action="simul">
 &Ctrl;<keycap>F</keycap></keycombo> is pressed or <menuchoice> <guimenu>Edit</guimenu> 
-<guimenuitem>Find...</guimenuitem> </menuchoice> is used, the <guilabel>Find</guilabel> 
+<guimenuitem>Search...</guimenuitem> </menuchoice> is used, the <guilabel>Search</guilabel>
 bar will open already set up to search for files within the current folder and any sub-folders.
 Start to type into the find input box and the search starts immediately.
 <screenshot>
@@ -821,7 +821,7 @@ starts the search from the user's <replaceable>Home</replaceable> folder.</para>
 </screenshot>
 
 <para>
-Use the <guilabel>More Options</guilabel> button to extend the <guilabel>Find</guilabel> 
+Use the <guilabel>More Options</guilabel> button to extend the <guilabel>Search</guilabel>
 bar. This provides a very comfortable way for 
 the user to shrink the number of search results.</para>
 <para>To start a search select one or more file types (<guilabel>Documents</guilabel>, 
@@ -1693,7 +1693,7 @@ The name of this file has to be entered in a dialog.
 <keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo>
 </shortcut>
 <guimenu>Edit</guimenu>
-<guimenuitem>Find...</guimenuitem>
+<guimenuitem>Search...</guimenuitem>
 </menuchoice></term>
 <listitem><para><action>Opens the find bar. Enter a search term into the edit box and select to search for filename
 or in contents of files starting from the current folder or everywhere.</action></para></listitem>

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 7224c8ea940c166db524c654b0ef78291fbd53f4..2775d428525b23713e65b398ad0dd432e828a616 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -928,9 +928,13 @@ void DolphinMainWindow::updateControlMenu()
 
     menu->addSeparator();
 
+    // Overwrite Find action to Search action
+    QAction *searchAction = ac->action(KStandardAction::name(KStandardAction::Find));
+    searchAction->setText(i18n("Search..."));
+
     // Add "Edit" actions
     bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) |
-                 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Find)), menu) |
+                 addActionToMenu(searchAction, menu) |
                  addActionToMenu(ac->action(KStandardAction::name(KStandardAction::SelectAll)), menu) |
                  addActionToMenu(ac->action(QStringLiteral("invert_selection")), menu);
 
@@ -1140,7 +1144,8 @@ void DolphinMainWindow::setupActions()
     // due to the long text, the text "Paste" is used:
     paste->setIconText(i18nc("@action:inmenu Edit", "Paste"));
 
-    KStandardAction::find(this, &DolphinMainWindow::find, actionCollection());
+    QAction *searchAction = KStandardAction::find(this, &DolphinMainWindow::find, actionCollection());
+    searchAction->setText(i18n("Search..."));
 
     KStandardAction::selectAll(this, &DolphinMainWindow::selectAll, actionCollection());
 

diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp
index b4fef22a817cb7983add4ceb3feb544a98220c85..68da73a71d2d57ba6a259132e926b54da72f694f 100644 (file)
--- a/src/filterbar/filterbar.cpp
+++ b/src/filterbar/filterbar.cpp
@@ -47,13 +47,12 @@ FilterBar::FilterBar(QWidget* parent) :
     m_lockButton->setToolTip(i18nc("@info:tooltip", "Keep Filter When Changing Folders"));
     connect(m_lockButton, &QToolButton::toggled, this, &FilterBar::slotToggleLockButton);
 
-    // Create label
-    QLabel* filterLabel = new QLabel(i18nc("@label:textbox", "Filter:"), this);
 
     // Create filter editor
     m_filterInput = new QLineEdit(this);
     m_filterInput->setLayoutDirection(Qt::LeftToRight);
     m_filterInput->setClearButtonEnabled(true);
+    m_filterInput->setPlaceholderText(i18n("Filter..."));
     connect(m_filterInput, &QLineEdit::textChanged,
             this, &FilterBar::filterChanged);
     setFocusProxy(m_filterInput);
@@ -62,11 +61,8 @@ FilterBar::FilterBar(QWidget* parent) :
     QHBoxLayout* hLayout = new QHBoxLayout(this);
     hLayout->setContentsMargins(0, 0, 0, 0);
     hLayout->addWidget(closeButton);
-    hLayout->addWidget(filterLabel);
     hLayout->addWidget(m_filterInput);
     hLayout->addWidget(m_lockButton);
-
-    filterLabel->setBuddy(m_filterInput);
 }
 
 FilterBar::~FilterBar()

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 71c27747385e0810d191aa6b6ec75b0dc5fa4c77..d846e5b6c44a7ef8487b26aa62ee6d54dc19f671 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -49,7 +49,6 @@ DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
     m_startedSearching(false),
     m_active(true),
     m_topLayout(nullptr),
-    m_searchLabel(nullptr),
     m_searchInput(nullptr),
     m_saveSearchAction(nullptr),
     m_optionsScrollArea(nullptr),
@@ -355,11 +354,9 @@ void DolphinSearchBox::init()
     closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));
     connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest);
 
-    // Create search label
-    m_searchLabel = new QLabel(this);
-
     // Create search box
     m_searchInput = new QLineEdit(this);
+    m_searchInput->setPlaceholderText(i18n("Search..."));
     m_searchInput->installEventFilter(this);
     m_searchInput->setClearButtonEnabled(true);
     m_searchInput->setFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont));
@@ -381,7 +378,6 @@ void DolphinSearchBox::init()
     QHBoxLayout* searchInputLayout = new QHBoxLayout();
     searchInputLayout->setContentsMargins(0, 0, 0, 0);
     searchInputLayout->addWidget(closeButton);
-    searchInputLayout->addWidget(m_searchLabel);
     searchInputLayout->addWidget(m_searchInput);
 
     // Create "Filename" and "Content" button

diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h
index c138cfe7f3fb35776923a033b02755151a0b3391..bb71049c746a6999aa92e10a56ea386a6943f057 100644 (file)
--- a/src/search/dolphinsearchbox.h
+++ b/src/search/dolphinsearchbox.h
@@ -166,7 +166,6 @@ private:
 
     QVBoxLayout* m_topLayout;
 
-    QLabel* m_searchLabel;
     QLineEdit* m_searchInput;
     QAction* m_saveSearchAction;
     QScrollArea* m_optionsScrollArea;