From 10cddab2e38a26d4a2593fcb095fca8230a39486 Mon Sep 17 00:00:00 2001 From: Mavridis Philippe Date: Fri, 8 Oct 2021 11:00:07 +0300 Subject: TDEMenu search shortcut: various fixes * Better Escape key usage prevention * Better handling of different shortcut counts (0 vs 1 vs 2) * Fixed a deprecated function call to setShortcut() Signed-off-by: Mavridis Philippe --- kicker/kicker/ui/k_mnu.cpp | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'kicker') diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index a4a1f6d58..b99d6e3ba 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -270,13 +270,22 @@ void PanelKMenu::initialize() TDEToolBarButton *clearButton = new TDEToolBarButton( "locationbar_erase", 0, hbox ); TQStringList cuts = TQStringList::split(";", KickerSettings::searchShortcut()); - searchEdit = new KPIM::ClickLineEdit( - hbox, - ( cuts.count() == 2 - ? i18n(" Press '%1' or '%2' to search...").arg(cuts[0], cuts[1]) - : i18n(" Press '%1' to search...").arg(cuts[0]) - ) - ); + TQString placeholder; + switch( cuts.count() ) + { + case 0: + placeholder = i18n(" Click here to search..."); + break; + + case 1: + placeholder = i18n(" Press '%1' to search...").arg(cuts[0]); + break; + + case 2: + placeholder = i18n(" Press '%1' or '%2' to search...").arg(cuts[0], cuts[1]); + break; + } + searchEdit = new KPIM::ClickLineEdit( hbox, placeholder ); hbox->setFocusPolicy(TQ_StrongFocus); hbox->setFocusProxy(searchEdit); -- cgit v1.2.1