From ccea2e1130bf1cf54aea58528a493aacadbeda13 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Wed, 1 Nov 2017 12:47:19 -0400
Subject: Start working on fixing up lumina-fileinfo

---
 src-qt5/desktop-utils/lumina-fileinfo/main.cpp | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'src-qt5/desktop-utils/lumina-fileinfo/main.cpp')

diff --git a/src-qt5/desktop-utils/lumina-fileinfo/main.cpp b/src-qt5/desktop-utils/lumina-fileinfo/main.cpp
index a602f290..463f856a 100644
--- a/src-qt5/desktop-utils/lumina-fileinfo/main.cpp
+++ b/src-qt5/desktop-utils/lumina-fileinfo/main.cpp
@@ -11,36 +11,25 @@ int main(int argc, char ** argv)
 {
   LTHEME::LoadCustomEnvSettings();
   QApplication a(argc, argv);
-    a.setAttribute(Qt::AA_UseHighDpiPixmaps);   
+    a.setAttribute(Qt::AA_UseHighDpiPixmaps);
   LUtils::LoadTranslation(&a, "l-fileinfo");
-  //LuminaThemeEngine theme(&a);
 
 
   //Read the input variables
   QString path = "";
   QString flag = "";
   for(int i=1; i<argc; i++){
-    if( QString(argv[i]).startsWith("-") ){ flag = QString(argv[i]); }
+    QString tmp(argv[i]);
+    if( tmp=="-application" ){ flag = "APP"; }
+    else if( tmp=="-link" ){ flag = "APP"; }
     else{ path = QString(argv[i]); break; }
   }
   //Check the input variables
   // - path
   if(!path.isEmpty()){ path = LUtils::PathToAbsolute(path); }
-  // - flag
-  if(!flag.isEmpty()){
-    if(flag=="-application"){
-      flag = "APP"; //for internal use
-    }else if(flag=="-link"){
-      flag = "LINK"; //for internal use
-    }else{
-      //Invalid flag - clear the path as well
-      flag.clear();
-      path.clear();
-    }
-  }
-  if(!path.isEmpty() || !flag.isEmpty()){ 
+
+  if(!path.isEmpty() || !flag.isEmpty()){
     MainUI w;
-      //QObject::connect(&theme, SIGNAL(updateIcons()), &w, SLOT(UpdateIcons()) );
     w.LoadFile(path, flag);
     w.show();
     int retCode = a.exec();
-- 
cgit 


From b82e9b864dc3f5321fc47f3e4b0e1e6fdca9f1fc Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Wed, 1 Nov 2017 15:13:52 -0400
Subject: Rework quite a bit of the lumina-fileinfo backend. Still not quite
 finished yet, but it is already much more stable/reliable. Just need to add
 new features.

---
 src-qt5/desktop-utils/lumina-fileinfo/main.cpp | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'src-qt5/desktop-utils/lumina-fileinfo/main.cpp')

diff --git a/src-qt5/desktop-utils/lumina-fileinfo/main.cpp b/src-qt5/desktop-utils/lumina-fileinfo/main.cpp
index 463f856a..ce62399d 100644
--- a/src-qt5/desktop-utils/lumina-fileinfo/main.cpp
+++ b/src-qt5/desktop-utils/lumina-fileinfo/main.cpp
@@ -20,26 +20,17 @@ int main(int argc, char ** argv)
   QString flag = "";
   for(int i=1; i<argc; i++){
     QString tmp(argv[i]);
-    if( tmp=="-application" ){ flag = "APP"; }
-    else if( tmp=="-link" ){ flag = "APP"; }
-    else{ path = QString(argv[i]); break; }
+    if( tmp=="--new-application" ){ flag = "APP"; }
+    else if( tmp=="--new-link" ){ flag = "LINK"; }
+    else if(!tmp.startsWith("-")){ path = QString(argv[i]); break; }
   }
   //Check the input variables
   // - path
   if(!path.isEmpty()){ path = LUtils::PathToAbsolute(path); }
-
-  if(!path.isEmpty() || !flag.isEmpty()){
+  if(path.isEmpty() && flag.isEmpty()){ flag = "APP"; }
     MainUI w;
     w.LoadFile(path, flag);
     w.show();
     int retCode = a.exec();
     return retCode;
-  }else{
-    //Show an error text and exit
-    qDebug() << "ERROR: Invalid input arguments";
-    qDebug() << "Usage: \"lumina-fileinfo [-application | -link] [file]";
-    return 1;
-  }
-
-
 }
-- 
cgit