From dcfb02cce1c025df28f1f8a2c1c485be12788946 Mon Sep 17 00:00:00 2001
From: Mavridis Philippe <mavridisf@gmail.com>
Date: Sun, 29 Oct 2023 19:34:15 +0200
Subject: [PATCH] Remove Strigi integrtion

Strigi search was based on the strigi:// TDEIO which is no longer supported.

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
---
 src/behaviour.ui    | 88 ++++++++++-----------------------------------
 src/menuhandler.cpp | 35 +++---------------
 src/menuhandler.h   |  2 --
 src/tastymenu.kcfg  |  5 ---
 4 files changed, 24 insertions(+), 106 deletions(-)

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 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>516</width>
-            <height>400</height>
+            <width>647</width>
+            <height>552</height>
         </rect>
     </property>
     <property name="caption">
@@ -111,73 +111,6 @@ It saves the current session informations like open applications and windows pos
                 <string>Show items in alpha&amp;betical order</string>
             </property>
         </widget>
-        <widget class="TQLabel" row="6" column="0" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>SearchFieldBehaviour</cstring>
-            </property>
-            <property name="font">
-                <font>
-                    <bold>1</bold>
-                </font>
-            </property>
-            <property name="text">
-                <string>Search field behaviour</string>
-            </property>
-            <property name="alignment">
-                <set>AlignBottom</set>
-            </property>
-        </widget>
-        <widget class="TQButtonGroup" row="7" column="1">
-            <property name="name">
-                <cstring>buttonGroup1</cstring>
-            </property>
-            <property name="frameShape">
-                <enum>NoFrame</enum>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <vbox>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>0</number>
-                </property>
-                <widget class="TQRadioButton">
-                    <property name="name">
-                        <cstring>simpleSearch</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Si&amp;mple searches</string>
-                    </property>
-                    <property name="checked">
-                        <bool>true</bool>
-                    </property>
-                    <property name="toolTip" stdset="0">
-                        <string>Filters the applications list</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <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_StrigiIntegration</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Stri&amp;gi Integration</string>
-                    </property>
-                    <property name="toolTip" stdset="0">
-                        <string>Perform queries with Strigi</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Perform queries with Strigi instead of using the first column.
-It needs the Strigi Daemon up and running</string>
-                    </property>
-                </widget>
-            </vbox>
-        </widget>
         <widget class="TQCheckBox" row="3" column="1">
             <property name="name">
                 <cstring>kcfg_NewAppsNotification</cstring>
@@ -189,6 +122,23 @@ It needs the Strigi Daemon up and running</string>
                 <bool>true</bool>
             </property>
         </widget>
+        <spacer row="6" column="1">
+            <property name="name">
+                <cstring>spacer3</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Vertical</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Expanding</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>111</height>
+                </size>
+            </property>
+        </spacer>
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
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 @@
   </group>
 
   <group name="Behaviour"> 
-    <entry name="StrigiIntegration" type="Bool">
-      <label>If the search field should perform queries with Strigi.</label>
-      <default>false</default>
-    </entry>
-
     <entry name="OverrideAltF1" type="Bool"> 
       <label>If Alt+F1 shortcut should be used by Tasty Menu</label>
       <default>false</default>