Disable the theme engine from the desktop-utilities.

Also start pruning unneeded libLumina classes from the desktop utils.

9 files changed, 15 insertions, 16 deletions

diff --git a/src-qt5/desktop-utils/lumina-calculator/lumina-calculator.pro b/src-qt5/desktop-utils/lumina-calculator/lumina-calculator.pro
index efb9e68c..347a8dfb 100644
--- a/src-qt5/desktop-utils/lumina-calculator/lumina-calculator.pro
+++ b/src-qt5/desktop-utils/lumina-calculator/lumina-calculator.pro
@@ -8,7 +8,7 @@ target.path = $${L_BINDIR}
 #include all the special classes from the Lumina tree
 include(../../core/libLumina/LUtils.pri) #includes LUtils
 include(../../core/libLumina/LuminaXDG.pri)
-include(../../core/libLumina/LuminaSingleApplication.pri)
+#include(../../core/libLumina/LuminaSingleApplication.pri)
 include(../../core/libLumina/LuminaThemes.pri)
 
 HEADERS	+= mainUI.h \
diff --git a/src-qt5/desktop-utils/lumina-calculator/main.cpp b/src-qt5/desktop-utils/lumina-calculator/main.cpp
index da57763a..222ee8b4 100644
--- a/src-qt5/desktop-utils/lumina-calculator/main.cpp
+++ b/src-qt5/desktop-utils/lumina-calculator/main.cpp
@@ -17,10 +17,10 @@ int  main(int argc, char *argv[]) {
    QApplication a(argc, argv);
    LUtils::LoadTranslation(&a, "l-calc");
    //Now go ahead and setup the app
-   LuminaThemeEngine theme(&a);
+   //LuminaThemeEngine theme(&a);
    //Now start the window
    mainUI W;
-    QObject::connect(&theme, SIGNAL(updateIcons()), &W, SLOT(updateIcons()) );
+    //QObject::connect(&theme, SIGNAL(updateIcons()), &W, SLOT(updateIcons()) );
    W.show();
    return  a.exec();
 }
diff --git a/src-qt5/desktop-utils/lumina-fileinfo/lumina-fileinfo.pro b/src-qt5/desktop-utils/lumina-fileinfo/lumina-fileinfo.pro
index ee12b420..6f44a512 100644
--- a/src-qt5/desktop-utils/lumina-fileinfo/lumina-fileinfo.pro
+++ b/src-qt5/desktop-utils/lumina-fileinfo/lumina-fileinfo.pro
@@ -12,7 +12,7 @@ target.path = $${L_BINDIR}
 #include all the special classes from the Lumina tree
 include(../../core/libLumina/LUtils.pri) #includes LUtils
 include(../../core/libLumina/LuminaXDG.pri)
-include(../../core/libLumina/LuminaSingleApplication.pri)
+#include(../../core/libLumina/LuminaSingleApplication.pri)
 include(../../core/libLumina/LuminaThemes.pri)
 
 SOURCES += main.cpp\
diff --git a/src-qt5/desktop-utils/lumina-fileinfo/main.cpp b/src-qt5/desktop-utils/lumina-fileinfo/main.cpp
index 46f83831..4b048487 100644
--- a/src-qt5/desktop-utils/lumina-fileinfo/main.cpp
+++ b/src-qt5/desktop-utils/lumina-fileinfo/main.cpp
@@ -12,7 +12,7 @@ int main(int argc, char ** argv)
   LTHEME::LoadCustomEnvSettings();
   QApplication a(argc, argv);
   LUtils::LoadTranslation(&a, "l-fileinfo");
-  LuminaThemeEngine theme(&a);
+  //LuminaThemeEngine theme(&a);
 
 
   //Read the input variables
@@ -39,7 +39,7 @@ int main(int argc, char ** argv)
   }
   if(!path.isEmpty() || !flag.isEmpty()){ 
     MainUI w;
-      QObject::connect(&theme, SIGNAL(updateIcons()), &w, SLOT(UpdateIcons()) );
+      //QObject::connect(&theme, SIGNAL(updateIcons()), &w, SLOT(UpdateIcons()) );
     w.LoadFile(path, flag);
     w.show();
     int retCode = a.exec();
diff --git a/src-qt5/desktop-utils/lumina-fm/main.cpp b/src-qt5/desktop-utils/lumina-fm/main.cpp
index c72f031e..61d2dc95 100644
--- a/src-qt5/desktop-utils/lumina-fm/main.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/main.cpp
@@ -18,7 +18,7 @@ int main(int argc, char ** argv)
       if( !a.isPrimaryProcess()){ return 0; }
     qDebug() << "Loaded QApplication";
     a.setApplicationName("Insight File Manager");
-    LuminaThemeEngine themes(&a);
+    //LuminaThemeEngine themes(&a);
 
     //Get the list of inputs for the initial load
     QStringList in = a.inputlist; //has fixes for relative paths and such
@@ -26,7 +26,7 @@ int main(int argc, char ** argv)
     //Start the UI
     MainUI w;
     QObject::connect(&a, SIGNAL(InputsAvailable(QStringList)), &w, SLOT(slotSingleInstance(QStringList)) );
-    QObject::connect(&themes, SIGNAL(updateIcons()), &w, SLOT(setupIcons()) );
+    //QObject::connect(&themes, SIGNAL(updateIcons()), &w, SLOT(setupIcons()) );
     w.OpenDirs(in);
     w.show();
 
diff --git a/src-qt5/desktop-utils/lumina-screenshot/main.cpp b/src-qt5/desktop-utils/lumina-screenshot/main.cpp
index a39d6851..7ba9d2d5 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/main.cpp
+++ b/src-qt5/desktop-utils/lumina-screenshot/main.cpp
@@ -13,12 +13,11 @@ int main(int argc, char ** argv)
 {
     LTHEME::LoadCustomEnvSettings();
     LSingleApplication a(argc, argv, "l-screenshot");
-    LuminaThemeEngine theme(&a);
+    //LuminaThemeEngine theme(&a);
     a.setApplicationName("Take Screenshot");
-    //LUtils::LoadTranslation(&a, "l-screenshot");
 
     MainUI w;
-    QObject::connect(&theme,SIGNAL(updateIcons()), &w, SLOT(setupIcons()) );
+    //QObject::connect(&theme,SIGNAL(updateIcons()), &w, SLOT(setupIcons()) );
     w.show();
 
     return a.exec();
diff --git a/src-qt5/desktop-utils/lumina-terminal/main.cpp b/src-qt5/desktop-utils/lumina-terminal/main.cpp
index 7375b074..a316ff35 100644
--- a/src-qt5/desktop-utils/lumina-terminal/main.cpp
+++ b/src-qt5/desktop-utils/lumina-terminal/main.cpp
@@ -34,13 +34,13 @@ int  main(int argc, char *argv[]) {
    }
    
    //Now go ahead and setup the app
-   LuminaThemeEngine theme(&a);
+   //LuminaThemeEngine theme(&a);
      QApplication::setQuitOnLastWindowClosed(false);   
      
    //Now start the tray icon
    TrayIcon tray;
     QObject::connect(&a, SIGNAL(InputsAvailable(QStringList)), &tray, SLOT(slotSingleInstance(QStringList)) );
-    QObject::connect(&theme, SIGNAL(updateIcons()), &tray, SLOT(updateIcons()) );
+    //QObject::connect(&theme, SIGNAL(updateIcons()), &tray, SLOT(updateIcons()) );
     tray.parseInputs(a.inputlist);
    tray.show();
    return  a.exec();
diff --git a/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro b/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro
index 3da05dbc..51e099e9 100644
--- a/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro
+++ b/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro
@@ -8,7 +8,7 @@ target.path = $${L_BINDIR}
 #include all the special classes from the Lumina tree
 include(../../core/libLumina/LUtils.pri) #includes LUtils
 include(../../core/libLumina/LuminaXDG.pri)
-include(../../core/libLumina/LuminaSingleApplication.pri)
+#include(../../core/libLumina/LuminaSingleApplication.pri)
 include(../../core/libLumina/LuminaThemes.pri)
 
 HEADERS	+= MainUI.h \
diff --git a/src-qt5/desktop-utils/lumina-textedit/main.cpp b/src-qt5/desktop-utils/lumina-textedit/main.cpp
index 346a6c44..ec4503a0 100644
--- a/src-qt5/desktop-utils/lumina-textedit/main.cpp
+++ b/src-qt5/desktop-utils/lumina-textedit/main.cpp
@@ -17,14 +17,14 @@ int  main(int argc, char *argv[]) {
    QApplication a(argc, argv);
    LUtils::LoadTranslation(&a, "l-te");
    //Now go ahead and setup the app
-   LuminaThemeEngine theme(&a);
+   //LuminaThemeEngine theme(&a);
    QStringList args;
    for(int i=1; i<argc; i++){
       args << QString(argv[i]);
    }
    //Now start the window
    MainUI W;
-    QObject::connect(&theme, SIGNAL(updateIcons()), &W, SLOT(updateIcons()) );
+    //QObject::connect(&theme, SIGNAL(updateIcons()), &W, SLOT(updateIcons()) );
     W.LoadArguments(args);
    W.show();
    return  a.exec();