Pass command line argument to MainWindow, added command unlicense which reverts back to the default unlicensed state.

Author: CodeShark

src/commandserver.cpp

@@ -127,6 +127,6 @@ void CommandServer::processArg(const QString& arg)
         emit gotFile(arg);
     }
     else {
-        LOGGER(debug) << "CommandServer::handleConnection - unhandled arg: " << arg.toStdString() << std::endl;
+        emit gotCommand(arg);
     }
 }

src/commandserver.h

@@ -33,6 +33,7 @@ class CommandServer : public QObject
 signals:
     void gotUrl(const QUrl& url);
     void gotFile(const QString& fileName);
+    void gotCommand(const QString& command);
 
 private slots:
     void handleConnection();

src/main.cpp

@@ -42,13 +42,13 @@ int main(int argc, char* argv[])
         msgBox.setText(QMessageBox::tr("Warning: Failed to create vault data directory."));
         msgBox.exec();
     }
-        
-    INIT_LOGGER((APPDATADIR + "/debug.log").toStdString().c_str());
-    LOGGER(debug) << std::endl << std::endl << std::endl << std::endl << QDateTime::currentDateTime().toString().toStdString() << std::endl;
 
+    // Check whether another instance is already running. If so, send it commands and exit.    
     CommandServer commandServer(&app);
     if (commandServer.processArgs(argc, argv)) exit(0);
 
+    INIT_LOGGER((APPDATADIR + "/debug.log").toStdString().c_str());
+    LOGGER(debug) << std::endl << std::endl << std::endl << std::endl << QDateTime::currentDateTime().toString().toStdString() << std::endl;
     LOGGER(debug) << "Vault started." << std::endl;
 
     SplashScreen splash;
@@ -68,6 +68,7 @@ int main(int argc, char* argv[])
     else {
         app.connect(&commandServer, SIGNAL(gotUrl(const QUrl&)), &mainWin, SLOT(processUrl(const QUrl&)));
         app.connect(&commandServer, SIGNAL(gotFile(const QString&)), &mainWin, SLOT(processFile(const QString&)));
+        app.connect(&commandServer, SIGNAL(gotCommand(const QString&)), &mainWin, SLOT(processCommand(const QString&)));
     }
 
     app.processEvents();
@@ -95,7 +96,11 @@ int main(int argc, char* argv[])
     if (!mainWin.isLicenseAccepted()) {
         //Display license agreement
         AcceptLicenseDialog acceptLicenseDialog;
-        if (!acceptLicenseDialog.exec()) return -1;
+        if (!acceptLicenseDialog.exec()) {
+            LOGGER(error) << "License agreement not accepted." << std::endl;
+            return -1;
+        }
+        LOGGER(debug) << "License agreement accepted." << std::endl;
         mainWin.setLicenseAccepted(true);
         mainWin.saveSettings();
     }

src/mainwindow.cpp

@@ -1216,6 +1216,18 @@ void MainWindow::processFile(const QString& fileName)
     }
 }
 
+void MainWindow::processCommand(const QString& command)
+{
+    if (command == "unlicense") {
+        LOGGER(trace) << "MainWindow::processCommand - " << command.toStdString() << std::endl;
+        licenseAccepted = false;
+        saveSettings();
+    }
+    else {
+        LOGGER(trace) << "MainWindow::processCommand - unhandled command: " << command.toStdString() << std::endl;
+    }
+}
+
 void MainWindow::createActions()
 {
     // application actions

src/mainwindow.h

@@ -174,10 +174,11 @@ private slots:
     // STATUS UPDATES
     void errorStatus(const QString& message);
 
-    //////////////////////
-    // URL/FILE OPERATIONS
+    //////////////////////////////
+    // URL/FILE/COMMAND OPERATIONS
     void processUrl(const QUrl& url);
     void processFile(const QString& fileName);
+    void processCommand(const QString& command);
 
 private:
     // License accepted?