From 4067bfe3370796231c1394f66592374379aa659d Mon Sep 17 00:00:00 2001
From: fanpengcheng <fanpengcheng@uniontech.com>
Date: Thu, 20 Jan 2022 13:32:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=B2=A1=E6=9C=89=E5=9C=A8=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=98=BE=E7=A4=BA=E5=AF=B9=E5=BA=94=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

涉及系统监视器，全局搜索

Log:
Influence: 全局搜索、系统监视器插件图标
Task: https://pms.uniontech.com/zentao/task-view-98352.html
Change-Id: I3c2184ed91ccd6a51df295782af91f74500c3ea5
---
 plugins/dcc-dock-plugin/module_widget.cpp                | 2 ++
 plugins/dcc-dock-plugin/resources.qrc                    | 2 ++
 .../dcc-dock-plugin/texts/dcc_dock_grandsearch_16px.svg  | 9 +++++++++
 plugins/dcc-dock-plugin/texts/dcc_dock_power_16px.svg    | 8 +++-----
 .../texts/dcc_dock_systemmonitor_16px.svg                | 9 +++++++++
 5 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 plugins/dcc-dock-plugin/texts/dcc_dock_grandsearch_16px.svg
 create mode 100644 plugins/dcc-dock-plugin/texts/dcc_dock_systemmonitor_16px.svg

diff --git a/plugins/dcc-dock-plugin/module_widget.cpp b/plugins/dcc-dock-plugin/module_widget.cpp
index ea9489a2b..59379f5a3 100644
--- a/plugins/dcc-dock-plugin/module_widget.cpp
+++ b/plugins/dcc-dock-plugin/module_widget.cpp
@@ -287,6 +287,8 @@ void ModuleWidget::initUI()
                                                        , {"shutdown",       "dcc_dock_power"}
                                                        , {"multitasking",   "dcc_dock_task"}
                                                        , {"datetime",       "dcc_dock_time"}
+                                                       , {"system-monitor", "dcc_dock_systemmonitor"}
+                                                       , {"grand-search",   "dcc_dock_grandsearch"}
                                                        , {"trash",          "dcc_dock_trash"}};
         if (plugins.size() != 0) {
             layout->addSpacing(10);
diff --git a/plugins/dcc-dock-plugin/resources.qrc b/plugins/dcc-dock-plugin/resources.qrc
index ac304193c..b56db9a9e 100644
--- a/plugins/dcc-dock-plugin/resources.qrc
+++ b/plugins/dcc-dock-plugin/resources.qrc
@@ -10,6 +10,8 @@
         <file>texts/dcc_dock_power_16px.svg</file>
         <file>texts/dcc_dock_task_16px.svg</file>
         <file>texts/dcc_dock_trash_16px.svg</file>
+        <file>texts/dcc_dock_grandsearch_16px.svg</file>
+        <file>texts/dcc_dock_systemmonitor_16px.svg</file>
     </qresource>
     <qresource prefix="/">
         <file>translations/dcc-dock-plugin.ts</file>
diff --git a/plugins/dcc-dock-plugin/texts/dcc_dock_grandsearch_16px.svg b/plugins/dcc-dock-plugin/texts/dcc_dock_grandsearch_16px.svg
new file mode 100644
index 000000000..b1e0e65ba
--- /dev/null
+++ b/plugins/dcc-dock-plugin/texts/dcc_dock_grandsearch_16px.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon/dock-set/search</title>
+    <g id="icon/dock-set/search" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="ICON-/-Action-/-Search" transform="translate(1.000000, 1.000000)" fill="#536076">
+            <path d="M6,0 C9.3137085,0 12,2.6862915 12,6 C12,7.38645854 11.5297397,8.6630819 10.7400213,9.67906791 L14.0303301,12.9696699 C14.3232233,13.2625631 14.3232233,13.7374369 14.0303301,14.0303301 C13.7640635,14.2965966 13.3473998,14.3208027 13.0537883,14.1029482 L12.9696699,14.0303301 L9.67906791,10.7400213 C8.6630819,11.5297397 7.38645854,12 6,12 C2.6862915,12 0,9.3137085 0,6 C0,2.6862915 2.6862915,0 6,0 Z M6,1.5 C3.51471863,1.5 1.5,3.51471863 1.5,6 C1.5,8.48528137 3.51471863,10.5 6,10.5 C8.48528137,10.5 10.5,8.48528137 10.5,6 C10.5,3.51471863 8.48528137,1.5 6,1.5 Z" id="形状结合"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/plugins/dcc-dock-plugin/texts/dcc_dock_power_16px.svg b/plugins/dcc-dock-plugin/texts/dcc_dock_power_16px.svg
index b6ae5a96b..66aea8e7c 100644
--- a/plugins/dcc-dock-plugin/texts/dcc_dock_power_16px.svg
+++ b/plugins/dcc-dock-plugin/texts/dcc_dock_power_16px.svg
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>icon/dock/power</title>
-    <g id="icon/dock/power" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="path-1-link" transform="translate(0.000000, 3.000000)" fill="#536076">
-            <path d="M11.6666667,0 C12.9553311,0 14,1.11928813 14,2.5 L14,7.5 C14,8.88071187 12.9553311,10 11.6666667,10 L2.33333333,10 C1.04466892,10 0,8.88071187 0,7.5 L0,2.5 C0,1.11928813 1.04466892,0 2.33333333,0 L11.6666667,0 Z M11.5,1 L2.5,1 C1.67157288,1 1,1.7163444 1,2.6 L1,7.4 C1,8.2836556 1.67157288,9 2.5,9 L11.5,9 C12.3284271,9 13,8.2836556 13,7.4 L13,2.6 C13,1.7163444 12.3284271,1 11.5,1 Z M10,2 L10,8 L3,8 C2.44771525,8 2,7.55228475 2,7 L2,3 C2,2.44771525 2.44771525,2 3,2 L10,2 Z M16,2 L16,8 L15,8 L15,2 L16,2 Z" id="形状结合"></path>
-        </g>
+    <title>icon/dock-set/power</title>
+    <g id="icon/dock-set/power" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M8,1 C11.8659932,1 15,4.13400675 15,8 C15,11.8659932 11.8659932,15 8,15 C4.13400675,15 1,11.8659932 1,8 C1,4.13400675 4.13400675,1 8,1 Z M5.35903478,3.72431037 C5.19110576,3.5050971 4.87726493,3.46352301 4.65805167,3.63145203 C3.30807232,4.665608 2.5,6.26636725 2.5,8 C2.5,11.0375661 4.96243388,13.5 8,13.5 C11.0375661,13.5 13.5,11.0375661 13.5,8 C13.5,6.27318712 12.698307,4.67801229 11.357281,3.64324033 C11.1386573,3.47454441 10.8246728,3.51501883 10.6559769,3.73364248 C10.487281,3.95226613 10.5277554,4.26625067 10.746379,4.43494659 C11.8445789,5.28234731 12.5,6.58647654 12.5,8 C12.5,10.4852814 10.4852814,12.5 8,12.5 C5.51471863,12.5 3.5,10.4852814 3.5,8 C3.5,6.58090106 4.1606451,5.27218928 5.26617644,4.42529349 C5.4853897,4.25736447 5.5269638,3.94352364 5.35903478,3.72431037 Z M8,2.5 C7.72385763,2.5 7.5,2.72385763 7.5,3 L7.5,3 L7.5,7.5 C7.5,7.77614237 7.72385763,8 8,8 C8.27614237,8 8.5,7.77614237 8.5,7.5 L8.5,7.5 L8.5,3 C8.5,2.72385763 8.27614237,2.5 8,2.5 Z" id="形状结合" fill="#536076"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/plugins/dcc-dock-plugin/texts/dcc_dock_systemmonitor_16px.svg b/plugins/dcc-dock-plugin/texts/dcc_dock_systemmonitor_16px.svg
new file mode 100644
index 000000000..50ee6bb28
--- /dev/null
+++ b/plugins/dcc-dock-plugin/texts/dcc_dock_systemmonitor_16px.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon/dock-set/monitor</title>
+    <g id="icon/dock-set/monitor" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="plugin" transform="translate(1.000000, 1.000000)" fill="#536076">
+            <path d="M7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 C3.13400675,14 0,10.8659932 0,7 C0,3.13400675 3.13400675,0 7,0 Z M7,0.945 C3.65591584,0.945 0.945,3.65591584 0.945,7 C0.945,8.38131917 1.40945487,9.69294991 2.24885232,10.7539807 C2.72621454,11.357385 3.31465528,11.8658708 3.98137962,12.2499873 C4.19911821,12.3754318 4.47732316,12.3006127 4.60276776,12.0828742 C4.72821236,11.8651356 4.65339329,11.5869306 4.43565469,11.4614861 C3.86894241,11.134989 3.36848562,10.7025323 2.96252556,10.1893831 C2.24916805,9.28767161 1.855,8.17453238 1.855,7 C1.855,4.15849496 4.15849496,1.855 7,1.855 C9.84150503,1.855 12.145,4.15849496 12.145,7 C12.145,8.2354804 11.7086274,9.40242114 10.926164,10.3252761 C10.5518115,10.766796 10.1055064,11.143028 9.6069708,11.4366552 C9.39044617,11.5641838 9.3183006,11.843094 9.44582912,12.0596186 C9.57335771,12.2761432 9.85226788,12.3482888 10.0687925,12.2207602 C10.6552948,11.8753224 11.1800825,11.4329301 11.620257,10.9137784 C12.5408416,9.82802009 13.055,8.45306588 13.055,7 C13.055,3.65591584 10.3440842,0.945 7,0.945 Z M6.14105816,4.495 C5.50116297,4.495 5.18416622,4.83633522 4.90582529,5.77511311 L4.82649982,6.06085546 L4.73234063,6.44176056 L4.62671,6.90560555 L4.56190269,7.17901737 L4.49991454,7.42095739 L4.44006074,7.63301735 L4.38180608,7.81626811 L4.32469407,7.97170619 L4.28562417,8.06399685 C4.18241314,8.29231802 4.08614343,8.3805064 3.97613719,8.3805064 C3.86668889,8.3805064 3.75492139,8.31451453 3.64265705,8.17713687 C3.590764,8.11363546 3.54533748,8.04344016 3.51412587,7.98357483 L3.48793955,7.92778336 L3.45795778,7.86852724 C3.35533873,7.70099386 3.14358589,7.62764513 2.95581257,7.70436884 C2.74717556,7.78961743 2.64714947,8.02785879 2.73239807,8.23649582 C2.7911169,8.38020407 2.88738493,8.54274071 3.01066476,8.69359799 C3.27613883,9.01845798 3.60198971,9.19668421 3.97613719,9.19668421 C4.64075184,9.19668421 4.95612039,8.83258404 5.2460487,7.79607626 L5.3499402,7.39588885 L5.52328424,6.64533944 L5.58658899,6.38789258 L5.64743971,6.16103027 L5.70643091,5.9635046 L5.76406409,5.7942793 L5.80239381,5.69521553 C5.91627732,5.41736693 6.02110531,5.31117787 6.14105816,5.31117787 C6.24325628,5.31117787 6.32653129,5.3992481 6.41313618,5.64227159 L6.45834986,5.78392307 L6.47942327,5.8607465 L6.54450741,6.14194013 L6.58792534,6.36698952 L6.63137458,6.62094314 L6.70003119,7.06780466 L6.74872615,7.36996939 L6.79819261,7.64534715 L6.84953245,7.8945755 L6.882077,8.03296361 C7.09281104,8.88118308 7.39529511,9.19668421 8.01732295,9.19668421 C8.58697462,9.19668421 8.84126341,8.90212617 9.01953871,8.1217962 L9.08342281,7.81789288 L9.1180369,7.66673516 L9.14898334,7.55254983 L9.1609,7.5166 L9.20322326,7.65582622 L9.27559458,7.92759744 L9.33606009,8.13140076 L9.38017871,8.25537384 C9.65654508,8.9762274 10.1446365,9.28366432 10.9490039,9.19418227 C11.1730034,9.16926339 11.3343901,8.96747516 11.3094712,8.74347565 C11.2845524,8.51947614 11.0827641,8.35808946 10.8587646,8.38300834 C10.4277966,8.43095148 10.2589596,8.32454889 10.1167863,7.89403132 L10.0748964,7.75579483 L9.98406619,7.41835227 L9.9502025,7.30700894 C9.78920005,6.80922761 9.58280729,6.61436713 9.17194754,6.61436713 C8.66007877,6.61436713 8.46003886,6.85896582 8.29229499,7.61574793 L8.22887135,7.91867419 L8.19047201,8.07878484 L8.16988704,8.15227483 C8.1164769,8.33153783 8.07389828,8.3805064 8.01732295,8.3805064 C7.9065455,8.3805064 7.81619125,8.27502879 7.72298618,7.98338212 L7.67828579,7.8285018 L7.63506429,7.64881887 L7.59201688,7.44017841 L7.54880371,7.20159447 L7.50500765,6.93199414 L7.45838443,6.6241055 L7.40965498,6.32171483 L7.3601885,6.04633705 L7.30884868,5.79710872 L7.27630414,5.65872064 C7.06557012,4.81050119 6.76308601,4.495 6.14105816,4.495 Z" id="形状结合"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file