Merge branch 'master' of github.com:trueos/lumina

1 files changed, 15 insertions, 3 deletions

diff --git a/src-qt5/desktop-utils/lumina-fm/main.cpp b/src-qt5/desktop-utils/lumina-fm/main.cpp
index b05c4016..61d2dc95 100644
--- a/src-qt5/desktop-utils/lumina-fm/main.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/main.cpp
@@ -6,9 +6,11 @@
 #include "MainUI.h"
 #include <LuminaOS.h>
 #include <LuminaThemes.h>
-#include <LuminaUtils.h>
+#include <LUtils.h>
 #include <LuminaSingleApplication.h>
 
+#include "BrowserWidget.h"
+
 int main(int argc, char ** argv)
 {
     LTHEME::LoadCustomEnvSettings();
@@ -16,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
@@ -24,10 +26,20 @@ 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();
 
+   // TESTING CODE FOR NEW BACKEND
+    /*QMainWindow W;
+      BrowserWidget B("",&W);
+      W.setCentralWidget( &B);
+      B.showDetails(false);
+      B.changeDirectory(in.first());
+    qDebug() << "Show Window";
+    W.show();
+  */
+
     int retCode = a.exec();
     return retCode;
 }