diff --git a/src/behaviour.ui b/src/behaviour.ui
index ed1b322..dd5956d 100644
--- a/src/behaviour.ui
+++ b/src/behaviour.ui
@@ -8,8 +8,8 @@
0
0
- 516
- 400
+ 647
+ 552
@@ -111,73 +111,6 @@ It saves the current session informations like open applications and windows pos
Show items in alpha&betical order
-
-
- SearchFieldBehaviour
-
-
-
- 1
-
-
-
- Search field behaviour
-
-
- AlignBottom
-
-
-
-
- buttonGroup1
-
-
- NoFrame
-
-
-
-
-
-
- unnamed
-
-
- 0
-
-
-
- simpleSearch
-
-
- Si&mple searches
-
-
- true
-
-
- Filters the applications list
-
-
- It displays in the first column all the applications whose name or description matches with the query you entered
-
-
-
-
- kcfg_StrigiIntegration
-
-
- Stri&gi Integration
-
-
- Perform queries with Strigi
-
-
- Perform queries with Strigi instead of using the first column.
-It needs the Strigi Daemon up and running
-
-
-
-
kcfg_NewAppsNotification
@@ -189,6 +122,23 @@ It needs the Strigi Daemon up and running
true
+
+
+ spacer3
+
+
+ Vertical
+
+
+ Expanding
+
+
+
+ 20
+ 111
+
+
+
diff --git a/src/menuhandler.cpp b/src/menuhandler.cpp
index 98f2c7c..1728439 100644
--- a/src/menuhandler.cpp
+++ b/src/menuhandler.cpp
@@ -94,10 +94,13 @@ MenuHandler::MenuHandler( TQWidget *parent, Prefs *prefs, char *name, WFlags fl)
icon = iconLoader->loadIcon("clear_left", TDEIcon::Small);
menu->clearButton->setIconSet(icon);
- connect(menu->clearButton, SIGNAL(clicked()), menu->searchLine, SLOT (clear()) );
+
+ connect(menu->searchLine, SIGNAL(textChanged(const TQString&)),
+ this, SLOT(initializeSearch(const TQString &)));
+ connect(menu->clearButton, SIGNAL(clicked()), menu->searchLine, SLOT(clear()));
menu->detachButton->setIconSet(TQPixmap(uic_findImage("detach.png")));
- connect(menu->detachButton, SIGNAL(clicked()), this, SLOT (switchWindowMode()) );
+ connect(menu->detachButton, SIGNAL(clicked()), this, SLOT(switchWindowMode()));
menu->searchLine->setContextMenuEnabled(false);
@@ -449,8 +452,6 @@ void MenuHandler::readConfig()
int h = (int)(r.height()/_menuHeight);
resize(w,h);
- _strigiIntegration = prefSkel->strigiIntegration();
-
_isNormalWindow = prefSkel->isNormalWindow();
if( _isNormalWindow )
{
@@ -462,26 +463,6 @@ void MenuHandler::readConfig()
menu->detachButton->setIconSet(TQPixmap(uic_findImage("detach.png")));
TQToolTip::add( menu->detachButton, tr2i18n( "Make this menu a normal window" ) );
}
-
- // disconnect(menu->searchLine, 0, 0, 0);
- if( !_strigiIntegration )
- {
- //menu->searchLine->setListView((TDEListView *)(menu->dynamicList));
- disconnect(menu->searchLine, SIGNAL(returnPressed( const TQString &)),
- this, SLOT (strigiSearch( const TQString &)) );
- connect(menu->searchLine, SIGNAL(textChanged( const TQString &)),
- this, SLOT (initializeSearch( const TQString &)) );
- }
- else //strigi
- {
- menu->searchLine->setListView(NULL);
- menu->searchLine->setEnabled(true);
- disconnect(menu->searchLine, SIGNAL(textChanged( const TQString &)),
- this, SLOT (initializeSearch( const TQString &)) );
- connect(menu->searchLine, SIGNAL(returnPressed( const TQString &)),
- this, SLOT (strigiSearch( const TQString &)) );
- menu->searchLine->setContextMenuEnabled(false);
- }
}
void MenuHandler::updateConfig()
@@ -1608,12 +1589,6 @@ void MenuHandler::initializeSearch( const TQString & query )
}
}
-void MenuHandler::strigiSearch( const TQString & query )
-{
- close();
- KRun::runCommand ("konqueror strigi:/?q="+query);
-}
-
void MenuHandler::clearDynList( )
{
menu->dynamicList->clear();
diff --git a/src/menuhandler.h b/src/menuhandler.h
index d430c12..d6674d4 100644
--- a/src/menuhandler.h
+++ b/src/menuhandler.h
@@ -128,7 +128,6 @@ private:
int _actionIconSize;
bool _displaySubText;
bool _newAppsNotification;
- bool _strigiIntegration;
double _menuWidth;
double _menuHeight;
bool _isNormalWindow;
@@ -179,7 +178,6 @@ private slots:
void doNewSession( bool lock );
void runDialog();
void initializeSearch( const TQString & query );
- void strigiSearch( const TQString & query );
void clearDynList();
void menuModeChanged( int index );
void switchWindowMode();
diff --git a/src/tastymenu.kcfg b/src/tastymenu.kcfg
index 7ed5940..e3aa913 100644
--- a/src/tastymenu.kcfg
+++ b/src/tastymenu.kcfg
@@ -119,11 +119,6 @@
-
-
- false
-
-
false