feat: upgrade to qt6
This commit is contained in:
parent
320c8e74ad
commit
1e7d08551b
10 changed files with 63 additions and 68 deletions
|
|
@ -22,8 +22,8 @@
|
||||||
// along with SDDM Sugar Candy. If not, see <https://www.gnu.org/licenses/>
|
// along with SDDM Sugar Candy. If not, see <https://www.gnu.org/licenses/>
|
||||||
//
|
//
|
||||||
|
|
||||||
import QtQuick 2.11
|
import QtQuick
|
||||||
import QtQuick.Controls 2.4
|
import QtQuick.Controls
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
id: clock
|
id: clock
|
||||||
|
|
|
||||||
|
|
@ -22,10 +22,10 @@
|
||||||
// along with SDDM Sugar Candy. If not, see <https://www.gnu.org/licenses/>
|
// along with SDDM Sugar Candy. If not, see <https://www.gnu.org/licenses/>
|
||||||
//
|
//
|
||||||
|
|
||||||
import QtQuick 2.11
|
import QtQuick
|
||||||
import QtQuick.Layouts 1.11
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls 2.4
|
import QtQuick.Controls
|
||||||
import QtGraphicalEffects 1.0
|
import QtQuick.Effects
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
id: inputContainer
|
id: inputContainer
|
||||||
|
|
@ -97,6 +97,12 @@ Column {
|
||||||
enabled: false
|
enabled: false
|
||||||
icon.color: root.palette.text
|
icon.color: root.palette.text
|
||||||
icon.source: Qt.resolvedUrl("../Assets/User.svgz")
|
icon.source: Qt.resolvedUrl("../Assets/User.svgz")
|
||||||
|
background: Rectangle {
|
||||||
|
id: indicatorBackground
|
||||||
|
color: "white"
|
||||||
|
opacity: 0
|
||||||
|
radius: 50
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
background: Rectangle {
|
background: Rectangle {
|
||||||
|
|
@ -124,14 +130,13 @@ Column {
|
||||||
radius: config.RoundCorners / 2
|
radius: config.RoundCorners / 2
|
||||||
color: root.palette.window
|
color: root.palette.window
|
||||||
layer.enabled: true
|
layer.enabled: true
|
||||||
layer.effect: DropShadow {
|
layer.effect: MultiEffect {
|
||||||
transparentBorder: true
|
source: sourceItem
|
||||||
horizontalOffset: 0
|
anchors.fill: sourceItem
|
||||||
verticalOffset: 10 * config.InterfaceShadowSize
|
saturation: -1.0
|
||||||
radius: 20 * config.InterfaceShadowSize
|
shadowHorizontalOffset: 0
|
||||||
samples: 41 * config.InterfaceShadowSize
|
shadowBlur: 1.0
|
||||||
cached: true
|
shadowColor: "#88000000"
|
||||||
color: Qt.hsla(0,0,0,config.InterfaceShadowOpacity)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,8 +22,8 @@
|
||||||
// along with SDDM Sugar Candy. If not, see <https://www.gnu.org/licenses/>
|
// along with SDDM Sugar Candy. If not, see <https://www.gnu.org/licenses/>
|
||||||
//
|
//
|
||||||
|
|
||||||
import QtQuick 2.11
|
import QtQuick
|
||||||
import QtQuick.Layouts 1.11
|
import QtQuick.Layouts
|
||||||
import SddmComponents 2.0 as SDDM
|
import SddmComponents 2.0 as SDDM
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
|
|
|
||||||
|
|
@ -22,9 +22,9 @@
|
||||||
// along with SDDM Sugar Candy. If not, see <https://www.gnu.org/licenses/>
|
// along with SDDM Sugar Candy. If not, see <https://www.gnu.org/licenses/>
|
||||||
//
|
//
|
||||||
|
|
||||||
import QtQuick 2.11
|
import QtQuick
|
||||||
import QtQuick.Controls 2.4
|
import QtQuick.Controls
|
||||||
import QtGraphicalEffects 1.0
|
import QtQuick.Effects
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: sessionButton
|
id: sessionButton
|
||||||
|
|
@ -125,14 +125,13 @@ Item {
|
||||||
radius: config.RoundCorners / 2
|
radius: config.RoundCorners / 2
|
||||||
color: config.BackgroundColor
|
color: config.BackgroundColor
|
||||||
layer.enabled: true
|
layer.enabled: true
|
||||||
layer.effect: DropShadow {
|
layer.effect: MultiEffect {
|
||||||
transparentBorder: true
|
source: sourceItem
|
||||||
horizontalOffset: 0
|
anchors.fill: sourceItem
|
||||||
verticalOffset: 0
|
saturation: -1.0
|
||||||
radius: 20 * config.InterfaceShadowSize
|
shadowHorizontalOffset: 0
|
||||||
samples: 41 * config.InterfaceShadowSize
|
shadowBlur: 0.5
|
||||||
cached: true
|
shadowColor: "#88000000"
|
||||||
color: Qt.hsla(0,0,0,config.InterfaceShadowOpacity)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,9 +22,9 @@
|
||||||
// along with SDDM Sugar Candy. If not, see <https://www.gnu.org/licenses/>
|
// along with SDDM Sugar Candy. If not, see <https://www.gnu.org/licenses/>
|
||||||
//
|
//
|
||||||
|
|
||||||
import QtQuick 2.11
|
import QtQuick
|
||||||
import QtQuick.Layouts 1.11
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls 2.4
|
import QtQuick.Controls
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,9 +22,9 @@
|
||||||
// along with SDDM Sugar Candy. If not, see <https://www.gnu.org/licenses/>
|
// along with SDDM Sugar Candy. If not, see <https://www.gnu.org/licenses/>
|
||||||
//
|
//
|
||||||
|
|
||||||
import QtQuick 2.11
|
import QtQuick
|
||||||
import QtQuick.Controls 2.4
|
import QtQuick.Controls
|
||||||
import QtGraphicalEffects 1.0
|
import QtQuick.Effects
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: usernameField
|
id: usernameField
|
||||||
|
|
@ -108,14 +108,13 @@ Item {
|
||||||
radius: 10
|
radius: 10
|
||||||
color: root.palette.window
|
color: root.palette.window
|
||||||
layer.enabled: true
|
layer.enabled: true
|
||||||
layer.effect: DropShadow {
|
layer.effect: MultiEffect {
|
||||||
transparentBorder: true
|
source: sourceItem
|
||||||
horizontalOffset: 0
|
anchors.fill: sourceItem
|
||||||
verticalOffset: 0
|
saturation: -1.0
|
||||||
radius: 100
|
shadowHorizontalOffset: 0
|
||||||
samples: 201
|
shadowBlur: 0.5
|
||||||
cached: true
|
shadowColor: "#88000000"
|
||||||
color: "#88000000"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,8 +22,8 @@
|
||||||
// along with SDDM Sugar Candy. If not, see <https://www.gnu.org/licenses/>
|
// along with SDDM Sugar Candy. If not, see <https://www.gnu.org/licenses/>
|
||||||
//
|
//
|
||||||
|
|
||||||
import QtQuick 2.11
|
import QtQuick
|
||||||
import QtQuick.VirtualKeyboard 2.3
|
import QtQuick.VirtualKeyboard
|
||||||
|
|
||||||
InputPanel {
|
InputPanel {
|
||||||
id: virtualKeyboard
|
id: virtualKeyboard
|
||||||
|
|
|
||||||
9
Main.qml
9
Main.qml
|
|
@ -22,10 +22,11 @@
|
||||||
// along with SDDM Sugar Candy. If not, see <https://www.gnu.org/licenses/>
|
// along with SDDM Sugar Candy. If not, see <https://www.gnu.org/licenses/>
|
||||||
//
|
//
|
||||||
|
|
||||||
import QtQuick 2.11
|
import QtQuick
|
||||||
import QtQuick.Layouts 1.11
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls 2.4
|
import QtQuick.Controls
|
||||||
import QtGraphicalEffects 1.0
|
import QtQuick.Effects
|
||||||
|
|
||||||
import "Components"
|
import "Components"
|
||||||
|
|
||||||
Pane {
|
Pane {
|
||||||
|
|
|
||||||
23
README.md
23
README.md
|
|
@ -4,6 +4,10 @@
|
||||||
A Tokyo Night theme for the <a href="https://github.com/sddm/sddm">SDDM Login Manager</a>
|
A Tokyo Night theme for the <a href="https://github.com/sddm/sddm">SDDM Login Manager</a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
<p align=center>
|
||||||
|
<i>Now <a href="https://github.com/siddrs/tokyo-night-sddm">updated</a> to Qt6!</i>
|
||||||
|
</p>
|
||||||
|
|
||||||
<h2 align=center>Preview</h2>
|
<h2 align=center>Preview</h2>
|
||||||
<center>
|
<center>
|
||||||
<img src="./Previews/1.png" alt="preview-1">
|
<img src="./Previews/1.png" alt="preview-1">
|
||||||
|
|
@ -19,30 +23,18 @@ A Tokyo Night theme for the <a href="https://github.com/sddm/sddm">SDDM Login Ma
|
||||||
### From sources
|
### From sources
|
||||||
> _Assumes that you've installed and configured SDDM correctly_ (if not [read more](https://wiki.archlinux.org/title/SDDM))
|
> _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:
|
1. Open terminal, and clone the repository with:
|
||||||
|
|
||||||
```sh
|
```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:
|
2. Them move it as follows:
|
||||||
|
|
||||||
```sh
|
```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
|
## Configure
|
||||||
|
|
||||||
Edit the `/etc/sddm.conf` (with any text editor with **raised** privileges), so that it looks like this:
|
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
|
sudo nano /etc/sddm.conf # use any text editor with raised privileges
|
||||||
---
|
---
|
||||||
[Theme]
|
[Theme]
|
||||||
Current=tokyo-night-sddm
|
Current=tokyo-night
|
||||||
```
|
```
|
||||||
|
|
||||||
### Language and time format
|
### Language and time format
|
||||||
|
|
@ -63,7 +55,6 @@ Current=tokyo-night-sddm
|
||||||
## Credits
|
## Credits
|
||||||
|
|
||||||
- Based on the theme [`Sugar Dark for SDDM`](https://github.com/MarianArlt/sddm-sugar-dark) by [**MarianArlt**](https://github.com/MarianArlt).
|
- 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
|
## License
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
[SddmGreeterTheme]
|
[SddmGreeterTheme]
|
||||||
Name=Tokyo Night SDDM
|
Name=Tokyo Night SDDM
|
||||||
Description=A Tokyo Night Theme for SDDM
|
Description=A Tokyo Night Theme for SDDM
|
||||||
Author=rototrash
|
Author=toki
|
||||||
License=GPL-3.0-or-later
|
License=GPL-3.0-or-later
|
||||||
Type=sddm-theme
|
Type=sddm-theme
|
||||||
Version=1.0
|
Version=1.1
|
||||||
Website=https://github.com/tokyo-night-sddm/
|
Website=https://git.tokinanpa.dev/toki/tokyo-night-sddm
|
||||||
|
QtVersion=6
|
||||||
Screenshot=preview.png
|
Screenshot=preview.png
|
||||||
MainScript=Main.qml
|
MainScript=Main.qml
|
||||||
ConfigFile=theme.conf
|
ConfigFile=theme.conf
|
||||||
Theme-Id=tokyo-night-sddm
|
Theme-Id=tokyo-night
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue