From 4e7313139d1aea2baf90fb5d55ff6106fc705eec Mon Sep 17 00:00:00 2001 From: swq Date: Fri, 27 Dec 2024 15:53:31 +0800 Subject: [PATCH] fix: add mouse and keyboard icon add mouse and keyboard icon Log: add mouse and keyboard icon pms: BUG-297221 pms: BUG-297227 pms: BUG-297229 --- src/plugin-commoninfo/qml/commonInfoMain.qml | 3 +-- src/plugin-keyboard/qml/Shortcuts.qml | 2 +- src/plugin-keyboard/qml/device_keyboard.dci | Bin 0 -> 1437 bytes src/plugin-keyboard/qml/keyboard.qml | 2 +- src/plugin-keyboard/qml/keyboardMain.qml | 2 +- src/plugin-keyboard/qml/keyboard_fn.dci | Bin 0 -> 717 bytes src/plugin-keyboard/qml/keyboard_input.dci | Bin 0 -> 1083 bytes src/plugin-keyboard/qml/keyboard_layout.dci | Bin 0 -> 793 bytes src/plugin-mouse/qml/device_mouse.dci | Bin 0 -> 2103 bytes src/plugin-mouse/qml/mouse.qml | 2 +- src/plugin-mouse/qml/mouseMain.qml | 4 ++-- src/plugin-mouse/qml/mouse_trackpad_mouse.dci | Bin 0 -> 1071 bytes src/plugin-mouse/qml/mouse_trackpad_trackpad.dci | Bin 0 -> 929 bytes 13 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 src/plugin-keyboard/qml/device_keyboard.dci create mode 100644 src/plugin-keyboard/qml/keyboard_fn.dci create mode 100644 src/plugin-keyboard/qml/keyboard_input.dci create mode 100644 src/plugin-keyboard/qml/keyboard_layout.dci create mode 100644 src/plugin-mouse/qml/device_mouse.dci create mode 100644 src/plugin-mouse/qml/mouse_trackpad_mouse.dci create mode 100644 src/plugin-mouse/qml/mouse_trackpad_trackpad.dci diff --git a/src/plugin-commoninfo/qml/commonInfoMain.qml b/src/plugin-commoninfo/qml/commonInfoMain.qml index 6e1b203341..980c8dd4be 100644 --- a/src/plugin-commoninfo/qml/commonInfoMain.qml +++ b/src/plugin-commoninfo/qml/commonInfoMain.qml @@ -22,8 +22,7 @@ DccObject { parentName: "system" displayName: qsTr("Developer Mode") description: qsTr("Developer root permission management") - //visible: !dccData.mode().isCommunitySystem() - visible: false + visible: !dccData.mode().isCommunitySystem() icon: "developer" weight: 90 DevelopModePage{} diff --git a/src/plugin-keyboard/qml/Shortcuts.qml b/src/plugin-keyboard/qml/Shortcuts.qml index c2c26d403b..e245e85828 100644 --- a/src/plugin-keyboard/qml/Shortcuts.qml +++ b/src/plugin-keyboard/qml/Shortcuts.qml @@ -13,7 +13,7 @@ DccObject { parentName: "keyboard" displayName: qsTr("Shortcuts") description: qsTr("System shortcut, custom shortcut") - icon: "dcc_nav_keyboard" // TODO: shortcut icon required + icon: "keyboard_fn" weight: parent.weight // 300 page: DccSettingsView { } diff --git a/src/plugin-keyboard/qml/device_keyboard.dci b/src/plugin-keyboard/qml/device_keyboard.dci new file mode 100644 index 0000000000000000000000000000000000000000..218806d0c2d81e73ee268d49af33b3c5d189ea27 GIT binary patch literal 1437 zcmZ>9_GDmWWME)2GGU+u__9KDGv(zMas(|cpSEqom01Ka7AY0%4fS|zhLo0GsJUz?#=RfRE^L+C!?YYuHu!ww3oBb@+ zjlXB>y5%Z+di{D}{O6)h=iU1`mK`d$J7;MqCO^~u&$MBpqvM`vb_e_C>zVi-gn2LM z($ZQG8Xg)FxN=b!mqp|LSq#&;BpS-pvdfs4y6nM7Uu%iV{eu*wauK-`KBz%yf*&80;Y3?@0YrThE&cw?&A^~PxyCZAYlufch91-Giw z>x&BxE{Zhi>fK?=ymIBNS(n2E_Ai~3AZ`>SzDka>&|7RicN`o!jTCs$RD!dKRR=?o#4;=Mx*)a&YcC?Jk2I!KJQ( zbsMegj3#u>l(2eW8hU7fy3OX~Wm#G7YlPTT57q_+v_D&8S#u!y*9&2#)5{;+E599_GDmWWME)2GGU+u)G|SIGv(zMF^;}M7dPa%9u|CXfn5V(wBpDA;>;Q}a5TMl4KOn|1Fv1)L z<&#QnfNBWxbaPt)WQV&t1%w4y_{;{f_1zB$3it~MdNDENZvOK+pk%@ED@+Cd_t+U* z6z0C|j4Rl$_T!$4P`9&EBx53TE~iD%vYOXR>+XLE6#N^0dmFE^V)o51%=_FP&+?0Y zHQP}C$c78oo*cOpVf^IbS4p76c>d(VYM ljbc|XFJ{Pz`?V|KN6ZNmk7cPwzEd(+`z%(C`mf8y001j@Y^VSL literal 0 HcmV?d00001 diff --git a/src/plugin-keyboard/qml/keyboard_input.dci b/src/plugin-keyboard/qml/keyboard_input.dci new file mode 100644 index 0000000000000000000000000000000000000000..c9c629ec43103d8f71a357b0296b8e3649db7faa GIT binary patch literal 1083 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 YKW;tYKGH0?JfiU-XZ)whK0N^VFIu=18~^|S literal 0 HcmV?d00001 diff --git a/src/plugin-mouse/qml/mouse.qml b/src/plugin-mouse/qml/mouse.qml index 78530cc48b..46a2d7bb26 100644 --- a/src/plugin-mouse/qml/mouse.qml +++ b/src/plugin-mouse/qml/mouse.qml @@ -9,7 +9,7 @@ DccObject { parentName:"device" displayName: qsTr("Mouse and Touchpad") description: qsTr("Common、Mouse、Touchpad") - icon:"dcc_nav_mouse" + icon:"device_mouse" weight: 30 visible: !DccApp.isTreeland() diff --git a/src/plugin-mouse/qml/mouseMain.qml b/src/plugin-mouse/qml/mouseMain.qml index 78bdd9e305..a916e1fef0 100644 --- a/src/plugin-mouse/qml/mouseMain.qml +++ b/src/plugin-mouse/qml/mouseMain.qml @@ -25,7 +25,7 @@ DccObject { name: "MouseAndTouchpadMouse" parentName: "MouseAndTouchpad" displayName: qsTr("Mouse") - icon: "dcc_nav_mouse" + icon: "mouse_trackpad_mouse" weight: 100 page: DccRightView { spacing: 5 @@ -36,7 +36,7 @@ DccObject { name: "Touchpad" parentName: "MouseAndTouchpad" displayName: qsTr("Touchpad") - icon: "dcc_nav_mouse" + icon: "mouse_trackpad_trackpad" visible: dccData.tpadExist weight: 200 page: DccRightView { diff --git a/src/plugin-mouse/qml/mouse_trackpad_mouse.dci b/src/plugin-mouse/qml/mouse_trackpad_mouse.dci new file mode 100644 index 0000000000000000000000000000000000000000..08ebdbda988b422004f28843994920f1b608b6b5 GIT binary patch literal 1071 zcmZ>9_GDmWWME)2GGU+u+-HX9X3EPi%1zACOGzxsCda(BP)$t6bacE^o$aHV||#}Fi(TUNirUyco7qXrqt6>P;(ez4kN=Y zAT2^rbAmkG+_-@3a95{*umB66f53#I?|wi~;5oBE%l|wxUuPDi{T_j79%!EF@^;1NjbM>W#8VG z3qs$&y`NuOmG*Y|Z;^}j?0L$XLF$nfX+N6&Oc$Idrho3FWQ6^$|E%})zdfI|=%{Gs zWAzWuY8RWj$V@Q!$kw!2?ep3R3)LsQ5xp(8n`_>6vCGT9N=W^4d#ktUm7rIc)7q-G zS)BV>wnR_K6S{X=N5)K2rv2A3zo(gtOU{Lr-BFzInd9!#yJ49!ViT<@F09_O=sCkp z6+tcng8-Qf49anS^gH;g?~fAM#-B&}i; zuj4vs;jwzkJmX>xbv>icJnCk`M;Y|~bg8O|``r=yG>30Z@-im9JECnqJ2p)EUDm`L z-un3Bz0)d1-xA+y|5eUoIri_P{ll)rHw!+*+_uu;QcGN^-G<@vWsdH26-$ o)$#s&zFF7hjzFk=t!Txa<6-gBEL8U`*tT}{N)ub3e+LB^0SoI3H~;_u literal 0 HcmV?d00001 diff --git a/src/plugin-mouse/qml/mouse_trackpad_trackpad.dci b/src/plugin-mouse/qml/mouse_trackpad_trackpad.dci new file mode 100644 index 0000000000000000000000000000000000000000..d8aa84450937f6f8abb921283726a8d93a51a128 GIT binary patch literal 929 zcmZ>9_GDmWWME)2GGU+u1TsT(Gv(zMF^;}M7dPa%9u|CXfn5V(wBpDA;EW!k#DfRRjU_^odBg|nC zF3DsI)SMtsH@6xfJKWVNAS}SbCm+bxcRwH~aGpt^<$oc!AlL0}xy4iGEYa3wYG7h; z_s|d*QB)8J&3ET>)%CpIRjZY^}XOa*Xh;A zbt6_#v{zv(L&pmB9g30ZcMUIy+iVa_Oi=LHFfr{x@C4%|j*73gr+zeURO05SHsxWx zY}>iD!fdq$M{k_9&HCG!C81w>Trynvr-_?P)Xv}ytxS2gT;Bg_jap6h#{H|@K1XP|Cw*d!`HLwq-*Rhp2=M4sV?^50SCjq_jg?iZhV#bQ1o)g(s0IrQmNc)E>gV< w-&%=px%{B1Yg8a-MbW*AU*`#l44SPfEPB$KHhj0BlRcKL7v# literal 0 HcmV?d00001