Add in the search capabilities within the new lumina-config UI.

3 files changed, 28 insertions, 8 deletions

diff --git a/src-qt5/core-utils/lumina-config/pages/page_main.cpp b/src-qt5/core-utils/lumina-config/pages/page_main.cpp
index c853f06c..02065b78 100644
--- a/src-qt5/core-utils/lumina-config/pages/page_main.cpp
+++ b/src-qt5/core-utils/lumina-config/pages/page_main.cpp
@@ -14,6 +14,7 @@
 page_main::page_main(QWidget *parent) : PageWidget(parent), ui(new Ui::page_main()){
   ui->setupUi(this);
   connect(ui->treeWidget, SIGNAL(itemActivated(QTreeWidgetItem*,int)), this, SLOT(itemTriggered(QTreeWidgetItem*)) );
+  connect(ui->lineEdit, SIGNAL(textChanged(QString)), this, SLOT(searchChanged(QString)) );
 }
 
 page_main::~page_main(){
@@ -36,13 +37,17 @@ void page_main::UpdateItems(QString search){
     apps->setIcon(0, LXDG::findIcon("preferences-desktop-filetype-association",""));
     apps->setText(0, tr("Application Settings"));
   //Now go through and add in the known pages for each category
+  QStringList SL = search.split(" "); //search list
   for(int i=0; i<INFO.length(); i++){
     if(!search.isEmpty() ){
       //See if this item needs to be included or not
       QStringList info; info << INFO[i].name.split(" ") << INFO[i].title.split(" ") << INFO[i].comment.split(" ") << INFO[i].search_tags;
       info.removeDuplicates(); //remove any duplicate terms/info first
-      info << search.split(" "); //add the terms we want to search for
-      if(0<info.removeDuplicates()){ continue; } //no duplicates between search terms and available info
+      bool ok = true;
+      for(int s=0; s<SL.length() && ok; s++){
+	ok = !info.filter(SL[s]).isEmpty();
+      }
+      if(!ok){ continue; } //no duplicates between search terms and available info
     }
     qDebug() << "Item Found:" << INFO[i].id << INFO[i].title;
     QTreeWidgetItem *it = new QTreeWidgetItem();
@@ -58,10 +63,10 @@ void page_main::UpdateItems(QString search){
     else{ ui->treeWidget->addTopLevelItem(it); }
   }
   //Now add the categories to the tree widget if they are non-empty
-  if(interface->childCount()>0){ ui->treeWidget->addTopLevelItem(interface); }
-  if(appearance->childCount()>0){ ui->treeWidget->addTopLevelItem(appearance); }
-  if(session->childCount()>0){ ui->treeWidget->addTopLevelItem(session); }
-  if(apps->childCount()>0){ ui->treeWidget->addTopLevelItem(apps); }
+  if(interface->childCount()>0){ ui->treeWidget->addTopLevelItem(interface); interface->setExpanded(true); }
+  if(appearance->childCount()>0){ ui->treeWidget->addTopLevelItem(appearance); appearance->setExpanded(true); }
+  if(session->childCount()>0){ ui->treeWidget->addTopLevelItem(session); session->setExpanded(true); }
+  if(apps->childCount()>0){ ui->treeWidget->addTopLevelItem(apps); apps->setExpanded(true); }
 }
 
 //================
@@ -93,3 +98,7 @@ void page_main::itemTriggered(QTreeWidgetItem *it){
     emit ChangePage(it->whatsThis(0));
   }
 }
+
+void page_main::searchChanged(QString txt){
+  UpdateItems(txt.simplified());
+}
diff --git a/src-qt5/core-utils/lumina-config/pages/page_main.h b/src-qt5/core-utils/lumina-config/pages/page_main.h
index 0b24b6da..2e38eb64 100644
--- a/src-qt5/core-utils/lumina-config/pages/page_main.h
+++ b/src-qt5/core-utils/lumina-config/pages/page_main.h
@@ -32,5 +32,6 @@ private:
 
 private slots:
 	void itemTriggered(QTreeWidgetItem*);
+	void searchChanged(QString);
 };
 #endif
diff --git a/src-qt5/core-utils/lumina-config/pages/page_main.ui b/src-qt5/core-utils/lumina-config/pages/page_main.ui
index 3d9626c1..2331152b 100644
--- a/src-qt5/core-utils/lumina-config/pages/page_main.ui
+++ b/src-qt5/core-utils/lumina-config/pages/page_main.ui
@@ -15,19 +15,29 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
-    <number>0</number>
+    <number>2</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
-    <number>0</number>
+    <number>2</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
+    <widget class="QLineEdit" name="lineEdit">
+     <property name="placeholderText">
+      <string>Search for....</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QTreeWidget" name="treeWidget">
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
      <property name="styleSheet">
       <string notr="true">QTreeWidget{background: transparent; }</string>
      </property>