From c0909869f3fe4c3684c167c74a7b34ca47c950e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=ADaz=20Urbaneja=20V=C3=ADctor=20Diego=20Alejandro=20?= =?UTF-8?q?=28Sodomon=29?= Date: Fri, 8 Mar 2024 22:58:41 -0400 Subject: [PATCH 1/3] changed *.svgz for *.svg --- Assets/Hibernate.svg | 35 ++++++++++++++++++++++++++++ Assets/Hibernate.svgz | Bin 717 -> 0 bytes Assets/Reboot.svg | 36 +++++++++++++++++++++++++++++ Assets/Reboot.svgz | Bin 770 -> 0 bytes Assets/Shutdown.svg | 31 +++++++++++++++++++++++++ Assets/Shutdown.svgz | Bin 729 -> 0 bytes Assets/Suspend.svg | 31 +++++++++++++++++++++++++ Assets/Suspend.svgz | Bin 620 -> 0 bytes Assets/User.svg | 52 ++++++++++++++++++++++++++++++++++++++++++ Assets/User.svgz | Bin 862 -> 0 bytes 10 files changed, 185 insertions(+) create mode 100644 Assets/Hibernate.svg delete mode 100644 Assets/Hibernate.svgz create mode 100644 Assets/Reboot.svg delete mode 100644 Assets/Reboot.svgz create mode 100644 Assets/Shutdown.svg delete mode 100644 Assets/Shutdown.svgz create mode 100644 Assets/Suspend.svg delete mode 100644 Assets/Suspend.svgz create mode 100644 Assets/User.svg delete mode 100644 Assets/User.svgz diff --git a/Assets/Hibernate.svg b/Assets/Hibernate.svg new file mode 100644 index 0000000..b877ee6 --- /dev/null +++ b/Assets/Hibernate.svg @@ -0,0 +1,35 @@ + + + + + + + image/svg+xml + + + + + + + + diff --git a/Assets/Hibernate.svgz b/Assets/Hibernate.svgz deleted file mode 100644 index c6aab4d04fc2af6b1aeabfe1963e67d9fb0cc408..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 717 zcmV;;0y6y{iwFP!000000G(7@Z`&Xge($e9^l|kCNMgrLQf-|o?O`vwXj0#(jT2TI zB21d5zrF_?-_%aiW+TjZ&UbFW@#^NeuF#V(jnrz5Nf=`!RIUrDwrl+J$6b(O)L5_;}NcS4Ezc+SJ@`WX-q2 z75D+RU=?#3sXt>WV23I@Mg!2;ipLqC)H)y2%E*7 zY)ER)rLuuGg)mvGL^U^$aPg2!AGf8$#rTRyaz)TBN<*?>v)K#)x#|EcNdgm{hbddk z=Zk^Hn6rer*Ezu0hzkI$VeZ`xT++t9M>UFld{EJJMiU5z7zLAr%oCcX4mdCLs%MP2 zjQT7n>iG^#xXya)Z(w>`ith2yC+=FLjC74O+>%~N7Sqi`#AQ!dxJVatNgZ@!f)mGp zRN{~kmc;2uP2D!S`F5lR=*Ad(AMQI?4&KN)j~CQtMA1hyhu8g1Agrr%B5@I?9P%Cq zgf9sHp-cX&B?#>OjHdJCO>aCLtbNlOz8n6%HTp#SF|OP{YIE@l + + + + + + image/svg+xml + + + + + + + + + diff --git a/Assets/Reboot.svgz b/Assets/Reboot.svgz deleted file mode 100644 index 1958f78d8f35b7873c1f66afbc073b238660f91a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 770 zcmV+d1O5CTiwFP!000000EJb{a+@#|-RCPbWYbIy=)pq}+nIJcnRd}lpEKF1AZ!|t zJVNo~?|TKt*iG8N!n#LCSN9xU;rZRZZO~SluGVVdkpO#0szR5wS}nZq-|l_xq0S0b zibgBB@RauMmRIv`yShRM!D7|rWwG$q)^74J+&q~k&}J2uMJOBDN@cr{1SIq(dNI)p zBZaNEve0d-RoAan-SrvSl+}s7+wFoK>q#WbvJlgdQXd$8cTiUB{mZ3L<4a2^#yEtz ziTNsPSC@9Z@L1GGYgw<>_7rYwxqGko3lAfVScFD+@|5&IT`oLG$h{>*^HNrwLkHYN z)I(uE)k-T$VZ}5(B5}VKD4;q2^5K4nATEmhr#6qr5FSSmzw{H7=`Bz2ye#rcn^xFm z-HMfT0^foK^KhEDAlt)6PDzKfMt1ti6!OJ0FN?Nzi^8wAZkkVSlcTJ&q_u72vfpzU zjw-^VjHAf#OyxWrJ?Nv= zdS{J(lml-V`+Ym*42mHsno+;IcGL4L^A_Vx{QT!WeP5 z*vz52syb zN0>odL`W{hIy5+p## zA~-WQA~?llSPPfUS(v3s(r5iQ@1?pQ5a^-M1sq2y;4vX7;r#y__FY3+#Q1AFMq_41 z1D<3ga=x(Ms@OS1+{n2Hs*@zb3H{rv=T=SS(jbnajDqVArxSYK`Z!2kv!^MU`NNn+ zB%7VVXQ + + + + + + image/svg+xml + + + + + + + diff --git a/Assets/Shutdown.svgz b/Assets/Shutdown.svgz deleted file mode 100644 index 484567517439d5790b2aca3f4687b2ccbba4dcd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 729 zcmV;~0w(<*iwFP!000000EJZBZlf>|eeYLT^l=sN6>OTM(sos8rS8jKw9j5}61IRN z<1|gbe#eHCM5?q1VV^T+#xrK@<^5~dq8HqXz;qP zb!&UGN_v~zuWy#a%k~B#1kU|X*3~N6dA~2SY=3ZVYTY)gtIV{fGrb=&l9DW$<<%^& zoYB5{F_rB)+YiyRA8s$iuHL+>kH=$rWKl$vQW>Thr3+9jhEwnL>*CrKa{S1ZVvIAe z&C36(ntGMMTt;xQS!5&{bNp;yR|!TKF%EB}cc$6y{3@B?v8nwoqBX!}Z8k%o$KV0c z1ZC0G8Lw;Y^=v*fBKm>^YA(Njc^nbosw#h5_dG#(f`{A3m{TddT%DM>J_|~lBn&b3b zMK+Z&6`5UBxy;Uc5Yb-y-Ml>kNlKHE0pc4X91-*s2Np&#j}wjF5XjVs)o7-89w$1= z6k;inLhxLn2gFlSU@BRGM5+odrCad0 z5f+T_eYmg!g!c-^2#lsm3B|_PEQc(pN+p$fp2r*{=1PKNOjB{eLiPZ8%DBq0;$az; zQi&y}s7OK1b4C#(sgg1$G(;|>q@jE1dC`yw1&4xM%tkYOAE20mh=NKPwU_EK0!=ZY zIOl4LE-8nM3ZeuTMaV)BOnDBw3wa76a>)4UYOmkW^iKzWYN6rmURTgwCAotu!&|p7 zn+;6L9G+UutG3+rm*%F&2A?VjO!K_UHkZkFMQu5bPU L!+{w#rv(52g%xA3 diff --git a/Assets/Suspend.svg b/Assets/Suspend.svg new file mode 100644 index 0000000..ecd2961 --- /dev/null +++ b/Assets/Suspend.svg @@ -0,0 +1,31 @@ + + + + + + + image/svg+xml + + + + + + + diff --git a/Assets/Suspend.svgz b/Assets/Suspend.svgz deleted file mode 100644 index dd230f776100afbfb89c64e4e99e63fd6191ba8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 620 zcmV-y0+an8iwFP!000000EJUckDD+Mz3;EEyvK$Zn`A>+$VzRsQV+fKQ|iqH6Wj$G z*-oItpW@Rt2WZ7$c!dT}ibs@b_=eQHqguTvfc) zN)%XW{It8v?QwsH5CXBXSydLeajwq@=?|t|YO^O*Nkl6;p`0ajNeQ0lV)GJ zcYF$uo^{Xy1!m5^e0&}d;IhnqYV&e|@OT3Mtq)Ki@2>8=DzjRfj=P=g_+Iz{-@z5+ zWD4An-MJT2(jl!8Rv%0$-hAg(*-0-VU!82*Prk@ytXWd&TCoc?2XmZ)T*kNzNoG^# zWW0lbdhVJ*W!<@jR&>uxD4fwpSSF`UB-ED#OA@by z^BVIYNoHICpoa6BZsO9R?l07#IMjy_OIK_I#ZbaPvZ3n@OH&Vg7Ph!DX555@E*QG< zJ-Fd|^*rCi3|ba?h*pa&IwHzYgDCoe=+N3`5&!GO(?{iZC{1Ws&)k0rySu-&n(QDB G1pojq +image/svg+xml \ No newline at end of file diff --git a/Assets/User.svgz b/Assets/User.svgz deleted file mode 100644 index e8bbdbf1e188c991ccccf52eb00eaf2b7326ba6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 862 zcmV-k1EKsMiwFP!000000F6}JuA?>-eV?zen3q-!#x|D_6f#ohXw*LRrJc4?-+aI! z?f^!%6LQYicbjX@3?mf@Vb)sv>TMrC+?yKRgf>#OxkoYakZ224%C^eAKR~-b9_ju>-sjrsIV$ z!Hf^~7a^;Q%{`V5zr8H&W%-k3?m@nk&7rcvMecQ47@=>Yi<=bv&+49g1QEniG#S4D z(A`JNb@?zBbO7d>vQiZ;$=thwYYbsu#~h|?v&E9&1H%llh{SP}><}X~^-1Vc>Ya{@ zJLju(sW~SIb-aR!sFlvW_vhj9M&eoNQs|jVhUX2Xpk!&G8al!1`Cn03t7@Tn>$*Y7 z#8evEw}oG2DYl5EIG5fMXp=P;UaB6p=4-N-EfD^+b2N&+F`pFkR;N)oD`0<@KBW_A zE~stJZKe`89tLdOkNO zI2{{ddC4tbdp;vHg^7i`Cj0&A)9F|g+22Zk8D;Kq41ZQv=pE?FB7@tY;r1jOmWqZl715gE(~qR}27+?TMCb_=I35ZT2E zIB@8I%*-ol97iD_4P#8>9gAZ?SPJpnB8>OwhCuKOib#t7LJs)o*0To29H*n*kUf0= oc_?e0G1azk_bBbdwB5M9YT*XibvUS|7v|#hANmt&k%I>S03TkfmjD0& From 0e721d2cf797399c272ef2ac2f9b1a1433ac44b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=ADaz=20Urbaneja=20V=C3=ADctor=20Diego=20Alejandro=20?= =?UTF-8?q?=28Sodomon=29?= Date: Fri, 8 Mar 2024 22:59:20 -0400 Subject: [PATCH 2/3] Backgrounds/background.png => background.png --- Backgrounds/background.png => background.png | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename Backgrounds/background.png => background.png (100%) diff --git a/Backgrounds/background.png b/background.png similarity index 100% rename from Backgrounds/background.png rename to background.png From d845917d4dffd89b4feef8989fc6f83947e25e73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=ADaz=20Urbaneja=20V=C3=ADctor=20Diego=20Alejandro=20?= =?UTF-8?q?=28Sodomon=29?= Date: Fri, 8 Mar 2024 23:01:35 -0400 Subject: [PATCH 3/3] Port to Qt6/Plasma 6 --- Components/Clock.qml | 4 ++-- Components/Input.qml | 10 +++++----- Components/LoginForm.qml | 4 ++-- Components/SessionButton.qml | 6 +++--- Components/SystemButtons.qml | 8 ++++---- Components/UserList.qml | 8 ++++---- Components/VirtualKeyboard.qml | 2 +- Main.qml | 8 ++++---- metadata.desktop | 5 ++++- theme.conf | 2 +- 10 files changed, 30 insertions(+), 27 deletions(-) mode change 100644 => 100755 Main.qml mode change 100644 => 100755 metadata.desktop mode change 100644 => 100755 theme.conf diff --git a/Components/Clock.qml b/Components/Clock.qml index 45b240e..1aa7265 100644 --- a/Components/Clock.qml +++ b/Components/Clock.qml @@ -4,8 +4,8 @@ // Config created by https://github.com/MarianArlt // Config modified by keyitdev https://github.com/keyitdev -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick 2.15 +import QtQuick.Controls 2.15 Column { id: clock diff --git a/Components/Input.qml b/Components/Input.qml index 4d92eb6..86d9dbb 100644 --- a/Components/Input.qml +++ b/Components/Input.qml @@ -4,10 +4,10 @@ // Config created by https://github.com/MarianArlt // Config modified by keyitdev https://github.com/keyitdev -import QtQuick 2.11 -import QtQuick.Layouts 1.11 -import QtQuick.Controls 2.4 -import QtGraphicalEffects 1.0 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 +import Qt5Compat.GraphicalEffects Column { id: inputContainer @@ -78,7 +78,7 @@ Column { icon.width: parent.height * 0.25 enabled: false icon.color: root.palette.text - icon.source: Qt.resolvedUrl("../Assets/User.svgz") + icon.source: Qt.resolvedUrl("../Assets/User.svg") } background: Rectangle { diff --git a/Components/LoginForm.qml b/Components/LoginForm.qml index a078952..4a7d66a 100644 --- a/Components/LoginForm.qml +++ b/Components/LoginForm.qml @@ -4,8 +4,8 @@ // Config created by https://github.com/MarianArlt // Config modified by keyitdev https://github.com/keyitdev -import QtQuick 2.11 -import QtQuick.Layouts 1.11 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import SddmComponents 2.0 as SDDM ColumnLayout { diff --git a/Components/SessionButton.qml b/Components/SessionButton.qml index 21cced4..1c9d0ee 100644 --- a/Components/SessionButton.qml +++ b/Components/SessionButton.qml @@ -4,9 +4,9 @@ // Config created by https://github.com/MarianArlt // Config modified by keyitdev https://github.com/keyitdev -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtGraphicalEffects 1.0 +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import Qt5Compat.GraphicalEffects Item { id: sessionButton diff --git a/Components/SystemButtons.qml b/Components/SystemButtons.qml index a0404a4..9f2dedc 100644 --- a/Components/SystemButtons.qml +++ b/Components/SystemButtons.qml @@ -4,9 +4,9 @@ // Config created by https://github.com/MarianArlt // Config modified by keyitdev https://github.com/keyitdev -import QtQuick 2.11 -import QtQuick.Layouts 1.11 -import QtQuick.Controls 2.4 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 RowLayout { @@ -28,7 +28,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 diff --git a/Components/UserList.qml b/Components/UserList.qml index a0e69da..29ff78c 100644 --- a/Components/UserList.qml +++ b/Components/UserList.qml @@ -4,9 +4,9 @@ // Config created by https://github.com/MarianArlt // Config modified by keyitdev https://github.com/keyitdev -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtGraphicalEffects 1.0 +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import Qt5Compat.GraphicalEffects Item { id: usernameField @@ -63,7 +63,7 @@ Item { icon.width: parent.height * 0.25 enabled: false icon.color: root.palette.text - icon.source: Qt.resolvedUrl("../Assets/User.svgz") + icon.source: Qt.resolvedUrl("../Assets/User.svg") } background: Rectangle { diff --git a/Components/VirtualKeyboard.qml b/Components/VirtualKeyboard.qml index da09faf..ce83f55 100644 --- a/Components/VirtualKeyboard.qml +++ b/Components/VirtualKeyboard.qml @@ -4,7 +4,7 @@ // Config created by https://github.com/MarianArlt // Config modified by keyitdev https://github.com/keyitdev -import QtQuick 2.11 +import QtQuick 2.15 import QtQuick.VirtualKeyboard 2.3 InputPanel { diff --git a/Main.qml b/Main.qml old mode 100644 new mode 100755 index c14eea5..2faf78c --- a/Main.qml +++ b/Main.qml @@ -4,10 +4,10 @@ // Config created by https://github.com/MarianArlt // Config modified by keyitdev https://github.com/keyitdev -import QtQuick 2.11 -import QtQuick.Layouts 1.11 -import QtQuick.Controls 2.4 -import QtGraphicalEffects 1.0 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 +import Qt5Compat.GraphicalEffects import "Components" Pane { diff --git a/metadata.desktop b/metadata.desktop old mode 100644 new mode 100755 index 0b9e7a5..ee5c013 --- a/metadata.desktop +++ b/metadata.desktop @@ -5,8 +5,11 @@ Author=keyitdev License=GPL-3.0-or-later Type=sddm-theme Version=1.0 +Website=https://github.com/Keyitdev/sddm-astronaut-theme Screenshot=Previews/preview.png MainScript=Main.qml ConfigFile=theme.conf TranslationsDirectory=translations -Theme-Id=sddm-astronaut-theme \ No newline at end of file +Theme-Id=sddm-astronaut-theme +Theme-API=2.0 +QtVersion=6 diff --git a/theme.conf b/theme.conf old mode 100644 new mode 100755 index 6f09033..47bda59 --- a/theme.conf +++ b/theme.conf @@ -1,6 +1,6 @@ [General] -Background="Backgrounds/background.png" +Background="background.png" ## Path relative to the theme root directory. Most standard image file formats are allowed including support for transparency. (e.g. background.jpeg/illustration.GIF/Foto.png/undraw.svgz) DimBackgroundImage="0.0"