diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui index e64285767..d29c41e16 100644 --- a/kcontrol/kicker/menutab.ui +++ b/kcontrol/kicker/menutab.ui @@ -185,7 +185,7 @@ - Custom K Menu button icon: + K Menu button icon: @@ -506,7 +506,7 @@ - + m_pRecentOrderGroup @@ -602,6 +602,53 @@ + + + m_pSearchGroup + + + K Menu Search + + + + unnamed + + + + kcfg_UseSearchBar + + + Show search field in K Menu + + + true + + + false + + + <qt>When this option is selected a text-based search field will appear in the K Menu.</qt> + + + + + Spacer8 + + + Horizontal + + + Expanding + + + + 20 + 0 + + + + + diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 589ed74e8..ae5076501 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -220,17 +220,19 @@ void PanelKMenu::initialize() PanelServiceMenu::initialize(); // Insert search field - TQHBox* hbox = new TQHBox( this ); - KToolBarButton *clearButton = new KToolBarButton( "locationbar_erase", 0, hbox ); - searchEdit = new KPIM::ClickLineEdit(hbox, " "+i18n("Press '/' to search...")); - hbox->setFocusPolicy(TQWidget::StrongFocus); - hbox->setFocusProxy(searchEdit); - hbox->setSpacing( 3 ); - connect(clearButton, TQT_SIGNAL(clicked()), searchEdit, TQT_SLOT(clear())); - connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClearSearch())); - connect(searchEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT( slotUpdateSearch( const TQString&))); - insertItem(hbox, searchLineID, 0); + if (KickerSettings::UseSearchBar()) + TQHBox* hbox = new TQHBox( this ); + KToolBarButton *clearButton = new KToolBarButton( "locationbar_erase", 0, hbox ); + searchEdit = new KPIM::ClickLineEdit(hbox, " "+i18n("Press '/' to search...")); + hbox->setFocusPolicy(TQWidget::StrongFocus); + hbox->setFocusProxy(searchEdit); + hbox->setSpacing( 3 ); + connect(clearButton, TQT_SIGNAL(clicked()), searchEdit, TQT_SLOT(clear())); + connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClearSearch())); + connect(searchEdit, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT( slotUpdateSearch( const TQString&))); + insertItem(hbox, searchLineID, 0); + } //TQToolTip::add(clearButton, i18n("Clear Search")); //TQToolTip::add(searchEdit, i18n("Enter the name of an application")); diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg index 7e6f76366..ff86c8431 100644 --- a/kicker/libkicker/kickerSettings.kcfg +++ b/kicker/libkicker/kickerSettings.kcfg @@ -255,6 +255,11 @@ true + + + true + + kside.png