diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | src/behaviour.ui | 18 | ||||
| -rw-r--r-- | src/menuhandler.cpp | 26 | ||||
| -rw-r--r-- | src/menuhandler.h | 2 | ||||
| -rw-r--r-- | src/tastymenu.kcfg | 9 |
5 files changed, 4 insertions, 53 deletions
@@ -4,7 +4,7 @@ It provides three columns where you can always have all your favourite applicati KEY FEATURES -One column for all your favourite applications and two columns for browsing all the installed programs -Search engine for the applications --Optional integration with Kerry Beagle or Strigi +-Optional integration with Strigi -Highlighting of recently installed applications -Fast user switching -Drag and drop support
\ No newline at end of file diff --git a/src/behaviour.ui b/src/behaviour.ui index ef434ab..e817ab7 100644 --- a/src/behaviour.ui +++ b/src/behaviour.ui @@ -178,24 +178,6 @@ It saves the current session informations like open applications and windows pos </widget> <widget class="TQRadioButton"> <property name="name"> - <cstring>kcfg_KerryIntegration</cstring> - </property> - <property name="text"> - <string>&Kerry Beagle integration</string> - </property> - <property name="accel"> - <string>Alt+K</string> - </property> - <property name="toolTip" stdset="0"> - <string>Perform queries with Kerry Beagle</string> - </property> - <property name="whatsThis" stdset="0"> - <string>Perform queries with Kerry Beagle instead of using the first column. -It needs Kerry Beagle up and running.</string> - </property> - </widget> - <widget class="TQRadioButton"> - <property name="name"> <cstring>kcfg_StrigiIntegration</cstring> </property> <property name="text"> diff --git a/src/menuhandler.cpp b/src/menuhandler.cpp index db280fb..33c1477 100644 --- a/src/menuhandler.cpp +++ b/src/menuhandler.cpp @@ -448,7 +448,6 @@ void MenuHandler::readConfig() int h = (int)(r.height()/_menuHeight); resize(w,h); - _kerryIntegration = prefSkel->kerryIntegration(); _strigiIntegration = prefSkel->strigiIntegration(); _isNormalWindow = prefSkel->isNormalWindow(); @@ -464,36 +463,20 @@ void MenuHandler::readConfig() } // disconnect(menu->searchLine, 0, 0, 0); - if( !_kerryIntegration && !_strigiIntegration ) + if( !_strigiIntegration ) { //menu->searchLine->setListView((TDEListView *)(menu->dynamicList)); disconnect(menu->searchLine, SIGNAL(returnPressed( const TQString &)), - this, SLOT (kerrySearch( const TQString &)) ); - 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 if( _kerryIntegration ) - { - menu->searchLine->setListView(NULL); - menu->searchLine->setEnabled(true); - disconnect(menu->searchLine, SIGNAL(textChanged( const TQString &)), - this, SLOT (initializeSearch( const TQString &)) ); - disconnect(menu->searchLine, SIGNAL(returnPressed( const TQString &)), - this, SLOT (strigiSearch( const TQString &)) ); - connect(menu->searchLine, SIGNAL(returnPressed( const TQString &)), - this, SLOT (kerrySearch( const TQString &)) ); - menu->searchLine->setContextMenuEnabled(false); - } else //strigi { menu->searchLine->setListView(NULL); menu->searchLine->setEnabled(true); disconnect(menu->searchLine, SIGNAL(textChanged( const TQString &)), this, SLOT (initializeSearch( const TQString &)) ); - disconnect(menu->searchLine, SIGNAL(returnPressed( const TQString &)), - this, SLOT (kerrySearch( const TQString &)) ); connect(menu->searchLine, SIGNAL(returnPressed( const TQString &)), this, SLOT (strigiSearch( const TQString &)) ); menu->searchLine->setContextMenuEnabled(false); @@ -1620,13 +1603,6 @@ void MenuHandler::initializeSearch( const TQString & query ) } } -void MenuHandler::kerrySearch( const TQString & query ) -{ - close(); - DCOPRef kdesktopKScreensaverIface ("kerry", "search"); - kdesktopKScreensaverIface.call ("search(TQString)", query); -} - void MenuHandler::strigiSearch( const TQString & query ) { close(); diff --git a/src/menuhandler.h b/src/menuhandler.h index 35ee3b7..8873c7f 100644 --- a/src/menuhandler.h +++ b/src/menuhandler.h @@ -123,7 +123,6 @@ private: int _actionIconSize; bool _displaySubText; bool _newAppsNotification; - bool _kerryIntegration; bool _strigiIntegration; double _menuWidth; double _menuHeight; @@ -174,7 +173,6 @@ private slots: void doNewSession( bool lock ); void runDialog(); void initializeSearch( const TQString & query ); - void kerrySearch( const TQString & query ); void strigiSearch( const TQString & query ); void clearDynList(); void menuModeChanged( int index ); diff --git a/src/tastymenu.kcfg b/src/tastymenu.kcfg index 792bbe7..c9ee460 100644 --- a/src/tastymenu.kcfg +++ b/src/tastymenu.kcfg @@ -99,13 +99,8 @@ </group> <group name="Behaviour"> - <entry name="KerryIntegration" type="Bool"> - <label>If the search field should perform queries with Kerry Beagle</label> - <default>false</default> - </entry> - <entry name="StrigiIntegration" type="Bool"> - <label>If the search field should perform queries with Strigi. - It has no effect when Kerry integration is enabled</label> + <entry name="StrigiIntegration" type="Bool"> + <label>If the search field should perform queries with Strigi.</label> <default>false</default> </entry> |