diff --git a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Hibernate.svg b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Hibernate.svg new file mode 100644 index 0000000..dc49869 --- /dev/null +++ b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Hibernate.svg @@ -0,0 +1,73 @@ + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Hibernate.svgz b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Hibernate.svgz deleted file mode 100644 index c6aab4d..0000000 Binary files a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Hibernate.svgz and /dev/null differ diff --git a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Reboot.svg b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Reboot.svg new file mode 100644 index 0000000..a38ec06 --- /dev/null +++ b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Reboot.svg @@ -0,0 +1,66 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Reboot.svgz b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Reboot.svgz deleted file mode 100644 index 1958f78..0000000 Binary files a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Reboot.svgz and /dev/null differ diff --git a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Shutdown.svg b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Shutdown.svg new file mode 100644 index 0000000..98264be --- /dev/null +++ b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Shutdown.svg @@ -0,0 +1,66 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Shutdown.svgz b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Shutdown.svgz deleted file mode 100644 index 4845675..0000000 Binary files a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Shutdown.svgz and /dev/null differ diff --git a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Suspend.svg b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Suspend.svg new file mode 100644 index 0000000..e707e80 --- /dev/null +++ b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Suspend.svg @@ -0,0 +1,66 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Suspend.svgz b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Suspend.svgz deleted file mode 100644 index dd230f7..0000000 Binary files a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/Suspend.svgz and /dev/null differ diff --git a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/User.svg b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/User.svg new file mode 100644 index 0000000..b65116f --- /dev/null +++ b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/User.svg @@ -0,0 +1,58 @@ + +image/svg+xml diff --git a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/User.svgz b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/User.svgz deleted file mode 100644 index e8bbdbf..0000000 Binary files a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Assets/User.svgz and /dev/null differ diff --git a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/Clock.qml b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/Clock.qml index 3ebe6ce..6b1e6b5 100644 --- a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/Clock.qml +++ b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/Clock.qml @@ -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/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/Input.qml b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/Input.qml index 7ed433a..2f4170d 100644 --- a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/Input.qml +++ b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/Input.qml @@ -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/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/LoginForm.qml b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/LoginForm.qml index f1b410b..38208ae 100644 --- a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/LoginForm.qml +++ b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/LoginForm.qml @@ -61,3 +61,4 @@ ColumnLayout { } } + diff --git a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/SessionButton.qml b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/SessionButton.qml index 3c70397..7f06db8 100644 --- a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/SessionButton.qml +++ b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/SessionButton.qml @@ -192,3 +192,4 @@ Item { } } + diff --git a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/SystemButtons.qml b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/SystemButtons.qml index fa1f902..6bc5da4 100644 --- a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/SystemButtons.qml +++ b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/SystemButtons.qml @@ -30,10 +30,10 @@ 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/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/UserList.qml b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/UserList.qml index 30db91f..3ea47af 100644 --- a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/UserList.qml +++ b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Components/UserList.qml @@ -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/melawy-kde-theme/usr/share/sddm/themes/Melawy/Main.qml b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Main.qml index 369b4be..084d765 100644 --- a/melawy-kde-theme/usr/share/sddm/themes/Melawy/Main.qml +++ b/melawy-kde-theme/usr/share/sddm/themes/Melawy/Main.qml @@ -22,10 +22,11 @@ // along with SDDM Sugar Candy. If not, see // -import QtQuick -import QtQuick.Layouts -import QtQuick.Controls 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/melawy-kde-theme/usr/share/sddm/themes/Melawy/metadata.desktop b/melawy-kde-theme/usr/share/sddm/themes/Melawy/metadata.desktop index 75f79ed..db96eab 100644 --- a/melawy-kde-theme/usr/share/sddm/themes/Melawy/metadata.desktop +++ b/melawy-kde-theme/usr/share/sddm/themes/Melawy/metadata.desktop @@ -14,3 +14,4 @@ TranslationsDirectory=translations Email=valeria@fadeeva.me Theme-Id=Melawy Theme-API=2.11 +QtVersion=6 diff --git a/melawy-kde-theme/usr/share/sddm/themes/Melawy/theme.conf b/melawy-kde-theme/usr/share/sddm/themes/Melawy/theme.conf index 37dd3b0..0d26a7d 100644 --- a/melawy-kde-theme/usr/share/sddm/themes/Melawy/theme.conf +++ b/melawy-kde-theme/usr/share/sddm/themes/Melawy/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" @@ -40,7 +36,7 @@ BackgroundImageHAlignment="center" BackgroundImageVAlignment="center" ## As before but for the vertical position of the background picture relative to its visible area. -MainColor=#A03d40 +MainColor=#FF3d40 ## Used for all elements when not focused/hovered etc. Usually the best effect is achieved by having this be either white or a very dark grey like #444 (not black for smoother antialias) ## Colors can be HEX or Qt names (e.g. red/salmon/blanchedalmond). See https://doc.qt.io/qt-5/qml-color.html @@ -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" @@ -68,11 +64,9 @@ ScreenPadding="0" Font="Noto Sans" ## If you want to choose a custom font it will have to be available to the X root user. See https://wiki.archlinux.org/index.php/fonts#Manual_installation -FontSize="" +FontSize="11" ## 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=""