Portable Tool for an Ideal Windows Setup
C# activatorbloatware-removalcsharpdebloatdebloaterdisable-servicesmonitoring-systemportableprivacy-toolsregistry-tweakssystem-tuningsystem-utilitytelemetrytweakerwindows-10windows-11windows-debloatwindows-defenderwindows-optimizationwindows-tweaks
upd toolset page mvvm & add apps catalog #78 #96
Greedeks73c987c830fa
diff --git a/.Source/GTweak/Assets/DrawingImages/SettingsPanel.xaml b/.Source/GTweak/Assets/DrawingImages/SettingsPanel.xamlindex 82538b14..978bff47 100644--- a/.Source/GTweak/Assets/DrawingImages/SettingsPanel.xaml+++ b/.Source/GTweak/Assets/DrawingImages/SettingsPanel.xaml@@ -58,18 +58,18 @@<DrawingImage x:Key="Icon_Git"><DrawingImage.Drawing><DrawingGroup ClipGeometry="M0,0 V31 H31 V0 H0 Z">- <GeometryDrawing Brush="{DynamicResource Brush_Inactive}" Geometry="F1 M31,31z M0,0z M20.9,5.7C21,5.7 21,5.7 21,5.8 21.9,6.3 22.6,6.9 23.4,7.6L23.5,7.7C24.4,8.6 25.1,9.7 25.6,10.8 25.6,10.9 25.7,10.9 25.7,11 26.9,13.7 26.9,16.8 25.9,19.6 24.9,22.1 23,24.2 20.6,25.5 20.5,25.5 20.5,25.6 20.4,25.6 17.9,26.9 14.9,27.1 12.2,26.3 10.4,25.7 8.8,24.8 7.5,23.5L7.4,23.4C5.6,21.7,4.6,19.3,4.3,16.9L4.3,16.7C4,14.4 4.6,12.1 5.7,10.1 5.7,10.1 5.7,10 5.8,10 6.3,9.1 6.9,8.4 7.6,7.6L7.7,7.5C8.6,6.6 9.7,5.9 10.8,5.4 10.9,5.4 10.9,5.4 11,5.3 14.2,3.8 17.9,4 20.9,5.7 M8.2,7.9L8,8.1C6,10 5,12.7 4.9,15.4 4.9,18.3 6,21 8,23.1 10,25.1 12.7,26.1 15.5,26.2 18.3,26.2 21,25 23,23 24.9,21 26,18.3 26,15.5 25.9,12.7 24.7,10 22.7,8 21.3,6.7 19.7,5.9 18,5.4 17.9,5.4 17.9,5.4 17.8,5.3 14.3,4.4 10.8,5.6 8.2,7.9" />- <GeometryDrawing Brush="{DynamicResource Brush_Inactive}" Geometry="F1 M31,31z M0,0z M18.8,6.4L18.9,6.5C18.9,6.6 18.9,6.6 18.8,6.7 18.4,6.7 18.1,6.6 17.7,6.5 15.3,5.8 12.8,6.3 10.6,7.5L9.4,8.4 9.3,8.5C8.6,9.1 8,9.9 7.5,10.7 7.5,10.7 7.5,10.8 7.4,10.8 6.2,12.8 5.9,15.3 6.4,17.6 6.8,19 7.4,20.3 8.4,21.4L8.5,21.5C9.1,22.2 9.9,22.8 10.7,23.3 10.8,23.3 10.8,23.3 10.8,23.4 12.8,24.6 15.3,24.9 17.6,24.4 20,23.8 22.1,22.3 23.3,20.2 24.6,18.1 25,15.5 24.4,13.1 23.9,11.4 23.1,9.9 21.8,8.7L21.6,8.5C21.6,8.3 21.6,8.3 21.7,8.2 22.2,8.2 22.5,8.8 22.8,9.1 24.5,11.2 25.3,13.8 25,16.5 25,16.8 24.9,17.2 24.8,17.5L24.8,17.6C24.2,20.1 22.7,22.2 20.5,23.6 18.3,25 15.7,25.4 13.2,24.8 10.7,24.2 8.5,22.6 7.1,20.4 5.8,18.2 5.3,15.6 6,13.1 6.2,12.4 6.4,11.7 6.8,11.1 6.8,11 6.9,11 6.9,10.9 8,8.7 10.1,7 12.4,6.2 14.4,5.7 16.9,5.6 18.8,6.4" />- <GeometryDrawing Brush="{DynamicResource Brush_Inactive}" Geometry="F1 M31,31z M0,0z M19.6,6.8C20,6.8,20.2,7,20.5,7.2L20.5,7.5C20.3,7.6 20.2,7.5 19.9,7.4 19.8,7.4 19.8,7.3 19.7,7.3 19.5,7.2 19.5,7.2 19.5,7 19.5,7 19.5,6.9 19.6,6.8Q19.45,6.95,19.6,6.8 M20.8,7.6C21.1,7.6 21.2,7.7 21.4,7.9 21.4,8 21.4,8.1 21.3,8.1 21.2,8.2 21.2,8.2 21.1,8.2L20.8,7.9z" />+ <GeometryDrawing Brush="{DynamicResource Brush_Highlighted}" Geometry="F1 M31,31z M0,0z M20.9,5.7C21,5.7 21,5.7 21,5.8 21.9,6.3 22.6,6.9 23.4,7.6L23.5,7.7C24.4,8.6 25.1,9.7 25.6,10.8 25.6,10.9 25.7,10.9 25.7,11 26.9,13.7 26.9,16.8 25.9,19.6 24.9,22.1 23,24.2 20.6,25.5 20.5,25.5 20.5,25.6 20.4,25.6 17.9,26.9 14.9,27.1 12.2,26.3 10.4,25.7 8.8,24.8 7.5,23.5L7.4,23.4C5.6,21.7,4.6,19.3,4.3,16.9L4.3,16.7C4,14.4 4.6,12.1 5.7,10.1 5.7,10.1 5.7,10 5.8,10 6.3,9.1 6.9,8.4 7.6,7.6L7.7,7.5C8.6,6.6 9.7,5.9 10.8,5.4 10.9,5.4 10.9,5.4 11,5.3 14.2,3.8 17.9,4 20.9,5.7 M8.2,7.9L8,8.1C6,10 5,12.7 4.9,15.4 4.9,18.3 6,21 8,23.1 10,25.1 12.7,26.1 15.5,26.2 18.3,26.2 21,25 23,23 24.9,21 26,18.3 26,15.5 25.9,12.7 24.7,10 22.7,8 21.3,6.7 19.7,5.9 18,5.4 17.9,5.4 17.9,5.4 17.8,5.3 14.3,4.4 10.8,5.6 8.2,7.9" />+ <GeometryDrawing Brush="{DynamicResource Brush_Highlighted}" Geometry="F1 M31,31z M0,0z M18.8,6.4L18.9,6.5C18.9,6.6 18.9,6.6 18.8,6.7 18.4,6.7 18.1,6.6 17.7,6.5 15.3,5.8 12.8,6.3 10.6,7.5L9.4,8.4 9.3,8.5C8.6,9.1 8,9.9 7.5,10.7 7.5,10.7 7.5,10.8 7.4,10.8 6.2,12.8 5.9,15.3 6.4,17.6 6.8,19 7.4,20.3 8.4,21.4L8.5,21.5C9.1,22.2 9.9,22.8 10.7,23.3 10.8,23.3 10.8,23.3 10.8,23.4 12.8,24.6 15.3,24.9 17.6,24.4 20,23.8 22.1,22.3 23.3,20.2 24.6,18.1 25,15.5 24.4,13.1 23.9,11.4 23.1,9.9 21.8,8.7L21.6,8.5C21.6,8.3 21.6,8.3 21.7,8.2 22.2,8.2 22.5,8.8 22.8,9.1 24.5,11.2 25.3,13.8 25,16.5 25,16.8 24.9,17.2 24.8,17.5L24.8,17.6C24.2,20.1 22.7,22.2 20.5,23.6 18.3,25 15.7,25.4 13.2,24.8 10.7,24.2 8.5,22.6 7.1,20.4 5.8,18.2 5.3,15.6 6,13.1 6.2,12.4 6.4,11.7 6.8,11.1 6.8,11 6.9,11 6.9,10.9 8,8.7 10.1,7 12.4,6.2 14.4,5.7 16.9,5.6 18.8,6.4" />+ <GeometryDrawing Brush="{DynamicResource Brush_Highlighted}" Geometry="F1 M31,31z M0,0z M19.6,6.8C20,6.8,20.2,7,20.5,7.2L20.5,7.5C20.3,7.6 20.2,7.5 19.9,7.4 19.8,7.4 19.8,7.3 19.7,7.3 19.5,7.2 19.5,7.2 19.5,7 19.5,7 19.5,6.9 19.6,6.8Q19.45,6.95,19.6,6.8 M20.8,7.6C21.1,7.6 21.2,7.7 21.4,7.9 21.4,8 21.4,8.1 21.3,8.1 21.2,8.2 21.2,8.2 21.1,8.2L20.8,7.9z" /><DrawingGroup Opacity="1"><GeometryDrawing Geometry="F1 M31,31z M0,0z M18.5,24.3L18.5,21.2C18.5,20.3,17.9,19.5,17.2,19.1L18,19.1C20.3,19.1 22.2,17.3 22.2,15 22.2,13.9 21.8,12.9 21.1,12.1 21.2,11.4 21.2,10.3 20.9,9.4 19.4,9.4 18.2,10.5 18,10.7L13.7,10.7C13.5,10.5 12.4,9.4 10.9,9.4 10.6,10.2 10.5,11.1 10.6,11.8 9.8,12.5 9.3,13.6 9.3,14.9 9.3,17.2 11.2,19 13.5,19L14.3,19C13.6,19.3 13.1,19.9 13,20.7 12.3,20.7 11.3,20.6 10.9,20 10.1,18.8 9.7,18.8 9.3,18.8 8.9,18.8 8.9,19.2 9.3,19.6 9.7,20 9.7,20 10.1,20.8 10.4,21.5 11.3,22 13,22L13,24.2"><GeometryDrawing.Pen>- <Pen Brush="{DynamicResource Brush_Inactive}" Thickness="0.5" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />+ <Pen Brush="{DynamicResource Brush_Highlighted}" Thickness="0.5" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" /></GeometryDrawing.Pen></GeometryDrawing><GeometryDrawing Geometry="F1 M31,31z M0,0z M10.4,13.8C10.5,13.5,10.7,13.1,11.1,12.8 M10.2,15.5L10.2,14.5 M12.8,18.1C11.7,17.9,10.8,17.1,10.4,16.1"><GeometryDrawing.Pen>- <Pen Brush="{DynamicResource Brush_Inactive}" Thickness="0.5" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />+ <Pen Brush="{DynamicResource Brush_Highlighted}" Thickness="0.5" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" /></GeometryDrawing.Pen></GeometryDrawing></DrawingGroup>@@ -80,7 +80,7 @@<DrawingImage x:Key="Icon_Steam"><DrawingImage.Drawing><DrawingGroup ClipGeometry="M0,0 V31 H31 V0 H0 Z">- <GeometryDrawing Brush="{DynamicResource Brush_Inactive}" Geometry="F1 M31,31z M0,0z M15.5,4.34C9.34,4.34 4.34,9.34 4.34,15.5 4.34,21.66 9.34,26.66 15.5,26.66 21.66,26.66 26.66,21.66 26.66,15.5 26.66,9.34 21.66,4.34 15.5,4.34 M15.5,4.96C21.324,4.96 26.04,9.676 26.04,15.5 26.04,21.324 21.323,26.04 15.5,26.04A10.54,10.54,0,0,1,5.531,18.926L8.781,20.136C9.101,21.305,10.137,22.207,11.371,22.309A2.95,2.95,0,0,0,14.426,20.281A0.5,0.5,0,0,1,14.602,20.027L18.57,17.105A0.5,0.5,0,0,1,18.797,17.02A4.336,4.336,0,0,0,22.621,12.445C22.496,10.281,20.719,8.504,18.555,8.379A4.336,4.336,0,0,0,13.98,12.203A0.5,0.5,0,0,1,13.895,12.43L10.973,16.398A0.5,0.5,0,0,1,10.719,16.574A3,3,0,0,0,10.102,16.859L4.996,14.645C5.434,9.219,9.965,4.96,15.5,4.96 M15.371,5.887C11.231,5.941 7.441,8.691 6.254,12.879 6.141,13.281 6.054,13.679 5.996,14.082A0.15,0.15,0,0,0,6.046,14.23A0.16,0.16,0,0,0,6.203,14.254A0.16,0.16,0,0,0,6.301,14.129Q6.387,13.545,6.551,12.965A9.302,9.302,0,0,1,20.961,7.969C21.031,8.019,21.129,8.004,21.18,7.934A0.15,0.15,0,0,0,21.145,7.719A9.6,9.6,0,0,0,16.203,5.914A10,10,0,0,0,15.371,5.887 M21.828,8.324A0.16,0.16,0,0,0,21.691,8.43A0.15,0.15,0,0,0,21.734,8.598Q21.994,8.831,22.23,9.082A0.16,0.16,0,0,0,22.383,9.132A0.17,0.17,0,0,0,22.5,9.02A0.16,0.16,0,0,0,22.457,8.867A9,9,0,0,0,21.941,8.367A0.17,0.17,0,0,0,21.828,8.324 M18.128,8.684A5,5,0,0,1,18.535,8.688C20.543,8.805,22.195,10.457,22.313,12.465A4.023,4.023,0,0,1,18.762,16.711A0.8,0.8,0,0,0,18.387,16.855L14.418,19.777A0.8,0.8,0,0,0,14.133,20.184A2.64,2.64,0,0,1,11.398,22C10.375,21.914,9.5,21.207,9.152,20.273L11.055,20.98 11.055,20.984A1.71,1.71,0,0,0,13.211,20.066A1.707,1.707,0,0,0,12.328,17.824L12.203,17.77 10.457,17.016A2.4,2.4,0,0,1,10.817,16.867C10.969,16.817,11.117,16.727,11.223,16.582L14.145,12.613A0.8,0.8,0,0,0,14.289,12.238A4.024,4.024,0,0,1,18.129,8.684 M22.829,9.371A0.16,0.16,0,0,0,22.689,9.461A0.16,0.16,0,0,0,22.712,9.625C22.79,9.723 22.868,9.825 22.942,9.922 22.997,9.992 23.091,10.008 23.162,9.957A0.157,0.157,0,0,0,23.192,9.738Q23.074,9.581,22.95,9.43A0.15,0.15,0,0,0,22.83,9.371 M18.291,9.609A3.1,3.1,0,0,0,18.291,15.809A3.1,3.1,0,0,0,21.393,12.711A3.11,3.11,0,0,0,18.289,9.609 M18.289,9.922A2.786,2.786,0,0,1,21.079,12.711A2.786,2.786,0,0,1,18.289,15.5A2.786,2.786,0,0,1,15.5,12.71A2.786,2.786,0,0,1,18.29,9.922 M23.513,10.34A0.15,0.15,0,0,0,23.383,10.426A0.16,0.16,0,0,0,23.392,10.578A9.302,9.302,0,0,1,12.965,24.45A9.28,9.28,0,0,1,7.68,20.532A0.157,0.157,0,0,0,7.406,20.544A0.16,0.16,0,0,0,7.418,20.7A9.57,9.57,0,0,0,12.878,24.747C17.984,26.192,23.301,23.227,24.746,18.122A9.6,9.6,0,0,0,23.656,10.415A0.16,0.16,0,0,0,23.527,10.341z M18.29,10.54A2.17,2.17,0,1,0,20.462,12.712C20.462,11.512,19.489,10.539,18.29,10.539 M18.29,10.851C19.321,10.851,20.15,11.679,20.15,12.71A1.859,1.859,0,1,1,18.29,10.85 M4.974,14.97L10.013,17.158A0.2,0.2,0,0,0,10.079,17.185L12.079,18.053 12.204,18.107A1.392,1.392,0,0,1,11.164,20.689L5.411,18.545A10.5,10.5,0,0,1,4.974,14.971 M4.974,14.971" />+ <GeometryDrawing Brush="{DynamicResource Brush_Highlighted}" Geometry="F1 M31,31z M0,0z M15.5,4.34C9.34,4.34 4.34,9.34 4.34,15.5 4.34,21.66 9.34,26.66 15.5,26.66 21.66,26.66 26.66,21.66 26.66,15.5 26.66,9.34 21.66,4.34 15.5,4.34 M15.5,4.96C21.324,4.96 26.04,9.676 26.04,15.5 26.04,21.324 21.323,26.04 15.5,26.04A10.54,10.54,0,0,1,5.531,18.926L8.781,20.136C9.101,21.305,10.137,22.207,11.371,22.309A2.95,2.95,0,0,0,14.426,20.281A0.5,0.5,0,0,1,14.602,20.027L18.57,17.105A0.5,0.5,0,0,1,18.797,17.02A4.336,4.336,0,0,0,22.621,12.445C22.496,10.281,20.719,8.504,18.555,8.379A4.336,4.336,0,0,0,13.98,12.203A0.5,0.5,0,0,1,13.895,12.43L10.973,16.398A0.5,0.5,0,0,1,10.719,16.574A3,3,0,0,0,10.102,16.859L4.996,14.645C5.434,9.219,9.965,4.96,15.5,4.96 M15.371,5.887C11.231,5.941 7.441,8.691 6.254,12.879 6.141,13.281 6.054,13.679 5.996,14.082A0.15,0.15,0,0,0,6.046,14.23A0.16,0.16,0,0,0,6.203,14.254A0.16,0.16,0,0,0,6.301,14.129Q6.387,13.545,6.551,12.965A9.302,9.302,0,0,1,20.961,7.969C21.031,8.019,21.129,8.004,21.18,7.934A0.15,0.15,0,0,0,21.145,7.719A9.6,9.6,0,0,0,16.203,5.914A10,10,0,0,0,15.371,5.887 M21.828,8.324A0.16,0.16,0,0,0,21.691,8.43A0.15,0.15,0,0,0,21.734,8.598Q21.994,8.831,22.23,9.082A0.16,0.16,0,0,0,22.383,9.132A0.17,0.17,0,0,0,22.5,9.02A0.16,0.16,0,0,0,22.457,8.867A9,9,0,0,0,21.941,8.367A0.17,0.17,0,0,0,21.828,8.324 M18.128,8.684A5,5,0,0,1,18.535,8.688C20.543,8.805,22.195,10.457,22.313,12.465A4.023,4.023,0,0,1,18.762,16.711A0.8,0.8,0,0,0,18.387,16.855L14.418,19.777A0.8,0.8,0,0,0,14.133,20.184A2.64,2.64,0,0,1,11.398,22C10.375,21.914,9.5,21.207,9.152,20.273L11.055,20.98 11.055,20.984A1.71,1.71,0,0,0,13.211,20.066A1.707,1.707,0,0,0,12.328,17.824L12.203,17.77 10.457,17.016A2.4,2.4,0,0,1,10.817,16.867C10.969,16.817,11.117,16.727,11.223,16.582L14.145,12.613A0.8,0.8,0,0,0,14.289,12.238A4.024,4.024,0,0,1,18.129,8.684 M22.829,9.371A0.16,0.16,0,0,0,22.689,9.461A0.16,0.16,0,0,0,22.712,9.625C22.79,9.723 22.868,9.825 22.942,9.922 22.997,9.992 23.091,10.008 23.162,9.957A0.157,0.157,0,0,0,23.192,9.738Q23.074,9.581,22.95,9.43A0.15,0.15,0,0,0,22.83,9.371 M18.291,9.609A3.1,3.1,0,0,0,18.291,15.809A3.1,3.1,0,0,0,21.393,12.711A3.11,3.11,0,0,0,18.289,9.609 M18.289,9.922A2.786,2.786,0,0,1,21.079,12.711A2.786,2.786,0,0,1,18.289,15.5A2.786,2.786,0,0,1,15.5,12.71A2.786,2.786,0,0,1,18.29,9.922 M23.513,10.34A0.15,0.15,0,0,0,23.383,10.426A0.16,0.16,0,0,0,23.392,10.578A9.302,9.302,0,0,1,12.965,24.45A9.28,9.28,0,0,1,7.68,20.532A0.157,0.157,0,0,0,7.406,20.544A0.16,0.16,0,0,0,7.418,20.7A9.57,9.57,0,0,0,12.878,24.747C17.984,26.192,23.301,23.227,24.746,18.122A9.6,9.6,0,0,0,23.656,10.415A0.16,0.16,0,0,0,23.527,10.341z M18.29,10.54A2.17,2.17,0,1,0,20.462,12.712C20.462,11.512,19.489,10.539,18.29,10.539 M18.29,10.851C19.321,10.851,20.15,11.679,20.15,12.71A1.859,1.859,0,1,1,18.29,10.85 M4.974,14.97L10.013,17.158A0.2,0.2,0,0,0,10.079,17.185L12.079,18.053 12.204,18.107A1.392,1.392,0,0,1,11.164,20.689L5.411,18.545A10.5,10.5,0,0,1,4.974,14.971 M4.974,14.971" /></DrawingGroup></DrawingImage.Drawing></DrawingImage>@@ -88,21 +88,22 @@<DrawingImage x:Key="Icon_Telegram"><DrawingImage.Drawing><DrawingGroup ClipGeometry="M0,0 V31 H31 V0 H0 Z">- <GeometryDrawing Brush="{DynamicResource Brush_Inactive}" Geometry="F1 M31,31z M0,0z M20.95,5.691L21.066,5.754C21.949,6.246,22.703,6.875,23.43,7.57Q23.493,7.63,23.563,7.687C24.465,8.551,25.148,9.652,25.672,10.777L25.77,10.984C26.988,13.68 26.996,16.816 25.96,19.566 24.969,22.098 23.098,24.152 20.707,25.43Q20.614,25.483,20.516,25.535C18.059,26.855 14.969,27.039 12.316,26.262 10.496,25.703 8.941,24.738 7.57,23.43L7.437,23.313C5.684,21.641,4.676,19.199,4.359,16.832L4.336,16.664C4.07,14.394,4.598,12.043,5.691,10.051Q5.722,9.991,5.754,9.934C6.246,9.05,6.875,8.297,7.57,7.57Q7.63,7.506,7.687,7.437C8.551,6.535 9.652,5.852 10.777,5.328 10.879,5.281 10.879,5.281 10.984,5.23 14.152,3.797 17.922,4.027 20.949,5.691 M8.171,7.93C8.128,7.973 8.081,8.012 8.038,8.055 6.085,9.915 5.038,12.665 4.964,15.32 4.94,18.215 6.074,20.918 8.089,22.988 10.065,24.953 12.789,26.031 15.565,26.039 18.397,26.004 21.085,24.824 23.077,22.82 25.011,20.809 26.054,18.098 26.034,15.32 25.972,12.488 24.757,9.793 22.722,7.828 21.37,6.57 19.757,5.738 17.983,5.266 17.909,5.25 17.839,5.23 17.765,5.211 14.3,4.371 10.753,5.586 8.171,7.93 M8.171,7.93" />- <GeometryDrawing Brush="{DynamicResource Brush_Inactive}" Geometry="F1 M31,31z M0,0z M18.828,6.418C18.891,6.477 18.891,6.477 18.953,6.539 18.93,6.668 18.93,6.668 18.891,6.781A6,6,0,0,1,17.789,6.574C15.367,5.918 12.871,6.367 10.707,7.59 10.277,7.848 9.887,8.152 9.507,8.477L9.41,8.559A8.6,8.6,0,0,0,7.57,10.777C7.547,10.817 7.523,10.852 7.5,10.891 6.316,12.891 5.969,15.398 6.516,17.652 6.886,19.074 7.52,20.375 8.476,21.492Q8.517,21.544,8.559,21.59A8.6,8.6,0,0,0,10.777,23.43C10.832,23.465 10.832,23.465 10.891,23.5 12.891,24.684 15.398,25.031 17.652,24.484 20.039,23.864 22.117,22.41 23.395,20.285 24.652,18.141 25.075,15.613 24.445,13.191 23.977,11.511 23.105,9.973 21.835,8.766Q21.755,8.684,21.675,8.598C21.684,8.422 21.684,8.422 21.735,8.297 22.23,8.34 22.57,8.859 22.875,9.219 24.602,11.329 25.34,13.875 25.113,16.586Q25.056,17.078,24.945,17.559C24.934,17.617,24.934,17.617,24.918,17.679A9.7,9.7,0,0,1,20.664,23.679C18.473,25.035 15.84,25.504 13.316,24.929 10.789,24.301 8.613,22.766 7.242,20.543 5.945,18.367 5.484,15.707 6.094,13.227 6.274,12.523 6.524,11.855 6.844,11.203Q6.889,11.099,6.941,10.996C8.071,8.796 10.094,7.106 12.434,6.32 14.438,5.68 16.855,5.594 18.828,6.418 M18.828,6.418" />- <GeometryDrawing Brush="{DynamicResource Brush_Inactive}" Geometry="F1 M31,31z M0,0z M20.223,10.535C20.383,10.617 20.383,10.617 20.465,10.777 20.515,11.254 20.418,11.719 20.325,12.184L20.277,12.418C20.238,12.633,20.195,12.844,20.157,13.058Q20.087,13.393 20.023,13.727 19.917,14.292 19.805,14.859L19.5,16.438C19.418,16.852,19.34,17.266,19.258,17.676L19.234,17.809 18.93,19.355 18.824,19.918A9,9,0,0,0,18.762,20.23L18.738,20.367C18.684,20.641,18.602,20.812,18.406,21.007A1.18,1.18,0,0,1,17.648,21.121C17.359,21.023,17.148,20.813,16.926,20.609Q16.673,20.389,16.414,20.168C16.195,19.984,15.98,19.793,15.766,19.605Q15.66,19.51,15.555,19.422C15.504,19.379 15.504,19.379 15.457,19.332 15.266,19.168 15.215,19.132 14.953,19.132A4,4,0,0,0,14.617,19.43C14.555,19.488 14.488,19.55 14.426,19.61 14.395,19.64 14.359,19.672 14.328,19.703Q14.094,19.925 13.859,20.141 13.778,20.212 13.695,20.289C13.523,20.437 13.465,20.461 13.238,20.489 13.016,20.465 13.016,20.465 12.895,20.339A2.8,2.8,0,0,1,12.594,19.695Q12.57,19.629,12.547,19.559L12.395,19.125C12.359,19.027,12.325,18.925,12.289,18.828Q12.183,18.537,12.082,18.246C11.969,17.922,11.852,17.602,11.73,17.277Q11.709,17.211,11.68,17.141C11.602,16.921,11.602,16.921,11.504,16.711A13,13,0,0,0,10.98,16.563A10,10,0,0,1,10.656,16.477A25,25,0,0,1,10.141,16.344C9.97699999999999,16.304,9.80899999999999,16.258,9.64499999999999,16.214Q9.56899999999999,16.199,9.49199999999999,16.176A1.53,1.53,0,0,1,8.71899999999999,15.742C8.62499999999999,15.551 8.63699999999999,15.406 8.65599999999999,15.195 8.87499999999999,14.871 9.08999999999999,14.746 9.45299999999999,14.609Q9.52499999999999,14.579,9.60199999999999,14.551L10.098,14.351 10.449,14.211 11.215,13.906Q11.848,13.655,12.48,13.398C12.586,13.355,12.586,13.355,12.7,13.313Q12.918,13.219,13.137,13.133L14.238,12.688Q15.268,12.276,16.293,11.859C17.086,11.539 17.879,11.215 18.676,10.899 18.715,10.883 18.75,10.867 18.793,10.852L19.109,10.722 19.289,10.652C19.609,10.527,19.883,10.496,20.223,10.535 M19.422,11.008L19.234,11.082A5,5,0,0,0,19.027,11.168A5,5,0,0,0,18.805,11.258L18.18,11.508 17.598,11.742C16.949,12.004,16.305,12.266,15.656,12.532L14.516,12.992Q14.309,13.074 14.109,13.16 13.354,13.46 12.605,13.766L10.719,14.531 10.589,14.582 9.84799999999999,14.887 9.67199999999999,14.957Q9.59699999999999,14.99 9.51599999999999,15.023 9.45199999999999,15.048 9.38299999999999,15.078A2,2,0,0,0,9.02299999999999,15.32C9.02699999999999,15.434 9.02699999999999,15.434 9.08199999999999,15.562 9.74599999999999,16.027 10.879,16.324 11.687,16.348 12.184,16.258 12.539,15.953 12.918,15.633 13.191,15.41 13.492,15.234 13.793,15.055Q13.974,14.939 14.156,14.825 14.836,14.403 15.516,13.988 16.296,13.508 17.074,13.016C18.031,12.414 18.031,12.414 18.312,12.41 18.469,12.473 18.469,12.473 18.555,12.574 18.602,12.774 18.585,12.883 18.527,13.078 18.402,13.23 18.257,13.359 18.105,13.488L17.859,13.711 17.734,13.821Q17.506,14.031,17.289,14.254A7,7,0,0,1,16.777,14.734A10,10,0,0,0,16.164,15.32C15.973,15.516 15.777,15.71 15.562,15.89 15.301,16.113 15.062,16.36 14.82,16.602 14.602,16.824 14.379,17.032 14.137,17.227A1,1,0,0,0,13.926,17.559Q14.722,18.25,15.523,18.929L15.918,19.262Q16.013,19.344,16.113,19.426L16.617,19.856C17.203,20.43 17.203,20.43 17.922,20.766 18.086,20.754 18.086,20.754 18.227,20.648 18.407,20.191 18.492,19.718 18.582,19.242L18.632,18.984Q18.702,18.634 18.766,18.289 18.826,17.996 18.879,17.707C18.969,17.25,19.055,16.789,19.145,16.332Q19.279,15.628,19.418,14.918L19.652,13.703 19.793,12.977C19.836,12.75,19.883,12.523,19.926,12.293L19.973,12.043 20.039,11.703 20.074,11.512C20.105,11.305,20.105,11.105,20.102,10.898A1.44,1.44,0,0,0,19.422,11.008 M17.797,12.957Q17.704,13.017 17.605,13.074 17.505,13.138 17.398,13.204C17.328,13.246,17.258,13.293,17.184,13.336L15.625,14.309C15.047,14.672,14.465,15.027,13.883,15.387L12.629,16.16Q12.279,16.379 11.929,16.59 12.099,17.186 12.309,17.766C12.329,17.816 12.344,17.871 12.363,17.922 12.403,18.027 12.441,18.137 12.48,18.242 12.54,18.406 12.594,18.57 12.652,18.734Q12.712,18.893,12.766,19.051C12.786,19.098 12.801,19.148 12.82,19.199 12.91,19.461 12.91,19.461 13.078,19.679A22,22,0,0,1,13.211,18.773C13.227,18.672 13.238,18.566 13.254,18.465 13.402,17.398 13.402,17.398 13.867,17.015 13.934,16.941 14.004,16.871 14.074,16.797Q14.284,16.59,14.508,16.402C14.738,16.203 14.953,15.988 15.168,15.773 15.41,15.527 15.656,15.293 15.918,15.07 16.09,14.918 16.246,14.754 16.406,14.594 16.602,14.394 16.796,14.199 17.012,14.02 17.282,13.793 17.523,13.54 17.773,13.285A2.8,2.8,0,0,1,18.227,12.898L18.227,12.773C18.047,12.773,17.949,12.863,17.797,12.957 M13.742,17.922C13.625,18.305,13.555,18.692,13.492,19.086L13.457,19.286 13.422,19.476C13.414,19.536 13.402,19.594 13.395,19.652 13.371,19.809 13.371,19.809 13.441,19.98 13.469,19.953 13.496,19.93 13.523,19.902 13.653,19.782 13.777,19.664 13.903,19.547Q13.965,19.485,14.035,19.422C14.273,19.195,14.515,18.977,14.773,18.77A8,8,0,0,0,14.121,18.176L13.945,18.031C13.828,17.914,13.828,17.914,13.742,17.921 M19.555,6.84400000000001C19.91,6.85900000000001,20.172,7.02700000000001,20.465,7.20400000000001L20.465,7.50800000000001C20.219,7.59000000000001,20.141,7.52000000000001,19.915,7.41000000000001L19.715,7.31600000000001C19.555,7.20300000000001,19.555,7.20300000000001,19.5,7.04300000000001L19.496,6.90300000000001z M20.828,7.57000000000001C21.094,7.59800000000001,21.234,7.69500000000001,21.434,7.87100000000001L21.375,8.11300000000001C21.273,8.16400000000001,21.273,8.16400000000001,21.133,8.17200000000001A2.4,2.4,0,0,1,20.766,7.87200000000001Q20.8,7.72100000000001,20.828,7.57000000000001 M20.828,7.57000000000001" />+ <GeometryDrawing Brush="{DynamicResource Brush_Highlighted}" Geometry="F1 M31,31z M0,0z M20.95,5.691L21.066,5.754C21.949,6.246,22.703,6.875,23.43,7.57Q23.493,7.63,23.563,7.687C24.465,8.551,25.148,9.652,25.672,10.777L25.77,10.984C26.988,13.68 26.996,16.816 25.96,19.566 24.969,22.098 23.098,24.152 20.707,25.43Q20.614,25.483,20.516,25.535C18.059,26.855 14.969,27.039 12.316,26.262 10.496,25.703 8.941,24.738 7.57,23.43L7.437,23.313C5.684,21.641,4.676,19.199,4.359,16.832L4.336,16.664C4.07,14.394,4.598,12.043,5.691,10.051Q5.722,9.991,5.754,9.934C6.246,9.05,6.875,8.297,7.57,7.57Q7.63,7.506,7.687,7.437C8.551,6.535 9.652,5.852 10.777,5.328 10.879,5.281 10.879,5.281 10.984,5.23 14.152,3.797 17.922,4.027 20.949,5.691 M8.171,7.93C8.128,7.973 8.081,8.012 8.038,8.055 6.085,9.915 5.038,12.665 4.964,15.32 4.94,18.215 6.074,20.918 8.089,22.988 10.065,24.953 12.789,26.031 15.565,26.039 18.397,26.004 21.085,24.824 23.077,22.82 25.011,20.809 26.054,18.098 26.034,15.32 25.972,12.488 24.757,9.793 22.722,7.828 21.37,6.57 19.757,5.738 17.983,5.266 17.909,5.25 17.839,5.23 17.765,5.211 14.3,4.371 10.753,5.586 8.171,7.93 M8.171,7.93" />+ <GeometryDrawing Brush="{DynamicResource Brush_Highlighted}" Geometry="F1 M31,31z M0,0z M18.828,6.418C18.891,6.477 18.891,6.477 18.953,6.539 18.93,6.668 18.93,6.668 18.891,6.781A6,6,0,0,1,17.789,6.574C15.367,5.918 12.871,6.367 10.707,7.59 10.277,7.848 9.887,8.152 9.507,8.477L9.41,8.559A8.6,8.6,0,0,0,7.57,10.777C7.547,10.817 7.523,10.852 7.5,10.891 6.316,12.891 5.969,15.398 6.516,17.652 6.886,19.074 7.52,20.375 8.476,21.492Q8.517,21.544,8.559,21.59A8.6,8.6,0,0,0,10.777,23.43C10.832,23.465 10.832,23.465 10.891,23.5 12.891,24.684 15.398,25.031 17.652,24.484 20.039,23.864 22.117,22.41 23.395,20.285 24.652,18.141 25.075,15.613 24.445,13.191 23.977,11.511 23.105,9.973 21.835,8.766Q21.755,8.684,21.675,8.598C21.684,8.422 21.684,8.422 21.735,8.297 22.23,8.34 22.57,8.859 22.875,9.219 24.602,11.329 25.34,13.875 25.113,16.586Q25.056,17.078,24.945,17.559C24.934,17.617,24.934,17.617,24.918,17.679A9.7,9.7,0,0,1,20.664,23.679C18.473,25.035 15.84,25.504 13.316,24.929 10.789,24.301 8.613,22.766 7.242,20.543 5.945,18.367 5.484,15.707 6.094,13.227 6.274,12.523 6.524,11.855 6.844,11.203Q6.889,11.099,6.941,10.996C8.071,8.796 10.094,7.106 12.434,6.32 14.438,5.68 16.855,5.594 18.828,6.418 M18.828,6.418" />+ <GeometryDrawing Brush="{DynamicResource Brush_Highlighted}" Geometry="F1 M31,31z M0,0z M20.223,10.535C20.383,10.617 20.383,10.617 20.465,10.777 20.515,11.254 20.418,11.719 20.325,12.184L20.277,12.418C20.238,12.633,20.195,12.844,20.157,13.058Q20.087,13.393 20.023,13.727 19.917,14.292 19.805,14.859L19.5,16.438C19.418,16.852,19.34,17.266,19.258,17.676L19.234,17.809 18.93,19.355 18.824,19.918A9,9,0,0,0,18.762,20.23L18.738,20.367C18.684,20.641,18.602,20.812,18.406,21.007A1.18,1.18,0,0,1,17.648,21.121C17.359,21.023,17.148,20.813,16.926,20.609Q16.673,20.389,16.414,20.168C16.195,19.984,15.98,19.793,15.766,19.605Q15.66,19.51,15.555,19.422C15.504,19.379 15.504,19.379 15.457,19.332 15.266,19.168 15.215,19.132 14.953,19.132A4,4,0,0,0,14.617,19.43C14.555,19.488 14.488,19.55 14.426,19.61 14.395,19.64 14.359,19.672 14.328,19.703Q14.094,19.925 13.859,20.141 13.778,20.212 13.695,20.289C13.523,20.437 13.465,20.461 13.238,20.489 13.016,20.465 13.016,20.465 12.895,20.339A2.8,2.8,0,0,1,12.594,19.695Q12.57,19.629,12.547,19.559L12.395,19.125C12.359,19.027,12.325,18.925,12.289,18.828Q12.183,18.537,12.082,18.246C11.969,17.922,11.852,17.602,11.73,17.277Q11.709,17.211,11.68,17.141C11.602,16.921,11.602,16.921,11.504,16.711A13,13,0,0,0,10.98,16.563A10,10,0,0,1,10.656,16.477A25,25,0,0,1,10.141,16.344C9.97699999999999,16.304,9.80899999999999,16.258,9.64499999999999,16.214Q9.56899999999999,16.199,9.49199999999999,16.176A1.53,1.53,0,0,1,8.71899999999999,15.742C8.62499999999999,15.551 8.63699999999999,15.406 8.65599999999999,15.195 8.87499999999999,14.871 9.08999999999999,14.746 9.45299999999999,14.609Q9.52499999999999,14.579,9.60199999999999,14.551L10.098,14.351 10.449,14.211 11.215,13.906Q11.848,13.655,12.48,13.398C12.586,13.355,12.586,13.355,12.7,13.313Q12.918,13.219,13.137,13.133L14.238,12.688Q15.268,12.276,16.293,11.859C17.086,11.539 17.879,11.215 18.676,10.899 18.715,10.883 18.75,10.867 18.793,10.852L19.109,10.722 19.289,10.652C19.609,10.527,19.883,10.496,20.223,10.535 M19.422,11.008L19.234,11.082A5,5,0,0,0,19.027,11.168A5,5,0,0,0,18.805,11.258L18.18,11.508 17.598,11.742C16.949,12.004,16.305,12.266,15.656,12.532L14.516,12.992Q14.309,13.074 14.109,13.16 13.354,13.46 12.605,13.766L10.719,14.531 10.589,14.582 9.84799999999999,14.887 9.67199999999999,14.957Q9.59699999999999,14.99 9.51599999999999,15.023 9.45199999999999,15.048 9.38299999999999,15.078A2,2,0,0,0,9.02299999999999,15.32C9.02699999999999,15.434 9.02699999999999,15.434 9.08199999999999,15.562 9.74599999999999,16.027 10.879,16.324 11.687,16.348 12.184,16.258 12.539,15.953 12.918,15.633 13.191,15.41 13.492,15.234 13.793,15.055Q13.974,14.939 14.156,14.825 14.836,14.403 15.516,13.988 16.296,13.508 17.074,13.016C18.031,12.414 18.031,12.414 18.312,12.41 18.469,12.473 18.469,12.473 18.555,12.574 18.602,12.774 18.585,12.883 18.527,13.078 18.402,13.23 18.257,13.359 18.105,13.488L17.859,13.711 17.734,13.821Q17.506,14.031,17.289,14.254A7,7,0,0,1,16.777,14.734A10,10,0,0,0,16.164,15.32C15.973,15.516 15.777,15.71 15.562,15.89 15.301,16.113 15.062,16.36 14.82,16.602 14.602,16.824 14.379,17.032 14.137,17.227A1,1,0,0,0,13.926,17.559Q14.722,18.25,15.523,18.929L15.918,19.262Q16.013,19.344,16.113,19.426L16.617,19.856C17.203,20.43 17.203,20.43 17.922,20.766 18.086,20.754 18.086,20.754 18.227,20.648 18.407,20.191 18.492,19.718 18.582,19.242L18.632,18.984Q18.702,18.634 18.766,18.289 18.826,17.996 18.879,17.707C18.969,17.25,19.055,16.789,19.145,16.332Q19.279,15.628,19.418,14.918L19.652,13.703 19.793,12.977C19.836,12.75,19.883,12.523,19.926,12.293L19.973,12.043 20.039,11.703 20.074,11.512C20.105,11.305,20.105,11.105,20.102,10.898A1.44,1.44,0,0,0,19.422,11.008 M17.797,12.957Q17.704,13.017 17.605,13.074 17.505,13.138 17.398,13.204C17.328,13.246,17.258,13.293,17.184,13.336L15.625,14.309C15.047,14.672,14.465,15.027,13.883,15.387L12.629,16.16Q12.279,16.379 11.929,16.59 12.099,17.186 12.309,17.766C12.329,17.816 12.344,17.871 12.363,17.922 12.403,18.027 12.441,18.137 12.48,18.242 12.54,18.406 12.594,18.57 12.652,18.734Q12.712,18.893,12.766,19.051C12.786,19.098 12.801,19.148 12.82,19.199 12.91,19.461 12.91,19.461 13.078,19.679A22,22,0,0,1,13.211,18.773C13.227,18.672 13.238,18.566 13.254,18.465 13.402,17.398 13.402,17.398 13.867,17.015 13.934,16.941 14.004,16.871 14.074,16.797Q14.284,16.59,14.508,16.402C14.738,16.203 14.953,15.988 15.168,15.773 15.41,15.527 15.656,15.293 15.918,15.07 16.09,14.918 16.246,14.754 16.406,14.594 16.602,14.394 16.796,14.199 17.012,14.02 17.282,13.793 17.523,13.54 17.773,13.285A2.8,2.8,0,0,1,18.227,12.898L18.227,12.773C18.047,12.773,17.949,12.863,17.797,12.957 M13.742,17.922C13.625,18.305,13.555,18.692,13.492,19.086L13.457,19.286 13.422,19.476C13.414,19.536 13.402,19.594 13.395,19.652 13.371,19.809 13.371,19.809 13.441,19.98 13.469,19.953 13.496,19.93 13.523,19.902 13.653,19.782 13.777,19.664 13.903,19.547Q13.965,19.485,14.035,19.422C14.273,19.195,14.515,18.977,14.773,18.77A8,8,0,0,0,14.121,18.176L13.945,18.031C13.828,17.914,13.828,17.914,13.742,17.921 M19.555,6.84400000000001C19.91,6.85900000000001,20.172,7.02700000000001,20.465,7.20400000000001L20.465,7.50800000000001C20.219,7.59000000000001,20.141,7.52000000000001,19.915,7.41000000000001L19.715,7.31600000000001C19.555,7.20300000000001,19.555,7.20300000000001,19.5,7.04300000000001L19.496,6.90300000000001z M20.828,7.57000000000001C21.094,7.59800000000001,21.234,7.69500000000001,21.434,7.87100000000001L21.375,8.11300000000001C21.273,8.16400000000001,21.273,8.16400000000001,21.133,8.17200000000001A2.4,2.4,0,0,1,20.766,7.87200000000001Q20.8,7.72100000000001,20.828,7.57000000000001 M20.828,7.57000000000001" /></DrawingGroup></DrawingImage.Drawing></DrawingImage><DrawingImage x:Key="Icon_Website"><DrawingImage.Drawing>- <DrawingGroup ClipGeometry="M0,0 V100 H100 V0 H0 Z">+ <DrawingGroup ClipGeometry="M0,0 V64 H64 V0 H0 Z"><DrawingGroup Opacity="1">- <GeometryDrawing Brush="{DynamicResource Brush_Inactive}" Geometry="F1 M100,100z M0,0z M73.6875,9.75C84.484375,17.5 90.921875,26.957031 94,40 95.300781,55.414062 92.515625,67.832031 82.410156,79.898438 73.949219,89.015625 63.179688,93.914062 50.847656,94.402344 36.503906,94.628906 25.535156,90.058594 14.875,80.5 4.863281,70.144531 2.511719,57.601562 2.722656,43.785156 3.148438,32.957031 8.328125,24.285156 15.375,16.3125 32.246094,1.453125 53.902344,-2.503906 73.6875,9.75z M50,7C50,13.929688 50,20.859375 50,28 55.28125,27.339844 60.558594,26.679688 66,26 63.757812,18.15625 60.808594,12.792969 54.1875,7.9375 52.089844,6.867188 52.089844,6.867188 50,7z M39,11C34.480469,15.902344 32.898438,19.359375 31,26 38.425781,26.988281 38.425781,26.988281 46,28 46,21.070312 46,14.140625 46,7 43.414062,7 40.917969,9.417969 39,11z M26,13.25C25.132812,13.851562 24.265625,14.457031 23.375,15.078125 21.128906,16.894531 19.605469,18.617188 18,21 22.265625,23.359375 22.265625,23.359375 27,24 27.421875,23.15625 27.84375,22.3125 28.277344,21.445312 30.183594,17.628906 32.09375,13.816406 34,10 30.246094,10 29.03125,11.101562 26,13.25z M63,10C65.308594,14.621094 67.621094,19.238281 70,24 75.691406,23.375 75.691406,23.375 79,20 72.011719,12.957031 72.011719,12.957031 63,10z M14,25C7.75,35.128906 5.84375,43.984375 7,56 8.453125,61.894531 10.808594,66.859375 14,72 17.804688,71.328125 21.351562,70.273438 25,69 25,66.359375 25,63.71875 25,61 25.660156,61 26.320312,61 27,61 27.660156,62.980469 28.320312,64.960938 29,67 31.796875,66.773438 34.582031,66.519531 37.375,66.25 38.167969,66.1875 38.964844,66.125 39.78125,66.0625 41.933594,65.84375 43.925781,65.609375 46,65 47.632812,63.078125 47.632812,63.078125 48,61 48.246094,61.644531 48.488281,62.285156 48.742188,62.949219 49.792969,65.152344 49.792969,65.152344 51.878906,65.636719 52.621094,65.699219 53.367188,65.761719 54.132812,65.828125 54.9375,65.90625 55.742188,65.984375 56.574219,66.0625 57.835938,66.15625 57.835938,66.15625 59.125,66.25 59.972656,66.328125 60.824219,66.40625 61.699219,66.484375 63.796875,66.671875 65.898438,66.839844 68,67 68.660156,65.019531 69.320312,63.039062 70,61 70.988281,61 71.980469,61 73,61 72.671875,63.640625 72.339844,66.28125 72,69 73.246094,69.535156 74.496094,70.050781 75.75,70.5625 76.445312,70.851562 77.140625,71.140625 77.859375,71.441406 80.441406,72.113281 81.589844,72.164062 84,71 85.550781,68.644531 85.550781,68.644531 86.6875,65.75 87.105469,64.796875 87.519531,63.84375 87.949219,62.859375 91.601562,52.917969 91.0625,41.722656 87,32 85.777344,29.5625 84.457031,27.3125 83,25 79.195312,25.671875 75.648438,26.726562 72,28 72,30.96875 72,33.941406 72,37 71.011719,37.328125 70.019531,37.660156 69,38 68.503906,34.039062 68.503906,34.039062 68,30 65.9375,30.140625 63.875,30.289062 61.8125,30.4375 60.664062,30.519531 59.515625,30.601562 58.332031,30.683594 55.484375,30.953125 52.789062,31.375 50,32 50,33.980469 50,35.960938 50,38 49.011719,37.671875 48.019531,37.339844 47,37 46.503906,34.523438 46.503906,34.523438 46,32 44.105469,31.660156 42.210938,31.328125 40.3125,31 39.257812,30.8125 38.199219,30.628906 37.113281,30.4375 34.351562,30.050781 31.78125,29.917969 29,30 28.671875,32.640625 28.339844,35.28125 28,38 26.679688,38 25.359375,38 24,38 24.328125,34.699219 24.660156,31.398438 25,28 23.113281,27.257812 23.113281,27.257812 21.1875,26.5 20.480469,26.222656 19.773438,25.941406 19.042969,25.65625 16.882812,24.847656 16.882812,24.847656 14,25z M50,69C50,75.929688 50,82.859375 50,90 58.058594,86.777344 61.457031,82.738281 65,75 65.371094,73.675781 65.71875,72.34375 66,71 64.273438,70.660156 62.542969,70.328125 60.8125,70 59.847656,69.8125 58.886719,69.628906 57.894531,69.4375 54.664062,68.875 54.664062,68.875 50,69z M36.25,70C34.773438,70.277344 34.773438,70.277344 33.265625,70.5625 32.519531,70.707031 31.769531,70.851562 31,71 32.695312,77.972656 35.472656,83.296875 41,88 43.476562,88.988281 43.476562,88.988281 46,90 46,83.070312 46,76.140625 46,69 42.519531,69 39.644531,69.351562 36.25,70z M70,72C66.535156,79.425781 66.535156,79.425781 63,87 67.820312,85.394531 70.105469,84.515625 73.875,81.5625 74.65625,80.964844 75.4375,80.367188 76.242188,79.753906 76.820312,79.175781 77.402344,78.597656 78,78 78,77.011719 78,76.019531 78,75 75.359375,74.011719 72.71875,73.019531 70,72z M21.9375,74C20.835938,74.558594 20.835938,74.558594 19.714844,75.125 18.867188,75.558594 18.867188,75.558594 18,76 21.765625,81.21875 25.953125,84.613281 32,87 32.660156,86.671875 33.320312,86.339844 34,86 33.664062,85.410156 33.324219,84.816406 32.976562,84.207031 30.722656,80.214844 28.539062,76.335938 27,72 25.15625,72 23.550781,73.179688 21.9375,74z M21.9375,74" />- <GeometryDrawing Brush="{DynamicResource Brush_Inactive}" Geometry="F1 M100,100z M0,0z M62,39C63.320312,39 64.640625,39 66,39 66.660156,41.96875 67.320312,44.941406 68,48 68.660156,48 69.320312,48 70,48 70.328125,46.351562 70.660156,44.699219 71,43 72.320312,42.671875 73.640625,42.339844 75,42 75.660156,43.980469 76.320312,45.960938 77,48 77.660156,48 78.320312,48 79,48 79.144531,46.886719 79.289062,45.773438 79.4375,44.625 80,41 80,41 81,39 82.320312,39 83.640625,39 85,39 83.839844,45.546875 82.265625,51.746094 80,58 78.679688,58 77.359375,58 76,58 75.011719,56.019531 74.019531,54.039062 73,52 72.339844,53.980469 71.679688,55.960938 71,58 69.679688,58 68.359375,58 67,58 66.160156,55.585938 65.328125,53.167969 64.5,50.75 64.140625,49.726562 64.140625,49.726562 63.777344,48.683594 62.605469,45.234375 62,42.683594 62,39z M62,39" />- <GeometryDrawing Brush="{DynamicResource Brush_Inactive}" Geometry="F1 M100,100z M0,0z M37,39C38.320312,39 39.640625,39 41,39 41.660156,41.96875 42.320312,44.941406 43,48 43.660156,48 44.320312,48 45,48 45.328125,46.351562 45.660156,44.699219 46,43 47.320312,42.671875 48.640625,42.339844 50,42 50.660156,43.980469 51.320312,45.960938 52,48 52.660156,48 53.320312,48 54,48 54.144531,46.886719 54.289062,45.773438 54.4375,44.625 55,41 55,41 56,39 57.320312,39 58.640625,39 60,39 58.839844,45.546875 57.265625,51.746094 55,58 53.679688,58 52.359375,58 51,58 50.011719,56.019531 49.019531,54.039062 48,52 47.339844,53.980469 46.679688,55.960938 46,58 44.679688,58 43.359375,58 42,58 41.160156,55.585938 40.328125,53.167969 39.5,50.75 39.140625,49.726562 39.140625,49.726562 38.777344,48.683594 37.605469,45.234375 37,42.683594 37,39z M37,39" />- <GeometryDrawing Brush="{DynamicResource Brush_Inactive}" Geometry="F1 M100,100z M0,0z M12,39C13.320312,39 14.640625,39 16,39 16.660156,41.96875 17.320312,44.941406 18,48 18.660156,48 19.320312,48 20,48 20.328125,46.351562 20.660156,44.699219 21,43 22.320312,42.671875 23.640625,42.339844 25,42 25.660156,43.980469 26.320312,45.960938 27,48 27.660156,48 28.320312,48 29,48 29.144531,46.886719 29.289062,45.773438 29.4375,44.625 30,41 30,41 31,39 32.320312,39 33.640625,39 35,39 33.839844,45.546875 32.265625,51.746094 30,58 28.679688,58 27.359375,58 26,58 25.011719,56.019531 24.019531,54.039062 23,52 22.339844,53.980469 21.679688,55.960938 21,58 19.679688,58 18.359375,58 17,58 16.160156,55.585938 15.328125,53.167969 14.5,50.75 14.140625,49.726562 14.140625,49.726562 13.777344,48.683594 12.605469,45.234375 12,42.683594 12,39z M12,39" />+ <GeometryDrawing Brush="{DynamicResource Brush_Highlighted}" Geometry="F1 M64,64z M0,0z M42.066406,11.234375C48.0625,15.054688 51.527344,19.539062 53.761719,26.238281 53.839844,28.035156 53.878906,29.804688 53.878906,31.601562 53.886719,32.082031 53.894531,32.566406 53.902344,33.066406 53.910156,35.777344 53.726562,37.84375 52.480469,40.320312 51.847656,40.320312 51.210938,40.320312 50.558594,40.320312 50.980469,37.574219 51.40625,34.828125 51.839844,32 50.363281,32 48.882812,32 47.359375,32 47.359375,31.789062 47.359375,31.578125 47.359375,31.359375 48.839844,31.359375 50.316406,31.359375 51.839844,31.359375 51.210938,27.621094 50.484375,24.476562 48.640625,21.121094 48.640625,20.699219 48.640625,20.273438 48.640625,19.839844 47.371094,19.839844 46.105469,19.839844 44.800781,19.839844 45.117188,20.578125 45.433594,21.320312 45.761719,22.078125 47.28125,26.53125 46.875,31.199219 46.71875,35.839844 46.296875,35.839844 45.875,35.839844 45.441406,35.839844 45.441406,34.574219 45.441406,33.304688 45.441406,32 44.59375,31.789062 43.75,31.578125 42.878906,31.359375 43.726562,31.359375 44.570312,31.359375 45.441406,31.359375 44.585938,25.496094 44.585938,25.496094 42.878906,19.839844 40.769531,19.839844 38.65625,19.839844 36.480469,19.839844 36.796875,20.472656 36.796875,20.472656 37.121094,21.121094 37.175781,22.707031 37.195312,24.277344 37.183594,25.863281 37.179688,26.332031 37.179688,26.800781 37.179688,27.28125 37.175781,28.773438 37.167969,30.265625 37.160156,31.761719 37.15625,32.773438 37.152344,33.785156 37.152344,34.796875 37.144531,37.277344 37.132812,39.757812 37.121094,42.238281 36.488281,42.453125 35.851562,42.664062 35.199219,42.878906 35.410156,39.289062 35.621094,35.699219 35.839844,32 33.09375,32 30.347656,32 27.519531,32 27.730469,35.800781 27.941406,39.601562 28.160156,43.519531 32.59375,43.519531 37.03125,43.519531 41.601562,43.519531 41.601562,43.730469 41.601562,43.941406 41.601562,44.160156 37.164062,44.160156 32.730469,44.160156 28.160156,44.160156 28.542969,45.308594 28.925781,46.457031 29.320312,47.640625 29.535156,48.285156 29.75,48.933594 29.972656,49.597656 30.34375,50.390625 30.34375,50.390625 30.71875,51.199219 31.355469,51.410156 31.988281,51.621094 32.640625,51.839844 33.0625,50.574219 33.484375,49.304688 33.921875,48 34.34375,48 34.765625,48 35.199219,48 35.199219,49.054688 35.199219,50.113281 35.199219,51.199219 35.554688,50.921875 35.910156,50.644531 36.273438,50.359375 36.96875,49.824219 36.96875,49.824219 37.679688,49.28125 38.371094,48.746094 38.371094,48.746094 39.074219,48.199219 40.320312,47.359375 40.320312,47.359375 41.601562,47.359375 41.601562,51.109375 41.601562,51.109375 40.960938,52.480469 35.722656,54.734375 28.171875,54.722656 22.761719,52.839844 16.707031,49.894531 12.652344,45.253906 10.238281,39.039062 8.5,33.820312 8.820312,26.253906 11.234375,21.296875 17.71875,11.121094 30.578125,5.644531 42.066406,11.234375z M26.878906,11.519531C26.667969,11.941406 26.457031,12.363281 26.238281,12.800781 25.59375,12.851562 24.945312,12.90625 24.28125,12.960938 21.152344,13.308594 18.847656,15.117188 16.640625,17.28125 16.429688,17.914062 16.21875,18.546875 16,19.199219 17.265625,19.199219 18.535156,19.199219 19.839844,19.199219 20.050781,18.144531 20.261719,17.089844 20.480469,16 20.902344,16 21.324219,16 21.761719,16 21.546875,17.054688 21.335938,18.113281 21.121094,19.199219 23.019531,19.199219 24.921875,19.199219 26.878906,19.199219 27.511719,16.664062 28.148438,14.132812 28.800781,11.519531 28.167969,11.519531 27.53125,11.519531 26.878906,11.519531z M30.71875,11.519531C30.289062,12.558594 29.863281,13.597656 29.441406,14.640625 29.203125,15.21875 28.964844,15.796875 28.71875,16.394531 28.085938,17.847656 28.085938,17.847656 28.160156,19.199219 30.484375,19.199219 32.804688,19.199219 35.199219,19.199219 34.3125,15.214844 34.3125,15.214844 32.640625,11.519531 32.007812,11.519531 31.371094,11.519531 30.71875,11.519531z M34.558594,11.519531C34.757812,12.441406 34.960938,13.359375 35.160156,14.28125 35.269531,14.792969 35.382812,15.304688 35.496094,15.832031 35.839844,17.375 35.839844,17.375 36.480469,19.199219 38.378906,19.199219 40.28125,19.199219 42.238281,19.199219 41.359375,15.875 39.203125,14.078125 36.480469,12.160156 35.847656,11.949219 35.210938,11.738281 34.558594,11.519531z M40.320312,13.441406C40.878906,14.410156 41.457031,15.367188 42.039062,16.320312 42.359375,16.855469 42.679688,17.390625 43.007812,17.941406 44.074219,19.386719 44.074219,19.386719 45.890625,19.378906 46.375,19.320312 46.859375,19.261719 47.359375,19.199219 46.410156,16.351562 44.105469,14.882812 41.601562,13.441406 41.175781,13.441406 40.753906,13.441406 40.320312,13.441406z M14.71875,19.839844C14.304688,20.652344 13.890625,21.464844 13.480469,22.28125 13.25,22.734375 13.019531,23.1875 12.78125,23.652344 11.515625,26.308594 11.464844,28.445312 11.519531,31.359375 13.210938,31.359375 14.898438,31.359375 16.640625,31.359375 16.726562,30.796875 16.808594,30.234375 16.898438,29.652344 17.011719,28.910156 17.125,28.164062 17.238281,27.398438 17.351562,26.664062 17.460938,25.929688 17.578125,25.171875 17.863281,23.382812 18.1875,21.613281 18.558594,19.839844 17.292969,19.839844 16.027344,19.839844 14.71875,19.839844z M19.839844,19.839844C18.285156,23.925781 17.710938,26.992188 17.921875,31.359375 20.664062,31.359375 23.410156,31.359375 26.238281,31.359375 26.558594,25.65625 26.558594,25.65625 26.878906,19.839844 24.558594,19.839844 22.234375,19.839844 19.839844,19.839844z M28.160156,19.839844C27.386719,22.15625 27.449219,24.273438 27.480469,26.679688 27.484375,27.128906 27.484375,27.578125 27.488281,28.042969 27.496094,29.148438 27.507812,30.253906 27.519531,31.359375 30.265625,31.359375 33.011719,31.359375 35.839844,31.359375 35.855469,29.800781 35.871094,28.238281 35.878906,26.679688 35.886719,26.238281 35.890625,25.796875 35.894531,25.339844 35.90625,23.328125 35.839844,21.765625 35.199219,19.839844 32.875,19.839844 30.554688,19.839844 28.160156,19.839844z M11.519531,32C11.179688,36.011719 12.277344,38.6875 14.078125,42.238281 14.292969,42.664062 14.503906,43.085938 14.71875,43.519531 15.988281,43.519531 17.253906,43.519531 18.558594,43.519531 18.476562,43.171875 18.390625,42.820312 18.300781,42.460938 17.484375,38.976562 16.980469,35.5625 16.640625,32 14.949219,32 13.261719,32 11.519531,32z M17.921875,32C17.703125,36.011719 18.273438,39.167969 19.839844,42.878906 20.5,43.6875 20.5,43.6875 21.941406,43.582031 24.410156,43.550781 24.410156,43.550781 26.878906,43.519531 26.667969,39.71875 26.457031,35.917969 26.238281,32 23.496094,32 20.75,32 17.921875,32z M16,44.160156C16.96875,47.070312 19.308594,48.320312 21.761719,49.921875 22.183594,49.707031 22.605469,49.496094 23.039062,49.28125 22.445312,48.546875 22.445312,48.546875 21.839844,47.800781 20.480469,46.078125 20.480469,46.078125 19.199219,44.160156 17.546875,44 17.546875,44 16,44.160156z M21.121094,44.160156C22,47.484375 24.15625,49.28125 26.878906,51.199219 27.511719,51.410156 28.148438,51.621094 28.800781,51.839844 28.167969,49.304688 27.53125,46.769531 26.878906,44.160156 24.980469,44.160156 23.078125,44.160156 21.121094,44.160156z M21.121094,44.160156" />+ <GeometryDrawing Brush="{DynamicResource Brush_Highlighted}" Geometry="F1 M64,64z M0,0z M42.878906,35.199219C45.730469,35.914062 47.042969,37.117188 49.078125,39.078125 49.757812,39.722656 50.4375,40.363281 51.117188,41.003906 51.453125,41.324219 51.789062,41.640625 52.132812,41.96875 53.984375,43.679688 55.941406,45.277344 57.890625,46.878906 58.878906,48 58.878906,48 58.878906,50.558594 56.980469,50.558594 55.078125,50.558594 53.121094,50.558594 53.4375,51.339844 53.753906,52.117188 54.078125,52.921875 54.855469,54.988281 55.3125,56.648438 55.039062,58.878906 54.398438,59.519531 54.398438,59.519531 52.441406,59.558594 51.820312,59.546875 51.199219,59.535156 50.558594,59.519531 49.714844,57.621094 48.871094,55.71875 48,53.761719 47.511719,54.183594 47.023438,54.605469 46.519531,55.039062 44.800781,56.320312 44.800781,56.320312 42.878906,56.320312 42.878906,49.351562 42.878906,42.378906 42.878906,35.199219z M44.160156,38.398438C44.160156,43.46875 44.160156,48.539062 44.160156,53.761719 45.214844,52.914062 46.273438,52.070312 47.359375,51.199219 47.992188,51.199219 48.628906,51.199219 49.28125,51.199219 50.335938,53.3125 51.390625,55.425781 52.480469,57.601562 53.316406,56.289062 53.316406,56.289062 52.621094,54.65625 52.378906,54.015625 52.132812,53.378906 51.878906,52.71875 51.636719,52.078125 51.394531,51.4375 51.140625,50.773438 50.855469,50.035156 50.855469,50.035156 50.558594,49.28125 53.09375,48.964844 53.09375,48.964844 55.679688,48.640625 55,47.964844 55,47.964844 54.308594,47.273438 53.085938,46.050781 51.875,44.824219 50.671875,43.585938 50.0625,42.964844 49.449219,42.34375 48.839844,41.71875 48.53125,41.398438 48.21875,41.078125 47.898438,40.746094 47.101562,39.941406 46.273438,39.167969 45.441406,38.398438 45.019531,38.398438 44.59375,38.398438 44.160156,38.398438z M44.160156,38.398438" />+ <GeometryDrawing Brush="{DynamicResource Brush_Highlighted}" Geometry="F1 M64,64z M0,0z M23.039062,13.441406C23.460938,13.441406 23.886719,13.441406 24.320312,13.441406 23.898438,14.285156 23.476562,15.128906 23.039062,16 22.617188,16 22.195312,16 21.761719,16 22.183594,15.15625 22.605469,14.308594 23.039062,13.441406z M23.039062,13.441406" />+ <GeometryDrawing Brush="{DynamicResource Brush_Highlighted}" Geometry="F1 M64,64z M0,0z M35.199219,44.800781C35.621094,44.800781 36.042969,44.800781 36.480469,44.800781 36.269531,45.433594 36.058594,46.066406 35.839844,46.71875 35.417969,46.71875 34.996094,46.71875 34.558594,46.71875 34.769531,46.085938 34.980469,45.453125 35.199219,44.800781z M35.199219,44.800781" />+ <GeometryDrawing Brush="{DynamicResource Brush_Highlighted}" Geometry="F1 M64,64z M0,0z M37.761719,31.359375C39.238281,31.359375 40.71875,31.359375 42.238281,31.359375 42.238281,31.570312 42.238281,31.78125 42.238281,32 40.761719,32 39.28125,32 37.761719,32 37.761719,31.789062 37.761719,31.578125 37.761719,31.359375z M37.761719,31.359375" /></DrawingGroup></DrawingGroup></DrawingImage.Drawing>diff --git a/.Source/GTweak/Assets/Images/DownloadApps/Amd.png b/.Source/GTweak/Assets/Images/DownloadApps/Amd.pngnew file mode 100644index 00000000..ca82e964Binary files /dev/null and b/.Source/GTweak/Assets/Images/DownloadApps/Amd.png differdiff --git a/.Source/GTweak/Assets/Images/DownloadApps/Autoruns.png b/.Source/GTweak/Assets/Images/DownloadApps/Autoruns.pngnew file mode 100644index 00000000..4700c9f5Binary files /dev/null and b/.Source/GTweak/Assets/Images/DownloadApps/Autoruns.png differdiff --git a/.Source/GTweak/Assets/Images/DownloadApps/DeviceTweaker.png b/.Source/GTweak/Assets/Images/DownloadApps/DeviceTweaker.pngnew file mode 100644index 00000000..7ff0b0eaBinary files /dev/null and b/.Source/GTweak/Assets/Images/DownloadApps/DeviceTweaker.png differdiff --git a/.Source/GTweak/Assets/Images/DownloadApps/FirstEverTech.png b/.Source/GTweak/Assets/Images/DownloadApps/FirstEverTech.pngnew file mode 100644index 00000000..ea2f41ebBinary files /dev/null and b/.Source/GTweak/Assets/Images/DownloadApps/FirstEverTech.png differdiff --git a/.Source/GTweak/Assets/Images/DownloadApps/Nvidia.png b/.Source/GTweak/Assets/Images/DownloadApps/Nvidia.pngnew file mode 100644index 00000000..2d2b757cBinary files /dev/null and b/.Source/GTweak/Assets/Images/DownloadApps/Nvidia.png differdiff --git a/.Source/GTweak/Assets/Images/DownloadApps/NvidiaPI.png b/.Source/GTweak/Assets/Images/DownloadApps/NvidiaPI.pngnew file mode 100644index 00000000..fd92fea5Binary files /dev/null and b/.Source/GTweak/Assets/Images/DownloadApps/NvidiaPI.png differdiff --git a/.Source/GTweak/Assets/Images/DownloadApps/Occt.png b/.Source/GTweak/Assets/Images/DownloadApps/Occt.pngnew file mode 100644index 00000000..8e99e1acBinary files /dev/null and b/.Source/GTweak/Assets/Images/DownloadApps/Occt.png differdiff --git a/.Source/GTweak/Assets/Images/ImageResources.xaml b/.Source/GTweak/Assets/Images/ImageResources.xamlindex 020e15ce..2c18767a 100644--- a/.Source/GTweak/Assets/Images/ImageResources.xaml+++ b/.Source/GTweak/Assets/Images/ImageResources.xaml@@ -1,6 +1,14 @@<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">+ <BitmapImage x:Key="Img_Amd" UriSource="/GTweak;component/Assets/Images/DownloadApps/Amd.png"/>+ <BitmapImage x:Key="Img_Autoruns" UriSource="/GTweak;component/Assets/Images/DownloadApps/Autoruns.png"/>+ <BitmapImage x:Key="Img_DeviceTweaker" UriSource="/GTweak;component/Assets/Images/DownloadApps/DeviceTweaker.png"/>+ <BitmapImage x:Key="Img_FirstEverTech" UriSource="/GTweak;component/Assets/Images/DownloadApps/FirstEverTech.png"/>+ <BitmapImage x:Key="Img_Nvidia" UriSource="/GTweak;component/Assets/Images/DownloadApps/Nvidia.png"/>+ <BitmapImage x:Key="Img_NvidiaPI" UriSource="/GTweak;component/Assets/Images/DownloadApps/NvidiaPI.png"/>+ <BitmapImage x:Key="Img_Occt" UriSource="/GTweak;component/Assets/Images/DownloadApps/Occt.png"/>+<BitmapImage x:Key="Img_BatFile" UriSource="/GTweak;component/Assets/Images/AddonsFiles/BatFile.png"/><BitmapImage x:Key="Img_CmdFile" UriSource="/GTweak;component/Assets/Images/AddonsFiles/CmdFile.png"/><BitmapImage x:Key="Img_PowershellFile" UriSource="/GTweak;component/Assets/Images/AddonsFiles/PowershellFile.png"/>diff --git a/.Source/GTweak/Assets/UserControls/FlowPanel.cs b/.Source/GTweak/Assets/UserControls/FlowPanel.csindex d203a24d..267ed834 100644--- a/.Source/GTweak/Assets/UserControls/FlowPanel.cs+++ b/.Source/GTweak/Assets/UserControls/FlowPanel.cs@@ -249,67 +249,60 @@ namespace GTweak.Assets.UserControlsprivate void ArrangeResponsive(Size finalSize){int count = _visibleCache.Count;- if (count == 0)+ if (count != 0){- return;- }-- double totalItemWidth = 0;- double totalItemHeight = 0;- double maxItemWidth = 0;-- for (int i = 0; i < count; i++)- {- double w = GetChildWidth(_visibleCache[i]);- double h = GetChildHeight(_visibleCache[i]);-- totalItemWidth += w;- totalItemHeight += h;+ double totalItemWidth = 0;+ double maxItemWidth = 0;- if (w > maxItemWidth)+ for (int i = 0; i < count; i++){- maxItemWidth = w;+ double w = GetChildWidth(_visibleCache[i]);+ totalItemWidth += w;+ if (w > maxItemWidth)+ {+ maxItemWidth = w;+ }}- }-- double horizontalRequired = totalItemWidth + (count > 1 ? (count - 1) * HorizontalSpacing : 0);- if (horizontalRequired <= finalSize.Width)- {- double extraSpace = Math.Max(0, finalSize.Width - totalItemWidth);- double spacing = count > 1 ? extraSpace / (count - 1) : 0;+ double rowSpacing = count > 1 ? HorizontalSpacing * (count - 1) : 0;+ double rowWidth = totalItemWidth + rowSpacing;- double x = 0;- if (count == 1)+ if (rowWidth <= finalSize.Width){- x = GetResponsiveAlignmentOffset(finalSize.Width, totalItemWidth);- }+ double x = GetResponsiveAlignmentOffset(finalSize.Width, rowWidth);- for (int i = 0; i < count; i++)- {- UIElement child = _visibleCache[i];- double w = GetChildWidth(child);- double h = GetChildHeight(child);+ for (int i = 0; i < count; i++)+ {+ UIElement child = _visibleCache[i];+ double w = GetChildWidth(child);+ double h = GetChildHeight(child);- child.Arrange(new Rect(x, 0, w, h));- x += w + spacing;+ if (i == count - 1)+ {+ child.Arrange(new Rect(finalSize.Width - w, 0, w, h));+ }+ else+ {+ child.Arrange(new Rect(x, 0, w, h));+ x += w + HorizontalSpacing;+ }+ }}- }- else- {- double contentWidth = maxItemWidth;- double y = 0;-- for (int i = 0; i < count; i++)+ else{- UIElement child = _visibleCache[i];- double w = GetChildWidth(child);- double h = GetChildHeight(child);+ double y = 0;- double x = GetResponsiveAlignmentOffset(contentWidth, w);+ for (int i = 0; i < count; i++)+ {+ UIElement child = _visibleCache[i];+ double w = GetChildWidth(child);+ double h = GetChildHeight(child);- child.Arrange(new Rect(x, y, w, h));- y += h + VerticalSpacing;+ double x = GetResponsiveAlignmentOffset(finalSize.Width, w);+ child.Arrange(new Rect(x, y, w, h));++ y += h + VerticalSpacing;+ }}}}diff --git a/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml b/.Source/GTweak/Assets/UserControls/ToolsetCard.xamlindex d5ed4cd6..ba864e53 100644--- a/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml+++ b/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml@@ -94,7 +94,7 @@</Grid.ColumnDefinitions><Grid Grid.Column="0">- <TextBlock Panel.ZIndex="5" Text="{Binding Progress, StringFormat='{}{0}%', RelativeSource={RelativeSource AncestorType=local:ToolsetCard}}" Style="{StaticResource TextDefault}" FontFamily="{StaticResource Play}" Foreground="{StaticResource Brush_Highlighted_Inverted}" FontSize="12px" HorizontalAlignment="Center" VerticalAlignment="Center"/>+ <TextBlock Panel.ZIndex="5" Text="{Binding Progress, StringFormat='{}{0:0}%', RelativeSource={RelativeSource AncestorType=local:ToolsetCard}}" Style="{StaticResource TextDefault}" FontFamily="{StaticResource Play}" Foreground="{StaticResource Brush_Highlighted_Inverted}" FontSize="12px" HorizontalAlignment="Center" VerticalAlignment="Center"/><ProgressBar Value="{Binding Progress, RelativeSource={RelativeSource AncestorType=local:ToolsetCard}}" Foreground="{StaticResource Brush_Accent}" Minimum="0" Maximum="100" Height="20" VerticalAlignment="Center"/></Grid>diff --git a/.Source/GTweak/Core/Model/ToolsetModel.cs b/.Source/GTweak/Core/Model/ToolsetModel.csindex 9c322a54..ea8d51f5 100644--- a/.Source/GTweak/Core/Model/ToolsetModel.cs+++ b/.Source/GTweak/Core/Model/ToolsetModel.cs@@ -1,6 +1,30 @@-namespace GTweak.Core.Model+using System.Xml.Linq;++namespace GTweak.Core.Models{internal class ToolsetModel{+ public string AppName { get; }+ public string AuthorName { get; }+ public string SourceUrl { get; }+ public string Group { get; }+ public string DownloadPathStr { get; }+ public string FilePattern { get; }+ public string UrlPattern { get; }+ public string IconResourceName { get; }+ public string AuthorIconUrl { get; }++ public ToolsetModel(XElement appElement)+ {+ AppName = appElement.Element("Name")?.Value ?? string.Empty;+ AuthorName = appElement.Element("Author")?.Value ?? string.Empty;+ SourceUrl = appElement.Element("Source")?.Value ?? string.Empty;+ Group = appElement.Element("Group")?.Value ?? string.Empty;+ DownloadPathStr = appElement.Element("DownloadPath")?.Value ?? string.Empty;+ FilePattern = appElement.Element("FilePattern")?.Value ?? string.Empty;+ UrlPattern = appElement.Element("UrlPattern")?.Value ?? string.Empty;+ IconResourceName = appElement.Element("Icon")?.Value ?? string.Empty;+ AuthorIconUrl = appElement.Element("AuthorIcon")?.Value ?? string.Empty;+ }}-}+}\ No newline at end of filediff --git a/.Source/GTweak/Core/Service/ToolsetDownloadService.cs b/.Source/GTweak/Core/Service/ToolsetDownloadService.csnew file mode 100644index 00000000..f8d17029--- /dev/null+++ b/.Source/GTweak/Core/Service/ToolsetDownloadService.cs@@ -0,0 +1,142 @@+using System;+using System.IO;+using System.Net.Http;+using System.Text.RegularExpressions;+using System.Threading;+using System.Threading.Tasks;+using GTweak.Core.Models;+using GTweak.Utilities.Controls;+using Newtonsoft.Json.Linq;++namespace GTweak.Core.Service+{+ internal static class ToolsetDownloadService+ {+ private static readonly HttpClient _httpClient;++ static ToolsetDownloadService()+ {+ _httpClient = new HttpClient();+ _httpClient.DefaultRequestHeaders.Add("User-Agent", "GTweak");+ }++ public static async Task<string> ResolveDownloadUrlAsync(ToolsetModel model)+ {+ try+ {+ if (model.Group.Equals("web", StringComparison.OrdinalIgnoreCase))+ {+ if (string.IsNullOrEmpty(model.UrlPattern))+ {+ return model.DownloadPathStr;+ }++ string htmlCode = await _httpClient.GetStringAsync(model.DownloadPathStr);+ Match match = Regex.Match(htmlCode, model.UrlPattern);+ return match.Success ? match.Value : null;+ }++ if (model.Group.Equals("github", StringComparison.OrdinalIgnoreCase))+ {+ string apiUrl = $"https://api.github.com/repos/{model.DownloadPathStr}/releases/latest";++ HttpResponseMessage response = await _httpClient.GetAsync(apiUrl);+ if (!response.IsSuccessStatusCode)+ {+ return null;+ }++ string content = await response.Content.ReadAsStringAsync();+ JObject json = JObject.Parse(content);++ if (json["assets"] is JArray assets && assets.Count > 0)+ {+ string firstFoundUrl = null;++ foreach (JToken asset in assets)+ {+ string downloadUrl = asset["browser_download_url"]?.ToString();+ if (string.IsNullOrEmpty(downloadUrl))+ {+ continue;+ }++ firstFoundUrl ??= downloadUrl;++ if (!string.IsNullOrEmpty(model.FilePattern) && Regex.IsMatch(downloadUrl, model.FilePattern, RegexOptions.IgnoreCase))+ {+ return downloadUrl;+ }+ }++ return firstFoundUrl;+ }+ }+ }+ catch (Exception ex) { ErrorLogging.LogDebug(ex); }++ return null;+ }++ public static async Task DownloadFileAsync(string url, string destinationPath, string referrer, IProgress<double> progress, CancellationToken ct)+ {+ string tempPath = destinationPath + ".tmp";+ try+ {+ using HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, url);+ if (!string.IsNullOrEmpty(referrer))+ {+ request.Headers.Referrer = new Uri(referrer);+ }++ using HttpResponseMessage response = await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, ct);+ response.EnsureSuccessStatusCode();++ long totalBytes = response.Content.Headers.ContentLength ?? -1L;++ using (Stream streamToReadFrom = await response.Content.ReadAsStreamAsync())+ using (FileStream fileStream = new FileStream(tempPath, FileMode.Create, FileAccess.Write, FileShare.None))+ {+ byte[] buffer = new byte[8192];+ long totalReadBytes = 0L;+ int readBytes;+ int lastReportedProgress = 0;++ while ((readBytes = await streamToReadFrom.ReadAsync(buffer, 0, buffer.Length, ct)) > 0)+ {+ await fileStream.WriteAsync(buffer, 0, readBytes, ct);+ totalReadBytes += readBytes;++ if (totalBytes != -1 && progress != null)+ {+ int newProgress = (int)Math.Round((double)totalReadBytes / totalBytes * 100);+ if (newProgress != lastReportedProgress)+ {+ progress.Report(newProgress);+ lastReportedProgress = newProgress;+ }+ }+ }+ }++ if (File.Exists(destinationPath))+ {+ File.Delete(destinationPath);+ }++ File.Move(tempPath, destinationPath);+ progress?.Report(100);+ }+ catch (Exception ex)+ {+ ErrorLogging.LogDebug(ex);+ if (File.Exists(tempPath))+ {+ try { File.Delete(tempPath); }+ catch (Exception exc) { ErrorLogging.LogDebug(exc); }+ }+ throw;+ }+ }+ }+}diff --git a/.Source/GTweak/Core/ViewModel/ToolsetViewModel.cs b/.Source/GTweak/Core/ViewModel/ToolsetViewModel.csindex 51df338f..53665bdd 100644--- a/.Source/GTweak/Core/ViewModel/ToolsetViewModel.cs+++ b/.Source/GTweak/Core/ViewModel/ToolsetViewModel.cs@@ -1,6 +1,224 @@+using System;+using System.Collections.ObjectModel;+using System.Diagnostics;+using System.IO;+using System.Threading;+using System.Threading.Tasks;+using System.Windows.Input;+using System.Windows.Media;+using System.Xml.Linq;+using GTweak.Core.Base;+using GTweak.Core.Models;+using GTweak.Core.Service;+using GTweak.Utilities.Controls;+using GTweak.Utilities.Managers;+using Ookii.Dialogs.Wpf;+namespace GTweak.Core.ViewModel{- internal class ToolsetViewModel+ internal class ToolsetViewModel : ViewModelBase{+ public ObservableCollection<ToolsetItem> Tools { get; } = new ObservableCollection<ToolsetItem>();++ public ICommand SelectFolderCommand { get; }+ public ICommand OpenFolderCommand { get; }++ public string DownloadPath+ {+ get => SettingsEngine.DownloadPath;+ set+ {+ if (SettingsEngine.DownloadPath != value)+ {+ SettingsEngine.DownloadPath = value;+ OnPropertyChanged();+ }+ }+ }++ public ToolsetViewModel()+ {+ SelectFolderCommand = new RelayCommand(_ => SelectFolder());+ OpenFolderCommand = new RelayCommand(_ => OpenFolder());++ LoadApps();+ }++ private void LoadApps()+ {+ try+ {+ string xmlContent = Properties.Resources.AppsCatalog;++ if (!string.IsNullOrWhiteSpace(xmlContent))+ {+ XDocument doc = XDocument.Parse(xmlContent);++ foreach (var appElement in doc.Descendants("App"))+ {+ ToolsetModel model = new ToolsetModel(appElement);+ Tools.Add(new ToolsetItem(model));+ }+ }+ }+ catch (Exception ex)+ {+ ErrorLogging.LogDebug(ex);+ }+ }++ private void SelectFolder()+ {+ try+ {+ VistaFolderBrowserDialog folderDialog = new VistaFolderBrowserDialog+ {+ UseDescriptionForTitle = true,+ SelectedPath = SettingsEngine.DownloadPath ?? Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory)+ };++ if (folderDialog.ShowDialog() == true)+ {+ string selectedPath = folderDialog.SelectedPath;+ if (!string.IsNullOrWhiteSpace(selectedPath) && Directory.Exists(selectedPath))+ {+ DownloadPath = selectedPath;+ }+ }+ }+ catch (Exception ex)+ {+ ErrorLogging.LogDebug(ex);+ }+ }++ private void OpenFolder()+ {+ try+ {+ if (Directory.Exists(DownloadPath))+ {+ Process.Start(new ProcessStartInfo+ {+ FileName = DownloadPath,+ UseShellExecute = true,+ Verb = "open"+ });+ }+ }+ catch (Exception ex)+ {+ ErrorLogging.LogDebug(ex);+ }+ }++ internal class ToolsetItem : ViewModelBase+ {+ private readonly ToolsetModel _model;+ private CancellationTokenSource _cts;++ private ImageSource _appIconSource;+ private ImageSource _authorIconSource;+ private bool _isDownloading;+ private double _progress;++ public ToolsetItem(ToolsetModel model)+ {+ _model = model;++ DownloadCommand = new RelayCommand(async _ => await DownloadAsync(), _ => !IsDownloading);+ CancelCommand = new RelayCommand(_ => CancelDownload(), _ => IsDownloading);++ _ = LoadIconsAsync();+ }++ public string AppName => _model.AppName;+ public string AuthorName => _model.AuthorName;+ public string SourceUrl => _model.SourceUrl;++ public ImageSource AppIconSource+ {+ get => _appIconSource;+ set { _appIconSource = value; OnPropertyChanged(); }+ }++ public ImageSource AuthorIconSource+ {+ get => _authorIconSource;+ set { _authorIconSource = value; OnPropertyChanged(); }+ }++ public bool IsDownloading+ {+ get => _isDownloading;+ set { _isDownloading = value; OnPropertyChanged(); }+ }++ public double Progress+ {+ get => _progress;+ set { _progress = value; OnPropertyChanged(); }+ }++ public ICommand DownloadCommand { get; }+ public ICommand CancelCommand { get; }++ private async Task LoadIconsAsync()+ {+ try+ {+ AppIconSource = ToolsetIconManager.GetAppIconFromResource(_model.IconResourceName);+ AuthorIconSource = ToolsetIconManager.GetPlaceholder(_model.Group);++ ImageSource realIcon = await ToolsetIconManager.GetAuthorIconAsync(_model.Group, _model.AuthorIconUrl);+ if (realIcon != null)+ {+ AuthorIconSource = realIcon;+ }+ }+ catch (Exception ex)+ {+ ErrorLogging.LogDebug(ex);+ }+ }++ private async Task DownloadAsync()+ {+ IsDownloading = true;+ Progress = 0;+ _cts = new CancellationTokenSource();++ Progress<double> progressHandler = new Progress<double>(value => Progress = value);++ try+ {+ string finalUrl = await ToolsetDownloadService.ResolveDownloadUrlAsync(_model);++ if (!string.IsNullOrEmpty(finalUrl))+ {+ string destinationPath = Path.Combine(SettingsEngine.DownloadPath ?? Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory), Path.GetFileName(new Uri(finalUrl).LocalPath));+ await ToolsetDownloadService.DownloadFileAsync(finalUrl, destinationPath, _model.SourceUrl, progressHandler, _cts.Token);+ }+ }+ catch (Exception ex) { ErrorLogging.LogDebug(ex); }+ finally+ {+ IsDownloading = false;++ if (Progress != 100)+ {+ Progress = 0;+ }++ _cts?.Dispose();+ _cts = null;+ }+ }++ private void CancelDownload()+ {+ _cts?.Cancel();+ }+ }}-}+}\ No newline at end of filediff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csprojindex 02825184..e294f3aa 100644--- a/.Source/GTweak/GTweak.csproj+++ b/.Source/GTweak/GTweak.csproj@@ -156,6 +156,7 @@<Compile Include="Core\Model\ServicesModel.cs" /><Compile Include="Core\Model\SystemModel.cs" /><Compile Include="Core\Model\ToolsetModel.cs" />+ <Compile Include="Core\Service\ToolsetDownloadService.cs" /><Compile Include="Core\ViewModel\AddonsViewModel.cs" /><Compile Include="Core\ViewModel\ConfidentialityViewModel.cs" /><Compile Include="Core\ViewModel\DataSystemViewModel.cs" />@@ -171,6 +172,7 @@<Compile Include="Utilities\Helpers\UnlockHandleHelper.cs" /><Compile Include="Utilities\Maintenance\ClearingMemory.cs" /><Compile Include="Utilities\Maintenance\RegistryExporter.cs" />+ <Compile Include="Utilities\Managers\ToolsetIconManager.cs" /><Compile Include="Utilities\Tweaks\ConfidentialityTweaks.cs" /><Compile Include="Utilities\Tweaks\DefenderManager\AclPermissionsBackup.cs" /><Compile Include="Utilities\Tweaks\DefenderManager\WindowsDefender.cs" />@@ -540,6 +542,7 @@<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /></ItemGroup><ItemGroup>+ <None Include="Resources\AppsCatalog.xml" /><Resource Include="GTweak.ico" /><Resource Include="Assets\Fonts\Jura-Medium.ttf" /><Resource Include="Assets\Fonts\Play-Regular.ttf" />@@ -621,6 +624,13 @@<Resource Include="Assets\Images\PreinstalledApps\Widgets.png" /><Resource Include="Assets\Images\PreinstalledApps\Xbox.png" /><Resource Include="Assets\Images\PreinstalledApps\YandexMusic.png" />+ <Resource Include="Assets\Images\DownloadApps\Amd.png" />+ <Resource Include="Assets\Images\DownloadApps\Autoruns.png" />+ <Resource Include="Assets\Images\DownloadApps\DeviceTweaker.png" />+ <Resource Include="Assets\Images\DownloadApps\FirstEverTech.png" />+ <Resource Include="Assets\Images\DownloadApps\Nvidia.png" />+ <Resource Include="Assets\Images\DownloadApps\NvidiaPI.png" />+ <Resource Include="Assets\Images\DownloadApps\Occt.png" /><Content Include="Properties\AssemblyInfo.tt"><Generator>TextTemplatingFileGenerator</Generator><LastGenOutput>AssemblyInfo.cs</LastGenOutput>diff --git a/.Source/GTweak/Languages/en/Localize.xaml b/.Source/GTweak/Languages/en/Localize.xamlindex 4890dfda..92783fdf 100644--- a/.Source/GTweak/Languages/en/Localize.xaml+++ b/.Source/GTweak/Languages/en/Localize.xaml@@ -550,6 +550,7 @@<v:String x:Key="source_ts">Source</v:String><v:String x:Key="btn_download">Download</v:String><v:String x:Key="btn_cancel">Сancel</v:String>+ <v:String x:Key="download_folder_ts">Download Folder</v:String><!--#endregion--></ResourceDictionary>\ No newline at end of filediff --git a/.Source/GTweak/Languages/fr/Localize.xaml b/.Source/GTweak/Languages/fr/Localize.xamlindex 7a7b3305..978f32ae 100644--- a/.Source/GTweak/Languages/fr/Localize.xaml+++ b/.Source/GTweak/Languages/fr/Localize.xaml@@ -550,6 +550,7 @@<v:String x:Key="source_ts">Source</v:String><v:String x:Key="btn_download">Download</v:String><v:String x:Key="btn_cancel">Сancel</v:String>+ <v:String x:Key="download_folder_ts">Download Folder</v:String><!--#endregion--></ResourceDictionary>diff --git a/.Source/GTweak/Languages/hu/Localize.xaml b/.Source/GTweak/Languages/hu/Localize.xamlindex 3089bd94..c4456757 100644--- a/.Source/GTweak/Languages/hu/Localize.xaml+++ b/.Source/GTweak/Languages/hu/Localize.xaml@@ -550,6 +550,7 @@<v:String x:Key="source_ts">Source</v:String><v:String x:Key="btn_download">Download</v:String><v:String x:Key="btn_cancel">Сancel</v:String>+ <v:String x:Key="download_folder_ts">Download Folder</v:String><!--#endregion--></ResourceDictionary>diff --git a/.Source/GTweak/Languages/it/Localize.xaml b/.Source/GTweak/Languages/it/Localize.xamlindex 745b5ca8..c60a7586 100644--- a/.Source/GTweak/Languages/it/Localize.xaml+++ b/.Source/GTweak/Languages/it/Localize.xaml@@ -550,6 +550,7 @@<v:String x:Key="source_ts">Source</v:String><v:String x:Key="btn_download">Download</v:String><v:String x:Key="btn_cancel">Сancel</v:String>+ <v:String x:Key="download_folder_ts">Download Folder</v:String><!--#endregion--></ResourceDictionary>diff --git a/.Source/GTweak/Languages/ko/Localize.xaml b/.Source/GTweak/Languages/ko/Localize.xamlindex 6fc9e08e..cf27d867 100644--- a/.Source/GTweak/Languages/ko/Localize.xaml+++ b/.Source/GTweak/Languages/ko/Localize.xaml@@ -550,6 +550,7 @@<v:String x:Key="source_ts">Source</v:String><v:String x:Key="btn_download">Download</v:String><v:String x:Key="btn_cancel">Сancel</v:String>+ <v:String x:Key="download_folder_ts">Download Folder</v:String><!--#endregion--></ResourceDictionary>diff --git a/.Source/GTweak/Languages/pl/Localize.xaml b/.Source/GTweak/Languages/pl/Localize.xamlindex 3e5f2d23..c7751535 100644--- a/.Source/GTweak/Languages/pl/Localize.xaml+++ b/.Source/GTweak/Languages/pl/Localize.xaml@@ -550,6 +550,7 @@<v:String x:Key="source_ts">Source</v:String><v:String x:Key="btn_download">Download</v:String><v:String x:Key="btn_cancel">Сancel</v:String>+ <v:String x:Key="download_folder_ts">Download Folder</v:String><!--#endregion--></ResourceDictionary>diff --git a/.Source/GTweak/Languages/pt-BR/Localize.xaml b/.Source/GTweak/Languages/pt-BR/Localize.xamlindex 9c179ac9..e584a10d 100644--- a/.Source/GTweak/Languages/pt-BR/Localize.xaml+++ b/.Source/GTweak/Languages/pt-BR/Localize.xaml@@ -550,6 +550,7 @@<v:String x:Key="source_ts">Source</v:String><v:String x:Key="btn_download">Download</v:String><v:String x:Key="btn_cancel">Сancel</v:String>+ <v:String x:Key="download_folder_ts">Download Folder</v:String><!--#endregion--></ResourceDictionary>diff --git a/.Source/GTweak/Languages/ru/Localize.xaml b/.Source/GTweak/Languages/ru/Localize.xamlindex d988bd92..1c7cb9b8 100644--- a/.Source/GTweak/Languages/ru/Localize.xaml+++ b/.Source/GTweak/Languages/ru/Localize.xaml@@ -549,7 +549,8 @@<!--#region ToolsetCard Page --><v:String x:Key="source_ts">Источник</v:String><v:String x:Key="btn_download">Скачать</v:String>- <v:String x:Key="btn_cancel">Сancel</v:String>+ <v:String x:Key="btn_cancel">Отмена</v:String>+ <v:String x:Key="download_folder_ts">Папка загрузки</v:String><!--#endregion--></ResourceDictionary>diff --git a/.Source/GTweak/Languages/uk/Localize.xaml b/.Source/GTweak/Languages/uk/Localize.xamlindex d9ffe953..f5f5f9fc 100644--- a/.Source/GTweak/Languages/uk/Localize.xaml+++ b/.Source/GTweak/Languages/uk/Localize.xaml@@ -550,6 +550,7 @@<v:String x:Key="source_ts">Source</v:String><v:String x:Key="btn_download">Download</v:String><v:String x:Key="btn_cancel">Сancel</v:String>+ <v:String x:Key="download_folder_ts">Download Folder</v:String><!--#endregion--></ResourceDictionary>diff --git a/.Source/GTweak/Languages/zh-CN/Localize.xaml b/.Source/GTweak/Languages/zh-CN/Localize.xamlindex 56cfdce9..6dc3d393 100644--- a/.Source/GTweak/Languages/zh-CN/Localize.xaml+++ b/.Source/GTweak/Languages/zh-CN/Localize.xaml@@ -550,6 +550,7 @@<v:String x:Key="source_ts">Source</v:String><v:String x:Key="btn_download">Download</v:String><v:String x:Key="btn_cancel">Сancel</v:String>+ <v:String x:Key="download_folder_ts">Download Folder</v:String><!--#endregion--></ResourceDictionary>diff --git a/.Source/GTweak/Languages/zh-TW/Localize.xaml b/.Source/GTweak/Languages/zh-TW/Localize.xamlindex 6f1817e5..230dc43d 100644--- a/.Source/GTweak/Languages/zh-TW/Localize.xaml+++ b/.Source/GTweak/Languages/zh-TW/Localize.xaml@@ -550,6 +550,7 @@<v:String x:Key="source_ts">Source</v:String><v:String x:Key="btn_download">Download</v:String><v:String x:Key="btn_cancel">Сancel</v:String>+ <v:String x:Key="download_folder_ts">Download Folder</v:String><!--#endregion--></ResourceDictionary>diff --git a/.Source/GTweak/Properties/Resources.Designer.cs b/.Source/GTweak/Properties/Resources.Designer.csindex a187a49d..ca177e2c 100644--- a/.Source/GTweak/Properties/Resources.Designer.cs+++ b/.Source/GTweak/Properties/Resources.Designer.cs@@ -60,6 +60,25 @@ namespace GTweak.Properties {}}+ /// <summary>+ /// Ищет локализованную строку, похожую на <?xml version="1.0" encoding="UTF-8"?>+ ///<Apps>+ /// <App>+ /// <Icon>Img_FirstEverTech</Icon>+ /// <Name>Universal Intel Chipset Device Updater</Name>+ /// <Group>github</Group>+ /// <Author>FirstEverTech</Author>+ /// <AuthorIcon>https://github.com/FirstEverTech.png</AuthorIcon>+ /// <Source>https://github.com/FirstEverTech/Universal-Intel-Chipset-Updater</Source>+ /// <DownloadPath>FirstEverTech/Universal-Intel-Chipset-Updater</DownloadPath>+ /// <FilePattern><![CDATA[Setup.*\\ [остаток строки не уместился]";.+ /// </summary>+ internal static string AppsCatalog {+ get {+ return ResourceManager.GetString("AppsCatalog", resourceCulture);+ }+ }+/// <summary>/// Поиск локализованного ресурса типа System.Byte[]./// </summary>@@ -71,7 +90,13 @@ namespace GTweak.Properties {}/// <summary>- /// Ищет локализованную строку, похожую на # Blocklist Domain - GTweak+ /// Ищет локализованную строку, похожую на 0.0.0.0 1oavsblobprodcus350.blob.core.windows.net+ ///0.0.0.0 2539951.r.bat.bing.com+ ///0.0.0.0 37bvsblobprodcus311.blob.core.windows.net+ ///0.0.0.0 a.ads1.msn.com+ ///0.0.0.0 a.ads2.msads.net+ ///0.0.0.0 a.ads2.msn.com+ ///0.0.0.0 a.rad.msn.com///0.0.0.0 a-0001.a-msedge.net///0.0.0.0 a-0001.dc-msedge.net///0.0.0.0 a-0002.a-msedge.net@@ -81,14 +106,7 @@ namespace GTweak.Properties {///0.0.0.0 a-0005.a-msedge.net///0.0.0.0 a-0006.a-msedge.net///0.0.0.0 a-0007.a-msedge.net- ///0.0.0.0 a-0008.a-msedge.net- ///0.0.0.0 a-0009.a-msedge.net- ///0.0.0.0 a-0010.a-msedge.net- ///0.0.0.0 a-0011.a-msedge.net- ///0.0.0.0 a-0012.a-msedge.net- ///0.0.0.0 a-msedge.net- ///0.0.0.0 1oavsblobprodcus350.blob.core.windows.net- ///0. [остаток строки не уместился]";.+ ///0.0.0.0 a-0008.a-m [остаток строки не уместился]";./// </summary>internal static string Blocklist {get {diff --git a/.Source/GTweak/Properties/Resources.resx b/.Source/GTweak/Properties/Resources.resxindex f177867a..c16f3784 100644--- a/.Source/GTweak/Properties/Resources.resx+++ b/.Source/GTweak/Properties/Resources.resx@@ -118,6 +118,9 @@<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></resheader><assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />+ <data name="AppsCatalog" type="System.Resources.ResXFileRef, System.Windows.Forms">+ <value>..\Resources\AppsCatalog.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>+ </data><data name="Blank" type="System.Resources.ResXFileRef, System.Windows.Forms"><value>..\Resources\Blank.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></data>diff --git a/.Source/GTweak/Resources/AppsCatalog.xml b/.Source/GTweak/Resources/AppsCatalog.xmlnew file mode 100644index 00000000..fff47d9d--- /dev/null+++ b/.Source/GTweak/Resources/AppsCatalog.xml@@ -0,0 +1,88 @@+<?xml version="1.0" encoding="UTF-8"?>+<Apps>+ <App>+ <Icon>Img_FirstEverTech</Icon>+ <Name>Universal Intel Chipset Device Updater</Name>+ <Group>github</Group>+ <Author>FirstEverTech</Author>+ <AuthorIcon>https://github.com/FirstEverTech.png</AuthorIcon>+ <Source>https://github.com/FirstEverTech/Universal-Intel-Chipset-Updater</Source>+ <DownloadPath>FirstEverTech/Universal-Intel-Chipset-Updater</DownloadPath>+ <FilePattern><![CDATA[.*\.exe$]]></FilePattern>+ </App>++ <App>+ <Icon>Img_FirstEverTech</Icon>+ <Name>Universal Intel Wi-Fi and Bluetooth Drivers Updater</Name>+ <Group>github</Group>+ <Author>FirstEverTech</Author>+ <AuthorIcon>https://github.com/FirstEverTech.png</AuthorIcon>+ <Source>https://github.com/FirstEverTech/Universal-Intel-WiFi-BT-Updater</Source>+ <DownloadPath>FirstEverTech/Universal-Intel-WiFi-BT-Updater</DownloadPath>+ <FilePattern><![CDATA[.*\.exe$]]></FilePattern>+ </App>++ <App>+ <Icon>Img_DeviceTweaker</Icon>+ <Name>DEVICE TWEAKER</Name>+ <Group>github</Group>+ <Author>arsenzaaa</Author>+ <AuthorIcon>https://github.com/arsenzaaa.png</AuthorIcon>+ <Source>https://github.com/arsenzaaa/DEVICE-TWEAKER</Source>+ <DownloadPath>arsenzaaa/DEVICE-TWEAKER</DownloadPath>+ <FilePattern><![CDATA[(?i)DEVICE.*NET.*FRAMEWORK.*\.exe$]]></FilePattern>+ </App>++ <App>+ <Icon>Img_NvidiaPI</Icon>+ <Name>NVIDIA Profile Inspector</Name>+ <Group>github</Group>+ <Author>Orbmu2k</Author>+ <AuthorIcon>https://github.com/Orbmu2k.png</AuthorIcon>+ <Source>https://github.com/Orbmu2k/nvidiaProfileInspector</Source>+ <DownloadPath>Orbmu2k/nvidiaProfileInspector</DownloadPath>+ <FilePattern><![CDATA[(?i)nvidiaProfileInspector.*\.zip$]]></FilePattern>+ </App>++ <App>+ <Icon>Img_Nvidia</Icon>+ <Name>NVIDIA App</Name>+ <Group>web</Group>+ <Author>(C) NVIDIA Corporation</Author>+ <AuthorIcon>nvidia.com</AuthorIcon>+ <Source>https://www.nvidia.com/en-eu/software/nvidia-app/</Source>+ <DownloadPath>https://www.nvidia.com/en-us/software/nvidia-app/</DownloadPath>+ <UrlPattern><![CDATA[https://.*?download\.nvidia\.com/nvapp/client/.*?/NVIDIA_app_.*?\.exe]]></UrlPattern>+ </App>++ <App>+ <Icon>Img_Amd</Icon>+ <Name>AMD Software: Adrenalin Edition™</Name>+ <Group>web</Group>+ <Author>Advanced Micro Devices, Inc</Author>+ <AuthorIcon>amd.com</AuthorIcon>+ <Source>https://www.amd.com/en/support/download/drivers.html</Source>+ <DownloadPath>https://www.amd.com/en/support/download/drivers.html</DownloadPath>+ <UrlPattern><![CDATA[https://drivers\.amd\.com/drivers/installer/.*?/whql/.*?minimalsetup.*?\.exe]]></UrlPattern>+ </App>++ <App>+ <Icon>Img_Autoruns</Icon>+ <Name>Autoruns</Name>+ <Group>web</Group>+ <Author>Mark Russinovich</Author>+ <AuthorIcon>microsoft.com</AuthorIcon>+ <Source>https://learn.microsoft.com/en-us/sysinternals/downloads/autoruns</Source>+ <DownloadPath>https://download.sysinternals.com/files/Autoruns.zip</DownloadPath>+ </App>++ <App>+ <Icon>Img_Occt</Icon>+ <Name>OCCT</Name>+ <Group>web</Group>+ <Author>OCCT</Author>+ <AuthorIcon>ocbase.com</AuthorIcon>+ <Source>https://www.ocbase.com/download</Source>+ <DownloadPath>https://www.ocbase.com/download/edition:Personal/os:Windows</DownloadPath>+ </App>+</Apps>\ No newline at end of filediff --git a/.Source/GTweak/Utilities/Controls/SettingsEngine.cs b/.Source/GTweak/Utilities/Controls/SettingsEngine.csindex 05583d39..7d03dd7c 100644--- a/.Source/GTweak/Utilities/Controls/SettingsEngine.cs+++ b/.Source/GTweak/Utilities/Controls/SettingsEngine.cs@@ -36,7 +36,8 @@ namespace GTweak.Utilities.Controls["VolumeLevel"] = 50,["Language"] = HardwareProvider.GetCurrentSystemLang().Code,["Theme"] = AvailableThemes.First(),- ["AddonsPath"] = string.Empty,+ ["AddonsPath"] = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory),+ ["DownloadPath"] = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory)};private static readonly Dictionary<string, object> _cachedSettings = new Dictionary<string, object>(_defaultSettings);@@ -50,6 +51,7 @@ namespace GTweak.Utilities.Controlsinternal static string Language { get => (string)_cachedSettings["Language"]; set => ChangingParameters("Language", value); }internal static string Theme { get => (string)_cachedSettings["Theme"]; set => ChangingParameters("Theme", value); }internal static string UserAddonsPath { get => (string)_cachedSettings["AddonsPath"]; set => ChangingParameters("AddonsPath", value); }+ internal static string DownloadPath { get => (string)_cachedSettings["DownloadPath"]; set => ChangingParameters("DownloadPath", value); }private static void ChangingParameters(string key, object value){diff --git a/.Source/GTweak/Utilities/Managers/ToolsetIconManager.cs b/.Source/GTweak/Utilities/Managers/ToolsetIconManager.csnew file mode 100644index 00000000..a0d7cd2d--- /dev/null+++ b/.Source/GTweak/Utilities/Managers/ToolsetIconManager.cs@@ -0,0 +1,97 @@+using System;+using System.Collections.Concurrent;+using System.IO;+using System.Net.Http;+using System.Threading.Tasks;+using System.Windows;+using System.Windows.Media;+using System.Windows.Media.Imaging;+using GTweak.Utilities.Controls;++namespace GTweak.Utilities.Managers+{+ internal static class ToolsetIconManager+ {+ private static readonly ConcurrentDictionary<string, ImageSource> _imageCache = new ConcurrentDictionary<string, ImageSource>();+ private static readonly HttpClient _httpClient = new HttpClient();++ public static ImageSource GetPlaceholder(string group) => Application.Current.TryFindResource(group.ToLower() == "github" ? "Icon_Git" : "Icon_Website") as ImageSource;++ public static async Task<ImageSource> GetAuthorIconAsync(string group, string authorIconUrlOrDomain)+ {+ if (string.IsNullOrWhiteSpace(authorIconUrlOrDomain))+ {+ return GetPlaceholder(group);+ }++ if (_imageCache.TryGetValue(authorIconUrlOrDomain, out ImageSource cachedImage))+ {+ return cachedImage;+ }++ string urlToDownload = authorIconUrlOrDomain;+ bool isWeb = group.ToLower() == "web";++ if (isWeb)+ {+ urlToDownload = $"https://www.google.com/s2/favicons?domain={authorIconUrlOrDomain}&sz=64";+ }++ try+ {+ var imageBytes = await _httpClient.GetByteArrayAsync(urlToDownload);+ var image = LoadImage(imageBytes);++ if (image != null)+ {+ _imageCache.TryAdd(authorIconUrlOrDomain, image);+ return image;+ }+ }+ catch+ {+ if (isWeb)+ {+ try+ {+ string backupUrl = $"https://icons.duckduckgo.com/ip3/{authorIconUrlOrDomain}.ico";+ byte[] imageBytes = await _httpClient.GetByteArrayAsync(backupUrl);+ ImageSource image = LoadImage(imageBytes);++ if (image != null)+ {+ _imageCache.TryAdd(authorIconUrlOrDomain, image);+ return image;+ }+ }+ catch (Exception ex) { ErrorLogging.LogDebug(ex); }+ }+ }++ return GetPlaceholder(group);+ }++ private static ImageSource LoadImage(byte[] imageData)+ {+ if (imageData != null && imageData.Length != 0)+ {+ BitmapImage bitmap = new BitmapImage();+ using (MemoryStream stream = new MemoryStream(imageData))+ {+ bitmap.BeginInit();+ bitmap.CreateOptions = BitmapCreateOptions.PreservePixelFormat;+ bitmap.CacheOption = BitmapCacheOption.OnLoad;+ bitmap.UriSource = null;+ bitmap.StreamSource = stream;+ bitmap.EndInit();+ }+ bitmap.Freeze();+ return bitmap;+ }++ return null;+ }++ public static ImageSource GetAppIconFromResource(string resourceName) => Application.Current.TryFindResource(resourceName) as ImageSource;+ }+}diff --git a/.Source/GTweak/View/ToolsetView.xaml b/.Source/GTweak/View/ToolsetView.xamlindex 9838b97b..22a66a09 100644--- a/.Source/GTweak/View/ToolsetView.xaml+++ b/.Source/GTweak/View/ToolsetView.xaml@@ -2,12 +2,63 @@xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:vm="clr-namespace:GTweak.Core.ViewModel"xmlns:uc="clr-namespace:GTweak.Assets.UserControls"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"xmlns:local="clr-namespace:GTweak.View"mc:Ignorable="d" d:Width="1014" Style="{StaticResource LaunchPage}">+ <UserControl.DataContext>+ <vm:ToolsetViewModel />+ </UserControl.DataContext><Grid>-+ <Grid.RowDefinitions>+ <RowDefinition Height="auto" />+ <RowDefinition Height="auto" />+ <RowDefinition Height="*" />+ </Grid.RowDefinitions>++ <uc:FlowPanel Grid.Row="0" ContentAlignment="Left" Orientation="Horizontal" HorizontalSpacing="10" VerticalSpacing="5" Margin="10,5,10,0">+ <Button Command="{Binding SelectFolderCommand}" Style="{StaticResource ButtonContent}" HorizontalAlignment="Right">+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center">+ <ui:SymbolIcon Symbol="FolderOpen20" FontSize="15" Margin="0,0,5,0"/>+ <TextBlock VerticalAlignment="Center">+ <Run Text="{DynamicResource btn_open_dir}"/><Run Text="..."/>+ </TextBlock>+ </StackPanel>+ </Button>++ <Border Grid.Column="0" BorderThickness="1" BorderBrush="{StaticResource Brush_Separator}" Height="29" CornerRadius="6" Background="Transparent" VerticalAlignment="Stretch" Padding="10,0" Cursor="Hand">+ <Border.InputBindings>+ <MouseBinding MouseAction="LeftClick" Command="{Binding OpenFolderCommand}"/>+ </Border.InputBindings>+ <TextBlock Style="{StaticResource Description}" FontSize="14px" VerticalAlignment="Center" HorizontalAlignment="Center" Padding="0,5" TextTrimming="CharacterEllipsis" Cursor="Hand">+ <Run Text="{DynamicResource download_folder_ts}"/><Run Text=": "/><Run Text="{Binding DownloadPath}" Foreground="{StaticResource Brush_Inactive}"/>+ </TextBlock>+ </Border>++ </uc:FlowPanel>++ <Border Grid.Row="1" Background="{StaticResource Brush_Separator}" Height="1.2" Margin="10,10,10,0" CornerRadius="10" HorizontalAlignment="Stretch"/>++ <Grid Grid.Row="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">+ <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">+ <Grid>+ <ItemsControl ItemsSource="{Binding Tools}" VirtualizingPanel.IsVirtualizing="True">+ <ItemsControl.ItemsPanel>+ <ItemsPanelTemplate>+ <uc:FlowPanel Margin="20,10,5,20" UseMasonryLayout="True" ItemWidth="100" HorizontalSpacing="5" VerticalSpacing="5" ContentAlignment="Stretch" HorizontalAlignment="Left" VerticalAlignment="Top"/>+ </ItemsPanelTemplate>+ </ItemsControl.ItemsPanel>++ <ItemsControl.ItemTemplate>+ <DataTemplate>+ <uc:ToolsetCard AppName="{Binding AppName}" AppIcon="{Binding AppIconSource}" AuthorName="{Binding AuthorName}" AuthorIcon="{Binding AuthorIconSource}" SourceUrl="{Binding SourceUrl}" DownloadCommand="{Binding DownloadCommand}" CancelCommand="{Binding CancelCommand}" IsDownloading="{Binding IsDownloading}" Progress="{Binding Progress}" />+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>+ </Grid>+ </ScrollViewer>+ </Grid></Grid></UserControl>diff --git a/Assets/DrawingImages/SettingsPanel/Web.svg b/Assets/DrawingImages/SettingsPanel/Web.svgnew file mode 100644index 00000000..0317d1a3--- /dev/null+++ b/Assets/DrawingImages/SettingsPanel/Web.svg@@ -0,0 +1,10 @@+<?xml version="1.0" encoding="UTF-8"?>+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64px" height="64px" viewBox="0 0 64 64" version="1.1">+<g id="surface1">+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 42.066406 11.234375 C 48.0625 15.054688 51.527344 19.539062 53.761719 26.238281 C 53.839844 28.035156 53.878906 29.804688 53.878906 31.601562 C 53.886719 32.082031 53.894531 32.566406 53.902344 33.066406 C 53.910156 35.777344 53.726562 37.84375 52.480469 40.320312 C 51.847656 40.320312 51.210938 40.320312 50.558594 40.320312 C 50.980469 37.574219 51.40625 34.828125 51.839844 32 C 50.363281 32 48.882812 32 47.359375 32 C 47.359375 31.789062 47.359375 31.578125 47.359375 31.359375 C 48.839844 31.359375 50.316406 31.359375 51.839844 31.359375 C 51.210938 27.621094 50.484375 24.476562 48.640625 21.121094 C 48.640625 20.699219 48.640625 20.273438 48.640625 19.839844 C 47.371094 19.839844 46.105469 19.839844 44.800781 19.839844 C 45.117188 20.578125 45.433594 21.320312 45.761719 22.078125 C 47.28125 26.53125 46.875 31.199219 46.71875 35.839844 C 46.296875 35.839844 45.875 35.839844 45.441406 35.839844 C 45.441406 34.574219 45.441406 33.304688 45.441406 32 C 44.59375 31.789062 43.75 31.578125 42.878906 31.359375 C 43.726562 31.359375 44.570312 31.359375 45.441406 31.359375 C 44.585938 25.496094 44.585938 25.496094 42.878906 19.839844 C 40.769531 19.839844 38.65625 19.839844 36.480469 19.839844 C 36.796875 20.472656 36.796875 20.472656 37.121094 21.121094 C 37.175781 22.707031 37.195312 24.277344 37.183594 25.863281 C 37.179688 26.332031 37.179688 26.800781 37.179688 27.28125 C 37.175781 28.773438 37.167969 30.265625 37.160156 31.761719 C 37.15625 32.773438 37.152344 33.785156 37.152344 34.796875 C 37.144531 37.277344 37.132812 39.757812 37.121094 42.238281 C 36.488281 42.453125 35.851562 42.664062 35.199219 42.878906 C 35.410156 39.289062 35.621094 35.699219 35.839844 32 C 33.09375 32 30.347656 32 27.519531 32 C 27.730469 35.800781 27.941406 39.601562 28.160156 43.519531 C 32.59375 43.519531 37.03125 43.519531 41.601562 43.519531 C 41.601562 43.730469 41.601562 43.941406 41.601562 44.160156 C 37.164062 44.160156 32.730469 44.160156 28.160156 44.160156 C 28.542969 45.308594 28.925781 46.457031 29.320312 47.640625 C 29.535156 48.285156 29.75 48.933594 29.972656 49.597656 C 30.34375 50.390625 30.34375 50.390625 30.71875 51.199219 C 31.355469 51.410156 31.988281 51.621094 32.640625 51.839844 C 33.0625 50.574219 33.484375 49.304688 33.921875 48 C 34.34375 48 34.765625 48 35.199219 48 C 35.199219 49.054688 35.199219 50.113281 35.199219 51.199219 C 35.554688 50.921875 35.910156 50.644531 36.273438 50.359375 C 36.96875 49.824219 36.96875 49.824219 37.679688 49.28125 C 38.371094 48.746094 38.371094 48.746094 39.074219 48.199219 C 40.320312 47.359375 40.320312 47.359375 41.601562 47.359375 C 41.601562 51.109375 41.601562 51.109375 40.960938 52.480469 C 35.722656 54.734375 28.171875 54.722656 22.761719 52.839844 C 16.707031 49.894531 12.652344 45.253906 10.238281 39.039062 C 8.5 33.820312 8.820312 26.253906 11.234375 21.296875 C 17.71875 11.121094 30.578125 5.644531 42.066406 11.234375 Z M 26.878906 11.519531 C 26.667969 11.941406 26.457031 12.363281 26.238281 12.800781 C 25.59375 12.851562 24.945312 12.90625 24.28125 12.960938 C 21.152344 13.308594 18.847656 15.117188 16.640625 17.28125 C 16.429688 17.914062 16.21875 18.546875 16 19.199219 C 17.265625 19.199219 18.535156 19.199219 19.839844 19.199219 C 20.050781 18.144531 20.261719 17.089844 20.480469 16 C 20.902344 16 21.324219 16 21.761719 16 C 21.546875 17.054688 21.335938 18.113281 21.121094 19.199219 C 23.019531 19.199219 24.921875 19.199219 26.878906 19.199219 C 27.511719 16.664062 28.148438 14.132812 28.800781 11.519531 C 28.167969 11.519531 27.53125 11.519531 26.878906 11.519531 Z M 30.71875 11.519531 C 30.289062 12.558594 29.863281 13.597656 29.441406 14.640625 C 29.203125 15.21875 28.964844 15.796875 28.71875 16.394531 C 28.085938 17.847656 28.085938 17.847656 28.160156 19.199219 C 30.484375 19.199219 32.804688 19.199219 35.199219 19.199219 C 34.3125 15.214844 34.3125 15.214844 32.640625 11.519531 C 32.007812 11.519531 31.371094 11.519531 30.71875 11.519531 Z M 34.558594 11.519531 C 34.757812 12.441406 34.960938 13.359375 35.160156 14.28125 C 35.269531 14.792969 35.382812 15.304688 35.496094 15.832031 C 35.839844 17.375 35.839844 17.375 36.480469 19.199219 C 38.378906 19.199219 40.28125 19.199219 42.238281 19.199219 C 41.359375 15.875 39.203125 14.078125 36.480469 12.160156 C 35.847656 11.949219 35.210938 11.738281 34.558594 11.519531 Z M 40.320312 13.441406 C 40.878906 14.410156 41.457031 15.367188 42.039062 16.320312 C 42.359375 16.855469 42.679688 17.390625 43.007812 17.941406 C 44.074219 19.386719 44.074219 19.386719 45.890625 19.378906 C 46.375 19.320312 46.859375 19.261719 47.359375 19.199219 C 46.410156 16.351562 44.105469 14.882812 41.601562 13.441406 C 41.175781 13.441406 40.753906 13.441406 40.320312 13.441406 Z M 14.71875 19.839844 C 14.304688 20.652344 13.890625 21.464844 13.480469 22.28125 C 13.25 22.734375 13.019531 23.1875 12.78125 23.652344 C 11.515625 26.308594 11.464844 28.445312 11.519531 31.359375 C 13.210938 31.359375 14.898438 31.359375 16.640625 31.359375 C 16.726562 30.796875 16.808594 30.234375 16.898438 29.652344 C 17.011719 28.910156 17.125 28.164062 17.238281 27.398438 C 17.351562 26.664062 17.460938 25.929688 17.578125 25.171875 C 17.863281 23.382812 18.1875 21.613281 18.558594 19.839844 C 17.292969 19.839844 16.027344 19.839844 14.71875 19.839844 Z M 19.839844 19.839844 C 18.285156 23.925781 17.710938 26.992188 17.921875 31.359375 C 20.664062 31.359375 23.410156 31.359375 26.238281 31.359375 C 26.558594 25.65625 26.558594 25.65625 26.878906 19.839844 C 24.558594 19.839844 22.234375 19.839844 19.839844 19.839844 Z M 28.160156 19.839844 C 27.386719 22.15625 27.449219 24.273438 27.480469 26.679688 C 27.484375 27.128906 27.484375 27.578125 27.488281 28.042969 C 27.496094 29.148438 27.507812 30.253906 27.519531 31.359375 C 30.265625 31.359375 33.011719 31.359375 35.839844 31.359375 C 35.855469 29.800781 35.871094 28.238281 35.878906 26.679688 C 35.886719 26.238281 35.890625 25.796875 35.894531 25.339844 C 35.90625 23.328125 35.839844 21.765625 35.199219 19.839844 C 32.875 19.839844 30.554688 19.839844 28.160156 19.839844 Z M 11.519531 32 C 11.179688 36.011719 12.277344 38.6875 14.078125 42.238281 C 14.292969 42.664062 14.503906 43.085938 14.71875 43.519531 C 15.988281 43.519531 17.253906 43.519531 18.558594 43.519531 C 18.476562 43.171875 18.390625 42.820312 18.300781 42.460938 C 17.484375 38.976562 16.980469 35.5625 16.640625 32 C 14.949219 32 13.261719 32 11.519531 32 Z M 17.921875 32 C 17.703125 36.011719 18.273438 39.167969 19.839844 42.878906 C 20.5 43.6875 20.5 43.6875 21.941406 43.582031 C 24.410156 43.550781 24.410156 43.550781 26.878906 43.519531 C 26.667969 39.71875 26.457031 35.917969 26.238281 32 C 23.496094 32 20.75 32 17.921875 32 Z M 16 44.160156 C 16.96875 47.070312 19.308594 48.320312 21.761719 49.921875 C 22.183594 49.707031 22.605469 49.496094 23.039062 49.28125 C 22.445312 48.546875 22.445312 48.546875 21.839844 47.800781 C 20.480469 46.078125 20.480469 46.078125 19.199219 44.160156 C 17.546875 44 17.546875 44 16 44.160156 Z M 21.121094 44.160156 C 22 47.484375 24.15625 49.28125 26.878906 51.199219 C 27.511719 51.410156 28.148438 51.621094 28.800781 51.839844 C 28.167969 49.304688 27.53125 46.769531 26.878906 44.160156 C 24.980469 44.160156 23.078125 44.160156 21.121094 44.160156 Z M 21.121094 44.160156 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 42.878906 35.199219 C 45.730469 35.914062 47.042969 37.117188 49.078125 39.078125 C 49.757812 39.722656 50.4375 40.363281 51.117188 41.003906 C 51.453125 41.324219 51.789062 41.640625 52.132812 41.96875 C 53.984375 43.679688 55.941406 45.277344 57.890625 46.878906 C 58.878906 48 58.878906 48 58.878906 50.558594 C 56.980469 50.558594 55.078125 50.558594 53.121094 50.558594 C 53.4375 51.339844 53.753906 52.117188 54.078125 52.921875 C 54.855469 54.988281 55.3125 56.648438 55.039062 58.878906 C 54.398438 59.519531 54.398438 59.519531 52.441406 59.558594 C 51.820312 59.546875 51.199219 59.535156 50.558594 59.519531 C 49.714844 57.621094 48.871094 55.71875 48 53.761719 C 47.511719 54.183594 47.023438 54.605469 46.519531 55.039062 C 44.800781 56.320312 44.800781 56.320312 42.878906 56.320312 C 42.878906 49.351562 42.878906 42.378906 42.878906 35.199219 Z M 44.160156 38.398438 C 44.160156 43.46875 44.160156 48.539062 44.160156 53.761719 C 45.214844 52.914062 46.273438 52.070312 47.359375 51.199219 C 47.992188 51.199219 48.628906 51.199219 49.28125 51.199219 C 50.335938 53.3125 51.390625 55.425781 52.480469 57.601562 C 53.316406 56.289062 53.316406 56.289062 52.621094 54.65625 C 52.378906 54.015625 52.132812 53.378906 51.878906 52.71875 C 51.636719 52.078125 51.394531 51.4375 51.140625 50.773438 C 50.855469 50.035156 50.855469 50.035156 50.558594 49.28125 C 53.09375 48.964844 53.09375 48.964844 55.679688 48.640625 C 55 47.964844 55 47.964844 54.308594 47.273438 C 53.085938 46.050781 51.875 44.824219 50.671875 43.585938 C 50.0625 42.964844 49.449219 42.34375 48.839844 41.71875 C 48.53125 41.398438 48.21875 41.078125 47.898438 40.746094 C 47.101562 39.941406 46.273438 39.167969 45.441406 38.398438 C 45.019531 38.398438 44.59375 38.398438 44.160156 38.398438 Z M 44.160156 38.398438 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 23.039062 13.441406 C 23.460938 13.441406 23.886719 13.441406 24.320312 13.441406 C 23.898438 14.285156 23.476562 15.128906 23.039062 16 C 22.617188 16 22.195312 16 21.761719 16 C 22.183594 15.15625 22.605469 14.308594 23.039062 13.441406 Z M 23.039062 13.441406 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 35.199219 44.800781 C 35.621094 44.800781 36.042969 44.800781 36.480469 44.800781 C 36.269531 45.433594 36.058594 46.066406 35.839844 46.71875 C 35.417969 46.71875 34.996094 46.71875 34.558594 46.71875 C 34.769531 46.085938 34.980469 45.453125 35.199219 44.800781 Z M 35.199219 44.800781 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 37.761719 31.359375 C 39.238281 31.359375 40.71875 31.359375 42.238281 31.359375 C 42.238281 31.570312 42.238281 31.78125 42.238281 32 C 40.761719 32 39.28125 32 37.761719 32 C 37.761719 31.789062 37.761719 31.578125 37.761719 31.359375 Z M 37.761719 31.359375 "/>+</g>+</svg>diff --git a/Assets/Images/DownloadApps/Amd.png b/Assets/Images/DownloadApps/Amd.pngnew file mode 100644index 00000000..ca82e964Binary files /dev/null and b/Assets/Images/DownloadApps/Amd.png differdiff --git a/Assets/Images/DownloadApps/Autoruns.png b/Assets/Images/DownloadApps/Autoruns.pngnew file mode 100644index 00000000..4700c9f5Binary files /dev/null and b/Assets/Images/DownloadApps/Autoruns.png differdiff --git a/Assets/Images/DownloadApps/DeviceTweaker.png b/Assets/Images/DownloadApps/DeviceTweaker.pngnew file mode 100644index 00000000..7ff0b0eaBinary files /dev/null and b/Assets/Images/DownloadApps/DeviceTweaker.png differdiff --git a/Assets/Images/DownloadApps/FirstEverTech.png b/Assets/Images/DownloadApps/FirstEverTech.pngnew file mode 100644index 00000000..ea2f41ebBinary files /dev/null and b/Assets/Images/DownloadApps/FirstEverTech.png differdiff --git a/Assets/Images/DownloadApps/Nvidia.png b/Assets/Images/DownloadApps/Nvidia.pngnew file mode 100644index 00000000..2d2b757cBinary files /dev/null and b/Assets/Images/DownloadApps/Nvidia.png differdiff --git a/Assets/Images/DownloadApps/NvidiaPI.png b/Assets/Images/DownloadApps/NvidiaPI.pngnew file mode 100644index 00000000..fd92fea5Binary files /dev/null and b/Assets/Images/DownloadApps/NvidiaPI.png differdiff --git a/Assets/Images/DownloadApps/Occt.png b/Assets/Images/DownloadApps/Occt.pngnew file mode 100644index 00000000..8e99e1acBinary files /dev/null and b/Assets/Images/DownloadApps/Occt.png differ