From 57dfe28898b931201d88cf4820e1cb70e0d7b926 Mon Sep 17 00:00:00 2001 From: noberumotto Date: Sat, 26 Nov 2022 13:35:07 +0800 Subject: [PATCH] =?UTF-8?q?UI=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- UI/App.xaml | 705 +------- UI/App.xaml.cs | 6 + UI/Controls/Base/IconConverter.cs | 1524 +++++++++++++++-- UI/Controls/Base/IconTypes.cs | 1518 ++++++++++++++-- UI/Controls/Charts/Charts.cs | 11 +- UI/Controls/Input/InputBox.cs | 49 + .../Navigation/Models/NavigationItemModel.cs | 29 +- UI/Controls/Navigation/Navigation.cs | 47 +- UI/Controls/Navigation/NavigationItem.cs | 10 + UI/Controls/SettingPanel/SettingPanel.cs | 5 +- UI/Controls/Tabbar/Tabbar.cs | 10 +- UI/MainWindow.xaml | 2 +- UI/Resources/Fonts/SegMDL2.ttf | Bin 203656 -> 0 bytes UI/Resources/Fonts/Segoe Fluent Icons.ttf | Bin 0 -> 408752 bytes UI/Resources/Fonts/fabric-icons.ttf | Bin 442200 -> 0 bytes UI/Resources/Themes/Common.xaml | 696 ++++++++ UI/Resources/Themes/Dark.xaml | 106 ++ UI/Resources/Themes/Dark/Base/CheckBox.xaml | 26 - .../Themes/Dark/Base/ColorSelect.xaml | 133 -- UI/Resources/Themes/Dark/Base/EmptyData.xaml | 63 - UI/Resources/Themes/Dark/Base/Icon.xaml | 26 - UI/Resources/Themes/Dark/Base/IconSelect.xaml | 133 -- UI/Resources/Themes/Dark/Base/Img.xaml | 32 - .../Themes/Dark/Base/Placeholder.xaml | 32 - UI/Resources/Themes/Dark/Base/Text.xaml | 18 - UI/Resources/Themes/Dark/Base/View.xaml | 20 - UI/Resources/Themes/Dark/Button/Button.xaml | 108 -- .../Themes/Dark/Button/IconButton.xaml | 63 - UI/Resources/Themes/Dark/Charts/Charts.xaml | 336 ---- .../Themes/Dark/Charts/ChartsItemTypeA.xaml | 194 --- .../Dark/Charts/ChartsItemTypeCard.xaml | 116 -- .../Dark/Charts/ChartsItemTypeColumn.xaml | 84 - .../Dark/Charts/ChartsItemTypeMonth.xaml | 74 - .../Dark/Charts/ChartsItemTypeRadar.xaml | 65 - UI/Resources/Themes/Dark/Config.xaml | 36 - .../Dark/DatePickerBar/DatePickerBar.xaml | 163 -- .../Dark/DatePickerBar/DatePickerBarItem.xaml | 78 - UI/Resources/Themes/Dark/Input/InputBox.xaml | 92 - UI/Resources/Themes/Dark/List/BaseList.xaml | 40 - .../Themes/Dark/List/BaseListItem.xaml | 85 - .../Themes/Dark/Navigation/Navigation.xaml | 45 - .../Dark/Navigation/NavigationItem.xaml | 155 -- UI/Resources/Themes/Dark/PageContainer.xaml | 22 - .../Themes/Dark/Select/DateSelect.xaml | 201 --- .../Themes/Dark/Select/ImageSelect.xaml | 55 - UI/Resources/Themes/Dark/Select/Option.xaml | 88 - UI/Resources/Themes/Dark/Select/Select.xaml | 102 -- .../Dark/SettingPanel/SettingPanel.xaml | 26 - .../Dark/SettingPanel/SettingPanelItem.xaml | 49 - .../SettingPanel/SettingPanelMultiItem.xaml | 53 - UI/Resources/Themes/Dark/Style.xaml | 46 - UI/Resources/Themes/Dark/Tabbar/Tabbar.xaml | 46 - UI/Resources/Themes/Dark/Toggle/Toggle.xaml | 108 -- .../Themes/Dark/Window/DefaultWindow.xaml | 281 --- .../Themes/Dark/Window/HideWindow.xaml | 17 - UI/Resources/Themes/Light.xaml | 105 ++ UI/Resources/Themes/Light/Base/CheckBox.xaml | 26 - .../Themes/Light/Base/ColorSelect.xaml | 133 -- UI/Resources/Themes/Light/Base/EmptyData.xaml | 63 - UI/Resources/Themes/Light/Base/Icon.xaml | 26 - .../Themes/Light/Base/IconSelect.xaml | 133 -- UI/Resources/Themes/Light/Base/Img.xaml | 32 - .../Themes/Light/Base/Placeholder.xaml | 32 - UI/Resources/Themes/Light/Base/Text.xaml | 18 - UI/Resources/Themes/Light/Base/View.xaml | 20 - UI/Resources/Themes/Light/Button/Button.xaml | 109 -- .../Themes/Light/Button/IconButton.xaml | 68 - UI/Resources/Themes/Light/Charts/Charts.xaml | 338 ---- .../Themes/Light/Charts/ChartsItemTypeA.xaml | 180 -- .../Light/Charts/ChartsItemTypeCard.xaml | 117 -- .../Light/Charts/ChartsItemTypeColumn.xaml | 84 - .../Light/Charts/ChartsItemTypeMonth.xaml | 74 - .../Light/Charts/ChartsItemTypeRadar.xaml | 65 - UI/Resources/Themes/Light/Config.xaml | 34 - .../Light/DatePickerBar/DatePickerBar.xaml | 163 -- .../DatePickerBar/DatePickerBarItem.xaml | 78 - UI/Resources/Themes/Light/Input/InputBox.xaml | 92 - UI/Resources/Themes/Light/List/BaseList.xaml | 40 - .../Themes/Light/List/BaseListItem.xaml | 85 - .../Themes/Light/Navigation/Navigation.xaml | 45 - .../Light/Navigation/NavigationItem.xaml | 155 -- UI/Resources/Themes/Light/PageContainer.xaml | 22 - .../Themes/Light/Select/DateSelect.xaml | 201 --- .../Themes/Light/Select/ImageSelect.xaml | 55 - UI/Resources/Themes/Light/Select/Option.xaml | 88 - UI/Resources/Themes/Light/Select/Select.xaml | 103 -- .../Light/SettingPanel/SettingPanel.xaml | 27 - .../Light/SettingPanel/SettingPanelItem.xaml | 49 - .../SettingPanel/SettingPanelMultiItem.xaml | 53 - UI/Resources/Themes/Light/Style.xaml | 46 - UI/Resources/Themes/Light/Tabbar/Tabbar.xaml | 46 - UI/Resources/Themes/Light/Toggle/Toggle.xaml | 108 -- .../Themes/Light/Window/DefaultWindow.xaml | 281 --- .../Themes/Light/Window/HideWindow.xaml | 17 - UI/Servicers/AppContextMenuServicer.cs | 37 +- UI/Servicers/IThemeServicer.cs | 4 + UI/Servicers/ThemeServicer.cs | 61 +- UI/Themes/Base/CheckBox.xaml | 1 - UI/Themes/Base/ColorSelect.xaml | 10 +- UI/Themes/Base/EmptyData.xaml | 11 +- UI/Themes/Base/Icon.xaml | 2 +- UI/Themes/Base/IconSelect.xaml | 189 +- UI/Themes/Base/Img.xaml | 1 - UI/Themes/Button/Button.xaml | 13 +- UI/Themes/Button/IconButton.xaml | 19 +- UI/Themes/Charts/Charts.xaml | 135 +- UI/Themes/Charts/ChartsItemTypeA.xaml | 83 +- UI/Themes/Charts/ChartsItemTypeCard.xaml | 69 +- UI/Themes/Charts/ChartsItemTypeMonth.xaml | 6 +- UI/Themes/DatePickerBar/DatePickerBar.xaml | 18 +- .../DatePickerBar/DatePickerBarItem.xaml | 18 +- UI/Themes/Input/InputBox.xaml | 185 +- UI/Themes/List/BaseListItem.xaml | 8 +- UI/Themes/Navigation/Navigation.xaml | 6 +- UI/Themes/Navigation/NavigationItem.xaml | 65 +- UI/Themes/Select/DateSelect.xaml | 32 +- UI/Themes/Select/ImageSelect.xaml | 2 +- UI/Themes/Select/Option.xaml | 14 +- UI/Themes/Select/Select.xaml | 23 +- UI/Themes/SettingPanel/SettingPanel.xaml | 8 +- UI/Themes/SettingPanel/SettingPanelItem.xaml | 6 +- .../SettingPanel/SettingPanelMultiItem.xaml | 6 +- UI/Themes/Tabbar/Tabbar.xaml | 13 +- UI/Themes/Toggle/Toggle.xaml | 8 +- UI/Themes/Window/DefaultWindow.xaml | 40 +- UI/UI.csproj | 301 +--- UI/ViewModels/CategoryPageVM.cs | 14 +- UI/ViewModels/DetailPageVM.cs | 4 +- UI/ViewModels/MainViewModel.cs | 12 +- UI/ViewModels/SettingPageVM.cs | 4 +- UI/Views/CategoryPage.xaml | 4 +- UI/Views/ChartPage.xaml | 30 +- UI/Views/DetailPage.xaml | 26 +- UI/Views/SettingPage.xaml | 4 +- 134 files changed, 4616 insertions(+), 8316 deletions(-) delete mode 100644 UI/Resources/Fonts/SegMDL2.ttf create mode 100644 UI/Resources/Fonts/Segoe Fluent Icons.ttf delete mode 100644 UI/Resources/Fonts/fabric-icons.ttf create mode 100644 UI/Resources/Themes/Common.xaml create mode 100644 UI/Resources/Themes/Dark.xaml delete mode 100644 UI/Resources/Themes/Dark/Base/CheckBox.xaml delete mode 100644 UI/Resources/Themes/Dark/Base/ColorSelect.xaml delete mode 100644 UI/Resources/Themes/Dark/Base/EmptyData.xaml delete mode 100644 UI/Resources/Themes/Dark/Base/Icon.xaml delete mode 100644 UI/Resources/Themes/Dark/Base/IconSelect.xaml delete mode 100644 UI/Resources/Themes/Dark/Base/Img.xaml delete mode 100644 UI/Resources/Themes/Dark/Base/Placeholder.xaml delete mode 100644 UI/Resources/Themes/Dark/Base/Text.xaml delete mode 100644 UI/Resources/Themes/Dark/Base/View.xaml delete mode 100644 UI/Resources/Themes/Dark/Button/Button.xaml delete mode 100644 UI/Resources/Themes/Dark/Button/IconButton.xaml delete mode 100644 UI/Resources/Themes/Dark/Charts/Charts.xaml delete mode 100644 UI/Resources/Themes/Dark/Charts/ChartsItemTypeA.xaml delete mode 100644 UI/Resources/Themes/Dark/Charts/ChartsItemTypeCard.xaml delete mode 100644 UI/Resources/Themes/Dark/Charts/ChartsItemTypeColumn.xaml delete mode 100644 UI/Resources/Themes/Dark/Charts/ChartsItemTypeMonth.xaml delete mode 100644 UI/Resources/Themes/Dark/Charts/ChartsItemTypeRadar.xaml delete mode 100644 UI/Resources/Themes/Dark/Config.xaml delete mode 100644 UI/Resources/Themes/Dark/DatePickerBar/DatePickerBar.xaml delete mode 100644 UI/Resources/Themes/Dark/DatePickerBar/DatePickerBarItem.xaml delete mode 100644 UI/Resources/Themes/Dark/Input/InputBox.xaml delete mode 100644 UI/Resources/Themes/Dark/List/BaseList.xaml delete mode 100644 UI/Resources/Themes/Dark/List/BaseListItem.xaml delete mode 100644 UI/Resources/Themes/Dark/Navigation/Navigation.xaml delete mode 100644 UI/Resources/Themes/Dark/Navigation/NavigationItem.xaml delete mode 100644 UI/Resources/Themes/Dark/PageContainer.xaml delete mode 100644 UI/Resources/Themes/Dark/Select/DateSelect.xaml delete mode 100644 UI/Resources/Themes/Dark/Select/ImageSelect.xaml delete mode 100644 UI/Resources/Themes/Dark/Select/Option.xaml delete mode 100644 UI/Resources/Themes/Dark/Select/Select.xaml delete mode 100644 UI/Resources/Themes/Dark/SettingPanel/SettingPanel.xaml delete mode 100644 UI/Resources/Themes/Dark/SettingPanel/SettingPanelItem.xaml delete mode 100644 UI/Resources/Themes/Dark/SettingPanel/SettingPanelMultiItem.xaml delete mode 100644 UI/Resources/Themes/Dark/Style.xaml delete mode 100644 UI/Resources/Themes/Dark/Tabbar/Tabbar.xaml delete mode 100644 UI/Resources/Themes/Dark/Toggle/Toggle.xaml delete mode 100644 UI/Resources/Themes/Dark/Window/DefaultWindow.xaml delete mode 100644 UI/Resources/Themes/Dark/Window/HideWindow.xaml create mode 100644 UI/Resources/Themes/Light.xaml delete mode 100644 UI/Resources/Themes/Light/Base/CheckBox.xaml delete mode 100644 UI/Resources/Themes/Light/Base/ColorSelect.xaml delete mode 100644 UI/Resources/Themes/Light/Base/EmptyData.xaml delete mode 100644 UI/Resources/Themes/Light/Base/Icon.xaml delete mode 100644 UI/Resources/Themes/Light/Base/IconSelect.xaml delete mode 100644 UI/Resources/Themes/Light/Base/Img.xaml delete mode 100644 UI/Resources/Themes/Light/Base/Placeholder.xaml delete mode 100644 UI/Resources/Themes/Light/Base/Text.xaml delete mode 100644 UI/Resources/Themes/Light/Base/View.xaml delete mode 100644 UI/Resources/Themes/Light/Button/Button.xaml delete mode 100644 UI/Resources/Themes/Light/Button/IconButton.xaml delete mode 100644 UI/Resources/Themes/Light/Charts/Charts.xaml delete mode 100644 UI/Resources/Themes/Light/Charts/ChartsItemTypeA.xaml delete mode 100644 UI/Resources/Themes/Light/Charts/ChartsItemTypeCard.xaml delete mode 100644 UI/Resources/Themes/Light/Charts/ChartsItemTypeColumn.xaml delete mode 100644 UI/Resources/Themes/Light/Charts/ChartsItemTypeMonth.xaml delete mode 100644 UI/Resources/Themes/Light/Charts/ChartsItemTypeRadar.xaml delete mode 100644 UI/Resources/Themes/Light/Config.xaml delete mode 100644 UI/Resources/Themes/Light/DatePickerBar/DatePickerBar.xaml delete mode 100644 UI/Resources/Themes/Light/DatePickerBar/DatePickerBarItem.xaml delete mode 100644 UI/Resources/Themes/Light/Input/InputBox.xaml delete mode 100644 UI/Resources/Themes/Light/List/BaseList.xaml delete mode 100644 UI/Resources/Themes/Light/List/BaseListItem.xaml delete mode 100644 UI/Resources/Themes/Light/Navigation/Navigation.xaml delete mode 100644 UI/Resources/Themes/Light/Navigation/NavigationItem.xaml delete mode 100644 UI/Resources/Themes/Light/PageContainer.xaml delete mode 100644 UI/Resources/Themes/Light/Select/DateSelect.xaml delete mode 100644 UI/Resources/Themes/Light/Select/ImageSelect.xaml delete mode 100644 UI/Resources/Themes/Light/Select/Option.xaml delete mode 100644 UI/Resources/Themes/Light/Select/Select.xaml delete mode 100644 UI/Resources/Themes/Light/SettingPanel/SettingPanel.xaml delete mode 100644 UI/Resources/Themes/Light/SettingPanel/SettingPanelItem.xaml delete mode 100644 UI/Resources/Themes/Light/SettingPanel/SettingPanelMultiItem.xaml delete mode 100644 UI/Resources/Themes/Light/Style.xaml delete mode 100644 UI/Resources/Themes/Light/Tabbar/Tabbar.xaml delete mode 100644 UI/Resources/Themes/Light/Toggle/Toggle.xaml delete mode 100644 UI/Resources/Themes/Light/Window/DefaultWindow.xaml delete mode 100644 UI/Resources/Themes/Light/Window/HideWindow.xaml diff --git a/UI/App.xaml b/UI/App.xaml index 42ee58b..e2345ef 100644 --- a/UI/App.xaml +++ b/UI/App.xaml @@ -6,701 +6,16 @@ xmlns:base="clr-namespace:UI.Controls.Base" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/UI/App.xaml.cs b/UI/App.xaml.cs index 554db2f..56e5ed0 100644 --- a/UI/App.xaml.cs +++ b/UI/App.xaml.cs @@ -249,6 +249,12 @@ namespace UI contextMenu.IsOpen = false; })); }; + + var theme = serviceProvider.GetService(); + theme.OnThemeChanged += (a, c) => + { + contextMenu.UpdateDefaultStyle(); + }; // 创建保活窗口 keepaliveWindow = new HideWindow(); } diff --git a/UI/Controls/Base/IconConverter.cs b/UI/Controls/Base/IconConverter.cs index be940c2..9f95018 100644 --- a/UI/Controls/Base/IconConverter.cs +++ b/UI/Controls/Base/IconConverter.cs @@ -9,126 +9,1410 @@ namespace UI.Controls.Base { private static Dictionary iconUnicodes = new Dictionary() { - {IconTypes.None,""}, - {IconTypes.Back,"\xE72B"}, - {IconTypes.Calendar,"\xE787"}, - {IconTypes.ChevronDown,"\xE70D"}, - {IconTypes.CheckMark,"\xE73E"}, - {IconTypes.CompletedSolid,"\xEC61"}, - {IconTypes.RadioBtnOn,"\xECCB"}, - {IconTypes.StatusCircleOuter,"\xF136"}, - {IconTypes.AcceptMedium,"\xF78C"}, - {IconTypes.Accept,"\xE8FB"}, - {IconTypes.Timer,"\xE91E"}, - {IconTypes.StatusCircleQuestionMark,"\xF142"}, - {IconTypes.ProjectDocument,"\xF759"}, - {IconTypes.AutomateFlow,"\xE3F5"}, - {IconTypes.FlashAuto,"\xE95C"}, - {IconTypes.ProductVariant,"\xEE30"}, - {IconTypes.AppIconDefault,"\xECAA"}, - {IconTypes.ChromeMinimize,"\xE921"}, - {IconTypes.ChromeClose,"\xE8BB"}, - {IconTypes.ChromeRestore,"\xE923"}, - {IconTypes.CalculatorMultiply,"\xE947"}, - {IconTypes.SquareShape,"\xF1A6"}, - {IconTypes.More,"\xE712"}, - {IconTypes.AppIconDefaultList,"\xEFDE"}, - {IconTypes.ClipboardList,"\xF0E3"}, - {IconTypes.Settings,"\xE713"}, - {IconTypes.ChromeBack,"\xE830"}, - {IconTypes.BulletedList,"\xE8FD"}, - {IconTypes.CalculatorAddition,"\xE948"}, - {IconTypes.DeviceRun,"\xE401"}, - {IconTypes.ProcessingRun,"\xE404"}, - {IconTypes.Product,"\xECDC"}, - {IconTypes.FileTemplate,"\xF2E6"}, - {IconTypes.DeviceOff,"\xE402"}, - {IconTypes.FlowChart,"\xE9D4"}, - {IconTypes.DownloadDocument,"\xF549"}, - {IconTypes.Delete,"\xE74D"}, - {IconTypes.EditStyle,"\xEF60"}, - {IconTypes.OpenWithMirrored,"\xEA5C"}, - {IconTypes.FileCode,"\xF30E"}, - {IconTypes.BuildIssue,"\xF319"}, - {IconTypes.WebEnvironment,"\xE3DB"}, - {IconTypes.DesktopScreenshot,"\xF5D9"}, - {IconTypes.MusicInCollectionFill,"\xEA36"}, - {IconTypes.NetworkTower,"\xEC05"}, - {IconTypes.KeyboardClassic,"\xE765"}, - {IconTypes.FabricSyncFolder,"\xF0A7"}, - {IconTypes.DateTime12,"\xF38F"}, - {IconTypes.DateTime,"\xEC92"}, - {IconTypes.MyNetwork,"\xEC27"}, - {IconTypes.WifiEthernet,"\xEE77"}, - {IconTypes.NormalWeight,"\xF4EF"}, - {IconTypes.Message,"\xE8BD"}, - {IconTypes.Download,"\xE896"}, - {IconTypes.Storyboard,"\xF308"}, - {IconTypes.HandsFree,"\xEAD0"}, - {IconTypes.PlaybackRate1x,"\xEC57"}, - {IconTypes.ProcessingCancel,"\xE403"}, - {IconTypes.Volume2,"\xE994"}, - {IconTypes.Game,"\xE7FC"}, - {IconTypes.NewsSearch,"\xF4E9"}, - {IconTypes.Share,"\xE72D"}, - {IconTypes.PageCheckedin,"\xF104"}, - {IconTypes.EntityExtraction,"\xE467"}, - {IconTypes.RecycleBin,"\xEF87"}, - {IconTypes.Ringer,"\xEA8F"}, - {IconTypes.Rocket,"\xF3B3"}, - {IconTypes.Robot,"\xE99A"}, - {IconTypes.Puzzle,"\xEA86"}, - {IconTypes.RainShowersDay,"\xE9C3"}, - {IconTypes.Plug,"\xF300"}, - {IconTypes.Pinned,"\xE840"}, - {IconTypes.PlayerSettings,"\xEF58"}, - {IconTypes.Permissions,"\xE8D7"}, - {IconTypes.PasswordField,"\xF6AA"}, - {IconTypes.OfficeStoreLogo,"\xEDCF"}, - {IconTypes.NUIFace,"\xEB68"}, - {IconTypes.MyMoviesTV,"\xEE6C"}, - {IconTypes.MicrosoftTranslatorLogo,"\xF782"}, - {IconTypes.Microphone,"\xE720"}, - {IconTypes.MailAlert,"\xED80"}, - {IconTypes.Lock,"\xE72E"}, - {IconTypes.Lightbulb,"\xEA80"}, - {IconTypes.LightningBolt,"\xE945"}, - {IconTypes.Insights,"\xE3AF"}, - {IconTypes.Home,"\xE80F"}, - {IconTypes.Heart,"\xEB51"}, - {IconTypes.HeartFill,"\xEB52"}, - {IconTypes.Flower,"\xF54E"}, - {IconTypes.FieldReadOnly,"\xF442"}, - {IconTypes.FangBody,"\xECEB"}, - {IconTypes.EventToDoLogo,"\xF869"}, - {IconTypes.Emoji,"\xE899"}, - {IconTypes.DrillDown,"\xF532"}, - {IconTypes.Diamond,"\xED02"}, - {IconTypes.Decimals,"\xF218"}, - {IconTypes.Crown,"\xED01"}, - {IconTypes.Color,"\xE790"}, - {IconTypes.CloudSecure,"\xE4D5"}, - {IconTypes.CloudImportExport,"\xEE55"}, - {IconTypes.Cat,"\xED7F"}, - {IconTypes.Car,"\xE804"}, - {IconTypes.Bug,"\xEBE8"}, - {IconTypes.ChevronUp,"\xE70E"}, - {IconTypes.BIDashboard,"\xF543"}, - {IconTypes.Preview,"\xE8FF"}, - {IconTypes.Blocked,"\xE733"}, - {IconTypes.Remove,"\xE738"}, - {IconTypes.Chart,"\xE999"}, - {IconTypes.Forward,"\xE72A"}, - {IconTypes.FileImage,"\xF311"}, - {IconTypes.CriticalErrorSolid,"\xF5C9"}, - {IconTypes.TagGroup,"\xE3F6"}, - {IconTypes.ClipboardListMirrored,"\xF0E4"}, - {IconTypes.MSNVideosSolid,"\xF2DA"}, - {IconTypes.SkypeCircleClock,"\xEF7E"}, - {IconTypes.FlameSolid,"\xF1F3"}, - {IconTypes.PieSingleSolid,"\xF530"}, - {IconTypes.Refresh,"\xE72C"}, - {IconTypes.Export,"\xEDE1"}, + {IconTypes.None,string.Empty}, +{IconTypes.Accept,"\xe8fb"}, +{IconTypes.AcceptMedium,"\xf78c"}, +{IconTypes.Accident,"\xe81f"}, +{IconTypes.AccidentSolid,"\xea8e"}, +{IconTypes.Accounts,"\xe910"}, +{IconTypes.ActionCenter,"\xe91c"}, +{IconTypes.ActionCenterAsterisk,"\xea21"}, +{IconTypes.ActionCenterMirrored,"\xed0d"}, +{IconTypes.ActionCenterNotification,"\xe7e7"}, +{IconTypes.ActionCenterNotificationMirrored,"\xed0c"}, +{IconTypes.ActionCenterQuiet,"\xee79"}, +{IconTypes.ActionCenterQuietNotification,"\xee7a"}, +{IconTypes.Add,"\xe710"}, +{IconTypes.AddBold,"\xf8aa"}, +{IconTypes.AddFriend,"\xe8fa"}, +{IconTypes.AddNewLine,"\xf7b7"}, +{IconTypes.AddNewLineFill,"\xf7b8"}, +{IconTypes.AddRemoteDevice,"\xe836"}, +{IconTypes.AddSurfaceHub,"\xecc4"}, +{IconTypes.AddTo,"\xecc8"}, +{IconTypes.AdjustHologram,"\xebd2"}, +{IconTypes.Admin,"\xe7ef"}, +{IconTypes.Airplane,"\xe709"}, +{IconTypes.AirplaneSolid,"\xeb4c"}, +{IconTypes.AlignCenter,"\xe8e3"}, +{IconTypes.AlignLeft,"\xe8e4"}, +{IconTypes.AlignRight,"\xe8e2"}, +{IconTypes.AllApps,"\xe71d"}, +{IconTypes.AllAppsMirrored,"\xea40"}, +{IconTypes.Annotation,"\xe924"}, +{IconTypes.AppIconDefault,"\xecaa"}, +{IconTypes.ApplicationGuard,"\xf0ef"}, +{IconTypes.Apps,"\xed35"}, +{IconTypes.AreaChart,"\xe9d2"}, +{IconTypes.ArrowDown8,"\xf0ae"}, +{IconTypes.ArrowLeft8,"\xf0b0"}, +{IconTypes.ArrowRight8,"\xf0af"}, +{IconTypes.ArrowUp8,"\xf0ad"}, +{IconTypes.AspectRatio,"\xe799"}, +{IconTypes.Asterisk,"\xea38"}, +{IconTypes.AsteriskBadge12,"\xedad"}, +{IconTypes.Attach,"\xe723"}, +{IconTypes.AttachCamera,"\xe8a2"}, +{IconTypes.Audio,"\xe8d6"}, +{IconTypes.Back,"\xe72b"}, +{IconTypes.BackgroundToggle,"\xef1f"}, +{IconTypes.BackMirrored,"\xf0d2"}, +{IconTypes.BackSolidBold,"\xf8ac"}, +{IconTypes.BackSpaceQWERTY,"\xe750"}, +{IconTypes.BackSpaceQWERTYLg,"\xeb96"}, +{IconTypes.BackSpaceQWERTYMd,"\xe926"}, +{IconTypes.BackSpaceQWERTYSm,"\xe925"}, +{IconTypes.BackToWindow,"\xe73f"}, +{IconTypes.Badge,"\xec1b"}, +{IconTypes.BandBattery0,"\xecb9"}, +{IconTypes.BandBattery1,"\xecba"}, +{IconTypes.BandBattery2,"\xecbb"}, +{IconTypes.BandBattery3,"\xecbc"}, +{IconTypes.BandBattery4,"\xecbd"}, +{IconTypes.BandBattery5,"\xecbe"}, +{IconTypes.BandBattery6,"\xecbf"}, +{IconTypes.Bank,"\xe825"}, +{IconTypes.BarcodeScanner,"\xec5a"}, +{IconTypes.Battery0,"\xe850"}, +{IconTypes.Battery1,"\xe851"}, +{IconTypes.Battery10,"\xe83f"}, +{IconTypes.Battery2,"\xe852"}, +{IconTypes.Battery3,"\xe853"}, +{IconTypes.Battery4,"\xe854"}, +{IconTypes.Battery5,"\xe855"}, +{IconTypes.Battery6,"\xe856"}, +{IconTypes.Battery7,"\xe857"}, +{IconTypes.Battery8,"\xe858"}, +{IconTypes.Battery9,"\xe859"}, +{IconTypes.BatteryCharging0,"\xe85a"}, +{IconTypes.BatteryCharging1,"\xe85b"}, +{IconTypes.BatteryCharging10,"\xea93"}, +{IconTypes.BatteryCharging2,"\xe85c"}, +{IconTypes.BatteryCharging3,"\xe85d"}, +{IconTypes.BatteryCharging4,"\xe85e"}, +{IconTypes.BatteryCharging5,"\xe85f"}, +{IconTypes.BatteryCharging6,"\xe860"}, +{IconTypes.BatteryCharging7,"\xe861"}, +{IconTypes.BatteryCharging8,"\xe862"}, +{IconTypes.BatteryCharging9,"\xe83e"}, +{IconTypes.BatterySaver0,"\xe863"}, +{IconTypes.BatterySaver1,"\xe864"}, +{IconTypes.BatterySaver10,"\xea95"}, +{IconTypes.BatterySaver2,"\xe865"}, +{IconTypes.BatterySaver3,"\xe866"}, +{IconTypes.BatterySaver4,"\xe867"}, +{IconTypes.BatterySaver5,"\xe868"}, +{IconTypes.BatterySaver6,"\xe869"}, +{IconTypes.BatterySaver7,"\xe86a"}, +{IconTypes.BatterySaver8,"\xe86b"}, +{IconTypes.BatterySaver9,"\xea94"}, +{IconTypes.BatteryUnknown,"\xe996"}, +{IconTypes.Beta,"\xea24"}, +{IconTypes.BidiLtr,"\xe9aa"}, +{IconTypes.BidiRtl,"\xe9ab"}, +{IconTypes.BlockContact,"\xe8f8"}, +{IconTypes.Blocked2,"\xece4"}, +{IconTypes.BlueLight,"\xf08c"}, +{IconTypes.Bluetooth,"\xe702"}, +{IconTypes.BodyCam,"\xec80"}, +{IconTypes.Bold,"\xe8dd"}, +{IconTypes.Bookmarks,"\xe8a4"}, +{IconTypes.BookmarksMirrored,"\xea41"}, +{IconTypes.Brightness,"\xe706"}, +{IconTypes.Broom,"\xea99"}, +{IconTypes.BrowsePhotos,"\xe7c5"}, +{IconTypes.BrushSize,"\xeda8"}, +{IconTypes.Bug,"\xebe8"}, +{IconTypes.BuildingEnergy,"\xec0b"}, +{IconTypes.BulletedList,"\xe8fd"}, +{IconTypes.BulletedListMirrored,"\xea42"}, +{IconTypes.Bullseye,"\xf272"}, +{IconTypes.BumperLeft,"\xf10c"}, +{IconTypes.BumperRight,"\xf10d"}, +{IconTypes.Bus,"\xe806"}, +{IconTypes.BusSolid,"\xeb47"}, +{IconTypes.ButtonA,"\xf093"}, +{IconTypes.ButtonB,"\xf094"}, +{IconTypes.ButtonMenu,"\xede3"}, +{IconTypes.ButtonView2,"\xeeca"}, +{IconTypes.ButtonX,"\xf096"}, +{IconTypes.ButtonY,"\xf095"}, +{IconTypes.Cafe,"\xec32"}, +{IconTypes.Calculator,"\xe8ef"}, +{IconTypes.CalculatorAddition,"\xe948"}, +{IconTypes.CalculatorBackspace,"\xe94f"}, +{IconTypes.CalculatorDivide,"\xe94a"}, +{IconTypes.CalculatorEqualTo,"\xe94e"}, +{IconTypes.CalculatorMultiply,"\xe947"}, +{IconTypes.CalculatorNegate,"\xe94d"}, +{IconTypes.CalculatorPercentage,"\xe94c"}, +{IconTypes.CalculatorSquareroot,"\xe94b"}, +{IconTypes.CalculatorSubtract,"\xe949"}, +{IconTypes.Calendar,"\xe787"}, +{IconTypes.CalendarDay,"\xe8bf"}, +{IconTypes.CalendarMirrored,"\xed28"}, +{IconTypes.CalendarReply,"\xe8f5"}, +{IconTypes.CalendarSolid,"\xea89"}, +{IconTypes.CalendarWeek,"\xe8c0"}, +{IconTypes.CallControl,"\xe80b"}, +{IconTypes.CallForwarding,"\xe7f2"}, +{IconTypes.CallForwardingMirrored,"\xea97"}, +{IconTypes.CallForwardInternational,"\xe87a"}, +{IconTypes.CallForwardInternationalMirrored,"\xea43"}, +{IconTypes.CallForwardRoaming,"\xe87b"}, +{IconTypes.CallForwardRoamingMirrored,"\xea44"}, +{IconTypes.CalligraphyFill,"\xf0c7"}, +{IconTypes.CalligraphyPen,"\xedfb"}, +{IconTypes.Calories,"\xecad"}, +{IconTypes.Camera,"\xe722"}, +{IconTypes.Cancel,"\xe711"}, +{IconTypes.CancelMedium,"\xf78a"}, +{IconTypes.Caption,"\xe8ba"}, +{IconTypes.Car,"\xe804"}, +{IconTypes.CaretBottomRightSolidCenter8,"\xf169"}, +{IconTypes.CaretDown8,"\xedd8"}, +{IconTypes.CaretDownSolid8,"\xeddc"}, +{IconTypes.CaretLeft8,"\xedd5"}, +{IconTypes.CaretLeftSolid8,"\xedd9"}, +{IconTypes.CaretRight8,"\xedd6"}, +{IconTypes.CaretRightSolid8,"\xedda"}, +{IconTypes.CaretSolidDown,"\xf08e"}, +{IconTypes.CaretSolidLeft,"\xf08d"}, +{IconTypes.CaretSolidRight,"\xf08f"}, +{IconTypes.CaretSolidUp,"\xf090"}, +{IconTypes.CaretUp8,"\xedd7"}, +{IconTypes.CaretUpSolid8,"\xeddb"}, +{IconTypes.CashDrawer,"\xec59"}, +{IconTypes.CC,"\xe7f0"}, +{IconTypes.CellPhone,"\xe8ea"}, +{IconTypes.Certificate,"\xeb95"}, +{IconTypes.CharacterAppearance,"\xf17f"}, +{IconTypes.Characters,"\xe8c1"}, +{IconTypes.ChatBubbles,"\xe8f2"}, +{IconTypes.Checkbox,"\xe739"}, +{IconTypes.Checkbox14,"\xf16b"}, +{IconTypes.CheckboxComposite,"\xe73a"}, +{IconTypes.CheckboxComposite14,"\xf16c"}, +{IconTypes.CheckboxCompositeReversed,"\xe73d"}, +{IconTypes.CheckboxFill,"\xe73b"}, +{IconTypes.CheckboxIndeterminate,"\xe73c"}, +{IconTypes.CheckboxIndeterminateCombo,"\xf16e"}, +{IconTypes.CheckboxIndeterminateCombo14,"\xf16d"}, +{IconTypes.CheckList,"\xe9d5"}, +{IconTypes.ChecklistMirrored,"\xf0b5"}, +{IconTypes.CheckMark,"\xe73e"}, +{IconTypes.ChevronDown,"\xe70d"}, +{IconTypes.ChevronDownMed,"\xe972"}, +{IconTypes.ChevronDownSmall,"\xe96e"}, +{IconTypes.ChevronLeft,"\xe76b"}, +{IconTypes.ChevronLeft20,"\xf743"}, +{IconTypes.ChevronLeft32,"\xf744"}, +{IconTypes.ChevronLeftMed,"\xe973"}, +{IconTypes.ChevronLeftSmall,"\xe96f"}, +{IconTypes.ChevronRight,"\xe76c"}, +{IconTypes.ChevronRight20,"\xf745"}, +{IconTypes.ChevronRight32,"\xf746"}, +{IconTypes.ChevronRightMed,"\xe974"}, +{IconTypes.ChevronRightSmall,"\xe970"}, +{IconTypes.ChevronUp,"\xe70e"}, +{IconTypes.ChevronUpMed,"\xe971"}, +{IconTypes.ChevronUpSmall,"\xe96d"}, +{IconTypes.ChineseBoPoMoFo,"\xe989"}, +{IconTypes.ChineseChangjie,"\xe981"}, +{IconTypes.ChinesePinyin,"\xe98a"}, +{IconTypes.ChinesePunctuation,"\xf111"}, +{IconTypes.ChineseQuick,"\xe984"}, +{IconTypes.ChipCardCreditCardReader,"\xef40"}, +{IconTypes.ChromeAnnotate,"\xe931"}, +{IconTypes.ChromeAnnotateContrast,"\xf0f9"}, +{IconTypes.ChromeBack,"\xe830"}, +{IconTypes.ChromeBackContrast,"\xf0d5"}, +{IconTypes.ChromeBackContrastMirrored,"\xf0d6"}, +{IconTypes.ChromeBackMirrored,"\xea47"}, +{IconTypes.ChromeBackToWindow,"\xe92c"}, +{IconTypes.ChromeBackToWindowContrast,"\xf0d7"}, +{IconTypes.ChromeClose,"\xe8bb"}, +{IconTypes.ChromeCloseContrast,"\xef2c"}, +{IconTypes.ChromeFullScreen,"\xe92d"}, +{IconTypes.ChromeFullScreenContrast,"\xf0d8"}, +{IconTypes.ChromeMaximize,"\xe922"}, +{IconTypes.ChromeMaximizeContrast,"\xef2e"}, +{IconTypes.ChromeMinimize,"\xe921"}, +{IconTypes.ChromeMinimizeContrast,"\xef2d"}, +{IconTypes.ChromeRestore,"\xe923"}, +{IconTypes.ChromeRestoreContrast,"\xef2f"}, +{IconTypes.ChromeSwitch,"\xf1cb"}, +{IconTypes.ChromeSwitchContast,"\xf1cc"}, +{IconTypes.CHTLanguageBar,"\xf69e"}, +{IconTypes.CircleFill,"\xea3b"}, +{IconTypes.CircleFillBadge12,"\xedb0"}, +{IconTypes.CircleRing,"\xea3a"}, +{IconTypes.CircleRingBadge12,"\xedaf"}, +{IconTypes.CircleShapeSolid,"\xf63c"}, +{IconTypes.CityNext,"\xec06"}, +{IconTypes.CityNext2,"\xec07"}, +{IconTypes.Clear,"\xe894"}, +{IconTypes.ClearAllInk,"\xed62"}, +{IconTypes.ClearAllInkMirrored,"\xef19"}, +{IconTypes.ClearSelection,"\xe8e6"}, +{IconTypes.ClearSelectionMirrored,"\xea48"}, +{IconTypes.Click,"\xe8b0"}, +{IconTypes.ClickedOutLoudSolidBold,"\xf8b3"}, +{IconTypes.ClickSolid,"\xf8af"}, +{IconTypes.ClipboardList,"\xf0e3"}, +{IconTypes.ClipboardListMirrored,"\xf0e4"}, +{IconTypes.ClippingTool,"\xf406"}, +{IconTypes.ClosedCaptionsInternational,"\xf15f"}, +{IconTypes.ClosePane,"\xe89f"}, +{IconTypes.ClosePaneMirrored,"\xea49"}, +{IconTypes.Cloud,"\xe753"}, +{IconTypes.CloudDownload,"\xebd3"}, +{IconTypes.CloudPrinter,"\xeda6"}, +{IconTypes.CloudSearch,"\xede4"}, +{IconTypes.Code,"\xe943"}, +{IconTypes.CollapseContent,"\xf165"}, +{IconTypes.CollapseContentSingle,"\xf166"}, +{IconTypes.CollateLandscape,"\xf57b"}, +{IconTypes.CollateLandscapeSeparated,"\xf5ac"}, +{IconTypes.CollatePortrait,"\xf57c"}, +{IconTypes.CollatePortraitSeparated,"\xf57d"}, +{IconTypes.Color,"\xe790"}, +{IconTypes.ColorOff,"\xf570"}, +{IconTypes.ColorSolid,"\xf354"}, +{IconTypes.CommaKey,"\xe9ad"}, +{IconTypes.CommandPrompt,"\xe756"}, +{IconTypes.Comment,"\xe90a"}, +{IconTypes.Communications,"\xe95a"}, +{IconTypes.CompanionApp,"\xec64"}, +{IconTypes.CompanionDeviceFramework,"\xed5d"}, +{IconTypes.Completed,"\xe930"}, +{IconTypes.CompletedSolid,"\xec61"}, +{IconTypes.Component,"\xe950"}, +{IconTypes.ComposeMode,"\xf6a9"}, +{IconTypes.Connect,"\xe703"}, +{IconTypes.ConnectApp,"\xed5c"}, +{IconTypes.Connected,"\xf0b9"}, +{IconTypes.Construction,"\xe822"}, +{IconTypes.ConstructionCone,"\xe98f"}, +{IconTypes.ConstructionSolid,"\xea8d"}, +{IconTypes.Contact,"\xe77b"}, +{IconTypes.Contact2,"\xe8d4"}, +{IconTypes.ContactInfo,"\xe779"}, +{IconTypes.ContactInfoMirrored,"\xea4a"}, +{IconTypes.ContactPresence,"\xe8cf"}, +{IconTypes.ContactSolid,"\xea8c"}, +{IconTypes.Copy,"\xe8c8"}, +{IconTypes.CopyTo,"\xf413"}, +{IconTypes.Courthouse,"\xec08"}, +{IconTypes.Crop,"\xe7a8"}, +{IconTypes.CtrlSpatialLeft,"\xf3e7"}, +{IconTypes.CtrlSpatialRight,"\xf11b"}, +{IconTypes.Cut,"\xe8c6"}, +{IconTypes.DashKey,"\xe9ae"}, +{IconTypes.DataSense,"\xe791"}, +{IconTypes.DataSenseBar,"\xe7a5"}, +{IconTypes.DateTime,"\xec92"}, +{IconTypes.DateTimeMirrored,"\xee93"}, +{IconTypes.DeclineCall,"\xf405"}, +{IconTypes.DefaultAPN,"\xf080"}, +{IconTypes.DefenderApp,"\xe83d"}, +{IconTypes.DefenderBadge12,"\xf0fb"}, +{IconTypes.Delete,"\xe74d"}, +{IconTypes.DeleteLines,"\xf7af"}, +{IconTypes.DeleteLinesFill,"\xf7b0"}, +{IconTypes.DeleteWord,"\xf7ad"}, +{IconTypes.DeleteWordFill,"\xf7ae"}, +{IconTypes.DeliveryOptimization,"\xf785"}, +{IconTypes.Design,"\xeb3c"}, +{IconTypes.DetachablePC,"\xf103"}, +{IconTypes.DeveloperTools,"\xec7a"}, +{IconTypes.DeviceDiscovery,"\xebde"}, +{IconTypes.DeviceLaptopNoPic,"\xe7f8"}, +{IconTypes.DeviceLaptopPic,"\xe7f7"}, +{IconTypes.DeviceMonitorLeftPic,"\xe7fa"}, +{IconTypes.DeviceMonitorNoPic,"\xe7fb"}, +{IconTypes.DeviceMonitorRightPic,"\xe7f9"}, +{IconTypes.Devices,"\xe772"}, +{IconTypes.Devices2,"\xe975"}, +{IconTypes.Devices3,"\xea6c"}, +{IconTypes.Devices4,"\xeb66"}, +{IconTypes.DevUpdate,"\xecc5"}, +{IconTypes.Diagnostic,"\xe9d9"}, +{IconTypes.Dial1,"\xf146"}, +{IconTypes.Dial10,"\xf14f"}, +{IconTypes.Dial11,"\xf150"}, +{IconTypes.Dial12,"\xf151"}, +{IconTypes.Dial13,"\xf152"}, +{IconTypes.Dial14,"\xf153"}, +{IconTypes.Dial15,"\xf154"}, +{IconTypes.Dial16,"\xf155"}, +{IconTypes.Dial2,"\xf147"}, +{IconTypes.Dial3,"\xf148"}, +{IconTypes.Dial4,"\xf149"}, +{IconTypes.Dial5,"\xf14a"}, +{IconTypes.Dial6,"\xf14b"}, +{IconTypes.Dial7,"\xf14c"}, +{IconTypes.Dial8,"\xf14d"}, +{IconTypes.Dial9,"\xf14e"}, +{IconTypes.Dialpad,"\xe75f"}, +{IconTypes.DialShape1,"\xf156"}, +{IconTypes.DialShape2,"\xf157"}, +{IconTypes.DialShape3,"\xf158"}, +{IconTypes.DialShape4,"\xf159"}, +{IconTypes.DialUp,"\xe83c"}, +{IconTypes.Dictionary,"\xe82d"}, +{IconTypes.DictionaryAdd,"\xe82e"}, +{IconTypes.DictionaryCloud,"\xebc3"}, +{IconTypes.DirectAccess,"\xe83b"}, +{IconTypes.Directions,"\xe8f0"}, +{IconTypes.DisableUpdates,"\xe8d8"}, +{IconTypes.DisconnectDisplay,"\xea14"}, +{IconTypes.DisconnectDrive,"\xe8cd"}, +{IconTypes.Dislike,"\xe8e0"}, +{IconTypes.DMC,"\xe951"}, +{IconTypes.Dock,"\xe952"}, +{IconTypes.DockBottom,"\xe90e"}, +{IconTypes.DockLeft,"\xe90c"}, +{IconTypes.DockLeftMirrored,"\xea4c"}, +{IconTypes.DockRight,"\xe90d"}, +{IconTypes.DockRightMirrored,"\xea4b"}, +{IconTypes.Document,"\xe8a5"}, +{IconTypes.DocumentApproval,"\xf28b"}, +{IconTypes.DoublePinyin,"\xf085"}, +{IconTypes.Down,"\xe74b"}, +{IconTypes.Download,"\xe896"}, +{IconTypes.DownloadMap,"\xe826"}, +{IconTypes.DownShiftKey,"\xe84a"}, +{IconTypes.Dpad,"\xf10e"}, +{IconTypes.Draw,"\xec87"}, +{IconTypes.DrawSolid,"\xec88"}, +{IconTypes.DrivingMode,"\xe7ec"}, +{IconTypes.Drop,"\xeb42"}, +{IconTypes.DullSound,"\xe911"}, +{IconTypes.DullSoundKey,"\xe9af"}, +{IconTypes.DuplexLandscapeOneSided,"\xf57e"}, +{IconTypes.DuplexLandscapeOneSidedMirrored,"\xf57f"}, +{IconTypes.DuplexLandscapeTwoSidedLongEdge,"\xf580"}, +{IconTypes.DuplexLandscapeTwoSidedLongEdgeMirrored,"\xf581"}, +{IconTypes.DuplexLandscapeTwoSidedShortEdge,"\xf582"}, +{IconTypes.DuplexLandscapeTwoSidedShortEdgeMirrored,"\xf583"}, +{IconTypes.DuplexPortraitOneSided,"\xf584"}, +{IconTypes.DuplexPortraitOneSidedMirrored,"\xf585"}, +{IconTypes.DuplexPortraitTwoSidedLongEdge,"\xf586"}, +{IconTypes.DuplexPortraitTwoSidedLongEdgeMirrored,"\xf587"}, +{IconTypes.DuplexPortraitTwoSidedShortEdge,"\xf588"}, +{IconTypes.DuplexPortraitTwoSidedShortEdgeMirrored,"\xf589"}, +{IconTypes.DynamicLock,"\xf439"}, +{IconTypes.Ear,"\xf270"}, +{IconTypes.Earbud,"\xf4c0"}, +{IconTypes.EaseOfAccess,"\xe776"}, +{IconTypes.Edit,"\xe70f"}, +{IconTypes.EditMirrored,"\xeb7e"}, +{IconTypes.Education,"\xe7be"}, +{IconTypes.EducationIcon,"\xf7bb"}, +{IconTypes.Eject,"\xf847"}, +{IconTypes.EMI,"\xe731"}, +{IconTypes.Emoji,"\xe899"}, +{IconTypes.Emoji2,"\xe76e"}, +{IconTypes.EmojiSwatch,"\xed5b"}, +{IconTypes.EmojiTabCelebrationObjects,"\xed55"}, +{IconTypes.EmojiTabFavorites,"\xed5a"}, +{IconTypes.EmojiTabFoodPlants,"\xed56"}, +{IconTypes.EmojiTabMoreSymbols,"\xf6ba"}, +{IconTypes.EmojiTabPeople,"\xed53"}, +{IconTypes.EmojiTabSmilesAnimals,"\xed54"}, +{IconTypes.EmojiTabSymbols,"\xed58"}, +{IconTypes.EmojiTabTextSmiles,"\xed59"}, +{IconTypes.EmojiTabTransitPlaces,"\xed57"}, +{IconTypes.EndPoint,"\xe81b"}, +{IconTypes.EndPointSolid,"\xeb4b"}, +{IconTypes.EnglishPunctuation,"\xf110"}, +{IconTypes.Equalizer,"\xe9e9"}, +{IconTypes.EraseTool,"\xe75c"}, +{IconTypes.EraseToolFill,"\xe82b"}, +{IconTypes.EraseToolFill2,"\xe82c"}, +{IconTypes.Error,"\xe783"}, +{IconTypes.ErrorBadge,"\xea39"}, +{IconTypes.ErrorBadge12,"\xedae"}, +{IconTypes.eSIM,"\xf61b"}, +{IconTypes.eSIMBusy,"\xf61e"}, +{IconTypes.eSIMLocked,"\xf61d"}, +{IconTypes.eSIMNoProfile,"\xf61c"}, +{IconTypes.Ethernet,"\xe839"}, +{IconTypes.EthernetError,"\xeb55"}, +{IconTypes.EthernetWarning,"\xeb56"}, +{IconTypes.Event12,"\xf763"}, +{IconTypes.ExpandTile,"\xe976"}, +{IconTypes.ExpandTileMirrored,"\xea4e"}, +{IconTypes.ExploitProtection,"\xf8a6"}, +{IconTypes.ExploitProtectionSettings,"\xf259"}, +{IconTypes.ExploreContent,"\xeccd"}, +{IconTypes.ExploreContentSingle,"\xf164"}, +{IconTypes.Export,"\xede1"}, +{IconTypes.ExportMirrored,"\xede2"}, +{IconTypes.ExpressiveInputEntry,"\xf6b8"}, +{IconTypes.Eyedropper,"\xef3c"}, +{IconTypes.EyeGaze,"\xf19d"}, +{IconTypes.Family,"\xebda"}, +{IconTypes.FastForward,"\xeb9d"}, +{IconTypes.Favicon,"\xe737"}, +{IconTypes.Favicon2,"\xec6c"}, +{IconTypes.FavoriteList,"\xe728"}, +{IconTypes.FavoriteStar,"\xe734"}, +{IconTypes.FavoriteStarFill,"\xe735"}, +{IconTypes.Feedback,"\xed15"}, +{IconTypes.FeedbackApp,"\xe939"}, +{IconTypes.Ferry,"\xe7e3"}, +{IconTypes.FerrySolid,"\xeb48"}, +{IconTypes.FileExplorer,"\xec50"}, +{IconTypes.FileExplorerApp,"\xec51"}, +{IconTypes.Filter,"\xe71c"}, +{IconTypes.FingerInking,"\xed5f"}, +{IconTypes.Fingerprint,"\xe928"}, +{IconTypes.FitPage,"\xe9a6"}, +{IconTypes.Flag,"\xe7c1"}, +{IconTypes.Flashlight,"\xe754"}, +{IconTypes.FlickDown,"\xe935"}, +{IconTypes.FlickLeft,"\xe937"}, +{IconTypes.FlickRight,"\xe938"}, +{IconTypes.FlickUp,"\xe936"}, +{IconTypes.Flow,"\xef90"}, +{IconTypes.Folder,"\xe8b7"}, +{IconTypes.FolderFill,"\xe8d5"}, +{IconTypes.FolderHorizontal,"\xf12b"}, +{IconTypes.FolderOpen,"\xe838"}, +{IconTypes.FolderSelect,"\xf89a"}, +{IconTypes.Font,"\xe8d2"}, +{IconTypes.FontColor,"\xe8d3"}, +{IconTypes.FontDecrease,"\xe8e7"}, +{IconTypes.FontIncrease,"\xe8e8"}, +{IconTypes.FontSize,"\xe8e9"}, +{IconTypes.Forward,"\xe72a"}, +{IconTypes.ForwardCall,"\xeac2"}, +{IconTypes.ForwardMirrored,"\xf0d3"}, +{IconTypes.ForwardSm,"\xe9ac"}, +{IconTypes.ForwardSolidBold,"\xf8ad"}, +{IconTypes.FourBars,"\xe908"}, +{IconTypes.FreeFormClipping,"\xf408"}, +{IconTypes.Frigid,"\xe9ca"}, +{IconTypes.Full20,"\xf741"}, +{IconTypes.FullAlpha,"\xe97f"}, +{IconTypes.FullCircleMask,"\xe91f"}, +{IconTypes.FullHiragana,"\xe986"}, +{IconTypes.FullKatakana,"\xe987"}, +{IconTypes.FullScreen,"\xe740"}, +{IconTypes.FuzzyReading,"\xf5ef"}, +{IconTypes.Game,"\xe7fc"}, +{IconTypes.GameConsole,"\xe967"}, +{IconTypes.GatewayRouter,"\xeb77"}, +{IconTypes.GenericScan,"\xee6f"}, +{IconTypes.GIF,"\xf4a9"}, +{IconTypes.GiftboxOpen,"\xf133"}, +{IconTypes.GlobalNavButton,"\xe700"}, +{IconTypes.Globe,"\xe774"}, +{IconTypes.Globe2,"\xf49a"}, +{IconTypes.Go,"\xe8ad"}, +{IconTypes.GoMirrored,"\xea4f"}, +{IconTypes.GoToMessage,"\xf716"}, +{IconTypes.GoToStart,"\xe8fc"}, +{IconTypes.GotoToday,"\xe8d1"}, +{IconTypes.GridView,"\xf0e2"}, +{IconTypes.GripperBarHorizontal,"\xe76f"}, +{IconTypes.GripperBarVertical,"\xe784"}, +{IconTypes.GripperResize,"\xe788"}, +{IconTypes.GripperResizeMirrored,"\xea50"}, +{IconTypes.GripperTool,"\xe75e"}, +{IconTypes.Groceries,"\xec09"}, +{IconTypes.Group,"\xe902"}, +{IconTypes.GroupList,"\xf168"}, +{IconTypes.GuestUser,"\xee57"}, +{IconTypes.HalfAlpha,"\xe97e"}, +{IconTypes.HalfDullSound,"\xe9b0"}, +{IconTypes.HalfKatakana,"\xe988"}, +{IconTypes.HalfStarLeft,"\xe7c6"}, +{IconTypes.HalfStarRight,"\xe7c7"}, +{IconTypes.Handwriting,"\xe929"}, +{IconTypes.Handwriting20,"\xf742"}, +{IconTypes.HangUp,"\xe778"}, +{IconTypes.HardDrive,"\xeda2"}, +{IconTypes.HeadlessDevice,"\xf191"}, +{IconTypes.Headphone,"\xe7f6"}, +{IconTypes.Headphone0,"\xed30"}, +{IconTypes.Headphone1,"\xed31"}, +{IconTypes.Headphone2,"\xed32"}, +{IconTypes.Headphone3,"\xed33"}, +{IconTypes.Headset,"\xe95b"}, +{IconTypes.Health,"\xe95e"}, +{IconTypes.Heart,"\xeb51"}, +{IconTypes.HeartBroken,"\xea92"}, +{IconTypes.HeartFill,"\xeb52"}, +{IconTypes.Help,"\xe897"}, +{IconTypes.HelpMirrored,"\xea51"}, +{IconTypes.Hide,"\xed1a"}, +{IconTypes.HideBcc,"\xe8c5"}, +{IconTypes.Highlight,"\xe7e6"}, +{IconTypes.HighlightFill,"\xe891"}, +{IconTypes.HighlightFill2,"\xe82a"}, +{IconTypes.History,"\xe81c"}, +{IconTypes.HMD,"\xf119"}, +{IconTypes.HolePunchLandscapeBottom,"\xf597"}, +{IconTypes.HolePunchLandscapeLeft,"\xf594"}, +{IconTypes.HolePunchLandscapeRight,"\xf595"}, +{IconTypes.HolePunchLandscapeTop,"\xf596"}, +{IconTypes.HolePunchOff,"\xf58f"}, +{IconTypes.HolePunchPortraitBottom,"\xf593"}, +{IconTypes.HolePunchPortraitLeft,"\xf590"}, +{IconTypes.HolePunchPortraitRight,"\xf591"}, +{IconTypes.HolePunchPortraitTop,"\xf592"}, +{IconTypes.HoloLens,"\xec94"}, +{IconTypes.HoloLensSelected,"\xf4bf"}, +{IconTypes.Home,"\xe80f"}, +{IconTypes.HomeGroup,"\xec26"}, +{IconTypes.HomeSolid,"\xea8a"}, +{IconTypes.HorizontalTabKey,"\xe7fd"}, +{IconTypes.HWPInsert,"\xf461"}, +{IconTypes.HWPJoin,"\xf460"}, +{IconTypes.HWPNewLine,"\xf465"}, +{IconTypes.HWPOverwrite,"\xf466"}, +{IconTypes.HWPScratchOut,"\xf463"}, +{IconTypes.HWPSplit,"\xf464"}, +{IconTypes.HWPStrikeThrough,"\xf462"}, +{IconTypes.IBeam,"\xe933"}, +{IconTypes.IBeamOutline,"\xe934"}, +{IconTypes.IDBadge,"\xf427"}, +{IconTypes.ImageExport,"\xee71"}, +{IconTypes.Import,"\xe8b5"}, +{IconTypes.ImportAll,"\xe8b6"}, +{IconTypes.ImportAllMirrored,"\xea53"}, +{IconTypes.Important,"\xe8c9"}, +{IconTypes.ImportantBadge12,"\xedb1"}, +{IconTypes.ImportMirrored,"\xea52"}, +{IconTypes.IncidentTriangle,"\xe814"}, +{IconTypes.IncomingCall,"\xe77e"}, +{IconTypes.Info,"\xe946"}, +{IconTypes.Info2,"\xea1f"}, +{IconTypes.InfoSolid,"\xf167"}, +{IconTypes.InkingCaret,"\xed65"}, +{IconTypes.InkingColorFill,"\xed67"}, +{IconTypes.InkingColorOutline,"\xed66"}, +{IconTypes.InkingTool,"\xe76d"}, +{IconTypes.InkingToolFill,"\xe88f"}, +{IconTypes.InkingToolFill2,"\xe829"}, +{IconTypes.InPrivate,"\xe727"}, +{IconTypes.Input,"\xe961"}, +{IconTypes.InsiderHubApp,"\xec24"}, +{IconTypes.InstertWords,"\xf7b1"}, +{IconTypes.InstertWordsFill,"\xf7b2"}, +{IconTypes.InteractiveDashboard,"\xf404"}, +{IconTypes.InternetSharing,"\xe704"}, +{IconTypes.IOT,"\xf22c"}, +{IconTypes.Italic,"\xe8db"}, +{IconTypes.Japanese,"\xe985"}, +{IconTypes.JoinWords,"\xf7b3"}, +{IconTypes.JoinWordsFill,"\xf7b4"}, +{IconTypes.JpnRomanji,"\xe87c"}, +{IconTypes.JpnRomanjiLock,"\xe87d"}, +{IconTypes.JpnRomanjiShift,"\xe87e"}, +{IconTypes.JpnRomanjiShiftLock,"\xe87f"}, +{IconTypes.Key12On,"\xe980"}, +{IconTypes.Keyboard12Key,"\xf261"}, +{IconTypes.KeyboardBrightness,"\xed39"}, +{IconTypes.KeyboardClassic,"\xe765"}, +{IconTypes.KeyboardDismiss,"\xe92f"}, +{IconTypes.KeyboardDock,"\xf26b"}, +{IconTypes.KeyboardFull,"\xec31"}, +{IconTypes.KeyboardLeftAligned,"\xf20c"}, +{IconTypes.KeyboardLeftDock,"\xf26d"}, +{IconTypes.KeyboardLeftHanded,"\xe763"}, +{IconTypes.KeyboardLowerBrightness,"\xed3a"}, +{IconTypes.KeyboardNarrow,"\xf260"}, +{IconTypes.KeyboardOneHanded,"\xed4c"}, +{IconTypes.KeyboardRightAligned,"\xf20d"}, +{IconTypes.KeyboardRightDock,"\xf26e"}, +{IconTypes.KeyboardRightHanded,"\xe764"}, +{IconTypes.KeyboardSettings,"\xf210"}, +{IconTypes.Keyboardsettings20,"\xf73d"}, +{IconTypes.KeyboardShortcut,"\xeda7"}, +{IconTypes.KeyboardSplit,"\xe766"}, +{IconTypes.KeyboardStandard,"\xe92e"}, +{IconTypes.KeyboardUndock,"\xf26c"}, +{IconTypes.Kiosk,"\xf712"}, +{IconTypes.KnowledgeArticle,"\xf000"}, +{IconTypes.Korean,"\xe97d"}, +{IconTypes.Label,"\xe932"}, +{IconTypes.LandscapeOrientation,"\xef6b"}, +{IconTypes.LandscapeOrientationMirrored,"\xf56f"}, +{IconTypes.LangJPN,"\xe7de"}, +{IconTypes.LanguageChs,"\xe88d"}, +{IconTypes.LanguageCht,"\xe88c"}, +{IconTypes.LanguageJpn,"\xec45"}, +{IconTypes.LanguageKor,"\xe88b"}, +{IconTypes.LaptopSecure,"\xf552"}, +{IconTypes.LaptopSelected,"\xec76"}, +{IconTypes.LargeErase,"\xf12a"}, +{IconTypes.Leaf,"\xe8be"}, +{IconTypes.LeaveChat,"\xe89b"}, +{IconTypes.LeaveChatMirrored,"\xea54"}, +{IconTypes.LEDLight,"\xe781"}, +{IconTypes.LeftArrowKeyTime0,"\xec52"}, +{IconTypes.LeftDoubleQuote,"\xe9b2"}, +{IconTypes.LeftQuote,"\xe848"}, +{IconTypes.LeftStick,"\xf108"}, +{IconTypes.Lexicon,"\xf180"}, +{IconTypes.Library,"\xe8f1"}, +{IconTypes.Light,"\xe793"}, +{IconTypes.Lightbulb,"\xea80"}, +{IconTypes.LightningBolt,"\xe945"}, +{IconTypes.Like,"\xe8e1"}, +{IconTypes.LikeDislike,"\xe8df"}, +{IconTypes.LineDisplay,"\xef3d"}, +{IconTypes.Link,"\xe71b"}, +{IconTypes.List,"\xea37"}, +{IconTypes.ListMirrored,"\xea55"}, +{IconTypes.LocaleLanguage,"\xf2b7"}, +{IconTypes.Location,"\xe81d"}, +{IconTypes.Lock,"\xe72e"}, +{IconTypes.LockFeedback,"\xebdb"}, +{IconTypes.LockscreenDesktop,"\xee3f"}, +{IconTypes.LockScreenGlance,"\xee65"}, +{IconTypes.LowerBrightness,"\xec8a"}, +{IconTypes.MagStripeReader,"\xec5c"}, +{IconTypes.Mail,"\xe715"}, +{IconTypes.MailBadge12,"\xedb3"}, +{IconTypes.MailFill,"\xe8a8"}, +{IconTypes.MailForward,"\xe89c"}, +{IconTypes.MailForwardMirrored,"\xea56"}, +{IconTypes.MailReply,"\xe8ca"}, +{IconTypes.MailReplyAll,"\xe8c2"}, +{IconTypes.MailReplyAllMirrored,"\xea58"}, +{IconTypes.MailReplyMirrored,"\xea57"}, +{IconTypes.Manage,"\xe912"}, +{IconTypes.MapCompassBottom,"\xe813"}, +{IconTypes.MapCompassTop,"\xe812"}, +{IconTypes.MapDirections,"\xe816"}, +{IconTypes.MapDrive,"\xe8ce"}, +{IconTypes.MapLayers,"\xe81e"}, +{IconTypes.MapPin,"\xe707"}, +{IconTypes.MapPin2,"\xe7b7"}, +{IconTypes.Marker,"\xed64"}, +{IconTypes.Market,"\xeafc"}, +{IconTypes.MarketDown,"\xef42"}, +{IconTypes.Marquee,"\xef20"}, +{IconTypes.Media,"\xea69"}, +{IconTypes.MediaStorageTower,"\xe965"}, +{IconTypes.Megaphone,"\xe789"}, +{IconTypes.Memo,"\xe77c"}, +{IconTypes.MergeCall,"\xea3c"}, +{IconTypes.Message,"\xe8bd"}, +{IconTypes.MicClipping,"\xec72"}, +{IconTypes.MicError,"\xec56"}, +{IconTypes.MicLocationCombo,"\xf47f"}, +{IconTypes.MicOff,"\xec54"}, +{IconTypes.MicOff2,"\xf781"}, +{IconTypes.MicOn,"\xec71"}, +{IconTypes.Microphone,"\xe720"}, +{IconTypes.MicrophoneListening,"\xf12e"}, +{IconTypes.MicrophoneSolidBold,"\xf8b1"}, +{IconTypes.MicSleep,"\xec55"}, +{IconTypes.MiniContract2Mirrored,"\xee49"}, +{IconTypes.MiniExpand2Mirrored,"\xee47"}, +{IconTypes.MiracastLogoLarge,"\xec16"}, +{IconTypes.MiracastLogoSmall,"\xec15"}, +{IconTypes.MixedMediaBadge,"\xea0d"}, +{IconTypes.MixVolumes,"\xf4c3"}, +{IconTypes.MobActionCenter,"\xec42"}, +{IconTypes.MobAirplane,"\xec40"}, +{IconTypes.MobBattery0,"\xeba0"}, +{IconTypes.MobBattery1,"\xeba1"}, +{IconTypes.MobBattery10,"\xebaa"}, +{IconTypes.MobBattery2,"\xeba2"}, +{IconTypes.MobBattery3,"\xeba3"}, +{IconTypes.MobBattery4,"\xeba4"}, +{IconTypes.MobBattery5,"\xeba5"}, +{IconTypes.MobBattery6,"\xeba6"}, +{IconTypes.MobBattery7,"\xeba7"}, +{IconTypes.MobBattery8,"\xeba8"}, +{IconTypes.MobBattery9,"\xeba9"}, +{IconTypes.MobBatteryCharging0,"\xebab"}, +{IconTypes.MobBatteryCharging1,"\xebac"}, +{IconTypes.MobBatteryCharging10,"\xebb5"}, +{IconTypes.MobBatteryCharging2,"\xebad"}, +{IconTypes.MobBatteryCharging3,"\xebae"}, +{IconTypes.MobBatteryCharging4,"\xebaf"}, +{IconTypes.MobBatteryCharging5,"\xebb0"}, +{IconTypes.MobBatteryCharging6,"\xebb1"}, +{IconTypes.MobBatteryCharging7,"\xebb2"}, +{IconTypes.MobBatteryCharging8,"\xebb3"}, +{IconTypes.MobBatteryCharging9,"\xebb4"}, +{IconTypes.MobBatterySaver0,"\xebb6"}, +{IconTypes.MobBatterySaver1,"\xebb7"}, +{IconTypes.MobBatterySaver10,"\xebc0"}, +{IconTypes.MobBatterySaver2,"\xebb8"}, +{IconTypes.MobBatterySaver3,"\xebb9"}, +{IconTypes.MobBatterySaver4,"\xebba"}, +{IconTypes.MobBatterySaver5,"\xebbb"}, +{IconTypes.MobBatterySaver6,"\xebbc"}, +{IconTypes.MobBatterySaver7,"\xebbd"}, +{IconTypes.MobBatterySaver8,"\xebbe"}, +{IconTypes.MobBatterySaver9,"\xebbf"}, +{IconTypes.MobBatteryUnknown,"\xec02"}, +{IconTypes.MobBluetooth,"\xec41"}, +{IconTypes.MobCallForwarding,"\xec7e"}, +{IconTypes.MobCallForwardingMirrored,"\xec7f"}, +{IconTypes.MobDrivingMode,"\xec47"}, +{IconTypes.MobeSIM,"\xed2a"}, +{IconTypes.MobeSIMBusy,"\xed2d"}, +{IconTypes.MobeSIMLocked,"\xed2c"}, +{IconTypes.MobeSIMNoProfile,"\xed2b"}, +{IconTypes.MobileLocked,"\xec20"}, +{IconTypes.MobileSelected,"\xec75"}, +{IconTypes.MobileTablet,"\xe8cc"}, +{IconTypes.MobLocation,"\xec43"}, +{IconTypes.MobQuietHours,"\xec46"}, +{IconTypes.MobSignal1,"\xec37"}, +{IconTypes.MobSignal2,"\xec38"}, +{IconTypes.MobSignal3,"\xec39"}, +{IconTypes.MobSignal4,"\xec3a"}, +{IconTypes.MobSignal5,"\xec3b"}, +{IconTypes.MobSIMError,"\xf5ab"}, +{IconTypes.MobSIMLock,"\xe875"}, +{IconTypes.MobSIMMissing,"\xe876"}, +{IconTypes.MobWifi1,"\xec3c"}, +{IconTypes.MobWifi2,"\xec3d"}, +{IconTypes.MobWifi3,"\xec3e"}, +{IconTypes.MobWifi4,"\xec3f"}, +{IconTypes.MobWifiCall0,"\xebd5"}, +{IconTypes.MobWifiCall1,"\xebd6"}, +{IconTypes.MobWifiCall2,"\xebd7"}, +{IconTypes.MobWifiCall3,"\xebd8"}, +{IconTypes.MobWifiCall4,"\xebd9"}, +{IconTypes.MobWifiCallBars,"\xebd4"}, +{IconTypes.MobWifiHotspot,"\xec44"}, +{IconTypes.MobWifiWarning1,"\xf473"}, +{IconTypes.MobWifiWarning2,"\xf474"}, +{IconTypes.MobWifiWarning3,"\xf475"}, +{IconTypes.MobWifiWarning4,"\xf476"}, +{IconTypes.More,"\xe712"}, +{IconTypes.Mouse,"\xe962"}, +{IconTypes.Move,"\xe7c2"}, +{IconTypes.MoveToFolder,"\xe8de"}, +{IconTypes.Movies,"\xe8b2"}, +{IconTypes.MultimediaDMP,"\xed47"}, +{IconTypes.MultimediaDMS,"\xe953"}, +{IconTypes.MultimediaDVR,"\xe954"}, +{IconTypes.MultimediaPMP,"\xe955"}, +{IconTypes.MultiSelect,"\xe762"}, +{IconTypes.MultiSelectMirrored,"\xea98"}, +{IconTypes.MusicAlbum,"\xe93c"}, +{IconTypes.MusicInfo,"\xe90b"}, +{IconTypes.MusicNote,"\xec4f"}, +{IconTypes.MusicSharing,"\xf623"}, +{IconTypes.MusicSharingOff,"\xf624"}, +{IconTypes.Mute,"\xe74f"}, +{IconTypes.MyNetwork,"\xec27"}, +{IconTypes.Narrator,"\xed4d"}, +{IconTypes.NarratorApp,"\xf83b"}, +{IconTypes.NarratorForward,"\xeda9"}, +{IconTypes.NarratorForwardMirrored,"\xedaa"}, +{IconTypes.NearbySharing,"\xf3e2"}, +{IconTypes.Network,"\xe968"}, +{IconTypes.NetworkAdapter,"\xeda3"}, +{IconTypes.NetworkConnected,"\xf385"}, +{IconTypes.NetworkConnectedCheckmark,"\xf386"}, +{IconTypes.NetworkOffline,"\xf384"}, +{IconTypes.NetworkPhysical,"\xf211"}, +{IconTypes.NetworkPrinter,"\xeda5"}, +{IconTypes.NetworkSharing,"\xf193"}, +{IconTypes.NetworkTower,"\xec05"}, +{IconTypes.NewFolder,"\xe8f4"}, +{IconTypes.NewWindow,"\xe78b"}, +{IconTypes.Next,"\xe893"}, +{IconTypes.NoiseCancelation,"\xf61f"}, +{IconTypes.NoiseCancelationOff,"\xf620"}, +{IconTypes.NUIFace,"\xeb68"}, +{IconTypes.NUIFPContinueSlideAction,"\xeb85"}, +{IconTypes.NUIFPContinueSlideHand,"\xeb84"}, +{IconTypes.NUIFPPressAction,"\xeb8b"}, +{IconTypes.NUIFPPressHand,"\xeb8a"}, +{IconTypes.NUIFPPressRepeatAction,"\xeb8d"}, +{IconTypes.NUIFPPressRepeatHand,"\xeb8c"}, +{IconTypes.NUIFPRollLeftAction,"\xeb89"}, +{IconTypes.NUIFPRollLeftHand,"\xeb88"}, +{IconTypes.NUIFPRollRightHand,"\xeb86"}, +{IconTypes.NUIFPRollRightHandAction,"\xeb87"}, +{IconTypes.NUIFPStartSlideAction,"\xeb83"}, +{IconTypes.NUIFPStartSlideHand,"\xeb82"}, +{IconTypes.NUIIris,"\xeb67"}, +{IconTypes.OEM,"\xe74c"}, +{IconTypes.OneBar,"\xe905"}, +{IconTypes.OneHandedLeft20,"\xf73f"}, +{IconTypes.OneHandedRight20,"\xf73e"}, +{IconTypes.OpenFile,"\xe8e5"}, +{IconTypes.OpenFolderHorizontal,"\xed25"}, +{IconTypes.OpenInNewWindow,"\xe8a7"}, +{IconTypes.OpenLocal,"\xe8da"}, +{IconTypes.OpenPane,"\xe8a0"}, +{IconTypes.OpenPaneMirrored,"\xea5b"}, +{IconTypes.OpenWith,"\xe7ac"}, +{IconTypes.OpenWithMirrored,"\xea5c"}, +{IconTypes.Orientation,"\xe8b4"}, +{IconTypes.OtherUser,"\xe7ee"}, +{IconTypes.OutlineHalfStarLeft,"\xf0e7"}, +{IconTypes.OutlineHalfStarRight,"\xf0e8"}, +{IconTypes.OutlineQuarterStarLeft,"\xf0e5"}, +{IconTypes.OutlineQuarterStarRight,"\xf0e6"}, +{IconTypes.OutlineStarLeftHalf,"\xf0f7"}, +{IconTypes.OutlineStarRightHalf,"\xf0f8"}, +{IconTypes.OutlineThreeQuarterStarLeft,"\xf0e9"}, +{IconTypes.OutlineThreeQuarterStarRight,"\xf0ea"}, +{IconTypes.OverwriteWords,"\xf7b5"}, +{IconTypes.OverwriteWordsFill,"\xf7b6"}, +{IconTypes.OverwriteWordsFillKorean,"\xf7ba"}, +{IconTypes.OverwriteWordsKorean,"\xf7b9"}, +{IconTypes.Package,"\xe7b8"}, +{IconTypes.Page,"\xe7c3"}, +{IconTypes.PageLeft,"\xe760"}, +{IconTypes.PageMarginLandscapeModerate,"\xf579"}, +{IconTypes.PageMarginLandscapeNarrow,"\xf577"}, +{IconTypes.PageMarginLandscapeNormal,"\xf578"}, +{IconTypes.PageMarginLandscapeWide,"\xf57a"}, +{IconTypes.PageMarginPortraitModerate,"\xf575"}, +{IconTypes.PageMarginPortraitNarrow,"\xf573"}, +{IconTypes.PageMarginPortraitNormal,"\xf574"}, +{IconTypes.PageMarginPortraitWide,"\xf576"}, +{IconTypes.PageMirrored,"\xf56e"}, +{IconTypes.PageRight,"\xe761"}, +{IconTypes.PageSolid,"\xe729"}, +{IconTypes.PaginationDotOutline10,"\xf126"}, +{IconTypes.PaginationDotSolid10,"\xf127"}, +{IconTypes.PanMode,"\xece9"}, +{IconTypes.ParkingLocation,"\xe811"}, +{IconTypes.ParkingLocationMirrored,"\xea5e"}, +{IconTypes.ParkingLocationSolid,"\xea8b"}, +{IconTypes.PartyLeader,"\xeca7"}, +{IconTypes.PassiveAuthentication,"\xf32a"}, +{IconTypes.PasswordKeyHide,"\xe9a9"}, +{IconTypes.PasswordKeyShow,"\xe9a8"}, +{IconTypes.Paste,"\xe77f"}, +{IconTypes.Pause,"\xe769"}, +{IconTypes.PauseBadge12,"\xedb4"}, +{IconTypes.PauseBold,"\xf8ae"}, +{IconTypes.PaymentCard,"\xe8c7"}, +{IconTypes.PC1,"\xe977"}, +{IconTypes.PDF,"\xea90"}, +{IconTypes.Pencil,"\xed63"}, +{IconTypes.PencilFill,"\xf0c6"}, +{IconTypes.PenPalette,"\xee56"}, +{IconTypes.PenPaletteMirrored,"\xef16"}, +{IconTypes.PenTips,"\xf45e"}, +{IconTypes.PenTipsMirrored,"\xf45f"}, +{IconTypes.PenWorkspace,"\xedc6"}, +{IconTypes.PenWorkspaceMirrored,"\xef15"}, +{IconTypes.People,"\xe716"}, +{IconTypes.PeriodKey,"\xe843"}, +{IconTypes.Permissions,"\xe8d7"}, +{IconTypes.PersonalFolder,"\xec25"}, +{IconTypes.Personalize,"\xe771"}, +{IconTypes.Phone,"\xe717"}, +{IconTypes.PhoneBook,"\xe780"}, +{IconTypes.Photo,"\xe91b"}, +{IconTypes.Photo2,"\xeb9f"}, +{IconTypes.Picture,"\xe8b9"}, +{IconTypes.PieSingle,"\xeb05"}, +{IconTypes.Pin,"\xe718"}, +{IconTypes.PinFill,"\xe841"}, +{IconTypes.Pinned,"\xe840"}, +{IconTypes.PinnedFill,"\xe842"}, +{IconTypes.PINPad,"\xef3e"}, +{IconTypes.PinyinIMELogo,"\xede5"}, +{IconTypes.PLAP,"\xec19"}, +{IconTypes.Play,"\xe768"}, +{IconTypes.Play36,"\xee4a"}, +{IconTypes.PlaybackRate1x,"\xec57"}, +{IconTypes.PlaybackRateOther,"\xec58"}, +{IconTypes.PlayBadge12,"\xedb5"}, +{IconTypes.PlayerSettings,"\xef58"}, +{IconTypes.PlaySolid,"\xf5b0"}, +{IconTypes.POI,"\xecaf"}, +{IconTypes.PointErase,"\xed61"}, +{IconTypes.PointEraseMirrored,"\xef18"}, +{IconTypes.PointerHand,"\xf271"}, +{IconTypes.PoliceCar,"\xec81"}, +{IconTypes.PostUpdate,"\xe8f3"}, +{IconTypes.PowerButton,"\xe7e8"}, +{IconTypes.PowerButtonUpdate,"\xf83d"}, +{IconTypes.PPSFourLandscape,"\xf58d"}, +{IconTypes.PPSFourPortrait,"\xf58e"}, +{IconTypes.PPSOneLandscape,"\xf58a"}, +{IconTypes.PPSOnePortrait,"\xf5ad"}, +{IconTypes.PPSTwoLandscape,"\xf58b"}, +{IconTypes.PPSTwoPortrait,"\xf58c"}, +{IconTypes.PresenceChicklet,"\xe978"}, +{IconTypes.PresenceChickletVideo,"\xe979"}, +{IconTypes.Preview,"\xe8ff"}, +{IconTypes.PreviewLink,"\xe8a1"}, +{IconTypes.Previous,"\xe892"}, +{IconTypes.Print,"\xe749"}, +{IconTypes.PrintAllPages,"\xf571"}, +{IconTypes.PrintCustomRange,"\xf572"}, +{IconTypes.PrintDefault,"\xf56d"}, +{IconTypes.Printer3D,"\xe914"}, +{IconTypes.PrintfaxPrinterFile,"\xe956"}, +{IconTypes.Priority,"\xe8d0"}, +{IconTypes.PrivateCall,"\xea3d"}, +{IconTypes.Process,"\xe9f3"}, +{IconTypes.Processing,"\xe9f5"}, +{IconTypes.ProductivityMode,"\xf71e"}, +{IconTypes.ProgressRingDots,"\xf16a"}, +{IconTypes.Project,"\xebc6"}, +{IconTypes.Projector,"\xe95d"}, +{IconTypes.ProtectedDocument,"\xe8a6"}, +{IconTypes.Protractor,"\xf0b4"}, +{IconTypes.ProvisioningPackage,"\xe835"}, +{IconTypes.PuncKey,"\xe844"}, +{IconTypes.PuncKey0,"\xe84c"}, +{IconTypes.PuncKey1,"\xe9b4"}, +{IconTypes.PuncKey2,"\xe9b5"}, +{IconTypes.PuncKey3,"\xe9b6"}, +{IconTypes.PuncKey4,"\xe9b7"}, +{IconTypes.PuncKey5,"\xe9b8"}, +{IconTypes.PuncKey6,"\xe9b9"}, +{IconTypes.PuncKey7,"\xe9bb"}, +{IconTypes.PuncKey8,"\xe9bc"}, +{IconTypes.PuncKey9,"\xe9ba"}, +{IconTypes.PuncKeyLeftBottom,"\xe84d"}, +{IconTypes.PuncKeyRightBottom,"\xe9b3"}, +{IconTypes.Puzzle,"\xea86"}, +{IconTypes.QRCode,"\xed14"}, +{IconTypes.QuarentinedItems,"\xf0b2"}, +{IconTypes.QuarentinedItemsMirrored,"\xf0b3"}, +{IconTypes.QuarterStarLeft,"\xf0ca"}, +{IconTypes.QuarterStarRight,"\xf0cb"}, +{IconTypes.QuickNote,"\xe70b"}, +{IconTypes.QuietHours,"\xe708"}, +{IconTypes.QuietHoursBadge12,"\xf0ce"}, +{IconTypes.QWERTYOff,"\xe983"}, +{IconTypes.QWERTYOn,"\xe982"}, +{IconTypes.Radar,"\xeb44"}, +{IconTypes.RadioBtnOff,"\xecca"}, +{IconTypes.RadioBtnOn,"\xeccb"}, +{IconTypes.RadioBullet,"\xe915"}, +{IconTypes.RadioBullet2,"\xeccc"}, +{IconTypes.Read,"\xe8c3"}, +{IconTypes.ReadingList,"\xe7bc"}, +{IconTypes.ReadingMode,"\xe736"}, +{IconTypes.ReceiptPrinter,"\xec5b"}, +{IconTypes.Recent,"\xe823"}, +{IconTypes.Record,"\xe7c8"}, +{IconTypes.Record2,"\xea3f"}, +{IconTypes.RectangularClipping,"\xf407"}, +{IconTypes.RedEye,"\xe7b3"}, +{IconTypes.Redo,"\xe7a6"}, +{IconTypes.Refresh,"\xe72c"}, +{IconTypes.Relationship,"\xf003"}, +{IconTypes.RememberedDevice,"\xe70c"}, +{IconTypes.Reminder,"\xeb50"}, +{IconTypes.ReminderFill,"\xeb4f"}, +{IconTypes.Remote,"\xe8af"}, +{IconTypes.Remove,"\xe738"}, +{IconTypes.RemoveFrom,"\xecc9"}, +{IconTypes.Rename,"\xe8ac"}, +{IconTypes.Repair,"\xe90f"}, +{IconTypes.RepeatAll,"\xe8ee"}, +{IconTypes.RepeatOff,"\xf5e7"}, +{IconTypes.RepeatOne,"\xe8ed"}, +{IconTypes.Replay,"\xef3b"}, +{IconTypes.Reply,"\xe97a"}, +{IconTypes.ReplyMirrored,"\xee35"}, +{IconTypes.ReportDocument,"\xe9f9"}, +{IconTypes.ReportHacked,"\xe730"}, +{IconTypes.ResetDevice,"\xed10"}, +{IconTypes.ResetDrive,"\xebc4"}, +{IconTypes.Reshare,"\xe8eb"}, +{IconTypes.ResizeMouseLarge,"\xe747"}, +{IconTypes.ResizeMouseMedium,"\xe744"}, +{IconTypes.ResizeMouseMediumMirrored,"\xea5f"}, +{IconTypes.ResizeMouseSmall,"\xe743"}, +{IconTypes.ResizeMouseSmallMirrored,"\xea60"}, +{IconTypes.ResizeMouseTall,"\xe746"}, +{IconTypes.ResizeMouseTallMirrored,"\xea61"}, +{IconTypes.ResizeMouseWide,"\xe745"}, +{IconTypes.ResizeTouchLarger,"\xe741"}, +{IconTypes.ResizeTouchNarrower,"\xe7ea"}, +{IconTypes.ResizeTouchNarrowerMirrored,"\xea62"}, +{IconTypes.ResizeTouchShorter,"\xe7eb"}, +{IconTypes.ResizeTouchSmaller,"\xe742"}, +{IconTypes.RestartUpdate,"\xf83e"}, +{IconTypes.ReturnKey,"\xe751"}, +{IconTypes.ReturnKeyLg,"\xeb97"}, +{IconTypes.ReturnKeySm,"\xe966"}, +{IconTypes.ReturnToCall,"\xf71a"}, +{IconTypes.ReturnToWindow,"\xe944"}, +{IconTypes.RevealPasswordMedium,"\xf78d"}, +{IconTypes.RevToggleKey,"\xe845"}, +{IconTypes.Rewind,"\xeb9e"}, +{IconTypes.RightArrowKeyTime0,"\xebe7"}, +{IconTypes.RightArrowKeyTime1,"\xe846"}, +{IconTypes.RightArrowKeyTime2,"\xe847"}, +{IconTypes.RightArrowKeyTime3,"\xe84e"}, +{IconTypes.RightArrowKeyTime4,"\xe84f"}, +{IconTypes.RightDoubleQuote,"\xe9b1"}, +{IconTypes.RightQuote,"\xe849"}, +{IconTypes.RightStick,"\xf109"}, +{IconTypes.Ringer,"\xea8f"}, +{IconTypes.RingerBadge12,"\xedac"}, +{IconTypes.RingerSilent,"\xe7ed"}, +{IconTypes.RoamingDomestic,"\xe879"}, +{IconTypes.RoamingInternational,"\xe878"}, +{IconTypes.Robot,"\xe99a"}, +{IconTypes.Rotate,"\xe7ad"}, +{IconTypes.RotateCamera,"\xe89e"}, +{IconTypes.RotateMapLeft,"\xe80d"}, +{IconTypes.RotateMapRight,"\xe80c"}, +{IconTypes.RotationLock,"\xe755"}, +{IconTypes.RTTLogo,"\xf714"}, +{IconTypes.Ruler,"\xed5e"}, +{IconTypes.Safe,"\xf540"}, +{IconTypes.Save,"\xe74e"}, +{IconTypes.SaveAs,"\xe792"}, +{IconTypes.SaveCopy,"\xea35"}, +{IconTypes.SaveLocal,"\xe78c"}, +{IconTypes.Scan,"\xe8fe"}, +{IconTypes.ScreenTime,"\xf182"}, +{IconTypes.ScrollMode,"\xece7"}, +{IconTypes.ScrollUpDown,"\xec8f"}, +{IconTypes.SDCard,"\xe7f1"}, +{IconTypes.Search,"\xe721"}, +{IconTypes.SearchAndApps,"\xe773"}, +{IconTypes.SearchMedium,"\xf78b"}, +{IconTypes.SelectAll,"\xe8b3"}, +{IconTypes.Send,"\xe724"}, +{IconTypes.SendFill,"\xe725"}, +{IconTypes.SendFillMirrored,"\xea64"}, +{IconTypes.SendMirrored,"\xea63"}, +{IconTypes.Sensor,"\xe957"}, +{IconTypes.Set,"\xf5ed"}, +{IconTypes.SetHistoryStatus,"\xf738"}, +{IconTypes.SetHistoryStatus2,"\xf739"}, +{IconTypes.SetlockScreen,"\xe7b5"}, +{IconTypes.SetSolid,"\xf5ee"}, +{IconTypes.SetTile,"\xe97b"}, +{IconTypes.Settings,"\xe713"}, +{IconTypes.SettingsBattery,"\xee63"}, +{IconTypes.SettingsDisplaySound,"\xe7f3"}, +{IconTypes.SettingsSolid,"\xf8b0"}, +{IconTypes.Share,"\xe72d"}, +{IconTypes.ShareBroadband,"\xe83a"}, +{IconTypes.Shield,"\xea18"}, +{IconTypes.Shop,"\xe719"}, +{IconTypes.ShoppingCart,"\xe7bf"}, +{IconTypes.ShowBcc,"\xe8c4"}, +{IconTypes.ShowResults,"\xe8bc"}, +{IconTypes.ShowResultsMirrored,"\xea65"}, +{IconTypes.Shuffle,"\xe8b1"}, +{IconTypes.SignalBars1,"\xe86c"}, +{IconTypes.SignalBars2,"\xe86d"}, +{IconTypes.SignalBars3,"\xe86e"}, +{IconTypes.SignalBars4,"\xe86f"}, +{IconTypes.SignalBars5,"\xe870"}, +{IconTypes.SignalError,"\xed2e"}, +{IconTypes.SignalNotConnected,"\xe871"}, +{IconTypes.SignalRoaming,"\xec1e"}, +{IconTypes.SignatureCapture,"\xef3f"}, +{IconTypes.SignOut,"\xf3b1"}, +{IconTypes.SIMError,"\xf618"}, +{IconTypes.SIMLock,"\xf61a"}, +{IconTypes.SIMMissing,"\xf619"}, +{IconTypes.SIPMove,"\xe759"}, +{IconTypes.SIPRedock,"\xe75b"}, +{IconTypes.SIPUndock,"\xe75a"}, +{IconTypes.SkipBack10,"\xed3c"}, +{IconTypes.SkipForward30,"\xed3d"}, +{IconTypes.SliderThumb,"\xec13"}, +{IconTypes.Slideshow,"\xe786"}, +{IconTypes.SlowMotionOn,"\xea79"}, +{IconTypes.SmallErase,"\xf129"}, +{IconTypes.Smartcard,"\xe963"}, +{IconTypes.SmartcardVirtual,"\xe964"}, +{IconTypes.SmartScreen,"\xf8a5"}, +{IconTypes.Sort,"\xe8cb"}, +{IconTypes.SpatialVolume0,"\xf0eb"}, +{IconTypes.SpatialVolume1,"\xf0ec"}, +{IconTypes.SpatialVolume2,"\xf0ed"}, +{IconTypes.SpatialVolume3,"\xf0ee"}, +{IconTypes.Speakers,"\xe7f5"}, +{IconTypes.SpecialEffectSize,"\xf4a5"}, +{IconTypes.Speech,"\xefa9"}, +{IconTypes.SpeechSolidBold,"\xf8b2"}, +{IconTypes.SpeedHigh,"\xec4a"}, +{IconTypes.SpeedMedium,"\xec49"}, +{IconTypes.SpeedOff,"\xec48"}, +{IconTypes.Spelling,"\xf87b"}, +{IconTypes.SpellingChinese,"\xf87e"}, +{IconTypes.SpellingKorean,"\xf87c"}, +{IconTypes.SpellingSerbian,"\xf87d"}, +{IconTypes.Split20,"\xf740"}, +{IconTypes.StaplingLandscapeBookBinding,"\xf5a9"}, +{IconTypes.StaplingLandscapeBottomLeft,"\xf5a3"}, +{IconTypes.StaplingLandscapeBottomRight,"\xf5a4"}, +{IconTypes.StaplingLandscapeTopLeft,"\xf5a1"}, +{IconTypes.StaplingLandscapeTopRight,"\xf5a2"}, +{IconTypes.StaplingLandscapeTwoBottom,"\xf5a8"}, +{IconTypes.StaplingLandscapeTwoLeft,"\xf5a5"}, +{IconTypes.StaplingLandscapeTwoRight,"\xf5a6"}, +{IconTypes.StaplingLandscapeTwoTop,"\xf5a7"}, +{IconTypes.StaplingOff,"\xf598"}, +{IconTypes.StaplingPortraitBookBinding,"\xf5a0"}, +{IconTypes.StaplingPortraitBottomLeft,"\xf5ae"}, +{IconTypes.StaplingPortraitBottomRight,"\xf59b"}, +{IconTypes.StaplingPortraitTopLeft,"\xf599"}, +{IconTypes.StaplingPortraitTopRight,"\xf59a"}, +{IconTypes.StaplingPortraitTwoBottom,"\xf59f"}, +{IconTypes.StaplingPortraitTwoLeft,"\xf59c"}, +{IconTypes.StaplingPortraitTwoRight,"\xf59d"}, +{IconTypes.StaplingPortraitTwoTop,"\xf59e"}, +{IconTypes.StartPoint,"\xe819"}, +{IconTypes.StartPointSolid,"\xeb49"}, +{IconTypes.StartPresenting,"\xf71c"}, +{IconTypes.StatusCheckmark,"\xf1d8"}, +{IconTypes.StatusCheckmark7,"\xf0b7"}, +{IconTypes.StatusCheckmarkLeft,"\xf1d9"}, +{IconTypes.StatusCircle,"\xea81"}, +{IconTypes.StatusCircle7,"\xf0b6"}, +{IconTypes.StatusCircleBlock,"\xf140"}, +{IconTypes.StatusCircleBlock2,"\xf141"}, +{IconTypes.StatusCircleCheckmark,"\xf13e"}, +{IconTypes.StatusCircleErrorX,"\xf13d"}, +{IconTypes.StatusCircleExclamation,"\xf13c"}, +{IconTypes.StatusCircleInfo,"\xf13f"}, +{IconTypes.StatusCircleInner,"\xf137"}, +{IconTypes.StatusCircleLeft,"\xebfd"}, +{IconTypes.StatusCircleOuter,"\xf136"}, +{IconTypes.StatusCircleQuestionMark,"\xf142"}, +{IconTypes.StatusCircleRing,"\xf138"}, +{IconTypes.StatusCircleSync,"\xf143"}, +{IconTypes.StatusConnecting1,"\xeb57"}, +{IconTypes.StatusConnecting2,"\xeb58"}, +{IconTypes.StatusDataTransfer,"\xe880"}, +{IconTypes.StatusDataTransferRoaming,"\xf5aa"}, +{IconTypes.StatusDataTransferVPN,"\xe881"}, +{IconTypes.StatusDualSIM1,"\xe884"}, +{IconTypes.StatusDualSIM1VPN,"\xe885"}, +{IconTypes.StatusDualSIM2,"\xe882"}, +{IconTypes.StatusDualSIM2VPN,"\xe883"}, +{IconTypes.StatusError,"\xea83"}, +{IconTypes.StatusErrorCircle7,"\xf0b8"}, +{IconTypes.StatusErrorFull,"\xeb90"}, +{IconTypes.StatusErrorLeft,"\xebff"}, +{IconTypes.StatusExclamationCircle7,"\xf12f"}, +{IconTypes.StatusInfo,"\xf3cc"}, +{IconTypes.StatusInfoLeft,"\xf3cd"}, +{IconTypes.StatusPause7,"\xf175"}, +{IconTypes.StatusSecured,"\xf809"}, +{IconTypes.StatusSGLTE,"\xe886"}, +{IconTypes.StatusSGLTECell,"\xe887"}, +{IconTypes.StatusSGLTEDataVPN,"\xe888"}, +{IconTypes.StatusTriangle,"\xea82"}, +{IconTypes.StatusTriangleExclamation,"\xf13b"}, +{IconTypes.StatusTriangleInner,"\xf13a"}, +{IconTypes.StatusTriangleLeft,"\xebfe"}, +{IconTypes.StatusTriangleOuter,"\xf139"}, +{IconTypes.StatusUnsecure,"\xeb59"}, +{IconTypes.StatusVPN,"\xe889"}, +{IconTypes.StatusWarning,"\xea84"}, +{IconTypes.StatusWarningLeft,"\xec00"}, +{IconTypes.Sticker2,"\xf4aa"}, +{IconTypes.StockDown,"\xeb11"}, +{IconTypes.StockUp,"\xeb0f"}, +{IconTypes.Stop,"\xe71a"}, +{IconTypes.StopPoint,"\xe81a"}, +{IconTypes.StopPointSolid,"\xeb4a"}, +{IconTypes.StopPresenting,"\xf71d"}, +{IconTypes.Stopwatch,"\xe916"}, +{IconTypes.StorageNetworkWireless,"\xe969"}, +{IconTypes.StorageOptical,"\xe958"}, +{IconTypes.StorageTape,"\xe96a"}, +{IconTypes.Streaming,"\xe93e"}, +{IconTypes.StreamingEnterprise,"\xed2f"}, +{IconTypes.Street,"\xe913"}, +{IconTypes.StreetsideSplitExpand,"\xe803"}, +{IconTypes.StreetsideSplitMinimize,"\xe802"}, +{IconTypes.Strikethrough,"\xede0"}, +{IconTypes.StrokeErase,"\xed60"}, +{IconTypes.StrokeErase2,"\xf128"}, +{IconTypes.StrokeEraseMirrored,"\xef17"}, +{IconTypes.SubscriptionAdd,"\xed0e"}, +{IconTypes.SubscriptionAddMirrored,"\xed11"}, +{IconTypes.Subtitles,"\xed1e"}, +{IconTypes.SubtitlesAudio,"\xed1f"}, +{IconTypes.SubtractBold,"\xf8ab"}, +{IconTypes.SurfaceHub,"\xe8ae"}, +{IconTypes.SurfaceHubSelected,"\xf4be"}, +{IconTypes.Sustainable,"\xec0a"}, +{IconTypes.Swipe,"\xe927"}, +{IconTypes.SwipeRevealArt,"\xec6d"}, +{IconTypes.Switch,"\xe8ab"}, +{IconTypes.SwitchApps,"\xe8f9"}, +{IconTypes.SwitchUser,"\xe748"}, +{IconTypes.Sync,"\xe895"}, +{IconTypes.SyncBadge12,"\xedab"}, +{IconTypes.SyncError,"\xea6a"}, +{IconTypes.SyncFolder,"\xe8f7"}, +{IconTypes.System,"\xe770"}, +{IconTypes.Tablet,"\xe70a"}, +{IconTypes.TabletMode,"\xebfc"}, +{IconTypes.TabletSelected,"\xec74"}, +{IconTypes.Tag,"\xe8ec"}, +{IconTypes.TapAndSend,"\xe9a1"}, +{IconTypes.TaskbarPhone,"\xee64"}, +{IconTypes.TaskView,"\xe7c4"}, +{IconTypes.TaskViewExpanded,"\xeb91"}, +{IconTypes.TaskViewSettings,"\xee40"}, +{IconTypes.ThisPC,"\xec4e"}, +{IconTypes.ThoughtBubble,"\xea91"}, +{IconTypes.ThreeBars,"\xe907"}, +{IconTypes.ThreeQuarterStarLeft,"\xf0cc"}, +{IconTypes.ThreeQuarterStarRight,"\xf0cd"}, +{IconTypes.Tiles,"\xeca5"}, +{IconTypes.TiltDown,"\xe80a"}, +{IconTypes.TiltUp,"\xe809"}, +{IconTypes.TimeLanguage,"\xe775"}, +{IconTypes.ToggleBorder,"\xec12"}, +{IconTypes.ToggleFilled,"\xec11"}, +{IconTypes.ToggleLeft,"\xf19e"}, +{IconTypes.ToggleRight,"\xf19f"}, +{IconTypes.ToggleThumb,"\xec14"}, +{IconTypes.TollSolid,"\xf161"}, +{IconTypes.ToolTip,"\xe82f"}, +{IconTypes.Touch,"\xe815"}, +{IconTypes.Touchpad,"\xefa5"}, +{IconTypes.TouchPointer,"\xe7c9"}, +{IconTypes.Touchscreen,"\xeda4"}, +{IconTypes.Trackers,"\xeadf"}, +{IconTypes.TrackersMirrored,"\xee92"}, +{IconTypes.TrafficCongestionSolid,"\xf163"}, +{IconTypes.TrafficLight,"\xef31"}, +{IconTypes.Train,"\xe7c0"}, +{IconTypes.TrainSolid,"\xeb4d"}, +{IconTypes.TreeFolderFolder,"\xed41"}, +{IconTypes.TreeFolderFolderFill,"\xed42"}, +{IconTypes.TreeFolderFolderOpen,"\xed43"}, +{IconTypes.TreeFolderFolderOpenFill,"\xed44"}, +{IconTypes.TriggerLeft,"\xf10a"}, +{IconTypes.TriggerRight,"\xf10b"}, +{IconTypes.Trim,"\xe78a"}, +{IconTypes.TVMonitor,"\xe7f4"}, +{IconTypes.TVMonitorSelected,"\xec77"}, +{IconTypes.TwoBars,"\xe906"}, +{IconTypes.TwoPage,"\xe89a"}, +{IconTypes.Type,"\xe97c"}, +{IconTypes.Underline,"\xe8dc"}, +{IconTypes.UnderscoreSpace,"\xe75d"}, +{IconTypes.Undo,"\xe7a7"}, +{IconTypes.Unfavorite,"\xe8d9"}, +{IconTypes.Unit,"\xecc6"}, +{IconTypes.Unknown,"\xe9ce"}, +{IconTypes.UnknownMirrored,"\xf22e"}, +{IconTypes.Unlock,"\xe785"}, +{IconTypes.Unpin,"\xe77a"}, +{IconTypes.UnsyncFolder,"\xe8f6"}, +{IconTypes.Up,"\xe74a"}, +{IconTypes.UpArrowShiftKey,"\xe752"}, +{IconTypes.UpdateRestore,"\xe777"}, +{IconTypes.UpdateStatusDot,"\xf83f"}, +{IconTypes.Upload,"\xe898"}, +{IconTypes.UpShiftKey,"\xe84b"}, +{IconTypes.USB,"\xe88e"}, +{IconTypes.USBSafeConnect,"\xecf3"}, +{IconTypes.UserAPN,"\xf081"}, +{IconTypes.VerticalBattery0,"\xf5f2"}, +{IconTypes.VerticalBattery1,"\xf5f3"}, +{IconTypes.VerticalBattery10,"\xf5fc"}, +{IconTypes.VerticalBattery2,"\xf5f4"}, +{IconTypes.VerticalBattery3,"\xf5f5"}, +{IconTypes.VerticalBattery4,"\xf5f6"}, +{IconTypes.VerticalBattery5,"\xf5f7"}, +{IconTypes.VerticalBattery6,"\xf5f8"}, +{IconTypes.VerticalBattery7,"\xf5f9"}, +{IconTypes.VerticalBattery8,"\xf5fa"}, +{IconTypes.VerticalBattery9,"\xf5fb"}, +{IconTypes.VerticalBatteryCharging0,"\xf5fd"}, +{IconTypes.VerticalBatteryCharging1,"\xf5fe"}, +{IconTypes.VerticalBatteryCharging10,"\xf607"}, +{IconTypes.VerticalBatteryCharging2,"\xf5ff"}, +{IconTypes.VerticalBatteryCharging3,"\xf600"}, +{IconTypes.VerticalBatteryCharging4,"\xf601"}, +{IconTypes.VerticalBatteryCharging5,"\xf602"}, +{IconTypes.VerticalBatteryCharging6,"\xf603"}, +{IconTypes.VerticalBatteryCharging7,"\xf604"}, +{IconTypes.VerticalBatteryCharging8,"\xf605"}, +{IconTypes.VerticalBatteryCharging9,"\xf606"}, +{IconTypes.VerticalBatteryUnknown,"\xf608"}, +{IconTypes.Vibrate,"\xe877"}, +{IconTypes.Video,"\xe714"}, +{IconTypes.Video360,"\xf131"}, +{IconTypes.VideoCapture,"\xf7ee"}, +{IconTypes.VideoChat,"\xe8aa"}, +{IconTypes.VideoSolid,"\xea0c"}, +{IconTypes.View,"\xe890"}, +{IconTypes.ViewAll,"\xe8a9"}, +{IconTypes.ViewDashboard,"\xf246"}, +{IconTypes.VirtualMachineGroup,"\xeea3"}, +{IconTypes.VoiceCall,"\xf715"}, +{IconTypes.Volume,"\xe767"}, +{IconTypes.Volume0,"\xe992"}, +{IconTypes.Volume1,"\xe993"}, +{IconTypes.Volume2,"\xe994"}, +{IconTypes.Volume3,"\xe995"}, +{IconTypes.VolumeBars,"\xebc5"}, +{IconTypes.VPN,"\xe705"}, +{IconTypes.Walk,"\xe805"}, +{IconTypes.WalkSolid,"\xe726"}, +{IconTypes.Warning,"\xe7ba"}, +{IconTypes.Webcam,"\xe8b8"}, +{IconTypes.Webcam2,"\xe960"}, +{IconTypes.WebSearch,"\xf6fa"}, +{IconTypes.Website,"\xeb41"}, +{IconTypes.Wheel,"\xee94"}, +{IconTypes.Wifi,"\xe701"}, +{IconTypes.Wifi1,"\xe872"}, +{IconTypes.Wifi2,"\xe873"}, +{IconTypes.Wifi3,"\xe874"}, +{IconTypes.WifiAttentionOverlay,"\xe998"}, +{IconTypes.WifiCall0,"\xf658"}, +{IconTypes.WifiCall1,"\xf659"}, +{IconTypes.WifiCall2,"\xf65a"}, +{IconTypes.WifiCall3,"\xf65b"}, +{IconTypes.WifiCall4,"\xf65c"}, +{IconTypes.WifiCallBars,"\xf657"}, +{IconTypes.WifiError0,"\xeb5a"}, +{IconTypes.WifiError1,"\xeb5b"}, +{IconTypes.WifiError2,"\xeb5c"}, +{IconTypes.WifiError3,"\xeb5d"}, +{IconTypes.WifiError4,"\xeb5e"}, +{IconTypes.WifiEthernet,"\xee77"}, +{IconTypes.WifiHotspot,"\xe88a"}, +{IconTypes.WifiWarning0,"\xeb5f"}, +{IconTypes.WifiWarning1,"\xeb60"}, +{IconTypes.WifiWarning2,"\xeb61"}, +{IconTypes.WifiWarning3,"\xeb62"}, +{IconTypes.WifiWarning4,"\xeb63"}, +{IconTypes.WindDirection,"\xebe6"}, +{IconTypes.WindowsInsider,"\xf1ad"}, +{IconTypes.WindowSnipping,"\xf7ed"}, +{IconTypes.Wire,"\xe95f"}, +{IconTypes.WiredUSB,"\xecf0"}, +{IconTypes.WirelessUSB,"\xecf1"}, +{IconTypes.Work,"\xe821"}, +{IconTypes.WorkSolid,"\xeb4e"}, +{IconTypes.World,"\xe909"}, +{IconTypes.XboxOneConsole,"\xe990"}, +{IconTypes.ZeroBars,"\xe904"}, +{IconTypes.ZipFolder,"\xf012"}, +{IconTypes.Zoom,"\xe71e"}, +{IconTypes.ZoomIn,"\xe8a3"}, +{IconTypes.ZoomMode,"\xece8"}, +{IconTypes.ZoomOut,"\xe71f"}, }; diff --git a/UI/Controls/Base/IconTypes.cs b/UI/Controls/Base/IconTypes.cs index 553682a..95a51ea 100644 --- a/UI/Controls/Base/IconTypes.cs +++ b/UI/Controls/Base/IconTypes.cs @@ -9,149 +9,1409 @@ namespace UI.Controls.Base /// public enum IconTypes { - /// - /// 无 - /// None, - /// - /// 返回 - /// + Accept, + AcceptMedium, + Accident, + AccidentSolid, + Accounts, + ActionCenter, + ActionCenterAsterisk, + ActionCenterMirrored, + ActionCenterNotification, + ActionCenterNotificationMirrored, + ActionCenterQuiet, + ActionCenterQuietNotification, + Add, + AddBold, + AddFriend, + AddNewLine, + AddNewLineFill, + AddRemoteDevice, + AddSurfaceHub, + AddTo, + AdjustHologram, + Admin, + Airplane, + AirplaneSolid, + AlignCenter, + AlignLeft, + AlignRight, + AllApps, + AllAppsMirrored, + Annotation, + AppIconDefault, + ApplicationGuard, + Apps, + AreaChart, + ArrowDown8, + ArrowLeft8, + ArrowRight8, + ArrowUp8, + AspectRatio, + Asterisk, + AsteriskBadge12, + Attach, + AttachCamera, + Audio, Back, - /// - /// 日历 - /// + BackgroundToggle, + BackMirrored, + BackSolidBold, + BackSpaceQWERTY, + BackSpaceQWERTYLg, + BackSpaceQWERTYMd, + BackSpaceQWERTYSm, + BackToWindow, + Badge, + BandBattery0, + BandBattery1, + BandBattery2, + BandBattery3, + BandBattery4, + BandBattery5, + BandBattery6, + Bank, + BarcodeScanner, + Battery0, + Battery1, + Battery10, + Battery2, + Battery3, + Battery4, + Battery5, + Battery6, + Battery7, + Battery8, + Battery9, + BatteryCharging0, + BatteryCharging1, + BatteryCharging10, + BatteryCharging2, + BatteryCharging3, + BatteryCharging4, + BatteryCharging5, + BatteryCharging6, + BatteryCharging7, + BatteryCharging8, + BatteryCharging9, + BatterySaver0, + BatterySaver1, + BatterySaver10, + BatterySaver2, + BatterySaver3, + BatterySaver4, + BatterySaver5, + BatterySaver6, + BatterySaver7, + BatterySaver8, + BatterySaver9, + BatteryUnknown, + Beta, + BidiLtr, + BidiRtl, + BlockContact, + Blocked2, + BlueLight, + Bluetooth, + BodyCam, + Bold, + Bookmarks, + BookmarksMirrored, + Brightness, + Broom, + BrowsePhotos, + BrushSize, + Bug, + BuildingEnergy, + BulletedList, + BulletedListMirrored, + Bullseye, + BumperLeft, + BumperRight, + Bus, + BusSolid, + ButtonA, + ButtonB, + ButtonMenu, + ButtonView2, + ButtonX, + ButtonY, + Cafe, + Calculator, + CalculatorAddition, + CalculatorBackspace, + CalculatorDivide, + CalculatorEqualTo, + CalculatorMultiply, + CalculatorNegate, + CalculatorPercentage, + CalculatorSquareroot, + CalculatorSubtract, Calendar, - /// - /// 下V - /// + CalendarDay, + CalendarMirrored, + CalendarReply, + CalendarSolid, + CalendarWeek, + CallControl, + CallForwarding, + CallForwardingMirrored, + CallForwardInternational, + CallForwardInternationalMirrored, + CallForwardRoaming, + CallForwardRoamingMirrored, + CalligraphyFill, + CalligraphyPen, + Calories, + Camera, + Cancel, + CancelMedium, + Caption, + Car, + CaretBottomRightSolidCenter8, + CaretDown8, + CaretDownSolid8, + CaretLeft8, + CaretLeftSolid8, + CaretRight8, + CaretRightSolid8, + CaretSolidDown, + CaretSolidLeft, + CaretSolidRight, + CaretSolidUp, + CaretUp8, + CaretUpSolid8, + CashDrawer, + CC, + CellPhone, + Certificate, + CharacterAppearance, + Characters, + ChatBubbles, + Checkbox, + Checkbox14, + CheckboxComposite, + CheckboxComposite14, + CheckboxCompositeReversed, + CheckboxFill, + CheckboxIndeterminate, + CheckboxIndeterminateCombo, + CheckboxIndeterminateCombo14, + CheckList, + ChecklistMirrored, + CheckMark, ChevronDown, - /// - /// 上V - /// + ChevronDownMed, + ChevronDownSmall, + ChevronLeft, + ChevronLeft20, + ChevronLeft32, + ChevronLeftMed, + ChevronLeftSmall, + ChevronRight, + ChevronRight20, + ChevronRight32, + ChevronRightMed, + ChevronRightSmall, ChevronUp, - /// - /// 复选标记 - /// - CheckMark, - /// - /// 已完成标记 - /// - CompletedSolid, - /// - /// 单选按钮on - /// - RadioBtnOn, - StatusCircleOuter, - AcceptMedium, - Accept, - Timer, - StatusCircleQuestionMark, - ProjectDocument, - AutomateFlow, - FlashAuto, - ProductVariant, - AppIconDefault, - ChromeMinimize, + ChevronUpMed, + ChevronUpSmall, + ChineseBoPoMoFo, + ChineseChangjie, + ChinesePinyin, + ChinesePunctuation, + ChineseQuick, + ChipCardCreditCardReader, + ChromeAnnotate, + ChromeAnnotateContrast, + ChromeBack, + ChromeBackContrast, + ChromeBackContrastMirrored, + ChromeBackMirrored, + ChromeBackToWindow, + ChromeBackToWindowContrast, ChromeClose, + ChromeCloseContrast, + ChromeFullScreen, + ChromeFullScreenContrast, + ChromeMaximize, + ChromeMaximizeContrast, + ChromeMinimize, + ChromeMinimizeContrast, ChromeRestore, - CalculatorMultiply, - SquareShape, - More, - AppIconDefaultList, + ChromeRestoreContrast, + ChromeSwitch, + ChromeSwitchContast, + CHTLanguageBar, + CircleFill, + CircleFillBadge12, + CircleRing, + CircleRingBadge12, + CircleShapeSolid, + CityNext, + CityNext2, + Clear, + ClearAllInk, + ClearAllInkMirrored, + ClearSelection, + ClearSelectionMirrored, + Click, + ClickedOutLoudSolidBold, + ClickSolid, ClipboardList, - Settings, - ChromeBack, - BulletedList, - CalculatorAddition, - DeviceRun, - ProcessingRun, - Product, - FileTemplate, - DeviceOff, - FlowChart, - DownloadDocument, - Delete, - EditStyle, - OpenWithMirrored, - FileCode, - BuildIssue, - WebEnvironment, - DesktopScreenshot, - MusicInCollectionFill, - NetworkTower, - KeyboardClassic, - FabricSyncFolder, - DateTime12, + ClipboardListMirrored, + ClippingTool, + ClosedCaptionsInternational, + ClosePane, + ClosePaneMirrored, + Cloud, + CloudDownload, + CloudPrinter, + CloudSearch, + Code, + CollapseContent, + CollapseContentSingle, + CollateLandscape, + CollateLandscapeSeparated, + CollatePortrait, + CollatePortraitSeparated, + Color, + ColorOff, + ColorSolid, + CommaKey, + CommandPrompt, + Comment, + Communications, + CompanionApp, + CompanionDeviceFramework, + Completed, + CompletedSolid, + Component, + ComposeMode, + Connect, + ConnectApp, + Connected, + Construction, + ConstructionCone, + ConstructionSolid, + Contact, + Contact2, + ContactInfo, + ContactInfoMirrored, + ContactPresence, + ContactSolid, + Copy, + CopyTo, + Courthouse, + Crop, + CtrlSpatialLeft, + CtrlSpatialRight, + Cut, + DashKey, + DataSense, + DataSenseBar, DateTime, - MyNetwork, - WifiEthernet, - NormalWeight, - Message, + DateTimeMirrored, + DeclineCall, + DefaultAPN, + DefenderApp, + DefenderBadge12, + Delete, + DeleteLines, + DeleteLinesFill, + DeleteWord, + DeleteWordFill, + DeliveryOptimization, + Design, + DetachablePC, + DeveloperTools, + DeviceDiscovery, + DeviceLaptopNoPic, + DeviceLaptopPic, + DeviceMonitorLeftPic, + DeviceMonitorNoPic, + DeviceMonitorRightPic, + Devices, + Devices2, + Devices3, + Devices4, + DevUpdate, + Diagnostic, + Dial1, + Dial10, + Dial11, + Dial12, + Dial13, + Dial14, + Dial15, + Dial16, + Dial2, + Dial3, + Dial4, + Dial5, + Dial6, + Dial7, + Dial8, + Dial9, + Dialpad, + DialShape1, + DialShape2, + DialShape3, + DialShape4, + DialUp, + Dictionary, + DictionaryAdd, + DictionaryCloud, + DirectAccess, + Directions, + DisableUpdates, + DisconnectDisplay, + DisconnectDrive, + Dislike, + DMC, + Dock, + DockBottom, + DockLeft, + DockLeftMirrored, + DockRight, + DockRightMirrored, + Document, + DocumentApproval, + DoublePinyin, + Down, Download, - Storyboard, - HandsFree, - PlaybackRate1x, - ProcessingCancel, - Volume2, + DownloadMap, + DownShiftKey, + Dpad, + Draw, + DrawSolid, + DrivingMode, + Drop, + DullSound, + DullSoundKey, + DuplexLandscapeOneSided, + DuplexLandscapeOneSidedMirrored, + DuplexLandscapeTwoSidedLongEdge, + DuplexLandscapeTwoSidedLongEdgeMirrored, + DuplexLandscapeTwoSidedShortEdge, + DuplexLandscapeTwoSidedShortEdgeMirrored, + DuplexPortraitOneSided, + DuplexPortraitOneSidedMirrored, + DuplexPortraitTwoSidedLongEdge, + DuplexPortraitTwoSidedLongEdgeMirrored, + DuplexPortraitTwoSidedShortEdge, + DuplexPortraitTwoSidedShortEdgeMirrored, + DynamicLock, + Ear, + Earbud, + EaseOfAccess, + Edit, + EditMirrored, + Education, + EducationIcon, + Eject, + EMI, + Emoji, + Emoji2, + EmojiSwatch, + EmojiTabCelebrationObjects, + EmojiTabFavorites, + EmojiTabFoodPlants, + EmojiTabMoreSymbols, + EmojiTabPeople, + EmojiTabSmilesAnimals, + EmojiTabSymbols, + EmojiTabTextSmiles, + EmojiTabTransitPlaces, + EndPoint, + EndPointSolid, + EnglishPunctuation, + Equalizer, + EraseTool, + EraseToolFill, + EraseToolFill2, + Error, + ErrorBadge, + ErrorBadge12, + eSIM, + eSIMBusy, + eSIMLocked, + eSIMNoProfile, + Ethernet, + EthernetError, + EthernetWarning, + Event12, + ExpandTile, + ExpandTileMirrored, + ExploitProtection, + ExploitProtectionSettings, + ExploreContent, + ExploreContentSingle, + Export, + ExportMirrored, + ExpressiveInputEntry, + Eyedropper, + EyeGaze, + Family, + FastForward, + Favicon, + Favicon2, + FavoriteList, + FavoriteStar, + FavoriteStarFill, + Feedback, + FeedbackApp, + Ferry, + FerrySolid, + FileExplorer, + FileExplorerApp, + Filter, + FingerInking, + Fingerprint, + FitPage, + Flag, + Flashlight, + FlickDown, + FlickLeft, + FlickRight, + FlickUp, + Flow, + Folder, + FolderFill, + FolderHorizontal, + FolderOpen, + FolderSelect, + Font, + FontColor, + FontDecrease, + FontIncrease, + FontSize, + Forward, + ForwardCall, + ForwardMirrored, + ForwardSm, + ForwardSolidBold, + FourBars, + FreeFormClipping, + Frigid, + Full20, + FullAlpha, + FullCircleMask, + FullHiragana, + FullKatakana, + FullScreen, + FuzzyReading, Game, - NewsSearch, - Share, - PageCheckedin, - EntityExtraction, - RecycleBin, - Ringer, - Rocket, - Robot, - Puzzle, - RainShowersDay, - Plug, - Pinned, - PlayerSettings, - Permissions, - PasswordField, - OfficeStoreLogo, - NUIFace, - MyMoviesTV, - MicrosoftTranslatorLogo, - Microphone, - MailAlert, - Lock, - Lightbulb, - LightningBolt, - Insights, - Home, + GameConsole, + GatewayRouter, + GenericScan, + GIF, + GiftboxOpen, + GlobalNavButton, + Globe, + Globe2, + Go, + GoMirrored, + GoToMessage, + GoToStart, + GotoToday, + GridView, + GripperBarHorizontal, + GripperBarVertical, + GripperResize, + GripperResizeMirrored, + GripperTool, + Groceries, + Group, + GroupList, + GuestUser, + HalfAlpha, + HalfDullSound, + HalfKatakana, + HalfStarLeft, + HalfStarRight, + Handwriting, + Handwriting20, + HangUp, + HardDrive, + HeadlessDevice, + Headphone, + Headphone0, + Headphone1, + Headphone2, + Headphone3, + Headset, + Health, Heart, + HeartBroken, HeartFill, - Flower, - FieldReadOnly, - FangBody, - EventToDoLogo, - Emoji, - DrillDown, - Diamond, - Decimals, - Crown, - Color, - CloudSecure, - CloudImportExport, - Cat, - Car, - Bug, - BIDashboard, + Help, + HelpMirrored, + Hide, + HideBcc, + Highlight, + HighlightFill, + HighlightFill2, + History, + HMD, + HolePunchLandscapeBottom, + HolePunchLandscapeLeft, + HolePunchLandscapeRight, + HolePunchLandscapeTop, + HolePunchOff, + HolePunchPortraitBottom, + HolePunchPortraitLeft, + HolePunchPortraitRight, + HolePunchPortraitTop, + HoloLens, + HoloLensSelected, + Home, + HomeGroup, + HomeSolid, + HorizontalTabKey, + HWPInsert, + HWPJoin, + HWPNewLine, + HWPOverwrite, + HWPScratchOut, + HWPSplit, + HWPStrikeThrough, + IBeam, + IBeamOutline, + IDBadge, + ImageExport, + Import, + ImportAll, + ImportAllMirrored, + Important, + ImportantBadge12, + ImportMirrored, + IncidentTriangle, + IncomingCall, + Info, + Info2, + InfoSolid, + InkingCaret, + InkingColorFill, + InkingColorOutline, + InkingTool, + InkingToolFill, + InkingToolFill2, + InPrivate, + Input, + InsiderHubApp, + InstertWords, + InstertWordsFill, + InteractiveDashboard, + InternetSharing, + IOT, + Italic, + Japanese, + JoinWords, + JoinWordsFill, + JpnRomanji, + JpnRomanjiLock, + JpnRomanjiShift, + JpnRomanjiShiftLock, + Key12On, + Keyboard12Key, + KeyboardBrightness, + KeyboardClassic, + KeyboardDismiss, + KeyboardDock, + KeyboardFull, + KeyboardLeftAligned, + KeyboardLeftDock, + KeyboardLeftHanded, + KeyboardLowerBrightness, + KeyboardNarrow, + KeyboardOneHanded, + KeyboardRightAligned, + KeyboardRightDock, + KeyboardRightHanded, + KeyboardSettings, + Keyboardsettings20, + KeyboardShortcut, + KeyboardSplit, + KeyboardStandard, + KeyboardUndock, + Kiosk, + KnowledgeArticle, + Korean, + Label, + LandscapeOrientation, + LandscapeOrientationMirrored, + LangJPN, + LanguageChs, + LanguageCht, + LanguageJpn, + LanguageKor, + LaptopSecure, + LaptopSelected, + LargeErase, + Leaf, + LeaveChat, + LeaveChatMirrored, + LEDLight, + LeftArrowKeyTime0, + LeftDoubleQuote, + LeftQuote, + LeftStick, + Lexicon, + Library, + Light, + Lightbulb, + LightningBolt, + Like, + LikeDislike, + LineDisplay, + Link, + List, + ListMirrored, + LocaleLanguage, + Location, + Lock, + LockFeedback, + LockscreenDesktop, + LockScreenGlance, + LowerBrightness, + MagStripeReader, + Mail, + MailBadge12, + MailFill, + MailForward, + MailForwardMirrored, + MailReply, + MailReplyAll, + MailReplyAllMirrored, + MailReplyMirrored, + Manage, + MapCompassBottom, + MapCompassTop, + MapDirections, + MapDrive, + MapLayers, + MapPin, + MapPin2, + Marker, + Market, + MarketDown, + Marquee, + Media, + MediaStorageTower, + Megaphone, + Memo, + MergeCall, + Message, + MicClipping, + MicError, + MicLocationCombo, + MicOff, + MicOff2, + MicOn, + Microphone, + MicrophoneListening, + MicrophoneSolidBold, + MicSleep, + MiniContract2Mirrored, + MiniExpand2Mirrored, + MiracastLogoLarge, + MiracastLogoSmall, + MixedMediaBadge, + MixVolumes, + MobActionCenter, + MobAirplane, + MobBattery0, + MobBattery1, + MobBattery10, + MobBattery2, + MobBattery3, + MobBattery4, + MobBattery5, + MobBattery6, + MobBattery7, + MobBattery8, + MobBattery9, + MobBatteryCharging0, + MobBatteryCharging1, + MobBatteryCharging10, + MobBatteryCharging2, + MobBatteryCharging3, + MobBatteryCharging4, + MobBatteryCharging5, + MobBatteryCharging6, + MobBatteryCharging7, + MobBatteryCharging8, + MobBatteryCharging9, + MobBatterySaver0, + MobBatterySaver1, + MobBatterySaver10, + MobBatterySaver2, + MobBatterySaver3, + MobBatterySaver4, + MobBatterySaver5, + MobBatterySaver6, + MobBatterySaver7, + MobBatterySaver8, + MobBatterySaver9, + MobBatteryUnknown, + MobBluetooth, + MobCallForwarding, + MobCallForwardingMirrored, + MobDrivingMode, + MobeSIM, + MobeSIMBusy, + MobeSIMLocked, + MobeSIMNoProfile, + MobileLocked, + MobileSelected, + MobileTablet, + MobLocation, + MobQuietHours, + MobSignal1, + MobSignal2, + MobSignal3, + MobSignal4, + MobSignal5, + MobSIMError, + MobSIMLock, + MobSIMMissing, + MobWifi1, + MobWifi2, + MobWifi3, + MobWifi4, + MobWifiCall0, + MobWifiCall1, + MobWifiCall2, + MobWifiCall3, + MobWifiCall4, + MobWifiCallBars, + MobWifiHotspot, + MobWifiWarning1, + MobWifiWarning2, + MobWifiWarning3, + MobWifiWarning4, + More, + Mouse, + Move, + MoveToFolder, + Movies, + MultimediaDMP, + MultimediaDMS, + MultimediaDVR, + MultimediaPMP, + MultiSelect, + MultiSelectMirrored, + MusicAlbum, + MusicInfo, + MusicNote, + MusicSharing, + MusicSharingOff, + Mute, + MyNetwork, + Narrator, + NarratorApp, + NarratorForward, + NarratorForwardMirrored, + NearbySharing, + Network, + NetworkAdapter, + NetworkConnected, + NetworkConnectedCheckmark, + NetworkOffline, + NetworkPhysical, + NetworkPrinter, + NetworkSharing, + NetworkTower, + NewFolder, + NewWindow, + Next, + NoiseCancelation, + NoiseCancelationOff, + NUIFace, + NUIFPContinueSlideAction, + NUIFPContinueSlideHand, + NUIFPPressAction, + NUIFPPressHand, + NUIFPPressRepeatAction, + NUIFPPressRepeatHand, + NUIFPRollLeftAction, + NUIFPRollLeftHand, + NUIFPRollRightHand, + NUIFPRollRightHandAction, + NUIFPStartSlideAction, + NUIFPStartSlideHand, + NUIIris, + OEM, + OneBar, + OneHandedLeft20, + OneHandedRight20, + OpenFile, + OpenFolderHorizontal, + OpenInNewWindow, + OpenLocal, + OpenPane, + OpenPaneMirrored, + OpenWith, + OpenWithMirrored, + Orientation, + OtherUser, + OutlineHalfStarLeft, + OutlineHalfStarRight, + OutlineQuarterStarLeft, + OutlineQuarterStarRight, + OutlineStarLeftHalf, + OutlineStarRightHalf, + OutlineThreeQuarterStarLeft, + OutlineThreeQuarterStarRight, + OverwriteWords, + OverwriteWordsFill, + OverwriteWordsFillKorean, + OverwriteWordsKorean, + Package, + Page, + PageLeft, + PageMarginLandscapeModerate, + PageMarginLandscapeNarrow, + PageMarginLandscapeNormal, + PageMarginLandscapeWide, + PageMarginPortraitModerate, + PageMarginPortraitNarrow, + PageMarginPortraitNormal, + PageMarginPortraitWide, + PageMirrored, + PageRight, + PageSolid, + PaginationDotOutline10, + PaginationDotSolid10, + PanMode, + ParkingLocation, + ParkingLocationMirrored, + ParkingLocationSolid, + PartyLeader, + PassiveAuthentication, + PasswordKeyHide, + PasswordKeyShow, + Paste, + Pause, + PauseBadge12, + PauseBold, + PaymentCard, + PC1, + PDF, + Pencil, + PencilFill, + PenPalette, + PenPaletteMirrored, + PenTips, + PenTipsMirrored, + PenWorkspace, + PenWorkspaceMirrored, + People, + PeriodKey, + Permissions, + PersonalFolder, + Personalize, + Phone, + PhoneBook, + Photo, + Photo2, + Picture, + PieSingle, + Pin, + PinFill, + Pinned, + PinnedFill, + PINPad, + PinyinIMELogo, + PLAP, + Play, + Play36, + PlaybackRate1x, + PlaybackRateOther, + PlayBadge12, + PlayerSettings, + PlaySolid, + POI, + PointErase, + PointEraseMirrored, + PointerHand, + PoliceCar, + PostUpdate, + PowerButton, + PowerButtonUpdate, + PPSFourLandscape, + PPSFourPortrait, + PPSOneLandscape, + PPSOnePortrait, + PPSTwoLandscape, + PPSTwoPortrait, + PresenceChicklet, + PresenceChickletVideo, Preview, - Blocked, - Remove, - Chart, - Forward, - FileImage, - CriticalErrorSolid, - TagGroup, - ClipboardListMirrored, - MSNVideosSolid, - SkypeCircleClock, - FlameSolid, - PieSingleSolid, + PreviewLink, + Previous, + Print, + PrintAllPages, + PrintCustomRange, + PrintDefault, + Printer3D, + PrintfaxPrinterFile, + Priority, + PrivateCall, + Process, + Processing, + ProductivityMode, + ProgressRingDots, + Project, + Projector, + ProtectedDocument, + Protractor, + ProvisioningPackage, + PuncKey, + PuncKey0, + PuncKey1, + PuncKey2, + PuncKey3, + PuncKey4, + PuncKey5, + PuncKey6, + PuncKey7, + PuncKey8, + PuncKey9, + PuncKeyLeftBottom, + PuncKeyRightBottom, + Puzzle, + QRCode, + QuarentinedItems, + QuarentinedItemsMirrored, + QuarterStarLeft, + QuarterStarRight, + QuickNote, + QuietHours, + QuietHoursBadge12, + QWERTYOff, + QWERTYOn, + Radar, + RadioBtnOff, + RadioBtnOn, + RadioBullet, + RadioBullet2, + Read, + ReadingList, + ReadingMode, + ReceiptPrinter, + Recent, + Record, + Record2, + RectangularClipping, + RedEye, + Redo, Refresh, - Export + Relationship, + RememberedDevice, + Reminder, + ReminderFill, + Remote, + Remove, + RemoveFrom, + Rename, + Repair, + RepeatAll, + RepeatOff, + RepeatOne, + Replay, + Reply, + ReplyMirrored, + ReportDocument, + ReportHacked, + ResetDevice, + ResetDrive, + Reshare, + ResizeMouseLarge, + ResizeMouseMedium, + ResizeMouseMediumMirrored, + ResizeMouseSmall, + ResizeMouseSmallMirrored, + ResizeMouseTall, + ResizeMouseTallMirrored, + ResizeMouseWide, + ResizeTouchLarger, + ResizeTouchNarrower, + ResizeTouchNarrowerMirrored, + ResizeTouchShorter, + ResizeTouchSmaller, + RestartUpdate, + ReturnKey, + ReturnKeyLg, + ReturnKeySm, + ReturnToCall, + ReturnToWindow, + RevealPasswordMedium, + RevToggleKey, + Rewind, + RightArrowKeyTime0, + RightArrowKeyTime1, + RightArrowKeyTime2, + RightArrowKeyTime3, + RightArrowKeyTime4, + RightDoubleQuote, + RightQuote, + RightStick, + Ringer, + RingerBadge12, + RingerSilent, + RoamingDomestic, + RoamingInternational, + Robot, + Rotate, + RotateCamera, + RotateMapLeft, + RotateMapRight, + RotationLock, + RTTLogo, + Ruler, + Safe, + Save, + SaveAs, + SaveCopy, + SaveLocal, + Scan, + ScreenTime, + ScrollMode, + ScrollUpDown, + SDCard, + Search, + SearchAndApps, + SearchMedium, + SelectAll, + Send, + SendFill, + SendFillMirrored, + SendMirrored, + Sensor, + Set, + SetHistoryStatus, + SetHistoryStatus2, + SetlockScreen, + SetSolid, + SetTile, + Settings, + SettingsBattery, + SettingsDisplaySound, + SettingsSolid, + Share, + ShareBroadband, + Shield, + Shop, + ShoppingCart, + ShowBcc, + ShowResults, + ShowResultsMirrored, + Shuffle, + SignalBars1, + SignalBars2, + SignalBars3, + SignalBars4, + SignalBars5, + SignalError, + SignalNotConnected, + SignalRoaming, + SignatureCapture, + SignOut, + SIMError, + SIMLock, + SIMMissing, + SIPMove, + SIPRedock, + SIPUndock, + SkipBack10, + SkipForward30, + SliderThumb, + Slideshow, + SlowMotionOn, + SmallErase, + Smartcard, + SmartcardVirtual, + SmartScreen, + Sort, + SpatialVolume0, + SpatialVolume1, + SpatialVolume2, + SpatialVolume3, + Speakers, + SpecialEffectSize, + Speech, + SpeechSolidBold, + SpeedHigh, + SpeedMedium, + SpeedOff, + Spelling, + SpellingChinese, + SpellingKorean, + SpellingSerbian, + Split20, + StaplingLandscapeBookBinding, + StaplingLandscapeBottomLeft, + StaplingLandscapeBottomRight, + StaplingLandscapeTopLeft, + StaplingLandscapeTopRight, + StaplingLandscapeTwoBottom, + StaplingLandscapeTwoLeft, + StaplingLandscapeTwoRight, + StaplingLandscapeTwoTop, + StaplingOff, + StaplingPortraitBookBinding, + StaplingPortraitBottomLeft, + StaplingPortraitBottomRight, + StaplingPortraitTopLeft, + StaplingPortraitTopRight, + StaplingPortraitTwoBottom, + StaplingPortraitTwoLeft, + StaplingPortraitTwoRight, + StaplingPortraitTwoTop, + StartPoint, + StartPointSolid, + StartPresenting, + StatusCheckmark, + StatusCheckmark7, + StatusCheckmarkLeft, + StatusCircle, + StatusCircle7, + StatusCircleBlock, + StatusCircleBlock2, + StatusCircleCheckmark, + StatusCircleErrorX, + StatusCircleExclamation, + StatusCircleInfo, + StatusCircleInner, + StatusCircleLeft, + StatusCircleOuter, + StatusCircleQuestionMark, + StatusCircleRing, + StatusCircleSync, + StatusConnecting1, + StatusConnecting2, + StatusDataTransfer, + StatusDataTransferRoaming, + StatusDataTransferVPN, + StatusDualSIM1, + StatusDualSIM1VPN, + StatusDualSIM2, + StatusDualSIM2VPN, + StatusError, + StatusErrorCircle7, + StatusErrorFull, + StatusErrorLeft, + StatusExclamationCircle7, + StatusInfo, + StatusInfoLeft, + StatusPause7, + StatusSecured, + StatusSGLTE, + StatusSGLTECell, + StatusSGLTEDataVPN, + StatusTriangle, + StatusTriangleExclamation, + StatusTriangleInner, + StatusTriangleLeft, + StatusTriangleOuter, + StatusUnsecure, + StatusVPN, + StatusWarning, + StatusWarningLeft, + Sticker2, + StockDown, + StockUp, + Stop, + StopPoint, + StopPointSolid, + StopPresenting, + Stopwatch, + StorageNetworkWireless, + StorageOptical, + StorageTape, + Streaming, + StreamingEnterprise, + Street, + StreetsideSplitExpand, + StreetsideSplitMinimize, + Strikethrough, + StrokeErase, + StrokeErase2, + StrokeEraseMirrored, + SubscriptionAdd, + SubscriptionAddMirrored, + Subtitles, + SubtitlesAudio, + SubtractBold, + SurfaceHub, + SurfaceHubSelected, + Sustainable, + Swipe, + SwipeRevealArt, + Switch, + SwitchApps, + SwitchUser, + Sync, + SyncBadge12, + SyncError, + SyncFolder, + System, + Tablet, + TabletMode, + TabletSelected, + Tag, + TapAndSend, + TaskbarPhone, + TaskView, + TaskViewExpanded, + TaskViewSettings, + ThisPC, + ThoughtBubble, + ThreeBars, + ThreeQuarterStarLeft, + ThreeQuarterStarRight, + Tiles, + TiltDown, + TiltUp, + TimeLanguage, + ToggleBorder, + ToggleFilled, + ToggleLeft, + ToggleRight, + ToggleThumb, + TollSolid, + ToolTip, + Touch, + Touchpad, + TouchPointer, + Touchscreen, + Trackers, + TrackersMirrored, + TrafficCongestionSolid, + TrafficLight, + Train, + TrainSolid, + TreeFolderFolder, + TreeFolderFolderFill, + TreeFolderFolderOpen, + TreeFolderFolderOpenFill, + TriggerLeft, + TriggerRight, + Trim, + TVMonitor, + TVMonitorSelected, + TwoBars, + TwoPage, + Type, + Underline, + UnderscoreSpace, + Undo, + Unfavorite, + Unit, + Unknown, + UnknownMirrored, + Unlock, + Unpin, + UnsyncFolder, + Up, + UpArrowShiftKey, + UpdateRestore, + UpdateStatusDot, + Upload, + UpShiftKey, + USB, + USBSafeConnect, + UserAPN, + VerticalBattery0, + VerticalBattery1, + VerticalBattery10, + VerticalBattery2, + VerticalBattery3, + VerticalBattery4, + VerticalBattery5, + VerticalBattery6, + VerticalBattery7, + VerticalBattery8, + VerticalBattery9, + VerticalBatteryCharging0, + VerticalBatteryCharging1, + VerticalBatteryCharging10, + VerticalBatteryCharging2, + VerticalBatteryCharging3, + VerticalBatteryCharging4, + VerticalBatteryCharging5, + VerticalBatteryCharging6, + VerticalBatteryCharging7, + VerticalBatteryCharging8, + VerticalBatteryCharging9, + VerticalBatteryUnknown, + Vibrate, + Video, + Video360, + VideoCapture, + VideoChat, + VideoSolid, + View, + ViewAll, + ViewDashboard, + VirtualMachineGroup, + VoiceCall, + Volume, + Volume0, + Volume1, + Volume2, + Volume3, + VolumeBars, + VPN, + Walk, + WalkSolid, + Warning, + Webcam, + Webcam2, + WebSearch, + Website, + Wheel, + Wifi, + Wifi1, + Wifi2, + Wifi3, + WifiAttentionOverlay, + WifiCall0, + WifiCall1, + WifiCall2, + WifiCall3, + WifiCall4, + WifiCallBars, + WifiError0, + WifiError1, + WifiError2, + WifiError3, + WifiError4, + WifiEthernet, + WifiHotspot, + WifiWarning0, + WifiWarning1, + WifiWarning2, + WifiWarning3, + WifiWarning4, + WindDirection, + WindowsInsider, + WindowSnipping, + Wire, + WiredUSB, + WirelessUSB, + Work, + WorkSolid, + World, + XboxOneConsole, + ZeroBars, + ZipFolder, + Zoom, + ZoomIn, + ZoomMode, + ZoomOut, } } diff --git a/UI/Controls/Charts/Charts.cs b/UI/Controls/Charts/Charts.cs index c76ccf2..7ded671 100644 --- a/UI/Controls/Charts/Charts.cs +++ b/UI/Controls/Charts/Charts.cs @@ -533,7 +533,7 @@ namespace UI.Controls.Charts protected override void OnRender(DrawingContext drawingContext) { base.OnRender(drawingContext); - _listView.Height = 1; + //_listView.Height = 1; } private void Charts_SizeChanged(object sender, SizeChangedEventArgs e) @@ -640,7 +640,10 @@ namespace UI.Controls.Charts maxValue = Math.Round(maxValue / 2, MidpointRounding.AwayFromZero) * 2 + 2; var countText = GetTemplateChild("ACount") as Run; - countText.Text = Data.Count().ToString(); + if (countText != null) + { + countText.Text = Data.Count().ToString(); + } } DataMaxValue = maxValue; @@ -1108,6 +1111,10 @@ namespace UI.Controls.Charts { maxValue = DataMaximum; } + if (maxValue == 0) + { + maxValue = 10; + } Maximum = Covervalue(maxValue); Median = Covervalue((maxValue / 2)); diff --git a/UI/Controls/Input/InputBox.cs b/UI/Controls/Input/InputBox.cs index ecfb922..aa13b86 100644 --- a/UI/Controls/Input/InputBox.cs +++ b/UI/Controls/Input/InputBox.cs @@ -6,13 +6,62 @@ using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; using System.Windows.Controls.Primitives; +using System.Windows.Media; +using UI.Controls.Base; namespace UI.Controls.Input { public class InputBox : TextBox { + /// + /// 圆角半径 + /// + public CornerRadius CornerRadius + { + get { return (CornerRadius)GetValue(CornerRadiusProperty); } + set { SetValue(CornerRadiusProperty, value); } + } + public static readonly DependencyProperty CornerRadiusProperty = + DependencyProperty.Register("CornerRadius", typeof(CornerRadius), typeof(InputBox)); + + /// + /// 图标 + /// + public IconTypes Icon + { + get { return (IconTypes)GetValue(IconProperty); } + set { SetValue(IconProperty, value); } + } + public static readonly DependencyProperty IconProperty = + DependencyProperty.Register("Icon", typeof(IconTypes), typeof(InputBox), new PropertyMetadata(IconTypes.None)); + + public Thickness BoxPadding { get { return (Thickness)GetValue(BoxPaddingProperty); } set { SetValue(BoxPaddingProperty, value); } } + public static readonly DependencyProperty BoxPaddingProperty = DependencyProperty.Register("BoxPadding", typeof(Thickness), typeof(InputBox)); + + public string Title { get { return (string)GetValue(TitleProperty); } set { SetValue(TitleProperty, value); } } + public static readonly DependencyProperty TitleProperty = DependencyProperty.Register("Title", typeof(string), typeof(InputBox)); + + public Thickness TitleMargin { get { return (Thickness)GetValue(TitleMarginProperty); } set { SetValue(TitleMarginProperty, value); } } + public static readonly DependencyProperty TitleMarginProperty = DependencyProperty.Register("TitleMargin", typeof(Thickness), typeof(InputBox)); + + public Thickness IconMargin { get { return (Thickness)GetValue(IconMarginProperty); } set { SetValue(IconMarginProperty, value); } } + public static readonly DependencyProperty IconMarginProperty = DependencyProperty.Register("IconMargin", typeof(Thickness), typeof(InputBox)); + + public SolidColorBrush IconColor { get { return (SolidColorBrush)GetValue(IconColorProperty); } set { SetValue(IconColorProperty, value); } } + public static readonly DependencyProperty IconColorProperty = DependencyProperty.Register("IconColor", typeof(SolidColorBrush), typeof(InputBox)); + + public SolidColorBrush TitleColor { get { return (SolidColorBrush)GetValue(TitleColorProperty); } set { SetValue(TitleColorProperty, value); } } + public static readonly DependencyProperty TitleColorProperty = DependencyProperty.Register("TitleColor", typeof(SolidColorBrush), typeof(InputBox)); + + public double IconSize { get { return (double)GetValue(IconSizeProperty); } set { SetValue(IconSizeProperty, value); } } + public static readonly DependencyProperty IconSizeProperty = DependencyProperty.Register("IconSize", typeof(double), typeof(InputBox)); + + public double TitleSize { get { return (double)GetValue(TitleSizeProperty); } set { SetValue(TitleSizeProperty, value); } } + public static readonly DependencyProperty TitleSizeProperty = DependencyProperty.Register("TitleSize", typeof(double), typeof(InputBox)); public string Error { get { return (string)GetValue(ErrorProperty); } set { SetValue(ErrorProperty, value); } } public static readonly DependencyProperty ErrorProperty = DependencyProperty.Register("Error", typeof(string), typeof(InputBox)); + public bool IsError { get { return (bool)GetValue(IsErrorProperty); } set { SetValue(IsErrorProperty, value); } } + public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register("IsError", typeof(bool), typeof(InputBox)); public bool IsShowError { get { return (bool)GetValue(IsShowErrorProperty); } set { SetValue(IsShowErrorProperty, value); } } public static readonly DependencyProperty IsShowErrorProperty = DependencyProperty.Register("IsShowError", typeof(bool), typeof(InputBox)); diff --git a/UI/Controls/Navigation/Models/NavigationItemModel.cs b/UI/Controls/Navigation/Models/NavigationItemModel.cs index 0124a37..6bd3cc8 100644 --- a/UI/Controls/Navigation/Models/NavigationItemModel.cs +++ b/UI/Controls/Navigation/Models/NavigationItemModel.cs @@ -11,7 +11,34 @@ namespace UI.Controls.Navigation.Models { public int ID { get; set; } public string Title { get; set; } - public IconTypes Icon { get; set; } + /// + /// 未选择时默认图标 + /// + public IconTypes UnSelectedIcon { get; set; } + + private IconTypes SelectedIcon_ = IconTypes.None; + /// + /// 选中后图标 + /// + public IconTypes SelectedIcon + { + get + { + + if (SelectedIcon_ == IconTypes.None) + { + return UnSelectedIcon; + } + else + { + return SelectedIcon_; + } + } + set + { + SelectedIcon_ = value; + } + } public ColorTypes IconColor { get; set; } public string BadgeText { get; set; } public string Uri { get; set; } diff --git a/UI/Controls/Navigation/Navigation.cs b/UI/Controls/Navigation/Navigation.cs index c18f821..aaeba99 100644 --- a/UI/Controls/Navigation/Navigation.cs +++ b/UI/Controls/Navigation/Navigation.cs @@ -238,11 +238,24 @@ namespace UI.Controls.Navigation { DefaultStyleKey = typeof(Navigation); ItemsDictionary = new Dictionary(); + Loaded += Navigation_Loaded; + } + + private void Navigation_Loaded(object sender, RoutedEventArgs e) + { + ScrollToActive(); } #region create animation private void CreateAnimations() { + if (ActiveBlock != null) + { + var tfg = new TransformGroup(); + tfg.Children.Add(new TranslateTransform() { X = 0, Y = 0 }); + tfg.Children.Add(new ScaleTransform() { ScaleX = 0, ScaleY = 0 }); + ActiveBlock.RenderTransform = tfg; + } storyboard = new Storyboard(); scrollAnimation = new DoubleAnimation(); stretchAnimation = new DoubleAnimation(); @@ -290,8 +303,9 @@ namespace UI.Controls.Navigation { var item = ritem as NavigationItemModel; var id = item.ID; - ItemsDictionary[id].Icon = item.Icon; + ItemsDictionary[id].Icon = item.UnSelectedIcon; ItemsDictionary[id].Title = item.Title; + ItemsDictionary[id].SelectedIcon = item.SelectedIcon; } } @@ -323,7 +337,8 @@ namespace UI.Controls.Navigation item.ID = id; navItem.ID = id; navItem.Title = item.Title; - navItem.Icon = item.Icon; + navItem.Icon = item.UnSelectedIcon; + navItem.SelectedIcon = item.SelectedIcon; navItem.IconColor = item.IconColor; navItem.BadgeText = item.BadgeText; navItem.Uri = item.Uri; @@ -387,15 +402,28 @@ namespace UI.Controls.Navigation { AddItem(item); } - Loaded += (e, c) => - { - ScrollToActive(); - }; } + + UpdateActiveLocation(); } #endregion + private void UpdateActiveLocation() + { + if (SelectedItem == null || !IsLoaded) + { + return; + } + var item = ItemsDictionary[SelectedItem.ID]; + item.Loaded += (e, c) => + { + ScrollToActive(0); + }; + - private void ScrollToActive() + + + } + private void ScrollToActive(double animationDuration = 0.35) { // 获取选中项 if (SelectedItem == null) @@ -405,6 +433,9 @@ namespace UI.Controls.Navigation var item = ItemsDictionary[SelectedItem.ID]; item.IsSelected = true; + scrollAnimation.Duration = new Duration(TimeSpan.FromSeconds(animationDuration)); + stretchAnimation.Duration = new Duration(TimeSpan.FromSeconds(animationDuration)); + // 选中项的坐标 Point relativePoint = item.TransformToAncestor(this).Transform(new Point(0, 0)); @@ -435,7 +466,7 @@ namespace UI.Controls.Navigation ActiveBlock.RenderTransform = transformGroup; } - + storyboard.Begin(); } } diff --git a/UI/Controls/Navigation/NavigationItem.cs b/UI/Controls/Navigation/NavigationItem.cs index 37e00af..fed99a0 100644 --- a/UI/Controls/Navigation/NavigationItem.cs +++ b/UI/Controls/Navigation/NavigationItem.cs @@ -51,6 +51,16 @@ namespace UI.Controls.Navigation DependencyProperty.Register("Icon", typeof(IconTypes), typeof(NavigationItem), new PropertyMetadata(IconTypes.None)); + + public IconTypes SelectedIcon + { + get { return (IconTypes)GetValue(SelectedIconIconProperty); } + set { SetValue(SelectedIconIconProperty, value); } + } + public static readonly DependencyProperty SelectedIconIconProperty = + DependencyProperty.Register("SelectedIconIcon", + typeof(IconTypes), + typeof(NavigationItem), new PropertyMetadata(IconTypes.None)); public ColorTypes IconColor { get { return (ColorTypes)GetValue(IconColorProperty); } diff --git a/UI/Controls/SettingPanel/SettingPanel.cs b/UI/Controls/SettingPanel/SettingPanel.cs index af144cc..d3c2e71 100644 --- a/UI/Controls/SettingPanel/SettingPanel.cs +++ b/UI/Controls/SettingPanel/SettingPanel.cs @@ -32,6 +32,9 @@ namespace UI.Controls.SettingPanel public object Data { get { return (object)GetValue(DataProperty); } set { SetValue(DataProperty, value); } } public static readonly DependencyProperty DataProperty = DependencyProperty.Register("Data", typeof(object), typeof(SettingPanel), new PropertyMetadata(new PropertyChangedCallback(OnDataChanged))); + public SolidColorBrush SpliteLineBrush { get { return (SolidColorBrush)GetValue(SpliteLineBrushProperty); } set { SetValue(SpliteLineBrushProperty, value); } } + public static readonly DependencyProperty SpliteLineBrushProperty = DependencyProperty.Register("SpliteLineBrush", typeof(SolidColorBrush), typeof(SettingPanel)); + private static void OnDataChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) { var control = d as SettingPanel; @@ -277,7 +280,7 @@ namespace UI.Controls.SettingPanel // 添加分割线 var spliteLine = new Border(); spliteLine.Height = 1; - spliteLine.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#ededed")); + spliteLine.Background = SpliteLineBrush; itemContainer.Children.Add(spliteLine); } } diff --git a/UI/Controls/Tabbar/Tabbar.cs b/UI/Controls/Tabbar/Tabbar.cs index c95ef00..89b96ed 100644 --- a/UI/Controls/Tabbar/Tabbar.cs +++ b/UI/Controls/Tabbar/Tabbar.cs @@ -73,7 +73,7 @@ namespace UI.Controls.Tabbar ItemsDictionary = new List(); } - + public override void OnApplyTemplate() { @@ -158,8 +158,8 @@ namespace UI.Controls.Tabbar { storyboard = new Storyboard(); scrollAnimation = new DoubleAnimation(); - //scrollAnimation.EasingFunction = new BackEase() { EasingMode = EasingMode.EaseInOut}; - scrollAnimation.Duration = new Duration(TimeSpan.FromSeconds(0.15)); + scrollAnimation.EasingFunction = new BackEase() { EasingMode = EasingMode.EaseOut, Amplitude = .8 }; + scrollAnimation.Duration = new Duration(TimeSpan.FromSeconds(0.38)); Storyboard.SetTarget(scrollAnimation, ActiveBlock); Storyboard.SetTargetProperty(scrollAnimation, new PropertyPath("RenderTransform.Children[0].X")); @@ -205,8 +205,8 @@ namespace UI.Controls.Tabbar scrollX = scrollX < 0 ? 0 : scrollX; scrollAnimation.To = scrollX; - - + + diff --git a/UI/MainWindow.xaml b/UI/MainWindow.xaml index b899787..11a5373 100644 --- a/UI/MainWindow.xaml +++ b/UI/MainWindow.xaml @@ -43,7 +43,7 @@ - + -a>q&svg6_Fb6=>PeBe-rI!`}9mMz= ziHuP21(THQ%Fj=|YxD{6L48=8_u5t-4`HO~ut($(-4kMVBqYH|=v(ob7PFo$3(5V_ zC$t%?Zsn}0T67X9OH4u&Kr4~GzwvFfnfxq4C-AAJh}olS^zmc=+pF6WxgPM!@OIP@ zb*vY+iQ90uHXkS&9Hf-QLqmuN!M8^@q8m94_#%-c{WOQv6h|Uv4sp9nK+s8EuY?K_ zb>q`t{p-#SMA!J$r~CH*eSBa1=@<%|c6y(3I|v#yhQ=0c0gY$lyw*9qb-0`pSvD0E z4fL*fK!ak+0)<6q14P`DQ;*@@A6(OeOi}O3V>jPS21d#eGl)-_9R*p@9hR2HV%p0r zNR_|KQqmEsn+-V2%9~0Xo72U8Sp^R0N6%IOER=ZR5g{w!Fk7k{+w-#u^2}+e^1~_q zjBKR1c-Yxe?rdwWPB%LO7#JbUl1$H-E+U?i&nx%1$`FCE2%bVKst}O`Oqm;S!}N@^ zrn_+L6wA$X&|aV?FM6jt&tnzW<@E*%yF*S#p8SE{QrKPN)Hl+v{9iV@P=gENdUt1e zpu;Mz&vUqHdI|#FdGddu6qScp`?(g>6iFYytmPIu76z^)ET*jBK&~(n0SOG^l*}kn zMCfk;^0NLxv##y68-{vvu5hi~dSma!FZN)HAE~*6y@oZ7?Yv1B|3S+yQE)cQtEy|i zsK0P%{=--ljWfj)4+Gye&YZY_X-Mlsn~POSBuX`-+w{y>&|fG$0&Nj!2=oX{2G#CB z7;$t*wkPv*eavp2^|f7V-S=eAJa1KX_ue2`-}n7Y+=!oz%9X4R^~&daqn-J%cEdV$W04Cg_DYz&{r_oO;;HKnkts1t`-re8KQ%(fHtEhzij# za{NFu@yCC0OD0(>68L?wsi>u#0WcV1WSjFi8ay0=G zKiooA4z4P9PLPlozN+&{Z$i zj!KQsfX)@jA{~-L8n0pDm%u|MoICWRC1{9Zf}pIfT1LtYp1d970r?r(zksw_MFM^E?pekgZsoC{25k} zn=5~Wo0F1~Be(qRZ=Xbdp>O-!*bhxgAJ0%j1X@@EYf#2mI@WN{B6SV?;O z2oa%2SU$@?LdCPW`;2qg%mgRz6}z|D_8{Yeh`r~w!5-)&yjpiKZxcO{D7a~~T;A!yg#~~{?&I2$(_;VU!3HZ&PKCXXg z>^uW@1&-@u%Ay=WXDtsi+)VtzS;`e3B46C;g_C#!E)uvJyQW;=Q@f!FT_LQ-n>ZB# zQ~D`d(W%tL7f~CvYVDLj3>uNW_vuS0GU_?W48z>1kujoEt+VVv^hSY*4TX@t@~!6% z2fWKJ9aoA@CqSYj;{idGm>ba-r(kb6gcb6i@`U9?O?>e;5;*+CiQQNTf4L5i2RWsAv=g zssXWZpe)sA(Na-@X#fbt`sX71s`|gB&Y|l!QJdoqG3p0 zDX$!YO2II(JIYV9Zw|?0CgYjUaErQs8Xk0*0I;Pnno3bF`T0^|aFUt`BMR(kHl9#C zLQg~_ZI6RG_6p9kjYB8M8;`E={cA`T7ulx382pa&&t%1(MH&%O`T%(F__Oe;rd}qB ze>|8ZdJc;ay-9So;>L)+NwMlBZY?)NZPXlxk&4C?fE^Th>zz9jfJu{rslpdfv2dR-g#Z}AO9UY^L;X$v ze)a(IXFc09Rh>pby`n;b+viQv3GhZ1jwU%WlxrAqoDUuA3p>KI71BBC~7q;g+<;&Q<6zH`ThEhqclUw2KHVE3ngB8JNGW1KcYD z3v(O@F>bF))~ge$QffRg|17L^xGa%D0hKt;yJ0s5-z0oLJw{jVrmYxPwo#S(aox-=F^rHxt z6a$`I_R*)vTn&Z@ZzN(6Ob8i;DLOvbP!JUbV?Q3^MaRv>@HB~3ki2PY^%JJPjy&rhd6{?K7eMiiK5vq=ath;D>J>mRC`K%!{7yVH2yS8YSs=m zCGC&57dOH_q1tgxQvLjOGnC13MLSPAy+3nhi#Bi6B8WFu$8U1{AsR~oaE8wwBFkv@ z#C)+(p$^Aog=bSG#b+Ih02cli4Jzr9^Z=_-Km|UxXqTp-@+Gyog0>724a2#+TBOk! zlfGckNH|>W&uQAegwcmMm@2WH)Z*nz>+K$jCF z^qEcpH-v;i(CC7N%voqXObz@xW%a0c#jG06UP76|5hx};pU4x@Tq$;I`8lTl*=Bu% zx*|;QxaB#r40|I@>SRpIP~x;^=a=y~t+A6h64voxxCqhu_F3mH#c54)Mivh#iK>Y7 z(dHgm!IIxDWzi}nm<4tUU&3#+RWUVf)rn}ZxGl(u%f(U#3?C+q3X=#aVCVp<$UB#W zUZU_}^gAC)Jo~T$;sDhMUjy#ZtxZmOZ9j}sBP0TQwz(hgt`HZ)ajpszocopcibc!lL!2u)^*NxYL zGWi%78#MB-Tl+Z#v!(~y$6d;YQ5yP zLAF-Dt6^P#X-&mCZy|w8@jdpJq0z%x7I8=PZktb-m>*-@f^t~6h$RAP;|j${CQ&;C zT)ctQ6)?zyrjcO3rlL|rE?^tU$gc*`Swf2JfslnxRZD`J0uaMLbqpb=W*rohB*vls zrDq_1GUme|5ZCyTBDZEUSQXF~PvrpqnN}_#C6k)38vAa z!X$&J_q8plag-Jo<>h#qn_7Ky_bjQ5lef1^A)V;y^_87JuR5=yZLsfOhl__6&G$C% z*|NsX3Zn^z1o6|i=*^RY7?N_6ytX30H!D6X&zxnm zq$Q^0r)9d``UHa^C)eUkO>`tCl~;HZk`h^6MRvWz>UD?OXEtXhCX4x<-uQe^Zl2lN zJF{Zum4g)thP0+ROUtwCtfn-ND@C7`o2B>9?<`|1?-#yBwW+T3_$0F>F3D=myt1QB zmzV))UlcVd(g>#O`f66au-QAj)m{rkVTQtL$Zp^E$O3e1;7z)}JhvZ+2^4PAZ z_-1t_ozoZMoY-fp3S_UE-G1qCkKODtmoGt{$yA3mF*n7MmX?vO(=(mB)t!=(n39r_ z7%%D)({s~Acfez?c+F0S&0gxxF(>Fl7uF28w#O!oSijKu6C5aie9rG)U$;MYw&pXza<;#dqh)+v0C8TArBS|?0bNrbVRaNpW z)<@7|4mJxKgNs{0ZO4S@B!H zJ}@;3z!C~$Y`S>s=ue{;Q-rX_t44n!-m(?Zz9{B9`Uhi1F|E6Vx!fX0QLk_?20)>p zJU1y(0K!!s5Y7}h*1$s($gdzr0VEeA1qJ6*eB-xgf_Vi-o3Lg8+l*u2y@|lMfbkRd zmEd_bz686Z?IRk905idJvRwpP(zM(pvLqG^uw3g|AT}wif&Q?>efl`_0(T9tEN_fx z*DzZ_ZOt-D#>av4i{WcW`EjTj6KofH;vYOC*~&c@i-(N5_?F#0<%CYVf^B{V?vy9p zk&$1nyFSZXVUvGhtMFxJ`YLR!%2wgcVsFxZNSIf=X(u@V*DTHxL#klyLYq7_>_Kp&7L{0p%tl|gl&XE835o}F9=?akU&D}=U~ zVJO3dLZ`MvHPBJ(05)0uoTdIcQJ7?3tn>nLtmp|+$tmJYa?0QyFChD<>S(QjZABy$ z2FffTECM|ZgdPI^CA}RQPI#Q7S~55d5z3~eWZ~ErfgM!Zp$sN&Aw{qc%|2L8ZoEWj zJJZ3gO{qwC)LSbD0{4#TOi9(%1$L{oJfo^9*j3e7b#HD#$Yw3e&M3~c7Fz82sTtWR z$SUm44tTQ4bFzv(Spl!F(s(p6vm?QlA@7zuI+D!!=DdoMk{nxBmbu4OU0c>v>X9wZ z5?gXyVoyp+mLokgK^NA=Tg=vsoSBL72?*BgFNH%$DcXx3Fbd;ig;7>V3Vk)vOHe1H zgZNkNClmS!H0*dkfm;0kxt~n`S9KJh8<^L8PP!p~z67&;JRL6P1oBnWoJaw61|k_Q zA4(8gJ`v!Kj~Rk%{79KWgqXOw2O%)ffh6bPrfD3P=|7g_SII6T(6y%7QCm~zNGb8R z7M6Ag^9a1^MiRH^T*0oQf|-6_nC^@2raSHY&SHOiK}mOY9*3I(v7C9q?$SWJzl7gP z!X;5ydjGag3@9D6@49HvmYiZj>(Vo3^bb|iBP?82wWV}Hcbyqt2)K)RX70LByUlEA znl)5GG7Nf0D4=&BorhH!kMopv$?}q3XG=yY|{^MbGM);o$}wlV2)n%hplcnzCkpYMQsMATXmaQ~r3b zuIZ}6nN@k{+TuqWT547lRb5j5_THVj#m@AmfE$h;hHV+<$e*&j{xY{N+gqJm=FW)B z$SrPgy`Gs?RFRZEx7=M{oU31bp6)VvYeQ4z{0r*!M!o#=xJv&~SA9`#L3mEU(;jl! zD_gztvr8|`E@>?)>nOJybDLZJp3QdKo3~V_>k_lP_Tu84qPhoi%gm7vUF899CSI4} zE<=b$l#*tdRqApShjNSSF(w#sh~HiW-C$Cz5=;Svv;rZjgD|ycL#y02coUPZVC$cN zRf>1Rzmu08urwG{Jj?zLjPSnxeUKf9APY+yH#spO5~Dc69&DALI$^Qs>ez$PH{>C4 ztvnPy0cRqMu3jFBzQG>EAd-Gjf2qEbpbqRILSk5~h#b;aM*rhuD&L^T^+_-v{3-+S zLSzl!s<6of3K9Zx6r*hQ0(f`K8}P;o5+Xo_M*+@tx^0G?C{%#e2G8UrA~zb+gdL4; z6R$aH*g2l~4cJ^DOmd$CZldA5FvK#q;EV{KG+mfL5uz96&kE zMdb)QAR0_7Q5{NdIKhRf*97UAhC!h;vM`*cmciee<j0%rgo3&#lrWym@bZS_S)b6$dO)pPk@_P$6VJ3#{I z6GLZ@$lxt1@_xyP3}?Hwv0PrBlKkgCC#U2mglzp^?>F0$Gp#uphQS9jG9DZ>WaL;g zlWk^Pu!R!xzx17Z+3O_UE`zd{kb*#*7?w^PyfX-s0e8ZB5}aQMU-6V!8bwZ~TM)j* zCtu7?(X^$-X51J(K^G27>@YiZT0$9^Z(Lu%%Oc71L}|P*9~b^lDN(nP3=I(5SCQk# z7CZK#VXrj0vtnEp4;-e-B}kH#54)$fsqdJ&&ZpXGSP*g+abS7)*|XO~>fA=5Z?<)6 zTRE(eqKbay%7^A|*f4kfdj1<*-{>h|h=@QY8WT^W6#0BjXhHNWCx1_C&!ZIL3o!<& z9e`qqjK0SR5X@2p;UsOrF&B_Sfr!h*?~yXm@Z{JTy(!vf5b9Q4-8=en@71g7Olw~r z4dxWpx|rasE6UXeBX^n8#gDO{V+g(ioz+^pi|#jC5#&F2^l?{hQ4Xj)=PR!i%=X|( zbTbGX3zz3>JUT^MR$Q`%RuEc~7d!-V5vk1* zm>w(&+69Ut1yur4J2oR*VNC2Oy?|GRomam5i%0hKObZG%zh}=Qzj*J8$bIcG;h-i3 ziULIhA_-MKvp2o{$kVU>nHg`H9{=eUdGyb(K7FL!xRIhi{qordDf-ic&;Ihm-7%4& zl(~SVh}A^-%D7b@F(rhZzBmUf7A&L*_=P+HCd=y^VK@K9Sy!V-(h!mIN-g38XV8@K zpmtv-V<_p0@>)HloFb~9el}uEh`(xq+;F4fYjt)Gi}SLY92MNE=35)XFd_CqEH`xy z{tG5~0YwGTM9Eg5-ZFm)E^7xdNUoWm1 zpkXabIOw^xg*X zuCmHeMlm|(_Sq+5bR;^v`})N>lY(^Q`2EGO1VkT5m~#XNw3x~Q;jZa_6k(X*G=0g- zid313(h%BL9O(thHbAJ2qc=fDnE;hIOU`sU+@mP_arq3t&A@L&6$B6cjN5Tdwo%aH z^VIPXnhAQeAM0WPq<@Nq;d>6oH=V@!eSM#Cb z=hbUQI-m=@04fAuIu1a(sDNv=V4U;Ned-J7ITE{4pdbFc646Vsd*rq;Q+*sQF$Y`*3ws3N7m>DCk%g(zfJdMGjZ$Rxc2$k)$zYLl($%s8}LP z^r1KMFZSt;(cE=bx9$hZNz75q36L%~hBN{yofP(P9ZUn*@>Xxp@;8N?gk|Jx~BQ=##ApH!^kgqa%5o_ui@+Bt6IkW;GgC5ceqj%p8AVMY)7=ZT;cWL)( zY$5C&$Dh}0dt>jRr2Q&a+wDq-hr7QCny)=1Z+1PjNmMuvn3hiRwBg7-?Q$IjjHZON5WXmw-BM z9;F=t%N4ik1x3>5Jg;D2n(s@!ugOXU&!V6 zm_r1^37m3}N^=SOG{@*mbBx1tfZ*ELW86pgyA{uzDf4au4-jZ4r4f~5!9JgM)c+hj zVg8}DI0ph+fmdi5<`BAyMhFuMr>WUE1o*;@xXwR(=28$gnt^mc-9`I!FWscPh+v)( zU;5B$hGtdLO_k&`nmNR_;Ct>s=1cCc^>6NrNm|-FDdhRUv=pXM zLGz;4wt950HnYUObLJ}@=g zMn@#qF7`b>c6bPD#L79amBN+6^>`bB7h*)3A=DuirV&oYV7e%q0!fBcQ&^Zgff1|r zqbjf~;wDF$dIco%;I zEBECVCe|Ok`x`fI$`9Xp|FN&{yEUh+r>~>doR(bNv9KiDZ%+4l5XHrzZ;7UrE-p9t zLSeV(yvnZq>zX}{bBg6}>8B0mv_K1Fi>DWcADZvHVEfLst-(Ui@=LaEyJF3p*@=a@ z<@>&V?EX8$`I~P1#@z=WK-3qHFWv0VE?L-7oSbH^o!Q^hnp^0Ix^+UqEPv_d&FkGB zSIfHnT{ZJsDzjnXIn`zVNzI%?+ww71d}+ys1(Ca9S4XkBc`jhnWS^wzHY`e(tH}l{ zdWRHQrJ>U=vRE;M70K5pL%_@VlDO>4nx~AORHRQSkUo(-C(Q9cIJ_zQ z=tL+eCkbZWA$d&sP=NiwYKwBq5*)}KRvRGZSXdqbsKeU0(F6b|kFceQ2_mNGt~b&_0uu#=1&ba18c*0hdQ$d* zQ;W03kKF@$(5DzD$39AnKO_AOPHPd!|BRDOK$q907Uf1Blzs5&mYR@R2rk|}RG)me z31)-NNWscKR}50cUWOQWg9Rg%t!PY<+k@3$j492s*+ejyyA5HB01lAPz=Mn<3=Q+^fOoFKMC95qZjB` z(o5rcHI}ihlv3k)XCOWy+Iwxj_++MTb@Z38a@-RAZ%MqB-#;qQM#sBFF}J1{pv(9# z_p zCxlD0LX*!yVxMJ_0=*md-Lr7U=1W!=MGxET&7s_ukd0j}vS?mFEXZdPSsY*nWyR|u-bVa9WLJaK2Z}!0H3v-_e2&QPlC3G8`m|_! zvd^LO=H+@CQpIPJBkOco(cZ|1`js!%zsQ>B51m5xD^PUmju@XmBUQc>IVD|&-Fdk< zV26^u&e1)2@RhsXuu0w$Nm+gQYJJ53Jve}P>?f5yf)>e4q6KkQI+~(qDzS<+S{QUJ z#c?6|h9PDPS~ycT1xo6s5ClYZ5T^i26O=EfW;q-LC{Ry?$AO+|TB2F|soUt+iP2Jc zVwKe8i=P0%#78%7f~ZOJ#p&@MrPCz0K7+C2v>5lHr~-!xq^Gz*VEq9W@Dxq@U?$HS z%6*W?Tql#86%zbcn{0`pW=Ym!It+C&C0d@I?mIRq__fjBJQON$OoSWKh(-;`t6Tj> z6vs-3Zt+dZO3o99Ps%ku`@l;(mi=%o8&Bz`QM!{O22rtSw?*agf{@L_cZ5Sfn9YtS zld)rJk~^hh^#)pAZ-{9#(e_j0IUy1f&wM_;np%gr{M8TrHhPWH3)5qvPOqnyt^F*S z(~-_v>6V05-(Rxh=LcsiFV{Lz+fM0B3^{0Sd^nDGA(~wk^i&O?ZQ3yY6l0kpAq^qM z&nmR#_nBcVO`NsX^hi^se&6JL#<`CsbYBK6l9Pt*Ptyi>jU)Vd^jbPXH0=kQiHQzeGXA`0T zk%yB@@CpTpPFsN)Ng^1KnyM!gWJjEFc4vcwCNiBHPH9385{&6l<4F!pa48Zf5Rl%p zlw>nNDrEA-J3u$piHW3VBtw#=4cX*f1o;e(NZdeUOS29`3wS!oj!R%vEA%h*Heff_ z-DyFOKN3#h8TB!uSykEC=gD)>;)$sFT(^l*`8I|qB?5ISp=!VYQ8-2!Ed<@EC>F4x z_VAA)gu$+wun_T$1-dXwKj^gynlhHY1Z^p3v}WviMQ^Xb7|L@3TKnt~PFOW36Djf+ zNCP4RKR1?%*yN0Eah6e79G7^#t0b$yuEfxJM;=8G9>^_u5FW@KDa#ifjsBp_DPHe1 z+Y7QvT+uBq3Yf!$PlUgjQcWoY2^EdJ8YYKiHra@sV@h?^_7oQM*vB^KIcazP4E+su z2m3)`Pp!*g*WZxW7eMYj*Nm~v_8!bk#Yde+Uy;S-LN2`&Wn;7u{tb~%FiGjlCne1W z!$0Z84zD}RGvXm=kNAl(^tJ>aW30%3&YNA2f>9o3iS`OoK#{is7RKU#!l6B8Z76G* z_Yb;7VHLGjLda^>Z(&Kp`CIk5fxW$H>Z z9gCcdgf+@e7x3ZsArur0u(WiGB^`yI9?^v(BOtGhz4BjijIgj$WAk|^Xv4tl=z~h^ zOun2YMaPQx2#}>EK_A1jETVDnbeoW&!KQ@b)ljem{_|BMCh#QdBzU8_#RYE*z95tV zPq6NEAP;)bGc8(zQHq>&hO!ViM#*BR23y%81c-%8d5ZHBBxoj+4FF|y=p@|CHCyAW7afZUsYHNR^d1U0 z=O-z^g|Z@5-S_W zVW0Fhqnz}|s^a=IbOh-UP__oU$c{#hc|gm6;1_K<{Gu(<3PCu#VKo9wOy2NU@--{b z1z>P`ud=Hs@RWTl286J%W(hP0OHQVJRd@-+8|_&h8o0VVkRGg zgChzUYJu=o!=jIx;~O3sp>}>IjI3BOc5Qr9aJVBiwPQHg6wl6V8X6AYHjf?aNR@Cw zmXu?8Xn1JTyxVx%W>DED;fgpcBkBk>8?#6Vqd=55@3t`RQ=egHlrkgF(4*n`%F$N5 z3neQuQw1j1!gAmy;i&L^w3grz7(*Tmo1$6plvMg`oGt@LLEa%e`~;fDorJj+6lC(5 zWw3;z+ZE}P!vHmIC`CuCHGe{J_K$Jnr#UetT3j}n*i8*&6>+uL?S&;Ng+u+7rM=5m zE%Qm&l<&Ur=B-P!s#XPq+poU5zTv>3{T1f?iq>{ZwqIAnBVG7r^mNWht31D|WY2*E zn>tH+mabgpZM&wu{hBuKvXx7FN~9SF@4Rzn{o&iLSHfXjf7{`D93eOc!eNwMciUl@ zgqs95z0yVR&yS{SSslI-cxW{cO6ZM-hEq-k!IPO6yIT<*y-!IRimH!B#Q ztjqIfCnV;Tdy;%v)>5Chv9)BPNb(Bj16qmM$A(B#J&!0czk z2r+@HSQA91lRk(DcDk9?Ce}aS(y<;eT%!4Y5+D&19#K32fpCF*Jpp;Khhuy=E+8E+ z_eM}^MR3q zcxTEx2+@#ZszT16^IfP32k`<73-AF0HKjfDUMJZGO>Y7$QczkGfuLsRUS;@HU@SlyPfehegu44g`{O4m-e4WBl@Q@T*po)Jo-h-il zf;_x65%eL(2cK-N7pj_dD2#~HiZOivnCGe-aQGJPXrcH~FnHY{K8U%xW(Ly*E%>8Q zrkSKpHM@C`4=4`G5odv$P>`tk3$2SqVP2=z?rEA=PC6I6wQKIU=lw`QU0p$8ZJnGW zwo9^|jy~CQaL@OpgVNs%>O8G^a=y{w%=TN;opG1Srwrralp8ly%6*E;?6jT+IqZ zUej~^=H>3o3$MEM`0$d4ZoR7Ta`*Dh*PZz}r_+h<)^iK6*vF)^zVnOnwChO)tyQ0I z(aF6Rv^LD!x1_3S$-a3Ftrzqb=!x8**Ww>t&XKs0%g(bQJ3kK+a<1u$=Q>lG_dGK@ zW~~x;FqK3PMBzfd6%WO-dN3tgCn?h@R80!wCT}sCqd1|!FCUN(_zQ}sEFbNm>4&y}oc@AR}nA2mM)vkYi*QMummXY`o^fhtHQfuYUTn+QlvTTGG$_mc_Mg zmxSE)wx$g?&Y5%Lh9+$*R@bcb%Lmye|H_)$RXs%>e2RKj)$&qNex~v!`A;aH?Qd;4 z|KSg>+4|-)Un|OAv1ww{1K_2#IkV7qyj{8CBZJKgo!l*)4+2A_@H(0dmphi*b)B49A7qE zs((t7pMQ!i9g;6=iTu1moAk2jg@}DPbZk|Oc2ckkJCjHw|qjMHDx zD}o9e<5qM;iXt3X%B%AF*IdQL4tY&#n)6X-agp<0G3+SLC`@@I#XNT9!9xf2Upw@I zyya)!F7MCS4F-jT1^El&67!wdK-!;~5kOI^f8lVjyHWy~#V85|wK&pJ9!&{EpFMc! z5WDx#&*Up#@OFD&U^jvo#)BAd3G(`F!p&%JMtZh~ViBf;iA6XjuE8huqRB$h+Bkm( zKRkb+%n*n%v_i8B)3DwX7o|^PfHHDT61hdj_+o2Iv&rNl;_AIPPFUZI$ zc4e@C@pY_fUU|XhV70ZywQ|P+efUjz)lY_BJn_4W-)DC{chQgk{dIPJMMXkVf~z_l zt~1N$C6|`E3+iWNWM((Fg@dj#S4#8Tq4^z_imlr&%C~w`?FG3-H3;rhx9Eb^b1nW} zziZySj*P4%UCE5%1q+wgRIDDJWs6Tt%JInw7ys_Wi^D%*N8Y@Jxvy{E6Mjx!3s^NF zAJu4m#oAv`D1OX1{s*2*{X^7fmBv=KocaeHPX0HLz5))y(*TTBl%||S(c!pQ7-u!1 zs84GMY;DVet8RO0^tHeuxr!}YN5pyVz|KlH&83kED%od4n;K) zDHKNtmx^U1NE7;KZvVuQ4tiA}FAiG9{8!MOwiq!Pql9)D@I~X$yf|>P+3>00JIu95#BOA9H%UX$(y@s-U^ zN*vuZET*&a?d=`ghC@{q!*-XuuD{q{Us;mNeC_PW5pk>7C7u{MEe(mUM_(E!8wi&s zurB74P3F4(rPbnvL+nZ%-83XxDyl-m+dA8}qm=%_;{G~!rnf9tKG{CKU402u`61p^i1@7^7R8s z=jcKh3Z-xKGdp>2L{AN|D{%J4Au+vTdz;!Txn3+=logU>gMl9(NlrtTb1@r1Ty0Dz>{iv7 znVKmh7ceSzn4-r%*jUhBVYO9u6g`xPR9m5?fwaonP)1FEMb_}$zWRd9>+_H*KFko$ zOmuH-YgtrhwKt#NQNO}2@|5H=k#sQ7Tw2;$k)!Lb>Z{DjF7K)GcR4(>i&|HAc>TSX zbmzA_95W+Ni@zL-ye=;o(*Jj`KDz`_U)m|?hoiPI*Y8=Cl#v?mY#0c_<;-TUY{_rT zL~OkRcSX=LsM{oOozWPazoE8i^U{W@s=v+;w3b`TyB8M)`Wt=Dn%-{~w4GO4I?(L3 zXAfsv%I9rt>e#ZVDkW`YR?cXn_&VOozB?ok%*2cU42tLaW*0QgjnFI!4325s+;c)A zP8Lqwc96Q?6l*_7qFVeD9Ka96*OZIiKu|DH??R#&0)$4%krxeeTS0qQA+(83slYX1 zFbH3-=L!Mj{;`dB2g22}BBtlK@Z^rwN9u9Q>gzGVllEG90X%0AL)&K_%6mLWCou z3?Kl7&%yd3uQ3sJX9%5OG5hoqJ63aH&AgW`oAb5Z>-!1^=ZFiVvsZ2iF4=R><12PP z`^{Sh@IEfzXIEn&aqry0qP`2HTV`MS@|@_mpAsKiDc`W-@w=trs+pJHF~E*dEqTW9 z`~JV;zB*2hYTb6WZ`|D)f)kSIlCCPeqziXrXM=WZ%3t(HG;o?4x#sQA9R z!-`FrDnimbx^1}1lcwv=-{0j*;zz%s+-B-j`epSTk6)|L)mj}bm$mYv!F<=fymctO zymh7-U*6i*(v|6gw=Um5u8ovnO*c5^jw z)G-$$RhO!j++U}NaB7u`-8U$r)6>8i-qcEG0bBhb+)UL|e{B_}R9DSW2P+XB?9E{I z_}AN6hp)79+@#pAJP6^8@G~1-J6x%Mg&}Ht6&Tf17g==`JEe2vO!0B927PibcW^_9 zT2%Pk^enkr0<9{gH^R`+QULtiR`o--o(5RG25B%Ct&UKA{`KvpNXQB6@Y`d_^Lv~jCdpI`K+ zh$)&LbU(zO@x<_7Prm>A-s$T$)k*hiEk(Cg?uT9wz|vKvoUuyxnOZaVBC}A#`d%8W zbg%&g?kV@-RP=vc;|#4EJT;Fk4Lw~AM*p;)K~b$zx6nXT)k1h>FX^T~nzV}5aU$*K zDHTywzncOqP5)ixwFx$JIiOU0qS~rEd4H}FwqFQ%)$gkN&j^8}LGFxb^?u;$ny2dQ zVXOAm1@_gs65kA=E6*Ke3T)}{c(6EGQTqQ(Y{)!A*phPDY1^@7(%;Y06hu=lOUJZ= z1B)9~&{VI?p%-iSv)TUGW!lfJb*clo{$nfl_;+7EH*H$=%%f^Oy^ZLGwom!3ZxC|- zi${J}7YtNV^V>Om1RcEU5?%eqmTjvBv-+P$*B83aj2Q7=eC9L;@8h#*o14vv&yqf` zi_fZURyGlzb=#cmVth7j311PPZQFeOIDDR^ZADIU+NyOn_K?0FpJ#7d(LPB{WU?CZ zQS_ht%xJVv$7fDg6FiU4g7$xg&$4Z4HUyvPz2R&JeAaC>b|5~Rwmx}^}viS+dU8jVdmJzXK9PaC#%(LH;8bjMyl{WqH44_l+B2KCUM z-qybzw5N+cb<=88jaC=N(f@074QChK=Qo!A*54|1(zdg8?^-AIb68v3=}Bl@~V);26Q@M>v)f9C-0+l=ZSLu-@c=m33G>>M*;TnByl zUmx&){ll$VqtK5LtC6!FMt3JsRBhGS*H2xq`NLu=&3OF5ex}sBY7l4WW!1^SK5pLX zV-NjXqoY@&-a-EjP=7mU#5?Ip6II`LqkYvZR(~1W`tCo??-=@K4~gwy zSSk;vv8b?H4JutFICfy5ca`D8Crz3(Z2TZHhf%wS4@~au8PnI%J9hH$(LLP*{q)^` z>Oy~O(0U1I)gXiD~zg_L?p>I@y*GY{Xpnr!_ zc~om^tK)Z2F-<)wz1tZsoswMwDtg1HlP-`bpEd#CA50Zkb*Bzy*=kGnJdRC(; z9@}c+So&PS_wQpiiAJMpYxV7sG)5DsE=M>2dF-nZ8rSOm^7Q=`=vP&UjA(uTpO5a^ z@b{MePsjGJqgQj-O>|VF(WnBc3el?ngEab2J#c;cr*^GM#~H*x)f3m3YM!cat!AwX z`!4i#6z!SR>Uj_CuMqH0Za zZO??-_>Rf73H_bKNyJmt?%F_4ZDe0($3W-M+NiGn-f!_Yd-Q#*XW~`J( zufq*hXJ6Hw9wK}CcfvsLgn`-loT<}D9fj}7HT?WWZ6t?W_qW^tn_@K>YWgC zvbosYY#uf*<@xi|NwEdlLiGOgMd%dJVsz?c305OZyc8S4mZmF)mSxMa<=G1KM97us z_3bOuy1;PO&g#r#J_}e#r|TjXvxKcePbglEZh2XQt;yD6Da%;S3f5#LtyZqX)@AFl z_1Ok&L$(pym~Fx~Wt*|h*%oX|wiVl&ZNs)@+tIa2JJ7q6cVauUU04Sj!A7!Ctdosq zW7t^M#dc-8v2koX>t;Qym+j8_SU($}wa{@mmyPn;^Ze%yHo7pYwR(2b^o!!Ci zWOuQ<**)xDb|1T+J-{Ah53z^YBkWQ37<-&O!KSh&*;DLk_6&QLJ;$DBFR&NcOYCL# z3VW5k#$IP{us7LT>}~cAdzZb(-e(`M57|fTWA-oh3Hy|N#y)3Xuz#~J*;njq_6_@% zeaF6MKd>L!PwZ#*3;UJ*#(rmiuxaei>ed|2x!{s3dJCW7me0gz=Cg2mdj+4J&%x*9 zbMd+PJbYe0AD^Euz!&5T@rC&!d{Mp_Uz{(&YkWz*6d%Hu=F9M9`Eq=Dz5-v7uf&J) zmH99}oVW8j_qfjk9`Xi{c+3;N3SX74##iUG=E~RNDbIM$3*O`9$MWO&@%#jSB0q_r%unH`^3(X~{0x33KZ~Eu&*A6t^Z5Dv z0)8RCh+oVv;g|Bu_~rZxekH$(U(K)K*YfN5_522YBfp8?%x~eh^4s|B{0@F6zl-0^ z@8S3I`}qC*0sbI=h(F99;g9mi_~ZNuK9xVopW;vRXZW-HIsQCp|B8Rjzv18V@A&up z2mT}fiT})h;lJ|V`0xA=K8^oL=bV_}^kiWvl+eNmD`pZii&@01Vm4aqpF_+k<`Q#@ zdBnV8J~6*oKrAR05(|q(#G+y`vA9@5)aYr?ONk+3X?l^~vSK;0yjVf3C{_|f#mZus z7%tjHU3kJ5fe1x|uK0>YB32Qriq*vGVhypTSWBcL6S*ivQJiP%(ZCN>vah%LodVr#LD*j8*Owii2y9mP&!XR(Xu5F^A$F-mlb(PE4kE4sw4 zVmC2Pj2GRaNA%KTE&4>i7!VW0L@`P1AtsAG#a?1>v5(kS>_^Y9-d`Lb4ipE8gT*1@ zP|6+;7e|OA#ZlsDaf~=t94C$!Cx{cpN#bO2ia1rACQcV;h%?1m;%sq_I9Hq}&KDPm z3&lm^VsVMMR9q%57gvZY#Z}^JagDfETqmvP2y&8i?~(XCT=COVv_a(=mhTu?3~7nY02Mdf00ak+%7$tC4da)?}7E+dzf%gN>C3UWock{l{mmc!(5 z*)HqSlfDdOC>t`8u}tJDa#gvSTwSgq*OY6?RAw@lg>1@Ft}WM*>&o@y`f>xgq1;Gr zEH{yx%FX2Fatpbo+)8dOw~^b*?d0}y2f3r%N$xCnksWe`94SZ1PB~hRkz-|-+*R%- z$I0=sTlUZs!grT_vR@9!338&GB=?Y$<(_gcxwqU$?ko3`Q{?{g0C}K1NFFQ?k%!8| z1a@(y{Yyi49K?~(V) z`{e!d0r{YONIondk&nv9pOR0@XXLZ;Ir+SNLB1$ok}u0wPLqGCHpLWILP@2RR)%iToJq~BW>K@M+0^W64mGEmOUk%c;%W(1Q%kC))DX3_T1G9amQ%~C71WAqB{fv7tcI!Ks$JEU zr+gKtP&HJfVwI>>)T(MVwYpkEt*O>hsmfHY3e{AlT3fB7)>Z4N_0uHSGTC0Ck``NFA&WQHQF-)Zyv~ zb)-5<9j%U0$ExGh@#+M1qB=>PtWHsI`+JI!m3c&Qa&8^VIq30(GIfNL{Qh zQJ1RA)aB|5b)~vWU9GNB*Q)E(_38$7qq<4mtZq@as@v4<>JD|Mx=Y=y?os!u`_%pF z0rjAINIk3`QID#})Z^+2HB~*So>EV%XVkOmIrY4HLA|J6QZK7l)T`<>^}2dPy{X<( zZ>x9IyXrmlzWP9Ys6J93tAD9a)Tin*^||^&{abyhzEWSSZ`8NyJN3Q#LH($HQa`I- z)UWC{^}G5*O;dl;+d7!$T4<@2)^weW)iddt^(=Z;dhyfjdJa9Oo=eZI=h5@(`SkpH z0llDJNH44x(TnQE^x}F6UDHeIrSuTJv|dIptC!Qu>lO5hdL=znudIjZ;ksSdwWoa@ z=ukIwq+^}vRrIQQHNCoCL$9gV(y7jLt_$7NrCwXFqu15z>GkyndPBXD-dJyG}+PranubthtvZ`T~8SzDQrJFVUCk z%k<^?3Vo%%N?)z7(bwwh^!54%eWSif->h%Zx9Z#U?fMRVr@l+yt?$wI>ihKl`T_l* zen>y8AJLEM$Moa+2|ZOmsh`qM>u2<{`Z@i)enG#eU(zq@SM;m;HT}ANL%*rt(r@c` z^t<{!{l5M{f2cpwAM1bVPxPnyGyS>#LjPNTslU=+>u>b8`aAu-{z3n!f6_neU-Yl~ zH~qW*Lr>Fx($yi%a3hQ~%4lPZH8Yu+%`9eCGn<*6?&+M99>g-Yna9j)=A+XW3z!AX zLS|vJh*{JuW)?R~n3`GAEM zFp-H(VpcJ$n$^teW(~8ZS<9p*Gr1{D)0AdyvyNHUtY_9Y8<-8vMrLEPiP_X_W;Qol zm@Um#W^1#J+16}lwl_PN9nDT=XS0jxFeA)JGs<+D(PoSpYr4#?W;ZjA-uuyQdQ7j` z-SnA$Ghil|iDr`7!%Q}Nn!U{4W*@V!*^lnj+TR>t4m1augUuo4P;;0$+#F$!G)I}E z%`xU!bDTNeoM28gCz+GYDdtpjnmL{BiaXPsWzII|m~+i}=6rL3xzJo>E;g5#OU-5G za&v{b(p+V(HrJSI&2{E_bA!3j++=Pxx0qYaZRU1!hq=?-W$rfjn0w8A=6>^ldC)v$ z9yX7dN6lmAar1wz71?>8#c1B zP3$UmRlAy9-L7HRv}@VaW;VBlZQ9bVZP&5u+V$-Eb_2Vi-N2?g*fZ@}_H28OJ=dOR&$k!Y3++YrVta|b)Lv#Uw^!IJ z?N#<_dyT!;UT3ejH`p8PP4;Gci@nv}W^cE5*gNfA_HKKRz1QAn@3#-w2kk@lVf%=E z)IMe(w@=uq_DTDcecC=_CUkc-y`&x6y4z-6YwNcUZkw)Lci;2t?t6aS$Nm7@5ZeUX z4BH&r0^7mkm98A%_W^z%G_XIy7QYYC9(uA<)owq;aT@qt1HWtFca7M6uYvY7Qk2oI z2HF#$UlIBhp`HlGiEx|*^(JUPt{xg8CBlBSF0h+MlA{6u(dLy%gU| z2fv5$%FxdY-_P*99Q`Oze}Q@n9IwFl3LLM%@tXKu6YXfC|4sC_iT*ax-zMsBqTfxl zqltQ(=ywzKH&K5R^*2#}6ZMyM2oAiF!)ZQ=*;{^^~ZmL_HIvFi zJwdyxCjh>KcGu6K-SsnQcl8JDuKu9zjuX^z91q9wa2(H#SK#3|9**O=b_bqoci`bT zKEChc`#!$!qh25N`uM$%-}|oLf$#bq_^#i9@A@71gU3fZ1GFK(4Pj5kN6B4=vM>v zAzlN-Yk+tSBGeb5z6kA&FrJ9#0P!3|=vRdCj8K1s`Xh&o5u)o6Cpk##6{HZa1yn<`l5DMU)1jEi`rfPqjpzM)b8qupd%4< zB&wqx=t)#};~Lf7{6%#)E>Ruz)g3OQI_j;X-a6{7yM9J>)Q|X$5Wf-PH$wbIh~EhD z8zFup#BJoE9uM_+sK-M+9_m4SM;`j=JKRLR8_x)FA0h4|#68_Z-qNKAaUUV>BgB1# zxQ`I`5#l~V+($m@NBl=V>PP%Xh~o%x90lk{fPMt%M}Xr5n6D7+hTcXY<|V{@gqV*I z^ATd4zz-4hIRZ~a;E4!45rHS@RX?u(;Drdh5P=UO@IeGVh`U0x5#l~V+((G}C_?`ujAIOZBJLx^eH5eJF~%dtc*Gb7@InM0h+-TU@gF5P zE__7<9*7eB9=;$-ar_j=hfj#W2T_W71TRG3g(w65;OC;u@m7>!9^oS*@J0mQh`<{W zcq0N&MBs@CJQ0B>qCuX>ar_+ZFEBpvArbsU1pg4hH$?Ca5&S>|9}tyjC;UJJeUG5; z5%fKRzQ^FH7`h&VuVV0348Drn9bRMbQVd>-!AmiCDFzS4;Gq~i6oZFi@K6lCiNQB9 z_$CI=#Ne42{1Ss-V$Y3F44)8#M`G|s4Bm*r8!>ny1~0^j?-;rsL&sy_EC$YE;4B8t zV))k>c#EMsF?1(}?!>@h4E>1{7Y}jja1{feaq8whPThRPDf$K6#=vb1+{UTHM-1G? zz-^<5kAeRfK0JmGkKw~(`0p70JBI&`5ic?PcMSg> zBYtA|?-+3uBaUMD?-;&2hVPEyyJN&zj5v!+^aJr0Bi>^8?->3&hX0P?yJPt781Wb* z4im&-0-v2A9uxS41U?~Yce<0nCnSi&1aX+a4+U1U!>~XAZR+@Jj+dNeav>^7jOMkRbjODY6`!f zBED0^cZ&E<5#K4|J4Jk_@cAj?J4IZli0c$_m?92S#9<2moFX1m#A6DdoFX1m#AAwh zOc94E;xI)VrijB7ahM_wQ~2jJaPynOKc`r?O5vkZZf_6!DxQUQ^_?Dg12;KbykOrtq_A?DQ;!pG^_JDf~r> z_)Xy>Quv1yahoD;Q>=TXh`SW=mLi@~#8Zm+NfAFO;v_{pq`-d)T}=@ODReZ2Zl=)9 z6grtg|5C(53f)T)4=M1U0{z41O_#PG!)i41O^~ewiV^%#bH$z;_0GXV9ArIM0Cd3^>n# z^9*@n2ApTWc?NuEz;}lHFas_#tjA`^>oTnKWYC)o_{^X?8E~2bry2AlgKlK-wHff2 z0e=~EA_KlMtgB}5s~Pw_0}p55*9R0iJ6;F~hwCIfCVtXF36OBwu820qQe zry1~+14lVk&ooSQ4SxJ14lV{G6zrQ$VYPUV-8&9z)=p|2MbNGTBejrD_onxIX z2fyT4N6WE}mLq@8G53+=X3B>4qWBX_Z&VyhriFkPdR*j4qnQk(>ZXK17|sKl_S5+;j0ViaREIp zpvMJ#bphX804D`_sDO?Z;G+UMTEHI{;F$tEQvfdo@KS(B3h+pQ^`-*)S%l8V6wt2% z@m@fO3dDVZxGxa*1>(Ly+!u)Z0yrw*Hw*a90)Ddqo(inv7Vwz`a8&?T1#ne>KMJhp z6wti_>$wH=ufY0Ff%TmNdRRaY3+Q11JuI-!QvkOGa9aSk1#nvcw*_!pfVT?x-vT%; z;C~DF-vYc=KvxUo=LPh&fW8*c*8=C63i#s!d{}@F3-Doq{JlW_Ucg5eSSKowUl&*x zDv)0n$gd0d=mI{vfSwod(FJt90Phy?(FJ^Tk-I#;fS)c9Uj^c;KztR5uL3@xK%5nb zvjRT4fIleUqYL=x0z6;9Hx%&EMd5U`K)zleUoYUV3+O@te^DTw3*_wu;<`Xw7w{bg z^7jI9ULbCph}$M~pa~slA`foDKQzJjO~h#vc`2QsZLNXO5{5wc)Nt}E8*Kp__h*xNeP`VftM2bNeSIAfu9oj zNs0WVM1E2tKPf|(@0Q3@O055v@C_w=LkS#~@QWqR6PCzlO5n2uK1<-U1U^gPvxKgc zz-b9xDS_7#crAg~61q}CS4!wg3Ext}x0KMC68J8mHzo9@gx-`me^5eqO6X1r-6^3v zC3L5R?v&7-61r1DcS`6^3Ee57J0*0dgzl8knG!lvLSIVgONlrv5r-w#K}y6`iFhgz zM!dBaS0rkz;OwFEWv{%_^$;2mGIFe{7nfzQ^F6I&exRfju&a$T7RT%Ykj0_ zcRWbj*1A>M?)Z*Cp=~SwF54ZBY1`s^+P2nbY1`t{vfbf` zwm7cCMcM9joVGZ=({C!{xNdyQcBkL8ZLLGm7WF$FrZU>;c#X>FpVQ&8-RUrGTkBJ_ z#c`aUrE+Wihqf)Ar!D&7{4AAQc{y#-ALnPOjQ%)3TeiD-FWcR`(iY!${6#d=@^7?7 zJKQ{%?Jkd|E!t6{eQqAhI_9tLbdAcceRa%V-Q~Gu-Q~5kb-%A;9_voW%DT%}X^Y=G z9;34BU)`oah_z4O2R`b+Lmhai z0|#~Bpbi|=frC15PzMg`?z(`o?&6)c4*zwhdu83lHEq#T&ClRCai*JH4Ya`t8LfGtZr;r?NY~2i$p1M@tX*^IV=&dccbZym-Ki=dPEbzq@$! z+U4K2dUP5ITU!KdWsqFgix%Cq&J6`czo=s&p9-hmiO3&#iZLuHt^PG;A9&qOY zcb?NN+K+ZPouV?@0bF{(rRVgC{*Li*x>R~jmuTza#B;htWrq*X=@FIDAK=&nPkP`< z4?KzM3QG?>>47Ibr%SXS$94KdWrsV@`9vzaxbvJ(q%!6k{OW;UJ@BiC`0)@w9{AM* zzj}x#54`FjemumDhq&>;pC0(rbL#=6hj{Ybx&YZR$D1Db)pPk1?FU}nc}pq-FNi}A zap*byrN3jIoDNeNQaI6qr@&d<^o^XBp`Dr0uhV%dV|<|p zp3A#vKk9eBm&&N$`Cclce&~h=-SC`WC_V6s2VU{OD;{{o1Fv{4@1pOc|ISxX8TGro zi^`}UJmi6gJn)bQ9`an?ReInf54z=nmpr%5M}J40IG;jg)bGxlQW^ETbwDbke&^Gv zjQ%^HUV84l3T-j|;5Exjcjr^7jQZVrA(c_TJFiM*)DJ%Nz=uBc)(0=*`rOh7 zKl;#N-{qII-_5u0))}en=G%AcMO1e27m18^(Nd(N9kFZ z*g8D=@WnoSvG4Lb`X0v9<#$wec=Vx5zRT}uKkxya^5Lg^m)}uZiuzrCM`hFxpXI}6 z`S4jjbk2t__u;pE_;cUocXS*Vk3M{u4_)+Ken)9A@Clvt;lq5Fhf#X$c-x2G`OrHb zdgr@*i@paO!teXgF(3NnL%)3JmJi+Xp;tci%7;$*&?z7Kw>@}XBg^vZ```OqsLI^;uteCUl2z44(NK6Jwe z&-&n5AAIP8*L?6AuD>pEeKl1mGQ9*G>B!egp7M;Lfwqe)I!=GXUQN;F|zE zgX^|ST(?bI)C=ASz#9R0BLHs%;0;`-UE(@z+M-_YMgZOjz#9ShA^=|m@O!wPxeS2& z0Jsm}^8&a2K!11q7$6=3xBfu;9X|xfX9D=a0Ddrl9}M6J1H@5)IKp+$WdJ`IAf5um z6Rv}%zdL;h;P-GHH0^isAHeSgh^GMY6u|EVh^qi`6~Oleh#y=xT?UAc0PztZJ_5u? zfcOXy9|8Pa06!PN&*A#(64zhT7VU?h3lL8M{9FJ(7Ql}Mh^qi`6~NyF@F@X&N&ue{ zz^4T8DFJ*+0G|@Trv&gR0pc=%PYK{t0{D~wJ|%!p3E)!#_>=(g91O-Yd`f`zfB<=1 z0N)b8w}kL5A$&{d&Rdlsd`k%562iBH@GT+uA%t%U;afuRMF`&#!ncIrj}ZJ3f%QDN(f#F!7CwnB?Pa8;FS>T9wB&zo~GQ=-4MJI zf>%QLnGn1Zf>%QDN(f#F-T63Lu61!2!smqGn-KYJi1n}#d2Z;gL#O3k)DK@2!WV_$ zsSrFx?_YE61Yd>lJt6og1RsUqqYyrZ-ni_32R;hHMxd5I!Y@PYK~u zLim&r>vti1N(i44!l#7rDIt7H2%i$dr-bkkA>ukjJco$q5b+!$opM}WJ zLd0{3cn%TIA>uhi+=j@DLgYOm@}3ZRPl&uHMBWo3?+KCbgwW9t`AUfR4H3T$#6bi2 zZvZC^%zp#(-@yDgF#iqAe*-?Y0Uz6dk8MDY8qlK#=Cgr$Y(Q5Un9m0Er2&0uV166$ zqYcb+1M}R#JU8G28}NS(__zjq9KAZPg{KDAH5zUmo=yWey=!27qk;8}2G%zk@MjJ9 zuLks^0sUyehc%!d4fv}Dd{hHIssSI>fRAdxM>U`e4dAE&95sNC25`{;E*ii^1OBN2 z|J1;|H<0Hxkk2;2_YLH;4dk;8%pAq6PLj2*r4my3}<}t#2NAUR(d_L~; zpzk@I#Qh#rc6n$7|Bm}O=roMuC)~e5W&957S-5Y5_B&q{!QV&lIT3tJ1pgAjuSD=C z5&TI69O3>9I^BbQz@Okg4chN`FM{unuwI4xH|XzZAMh6ee-ZE(!M{ZCFA@Ap1pgAj zzeMma5&TPp`~dfb&}k^l6Y_%y{s#Al(BEDD76I20@EHN0xW9u=V`1EYQ{3M{r?W8b z;I9byjlf$Ga2#QsCc-*R1YAeJbp%{Tz%}j%q0?keeJ0*)j28{FSPr_bCx;Jywj zyYa_;9aMJX9fKER_yOGKL8sjuZe!?w4E@J_9`tt?AGj}rPS4@^(BBxk8$)+v=q~Qt zpzja<-i;&fXC~;o~ zot_M<=fTmVl4qv3wa(Fcs_(4yj5vC$H|?bd7Mo}3UwR(=;FINA-)MX3Chs=d*LLq8 O_fM&|Z_KsBJpTu;RsQz? diff --git a/UI/Resources/Themes/Common.xaml b/UI/Resources/Themes/Common.xaml new file mode 100644 index 0000000..07c2896 --- /dev/null +++ b/UI/Resources/Themes/Common.xaml @@ -0,0 +1,696 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UI/Resources/Themes/Dark.xaml b/UI/Resources/Themes/Dark.xaml new file mode 100644 index 0000000..37d6e2f --- /dev/null +++ b/UI/Resources/Themes/Dark.xaml @@ -0,0 +1,106 @@ + + Dark + + #FF8780F7 + + + #CC383838 + + + + + + + + + + + + + + + + + + + + + + + + + + #313131 + + + #FFAFAFAF + + + + #525050 + + #706f6f + + + + #ccc + + + + #e7e7e7 + + + + #7F777777 + + + #6e6e6e + + #3d3d3d + + + #5A5A5A + + + + #7F777777 + + + + #3c3b3b + + #646464 + + + + #ffffff + + + + #525151 + + + + #3c3b3b + + + + #7e7e7e + + + + #646464 + + + + #646464 + + #383838 + + #4F4E4E + + \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Base/CheckBox.xaml b/UI/Resources/Themes/Dark/Base/CheckBox.xaml deleted file mode 100644 index c6e04c9..0000000 --- a/UI/Resources/Themes/Dark/Base/CheckBox.xaml +++ /dev/null @@ -1,26 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Base/ColorSelect.xaml b/UI/Resources/Themes/Dark/Base/ColorSelect.xaml deleted file mode 100644 index b54b155..0000000 --- a/UI/Resources/Themes/Dark/Base/ColorSelect.xaml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Base/EmptyData.xaml b/UI/Resources/Themes/Dark/Base/EmptyData.xaml deleted file mode 100644 index dd8c9c0..0000000 --- a/UI/Resources/Themes/Dark/Base/EmptyData.xaml +++ /dev/null @@ -1,63 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Base/Icon.xaml b/UI/Resources/Themes/Dark/Base/Icon.xaml deleted file mode 100644 index 5bdf15e..0000000 --- a/UI/Resources/Themes/Dark/Base/Icon.xaml +++ /dev/null @@ -1,26 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Base/IconSelect.xaml b/UI/Resources/Themes/Dark/Base/IconSelect.xaml deleted file mode 100644 index 8fd4626..0000000 --- a/UI/Resources/Themes/Dark/Base/IconSelect.xaml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Base/Img.xaml b/UI/Resources/Themes/Dark/Base/Img.xaml deleted file mode 100644 index e0aa1c6..0000000 --- a/UI/Resources/Themes/Dark/Base/Img.xaml +++ /dev/null @@ -1,32 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Base/Placeholder.xaml b/UI/Resources/Themes/Dark/Base/Placeholder.xaml deleted file mode 100644 index 087fad6..0000000 --- a/UI/Resources/Themes/Dark/Base/Placeholder.xaml +++ /dev/null @@ -1,32 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Base/Text.xaml b/UI/Resources/Themes/Dark/Base/Text.xaml deleted file mode 100644 index aabb1c2..0000000 --- a/UI/Resources/Themes/Dark/Base/Text.xaml +++ /dev/null @@ -1,18 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Base/View.xaml b/UI/Resources/Themes/Dark/Base/View.xaml deleted file mode 100644 index da0b669..0000000 --- a/UI/Resources/Themes/Dark/Base/View.xaml +++ /dev/null @@ -1,20 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Button/Button.xaml b/UI/Resources/Themes/Dark/Button/Button.xaml deleted file mode 100644 index 0351c5f..0000000 --- a/UI/Resources/Themes/Dark/Button/Button.xaml +++ /dev/null @@ -1,108 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Button/IconButton.xaml b/UI/Resources/Themes/Dark/Button/IconButton.xaml deleted file mode 100644 index 484dbf9..0000000 --- a/UI/Resources/Themes/Dark/Button/IconButton.xaml +++ /dev/null @@ -1,63 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Charts/Charts.xaml b/UI/Resources/Themes/Dark/Charts/Charts.xaml deleted file mode 100644 index 5c1e4ed..0000000 --- a/UI/Resources/Themes/Dark/Charts/Charts.xaml +++ /dev/null @@ -1,336 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Charts/ChartsItemTypeA.xaml b/UI/Resources/Themes/Dark/Charts/ChartsItemTypeA.xaml deleted file mode 100644 index ebfc82a..0000000 --- a/UI/Resources/Themes/Dark/Charts/ChartsItemTypeA.xaml +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Charts/ChartsItemTypeCard.xaml b/UI/Resources/Themes/Dark/Charts/ChartsItemTypeCard.xaml deleted file mode 100644 index c3f2f0a..0000000 --- a/UI/Resources/Themes/Dark/Charts/ChartsItemTypeCard.xaml +++ /dev/null @@ -1,116 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Charts/ChartsItemTypeColumn.xaml b/UI/Resources/Themes/Dark/Charts/ChartsItemTypeColumn.xaml deleted file mode 100644 index 412a3ec..0000000 --- a/UI/Resources/Themes/Dark/Charts/ChartsItemTypeColumn.xaml +++ /dev/null @@ -1,84 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Charts/ChartsItemTypeMonth.xaml b/UI/Resources/Themes/Dark/Charts/ChartsItemTypeMonth.xaml deleted file mode 100644 index 1781b02..0000000 --- a/UI/Resources/Themes/Dark/Charts/ChartsItemTypeMonth.xaml +++ /dev/null @@ -1,74 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Charts/ChartsItemTypeRadar.xaml b/UI/Resources/Themes/Dark/Charts/ChartsItemTypeRadar.xaml deleted file mode 100644 index ad9155b..0000000 --- a/UI/Resources/Themes/Dark/Charts/ChartsItemTypeRadar.xaml +++ /dev/null @@ -1,65 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Config.xaml b/UI/Resources/Themes/Dark/Config.xaml deleted file mode 100644 index d43c702..0000000 --- a/UI/Resources/Themes/Dark/Config.xaml +++ /dev/null @@ -1,36 +0,0 @@ - - Default - - #FF8780F7 - - - #CC383838 - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/DatePickerBar/DatePickerBar.xaml b/UI/Resources/Themes/Dark/DatePickerBar/DatePickerBar.xaml deleted file mode 100644 index b869753..0000000 --- a/UI/Resources/Themes/Dark/DatePickerBar/DatePickerBar.xaml +++ /dev/null @@ -1,163 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/DatePickerBar/DatePickerBarItem.xaml b/UI/Resources/Themes/Dark/DatePickerBar/DatePickerBarItem.xaml deleted file mode 100644 index 00f30fa..0000000 --- a/UI/Resources/Themes/Dark/DatePickerBar/DatePickerBarItem.xaml +++ /dev/null @@ -1,78 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Input/InputBox.xaml b/UI/Resources/Themes/Dark/Input/InputBox.xaml deleted file mode 100644 index 4a8d596..0000000 --- a/UI/Resources/Themes/Dark/Input/InputBox.xaml +++ /dev/null @@ -1,92 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/List/BaseList.xaml b/UI/Resources/Themes/Dark/List/BaseList.xaml deleted file mode 100644 index 22a57ce..0000000 --- a/UI/Resources/Themes/Dark/List/BaseList.xaml +++ /dev/null @@ -1,40 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/List/BaseListItem.xaml b/UI/Resources/Themes/Dark/List/BaseListItem.xaml deleted file mode 100644 index 07fbb42..0000000 --- a/UI/Resources/Themes/Dark/List/BaseListItem.xaml +++ /dev/null @@ -1,85 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Navigation/Navigation.xaml b/UI/Resources/Themes/Dark/Navigation/Navigation.xaml deleted file mode 100644 index bd13a75..0000000 --- a/UI/Resources/Themes/Dark/Navigation/Navigation.xaml +++ /dev/null @@ -1,45 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Navigation/NavigationItem.xaml b/UI/Resources/Themes/Dark/Navigation/NavigationItem.xaml deleted file mode 100644 index d8684db..0000000 --- a/UI/Resources/Themes/Dark/Navigation/NavigationItem.xaml +++ /dev/null @@ -1,155 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/PageContainer.xaml b/UI/Resources/Themes/Dark/PageContainer.xaml deleted file mode 100644 index 8b55d56..0000000 --- a/UI/Resources/Themes/Dark/PageContainer.xaml +++ /dev/null @@ -1,22 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Select/DateSelect.xaml b/UI/Resources/Themes/Dark/Select/DateSelect.xaml deleted file mode 100644 index 1a4fa8d..0000000 --- a/UI/Resources/Themes/Dark/Select/DateSelect.xaml +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Select/ImageSelect.xaml b/UI/Resources/Themes/Dark/Select/ImageSelect.xaml deleted file mode 100644 index d50ef34..0000000 --- a/UI/Resources/Themes/Dark/Select/ImageSelect.xaml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Select/Option.xaml b/UI/Resources/Themes/Dark/Select/Option.xaml deleted file mode 100644 index 803b113..0000000 --- a/UI/Resources/Themes/Dark/Select/Option.xaml +++ /dev/null @@ -1,88 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Select/Select.xaml b/UI/Resources/Themes/Dark/Select/Select.xaml deleted file mode 100644 index 8507c96..0000000 --- a/UI/Resources/Themes/Dark/Select/Select.xaml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/SettingPanel/SettingPanel.xaml b/UI/Resources/Themes/Dark/SettingPanel/SettingPanel.xaml deleted file mode 100644 index 56abd72..0000000 --- a/UI/Resources/Themes/Dark/SettingPanel/SettingPanel.xaml +++ /dev/null @@ -1,26 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/SettingPanel/SettingPanelItem.xaml b/UI/Resources/Themes/Dark/SettingPanel/SettingPanelItem.xaml deleted file mode 100644 index e55628f..0000000 --- a/UI/Resources/Themes/Dark/SettingPanel/SettingPanelItem.xaml +++ /dev/null @@ -1,49 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/SettingPanel/SettingPanelMultiItem.xaml b/UI/Resources/Themes/Dark/SettingPanel/SettingPanelMultiItem.xaml deleted file mode 100644 index 8c35a71..0000000 --- a/UI/Resources/Themes/Dark/SettingPanel/SettingPanelMultiItem.xaml +++ /dev/null @@ -1,53 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Style.xaml b/UI/Resources/Themes/Dark/Style.xaml deleted file mode 100644 index fe27844..0000000 --- a/UI/Resources/Themes/Dark/Style.xaml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/UI/Resources/Themes/Dark/Tabbar/Tabbar.xaml b/UI/Resources/Themes/Dark/Tabbar/Tabbar.xaml deleted file mode 100644 index ee9ae90..0000000 --- a/UI/Resources/Themes/Dark/Tabbar/Tabbar.xaml +++ /dev/null @@ -1,46 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Toggle/Toggle.xaml b/UI/Resources/Themes/Dark/Toggle/Toggle.xaml deleted file mode 100644 index 7851f9e..0000000 --- a/UI/Resources/Themes/Dark/Toggle/Toggle.xaml +++ /dev/null @@ -1,108 +0,0 @@ - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Window/DefaultWindow.xaml b/UI/Resources/Themes/Dark/Window/DefaultWindow.xaml deleted file mode 100644 index b09986e..0000000 --- a/UI/Resources/Themes/Dark/Window/DefaultWindow.xaml +++ /dev/null @@ -1,281 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Dark/Window/HideWindow.xaml b/UI/Resources/Themes/Dark/Window/HideWindow.xaml deleted file mode 100644 index 6619ff7..0000000 --- a/UI/Resources/Themes/Dark/Window/HideWindow.xaml +++ /dev/null @@ -1,17 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light.xaml b/UI/Resources/Themes/Light.xaml new file mode 100644 index 0000000..6f7996f --- /dev/null +++ b/UI/Resources/Themes/Light.xaml @@ -0,0 +1,105 @@ + + Light + + #2b20d9 + + + #eaeaea + + + + + + + + + + + + + + + + + + + + + + + + #ffffff + + + #5c5c5c + + + + #ededed + + #ededed + + + + #5c5c5c + + + + #5c5c5c + + + + #f3f3f3 + + + #f3f3f3 + + #eaeaea + + + #F9F9F9 + + + + #fbfafa + + + + #eaeaea + + #ffffff + + + + #000000 + + + + #FFECECEC + + + + #c4c4c4 + + + + #eeeef2 + + + + #F9F9F9 + + + + + #F3F3F4 + + #EAEAEA + + #FFFFFF + + \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Base/CheckBox.xaml b/UI/Resources/Themes/Light/Base/CheckBox.xaml deleted file mode 100644 index c6e04c9..0000000 --- a/UI/Resources/Themes/Light/Base/CheckBox.xaml +++ /dev/null @@ -1,26 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Base/ColorSelect.xaml b/UI/Resources/Themes/Light/Base/ColorSelect.xaml deleted file mode 100644 index b54b155..0000000 --- a/UI/Resources/Themes/Light/Base/ColorSelect.xaml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Base/EmptyData.xaml b/UI/Resources/Themes/Light/Base/EmptyData.xaml deleted file mode 100644 index 1d33b16..0000000 --- a/UI/Resources/Themes/Light/Base/EmptyData.xaml +++ /dev/null @@ -1,63 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Base/Icon.xaml b/UI/Resources/Themes/Light/Base/Icon.xaml deleted file mode 100644 index 5bdf15e..0000000 --- a/UI/Resources/Themes/Light/Base/Icon.xaml +++ /dev/null @@ -1,26 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Base/IconSelect.xaml b/UI/Resources/Themes/Light/Base/IconSelect.xaml deleted file mode 100644 index 8fd4626..0000000 --- a/UI/Resources/Themes/Light/Base/IconSelect.xaml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Base/Img.xaml b/UI/Resources/Themes/Light/Base/Img.xaml deleted file mode 100644 index e0aa1c6..0000000 --- a/UI/Resources/Themes/Light/Base/Img.xaml +++ /dev/null @@ -1,32 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Base/Placeholder.xaml b/UI/Resources/Themes/Light/Base/Placeholder.xaml deleted file mode 100644 index 087fad6..0000000 --- a/UI/Resources/Themes/Light/Base/Placeholder.xaml +++ /dev/null @@ -1,32 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Base/Text.xaml b/UI/Resources/Themes/Light/Base/Text.xaml deleted file mode 100644 index aabb1c2..0000000 --- a/UI/Resources/Themes/Light/Base/Text.xaml +++ /dev/null @@ -1,18 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Base/View.xaml b/UI/Resources/Themes/Light/Base/View.xaml deleted file mode 100644 index da0b669..0000000 --- a/UI/Resources/Themes/Light/Base/View.xaml +++ /dev/null @@ -1,20 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Button/Button.xaml b/UI/Resources/Themes/Light/Button/Button.xaml deleted file mode 100644 index 950a326..0000000 --- a/UI/Resources/Themes/Light/Button/Button.xaml +++ /dev/null @@ -1,109 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Button/IconButton.xaml b/UI/Resources/Themes/Light/Button/IconButton.xaml deleted file mode 100644 index 1533085..0000000 --- a/UI/Resources/Themes/Light/Button/IconButton.xaml +++ /dev/null @@ -1,68 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Charts/Charts.xaml b/UI/Resources/Themes/Light/Charts/Charts.xaml deleted file mode 100644 index afe610d..0000000 --- a/UI/Resources/Themes/Light/Charts/Charts.xaml +++ /dev/null @@ -1,338 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Charts/ChartsItemTypeA.xaml b/UI/Resources/Themes/Light/Charts/ChartsItemTypeA.xaml deleted file mode 100644 index 21904af..0000000 --- a/UI/Resources/Themes/Light/Charts/ChartsItemTypeA.xaml +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Charts/ChartsItemTypeCard.xaml b/UI/Resources/Themes/Light/Charts/ChartsItemTypeCard.xaml deleted file mode 100644 index f3a5e07..0000000 --- a/UI/Resources/Themes/Light/Charts/ChartsItemTypeCard.xaml +++ /dev/null @@ -1,117 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Charts/ChartsItemTypeColumn.xaml b/UI/Resources/Themes/Light/Charts/ChartsItemTypeColumn.xaml deleted file mode 100644 index 412a3ec..0000000 --- a/UI/Resources/Themes/Light/Charts/ChartsItemTypeColumn.xaml +++ /dev/null @@ -1,84 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Charts/ChartsItemTypeMonth.xaml b/UI/Resources/Themes/Light/Charts/ChartsItemTypeMonth.xaml deleted file mode 100644 index e9b457e..0000000 --- a/UI/Resources/Themes/Light/Charts/ChartsItemTypeMonth.xaml +++ /dev/null @@ -1,74 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Charts/ChartsItemTypeRadar.xaml b/UI/Resources/Themes/Light/Charts/ChartsItemTypeRadar.xaml deleted file mode 100644 index ad9155b..0000000 --- a/UI/Resources/Themes/Light/Charts/ChartsItemTypeRadar.xaml +++ /dev/null @@ -1,65 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Config.xaml b/UI/Resources/Themes/Light/Config.xaml deleted file mode 100644 index 56ee865..0000000 --- a/UI/Resources/Themes/Light/Config.xaml +++ /dev/null @@ -1,34 +0,0 @@ - - Light - - #2b20d9 - - - #eaeaea - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/DatePickerBar/DatePickerBar.xaml b/UI/Resources/Themes/Light/DatePickerBar/DatePickerBar.xaml deleted file mode 100644 index b869753..0000000 --- a/UI/Resources/Themes/Light/DatePickerBar/DatePickerBar.xaml +++ /dev/null @@ -1,163 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/DatePickerBar/DatePickerBarItem.xaml b/UI/Resources/Themes/Light/DatePickerBar/DatePickerBarItem.xaml deleted file mode 100644 index 00f30fa..0000000 --- a/UI/Resources/Themes/Light/DatePickerBar/DatePickerBarItem.xaml +++ /dev/null @@ -1,78 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Input/InputBox.xaml b/UI/Resources/Themes/Light/Input/InputBox.xaml deleted file mode 100644 index 4a8d596..0000000 --- a/UI/Resources/Themes/Light/Input/InputBox.xaml +++ /dev/null @@ -1,92 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/List/BaseList.xaml b/UI/Resources/Themes/Light/List/BaseList.xaml deleted file mode 100644 index 22a57ce..0000000 --- a/UI/Resources/Themes/Light/List/BaseList.xaml +++ /dev/null @@ -1,40 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/List/BaseListItem.xaml b/UI/Resources/Themes/Light/List/BaseListItem.xaml deleted file mode 100644 index 07fbb42..0000000 --- a/UI/Resources/Themes/Light/List/BaseListItem.xaml +++ /dev/null @@ -1,85 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Navigation/Navigation.xaml b/UI/Resources/Themes/Light/Navigation/Navigation.xaml deleted file mode 100644 index bd13a75..0000000 --- a/UI/Resources/Themes/Light/Navigation/Navigation.xaml +++ /dev/null @@ -1,45 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Navigation/NavigationItem.xaml b/UI/Resources/Themes/Light/Navigation/NavigationItem.xaml deleted file mode 100644 index e19fe4a..0000000 --- a/UI/Resources/Themes/Light/Navigation/NavigationItem.xaml +++ /dev/null @@ -1,155 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/PageContainer.xaml b/UI/Resources/Themes/Light/PageContainer.xaml deleted file mode 100644 index 8b55d56..0000000 --- a/UI/Resources/Themes/Light/PageContainer.xaml +++ /dev/null @@ -1,22 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Select/DateSelect.xaml b/UI/Resources/Themes/Light/Select/DateSelect.xaml deleted file mode 100644 index 2035d7a..0000000 --- a/UI/Resources/Themes/Light/Select/DateSelect.xaml +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Select/ImageSelect.xaml b/UI/Resources/Themes/Light/Select/ImageSelect.xaml deleted file mode 100644 index d50ef34..0000000 --- a/UI/Resources/Themes/Light/Select/ImageSelect.xaml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Select/Option.xaml b/UI/Resources/Themes/Light/Select/Option.xaml deleted file mode 100644 index 2c58175..0000000 --- a/UI/Resources/Themes/Light/Select/Option.xaml +++ /dev/null @@ -1,88 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Select/Select.xaml b/UI/Resources/Themes/Light/Select/Select.xaml deleted file mode 100644 index de29870..0000000 --- a/UI/Resources/Themes/Light/Select/Select.xaml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/SettingPanel/SettingPanel.xaml b/UI/Resources/Themes/Light/SettingPanel/SettingPanel.xaml deleted file mode 100644 index c281af7..0000000 --- a/UI/Resources/Themes/Light/SettingPanel/SettingPanel.xaml +++ /dev/null @@ -1,27 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/SettingPanel/SettingPanelItem.xaml b/UI/Resources/Themes/Light/SettingPanel/SettingPanelItem.xaml deleted file mode 100644 index 058c518..0000000 --- a/UI/Resources/Themes/Light/SettingPanel/SettingPanelItem.xaml +++ /dev/null @@ -1,49 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/SettingPanel/SettingPanelMultiItem.xaml b/UI/Resources/Themes/Light/SettingPanel/SettingPanelMultiItem.xaml deleted file mode 100644 index 8c35a71..0000000 --- a/UI/Resources/Themes/Light/SettingPanel/SettingPanelMultiItem.xaml +++ /dev/null @@ -1,53 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Style.xaml b/UI/Resources/Themes/Light/Style.xaml deleted file mode 100644 index fe27844..0000000 --- a/UI/Resources/Themes/Light/Style.xaml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/UI/Resources/Themes/Light/Tabbar/Tabbar.xaml b/UI/Resources/Themes/Light/Tabbar/Tabbar.xaml deleted file mode 100644 index ee9ae90..0000000 --- a/UI/Resources/Themes/Light/Tabbar/Tabbar.xaml +++ /dev/null @@ -1,46 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Toggle/Toggle.xaml b/UI/Resources/Themes/Light/Toggle/Toggle.xaml deleted file mode 100644 index 39b55eb..0000000 --- a/UI/Resources/Themes/Light/Toggle/Toggle.xaml +++ /dev/null @@ -1,108 +0,0 @@ - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Window/DefaultWindow.xaml b/UI/Resources/Themes/Light/Window/DefaultWindow.xaml deleted file mode 100644 index f06aa4c..0000000 --- a/UI/Resources/Themes/Light/Window/DefaultWindow.xaml +++ /dev/null @@ -1,281 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/UI/Resources/Themes/Light/Window/HideWindow.xaml b/UI/Resources/Themes/Light/Window/HideWindow.xaml deleted file mode 100644 index 6619ff7..0000000 --- a/UI/Resources/Themes/Light/Window/HideWindow.xaml +++ /dev/null @@ -1,17 +0,0 @@ - - - \ No newline at end of file diff --git a/UI/Servicers/AppContextMenuServicer.cs b/UI/Servicers/AppContextMenuServicer.cs index e198fd6..e30eaed 100644 --- a/UI/Servicers/AppContextMenuServicer.cs +++ b/UI/Servicers/AppContextMenuServicer.cs @@ -8,6 +8,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Controls; +using System.Windows.Media; using UI.Controls.Charts.Model; using UI.ViewModels; @@ -20,25 +21,38 @@ namespace UI.Servicers private readonly ICategorys categorys; private readonly IAppData appData; private readonly IAppConfig appConfig; - + private readonly IThemeServicer theme; private ContextMenu menu; private MenuItem setCategory; private MenuItem setLink; MenuItem block = new MenuItem(); - public AppContextMenuServicer(MainViewModel main, ICategorys categorys, IAppData appData, IAppConfig appConfig) + public AppContextMenuServicer(MainViewModel main, ICategorys categorys, IAppData appData, IAppConfig appConfig, IThemeServicer theme) { this.main = main; this.categorys = categorys; this.appData = appData; this.appConfig = appConfig; + this.theme = theme; - menu = new ContextMenu(); } public void Init() { + CreateMenu(); + theme.OnThemeChanged += Theme_OnThemeChanged; + } + + private void CreateMenu() + { + if (menu != null) + { + menu.ContextMenuOpening -= SetCategory_ContextMenuOpening; + + var test = VisualTreeHelper.GetParent(menu); + } + menu = new ContextMenu(); menu.Items.Clear(); MenuItem run = new MenuItem(); @@ -70,6 +84,13 @@ namespace UI.Servicers menu.ContextMenuOpening += SetCategory_ContextMenuOpening; } + + + private void Theme_OnThemeChanged(object sender, EventArgs e) + { + menu.UpdateDefaultStyle(); + } + private void Block_Click(object sender, System.Windows.RoutedEventArgs e) { var data = menu.Tag as ChartsDataModel; @@ -105,6 +126,10 @@ namespace UI.Servicers private void SetCategory_ContextMenuOpening(object sender, ContextMenuEventArgs e) { + if (menu.Tag == null) + { + return; + } var data = menu.Tag as ChartsDataModel; var log = data.Data as DailyLogModel; var app = log != null ? log.AppModel : null; @@ -207,7 +232,7 @@ namespace UI.Servicers } else { - main.Toast("关联配置不存在", Controls.Window.ToastType.Error, Controls.Base.IconTypes.Blocked); + main.Toast("关联配置不存在", Controls.Window.ToastType.Error, Controls.Base.IconTypes.IncidentTriangle); } } private void SetAppCategory(ChartsDataModel data, int appId, CategoryModel category) @@ -258,7 +283,7 @@ namespace UI.Servicers } else { - main.Toast("应用文件似乎不存在", Controls.Window.ToastType.Error, Controls.Base.IconTypes.Blocked); + main.Toast("应用文件似乎不存在", Controls.Window.ToastType.Error, Controls.Base.IconTypes.IncidentTriangle); } } @@ -282,7 +307,7 @@ namespace UI.Servicers } else { - main.Toast("应用文件似乎不存在", Controls.Window.ToastType.Error, Controls.Base.IconTypes.Blocked); + main.Toast("应用文件似乎不存在", Controls.Window.ToastType.Error, Controls.Base.IconTypes.IncidentTriangle); } } diff --git a/UI/Servicers/IThemeServicer.cs b/UI/Servicers/IThemeServicer.cs index e04dabf..56dfd6f 100644 --- a/UI/Servicers/IThemeServicer.cs +++ b/UI/Servicers/IThemeServicer.cs @@ -13,5 +13,9 @@ namespace UI.Servicers void SetMainWindow(MainWindow mainWindow); void UpdateWindowStyle(); + /// + /// 切换主题时发生 + /// + event EventHandler OnThemeChanged; } } diff --git a/UI/Servicers/ThemeServicer.cs b/UI/Servicers/ThemeServicer.cs index 7084e66..2175984 100644 --- a/UI/Servicers/ThemeServicer.cs +++ b/UI/Servicers/ThemeServicer.cs @@ -24,6 +24,9 @@ namespace UI.Servicers private Collection MergedDictionaries; private readonly string[] themeOptions = { "Light", "Dark" }; private readonly IAppConfig appConfig; + + public event EventHandler OnThemeChanged; + public ThemeServicer(IAppConfig appConfig) { this.appConfig = appConfig; @@ -38,11 +41,13 @@ namespace UI.Servicers if (oldConfig.General.Theme != newConfig.General.Theme) { LoadTheme(themeOptions[newConfig.General.Theme]); + OnThemeChanged?.Invoke(this, EventArgs.Empty); } if (oldConfig.General.ThemeColor != newConfig.General.ThemeColor) { LoadTheme(themeOptions[newConfig.General.Theme], true); + OnThemeChanged?.Invoke(this, EventArgs.Empty); } } public void Init() @@ -62,27 +67,53 @@ namespace UI.Servicers return; } - var configDict = GetResourceDictionary($"pack://application:,,,/Tai;component/Resources/Themes/{themeName}/Config.xaml"); - var controlDict = GetResourceDictionary($"pack://application:,,,/Tai;component/Resources/Themes/{themeName}/Style.xaml"); - + var themeDict = GetResourceDictionary($"pack://application:,,,/Tai;component/Resources/Themes/{themeName}.xaml"); + var controlDict = GetResourceDictionary($"pack://application:,,,/Tai;component/Themes/Generic.xaml"); + if (themeDict == null || controlDict == null) + { + return; + } + //Collection resourceDictionaries = Application.Current.Resources.MergedDictionaries; + //for (int i = 0; i < resourceDictionaries.Count; i++) + //{ + // ResourceDictionary resourceDictionary = resourceDictionaries[i]; + // //if (resourceDictionary.FindName("")) + // //{ + // if (resourceDictionary.Contains("ThemeName")) + // { + // foreach(var key in resourceDictionary.Keys) + // { + // resourceDictionary[key] = themeDict[key]; + // } + // //resourceDictionary["ThemeColor"] = (System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString("#ff0000"); + // } + // //} + //} //清除旧主题 - var oldStyles = MergedDictionaries.Where(m => m.Source.OriginalString.Contains(themeName)).ToList(); - if (oldStyles != null) + if (this.themeName != null) { - foreach (var oldStyle in oldStyles) + var oldStyles = MergedDictionaries.Where(m => m.Source.OriginalString.Contains(this.themeName) || m.Source.OriginalString.Contains("Generic")).ToList(); + if (oldStyles != null) { - MergedDictionaries.Remove(oldStyle); + foreach (var oldStyle in oldStyles) + { + MergedDictionaries.Remove(oldStyle); + } } } - if (configDict != null) - { - MergedDictionaries.Add(configDict); - } - if (controlDict != null) - { - MergedDictionaries.Add(controlDict); - } + + MergedDictionaries.Add(themeDict); + MergedDictionaries.Add(controlDict); + + //if (configDict != null) + //{ + // //MergedDictionaries.Add(configDict); + //} + //if (controlDict != null) + //{ + // MergedDictionaries.Add(controlDict); + //} this.themeName = themeName; UpdateWindowStyle(); diff --git a/UI/Themes/Base/CheckBox.xaml b/UI/Themes/Base/CheckBox.xaml index c6e04c9..207dd0e 100644 --- a/UI/Themes/Base/CheckBox.xaml +++ b/UI/Themes/Base/CheckBox.xaml @@ -8,7 +8,6 @@ - diff --git a/UI/Themes/Base/ColorSelect.xaml b/UI/Themes/Base/ColorSelect.xaml index b31907a..be0c8dc 100644 --- a/UI/Themes/Base/ColorSelect.xaml +++ b/UI/Themes/Base/ColorSelect.xaml @@ -20,14 +20,14 @@ + Background="{DynamicResource PopupBackgroundBrush}" Padding="10" Width="275" MaxHeight="300" Margin="10"> @@ -80,7 +80,7 @@ - + @@ -123,7 +123,7 @@ - + diff --git a/UI/Themes/Base/EmptyData.xaml b/UI/Themes/Base/EmptyData.xaml index 0b7949e..1d33b16 100644 --- a/UI/Themes/Base/EmptyData.xaml +++ b/UI/Themes/Base/EmptyData.xaml @@ -20,7 +20,7 @@ - + @@ -33,24 +33,25 @@ - + - + + - + diff --git a/UI/Themes/Base/Icon.xaml b/UI/Themes/Base/Icon.xaml index 5bdf15e..5472c3a 100644 --- a/UI/Themes/Base/Icon.xaml +++ b/UI/Themes/Base/Icon.xaml @@ -8,7 +8,7 @@ - + diff --git a/UI/Themes/Base/IconSelect.xaml b/UI/Themes/Base/IconSelect.xaml index 8fd4626..1f2f386 100644 --- a/UI/Themes/Base/IconSelect.xaml +++ b/UI/Themes/Base/IconSelect.xaml @@ -5,16 +5,18 @@ + + - + - + + Background="{DynamicResource PopupBackgroundBrush}" Padding="10" Width="275" MaxHeight="300" Margin="10"> - + @@ -36,84 +38,119 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + @@ -123,7 +160,7 @@ - + diff --git a/UI/Themes/Base/Img.xaml b/UI/Themes/Base/Img.xaml index e0aa1c6..9c529cd 100644 --- a/UI/Themes/Base/Img.xaml +++ b/UI/Themes/Base/Img.xaml @@ -9,7 +9,6 @@ - diff --git a/UI/Themes/Button/Button.xaml b/UI/Themes/Button/Button.xaml index 282502a..950a326 100644 --- a/UI/Themes/Button/Button.xaml +++ b/UI/Themes/Button/Button.xaml @@ -8,9 +8,9 @@ Value="true" /> - + - + @@ -18,7 +18,7 @@ - + @@ -61,7 +61,7 @@ + Value="{DynamicResource HoverBackgroundColor}" /> diff --git a/UI/Themes/Button/IconButton.xaml b/UI/Themes/Button/IconButton.xaml index c6fc890..6d86328 100644 --- a/UI/Themes/Button/IconButton.xaml +++ b/UI/Themes/Button/IconButton.xaml @@ -17,13 +17,13 @@ - + - + @@ -33,12 +33,23 @@ + Value="{DynamicResource HoverBackgroundColor}" /> - + + + + + + + + diff --git a/UI/Themes/Charts/Charts.xaml b/UI/Themes/Charts/Charts.xaml index 8be23d4..8750d89 100644 --- a/UI/Themes/Charts/Charts.xaml +++ b/UI/Themes/Charts/Charts.xaml @@ -16,13 +16,6 @@ - @@ -38,13 +31,52 @@ - + - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -60,8 +92,8 @@ - - + + - + @@ -161,22 +193,11 @@ - - - - - - - - - - + + + @@ -200,7 +221,7 @@ - + @@ -228,35 +249,19 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + - + + + - - + + + @@ -309,6 +314,22 @@ Value="Radar"> + + + + + + + + + + + + + + + + diff --git a/UI/Themes/Charts/ChartsItemTypeA.xaml b/UI/Themes/Charts/ChartsItemTypeA.xaml index d522ebe..f59dd2a 100644 --- a/UI/Themes/Charts/ChartsItemTypeA.xaml +++ b/UI/Themes/Charts/ChartsItemTypeA.xaml @@ -1,7 +1,9 @@  + xmlns:base="clr-namespace:UI.Controls.Base" xmlns:converter="clr-namespace:UI.Controls.Converters"> + + \ No newline at end of file diff --git a/UI/Themes/List/BaseListItem.xaml b/UI/Themes/List/BaseListItem.xaml index c2bf165..f15fd45 100644 --- a/UI/Themes/List/BaseListItem.xaml +++ b/UI/Themes/List/BaseListItem.xaml @@ -18,7 +18,7 @@ - + @@ -47,12 +47,12 @@ + Value="{DynamicResource ThemeColor}"/> + Value="{DynamicResource BaseListItemHoverBgColor}" /> diff --git a/UI/Themes/Navigation/NavigationItem.xaml b/UI/Themes/Navigation/NavigationItem.xaml index e34d4b0..14aa0da 100644 --- a/UI/Themes/Navigation/NavigationItem.xaml +++ b/UI/Themes/Navigation/NavigationItem.xaml @@ -12,25 +12,30 @@ - + + - + - - + + + + + @@ -49,11 +54,11 @@ - + - + @@ -63,7 +68,7 @@ --> - + @@ -80,7 +85,7 @@ - + @@ -93,32 +98,38 @@ - - - - + + + + + + + - - - - + + + + + + + + + + + diff --git a/UI/Themes/Select/DateSelect.xaml b/UI/Themes/Select/DateSelect.xaml index d7fd016..4d9a806 100644 --- a/UI/Themes/Select/DateSelect.xaml +++ b/UI/Themes/Select/DateSelect.xaml @@ -20,14 +20,14 @@ - + - - + + @@ -36,15 +36,15 @@ x:Name="Popup" Placement="Bottom" PlacementTarget="{Binding ElementName=Main}" - IsOpen="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:DateSelect}}, Path=IsOpen,Mode=TwoWay}" AllowsTransparency="True" > + IsOpen="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:DateSelect}}, Path=IsOpen,Mode=TwoWay}" AllowsTransparency="True" PopupAnimation="Slide"> + Background="{DynamicResource StandardBackgroundBrush2}" Padding="10" MaxHeight="300" Margin="10"> - + @@ -64,13 +64,13 @@ - + - + @@ -102,12 +102,12 @@ -