diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Hibernate.svg b/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Hibernate.svg
new file mode 100644
index 0000000..8445e38
--- /dev/null
+++ b/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Hibernate.svg
@@ -0,0 +1,73 @@
+
+
diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Hibernate.svgz b/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Hibernate.svgz
deleted file mode 100644
index c6aab4d..0000000
Binary files a/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Hibernate.svgz and /dev/null differ
diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Reboot.svg b/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Reboot.svg
new file mode 100644
index 0000000..d66a3d3
--- /dev/null
+++ b/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Reboot.svg
@@ -0,0 +1,66 @@
+
+
diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Reboot.svgz b/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Reboot.svgz
deleted file mode 100644
index 1958f78..0000000
Binary files a/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Reboot.svgz and /dev/null differ
diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Shutdown.svg b/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Shutdown.svg
new file mode 100644
index 0000000..7eb4eea
--- /dev/null
+++ b/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Shutdown.svg
@@ -0,0 +1,66 @@
+
+
diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Shutdown.svgz b/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Shutdown.svgz
deleted file mode 100644
index 4845675..0000000
Binary files a/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Shutdown.svgz and /dev/null differ
diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Suspend.svg b/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Suspend.svg
new file mode 100644
index 0000000..9489521
--- /dev/null
+++ b/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Suspend.svg
@@ -0,0 +1,66 @@
+
+
diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Suspend.svgz b/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Suspend.svgz
deleted file mode 100644
index dd230f7..0000000
Binary files a/usr/share/sddm/themes/Melawy-Nier-A2/Assets/Suspend.svgz and /dev/null differ
diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/Assets/User.svg b/usr/share/sddm/themes/Melawy-Nier-A2/Assets/User.svg
new file mode 100644
index 0000000..f0ccc59
--- /dev/null
+++ b/usr/share/sddm/themes/Melawy-Nier-A2/Assets/User.svg
@@ -0,0 +1,52 @@
+
+
\ No newline at end of file
diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/Assets/User.svgz b/usr/share/sddm/themes/Melawy-Nier-A2/Assets/User.svgz
deleted file mode 100644
index e8bbdbf..0000000
Binary files a/usr/share/sddm/themes/Melawy-Nier-A2/Assets/User.svgz and /dev/null differ
diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/Components/Clock.qml b/usr/share/sddm/themes/Melawy-Nier-A2/Components/Clock.qml
index e809efc..6b1e6b5 100644
--- a/usr/share/sddm/themes/Melawy-Nier-A2/Components/Clock.qml
+++ b/usr/share/sddm/themes/Melawy-Nier-A2/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
@@ -45,7 +45,9 @@ Column {
color: root.palette.text
renderType: Text.QtRendering
function updateTime() {
- text = new Date().toLocaleTimeString(Qt.locale(config.Locale), config.HourFormat == "long" ? Locale.LongFormat : config.HourFormat !== "" ? config.HourFormat : Locale.ShortFormat)
+ text = new Date().toLocaleTimeString(Qt.locale(config.Locale),
+ config.HourFormat == "long" ? Locale.LongFormat :
+ config.HourFormat !== "" ? config.HourFormat : Locale.ShortFormat)
}
}
@@ -54,8 +56,10 @@ Column {
anchors.horizontalCenter: parent.horizontalCenter
color: root.palette.text
renderType: Text.QtRendering
- function updateTime() {
- text = new Date().toLocaleDateString(Qt.locale(config.Locale), config.DateFormat == "short" ? Locale.ShortFormat : config.DateFormat !== "" ? config.DateFormat : Locale.LongFormat)
+ function updateDate() {
+ text = new Date().toLocaleDateString(Qt.locale(config.Locale),
+ config.DateFormat == "short" ? Locale.ShortFormat :
+ config.DateFormat !== "" ? config.DateFormat : Locale.LongFormat)
}
}
@@ -64,13 +68,14 @@ Column {
repeat: true
running: true
onTriggered: {
- dateLabel.updateTime()
+ dateLabel.updateDate()
timeLabel.updateTime()
}
}
Component.onCompleted: {
- dateLabel.updateTime()
+ dateLabel.updateDate()
timeLabel.updateTime()
}
}
+
diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/Components/Input.qml b/usr/share/sddm/themes/Melawy-Nier-A2/Components/Input.qml
index 6dace92..2f4170d 100644
--- a/usr/share/sddm/themes/Melawy-Nier-A2/Components/Input.qml
+++ b/usr/share/sddm/themes/Melawy-Nier-A2/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 Qt5Compat.GraphicalEffects
Column {
id: inputContainer
@@ -45,6 +45,7 @@ Column {
id: selectUser
+ displayText: ""
width: parent.height
height: parent.height
anchors.left: parent.left
@@ -96,7 +97,8 @@ Column {
icon.width: parent.height * 0.25
enabled: false
icon.color: root.palette.text
- icon.source: Qt.resolvedUrl("../Assets/User.svgz")
+ flat: true
+ icon.source: Qt.resolvedUrl("../Assets/User.svg")
}
background: Rectangle {
@@ -181,6 +183,7 @@ Column {
TextField {
id: username
text: config.ForceLastUser == "true" ? selectUser.currentText : null
+ font.pointSize: root.font.pointSize
font.capitalization: config.AllowBadUsernames == "false" ? Font.Capitalize : Font.MixedCase
anchors.centerIn: parent
height: root.font.pointSize * 3
@@ -229,6 +232,7 @@ Column {
TextField {
id: password
+ font.pointSize: root.font.pointSize
anchors.centerIn: parent
height: root.font.pointSize * 3
width: parent.width
@@ -238,7 +242,7 @@ Column {
placeholderText: config.TranslatePlaceholderPassword || textConstants.password
horizontalAlignment: TextInput.AlignHCenter
passwordCharacter: "•"
- passwordMaskDelay: config.ForceHideCompletePassword == "true" ? undefined : 1000
+ passwordMaskDelay: config.ForceHideCompletePassword == "true" ? undefined : 500
renderType: Text.QtRendering
background: Rectangle {
color: "transparent"
diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/Components/LoginForm.qml b/usr/share/sddm/themes/Melawy-Nier-A2/Components/LoginForm.qml
index 7021256..38208ae 100644
--- a/usr/share/sddm/themes/Melawy-Nier-A2/Components/LoginForm.qml
+++ b/usr/share/sddm/themes/Melawy-Nier-A2/Components/LoginForm.qml
@@ -22,9 +22,9 @@
// along with SDDM Sugar Candy. If not, see
//
-import QtQuick 2.11
-import QtQuick.Layouts 1.11
-import SddmComponents 2.0 as SDDM
+import QtQuick
+import QtQuick.Layouts
+import SddmComponents as SDDM
ColumnLayout {
id: formContainer
@@ -61,3 +61,4 @@ ColumnLayout {
}
}
+
diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/Components/SessionButton.qml b/usr/share/sddm/themes/Melawy-Nier-A2/Components/SessionButton.qml
index 945f925..7f06db8 100644
--- a/usr/share/sddm/themes/Melawy-Nier-A2/Components/SessionButton.qml
+++ b/usr/share/sddm/themes/Melawy-Nier-A2/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 Qt5Compat.GraphicalEffects
Item {
id: sessionButton
@@ -192,3 +192,4 @@ Item {
}
}
+
diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/Components/SystemButtons.qml b/usr/share/sddm/themes/Melawy-Nier-A2/Components/SystemButtons.qml
index 511470d..6bc5da4 100644
--- a/usr/share/sddm/themes/Melawy-Nier-A2/Components/SystemButtons.qml
+++ b/usr/share/sddm/themes/Melawy-Nier-A2/Components/SystemButtons.qml
@@ -22,18 +22,18 @@
// 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 {
spacing: root.font.pointSize
- property var suspend: ["Suspend", config.TranslateSuspend || textConstants.suspend, sddm.canSuspend]
- property var hibernate: ["Hibernate", config.TranslateHibernate || textConstants.hibernate, sddm.canHibernate]
- property var reboot: ["Reboot", config.TranslateReboot || textConstants.reboot, sddm.canReboot]
- property var shutdown: ["Shutdown", config.TranslateShutdown || textConstants.shutdown, sddm.canPowerOff]
+ readonly property var suspend: ["Suspend", config.TranslateSuspend || textConstants.suspend, sddm.canSuspend]
+ readonly property var hibernate: ["Hibernate", config.TranslateHibernate || textConstants.hibernate, sddm.canHibernate]
+ readonly property var reboot: ["Reboot", config.TranslateReboot || textConstants.reboot, sddm.canReboot]
+ readonly property var shutdown: ["Shutdown", config.TranslateShutdown || textConstants.shutdown, sddm.canPowerOff]
property Control exposedSession
@@ -46,7 +46,7 @@ RowLayout {
text: modelData[1]
font.pointSize: root.font.pointSize * 0.8
Layout.alignment: Qt.AlignHCenter
- icon.source: modelData ? Qt.resolvedUrl("../Assets/" + modelData[0] + ".svgz") : ""
+ icon.source: modelData ? Qt.resolvedUrl("../Assets/" + modelData[0] + ".svg") : ""
icon.height: 2 * Math.round((root.font.pointSize * 3) / 2)
icon.width: 2 * Math.round((root.font.pointSize * 3) / 2)
display: AbstractButton.TextUnderIcon
@@ -116,9 +116,7 @@ RowLayout {
}
}
]
-
}
-
}
-
}
+
diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/Components/UserList.qml b/usr/share/sddm/themes/Melawy-Nier-A2/Components/UserList.qml
index c6844be..3ea47af 100644
--- a/usr/share/sddm/themes/Melawy-Nier-A2/Components/UserList.qml
+++ b/usr/share/sddm/themes/Melawy-Nier-A2/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 Qt5Compat.GraphicalEffects
Item {
id: usernameField
@@ -81,7 +81,8 @@ Item {
icon.width: parent.height * 0.25
enabled: false
icon.color: root.palette.text
- icon.source: Qt.resolvedUrl("../Assets/User.svgz")
+ flat: true
+ icon.source: Qt.resolvedUrl("../Assets/User.svg")
}
background: Rectangle {
@@ -159,7 +160,6 @@ Item {
}
}
]
-
}
TextField {
@@ -198,5 +198,5 @@ Item {
}
]
}
-
}
+
diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/Components/VirtualKeyboard.qml b/usr/share/sddm/themes/Melawy-Nier-A2/Components/VirtualKeyboard.qml
index 77b6ea6..2aff7f4 100644
--- a/usr/share/sddm/themes/Melawy-Nier-A2/Components/VirtualKeyboard.qml
+++ b/usr/share/sddm/themes/Melawy-Nier-A2/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/usr/share/sddm/themes/Melawy-Nier-A2/Main.qml b/usr/share/sddm/themes/Melawy-Nier-A2/Main.qml
index 3526937..084d765 100644
--- a/usr/share/sddm/themes/Melawy-Nier-A2/Main.qml
+++ b/usr/share/sddm/themes/Melawy-Nier-A2/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 Qt5Compat.GraphicalEffects
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
import "Components"
Pane {
@@ -45,7 +46,8 @@ Pane {
palette.window: config.BackgroundColor
font.family: config.Font
- font.pointSize: config.FontSize !== "" ? config.FontSize : parseInt(height / 80)
+ font.pointSize: config.FontSize !== "" ? config.FontSize :
+ Screen.primaryOrientation == Qt.PortraitOrientation ? parseInt(height / 160) : parseInt(height / 80)
focus: true
property bool leftleft: config.HaveFormBackground == "true" &&
@@ -97,9 +99,9 @@ Pane {
LoginForm {
id: form
-
height: virtualKeyboard.state == "visible" ? parent.height - virtualKeyboard.implicitHeight : parent.height
- width: parent.width / 3
+ // If in portrait orientation we should take up half instead of 40% of the screen to avoid crowding
+ width: parent.width / 2.5
anchors.horizontalCenter: config.FormPosition == "center" ? parent.horizontalCenter : undefined
anchors.left: config.FormPosition == "left" ? parent.left : undefined
anchors.right: config.FormPosition == "right" ? parent.right : undefined
@@ -107,24 +109,24 @@ Pane {
z: 1
}
- Button {
- id: vkb
- onClicked: virtualKeyboard.switchState()
- visible: virtualKeyboard.status == Loader.Ready && config.ForceHideVirtualKeyboardButton == "false"
- anchors.bottom: parent.bottom
- anchors.bottomMargin: implicitHeight
- anchors.horizontalCenter: form.horizontalCenter
- z: 1
- contentItem: Text {
- text: config.TranslateVirtualKeyboardButton || "Virtual Keyboard"
- color: parent.visualFocus ? palette.highlight : palette.text
- font.pointSize: root.font.pointSize * 0.8
- }
- background: Rectangle {
- id: vkbbg
- color: "transparent"
- }
- }
+ // Button {
+ // id: vkb
+ // onClicked: virtualKeyboard.switchState()
+ // visible: virtualKeyboard.status == Loader.Ready && config.ForceHideVirtualKeyboardButton == "false"
+ // anchors.bottom: parent.bottom
+ // anchors.bottomMargin: implicitHeight
+ // anchors.horizontalCenter: form.horizontalCenter
+ // z: 1
+ // contentItem: Text {
+ // text: config.TranslateVirtualKeyboardButton || "Virtual Keyboard"
+ // color: parent.visualFocus ? palette.highlight : palette.text
+ // font.pointSize: root.font.pointSize * 0.8
+ // }
+ // background: Rectangle {
+ // id: vkbbg
+ // color: "transparent"
+ // }
+ // }
Loader {
id: virtualKeyboard
@@ -272,3 +274,4 @@ Pane {
}
}
}
+
diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/metadata.desktop b/usr/share/sddm/themes/Melawy-Nier-A2/metadata.desktop
index 007ff8c..8440950 100644
--- a/usr/share/sddm/themes/Melawy-Nier-A2/metadata.desktop
+++ b/usr/share/sddm/themes/Melawy-Nier-A2/metadata.desktop
@@ -1,6 +1,6 @@
[SddmGreeterTheme]
Name=Melawy: Nier A2
-Description=Fork from Premium Sugar for SDDM by Marian Arlt
+Description=Fork for KDE Plasma 6 from Premium Sugar for SDDM by Marian Arlt
Author=Valeria Fadeeva
Copyright=Copyright (C) 2023 Valeria Fadeeva
License=AGPLv3
@@ -14,3 +14,4 @@ TranslationsDirectory=translations
Email=valeria@fadeeva.me
Theme-Id=Melawy-Nier-A2
Theme-API=2.11
+QtVersion=6
diff --git a/usr/share/sddm/themes/Melawy-Nier-A2/theme.conf b/usr/share/sddm/themes/Melawy-Nier-A2/theme.conf
index 37dd3b0..b584e53 100644
--- a/usr/share/sddm/themes/Melawy-Nier-A2/theme.conf
+++ b/usr/share/sddm/themes/Melawy-Nier-A2/theme.conf
@@ -13,8 +13,6 @@ ScreenWidth="1920"
ScreenHeight="1080"
## Adjust to your resolution to help SDDM speed up on calculations
-
-
## [Blur Settings]
FullBlur="false"
@@ -24,8 +22,6 @@ PartialBlur="true"
BlurRadius="100"
## 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.
-
-
## [Design Customizations]
HaveFormBackground="false"
@@ -50,7 +46,7 @@ AccentColor=#E03D3D
BackgroundColor=#EEEEEE
## Used for the user and session selection background as well as for ScreenPadding and FormBackground when either is true. If PartialBlur and FormBackground are both enabled this color will blend with the blur effect.
-OverrideLoginButtonTextColor=
+OverrideLoginButtonTextColor=""
## The text of the login button may become difficult to read depending on your color choices. Use this option to set it independently for legibility.
InterfaceShadowSize="6"
@@ -71,8 +67,6 @@ Font="Noto Sans"
FontSize=""
## Only set a fixed value if fonts are way too small for your resolution. Preferrably kept empty.
-
-
## [Interface Behavior]
ForceRightToLeft="false"
@@ -99,8 +93,6 @@ AllowEmptyPassword="false"
AllowBadUsernames="false"
## Do not change this! Uppercase letters are generally not allowed in usernames. This option is only for systems that differ from this standard! Also shows username as is instead of capitalized.
-
-
## [Locale Settings]
Locale=""
@@ -112,14 +104,12 @@ HourFormat="HH:mm"
DateFormat="dddd, d MMMM"
## Defaults to Locale.LongFormat - Accepts "short" or a custom string like "dddd, d 'of' MMMM". See http://doc.qt.io/qt-5/qml-qtqml-date.html
-
-
## [Translations]
HeaderText="Welcome!"
## Header can be empty to not display any greeting at all. Keep it short.
-## SDDM may lack proper translation for every element. Suger defaults to SDDM translations. Please help translate SDDM as much as possible for your language: https://github.com/sddm/sddm/wiki/Localization. These are in order as they appear on screen.
+## SDDM may lack proper translation for every element. Please help translate SDDM as much as possible for your language: https://github.com/sddm/sddm/wiki/Localization. These are in order as they appear on screen.
TranslatePlaceholderUsername=""
TranslatePlaceholderPassword=""