Removed QtSingleApplication and switched over to my fork of SingleApplication.

Author: ckaiser

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "tools/UGlobalHotkey"]
 	path = tools/UGlobalHotkey
 	url = https://github.com/ckaiser/UGlobalHotkey.git
+[submodule "tools/SingleApplication"]
+	path = tools/SingleApplication
+	url = https://github.com/ckaiser/SingleApplication.git

lightscreen.pro

@@ -13,8 +13,6 @@ HEADERS += dialogs/areadialog.h \
     tools/windowpicker.h \
     updater/updater.h \
     widgets/hotkeywidget.h \
-    tools/qtsingleapplication/qtlockedfile.h \
-    tools/qtsingleapplication/qtsinglecoreapplication.h \
     tools/uploader/imageuploader.h \
     tools/uploader/imguruploader.h \
     tools/uploader/uploader.h
@@ -32,10 +30,6 @@ SOURCES += dialogs/areadialog.cpp \
     tools/windowpicker.cpp \
     updater/updater.cpp \
     widgets/hotkeywidget.cpp \
-    tools/qtsingleapplication/qtlockedfile.cpp \
-    tools/qtsingleapplication/qtlockedfile_unix.cpp \
-    tools/qtsingleapplication/qtlockedfile_win.cpp \
-    tools/qtsingleapplication/qtsinglecoreapplication.cpp \
     tools/uploader/imageuploader.cpp \
     tools/uploader/imguruploader.cpp \
     tools/uploader/uploader.cpp
@@ -47,9 +41,9 @@ RESOURCES += lightscreen.qrc
 
 RC_FILE += lightscreen.rc
 CODECFORSRC = UTF-8
-QT += core gui network sql multimedia
+QT += core gui widgets network sql multimedia
 
-include($$PWD/tools/qtsingleapplication/qtsingleapplication.pri)
+include($$PWD/tools/SingleApplication/singleapplication.pri)
 include($$PWD/tools/UGlobalHotkey/uglobalhotkey.pri)
 
 windows {

lightscreenwindow.cpp

@@ -39,9 +39,9 @@
     #include <QtWinExtras>
 #endif
 
-/*
- * Lightscreen includes
- */
+//
+//Lightscreen includes
+//
 #include "lightscreenwindow.h"
 #include "dialogs/optionsdialog.h"
 #include "dialogs/previewdialog.h"
@@ -344,21 +344,19 @@ void LightscreenWindow::messageClicked()
     }
 }
 
-void LightscreenWindow::messageReceived(const QString &message)
+void LightscreenWindow::executeArgument(const QString &message)
 {
     if (message.contains(' ')) {
         foreach (QString argument, message.split(' ')) {
-            messageReceived(argument);
+            executeArgument(argument);
         }
     }
 
     if (message == "--wake") {
         show();
-        qApp->alert(this, 500);
-        return;
-    }
-
-    if (message == "--screen") {
+        os::setForegroundWindow(this);
+        qApp->alert(this, 2000);
+    } else if (message == "--screen") {
         screenshotAction();
     } else if (message == "--area") {
         screenshotAction(2);
@@ -379,6 +377,19 @@ void LightscreenWindow::messageReceived(const QString &message)
     }
 }
 
+void LightscreenWindow::executeArguments(const QStringList arguments)
+{
+    // If we just have the default argument, call "--wake"
+    if (arguments.count() == 1 && (arguments.at(0) == qApp->arguments().at(0) || arguments.at(0) == QFileInfo(qApp->applicationFilePath()).fileName())) {
+        executeArgument("--wake");
+        return;
+    }
+
+    foreach (const QString argument, arguments) {
+        executeArgument(argument);
+    }
+}
+
 void LightscreenWindow::notify(const Screenshot::Result &result)
 {
     switch (result) {

lightscreenwindow.h

@@ -53,7 +53,8 @@ public slots:
     void createUploadMenu();
     void goToFolder();
     void messageClicked();
-    void messageReceived(const QString &message);
+    void executeArgument(const QString &message);
+    void executeArguments(const QStringList arguments);
     void notify(const Screenshot::Result &result);
     void preview(Screenshot *screenshot);
     void quit();

main.cpp

@@ -25,7 +25,8 @@
 #endif
 
 #include "tools/os.h"
-#include <QtSingleApplication>
+#include "tools/SingleApplication/singleapplication.h"
+
 #include "lightscreenwindow.h"
 
 int main(int argc, char *argv[])
@@ -34,24 +35,12 @@ int main(int argc, char *argv[])
     qSetMessagePattern("%{message} @%{line}[%{function}()]");
 #endif
 
-    QtSingleApplication application(argc, argv);
+    SingleApplication application(argc, argv);
     application.setOrganizationName("K");
     application.setApplicationName("Lightscreen");
     application.setApplicationVersion("2.2");
     application.setQuitOnLastWindowClosed(false);
 
-    if (application.isRunning()) {
-        if (application.arguments().size() > 1) {
-            QStringList arguments = application.arguments();
-            arguments.removeFirst();
-            application.sendMessage(arguments.join(" "));
-        } else {
-            application.sendMessage("--wake");
-        }
-
-        return 0;
-    }
-
     LightscreenWindow lightscreen;
 
 #ifdef Q_OS_WIN
@@ -89,14 +78,12 @@ int main(int argc, char *argv[])
 #endif
 
     if (application.arguments().size() > 1) {
-        foreach (QString argument, application.arguments()) {
-            lightscreen.messageReceived(argument);
-        }
+        lightscreen.executeArguments(application.arguments());
     } else {
         lightscreen.show();
     }
 
-    QObject::connect(&application, SIGNAL(messageReceived(const QString &)), &lightscreen, SLOT(messageReceived(const QString &)));
+    QObject::connect(&application, SIGNAL(instanceArguments(const QStringList)), &lightscreen, SLOT(executeArguments(const QStringList)));
     QObject::connect(&lightscreen, SIGNAL(finished()), &application, SLOT(quit()));
 
     int result = application.exec();