This commit is contained in:
Valeria Fadeeva 2025-02-02 18:25:49 +05:00
parent 03e3c03d87
commit 634bade0e3
20 changed files with 402 additions and 76 deletions

View File

@ -0,0 +1,73 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
viewBox="0 0 32 32"
version="1.1"
id="svg5"
sodipodi:docname="Hibernate.svg"
inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<metadata
id="metadata9">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#d9d9d9"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1008"
id="namedview7"
showgrid="false"
inkscape:zoom="15.198362"
inkscape:cx="8.7180447"
inkscape:cy="11.317009"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg5"
inkscape:pagecheckerboard="0"
inkscape:showpageshadow="2"
inkscape:deskcolor="#d1d1d1">
<inkscape:grid
type="xygrid"
id="grid1029"
originx="0"
originy="0"
spacingy="1"
spacingx="1"
units="px" />
</sodipodi:namedview>
<defs
id="defs3051">
<style
type="text/css"
id="current-color-scheme">
.ColorScheme-Text {
color:#eff0f1;
}
</style>
</defs>
<path
id="path891-3"
class="ColorScheme-Text"
d="m 9.789062,5.2443752 -0.867187,0.5 2.146484,3.716797 -3.615234,-0.96875 -0.257813,0.966796 4.580079,1.2265628 3.068359,5.316406 H 8.707031 L 5.353516,12.648672 4.646484,13.355703 7.292969,16.002187 H 3 v 1 h 4.292969 l -2.646485,2.646485 0.707032,0.707031 3.353515,-3.353516 h 6.136719 l -3.068359,5.316406 -4.580079,1.226563 0.257813,0.966797 3.615234,-0.96875 -2.146484,3.716797 0.867187,0.5 2.146485,-3.716797 0.96875,3.615234 0.964844,-0.259765 L 12.642578,22.818593 16,17.002187 l 3.357422,5.816406 -1.226563,4.580079 0.964844,0.259765 0.96875,-3.615234 2.146485,3.716797 0.867187,-0.5 -2.146484,-3.716797 3.615234,0.96875 0.257813,-0.966797 -4.580079,-1.226563 -3.068359,-5.316406 h 6.136719 l 3.353515,3.353516 0.707032,-0.707031 -2.646485,-2.646485 H 29 v -1 h -4.292969 l 2.007813,-2.001953 h -1.427735 l -1.99414,2.001953 H 17.15625 L 18.31,14.000234 h -1.16 l -1.15,2 -3.357422,-5.814453 1.226563,-4.5800778 -0.964844,-0.259766 -0.96875,3.615235 z m 15.544275,1.2869405 h 1.666666 V 7.3750876 H 23.66667 L 25.333337,4.8437719 H 23.666673 V 4 H 27 Z m -1.989669,5.6249123 h 1.666665 V 13 H 21.677 l 1.666668,-2.531315 H 21.677003 V 9.624913 h 3.333326 z m -4.677,-3.3748539 h 1.666665 V 9.625146 H 17 L 18.666668,7.0938303 H 17.000003 V 6.2500584 h 3.333327 z"
style="color:#31363b;fill:#000000;fill-opacity:1;stroke:none" />
</svg>

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
viewBox="0 0 32 32"
version="1.1"
id="svg6"
sodipodi:docname="Reboot.svg"
inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<metadata
id="metadata10">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#d9d9d9"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1008"
id="namedview8"
showgrid="false"
inkscape:zoom="21.81796"
inkscape:cx="28.89821"
inkscape:cy="16.316833"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg6"
inkscape:pagecheckerboard="0"
inkscape:showpageshadow="2"
inkscape:deskcolor="#d1d1d1" />
<defs
id="defs3051">
<style
type="text/css"
id="current-color-scheme">
.ColorScheme-Text {
color:#eff0f1;
}
</style>
</defs>
<path
style="color:#eff0f1;fill:#000000;fill-opacity:1;stroke:none"
d="M 16,4 C 13.859179,4.00462 11.57247,4.7214382 9.7299152,5.8114506 L 15.292969,11.050781 16.418727,9.9211172 12.228626,6.0755756 C 13.616515,5.4633843 14.715725,5.3117847 16.09305,5.3534748 22.400808,5.5395756 26.6,9.9248678 26.6,16 c -0.0045,1.874364 -0.441076,3.390811 -1.357475,5.025886 l 1.0856,1.054192 C 27.417466,20.238665 27.994687,18.139495 28,16 28,9.372583 22.627417,4 16,4 Z M 5.5788246,10.381268 C 4.4888122,12.223823 4.0046166,13.859179 4,16 c 0,6.627417 5.372583,12 12,12 2.140821,-0.0046 4.241429,-0.581863 6.083984,-1.671875 l -5.376953,-5.378906 -1.079233,1.160256 3.952525,3.904547 C 18.192119,26.62782 17.517835,26.694203 16,26.7 9.9248678,26.7 5.5,22.075132 5.5,16 5.50451,14.125636 5.748025,13.167492 6.6644244,11.532417 Z"
class="ColorScheme-Text"
id="path4"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccccccccccc" />
</svg>

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
viewBox="0 0 32 32"
version="1.1"
id="svg6"
sodipodi:docname="Shutdown.svg"
inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<metadata
id="metadata10">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#d9d9d9"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1008"
id="namedview8"
showgrid="false"
inkscape:zoom="21.493729"
inkscape:cx="10.863634"
inkscape:cy="14.981114"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg6"
inkscape:pagecheckerboard="0"
inkscape:showpageshadow="2"
inkscape:deskcolor="#d1d1d1" />
<defs
id="defs3051">
<style
type="text/css"
id="current-color-scheme">
.ColorScheme-Text {
color:#eff0f1;
}
</style>
</defs>
<path
style="color:#eff0f1;fill:#000000;fill-opacity:1;stroke:none"
d="M 15,4 V 4.05078 5.054686 13 h 2 V 5.050781 4.046875 4 h -1 z m 3,0.169922 V 5.591 C 22.963705,6.7205624 26.484078,10.773948 26.6,16 26.19486,22.190886 21.612593,26.732154 16,26.6 10.240993,26.464399 5.7057812,22.075132 5.4,16 5.6847547,10.69852 9.124358,6.5529048 14,5.589 V 4.181641 C 8.2314026,5.1567079 4.0067289,10.149579 4,16 4,22.627417 9.372583,28 16,28 22.627417,28 28,22.627417 28,16 27.998984,10.145149 23.772961,5.1457305 18,4.169922 Z"
class="ColorScheme-Text"
id="path4"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccsccccscc" />
</svg>

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
viewBox="0 0 32 32"
version="1.1"
id="svg5"
sodipodi:docname="Suspend.svg"
inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<metadata
id="metadata9">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#d9d9d9"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1008"
id="namedview7"
showgrid="false"
inkscape:zoom="15.198362"
inkscape:cx="8.7180447"
inkscape:cy="11.317009"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg5"
inkscape:pagecheckerboard="0"
inkscape:showpageshadow="2"
inkscape:deskcolor="#d1d1d1" />
<defs
id="defs3051">
<style
type="text/css"
id="current-color-scheme">
.ColorScheme-Text {
color:#eff0f1;
}
</style>
</defs>
<path
style="color:#eff0f1;fill:#000000;fill-opacity:1;stroke:none"
id="path902-3"
d="M 10.216059,3.999996 C 6.36165,6.3471 4.006562,10.53215 4,15.04594 4,22.20027 9.798203,28 16.95064,28 21.46591,27.996 25.652707,25.6384 27.999999,21.78019 L 27.209551,20.98954 C 25.405202,22.04058 23.356021,22.39641 21.268,22.402 14.890411,22.580816 10.086781,17.776831 9.596,10.72792 9.5993,8.6383 10.154052,6.58663 11.204,4.7801 Z M 9.309675,5.81744 C 8.662452,7.37405 8.125327,9.04207 8.117,10.72792 c 0,7.305313 5.998081,13.352636 13.150521,13.15408 1.70769,-0.004 3.397587,-0.54726 4.972421,-1.20784 L 25.622,22.81331 C 23.368941,25.41932 20.395053,26.61755 16.95064,26.62 10.877206,26.426811 5.8713374,21.447195 5.479,15.046 5.4837,11.59899 6.986748,8.32425 9.596,6.07256 Z m 14.857,1.99512 h 1.833332 V 8.75008 H 22.333341 L 24.166675,5.93752 H 22.333344 V 5 h 3.66666 z m -2.188636,6.24992 H 23.81137 V 15 h -3.666666 l 1.833335,-2.81258 h -1.833332 v -0.93753 h 3.666659 z m -5.1447,-4.00001 H 18.66667 V 11 H 15.000004 L 16.833339,8.18743 H 15.000007 V 7.2499 h 3.66666 z"
class="ColorScheme-Text"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccc" />
</svg>

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="28"
width="28"
id="svg12"
xml:space="preserve"
viewBox="0 0 28 28"
y="0px"
x="0px"
version="1.1"
sodipodi:docname="user.svgz"
inkscape:version="0.92.2 2405546, 2018-03-11"><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1440"
inkscape:window-height="843"
id="namedview8"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:zoom="3.2721019"
inkscape:cx="11.317087"
inkscape:cy="22.626613"
inkscape:window-x="0"
inkscape:window-y="22"
inkscape:window-maximized="1"
inkscape:current-layer="svg12" /><metadata
id="metadata18"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs16" /><g
id="g6"
transform="scale(0.06862745)"><g
id="g4"><path
id="path2"
d="M 204,204 C 260.1,204 306,158.1 306,102 306,45.9 260.1,0 204,0 147.9,0 102,45.9 102,102 c 0,56.1 45.9,102 102,102 z m 0,51 C 135.15,255 0,288.15 0,357 v 51 H 408 V 357 C 408,288.15 272.85,255 204,255 Z"
inkscape:connector-curvature="0" /></g></g></svg>

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@ -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
@ -45,7 +45,9 @@ Column {
color: root.palette.text color: root.palette.text
renderType: Text.QtRendering renderType: Text.QtRendering
function updateTime() { 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 anchors.horizontalCenter: parent.horizontalCenter
color: root.palette.text color: root.palette.text
renderType: Text.QtRendering renderType: Text.QtRendering
function updateTime() { function updateDate() {
text = new Date().toLocaleDateString(Qt.locale(config.Locale), config.DateFormat == "short" ? Locale.ShortFormat : config.DateFormat !== "" ? config.DateFormat : Locale.LongFormat) 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 repeat: true
running: true running: true
onTriggered: { onTriggered: {
dateLabel.updateTime() dateLabel.updateDate()
timeLabel.updateTime() timeLabel.updateTime()
} }
} }
Component.onCompleted: { Component.onCompleted: {
dateLabel.updateTime() dateLabel.updateDate()
timeLabel.updateTime() timeLabel.updateTime()
} }
} }

View File

@ -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 Qt5Compat.GraphicalEffects
Column { Column {
id: inputContainer id: inputContainer
@ -45,6 +45,7 @@ Column {
id: selectUser id: selectUser
displayText: ""
width: parent.height width: parent.height
height: parent.height height: parent.height
anchors.left: parent.left anchors.left: parent.left
@ -96,7 +97,8 @@ Column {
icon.width: parent.height * 0.25 icon.width: parent.height * 0.25
enabled: false enabled: false
icon.color: root.palette.text icon.color: root.palette.text
icon.source: Qt.resolvedUrl("../Assets/User.svgz") flat: true
icon.source: Qt.resolvedUrl("../Assets/User.svg")
} }
background: Rectangle { background: Rectangle {
@ -181,6 +183,7 @@ Column {
TextField { TextField {
id: username id: username
text: config.ForceLastUser == "true" ? selectUser.currentText : null text: config.ForceLastUser == "true" ? selectUser.currentText : null
font.pointSize: root.font.pointSize
font.capitalization: config.AllowBadUsernames == "false" ? Font.Capitalize : Font.MixedCase font.capitalization: config.AllowBadUsernames == "false" ? Font.Capitalize : Font.MixedCase
anchors.centerIn: parent anchors.centerIn: parent
height: root.font.pointSize * 3 height: root.font.pointSize * 3
@ -229,6 +232,7 @@ Column {
TextField { TextField {
id: password id: password
font.pointSize: root.font.pointSize
anchors.centerIn: parent anchors.centerIn: parent
height: root.font.pointSize * 3 height: root.font.pointSize * 3
width: parent.width width: parent.width
@ -238,7 +242,7 @@ Column {
placeholderText: config.TranslatePlaceholderPassword || textConstants.password placeholderText: config.TranslatePlaceholderPassword || textConstants.password
horizontalAlignment: TextInput.AlignHCenter horizontalAlignment: TextInput.AlignHCenter
passwordCharacter: "•" passwordCharacter: "•"
passwordMaskDelay: config.ForceHideCompletePassword == "true" ? undefined : 1000 passwordMaskDelay: config.ForceHideCompletePassword == "true" ? undefined : 500
renderType: Text.QtRendering renderType: Text.QtRendering
background: Rectangle { background: Rectangle {
color: "transparent" color: "transparent"

View File

@ -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 SddmComponents 2.0 as SDDM import SddmComponents as SDDM
ColumnLayout { ColumnLayout {
id: formContainer id: formContainer
@ -61,3 +61,4 @@ ColumnLayout {
} }
} }

View File

@ -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 Qt5Compat.GraphicalEffects
Item { Item {
id: sessionButton id: sessionButton
@ -192,3 +192,4 @@ Item {
} }
} }

View File

@ -22,18 +22,18 @@
// 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 {
spacing: root.font.pointSize spacing: root.font.pointSize
property var suspend: ["Suspend", config.TranslateSuspend || textConstants.suspend, sddm.canSuspend] readonly property var suspend: ["Suspend", config.TranslateSuspend || textConstants.suspend, sddm.canSuspend]
property var hibernate: ["Hibernate", config.TranslateHibernate || textConstants.hibernate, sddm.canHibernate] readonly property var hibernate: ["Hibernate", config.TranslateHibernate || textConstants.hibernate, sddm.canHibernate]
property var reboot: ["Reboot", config.TranslateReboot || textConstants.reboot, sddm.canReboot] readonly property var reboot: ["Reboot", config.TranslateReboot || textConstants.reboot, sddm.canReboot]
property var shutdown: ["Shutdown", config.TranslateShutdown || textConstants.shutdown, sddm.canPowerOff] readonly property var shutdown: ["Shutdown", config.TranslateShutdown || textConstants.shutdown, sddm.canPowerOff]
property Control exposedSession property Control exposedSession
@ -46,7 +46,7 @@ RowLayout {
text: modelData[1] text: modelData[1]
font.pointSize: root.font.pointSize * 0.8 font.pointSize: root.font.pointSize * 0.8
Layout.alignment: Qt.AlignHCenter 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.height: 2 * Math.round((root.font.pointSize * 3) / 2)
icon.width: 2 * Math.round((root.font.pointSize * 3) / 2) icon.width: 2 * Math.round((root.font.pointSize * 3) / 2)
display: AbstractButton.TextUnderIcon display: AbstractButton.TextUnderIcon
@ -116,9 +116,7 @@ RowLayout {
} }
} }
] ]
} }
} }
} }

View File

@ -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 Qt5Compat.GraphicalEffects
Item { Item {
id: usernameField id: usernameField
@ -81,7 +81,8 @@ Item {
icon.width: parent.height * 0.25 icon.width: parent.height * 0.25
enabled: false enabled: false
icon.color: root.palette.text icon.color: root.palette.text
icon.source: Qt.resolvedUrl("../Assets/User.svgz") flat: true
icon.source: Qt.resolvedUrl("../Assets/User.svg")
} }
background: Rectangle { background: Rectangle {
@ -159,7 +160,6 @@ Item {
} }
} }
] ]
} }
TextField { TextField {
@ -198,5 +198,5 @@ Item {
} }
] ]
} }
} }

View File

@ -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

View File

@ -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 Qt5Compat.GraphicalEffects
import QtQuick.Layouts 1.11 import QtQuick
import QtQuick.Controls 2.4 import QtQuick.Controls
import QtGraphicalEffects 1.0 import QtQuick.Layouts
import QtQuick.Window
import "Components" import "Components"
Pane { Pane {
@ -45,7 +46,8 @@ Pane {
palette.window: config.BackgroundColor palette.window: config.BackgroundColor
font.family: config.Font 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 focus: true
property bool leftleft: config.HaveFormBackground == "true" && property bool leftleft: config.HaveFormBackground == "true" &&
@ -97,9 +99,9 @@ Pane {
LoginForm { LoginForm {
id: form id: form
height: virtualKeyboard.state == "visible" ? parent.height - virtualKeyboard.implicitHeight : parent.height 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.horizontalCenter: config.FormPosition == "center" ? parent.horizontalCenter : undefined
anchors.left: config.FormPosition == "left" ? parent.left : undefined anchors.left: config.FormPosition == "left" ? parent.left : undefined
anchors.right: config.FormPosition == "right" ? parent.right : undefined anchors.right: config.FormPosition == "right" ? parent.right : undefined
@ -107,24 +109,24 @@ Pane {
z: 1 z: 1
} }
Button { // Button {
id: vkb // id: vkb
onClicked: virtualKeyboard.switchState() // onClicked: virtualKeyboard.switchState()
visible: virtualKeyboard.status == Loader.Ready && config.ForceHideVirtualKeyboardButton == "false" // visible: virtualKeyboard.status == Loader.Ready && config.ForceHideVirtualKeyboardButton == "false"
anchors.bottom: parent.bottom // anchors.bottom: parent.bottom
anchors.bottomMargin: implicitHeight // anchors.bottomMargin: implicitHeight
anchors.horizontalCenter: form.horizontalCenter // anchors.horizontalCenter: form.horizontalCenter
z: 1 // z: 1
contentItem: Text { // contentItem: Text {
text: config.TranslateVirtualKeyboardButton || "Virtual Keyboard" // text: config.TranslateVirtualKeyboardButton || "Virtual Keyboard"
color: parent.visualFocus ? palette.highlight : palette.text // color: parent.visualFocus ? palette.highlight : palette.text
font.pointSize: root.font.pointSize * 0.8 // font.pointSize: root.font.pointSize * 0.8
} // }
background: Rectangle { // background: Rectangle {
id: vkbbg // id: vkbbg
color: "transparent" // color: "transparent"
} // }
} // }
Loader { Loader {
id: virtualKeyboard id: virtualKeyboard
@ -272,3 +274,4 @@ Pane {
} }
} }
} }

View File

@ -1,6 +1,6 @@
[SddmGreeterTheme] [SddmGreeterTheme]
Name=Melawy: Fenek Name=Melawy: Fenek
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 Author=Valeria Fadeeva
Copyright=Copyright (C) 2023 Valeria Fadeeva Copyright=Copyright (C) 2023 Valeria Fadeeva
License=AGPLv3 License=AGPLv3
@ -14,3 +14,4 @@ TranslationsDirectory=translations
Email=valeria@fadeeva.me Email=valeria@fadeeva.me
Theme-Id=Melawy-Fenek Theme-Id=Melawy-Fenek
Theme-API=2.11 Theme-API=2.11
QtVersion=6

View File

@ -13,8 +13,6 @@ ScreenWidth="1920"
ScreenHeight="1080" ScreenHeight="1080"
## Adjust to your resolution to help SDDM speed up on calculations ## Adjust to your resolution to help SDDM speed up on calculations
## [Blur Settings] ## [Blur Settings]
FullBlur="false" FullBlur="false"
@ -24,8 +22,6 @@ PartialBlur="true"
BlurRadius="100" 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. ## 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] ## [Design Customizations]
HaveFormBackground="false" HaveFormBackground="false"
@ -50,7 +46,7 @@ AccentColor=#E03D3D
BackgroundColor=#EEEEEE 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. ## 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. ## 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" InterfaceShadowSize="6"
@ -71,8 +67,6 @@ Font="Noto Sans"
FontSize="" FontSize=""
## Only set a fixed value if fonts are way too small for your resolution. Preferrably kept empty. ## Only set a fixed value if fonts are way too small for your resolution. Preferrably kept empty.
## [Interface Behavior] ## [Interface Behavior]
ForceRightToLeft="false" ForceRightToLeft="false"
@ -99,8 +93,6 @@ AllowEmptyPassword="false"
AllowBadUsernames="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. ## 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 Settings]
Locale="" Locale=""
@ -112,14 +104,12 @@ HourFormat="HH:mm"
DateFormat="dddd, d MMMM" 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 ## 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] ## [Translations]
HeaderText="Welcome!" HeaderText="Welcome!"
## Header can be empty to not display any greeting at all. Keep it short. ## 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="" TranslatePlaceholderUsername=""
TranslatePlaceholderPassword="" TranslatePlaceholderPassword=""