diff --git a/UI/App.xaml b/UI/App.xaml
index 42ee58b8111d6badb587295c7d7267639f0fa445..e2345ef01e5d9b5113ab260aaec489f9b2e917c7 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 554db2f34ec2b2bdb239fdcfe098af139ed79376..56e5ed0097f6a14520b5dd786657c3d0c5b81a8b 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 be940c2157179a32d4a91a456c20fdfe78b8e586..9f950187b0a294139c0b2bbc97a91be707214de6 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 553682ae9c3de6fefcefadb5b3fc8553581995aa..95a51ea6d84bef5c28aabb30cf6b6d90acaf73e2 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 c76ccf25a5d0d108dc70eadc364742628544a913..7ded671d5a752e0e4fddf3e5e9e397899162b269 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 ecfb922be7ebb3ae7a825f466e61e6b2a4d64e95..aa13b86b550fb636d7108b54a2d7a8244d1fbe4c 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 0124a37e445fe7d3b600a2554c838c75ea26d4a0..6bd3cc8d2799ac2d4e2c3efde4836b12bcdac363 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 c18f821acf4bc0eb5c3755765926bb60b62da4a4..aaeba994f65cbfa5679a926a15769da70021d0e2 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 37e00afe931e4665f54ca1f549926cc8a4258727..fed99a0500330ecae210b7f69fa7ec1695fa01d6 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 af144cc7b5cfb178b4a9879f125bcf070a1c4985..d3c2e7171591759378f1d7984dfd414025b3a5e3 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 c95ef0010137bcc121aee85e56fb54a9ef182a6d..89b96eda0940cf6977db1f2a80fb862b5251bdc8 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 b899787fd7df650e1d20445f3f15cb95934f8797..11a5373220aec43f0f37c134053fadc908da3ae5 100644
--- a/UI/MainWindow.xaml
+++ b/UI/MainWindow.xaml
@@ -43,7 +43,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 0000000000000000000000000000000000000000..37d6e2f1b5863d97b9a722a18648a3e9c32ba7b1
--- /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 c6e04c9286fe00019f9deb91c865c162acbf939d..0000000000000000000000000000000000000000
--- 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 b54b155dbdc7990886d7ffd23f10511caab918e3..0000000000000000000000000000000000000000
--- 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 dd8c9c0e66f29ae3752af91dbc483bd008fd2bb6..0000000000000000000000000000000000000000
--- 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 5bdf15e914f0329901cf0afa827c428f745ba8da..0000000000000000000000000000000000000000
--- 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 8fd46263eedfca4a3a37b44884d61d7ecf65fa74..0000000000000000000000000000000000000000
--- 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 e0aa1c6df3f4a93f87ef1a9fd2c9fd36ec57d34b..0000000000000000000000000000000000000000
--- 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 087fad6ea7f78eed8ec24a7847d8cb6a0ffb13df..0000000000000000000000000000000000000000
--- 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 aabb1c21f2e30b905d1e85ff6e1280d00af30c74..0000000000000000000000000000000000000000
--- 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 da0b66954afcb052784d26d3012c971305656f8a..0000000000000000000000000000000000000000
--- 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 0351c5fb912c694eb10a7e7e0be2e0caf09d0f24..0000000000000000000000000000000000000000
--- 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 484dbf9375b5eb1d2a053af5846f3a1259702c1d..0000000000000000000000000000000000000000
--- 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 5c1e4edf6e4a1630c9ba5db291a97a4f7948d84c..0000000000000000000000000000000000000000
--- 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 ebfc82a7fb689c48f1e04a617b86eb441bd6e19b..0000000000000000000000000000000000000000
--- 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 c3f2f0a032c3f9325f1cbff38e9a5a2cc9913661..0000000000000000000000000000000000000000
--- 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 412a3ecb6d80cb6429423202999d9844c5101317..0000000000000000000000000000000000000000
--- 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 1781b02b99db72de5062f56d3cad4fd9e3293485..0000000000000000000000000000000000000000
--- 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 ad9155b484d3b638f4a96b6c576d170b4c47278d..0000000000000000000000000000000000000000
--- 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 d43c702c4ac6ad678bbb3d1c79b4d47897e80881..0000000000000000000000000000000000000000
--- 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 b869753fd5774d9ba2529f3c952791a6fa6b5ffb..0000000000000000000000000000000000000000
--- 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 00f30fa5185fded0ddf81658ad9246d33a3db5fa..0000000000000000000000000000000000000000
--- 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 4a8d5969b1442a3c845615c9a61c9783ddc62de7..0000000000000000000000000000000000000000
--- 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 22a57cef0f3fb0b862ac29c9174d48091831d2f7..0000000000000000000000000000000000000000
--- 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 07fbb42baff3d99d862dfae68378fcc000281105..0000000000000000000000000000000000000000
--- 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 bd13a75f58114d887c73c7d406784f6e4f75b3f4..0000000000000000000000000000000000000000
--- 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 d8684dba5ac92a5c1d0b1f7fabd44bea69e2e503..0000000000000000000000000000000000000000
--- 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 8b55d56ab4cc0da4a31c354fc0c2d32e0317eec6..0000000000000000000000000000000000000000
--- 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 1a4fa8d600d3324405585780fcf10eaf72a6942b..0000000000000000000000000000000000000000
--- 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 d50ef34a0f398f6762b3d8d2e97beb92601d5104..0000000000000000000000000000000000000000
--- 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 803b113712fffeba3e70c51eabb5a05db1d3f0d5..0000000000000000000000000000000000000000
--- 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 8507c96d64a9093cd934c452aa9562c73c37a058..0000000000000000000000000000000000000000
--- 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 56abd7247b66e9b893dc9f32c4c0669f810bef0d..0000000000000000000000000000000000000000
--- 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 e55628f5f6f6d3226ab40002a5a8e46044b063d1..0000000000000000000000000000000000000000
--- 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 8c35a711e7a1cf27c807350af59817d0d92ae183..0000000000000000000000000000000000000000
--- 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 fe27844b676c9eaddd0521884c10caf889ee7812..0000000000000000000000000000000000000000
--- 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 ee9ae90d2eb1a91f1addb612b81cdd34302ebd9a..0000000000000000000000000000000000000000
--- 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 7851f9e825bf6b93838685c681b527d67f6d7512..0000000000000000000000000000000000000000
--- 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 b09986e3d40b5dbe7ecf3ebb58d742a05bb712eb..0000000000000000000000000000000000000000
--- 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 6619ff7e07c27ea7cb1f686c4b815724eb72b98a..0000000000000000000000000000000000000000
--- 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 0000000000000000000000000000000000000000..6f7996f69b9a3147558a2f3439740380b5293013
--- /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 c6e04c9286fe00019f9deb91c865c162acbf939d..0000000000000000000000000000000000000000
--- 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 b54b155dbdc7990886d7ffd23f10511caab918e3..0000000000000000000000000000000000000000
--- 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 1d33b165df08ec9ab45548a9547d2a2050792013..0000000000000000000000000000000000000000
--- 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 5bdf15e914f0329901cf0afa827c428f745ba8da..0000000000000000000000000000000000000000
--- 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 8fd46263eedfca4a3a37b44884d61d7ecf65fa74..0000000000000000000000000000000000000000
--- 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 e0aa1c6df3f4a93f87ef1a9fd2c9fd36ec57d34b..0000000000000000000000000000000000000000
--- 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 087fad6ea7f78eed8ec24a7847d8cb6a0ffb13df..0000000000000000000000000000000000000000
--- 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 aabb1c21f2e30b905d1e85ff6e1280d00af30c74..0000000000000000000000000000000000000000
--- 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 da0b66954afcb052784d26d3012c971305656f8a..0000000000000000000000000000000000000000
--- 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 950a326034ffaee31e9b333aeb0ca8a2240f4313..0000000000000000000000000000000000000000
--- 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 1533085ddab7195b99876068a63278df9b1ea0d8..0000000000000000000000000000000000000000
--- 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 afe610da87a7b2316b1f34f4c05e7508f40c7eae..0000000000000000000000000000000000000000
--- 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 21904af7b49504ed53c3ef2173b1af446067bb68..0000000000000000000000000000000000000000
--- 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 f3a5e07de8862c35775bb314d43cf31e31cfe7e8..0000000000000000000000000000000000000000
--- 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 412a3ecb6d80cb6429423202999d9844c5101317..0000000000000000000000000000000000000000
--- 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 e9b457ee0a70955c713ffb1ca12a88b926115816..0000000000000000000000000000000000000000
--- 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 ad9155b484d3b638f4a96b6c576d170b4c47278d..0000000000000000000000000000000000000000
--- 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 56ee8657f17901e73eb2b9e147d30e336ccf7466..0000000000000000000000000000000000000000
--- 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 b869753fd5774d9ba2529f3c952791a6fa6b5ffb..0000000000000000000000000000000000000000
--- 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 00f30fa5185fded0ddf81658ad9246d33a3db5fa..0000000000000000000000000000000000000000
--- 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 4a8d5969b1442a3c845615c9a61c9783ddc62de7..0000000000000000000000000000000000000000
--- 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 22a57cef0f3fb0b862ac29c9174d48091831d2f7..0000000000000000000000000000000000000000
--- 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 07fbb42baff3d99d862dfae68378fcc000281105..0000000000000000000000000000000000000000
--- 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 bd13a75f58114d887c73c7d406784f6e4f75b3f4..0000000000000000000000000000000000000000
--- 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 e19fe4a253fcc203328f48406df44cb4a40d0c1d..0000000000000000000000000000000000000000
--- 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 8b55d56ab4cc0da4a31c354fc0c2d32e0317eec6..0000000000000000000000000000000000000000
--- 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 2035d7a5ee973e33e6d2ecd17c0d161857c3c209..0000000000000000000000000000000000000000
--- 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 d50ef34a0f398f6762b3d8d2e97beb92601d5104..0000000000000000000000000000000000000000
--- 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 2c5817595b0005ad71c6facf789370a1745bf0f0..0000000000000000000000000000000000000000
--- 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 de29870735d821d60aa0d56466afe1ca8d02c308..0000000000000000000000000000000000000000
--- 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 c281af7328dc56033aef78f49eb2581277edc30e..0000000000000000000000000000000000000000
--- 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 058c51852ae91d2fdd19067d0792253de0e2565a..0000000000000000000000000000000000000000
--- 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 8c35a711e7a1cf27c807350af59817d0d92ae183..0000000000000000000000000000000000000000
--- 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 fe27844b676c9eaddd0521884c10caf889ee7812..0000000000000000000000000000000000000000
--- 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 ee9ae90d2eb1a91f1addb612b81cdd34302ebd9a..0000000000000000000000000000000000000000
--- 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 39b55eb31edced24b1e02825e16d4b4461d94c48..0000000000000000000000000000000000000000
--- 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 f06aa4cba77dc83c37e319ddc7265bebcd077caf..0000000000000000000000000000000000000000
--- 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 6619ff7e07c27ea7cb1f686c4b815724eb72b98a..0000000000000000000000000000000000000000
--- 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 e198fd6279bcd6469ed5770b041fac2d1324ea49..e30eaed2e95613371c048b818461322492404b90 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 e04dabf54cf665d4a1db3dde077a2b2c53b4ee3c..56dfd6f01823ffe40e132f6c395454f1ca3a7749 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 7084e66a8a030447a118ea8879a583a0b97d27c3..2175984fe7e5bf17b05c9f36e93ddd24dac847bb 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 c6e04c9286fe00019f9deb91c865c162acbf939d..207dd0ee2061f3e6cc25e1ae6c742b050d78fdb2 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 b31907a1872e77b7e5ad1ed363dc5c4417fb9288..be0c8dc409b3c9d16ea6b2697b92a7079bd44391 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 0b7949eaad74413e9f4b8c17a10b20b76f984293..1d33b165df08ec9ab45548a9547d2a2050792013 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 5bdf15e914f0329901cf0afa827c428f745ba8da..5472c3a9d6ba9bb94b901f88f7d17587d663a664 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 8fd46263eedfca4a3a37b44884d61d7ecf65fa74..1f2f386c9245c0785cd4d357bf11c046777b7d80 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 e0aa1c6df3f4a93f87ef1a9fd2c9fd36ec57d34b..9c529cdd7eb7c688d911a1039e6a8388e8006e32 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 282502a5b8d98d91a33016b871989b8e7a2de16d..950a326034ffaee31e9b333aeb0ca8a2240f4313 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 c6fc8902a7d658db3dd8ba5dc39f9ccaeab62122..6d863281ee0bca4c7dd69876485a7fdcbaa4c2f4 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 8be23d43177fc4cb7c754a39f6056e4a8727ce1a..8750d89c2e5c236a43f4e328879f27737904e278 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 d522ebec66b8bb26a0dce59913f0c42539ab82bb..f59dd2a738332cd06d3e2aa259adfaa179d65943 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 c2bf165ef37c5c1f8e70af0461c8896b44945f7e..f15fd4575eba2ef45d8cc7da2d3e3912ca2ca46e 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 e34d4b0db0e366da32603eb10e8e5b1b344664b2..14aa0da37ea03ddee0609ce320336385b0df3c8a 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 d7fd0161c808267aedeb35dfdf2836064016e1cc..4d9a8069569f4537428995b98202d96b0704a951 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 @@
-