diff --git a/Components/Clock.qml b/Components/Clock.qml index e6c83ab..2949f22 100644 --- a/Components/Clock.qml +++ b/Components/Clock.qml @@ -1,8 +1,7 @@ -// SDDM Sugar Candy 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. -// Config created by https://github.com/MarianArlt -// Config modified by keyitdev https://github.com/keyitdev +// Config created by Keyitdev https://github.com/Keyitdev/sddm-astronaut-theme +// Copyright (C) 2022-2024 Keyitdev +// Based on https://github.com/MarianArlt/sddm-sugar-dark +// Distributed under the GPLv3+ License https://www.gnu.org/licenses/gpl-3.0.html import QtQuick 2.15 import QtQuick.Controls 2.15 diff --git a/Components/Input.qml b/Components/Input.qml index bb66adf..b7b01a2 100644 --- a/Components/Input.qml +++ b/Components/Input.qml @@ -1,8 +1,7 @@ -// SDDM Sugar Candy 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. -// Config created by https://github.com/MarianArlt -// Config modified by keyitdev https://github.com/keyitdev +// Config created by Keyitdev https://github.com/Keyitdev/sddm-astronaut-theme +// Copyright (C) 2022-2024 Keyitdev +// Based on https://github.com/MarianArlt/sddm-sugar-dark +// Distributed under the GPLv3+ License https://www.gnu.org/licenses/gpl-3.0.html import QtQuick 2.15 import QtQuick.Layouts 1.15 @@ -16,6 +15,49 @@ Column { property Control exposeSession: sessionSelect.exposeSession property bool failed + Item { + // change also in selectSession + height: root.font.pointSize * 2 + width: parent.width / 2 + anchors.horizontalCenter: parent.horizontalCenter + Label { + id: errorMessage + width: parent.width + text: failed ? config.TranslateLoginFailedWarning || textConstants.loginFailed + "!" : keyboard.capsLock ? config.TranslateCapslockWarning || textConstants.capslockWarning : null + horizontalAlignment: Text.AlignHCenter + font.pointSize: root.font.pointSize * 0.8 + font.italic: true + color: root.palette.text + opacity: 0 + states: [ + State { + name: "fail" + when: failed + PropertyChanges { + target: errorMessage + opacity: 1 + } + }, + State { + name: "capslock" + when: keyboard.capsLock + PropertyChanges { + target: errorMessage + opacity: 1 + } + } + ] + transitions: [ + Transition { + PropertyAnimation { + properties: "opacity" + duration: 100 + } + } + ] + } + } + Item { id: usernameField @@ -189,7 +231,7 @@ Column { border.width: parent.activeFocus ? 2 : 1 radius: config.RoundCorners || 0 } - onAccepted: loginButton.clicked() + onAccepted: config.AllowBadUsernames == "false" ? sddm.login(username.text.toLowerCase(), password.text, sessionSelect.selectedSession) : sddm.login(username.text, password.text, sessionSelect.selectedSession) KeyNavigation.down: showPassword z: 1 @@ -216,20 +258,19 @@ Column { height: root.font.pointSize * 4.5 width: parent.width / 2 anchors.horizontalCenter: parent.horizontalCenter - + Button { - id: showPassword z: 2 width: selectUser.height * 1 - height: parent.height - anchors.left: parent.left - anchors.verticalCenter: parent.verticalCenter - anchors.leftMargin: selectUser.height * 0 - icon.height: parent.height * 0.25 - icon.width: parent.height * 0.25 - icon.color: root.palette.text - icon.source: Qt.resolvedUrl("../Assets/Password2.svg") + height: parent.height + anchors.left: parent.left + anchors.verticalCenter: parent.verticalCenter + anchors.leftMargin: selectUser.height * 0 + icon.height: parent.height * 0.25 + icon.width: parent.height * 0.25 + icon.color: root.palette.text + icon.source: Qt.resolvedUrl("../Assets/Password2.svg") background: Rectangle { color: "transparent" @@ -341,57 +382,18 @@ Column { ] } - Item { - height: root.font.pointSize * 2.3 - width: parent.width / 2 - anchors.horizontalCenter: parent.horizontalCenter - Label { - id: errorMessage - width: parent.width - text: failed ? config.TranslateLoginFailedWarning || textConstants.loginFailed + "!" : keyboard.capsLock ? config.TranslateCapslockWarning || textConstants.capslockWarning : null - horizontalAlignment: Text.AlignHCenter - font.pointSize: root.font.pointSize * 0.8 - font.italic: true - color: root.palette.text - opacity: 0 - states: [ - State { - name: "fail" - when: failed - PropertyChanges { - target: errorMessage - opacity: 1 - } - }, - State { - name: "capslock" - when: keyboard.capsLock - PropertyChanges { - target: errorMessage - opacity: 1 - } - } - ] - transitions: [ - Transition { - PropertyAnimation { - properties: "opacity" - duration: 100 - } - } - ] - } - } - Item { id: login - height: root.font.pointSize * 3 + // important + height: root.font.pointSize * 9 width: parent.width / 2 anchors.horizontalCenter: parent.horizontalCenter - + visible: config.HideLoginButton == "true" ? false : true Button { + id: loginButton anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter text: config.TranslateLogin || textConstants.login height: root.font.pointSize * 3 implicitWidth: parent.width diff --git a/Components/LoginForm.qml b/Components/LoginForm.qml index 4a7d66a..2283449 100644 --- a/Components/LoginForm.qml +++ b/Components/LoginForm.qml @@ -1,8 +1,7 @@ -// SDDM Sugar Candy 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. -// Config created by https://github.com/MarianArlt -// Config modified by keyitdev https://github.com/keyitdev +// Config created by Keyitdev https://github.com/Keyitdev/sddm-astronaut-theme +// Copyright (C) 2022-2024 Keyitdev +// Based on https://github.com/MarianArlt/sddm-sugar-dark +// Distributed under the GPLv3+ License https://www.gnu.org/licenses/gpl-3.0.html import QtQuick 2.15 import QtQuick.Layouts 1.15 @@ -21,7 +20,8 @@ ColumnLayout { Clock { id: clock Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom - Layout.preferredHeight: root.height / 4 + // important + Layout.preferredHeight: root.height / 3 Layout.leftMargin: p != "0" ? a == "left" ? -p : a == "right" ? p : 0 : 0 } diff --git a/Components/SessionButton.qml b/Components/SessionButton.qml index 02ca2c2..d6b753b 100644 --- a/Components/SessionButton.qml +++ b/Components/SessionButton.qml @@ -1,8 +1,7 @@ -// SDDM Sugar Candy 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. -// Config created by https://github.com/MarianArlt -// Config modified by keyitdev https://github.com/keyitdev +// Config created by Keyitdev https://github.com/Keyitdev/sddm-astronaut-theme +// Copyright (C) 2022-2024 Keyitdev +// Based on https://github.com/MarianArlt/sddm-sugar-dark +// Distributed under the GPLv3+ License https://www.gnu.org/licenses/gpl-3.0.html import QtQuick 2.15 import QtQuick.Controls 2.15 @@ -20,7 +19,9 @@ Item { ComboBox { id: selectSession - + // important + // change also in errorMessage + height: root.font.pointSize * 2 hoverEnabled: true anchors.left: parent.left Keys.onPressed: { diff --git a/Components/SystemButtons.qml b/Components/SystemButtons.qml index d3d9c2b..be340d6 100644 --- a/Components/SystemButtons.qml +++ b/Components/SystemButtons.qml @@ -1,8 +1,7 @@ -// SDDM Sugar Candy 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. -// Config created by https://github.com/MarianArlt -// Config modified by keyitdev https://github.com/keyitdev +// Config created by Keyitdev https://github.com/Keyitdev/sddm-astronaut-theme +// Copyright (C) 2022-2024 Keyitdev +// Based on https://github.com/MarianArlt/sddm-sugar-dark +// Distributed under the GPLv3+ License https://www.gnu.org/licenses/gpl-3.0.html import QtQuick 2.15 import QtQuick.Layouts 1.15 diff --git a/Components/UserList.qml b/Components/UserList.qml index 29ff78c..8c4bca1 100644 --- a/Components/UserList.qml +++ b/Components/UserList.qml @@ -1,8 +1,7 @@ -// SDDM Sugar Candy 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. -// Config created by https://github.com/MarianArlt -// Config modified by keyitdev https://github.com/keyitdev +// Config created by Keyitdev https://github.com/Keyitdev/sddm-astronaut-theme +// Copyright (C) 2022-2024 Keyitdev +// Based on https://github.com/MarianArlt/sddm-sugar-dark +// Distributed under the GPLv3+ License https://www.gnu.org/licenses/gpl-3.0.html import QtQuick 2.15 import QtQuick.Controls 2.15 diff --git a/Components/VirtualKeyboard.qml b/Components/VirtualKeyboard.qml index ce83f55..1247d7e 100644 --- a/Components/VirtualKeyboard.qml +++ b/Components/VirtualKeyboard.qml @@ -1,8 +1,7 @@ -// SDDM Sugar Candy 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. -// Config created by https://github.com/MarianArlt -// Config modified by keyitdev https://github.com/keyitdev +// Config created by Keyitdev https://github.com/Keyitdev/sddm-astronaut-theme +// Copyright (C) 2022-2024 Keyitdev +// Based on https://github.com/MarianArlt/sddm-sugar-dark +// Distributed under the GPLv3+ License https://www.gnu.org/licenses/gpl-3.0.html import QtQuick 2.15 import QtQuick.VirtualKeyboard 2.3 diff --git a/Main.qml b/Main.qml index 2faf78c..55fde60 100755 --- a/Main.qml +++ b/Main.qml @@ -1,8 +1,7 @@ -// SDDM Sugar Candy 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. -// Config created by https://github.com/MarianArlt -// Config modified by keyitdev https://github.com/keyitdev +// Config created by Keyitdev https://github.com/Keyitdev/sddm-astronaut-theme +// Copyright (C) 2022-2024 Keyitdev +// Based on https://github.com/MarianArlt/sddm-sugar-dark +// Distributed under the GPLv3+ License https://www.gnu.org/licenses/gpl-3.0.html import QtQuick 2.15 import QtQuick.Layouts 1.15 diff --git a/Previews/preview1.png b/Previews/preview1.png index d6e9b49..e744a94 100644 Binary files a/Previews/preview1.png and b/Previews/preview1.png differ diff --git a/Previews/preview2.png b/Previews/preview2.png index 3d6b9b2..4445e0a 100644 Binary files a/Previews/preview2.png and b/Previews/preview2.png differ diff --git a/Previews/preview3.png b/Previews/preview3.png index f27aaa4..867f5c9 100644 Binary files a/Previews/preview3.png and b/Previews/preview3.png differ diff --git a/Previews/preview4.png b/Previews/preview4.png new file mode 100644 index 0000000..415e156 Binary files /dev/null and b/Previews/preview4.png differ diff --git a/README.md b/README.md index 862b470..a856e56 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,20 @@ # sddm-astronaut-theme -A theme for the [SDDM login manager](https://github.com/sddm/sddm) based on [`Sugar Dark for SDDM`](https://github.com/MarianArlt/sddm-sugar-dark). -Screen resolution: 1080p. +A theme for the [SDDM login manager](https://github.com/sddm/sddm). + +- Screen resolution: 1080p +- Font: Open sans ### Preview + +You can easily change how it looks in **[config](./theme.conf)**. +Here are some examples: + ![Preview](./Previews/preview1.png) ![Preview](./Previews/preview2.png) ![Preview](./Previews/preview3.png) +![Preview](./Previews/preview4.png) + ### Dependencies ```sh @@ -37,4 +45,5 @@ Based on the theme [`Sugar Dark for SDDM`](https://github.com/MarianArlt/sddm-su ### License -Distributed under the [GPLv3+](https://www.gnu.org/licenses/gpl-3.0.html) License. +Distributed under the **[GPLv3+](https://www.gnu.org/licenses/gpl-3.0.html) License**. +Copyright (C) 2022-2024 Keyitdev. \ No newline at end of file diff --git a/theme.conf b/theme.conf index 9b03083..ed88782 100755 --- a/theme.conf +++ b/theme.conf @@ -21,7 +21,7 @@ FullBlur="false" PartialBlur="true" ## Enable or disable the blur effect; if HaveFormBackground is set to true then PartialBlur will trigger the BackgroundColor of the form element to be partially transparent and blend with the blur. -BlurRadius="0" +BlurRadius="80" ## Set the strength of the blur effect. Anything above 100 is pretty strong and might slow down the rendering time. 0 is like setting false for any blur. @@ -77,6 +77,8 @@ Font="Open Sans" FontSize="" ## Only set a fixed value if fonts are way too small for your resolution. Preferrably kept empty. +HideLoginButton="true" +## Hides login button if set to true. ## [Interface Behavior]