From b4e22d96fec867c3cd7af5f8e65fc6b42cd17c17 Mon Sep 17 00:00:00 2001
From: Lssg97 <lssg97@163.com>
Date: Sat, 9 Jan 2021 10:20:32 +0800
Subject: [PATCH] Added the function of hiding WAN IP

---
 Documents/History.md           |  6 +++
 Documents/Q&A.md               |  4 +-
 README.md                      | 12 ++---
 Skin/DetailedSystemMonitor.ini | 83 ++++++++++++++++++++--------------
 4 files changed, 64 insertions(+), 41 deletions(-)

diff --git a/Documents/History.md b/Documents/History.md
index 313d0b6..87c8146 100644
--- a/Documents/History.md
+++ b/Documents/History.md
@@ -1,6 +1,12 @@
 # 更新笔记
 
 
+
+#### 2021年1月9日
+
+![新增](https://img.shields.io/badge/-%E6%96%B0%E5%A2%9E-blue?style=plastic)：  新增“隐藏广域网IP”功能，点击“广域网IP地址”即可在显示和隐藏状态间切换；增加了“默认显示IP”设置变量，以确定皮肤刷新后的初始显示效果。
+
+
 #### 2020年11月28日
 
 ![优化](https://img.shields.io/badge/-%E4%BC%98%E5%8C%96-green?style=plastic)：  使用“DeviceInfo”插件获取显卡相关信息，放弃使用遍历注册表的方案，显卡识别成功率会有大幅提高。插件目前未公开。感谢插件的作者a1091817957。
diff --git a/Documents/Q&A.md b/Documents/Q&A.md
index bb6d349..9c85d87 100644
--- a/Documents/Q&A.md
+++ b/Documents/Q&A.md
@@ -5,7 +5,7 @@
 
 * 皮肤默认尺寸为200x755像素，而不同计算机显示器的像素密度不同，在小尺寸但高分辨率屏幕上显示，看起来会很小。解决方法是调整皮肤的缩放比例参数（如图）：建议固定选择**1.2**，**1.5**或**2.0**。特别注意**刷新皮肤前请检查小数点位置！！**
 
-![](https://gitee.com/Lssg97/DetailedSystemMonitor/raw/main/Images/1.png)
+![](https://gitee.com/Lssg97/DetailedSystemMonitor/raw/develop/Images/1.png)
 
 
 #### 2. 为什么我的皮肤和图片展示的不一样，感觉缺东西？
@@ -24,7 +24,7 @@
 
 * 这是因为你的计算机开启了Windows的显示缩放功能，Rainmeter识别分辨率错误造成的，请参考下图来进行设置：打开Rainmeter安装目录，鼠标右键点击`Rainmeter.exe`,属性，兼容性，更改高DIP设置，勾选“替代高DIP缩放行为”，确定。完成操作后重启Rainmeter软件。
 
-![](https://gitee.com/Lssg97/DetailedSystemMonitor/raw/main/Images/2.png)
+![](https://gitee.com/Lssg97/DetailedSystemMonitor/raw/develop/Images/2.png)
 
 
 #### 5. 为什么“显卡温度”显示为“Nun”或者“N/A”？
diff --git a/README.md b/README.md
index e9c45da..d8046cb 100644
--- a/README.md
+++ b/README.md
@@ -5,18 +5,18 @@
 
 **详细系统监控**（DetailedSystemMonitor，以下均简称为“该皮肤”）是一款全面、直观、高信息密度的，用于监视所在计算机的网络、CPU、GPU、内存、硬盘等相关信息的 [Rainmeter](https://www.rainmeter.net/) 皮肤，旨在将这些系统信息清晰明了地展示在你的桌面上。能兼容市面上绝大多数使用Windows系统的计算机或工作站，并自动适配系统版本及硬件以只展示可以获取的信息。
 
-![详细系统监控 v3.0](https://gitee.com/Lssg97/DetailedSystemMonitor/raw/main/Images/0.png)
+![详细系统监控 v3.0](https://gitee.com/Lssg97/DetailedSystemMonitor/raw/develop/Images/0.png)
 
 该皮肤目前最新版本为 **3.3**。该版本新增了对 Intel CPU 温度的监测；使用“DeviceInfo”插件提高显卡识别成功率；优化了部分内容监测方式和UI界面，网速监测的默认方式由“带宽”变更为“速度”；优化修复一些已知问题。详细内容请查看 [**更新笔记**](https://github.com/Lssg97/DetailedSystemMonitor/blob/main/Documents/History.md)。
 
 
 ### 运行要求
 
-*  **系统要求：** **Microsoft Windows 7 SP1** 或更高版本系统，若要获得皮肤的全部功能，则需要 **Microsoft Windows 10 1709** 或更高版本系统；
+*  **系统要求：** **Microsoft Windows 7 SP1** 或更高版本系统；若要获得皮肤的全部功能，则需要 **Microsoft Windows 10 1709** 或更高版本系统。
 
-*  **环境要求：** [**.NET Framework 4.5**](https://www.microsoft.com/zh-cn/download/details.aspx?id=30653) 或更高版本；
+*  **环境要求：** [**.NET Framework 4.5**](https://www.microsoft.com/zh-cn/download/details.aspx?id=30653) 或更高版本。
 
-*  **软件要求：** [**Rainmeter 4.3 r3266**](https://www.rainmeter.net/) 或更高版本；
+*  **软件要求：** [**Rainmeter 4.3 r3266**](https://www.rainmeter.net/) 或更高版本。
 
 *  **其它要求：** 对于 **Intel平台计算机** 用户若想在皮肤中正确获取 **CPU温度**，Rainmeter 必须 **以管理员身份运行**。仅有AMD核心显卡的计算机若无法正常显示 GPU 温度，还需要后台运行 [**CoreTemp**](https://www.alcpu.com/CoreTemp/) 应用。
 
@@ -27,7 +27,7 @@
 
 *  安装皮肤时，请注意选择适合您计算机显卡设备的插件：若您的计算机存在 **NVIDIA** 显卡，请在插件栏中只勾选 `NvidiaGPU.dll`（如下图所示）；**AMD** 显卡同理。若您的计算机并非 **Intel** 平台，请取消勾选 `CPUTemp.dll`。
 
-<p align="center"><img src="https://gitee.com/Lssg97/DetailedSystemMonitor/raw/main/Images/3.png"></p>
+<p align="center"><img src="https://gitee.com/Lssg97/DetailedSystemMonitor/raw/develop/Images/3.png"></p>
 
 *  使用上述方法在默认情况下，新版本将自动覆盖旧版本的皮肤。若您想保留旧版本皮肤，请手动修改旧版本皮肤的文件名或皮肤文件所在目录名称，亦或者使用第三方压缩软件来解压新版本皮肤安装包，手动提取新版本皮肤文件（不推荐）。
 
@@ -67,7 +67,7 @@
 
 该皮肤的初始版本源自互联网，作者、创作时间等信息均已无从考证。本人于2010年获得了该皮肤初始版本的副本，自2015年开始致力于维护该皮肤，并在 [中国雨滴美化社区](https://bbs.rainmeter.cn/) 发布过七次独立的版本更新（<https://bbs.rainmeter.cn/thread-141896-1-1.html>）。维护至今，该皮肤在构思上已经和早期版本没有任何关联，属于原创作品。不过为了致敬早期版本创作者，在名称与版本上将继续延续早期版本。
 
-该皮肤使用了四个由第三方开发者制作的 Rainmeter 插件：AMDTemperature.dll（[z100s](https://tieba.baidu.com/p/2221203992)）、NvidiaGPU.dll（[IZZZZZI](https://tieba.baidu.com/p/3242119308)）、CPUTemp.dll（[DeadUniverse](https://tieba.baidu.com/p/6855002141)）和 DeviceInfo.dll（[a1091817957](https://tieba.baidu.com/home/main/?un=a1091817957)）；GPU Bar 配色方案来自 [mzflh](https://tieba.baidu.com/home/main/?un=mzflh)。感谢以上支持和帮助。
+该皮肤使用了四个由第三方开发者制作的 Rainmeter 插件：AMDTemperature.dll（[z100s](https://tieba.baidu.com/p/2221203992)）、NvidiaGPU.dll（[IZZZZZI](https://tieba.baidu.com/p/3242119308)）、CPUTemp.dll（[DeadUniverse](https://tieba.baidu.com/p/6855002141)）和 DeviceInfo.dll（[a1091817957](https://tieba.baidu.com/home/main/?un=a1091817957)）；GPU Bar 配色方案来自 [mzflh](https://tieba.baidu.com/home/main/?un=mzflh)。感谢以上人员的技术支持和帮助。
 
 
 ### 联系作者
diff --git a/Skin/DetailedSystemMonitor.ini b/Skin/DetailedSystemMonitor.ini
index 9e4ccd4..a9f89bf 100644
--- a/Skin/DetailedSystemMonitor.ini
+++ b/Skin/DetailedSystemMonitor.ini
@@ -11,7 +11,7 @@ Name=
 Author=��ɫ���� (camusice)
 Information=���ϵͳ���磬CPU��GPU���ڴ棬Ӳ�̵�ϵͳ��Ϣ��
 License=CC BY-NC-SA 3.0
-Version=v 3.3 (201217) (Beta)
+Version=v 3.3 (210109) (Beta)
 
 [Variables]
 
@@ -21,14 +21,18 @@ Version=v 3.3 (201217) (Beta)
 
 Zoom=1.0
 
-;--------��ʾʱ�䣨True��False�������Ƿ���ʾʱ�䣩--------
+;--------��ʾʱ�䣨True/False�������Ƿ���ʾʱ�䣩--------
 
 ShowTime=True
 
-;--------������ʾ���ͣ�Bandwidth��Speed��������bps����ʵʱ�����ٶ�B/s��--------
+;--------�������ͣ�Bandwidth/Speed��������bps����ʵʱ�����ٶ�B/s��--------
 
 NetSpeedType=Speed
 
+;--------Ĭ����ʾIP��True/False��Ƥ����ʼ����Ĺ�����IP�Ƿ����أ�--------
+
+ShowWANIP=True
+
 
 
 ;==================[Ƥ�����ò���]==================
@@ -60,7 +64,7 @@ FontColour4=255,0,0
 
 ;==================[�̳нڵ�]==================
 
-Release=201217
+Release=210109
 IntegratedGPUName=""
 DiscreteGPUName=""
 
@@ -172,7 +176,7 @@ Meter=Shape
 Shape=Rectangle 0,0,576,384,48 | Fill Color #FontColour#,255 | StrokeWidth 0
 Shape2=Rectangle 48,48,480,288,6
 Shape3=Path Path1
-Shape4=Combine Shape1 | Exclude Shape2 | Union Shape3 | Scale (69/576*#Zoom#),(60/576*#Zoom#),0,0
+Shape4=Combine Shape | Exclude Shape2 | Union Shape3 | Scale (69/576*#Zoom#),(60/576*#Zoom#),0,0
 Path1=357,464 | LineTo 456,464 | ArcTo 456,512 | LineTo 120,512 | ArcTo 120,464 | LineTo 219,464 | LineTo 237,408 | ArcTo 249,400,12 | LineTo 327,400 | ArcTo 339,408,12 | LineTo 357,464 | ClosePath 1
 X=(#Zoom#*10)
 Y=(#Zoom#*20)r
@@ -185,7 +189,7 @@ AntiAlias=1
 Meter=Shape
 Shape=Path Path1 | Fill Color 0,188,242,255 | StrokeWidth 0
 Shape2=Path Path2
-Shape3=Combine Shape1 | Exclude Shape2 | Scale (22/448*#Zoom#),(22/448*#Zoom#),0,0
+Shape3=Combine Shape | Exclude Shape2 | Scale (22/448*#Zoom#),(22/448*#Zoom#),0,0
 Path1=0,62 | LineTo 448,0 | LineTo 448,448 | LineTo 0,386 | ClosePath 1
 Path2=0,214 | LineTo 184,214 | LineTo 184,36 | LineTo 204,34 | LineTo 204,214 | LineTo 448,214 | LineTo 448,236 | LineTo 204,236 | LineTo 204,414 | LineTo 184,412 | LineTo 184,236 | LineTo 0,236 | LineTo 0,214 | ClosePath 1
 X=(#Zoom#*23)r
@@ -243,7 +247,7 @@ Shape=Ellipse 248,248,248 | Fill Color #FontColour#,255 | StrokeWidth 0
 Shape2=Ellipse 248,184,88
 Shape3=Path Path1
 Path1=394,372 | ArcTo 102,372,191 | ArcTo 200,312,110 | ArcTo 296,312,120,*,*,1 | ArcTo 394,372,110 | ClosePath 1
-Shape4=Combine Shape1 | Exclude Shape2 | Exclude Shape3 | Scale (13/496*#Zoom#),(13/496*#Zoom#),0,0 | Offset 0,26 | TransformOrder Offset,Scale
+Shape4=Combine Shape | Exclude Shape2 | Exclude Shape3 | Scale (13/496*#Zoom#),(13/496*#Zoom#),0,0 | Offset 0,26 | TransformOrder Offset,Scale
 X=(#Zoom#*92)
 Y=(#Zoom#*-28)r
 W=(#Zoom#*13)
@@ -275,7 +279,7 @@ Shape3=Path Path1 | Rotate 90 | Scale 2,2 | Offset -312,148.5
 Shape4=Path Path2 | Rotate 90 | Scale 2,2 | Offset -312,148.5
 Shape5=Path Path1 | Offset 0,298.9
 Shape6=Path Path2 | Offset 0,298.8
-Shape7=Combine Shape1 | Exclude Shape2 | Union Shape3 | Exclude Shape4 | Union Shape5 | Exclude Shape6 | Scale (13/512*#Zoom#),(13/512*#Zoom#),0,0 | Offset 0,26 | TransformOrder Offset,Scale
+Shape7=Combine Shape | Exclude Shape2 | Union Shape3 | Exclude Shape4 | Union Shape5 | Exclude Shape6 | Scale (13/512*#Zoom#),(13/512*#Zoom#),0,0 | Offset 0,26 | TransformOrder Offset,Scale
 Path1=512.1,191 | LineTo 503.9,205.3 | CurveTo 488.8,210.7,500.9,210.6,494.5,212.8 | CurveTo 456.7,192.1,477,206.3,466.2,200 | CurveTo 453.9,176.4,452.1,188.3,450.9,181.6 | LineTo 462.1,162.1 | CurveTo 446.2,134.7,455.2,154.1,449.8,144.8 | LineTo 429.7,134.7 | CurveTo 417.5,124.4,423.7,134.7,418.5,130.4 | CurveTo 417.5,87.3,415.5,112.4,415.4,99.8 | CurveTo 429.7,76.9,418.5,81.3,423.7,76.9 | LineTo 446.2,76.9 | CurveTo 462.1,49.5,449.8,66.8,455.2,57.5 | LineTo 453.9,35.2 | CurveTo 456.7,19.5,450.9,30,452,23.3 | CurveTo 488.8,0.9,466.2,11.6,477.1,5.3 | CurveTo 503.9,6.3,494.5,-1.2,500.9,1 | LineTo 512.1,20.6 | CurveTo 543.8,20.6,522.6,18.7,533.3,18.7 | LineTo 552,6.3 | CurveTo 567.1,0.9,555,1,561.4,-1.2 | CurveTo 599.2,19.5,578.9,5.3,589.7,11.6 | CurveTo 602,35.2,603.8,23.3,605,30 | LineTo 593.8,49.5 | CurveTo 609.7,76.9,600.7,57.5,606.1,66.8 | LineTo 626.2,76.9 | CurveTo 638.4,87.2,632.2,76.9,637.4,81.2 | CurveTo 638.4,124.3,640.4,99.2,640.5,111.8 | CurveTo 626.2,134.7,637.4,130.3,632.2,134.7 | LineTo 609.7,134.7 | CurveTo 593.8,162.1,606.1,144.8,600.7,154.1 | LineTo 602,176.4 | CurveTo 599.2,192.1,605,181.6,603.9,188.3 | CurveTo 567.1,210.7,589.7,200,578.8,206.3 | CurveTo 552,205.3,561.4,212.8,555,210.6 | LineTo 543.8,191 | CurveTo 512.1,191,533.4,192.9,522.6,192.9 | ClosePath 1
 Path2=501.6,132.2 | CurveTo 554.4,79.4,540.1,161.8,584,117.9 | CurveTo 501.6,132.2,515.9,49.7,472,93.7 | ClosePath 1
 X=(#Zoom#*91)
@@ -318,7 +322,7 @@ Shape2=Ellipse 496,368,144
 Shape3=Path Path1
 Shape4=Rectangle 480,288,32,96,10
 Shape5=Rectangle 480,352,80,32,10
-Shape6=Combine Shape1 | Union Shape2 | Union Shape3 | Exclude Shape4 | Exclude Shape5 | Scale (13/512*#Zoom#),(13/512*#Zoom#),0,0
+Shape6=Combine Shape | Union Shape2 | Union Shape3 | Exclude Shape4 | Exclude Shape5 | Scale (13/512*#Zoom#),(13/512*#Zoom#),0,0
 Path1=395,512 | LineTo 48,512 | ArcTo 0,464,48 | LineTo 0,422 | ArcTo 134,288,134 | LineTo 151,288 | ArcTo 297,288,176,*,*,1 | LineTo 314,288 | ArcTo 338,290,134 | ArcTo 395,512,176,*,*,1 | ClosePath 1
 X=(#Zoom#*91)
 Y=(#Zoom#*21)r
@@ -379,7 +383,7 @@ Shape3=Rectangle 0,160,384,64,11
 Shape3=Rectangle 0,160,384,64,11
 Shape4=Path Path1
 Shape5=Rectangle 160,256,64,256
-Shape6=Combine Shape1 | Union Shape2 | Union Shape3 | Union Shape4 | Union Shape5 | Scale (13/512*#Zoom#),(13/512*#Zoom#),0,0 | Offset 0,26 | TransformOrder Offset,Scale
+Shape6=Combine Shape | Union Shape2 | Union Shape3 | Union Shape4 | Union Shape5 | Scale (13/512*#Zoom#),(13/512*#Zoom#),0,0 | Offset 0,26 | TransformOrder Offset,Scale
 Path1=32,224 | LineTo 352,224 | LineTo 352,256 | ArcTo 32,256 | LineTo 32,224 | ClosePath 1
 X=(#Zoom#*12)
 Y=(#Zoom#*21)r
@@ -394,7 +398,7 @@ Shape2=Rectangle 576,64,64,192,24
 Shape3=Rectangle 64,64,480,192
 Shape4=Rectangle 544,128,32,64
 Shape5=Rectangle 96,96,(416*[MeasureBatteryPercent]/100),128
-Shape6=Combine Shape1 | Union Shape2 | Exclude Shape3 | Exclude Shape4 | Union Shape5 | Scale (13/512*#Zoom#),(13/512*#Zoom#),0,0 | Offset 0,130 | TransformOrder Offset,Scale
+Shape6=Combine Shape | Union Shape2 | Exclude Shape3 | Exclude Shape4 | Union Shape5 | Scale (13/512*#Zoom#),(13/512*#Zoom#),0,0 | Offset 0,130 | TransformOrder Offset,Scale
 X=(#Zoom#*0)r
 Y=(#Zoom#*0)r
 Hidden=1
@@ -664,6 +668,16 @@ AntiAlias=1
 
 ;--------������IP--------
 
+[MeasureShowWANIPAlto]
+Measure=String
+String=#ShowWANIP#
+UpdateDivider=-1
+DynamicVariables=1
+IfMatch=True
+IfMatchAction=[!SetOption MeterWANIP Text "%1"][!SetOption MeterWANIP ToolTipHidden 0][!SetOption MeterWANIP LeftMouseUpAction "[!SetVariable ShowWANIP False][!UpdateMeasure MeasureShowWANIPAlto]"][!UpdateMeter MeterWANIP][!Redraw]
+IfMatch2=False
+IfMatchAction2=[!SetOption MeterWANIP Text "***.***.***.***"][!SetOption MeterWANIP ToolTipHidden 1][!SetOption MeterWANIP LeftMouseUpAction "[!SetVariable ShowWANIP True][!UpdateMeasure MeasureShowWANIPAlto]"][!UpdateMeter MeterWANIP][!Redraw]
+
 [MeasureWANIP]
 Measure=WebParser
 ;URL=https://www.httpbin.org/get
@@ -697,7 +711,7 @@ Shape=Ellipse 248,248,248 | Fill Color #FontColour#,255 | StrokeWidth 0
 Shape2=Rectangle 0,152,496,32
 Shape3=Rectangle 0,312,496,32
 Shape4=Path Path1
-Shape5=Combine Shape1 | Exclude Shape2 | Exclude Shape3 | Exclude Shape4 | Scale (13/496*#Zoom#),(13/496*#Zoom#),0,0 | Offset 0,26 | TransformOrder Offset,Scale
+Shape5=Combine Shape | Exclude Shape2 | Exclude Shape3 | Exclude Shape4 | Scale (13/496*#Zoom#),(13/496*#Zoom#),0,0 | Offset 0,26 | TransformOrder Offset,Scale
 Path1=177,10 | ArcTo 248,0,248 | CurveTo 248,496,375,0,375,496 | CurveTo 248,0,121,496,121,0 | ArcTo 319,10,248 | ArcTo 319,486,525 | ArcTo 177,486,248 | ArcTo 177,10,525 | ClosePath 1
 X=(#Zoom#*92)
 Y=(#Zoom#*-35)r
@@ -716,11 +730,15 @@ FontFace=Noto Sans Mono CJK SC
 InlineSetting=CharacterSpacing | (#Zoom#*-1) | (#Zoom#*-1)
 InlinePattern="^\d{1,3}(\.)\d{1,3}(\.)\d{1,3}(\.)\d{1,3}$"
 InlineSetting2=CharacterSpacing | (#Zoom#*0.15) | (#Zoom#*0.15)
-InlinePattern2="^(\d{1,3}).(\d{1,3}).(\d{1,3}).(\d{1,3})$"
+InlinePattern2="^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$"
 InlineSetting3=Face | Noto Sans CJK SC
 InlinePattern3="N/A"
 InlineSetting4=Color | #FontColour4#,255
 InlinePattern4="N/A"
+InlineSetting5=CharacterSpacing | (#Zoom#*-1) | (#Zoom#*-1)
+InlinePattern5="^\*\*\*(\.)\*\*\*(\.)\*\*\*(\.)\*\*\*$"
+InlineSetting6=CharacterSpacing | (#Zoom#*-0.1) | (#Zoom#*-0.1)
+InlinePattern6="^(\*\*\*)\.(\*\*\*)\.(\*\*\*)\.(\*\*\*)$"
 SolidColor=#FontColour2#,1
 DynamicVariables=1
 ToolTipText="[MeasureWANIPLocation]"
@@ -774,7 +792,7 @@ FontFace=Noto Sans Mono CJK SC
 InlineSetting=CharacterSpacing | (#Zoom#*-1) | (#Zoom#*-1)
 InlinePattern="^\d{1,3}(\.)\d{1,3}(\.)\d{1,3}(\.)\d{1,3}$"
 InlineSetting2=CharacterSpacing | (#Zoom#*0.15) | (#Zoom#*0.15)
-InlinePattern2="^(\d{1,3}).(\d{1,3}).(\d{1,3}).(\d{1,3})$"
+InlinePattern2="^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$"
 InlineSetting3=Face | Noto Sans CJK SC
 InlinePattern3="N/A"
 InlineSetting4=Color | #FontColour4#,255
@@ -800,7 +818,7 @@ Shape6=Ellipse 368,224,24
 Shape7=Ellipse 432,224,24
 Shape8=Ellipse 368,384,24
 Shape9=Ellipse 432,384,24
-Shape10=Combine Shape1 | Union Shape2 | Union Shape3 | Exclude Shape4 | Exclude Shape5 | Exclude Shape6 | Exclude Shape7 | Exclude Shape8 | Exclude Shape9 | Scale (12/448*#Zoom#),(12/448*#Zoom#),0,0 | Offset 0,26 | TransformOrder Offset,Scale
+Shape10=Combine Shape | Union Shape2 | Union Shape3 | Exclude Shape4 | Exclude Shape5 | Exclude Shape6 | Exclude Shape7 | Exclude Shape8 | Exclude Shape9 | Scale (12/448*#Zoom#),(12/448*#Zoom#),0,0 | Offset 0,26 | TransformOrder Offset,Scale
 X=(#Zoom#*92)
 Y=(#Zoom#*21)r
 W=(#Zoom#*15)
@@ -818,7 +836,7 @@ FontFace=Noto Sans Mono CJK SC
 InlineSetting=CharacterSpacing | (#Zoom#*-1) | (#Zoom#*-1)
 InlinePattern="^\d{1,3}(\.)\d{1,3}(\.)\d{1,3}(\.)\d{1,3}$"
 InlineSetting2=CharacterSpacing | (#Zoom#*0.15) | (#Zoom#*0.15)
-InlinePattern2="^(\d{1,3}).(\d{1,3}).(\d{1,3}).(\d{1,3})$"
+InlinePattern2="^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$"
 InlineSetting3=Face | Noto Sans CJK SC
 InlinePattern3="N/A"
 InlineSetting4=Color | #FontColour4#,255
@@ -892,7 +910,7 @@ Shape14=Path Path5
 Shape15=Path Path5 | Offset 0,(-224/3)
 Shape16=Path Path5 | Offset 0,(-224/3*2)
 Shape17=Path Path5 | Offset 0,-224
-Shape18=Combine Shape1 | Union Shape2 | Union Shape3 | Union Shape4 | Union Shape5 | Union Shape6 | Union Shape7 | Union Shape8 | Union Shape9 | Union Shape10 | Union Shape11 | Union Shape12 | Union Shape13 | Union Shape14 | Union Shape15 | Union Shape16 | Union Shape17
+Shape18=Combine Shape | Union Shape2 | Union Shape3 | Union Shape4 | Union Shape5 | Union Shape6 | Union Shape7 | Union Shape8 | Union Shape9 | Union Shape10 | Union Shape11 | Union Shape12 | Union Shape13 | Union Shape14 | Union Shape15 | Union Shape16 | Union Shape17
 Shape19=Path PathC | Scale 1,0.9,0,0 | Offset 0,20
 Shape20=Path PathPO | Scale 1,0.9,0,0 | Offset 0,20
 Shape21=Path PathPI | Scale 1,0.9,0,0 | Offset 0,20
@@ -1246,10 +1264,10 @@ Group=Win10
 Meter=Shape
 Shape=Path Path1 | Fill Color #FontColour#,255 | StrokeWidth 0
 Shape2=Path Path2
-Shape3=Combine Shape1 | Union Shape2
-Shape4=Combine Shape1 | Union Shape2 | Offset 1,0
-Shape5=Combine Shape1 | Union Shape2 | Offset 0,1
-Shape6=Combine Shape1 | Union Shape2 | Offset 1,1
+Shape3=Combine Shape | Union Shape2
+Shape4=Combine Shape | Union Shape2 | Offset 1,0
+Shape5=Combine Shape | Union Shape2 | Offset 0,1
+Shape6=Combine Shape | Union Shape2 | Offset 1,1
 Shape7=Combine Shape3 | Union Shape4 | Union Shape5 | Union Shape6 | Scale (15/29*#Zoom#),(15/29*#Zoom#),0,0 | Offset 0,2 | TransformOrder Offset,Scale
 Path1=13.5,16.5 | LineTo 11.3,14.2 | LineTo 18.6,7.8 | LineTo 19.9,9.2 | ClosePath 1
 Path2=23,23 | CurveTo 26.8,13.9,25.3,20.7,26.8,17.5 | CurveTo 13.9,1,26.8,6.8,21,1 | CurveTo 1,13.9,6.8,1,1,6.8 | CurveTo 4.8,23,1,17.5,2.4,20.7 | LineTo 6.6,21.2 | CurveTo 3.6,13.9,4.7,19.3,3.6,16.8 | CurveTo 13.9,3.6,3.6,8.2,8.2,3.6 | CurveTo 24.2,13.9,19.6,3.6,24.2,8.2 | CurveTo 21.2,21.2,24.2,16.7,23,19.3 | LineTo 23,23 | ClosePath 1
@@ -1292,7 +1310,7 @@ Shape3=Ellipse 128,384,80
 Shape4=Rectangle 80,48,96,416,48
 Shape5=Ellipse 128,384,64
 Shape6=Rectangle 96,192,64,256,32
-Shape7=Combine Shape1 | Union Shape2 | Exclude Shape3 | Exclude Shape4 | Union Shape5 | Union Shape6 | Scale (13/512*#Zoom#),(13/512*#Zoom#),0,0 | Offset 78,26 | TransformOrder Offset,Scale
+Shape7=Combine Shape | Union Shape2 | Exclude Shape3 | Exclude Shape4 | Union Shape5 | Union Shape6 | Scale (13/512*#Zoom#),(13/512*#Zoom#),0,0 | Offset 78,26 | TransformOrder Offset,Scale
 X=(#Zoom#*108)
 Y=(#Zoom#*21)r
 W=(#Zoom#*15)
@@ -1326,7 +1344,7 @@ Shape2=Rectangle 128,160,64,96,13
 Shape3=Rectangle 224,32,64,224,13
 Shape4=Rectangle 320,96,64,160,13
 Shape5=Rectangle 416,0,64,256,13
-Shape6=Combine Shape1 | Union Shape2 | Union Shape3 | Union Shape4 | Union Shape5 | Scale (13/500*#Zoom#),(13/500*#Zoom#),0,0 | Offset 0,64 | TransformOrder Offset,Scale
+Shape6=Combine Shape | Union Shape2 | Union Shape3 | Union Shape4 | Union Shape5 | Scale (13/500*#Zoom#),(13/500*#Zoom#),0,0 | Offset 0,64 | TransformOrder Offset,Scale
 Path1=496,384 | LineTo 64,384 | LineTo 64,80 | CurveTo 48,64,64,71.16,56.84,64 | LineTo 16,64 | CurveTo 0,80,7.16,64,0,71.16 | LineTo 0,416 | CurveTo 32,448,0,433.67,14.33,448 | LineTo 496,448 | CurveTo 512,432,504.84,448,512,440.84 | LineTo 512,400 | CurveTo 496,384,512,391.16,504.84,384 | ClosePath 1
 X=(#Zoom#*107)
 Y=(#Zoom#*1)r
@@ -1354,7 +1372,7 @@ Index=0
 Meter=Shape
 Shape=Path Path1 | Fill Color #FontColour#,255 | StrokeWidth 0 | Offset 0,-64
 Shape2=Path Path2 | Offset 0,-64
-Shape3=Combine Shape1 | Union Shape2 | Scale (13/500*#Zoom#),(13/500*#Zoom#),0,0 | Offset 0,64 | TransformOrder Offset,Scale
+Shape3=Combine Shape | Union Shape2 | Scale (13/500*#Zoom#),(13/500*#Zoom#),0,0 | Offset 0,64 | TransformOrder Offset,Scale
 Path1=496,384 | LineTo 64,384 | LineTo 64,80 | CurveTo 48,64,64,71.16,56.84,64 | LineTo 16,64 | CurveTo 0,80,7.16,64,0,71.16 | LineTo 0,416 | CurveTo 32,448,0,433.67,14.33,448 | LineTo 496,448 | CurveTo 512,432,504.84,448,512,440.84 | LineTo 512,400 | CurveTo 496,384,512,391.16,504.84,384 | ClosePath 1
 Path2=464,96 | LineTo 345.94,96 | CurveTo 328.97,136.97,324.56,96,313.85,121.85 | LineTo 361.37,169.37 | LineTo 288,242.75 | LineTo 214.63,169.38 | CurveTo 169.38,169.38,202.13,156.88,181.87,156.88 | LineTo 100.69,238.07 | CurveTo 100.69,260.7,94.44,244.32,94.44,254.45 | LineTo 123.31,283.32 | CurveTo 145.94,283.32,129.56,289.57,139.69,289.57 | LineTo 192,237.25 | LineTo 265.37,310.62 | CurveTo 310.62,310.62,277.87,323.12,298.13,323.12 | LineTo 406.62,214.62 | LineTo 439.02,247.02 | CurveTo 479.99,230.05,454.14,262.14,479.99,251.43 | LineTo 479.99,112 | CurveTo 464,96,480,103.16,472.84,96 | ClosePath 1
 X=(#Zoom#*107)
@@ -1387,7 +1405,7 @@ Shape3=Ellipse 192,64,32
 Shape4=Ellipse 288,160,32
 Shape5=Ellipse 384,224,32
 Shape6=Ellipse 416,64,32
-Shape7=Combine Shape1 | Union Shape2 | Union Shape3 | Union Shape4 | Union Shape5 | Union Shape6 | Scale (13/500*#Zoom#),(13/500*#Zoom#),0,0 | Offset 0,64 | TransformOrder Offset,Scale
+Shape7=Combine Shape | Union Shape2 | Union Shape3 | Union Shape4 | Union Shape5 | Union Shape6 | Scale (13/500*#Zoom#),(13/500*#Zoom#),0,0 | Offset 0,64 | TransformOrder Offset,Scale
 Path1=496,384 | LineTo 64,384 | LineTo 64,80 | CurveTo 48,64,64,71.16,56.84,64 | LineTo 16,64 | CurveTo 0,80,7.16,64,0,71.16 | LineTo 0,416 | CurveTo 32,448,0,433.67,14.33,448 | LineTo 496,448 | CurveTo 512,432,504.84,448,512,440.84 | LineTo 512,400 | CurveTo 496,384,512,391.16,504.84,384 | ClosePath 1
 X=(#Zoom#*107)
 Y=(#Zoom#*21)r
@@ -1846,7 +1864,7 @@ Shape3=Path Path2
 Shape4=Path Path2 | Rotate 90
 Shape5=Rectangle 40,154,25,8,2
 Shape6=Rectangle 70,154,100,8,2
-Shape7=Combine Shape1 | Exclude Shape2 | Union Shape3 | Union Shape4 | Union Shape5 | Union Shape6
+Shape7=Combine Shape | Exclude Shape2 | Union Shape3 | Union Shape4 | Union Shape5 | Union Shape6
 Shape8=Combine Shape7 | Scale (40/200*#Zoom#),(40/200*#Zoom#),0,0
 Path1=12,34 | LineTo 30,34 | LineTo 30,52 | LineTo 170,52 | ArcTo 190,72,20 | LineTo 190,130 | ArcTo 170,150,20 | LineTo 30,150 | LineTo 30,165 | LineTo 23,165 | LineTo 23,134 | ArcTo 19,130,4 | LineTo 19,113 | ArcTo 23,109,4 | LineTo 23,92 | ArcTo 19,88,4 | LineTo 19,71 | ArcTo 23,67,4 | LineTo 23,41 | LineTo 12,41 | ArcTo 12,34 | ClosePath 1
 Path2=149.1,86.4 | CurveTo 145.2,92.8,146,89.5,144.9,91.4 | CurveTo 142,94.3,145.7,94.6,145.4,94.7 | CurveTo 135.5,96.5,138.8,93.8,137.7,94.2 | CurveTo 133.3,103,133.2,98.7,132.8,99.8 | CurveTo 131.8,106.2,133.7,106.4,133.6,106.7 | CurveTo 125.4,110.1,130.4,105.9,128.5,107 | CurveTo 126.3,121,119.3,116.1,119.7,121 | CurveTo 136,111.1,130.4,121,136,115.3 | CurveTo 138,109,136,108.3,136.2,108 | CurveTo 148.4,100.9,142.8,111.6,148.5,107.1 | CurveTo 150.5,97,148.3,97.5,148.5,97 | CurveTo 159.6,89.8,153.4,97,157.6,93.7 | CurveTo 159.5,84.4,161,87.1,161,86.6 | CurveTo 149.1,86.4,157.2,80.8,154,81.4 | ClosePath 1
@@ -6960,7 +6978,7 @@ Shape3=Ellipse 128,384,80
 Shape4=Rectangle 80,48,96,416,48
 Shape5=Ellipse 128,384,64
 Shape6=Rectangle 96,192,64,256,32
-Shape7=Combine Shape1 | Union Shape2 | Exclude Shape3 | Exclude Shape4 | Union Shape5 | Union Shape6 | Scale (13/512*#Zoom#),(13/512*#Zoom#),0,0 | Offset 78,26 | TransformOrder Offset,Scale
+Shape7=Combine Shape | Union Shape2 | Exclude Shape3 | Exclude Shape4 | Union Shape5 | Union Shape6 | Scale (13/512*#Zoom#),(13/512*#Zoom#),0,0 | Offset 78,26 | TransformOrder Offset,Scale
 X=(#Zoom#*130)
 Y=(#Zoom#*1)r
 W=(#Zoom#*15)
@@ -7143,7 +7161,7 @@ Shape12=Path PathRI | Offset 0,5
 Shape13=Path PathAO | Offset 0,5
 Shape14=Path PathAI | Offset 0,5
 Shape15=Path PathM | Offset 0,5
-Shape16=Combine Shape1 | Union Shape2 | Union Shape3 | Union Shape4 | Union Shape5 | Union Shape6 | Union Shape7 | Union Shape8 | Union Shape9 | Exclude Shape10 | Exclude Shape11 | Union Shape12 | Exclude Shape13 | Union Shape14 | Exclude Shape15 | Scale (33/512*#Zoom#),(28/512*#Zoom#),0,0
+Shape16=Combine Shape | Union Shape2 | Union Shape3 | Union Shape4 | Union Shape5 | Union Shape6 | Union Shape7 | Union Shape8 | Union Shape9 | Exclude Shape10 | Exclude Shape11 | Union Shape12 | Exclude Shape13 | Union Shape14 | Exclude Shape15 | Scale (33/512*#Zoom#),(28/512*#Zoom#),0,0
 Path1=48,416 | LineTo 464,416 | ArcTo 512,368,48,48,0,1,0 | LineTo 512,144 | ArcTo 464,96,48,48,0,1,0 | LineTo 48,96 | ArcTo 0,144,48,48,0,1,0 | LineTo 0,368 | ArcTo 48,416,48,48,0,1,0 | ClosePath 1
 Path2=106,512 | LineTo 118,512 | ArcTo 124,506,6,6,0,1,0 | LineTo 124,488 | LineTo 130,488 | ArcTo 136,482,6,6,0,1,0 | LineTo 136,440 | LineTo 88,440 | LineTo 88,482 | ArcTo 94,488,6,6,0,1,0 | LineTo 100,488 | LineTo 100,506 | ArcTo 106,512,6,6,0,1,0 | ClosePath 1
 Path3=376,30 | LineTo 376,72 | LineTo 424,72 | LineTo 424,30 | ArcTo 418,24,6,6,0,1,0 | LineTo 412,24 | LineTo 412,6 | ArcTo 406,0,6,6,0,1,0 | LineTo 394,0 | ArcTo 388,6,6,6,0,1,0 | LineTo 388,24 | LineTo 382,24 | ArcTo 376,30,6,6,0,1,0 | ClosePath 1
@@ -7320,7 +7338,7 @@ Shape2=Rectangle 160,64,64,128
 Shape3=Rectangle 288,64,64,128
 Shape4=Rectangle 416,64,64,128
 Shape5=Rectangle 0,256,640,32
-Shape6=Combine Shape1 | Exclude Shape2 | Exclude Shape3 | Exclude Shape4 | Exclude Shape5 | Scale (20/384*#Zoom#),(20/384*#Zoom#),0,0
+Shape6=Combine Shape | Exclude Shape2 | Exclude Shape3 | Exclude Shape4 | Exclude Shape5 | Scale (20/384*#Zoom#),(20/384*#Zoom#),0,0
 Path1=0,384 | LineTo 0,157 | ArcTo 0,67,48,*,*,1 | LineTo 0,32 | ArcTo 32,0,32 | LineTo 608,0 | ArcTo 640,32,32 | LineTo 640,67 | ArcTo 640,157,48,*,*,1 | LineTo 640,384 | LineTo 576,384 | LineTo 576,357 | ArcTo 544,357,*,*,*,1 | LineTo 544,384 | LineTo 416,384 | LineTo 416,357 | ArcTo 384,357,*,*,*,1 | LineTo 384,384 | LineTo 256,384 | LineTo 256,357 | ArcTo 224,357,*,*,*,1 | LineTo 224,384 | LineTo 96,384 | LineTo 96,357 | ArcTo 64,357,*,*,*,1 | LineTo 64,384 | LineTo 0,384 | ClosePath 1
 X=(#Zoom#*34)
 Y=(#Zoom#*40)r
@@ -7589,7 +7607,7 @@ Shape=Path Path1 | Fill Color #FontColour#,255 | StrokeWidth 0
 Shape2=Path Path2
 Shape3=Path Path3
 Shape4=Path Path4
-Shape5=Combine Shape1 | XOR Shape2 | XOR Shape3 | XOR Shape4 | Scale (35/600*#Zoom#),(35/600*#Zoom#),0,0
+Shape5=Combine Shape | XOR Shape2 | XOR Shape3 | XOR Shape4 | Scale (35/600*#Zoom#),(35/600*#Zoom#),0,0
 Path1=576,304 | LineTo 576,400 | CurveTo 528,448,576,426.51,554.51,448 | LineTo 48,448 | CurveTo 0,400,21.49,448,0,426.51 | LineTo 0,304 | CurveTo 48,256,0,277.49,21.49,256 | LineTo 528,256 | CurveTo 576,304,554.51,256,576,277.49 | ClosePath 1
 Path2=528,224 | ArcTo 558.777,230.165,79.557,79.557,0,0,0 | LineTo 462.25,85.374 | ArcTo 422.311,64,48.003,48.003,0,1,0 | LineTo 153.689,64 | ArcTo 113.751,85.374,48,48,0,1,0 | LineTo 17.223,230.165 | ArcTo 48,224,79.557,79.557,0,0,0 | LineTo 528,224 | ClosePath 1
 Path3=480,320 | CurveTo 448,352,462.327,320,448,334.327 | CurveTo 480,384,448,369.673,462.327,384 | CurveTo 512,352,497.673,384,512,369.673 | CurveTo 480,320,512,334.327,497.673,320 | ClosePath 1
@@ -8915,7 +8933,7 @@ Shape2=Rectangle 160,288,192,128,56
 Shape3=Path Path2 | Rotate 180
 Shape4=Ellipse 368,464,20
 Shape5=Ellipse 432,464,20
-Shape6=Combine Shape1 | Exclude Shape2 | Union Shape3 | Exclude Shape4 | Exclude Shape5 | Scale (13/512*#Zoom#),(13/512*#Zoom#),0,0
+Shape6=Combine Shape | Exclude Shape2 | Union Shape3 | Exclude Shape4 | Exclude Shape5 | Scale (13/512*#Zoom#),(13/512*#Zoom#),0,0
 Path1=171,352 | LineTo 341,352 | LineTo 292,401 | ArcTo 220,401,52 | LineTo 171,352 | ClosePath 1
 Path2=216,0 | LineTo 296,0 | ArcTo 320,24,24 | LineTo 320,192 | LineTo 408,192 | ArcTo 422,226,21 | LineTo 270,378 | ArcTo 242,378,21 | LineTo 90,226 | ArcTo 104,192,21 | LineTo 192,192 | LineTo 192,24 | ArcTo 216,0,24 | ClosePath 1
 X=(#Zoom#*12)
@@ -8955,7 +8973,7 @@ Shape2=Path Path1
 Shape3=Path Path2
 Shape4=Ellipse 368,464,20
 Shape5=Ellipse 432,464,20
-Shape6=Combine Shape1 | Exclude Shape2 | Union Shape3 | Exclude Shape4 | Exclude Shape5 | Scale (13/512*#Zoom#),(13/512*#Zoom#),0,0
+Shape6=Combine Shape | Exclude Shape2 | Union Shape3 | Exclude Shape4 | Exclude Shape5 | Scale (13/512*#Zoom#),(13/512*#Zoom#),0,0
 Path1=171,352 | LineTo 341,352 | LineTo 292,401 | ArcTo 220,401,52 | LineTo 171,352 | ClosePath 1
 Path2=216,0 | LineTo 296,0 | ArcTo 320,24,24 | LineTo 320,192 | LineTo 408,192 | ArcTo 422,226,21 | LineTo 270,378 | ArcTo 242,378,21 | LineTo 90,226 | ArcTo 104,192,21 | LineTo 192,192 | LineTo 192,24 | ArcTo 216,0,24 | ClosePath 1
 X=(#Zoom#*112)
@@ -9024,4 +9042,3 @@ StringAlign=Right
 NumOfDecimals=0
 AutoScale=1
 Y=0r
-