Browse Source

Removed beagle related code.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
master
Michele Calgaro 6 months ago
parent
commit
ea7224e457
Signed by: MicheleC <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
5 changed files with 4 additions and 53 deletions
  1. +1
    -1
      README
  2. +0
    -18
      src/behaviour.ui
  3. +1
    -25
      src/menuhandler.cpp
  4. +0
    -2
      src/menuhandler.h
  5. +2
    -7
      src/tastymenu.kcfg

+ 1
- 1
README View File

@@ -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

+ 0
- 18
src/behaviour.ui View File

@@ -176,24 +176,6 @@ It saves the current session informations like open applications and windows pos
<string>It displays in the first column all the applications whose name or description matches with the query you entered</string>
</property>
</widget>
<widget class="TQRadioButton">
<property name="name">
<cstring>kcfg_KerryIntegration</cstring>
</property>
<property name="text">
<string>&amp;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>


+ 1
- 25
src/menuhandler.cpp View File

@@ -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();


+ 0
- 2
src/menuhandler.h View File

@@ -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 );


+ 2
- 7
src/tastymenu.kcfg View File

@@ -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>



Loading…
Cancel
Save