From 7d7b4e7fec2c2a2c38e2076e02ae68514a44ee16 Mon Sep 17 00:00:00 2001 From: zhaokexin Date: Tue, 7 Mar 2023 19:14:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8svg=E5=9B=BE=E7=89=87=EF=BC=8C?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA=E6=9B=B4=E6=B8=85=E6=99=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- img/backspace.png | Bin 660 -> 0 bytes img/backspace.svg | 5 +++++ img/close.png | Bin 341 -> 0 bytes img/close.svg | 4 ++++ img/close_pressed.png | Bin 353 -> 0 bytes img/close_pressed.svg | 4 ++++ img/down.png | Bin 280 -> 0 bytes img/down.svg | 3 +++ img/enter.png | Bin 319 -> 0 bytes img/enter.svg | 4 ++++ img/left.png | Bin 296 -> 0 bytes img/left.svg | 3 +++ img/right.png | Bin 292 -> 0 bytes img/right.svg | 3 +++ img/up.png | Bin 258 -> 0 bytes img/up.svg | 3 +++ qml.qrc | 16 ++++++++-------- qml/ClassicKeyboardLayout.qml | 8 ++++---- qml/HideButton.qml | 4 ++-- qml/key/BackspaceKey.qml | 2 +- qml/key/EnterKey.qml | 2 +- 21 files changed, 45 insertions(+), 16 deletions(-) delete mode 100644 img/backspace.png create mode 100644 img/backspace.svg delete mode 100644 img/close.png create mode 100644 img/close.svg delete mode 100644 img/close_pressed.png create mode 100644 img/close_pressed.svg delete mode 100644 img/down.png create mode 100644 img/down.svg delete mode 100644 img/enter.png create mode 100644 img/enter.svg delete mode 100644 img/left.png create mode 100644 img/left.svg delete mode 100644 img/right.png create mode 100644 img/right.svg delete mode 100644 img/up.png create mode 100644 img/up.svg diff --git a/img/backspace.png b/img/backspace.png deleted file mode 100644 index 45367c5cdf0af82109093acd1234bff0e9597342..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 660 zcmV;F0&D$=P)fwXs-Ods8Xkh?kgXg(K{W z1i|%ZJKieLJ2c-#CjsOX5z_aAK|+&i;QZ^QJuL{lcxjFkjdLN^D-5o#Y=nl`KQO*h zm~z;S6$Y)f!S5TdrSYCe=<@Sq{>6U64*2~m`t$6$_mm=i9pguPZP;re;LD>+;r!Bm z$P0HgM#~uCqU4dYfi@IvDhq4E!)h7yUYjFM4khktg>jxl$hqUJ)525;3*-_Cu~DSL zA*3Fx@J?ju)$ zNROrk^5p(vkPwYzz>L4GT2v589Pxw5Q-QQT zJj&(7yH{Y@;l)bh>oXrg9l3<1kdqn_Escp)lEz=*xV$(k!40{@d`sd-l>+kkHnWzC zKXTaRg`1QXgtU#z3C)R&rIf1#HoZu?Xy+C`k@XNKx+C@vO(+*v#W>aLNeLAv-7V&6 zCw0lILjRR9Lheq_sHiRK(_G87XaMe$l6OBT=?e3iJ!zL0-R|KHLnSSHxE5*x*UwV& uAQRmV!<_tW_{(I>Z=Q4z+1xMl@#8;4PUD;a{wkFK0000 diff --git a/img/backspace.svg b/img/backspace.svg new file mode 100644 index 0000000..8cb0dd2 --- /dev/null +++ b/img/backspace.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/img/close.png b/img/close.png deleted file mode 100644 index 6610a4bb87df91de16a2fe1904d7045c8826ff58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{wq%x$B+uf-pOZqn+nOU*&Gv6e}eqRa k%~a=_ILYtS{o;R2={xRmdKI;Vst0LY+&x&QzG diff --git a/img/close.svg b/img/close.svg new file mode 100644 index 0000000..7cd0ed5 --- /dev/null +++ b/img/close.svg @@ -0,0 +1,4 @@ + + + + diff --git a/img/close_pressed.png b/img/close_pressed.png deleted file mode 100644 index cc96dcd2e508f80a6fbdeb5aabe9b7bcf8f38e29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{x?q-$B+uf-pPhSO$Gw4<|k7!Y@NKM(>H9H zEd9cF#>S5v)9xKnPH0^^Wtz-EAvfnI#zsmx4e_mK_su`6r?_fs*X6rLemrNVbWT3{ zYQnn>Vi6XLx{IgWUezP_TtmLOaKa=H-PXmLD0 wAn + + + diff --git a/img/down.png b/img/down.png deleted file mode 100644 index ec1225328ab612aa86789a5c4453bc0a8e2460bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#wVp1HAr*{oCpmI88;H25YgY7qVT%=g>E*v} zc2mh!X_My~SIqWnu=J*x=oxnl)TzC9A#z} z=3si$+DQ^N8VRaAHGu+?H+%>^ILYOij*S+F=bdsk?&U0uoDmkfGdvC)DlY0f$* + + diff --git a/img/enter.png b/img/enter.png deleted file mode 100644 index 249763e498257a2f9cd11cedebb028c5b5d40410..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#E1oWnAr*{or#SL883?%6Yad+ezQQ~qwIJO8 zk>DPtJ4a^Un9EyukoO5kUTWf7fmsQcCMe_{YMOpwX5zA~-)2p#>4Vmqf^aL2}lrqlG_o|z0*Yz%4+F!%8&_F|bEtgmG-eqhRH + + + diff --git a/img/left.png b/img/left.png deleted file mode 100644 index b341939bb2915dab7ed0d5616e2f8619b18e4929..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#y`CheZy|a+BsV^Hu~3Jm&aVHLYuECt&9_0gTe~DWM4fm_BNK diff --git a/img/left.svg b/img/left.svg new file mode 100644 index 0000000..67c9465 --- /dev/null +++ b/img/left.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/right.png b/img/right.png deleted file mode 100644 index 8b068d7c48ee0dbb9f0a1cad92048e6fb50dfe4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#ot`d^Ar*{!C;M_8G7xBuSNbAj*`%$x?$+e% zsnhNqka1>N&ACG$)2M!9zWB3`wFZd|_Q$WXE&p7iefhZXXVW;LDIbs6@UZI~FXVcm z`$0Qx&xAEX*QNR-cU9@^6#ZnJdF|F#{@k-DD*O+7^oJX-Coe6S=)j!Ly`^B<0VZ|Uu!`Ud%yB_` ko8>+%dmt=aGkp)^65pw6f2Eq#fu3OSboFyt=akR{02keB$p8QV diff --git a/img/right.svg b/img/right.svg new file mode 100644 index 0000000..e830f31 --- /dev/null +++ b/img/right.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/up.png b/img/up.png deleted file mode 100644 index 515d8171c10836725eb1a12dd40a46e721f952bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#>7Fi*Ar*{oCmZrLDDb#O`&h8M7o=R7{P@HR zL5ucI4bvGLB%%tQsOz-uW9MX*kbKEo#DA{LFsgBJ-{Y3j@6ivwY-C}*^Cakj*AxM{ z2VUFgTe~DWM4f?-pDE diff --git a/img/up.svg b/img/up.svg new file mode 100644 index 0000000..93f8d76 --- /dev/null +++ b/img/up.svg @@ -0,0 +1,3 @@ + + + diff --git a/qml.qrc b/qml.qrc index f01d21d..afeadc0 100644 --- a/qml.qrc +++ b/qml.qrc @@ -25,15 +25,7 @@ qml/key/SymbolKey.qml qml/key/TemporarySwitchKey.qml qml/key/WinKey.qml - img/close.png qml/js/utils.js - img/close_pressed.png - img/down.png - img/backspace.png - img/enter.png - img/left.png - img/right.png - img/up.png qml/key/BackspaceKey.qml qml/key/EnterKey.qml qml/PlacementModeButton.qml @@ -41,5 +33,13 @@ img/downfloat.svg qml/DragBar.qml img/space.svg + img/backspace.svg + img/close.svg + img/close_pressed.svg + img/enter.svg + img/left.svg + img/right.svg + img/up.svg + img/down.svg diff --git a/qml/ClassicKeyboardLayout.qml b/qml/ClassicKeyboardLayout.qml index e622862..d6bf5cd 100644 --- a/qml/ClassicKeyboardLayout.qml +++ b/qml/ClassicKeyboardLayout.qml @@ -78,7 +78,7 @@ Column { SymbolKey{ label: ","; shiftedText: "<" } SymbolKey{ label: "."; shiftedText: ">" } SymbolKey{ label: "/"; shiftedText: "?" } - ActionKey{ label: "up"; actionKeyImgPath: "qrc:/img/up.png" } + ActionKey{ label: "up"; actionKeyImgPath: "qrc:/img/up.svg" } ShiftKey{ width: virtualKeyboard.keyWidth*2 + virtualKeyboard.keySpacing; alignment: Text.AlignRight } } Row { @@ -92,9 +92,9 @@ Column { ChangeImKey{} SpaceKey{} AltKey{} - ActionKey{ label: "left"; actionKeyImgPath: "qrc:/img/left.png" } - ActionKey{ label: "down"; actionKeyImgPath: "qrc:/img/down.png" } - ActionKey{ label: "right"; actionKeyImgPath: "qrc:/img/right.png" } + ActionKey{ label: "left"; actionKeyImgPath: "qrc:/img/left.svg" } + ActionKey{ label: "down"; actionKeyImgPath: "qrc:/img/down.svg" } + ActionKey{ label: "right"; actionKeyImgPath: "qrc:/img/right.svg" } CtrlKey{} } } diff --git a/qml/HideButton.qml b/qml/HideButton.qml index 69d6f75..8802b22 100644 --- a/qml/HideButton.qml +++ b/qml/HideButton.qml @@ -12,14 +12,14 @@ Rectangle { id: hideButtonImg anchors.centerIn: parent sourceSize: Qt.size(parent.width, parent.width) - source: "qrc:/img/close.png" + source: "qrc:/img/close.svg" } MouseArea { anchors.fill: parent onPressed: { - hideButtonImg.source = "qrc:/img/close_pressed.png" + hideButtonImg.source = "qrc:/img/close_pressed.svg" } onReleased: { diff --git a/qml/key/BackspaceKey.qml b/qml/key/BackspaceKey.qml index 43c41c4..34d1b61 100644 --- a/qml/key/BackspaceKey.qml +++ b/qml/key/BackspaceKey.qml @@ -5,5 +5,5 @@ ActionKey { height: keyHeight * 3/4 alignment: Text.AlignRight label: "Backspace" - actionKeyImgPath: "qrc:/img/backspace.png" + actionKeyImgPath: "qrc:/img/backspace.svg" } diff --git a/qml/key/EnterKey.qml b/qml/key/EnterKey.qml index 135f409..2ded0f0 100644 --- a/qml/key/EnterKey.qml +++ b/qml/key/EnterKey.qml @@ -4,5 +4,5 @@ ActionKey { width: virtualKeyboard.keyWidth*2.5+virtualKeyboard.keySpacing*2 alignment: Text.AlignRight label: "Enter" - actionKeyImgPath: "qrc:/img/enter.png" + actionKeyImgPath: "qrc:/img/enter.svg" }