diff --git a/Control/UserControls/PannelCard/LeftCardControl.xaml b/Control/UserControls/PannelCard/LeftCardControl.xaml
index 891bfa6..46a3849 100644
--- a/Control/UserControls/PannelCard/LeftCardControl.xaml
+++ b/Control/UserControls/PannelCard/LeftCardControl.xaml
@@ -130,7 +130,8 @@
-->
-
+
+
-->
-
+
diff --git a/Fonts/iconfont.css b/Fonts/iconfont.css
deleted file mode 100644
index b6a60c0..0000000
--- a/Fonts/iconfont.css
+++ /dev/null
@@ -1,137 +0,0 @@
-@font-face {
- font-family: "iconfont"; /* Project id 2491374 */
- /* Color fonts */
- src:
- url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
- url('iconfont.woff?t=1623737923396') format('woff'),
- url('iconfont.ttf?t=1623737923396') format('truetype');
-}
-
-.iconfont {
- font-family: "iconfont" !important;
- font-size: 16px;
- font-style: normal;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-huihua:before {
- content: "\e614";
-}
-
-.icon-wenjianjia1:before {
- content: "\e62e";
-}
-
-.icon-wenjianjia2:before {
- content: "\e606";
-}
-
-.icon-xitong3:before {
- content: "\e621";
-}
-
-.icon-game:before {
- content: "\e681";
-}
-
-.icon-xitong4:before {
- content: "\e63e";
-}
-
-.icon-ren-fanqiang:before {
- content: "\e88c";
-}
-
-.icon-qita:before {
- content: "\e600";
-}
-
-.icon-kaifa:before {
- content: "\e618";
-}
-
-.icon-dakaihuihua:before {
- content: "\e64a";
-}
-
-.icon-huihua-copy:before {
- content: "\e647";
-}
-
-.icon-iconfontyouxihudong:before {
- content: "\e636";
-}
-
-.icon-xitong:before {
- content: "\e601";
-}
-
-.icon-xitong1:before {
- content: "\e67c";
-}
-
-.icon-xiazai:before {
- content: "\e617";
-}
-
-.icon-icon-test:before {
- content: "\e60e";
-}
-
-.icon-xinxi:before {
- content: "\e640";
-}
-
-.icon-xiazai1:before {
- content: "\e674";
-}
-
-.icon-youxi:before {
- content: "\e680";
-}
-
-.icon-wangluo:before {
- content: "\e611";
-}
-
-.icon-kaifa-:before {
- content: "\e609";
-}
-
-.icon-wangluo1:before {
- content: "\e735";
-}
-
-.icon-xitong2:before {
- content: "\e648";
-}
-
-.icon-xiazai2:before {
- content: "\e6af";
-}
-
-.icon-kaifasheji:before {
- content: "\e613";
-}
-
-.icon-qita1:before {
- content: "\e60b";
-}
-
-.icon-wangluo2:before {
- content: "\e70b";
-}
-
-.icon-developer:before {
- content: "\e651";
-}
-
-.icon-kaifataojian:before {
- content: "\e63a";
-}
-
-.icon-wenjianjia:before {
- content: "\e7c2";
-}
-
diff --git a/Fonts/iconfont.js b/Fonts/iconfont.js
deleted file mode 100644
index c0c66f5..0000000
--- a/Fonts/iconfont.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(c){var l,a,h,t,i,z,o='',p=(p=document.getElementsByTagName("script"))[p.length-1].getAttribute("data-injectcss");if(p&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function s(){i||(i=!0,h())}l=function(){var c,l,a;(a=document.createElement("div")).innerHTML=o,o=null,(l=a.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",c=l,(a=document.body).firstChild?(l=a.firstChild).parentNode.insertBefore(c,l):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),l()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(h=l,t=c.document,i=!1,(z=function(){try{t.documentElement.doScroll("left")}catch(c){return void setTimeout(z,50)}s()})(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,s())})}(window);
\ No newline at end of file
diff --git a/Fonts/iconfont.json b/Fonts/iconfont.json
deleted file mode 100644
index f77c09e..0000000
--- a/Fonts/iconfont.json
+++ /dev/null
@@ -1,219 +0,0 @@
-{
- "id": "2491374",
- "name": "GeekIcon",
- "font_family": "iconfont",
- "css_prefix_text": "icon-",
- "description": "",
- "glyphs": [
- {
- "icon_id": "13160269",
- "name": "会话",
- "font_class": "huihua",
- "unicode": "e614",
- "unicode_decimal": 58900
- },
- {
- "icon_id": "14236852",
- "name": "文件夹",
- "font_class": "wenjianjia1",
- "unicode": "e62e",
- "unicode_decimal": 58926
- },
- {
- "icon_id": "15416685",
- "name": "文件夹",
- "font_class": "wenjianjia2",
- "unicode": "e606",
- "unicode_decimal": 58886
- },
- {
- "icon_id": "15711148",
- "name": "系统",
- "font_class": "xitong3",
- "unicode": "e621",
- "unicode_decimal": 58913
- },
- {
- "icon_id": "18058019",
- "name": "游戏",
- "font_class": "game",
- "unicode": "e681",
- "unicode_decimal": 59009
- },
- {
- "icon_id": "19977025",
- "name": "系统",
- "font_class": "xitong4",
- "unicode": "e63e",
- "unicode_decimal": 58942
- },
- {
- "icon_id": "20017778",
- "name": "人-翻墙",
- "font_class": "ren-fanqiang",
- "unicode": "e88c",
- "unicode_decimal": 59532
- },
- {
- "icon_id": "1250",
- "name": "其它",
- "font_class": "qita",
- "unicode": "e600",
- "unicode_decimal": 58880
- },
- {
- "icon_id": "397886",
- "name": "开发,代码",
- "font_class": "kaifa",
- "unicode": "e618",
- "unicode_decimal": 58904
- },
- {
- "icon_id": "511314",
- "name": "打开会话",
- "font_class": "dakaihuihua",
- "unicode": "e64a",
- "unicode_decimal": 58954
- },
- {
- "icon_id": "791886",
- "name": "会话",
- "font_class": "huihua-copy",
- "unicode": "e647",
- "unicode_decimal": 58951
- },
- {
- "icon_id": "1033987",
- "name": "游戏",
- "font_class": "iconfontyouxihudong",
- "unicode": "e636",
- "unicode_decimal": 58934
- },
- {
- "icon_id": "1119109",
- "name": "系统",
- "font_class": "xitong",
- "unicode": "e601",
- "unicode_decimal": 58881
- },
- {
- "icon_id": "1137788",
- "name": "系统",
- "font_class": "xitong1",
- "unicode": "e67c",
- "unicode_decimal": 59004
- },
- {
- "icon_id": "1159887",
- "name": "下载",
- "font_class": "xiazai",
- "unicode": "e617",
- "unicode_decimal": 58903
- },
- {
- "icon_id": "1629872",
- "name": "文件夹",
- "font_class": "icon-test",
- "unicode": "e60e",
- "unicode_decimal": 58894
- },
- {
- "icon_id": "2006733",
- "name": "会话",
- "font_class": "xinxi",
- "unicode": "e640",
- "unicode_decimal": 58944
- },
- {
- "icon_id": "2418266",
- "name": "下载",
- "font_class": "xiazai1",
- "unicode": "e674",
- "unicode_decimal": 58996
- },
- {
- "icon_id": "2742683",
- "name": "游戏",
- "font_class": "youxi",
- "unicode": "e680",
- "unicode_decimal": 59008
- },
- {
- "icon_id": "3879214",
- "name": "网络",
- "font_class": "wangluo",
- "unicode": "e611",
- "unicode_decimal": 58897
- },
- {
- "icon_id": "3903356",
- "name": "开发",
- "font_class": "kaifa-",
- "unicode": "e609",
- "unicode_decimal": 58889
- },
- {
- "icon_id": "7055665",
- "name": "网络",
- "font_class": "wangluo1",
- "unicode": "e735",
- "unicode_decimal": 59189
- },
- {
- "icon_id": "8802631",
- "name": "系统",
- "font_class": "xitong2",
- "unicode": "e648",
- "unicode_decimal": 58952
- },
- {
- "icon_id": "9712640",
- "name": "下载",
- "font_class": "xiazai2",
- "unicode": "e6af",
- "unicode_decimal": 59055
- },
- {
- "icon_id": "9783461",
- "name": "开发设计",
- "font_class": "kaifasheji",
- "unicode": "e613",
- "unicode_decimal": 58899
- },
- {
- "icon_id": "9924353",
- "name": "其它",
- "font_class": "qita1",
- "unicode": "e60b",
- "unicode_decimal": 58891
- },
- {
- "icon_id": "9974441",
- "name": "网络",
- "font_class": "wangluo2",
- "unicode": "e70b",
- "unicode_decimal": 59147
- },
- {
- "icon_id": "10294636",
- "name": "开发",
- "font_class": "developer",
- "unicode": "e651",
- "unicode_decimal": 58961
- },
- {
- "icon_id": "11121465",
- "name": "开发套件",
- "font_class": "kaifataojian",
- "unicode": "e63a",
- "unicode_decimal": 58938
- },
- {
- "icon_id": "11759969",
- "name": "文件夹",
- "font_class": "wenjianjia",
- "unicode": "e7c2",
- "unicode_decimal": 59330
- }
- ]
-}
diff --git a/GeekDesk.csproj b/GeekDesk.csproj
index c3996bd..16c42f0 100644
--- a/GeekDesk.csproj
+++ b/GeekDesk.csproj
@@ -37,6 +37,9 @@
4
true
+
+ GeekDesk.SvgToGeometry
+
packages\SharpShellTools.2.2.0.0\lib\Apex.WinForms.dll
@@ -56,8 +59,11 @@
packages\GlobalHotKey.1.1.0\lib\GlobalHotKey.dll
-
- packages\HandyControl.3.1.0\lib\net452\HandyControl.dll
+
+ packages\HandyControl.3.2.0\lib\net472\HandyControl.dll
+
+
+ packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
packages\SharpShellTools.2.2.0.0\lib\ServerManager.exe
@@ -148,6 +154,7 @@
+
@@ -254,8 +261,12 @@
ResXFileCodeGenerator
Resources.Designer.cs
-
-
+
+ PreserveNewest
+
+
+ PreserveNewest
+
SettingsSingleFileGenerator
@@ -273,8 +284,6 @@
-
-
diff --git a/Resource/Dictionary/Geometry.xaml b/Resource/Dictionary/Geometry.xaml
index d9fe4fd..d5d66e2 100644
--- a/Resource/Dictionary/Geometry.xaml
+++ b/Resource/Dictionary/Geometry.xaml
@@ -1,6 +1,6 @@
+ >
M512 992C246.912 992 32 777.088 32 512 32 246.912 246.912 32 512 32c265.088 0 480 214.912 480 480 0 265.088-214.912 480-480 480z m-59.072-512v236.32a54.144 54.144 0 1 0 108.288 0V480a54.144 54.144 0 1 0-108.288 0z m53.76-226.464c-14.72 0-27.232 4.544-37.568 15.136-11.04 9.856-16.192 22.72-16.192 38.656 0 15.136 5.152 28 16.192 38.624 10.336 10.592 22.848 15.904 37.6 15.904a57.6 57.6 0 0 0 39.04-15.168c10.304-10.592 15.456-23.456 15.456-39.36s-5.12-28.8-15.456-38.656c-10.304-10.56-23.584-15.136-39.04-15.136z
diff --git a/SvgToGeometry.cs b/SvgToGeometry.cs
new file mode 100644
index 0000000..ec2a831
--- /dev/null
+++ b/SvgToGeometry.cs
@@ -0,0 +1,73 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+
+namespace GeekDesk
+{
+ class SvgToGeometry
+ {
+ static void Main(string[] args)
+ {
+ XmlDocument xmlDoc = new XmlDocument();
+ xmlDoc.XmlResolver = null;
+ XmlReaderSettings settings = new XmlReaderSettings();
+ settings.IgnoreComments = true;//忽略文档里面的注释
+ settings.DtdProcessing = DtdProcessing.Parse;
+ XmlReader reader = XmlReader.Create("D:\\下载文件\\font_2642707_zjdi9qttb38\\iconfont.svg", settings);
+ xmlDoc.Load(reader);
+
+ XmlNodeList nodeList = xmlDoc.SelectNodes("/svg/defs/font/glyph");
+
+ string jsonFilePath = "D:\\下载文件\\font_2642707_zjdi9qttb38\\iconfont.json";
+ JObject jo = ReadJson(jsonFilePath);
+ JArray ja = JArray.Parse(jo["glyphs"].ToString());
+
+ string value;
+
+ for (int i=0; i
-
+
+