diff --git a/Components/Clock.qml b/Components/Clock.qml index e809efc..3ebe6ce 100644 --- a/Components/Clock.qml +++ b/Components/Clock.qml @@ -22,8 +22,8 @@ // along with SDDM Sugar Candy. If not, see // -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick +import QtQuick.Controls Column { id: clock diff --git a/Components/Input.qml b/Components/Input.qml index dfbc3da..06f7396 100644 --- a/Components/Input.qml +++ b/Components/Input.qml @@ -22,10 +22,10 @@ // along with SDDM Sugar Candy. If not, see // -import QtQuick 2.11 -import QtQuick.Layouts 1.11 -import QtQuick.Controls 2.4 -import QtGraphicalEffects 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtQuick.Effects Column { id: inputContainer @@ -97,6 +97,12 @@ Column { enabled: false icon.color: root.palette.text icon.source: Qt.resolvedUrl("../Assets/User.svgz") + background: Rectangle { + id: indicatorBackground + color: "white" + opacity: 0 + radius: 50 + } } background: Rectangle { @@ -124,14 +130,13 @@ Column { radius: config.RoundCorners / 2 color: root.palette.window layer.enabled: true - layer.effect: DropShadow { - transparentBorder: true - horizontalOffset: 0 - verticalOffset: 10 * config.InterfaceShadowSize - radius: 20 * config.InterfaceShadowSize - samples: 41 * config.InterfaceShadowSize - cached: true - color: Qt.hsla(0,0,0,config.InterfaceShadowOpacity) + layer.effect: MultiEffect { + source: sourceItem + anchors.fill: sourceItem + saturation: -1.0 + shadowHorizontalOffset: 0 + shadowBlur: 1.0 + shadowColor: "#88000000" } } diff --git a/Components/LoginForm.qml b/Components/LoginForm.qml index 7021256..50ea8f7 100644 --- a/Components/LoginForm.qml +++ b/Components/LoginForm.qml @@ -22,8 +22,8 @@ // along with SDDM Sugar Candy. If not, see // -import QtQuick 2.11 -import QtQuick.Layouts 1.11 +import QtQuick +import QtQuick.Layouts import SddmComponents 2.0 as SDDM ColumnLayout { diff --git a/Components/SessionButton.qml b/Components/SessionButton.qml index c69cd13..6d65393 100644 --- a/Components/SessionButton.qml +++ b/Components/SessionButton.qml @@ -22,9 +22,9 @@ // along with SDDM Sugar Candy. If not, see // -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtGraphicalEffects 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Effects Item { id: sessionButton @@ -125,14 +125,13 @@ Item { radius: config.RoundCorners / 2 color: config.BackgroundColor layer.enabled: true - layer.effect: DropShadow { - transparentBorder: true - horizontalOffset: 0 - verticalOffset: 0 - radius: 20 * config.InterfaceShadowSize - samples: 41 * config.InterfaceShadowSize - cached: true - color: Qt.hsla(0,0,0,config.InterfaceShadowOpacity) + layer.effect: MultiEffect { + source: sourceItem + anchors.fill: sourceItem + saturation: -1.0 + shadowHorizontalOffset: 0 + shadowBlur: 0.5 + shadowColor: "#88000000" } } diff --git a/Components/SystemButtons.qml b/Components/SystemButtons.qml index 511470d..fa1f902 100644 --- a/Components/SystemButtons.qml +++ b/Components/SystemButtons.qml @@ -22,9 +22,9 @@ // along with SDDM Sugar Candy. If not, see // -import QtQuick 2.11 -import QtQuick.Layouts 1.11 -import QtQuick.Controls 2.4 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls RowLayout { diff --git a/Components/UserList.qml b/Components/UserList.qml index c6844be..221f488 100644 --- a/Components/UserList.qml +++ b/Components/UserList.qml @@ -22,9 +22,9 @@ // along with SDDM Sugar Candy. If not, see // -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtGraphicalEffects 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Effects Item { id: usernameField @@ -108,14 +108,13 @@ Item { radius: 10 color: root.palette.window layer.enabled: true - layer.effect: DropShadow { - transparentBorder: true - horizontalOffset: 0 - verticalOffset: 0 - radius: 100 - samples: 201 - cached: true - color: "#88000000" + layer.effect: MultiEffect { + source: sourceItem + anchors.fill: sourceItem + saturation: -1.0 + shadowHorizontalOffset: 0 + shadowBlur: 0.5 + shadowColor: "#88000000" } } diff --git a/Components/VirtualKeyboard.qml b/Components/VirtualKeyboard.qml index 77b6ea6..2aff7f4 100644 --- a/Components/VirtualKeyboard.qml +++ b/Components/VirtualKeyboard.qml @@ -22,8 +22,8 @@ // along with SDDM Sugar Candy. If not, see // -import QtQuick 2.11 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard InputPanel { id: virtualKeyboard diff --git a/Main.qml b/Main.qml index 06a132f..acf0856 100644 --- a/Main.qml +++ b/Main.qml @@ -22,10 +22,11 @@ // along with SDDM Sugar Candy. If not, see // -import QtQuick 2.11 -import QtQuick.Layouts 1.11 -import QtQuick.Controls 2.4 -import QtGraphicalEffects 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtQuick.Effects + import "Components" Pane { diff --git a/README.md b/README.md index b02d1c8..49ab46a 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,10 @@ A Tokyo Night theme for the SDDM Login Manager

+

+Now updated to Qt6! +

+

Preview

preview-1 @@ -19,30 +23,18 @@ A Tokyo Night theme for the SDDM Login Ma ### From sources > _Assumes that you've installed and configured SDDM correctly_ (if not [read more](https://wiki.archlinux.org/title/SDDM)) -> Please make sure you have the following dependencies installed: -> `qt5-quickcontrols2`, `qt5-graphicaleffects`, `qt5-svg` - 1. Open terminal, and clone the repository with: ```sh - git clone https://github.com/rototrash/tokyo-night-sddm.git ~/tokyo-night-sddm + git clone https://git.tokinanpa.dev/toki/tokyo-night-sddm ~/tokyo-night ``` 2. Them move it as follows: ```sh - sudo mv ~/tokyo-night-sddm /usr/share/sddm/themes/ + sudo mv ~/tokyo-night /usr/share/sddm/themes/ ``` -### Arch Linux -This theme is available on the [AUR](https://aur.archlinux.org/packages/sddm-theme-tokyo-night), you can install it with `makepkg` or using an AUR helper. - -```sh -git clone https://aur.archlinux.org/sddm-theme-tokyo-night.git -cd sddm-theme-tokyo-night -makepkg -Ccsi -``` - ## Configure Edit the `/etc/sddm.conf` (with any text editor with **raised** privileges), so that it looks like this: @@ -51,7 +43,7 @@ Edit the `/etc/sddm.conf` (with any text editor with **raised** privileges), so sudo nano /etc/sddm.conf # use any text editor with raised privileges --- [Theme] -Current=tokyo-night-sddm +Current=tokyo-night ``` ### Language and time format @@ -63,7 +55,6 @@ Current=tokyo-night-sddm ## Credits - Based on the theme [`Sugar Dark for SDDM`](https://github.com/MarianArlt/sddm-sugar-dark) by [**MarianArlt**](https://github.com/MarianArlt). -- AUR Package by [**julian-poidevin**](https://github.com/julian-poidevin) ## License diff --git a/metadata.desktop b/metadata.desktop index ca19434..ace3078 100644 --- a/metadata.desktop +++ b/metadata.desktop @@ -1,13 +1,13 @@ [SddmGreeterTheme] Name=Tokyo Night SDDM Description=A Tokyo Night Theme for SDDM -Author=rototrash +Author=toki License=GPL-3.0-or-later Type=sddm-theme -Version=1.0 -Website=https://github.com/tokyo-night-sddm/ +Version=1.1 +Website=https://git.tokinanpa.dev/toki/tokyo-night-sddm +QtVersion=6 Screenshot=preview.png MainScript=Main.qml ConfigFile=theme.conf -Theme-Id=tokyo-night-sddm - +Theme-Id=tokyo-night