Add single instance

screenlocker/application.cpp

@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2021 CutefishOS Team.
+ *
+ * Author:     Reion Wong <reionwong@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "application.h"
 
 // Qt Core

screenlocker/application.h

@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2021 CutefishOS Team.
+ *
+ * Author:     Reion Wong <reionwong@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef APPLICATION_H
 #define APPLICATION_H
 
@@ -5,8 +24,6 @@
 #include <QQuickView>
 #include "authenticator.h"
 
-struct org_kde_ksld;
-
 class Application : public QGuiApplication
 {
     Q_OBJECT
@@ -37,7 +54,6 @@ private:
     Authenticator *m_authenticator;
     QList<QQuickView *> m_views;
 
-    org_kde_ksld *m_ksldInterface = nullptr;
     bool m_testing = false;
 };
 

screenlocker/main.cpp

@@ -1,4 +1,24 @@
+/*
+ * Copyright (C) 2021 CutefishOS Team.
+ *
+ * Author:     Reion Wong <reionwong@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "application.h"
+#include <QDBusConnection>
 #include <QTranslator>
 #include <QLocale>
 
@@ -6,6 +26,14 @@ int main(int argc, char *argv[])
 {
     Application app(argc, argv);
 
+    if (!QDBusConnection::sessionBus().registerService("org.cutefish.ScreenLocker")) {
+        return -1;
+    }
+
+    if (!QDBusConnection::sessionBus().registerObject("/ScreenLocker", &app)) {
+        return -1;
+    }
+
     // Translations
     QLocale locale;
     QString qmFilePath = QString("%1/%2.qm").arg("/usr/share/cutefish-screenlocker/translations/").arg(locale.name());

screenlocker/qml/LockScreen.qml

@@ -172,7 +172,7 @@ Item {
 
                 Layout.preferredHeight: iconSize
                 Layout.preferredWidth: iconSize
-                sourceSize: source === "image://icontheme/default-user" ? Qt.size(iconSize, iconSize) : undefined
+                sourceSize: String(source) === "image://icontheme/default-user" ? Qt.size(iconSize, iconSize) : undefined
                 source: currentUser.iconFileName ? "file:///" + currentUser.iconFileName : "image://icontheme/default-user"
                 Layout.alignment: Qt.AlignHCenter