diff --git a/screenlocker/application.cpp b/screenlocker/application.cpp index 03260c2..0164a47 100644 --- a/screenlocker/application.cpp +++ b/screenlocker/application.cpp @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2021 CutefishOS Team. + * + * Author: Reion Wong + * + * 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 . + */ + #include "application.h" // Qt Core diff --git a/screenlocker/application.h b/screenlocker/application.h index 8369af1..0c8aade 100644 --- a/screenlocker/application.h +++ b/screenlocker/application.h @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2021 CutefishOS Team. + * + * Author: Reion Wong + * + * 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 . + */ + #ifndef APPLICATION_H #define APPLICATION_H @@ -5,8 +24,6 @@ #include #include "authenticator.h" -struct org_kde_ksld; - class Application : public QGuiApplication { Q_OBJECT @@ -37,7 +54,6 @@ private: Authenticator *m_authenticator; QList m_views; - org_kde_ksld *m_ksldInterface = nullptr; bool m_testing = false; }; diff --git a/screenlocker/main.cpp b/screenlocker/main.cpp index 15ab5f3..e818340 100644 --- a/screenlocker/main.cpp +++ b/screenlocker/main.cpp @@ -1,4 +1,24 @@ +/* + * Copyright (C) 2021 CutefishOS Team. + * + * Author: Reion Wong + * + * 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 . + */ + #include "application.h" +#include #include #include @@ -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()); diff --git a/screenlocker/qml/LockScreen.qml b/screenlocker/qml/LockScreen.qml index 638693f..ef755c9 100644 --- a/screenlocker/qml/LockScreen.qml +++ b/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