Rearrange the Lumina source tree quite a bit:

Now the utilites are arranged by category (core, core-utils, desktop-utils), so all the -utils may be excluded by a package system (or turned into separate packages) as needed.

1 files changed, 0 insertions, 111 deletions

diff --git a/lumina-search/Worker.cpp b/lumina-search/Worker.cpp
deleted file mode 100644
index b414a72f..00000000
--- a/lumina-search/Worker.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-#include "Worker.h"
-
-#include <QTimer>
-#include <LuminaXDG.h>
-#include <LuminaUtils.h>
-
-Worker::Worker(QObject *parent) : QObject(parent){
-  //Get the list of all applications and save them in an easily-searchable form
-  QList<XDGDesktop> apps = LXDG::systemDesktopFiles();
-  for(int i=0; i<apps.length(); i++){
-    applist << ":::1:::"+apps[i].name+":::2:::"+apps[i].genericName+":::3:::"+apps[i].comment+":::4:::"+apps[i].filePath;
-  }
-  stopsearch = false;
-}
-
-Worker::~Worker(){
-  stopsearch = true;
-}
-
-void Worker::StartSearch(QString term, bool isApp){
-  sterm=term; sapp=isApp;
-  if(stopsearch){
-    //Need to stop the current search first - give it a moment first
-    QTimer::singleShot(100,this, SLOT(beginsearch()) );	  
-  }else{
-    //Start immediately
-    QTimer::singleShot(0,this, SLOT(beginsearch()) );
-  }
-}
-
-void Worker::StopSearch(){
-  stopsearch = true;	
-}
-
-bool Worker::searchDir(QString dirpath){
-  //This is a recursive search algorithm for scanning a directory
-  QDir dir(dirpath);
-  //First look for files that match the search term	
-  if(stopsearch){ return true; }
-  emit SearchUpdate( QString(tr("Searching: %1")).arg(dirpath.replace(QDir::homePath(),"~")) );
-  QStringList tmp;
-  if(sterm.startsWith(".")){ tmp = dir.entryList(QStringList(sterm), QDir::AllEntries | QDir::NoDotAndDotDot | QDir::Hidden, QDir::Name); }
-  else{ tmp = dir.entryList(QStringList(sterm), QDir::AllEntries | QDir::NoDotAndDotDot , QDir::Name); }
-  for(int i=0; i<tmp.length(); i++){
-    if(stopsearch){ return true; }
-    emit FoundItem( dir.absoluteFilePath(tmp[i]) );
-  }
-  if(stopsearch){ return true; }
-  //Now recursively scan the sub directories
-  tmp = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot , QDir::Name);
-  for(int i=0; i<tmp.length(); i++){
-    if(stopsearch){ return true; }
-    if( skipDirs.contains(dir.absoluteFilePath(tmp[i])) ){ continue; } //this dir is skipped
-    if( searchDir(dir.absoluteFilePath(tmp[i])) ){ return true; }
-  }
-  return false;
-}
-
-void Worker::beginsearch(){
-  stopsearch = false; //just starting search - always set this to false initially
-  emit SearchUpdate( QString(tr("Starting Search: %1")).arg(sterm) );
-  //Now Perform the search
-  if(sapp){
-    //First try to match based on the name
-    QStringList tmp = applist.filter(":::1:::"+sterm, Qt::CaseInsensitive);
-    tmp.sort();
-    for(int i=0; i<tmp.length(); i++){
-      if(stopsearch){ return; }
-      emit FoundItem( tmp[i].section(":::4:::",1,1) );
-    }
-    //Check if this is a binary name
-    if(stopsearch){ return; }
-    if(LUtils::isValidBinary(sterm)){
-      emit FoundItem(sterm);
-      return;
-    }
-    //If items found, go ahead and stop now
-    if(stopsearch){ return; }
-    if(tmp.length()<1){
-      //Now try to match based on the generic name
-      tmp = applist.filter(":::2:::"+sterm, Qt::CaseInsensitive);
-      tmp.sort();
-      for(int i=0; i<tmp.length(); i++){
-        if(stopsearch){ return; }
-        emit FoundItem( tmp[i].section(":::4:::",1,1) );
-      }
-    }
-    //If items found, go ahead and stop now
-    if(stopsearch){ return; }
-    if(tmp.length()<1){
-      //Now try to match based on anything (name/genericname/comment)
-      tmp = applist.filter(sterm, Qt::CaseInsensitive);
-      tmp.sort();
-      for(int i=0; i<tmp.length(); i++){
-        if(stopsearch){ return; }
-        emit FoundItem( tmp[i].section(":::4:::",1,1) );
-      }
-    }
-    
-  }else{
-    //Search through the user's home directory and look for a file/dir starting with that term
-    if(!sterm.contains("*")){
-      sterm.prepend("*"); sterm.append("*"); //make sure it is a search glob pattern
-    }
-    if(startDir.isEmpty()){ startDir = QDir::homePath(); }
-    searchDir(startDir);
-    
-  }
-  emit SearchUpdate( tr("Search Finished") );
-  emit SearchDone();
-}
\ No newline at end of file