From a10c833846417adb0578be55698857843c09c8de Mon Sep 17 00:00:00 2001 From: Abdelrhman-AK <59510211+Abdelrhman-AK@users.noreply.github.com> Date: Thu, 6 Oct 2022 23:52:43 +0200 Subject: [PATCH] 1.0.5.9 --- Documentations/Terminal.md | 2 +- StockThemes/W10_Init.wpth | 80 -- StockThemes/W11_Init.wpth | 80 -- WinPaletter/ApplicationEvents.vb | 291 ++++--- WinPaletter/Classes/NativeMethods.vb | 45 +- WinPaletter/Classes/XeSettings.vb | 78 +- WinPaletter/Controllers/SubMenu.vb | 2 +- WinPaletter/GUI/XenonUI.vb | 69 +- WinPaletter/MainFrm.vb | 2 +- .../Terminals/ExternalTerminal.Designer.vb | 26 +- .../Terminals/TerminalsDashboard.Designer.vb | 2 +- WinPaletter/Terminals/TerminalsDashboard.resx | 25 +- WinPaletter/Terminals/WinTerminal.vb | 7 +- .../Terminals/WindowsTerminal.Designer.vb | 158 ++-- WinPaletter/Terminals/WindowsTerminal.resx | 2 +- WinPaletter/Terminals/WindowsTerminal.vb | 223 +++--- .../WindowsTerminalDecide.Designer.vb | 218 ++++++ .../Terminals/WindowsTerminalDecide.resx | 736 ++++++++++++++++++ .../Terminals/WindowsTerminalDecide.vb | 28 + WinPaletter/Terminals/cmd.Designer.vb | 26 +- WinPaletter/Terminals/cmd.resx | 30 +- WinPaletter/WinPaletter.vbproj | 9 + 22 files changed, 1494 insertions(+), 645 deletions(-) delete mode 100644 StockThemes/W10_Init.wpth delete mode 100644 StockThemes/W11_Init.wpth create mode 100644 WinPaletter/Terminals/WindowsTerminalDecide.Designer.vb create mode 100644 WinPaletter/Terminals/WindowsTerminalDecide.resx create mode 100644 WinPaletter/Terminals/WindowsTerminalDecide.vb diff --git a/Documentations/Terminal.md b/Documentations/Terminal.md index 434e1a4c..f1a6f4b9 100644 --- a/Documentations/Terminal.md +++ b/Documentations/Terminal.md @@ -131,7 +131,7 @@ Press on button "Open "settings.json" in editor" which you will find in the bott You can do one solution from these: -* Backup "settings.json" (You will find this button below) before you do any preference\customization to the terminal, then when you decide to restore the old preferences, open the backed-up file by notepad or other editor and copy all contents, and then press button: "Open "settings.json" in editor" and override contents of "settings.json", save and open your Windows Terminals, you will find old preferences are restored. +* Backup "settings.json" (You will find this button in the upper part of the form) before you do any preference\customization to the terminal, then when you decide to restore the old preferences, open the backed-up file by notepad or other editor and copy all contents, and then press button: "Open "settings.json" in editor" and override contents of "settings.json", save and open your Windows Terminals, you will find old preferences are restored. * Restore Defaults ( As answer of question `Q3-E`) diff --git a/StockThemes/W10_Init.wpth b/StockThemes/W10_Init.wpth deleted file mode 100644 index 5166b37b..00000000 --- a/StockThemes/W10_Init.wpth +++ /dev/null @@ -1,80 +0,0 @@ - -*Created from App Version= 1.0.0.0 - - -*Palette Name= Windows 10 (Initial) -*Palette Description= (Initial; Like first time after Windows Setup) -*Palette File Version= 1.0 -*Author= Microsoft -*AuthorSocialMediaLink= www.microsoft.com - - - -*WinMode_Light= False -*AppMode_Light= True -*Transparency= True -*Blur= True -*AccentColorOnTitlebarAndBorders= False -*AccentColorOnStartTaskbarAndActionCenter= False - - - -*Titlebar_Active= -16746281 -*Titlebar_Inactive= -16777216 -*ActionCenter_AppsLinks= -5842689 -*Taskbar_Icon_Underline= -8996371 -*StartButton_Hover= -12411677 -*SettingsIconsAndLinks= -16746281 -*StartMenuBackground_ActiveTaskbarButton= -16754018 -*StartListFolders_TaskbarFront= -16760203 -*Taskbar_Background= -16767422 -*StartMenu_Accent= -16754018 -*Undefined= -16777216 - - - -*LogonUI_Background= -16777216 -*LogonUI_PersonalColors_Background= -16777216 -*LogonUI_PersonalColors_Accent= -16777216 -*LogonUI_DisableAcrylicBackgroundOnLogon= False -*LogonUI_DisableLogonBackgroundImage= False -*LogonUI_NoLockScreen= False - - - -*Win32UI_ActiveBorder= -4934476 -*Win32UI_ActiveTitle= -6703919 -*Win32UI_AppWorkspace= -5526613 -*Win32UI_Background= -16777216 -*Win32UI_ButtonAlternateFace= -16777216 -*Win32UI_ButtonDkShadow= -9868951 -*Win32UI_ButtonFace= -986896 -*Win32UI_ButtonHilight= -1 -*Win32UI_ButtonLight= -1842205 -*Win32UI_ButtonShadow= -6250336 -*Win32UI_ButtonText= -16777216 -*Win32UI_GradientActiveTitle= -4599318 -*Win32UI_GradientInactiveTitle= -2628366 -*Win32UI_GrayText= -9605779 -*Win32UI_HilightText= -1 -*Win32UI_HotTrackingColor= -16750900 -*Win32UI_InactiveBorder= -722948 -*Win32UI_InactiveTitle= -4207141 -*Win32UI_InactiveTitleText= -16777216 -*Win32UI_InfoText= -16777216 -*Win32UI_InfoWindow= -31 -*Win32UI_Menu= -986896 -*Win32UI_MenuBar= -986896 -*Win32UI_MenuText= -16777216 -*Win32UI_Scrollbar= -3618616 -*Win32UI_TitleText= -16777216 -*Win32UI_Window= -1 -*Win32UI_WindowFrame= -10197916 -*Win32UI_WindowText= -16777216 -*Win32UI_Hilight= -16746281 -*Win32UI_MenuHilight= -16746281 -*Win32UI_Desktop= -16777216 - - - - \ No newline at end of file diff --git a/StockThemes/W11_Init.wpth b/StockThemes/W11_Init.wpth deleted file mode 100644 index 10f4df8d..00000000 --- a/StockThemes/W11_Init.wpth +++ /dev/null @@ -1,80 +0,0 @@ - -*Created from App Version= 1.0.0.0 - - -*Palette Name= Windows 11 (Initial) -*Palette Description= (Initial; Like first time after Windows Setup) -*Palette File Version= 1.0 -*Author= Microsoft -*AuthorSocialMediaLink= www.microsoft.com - - - -*WinMode_Light= True -*AppMode_Light= True -*Transparency= True -*Blur= False -*AccentColorOnTitlebarAndBorders= True -*AccentColorOnStartTaskbarAndActionCenter= False - - - -*Titlebar_Active= -16746284 -*Titlebar_Inactive= -14474461 -*ActionCenter_AppsLinks= -6689793 -*Taskbar_Icon_Underline= -11746561 -*StartButton_Hover= -16739848 -*SettingsIconsAndLinks= -16746284 -*StartMenuBackground_ActiveTaskbarButton= -16750656 -*StartListFolders_TaskbarFront= -16761198 -*Taskbar_Background= -16770456 -*StartMenu_Accent= -16750656 -*Undefined= -16777216 - - - -*LogonUI_Background= -16777216 -*LogonUI_PersonalColors_Background= -16777216 -*LogonUI_PersonalColors_Accent= -16777216 -*LogonUI_DisableAcrylicBackgroundOnLogon= False -*LogonUI_DisableLogonBackgroundImage= False -*LogonUI_NoLockScreen= False - - - -*Win32UI_ActiveBorder= -4934476 -*Win32UI_ActiveTitle= -6703919 -*Win32UI_AppWorkspace= -5526613 -*Win32UI_Background= -16777216 -*Win32UI_ButtonAlternateFace= -16777216 -*Win32UI_ButtonDkShadow= -9868951 -*Win32UI_ButtonFace= -986896 -*Win32UI_ButtonHilight= -1 -*Win32UI_ButtonLight= -1842205 -*Win32UI_ButtonShadow= -6250336 -*Win32UI_ButtonText= -16777216 -*Win32UI_GradientActiveTitle= -4599318 -*Win32UI_GradientInactiveTitle= -2628366 -*Win32UI_GrayText= -9605779 -*Win32UI_HilightText= -1 -*Win32UI_HotTrackingColor= -16750900 -*Win32UI_InactiveBorder= -722948 -*Win32UI_InactiveTitle= -4207141 -*Win32UI_InactiveTitleText= -16777216 -*Win32UI_InfoText= -16777216 -*Win32UI_InfoWindow= -31 -*Win32UI_Menu= -986896 -*Win32UI_MenuBar= -986896 -*Win32UI_MenuText= -16777216 -*Win32UI_Scrollbar= -3618616 -*Win32UI_TitleText= -16777216 -*Win32UI_Window= -1 -*Win32UI_WindowFrame= -10197916 -*Win32UI_WindowText= -16777216 -*Win32UI_Hilight= -16746281 -*Win32UI_MenuHilight= -16746281 -*Win32UI_Desktop= -16777216 - - - - \ No newline at end of file diff --git a/WinPaletter/ApplicationEvents.vb b/WinPaletter/ApplicationEvents.vb index 6f74043f..7cf6d78f 100644 --- a/WinPaletter/ApplicationEvents.vb +++ b/WinPaletter/ApplicationEvents.vb @@ -367,38 +367,41 @@ Namespace My Public Sub AdjustFonts() Dim f As String = "Segoe UI" - If My.W11 And Not My.Application.LanguageHelper.RightToLeft Then f = "Segoe UI Variable Display" - - With MainFrm.Label1 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With MainFrm.Label10 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With MainFrm.Label17 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With MainFrm.themename_lbl : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With MainFrm.author_lbl : .Font = New Font(f, .Font.Size, .Font.Style) : End With - - With ColorPickerDlg.Label1 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With ColorPickerDlg.Label2 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With ColorPickerDlg.Label3 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With ColorPickerDlg.Label5 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - - With About.Label17 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With About.Label4 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With About.Label3 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - - With ComplexSave.Label1 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With ComplexSave.Label2 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With ComplexSave.Label17 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - - With SettingsX.Label17 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With SettingsX.Label1 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With SettingsX.Label2 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With SettingsX.Label3 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With SettingsX.Label5 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With SettingsX.Label6 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With SettingsX.Label7 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - - With Whatsnew.Label2 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With Whatsnew.Label4 : .Font = New Font(f, .Font.Size, .Font.Style) : End With - With Whatsnew.Label13 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + If My.W11 And Not My.Application.LanguageHelper.RightToLeft Then + f = "Segoe UI Variable Display" + + With MainFrm.Label1 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With MainFrm.Label10 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With MainFrm.Label17 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With MainFrm.themename_lbl : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With MainFrm.author_lbl : .Font = New Font(f, .Font.Size, .Font.Style) : End With + + With ColorPickerDlg.Label1 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With ColorPickerDlg.Label2 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With ColorPickerDlg.Label3 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With ColorPickerDlg.Label5 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + + With About.Label17 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With About.Label4 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With About.Label3 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + + With ComplexSave.Label1 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With ComplexSave.Label2 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With ComplexSave.Label17 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + + With SettingsX.Label17 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With SettingsX.Label1 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With SettingsX.Label2 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With SettingsX.Label3 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With SettingsX.Label5 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With SettingsX.Label6 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With SettingsX.Label7 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + + With Whatsnew.Label2 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With Whatsnew.Label4 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + With Whatsnew.Label13 : .Font = New Font(f, .Font.Size, .Font.Style) : End With + End If + End Sub Public Function GetFormFromName(Name As String) As Form @@ -426,14 +429,10 @@ Namespace My If Name.ToLower = "TerminalInfo".ToLower Then Return TerminalInfo If Name.ToLower = "TerminalsDashboard".ToLower Then Return TerminalsDashboard If Name.ToLower = "WindowsTerminal".ToLower Then Return WindowsTerminal + If Name.ToLower = "WindowsTerminalDecide".ToLower Then Return WindowsTerminalDecide End Function Private Sub MyApplication_Startup(sender As Object, e As StartupEventArgs) Handles Me.Startup - Dim sw, sw_all As New Stopwatch - sw.Reset() : sw.Start() - sw.Start() - sw_all.Reset() - sw_all.Start() Try MemoryFonts.AddMemoryFont(My.Resources.JetBrainsMono_Regular) @@ -449,53 +448,45 @@ Namespace My FontsList.Clear() FontsFixedList.Clear() - For Each [font] As FontFamily In FontFamily.Families FontsList.Add([font].Name) Next - Dim B As New Bitmap(30, 30) Dim G As Graphics = Graphics.FromImage(B) - For Each [font] As FontFamily In NativeMethods.GDI32.GetFixedWidthFonts(G) FontsFixedList.Add([font].Name) Next - B.Dispose() G.Dispose() - sw_all.Stop() - MsgBox("Populating Fonts: " & sw.ElapsedMilliseconds) - sw.Reset() : sw.Start() - sw_all.Start() - _Settings = New XeSettings(XeSettings.Mode.Registry) allForms = New List(Of String) From { "About", -"Changelog", -"ColorPickerDlg", -"ComplexSave", -"dragPreviewer", -"EditInfo", -"LogonUI", -"MainFrm", -"Whatsnew", -"Updates", -"Win32UI", -"SettingsX", -"CursorsStudio", -"ApplyingTheme", -"LogonUI7", -"LogonUI8Colors", -"LogonUI8_Pics", -"Start8Selector", -"cmd", -"ExternalTerminal", -"NewExtTerminal", -"TerminalInfo", -"TerminalsDashboard", -"WindowsTerminal" -} + "Changelog", + "ColorPickerDlg", + "ComplexSave", + "dragPreviewer", + "EditInfo", + "LogonUI", + "MainFrm", + "Whatsnew", + "Updates", + "Win32UI", + "SettingsX", + "CursorsStudio", + "ApplyingTheme", + "LogonUI7", + "LogonUI8Colors", + "LogonUI8_Pics", + "Start8Selector", + "cmd", + "ExternalTerminal", + "NewExtTerminal", + "TerminalInfo", + "TerminalsDashboard", + "WindowsTerminal", + "WindowsTerminalDecide" + } If My.Application._Settings.Language Then My.Application.LanguageHelper.LoadLanguageFromFile(My.Application._Settings.Language_File) @@ -503,11 +494,6 @@ Namespace My My.Application.LanguageHelper.LoadInternal() End If - sw_all.Stop() - MsgBox("LoadLanguage: " & sw.ElapsedMilliseconds) - sw.Reset() : sw.Start() - sw_all.Start() - Dim ProcessKillerInfo As New ProcessStartInfo With { .FileName = Environment.GetEnvironmentVariable("WINDIR") & "\System32\taskkill.exe", .Verb = "runas", @@ -515,7 +501,6 @@ Namespace My .WindowStyle = ProcessWindowStyle.Hidden, .UseShellExecute = True } - Dim processExplorerInfo As New ProcessStartInfo With { .FileName = explorerPath, .Arguments = "", @@ -523,9 +508,9 @@ Namespace My .UseShellExecute = True } If Not My.W8 Then processExplorerInfo.Verb = "runas" - processKiller.StartInfo = ProcessKillerInfo processExplorer.StartInfo = processExplorerInfo + Try For x = 1 To Environment.GetCommandLineArgs.Count - 1 Dim arg As String = Environment.GetCommandLineArgs(x) @@ -550,22 +535,13 @@ Namespace My DetectOS() - '#If Not DEBUG Then - 'If My.W7 Or My.W8 Then - 'MsgBox("WinPaletter doesn't fully support " & My.Computer.Info.OSFullName & vbCrLf & vbCrLf & - '"You can use some features like Colorizing Cursors and Win32UI (unstable in current OS only) until the others features are developed to support both Windows 7 and 8 (Coming Soon)." _ - ', MsgBoxStyle.Exclamation + MsgboxRt()) - 'End If - '#End If - - Try : If IO.File.Exists("oldWinpaletter.trash") Then Kill("oldWinpaletter.trash") Catch : End Try + Wallpaper = ResizeImage(My.Application.GetCurrentWallpaper(), 528, 297) Monitor() ApplyDarkMode() - #Region "WhatsNew" If Not _Settings.WhatsNewRecord.ToArray.Contains(My.Application.Info.Version.ToString) Then '### Pop up WhatsNew @@ -582,73 +558,78 @@ Namespace My _Settings.WhatsNewRecord = ver.ToArray _Settings.Save(XeSettings.Mode.Registry) End If - - #End Region - If _Settings.AutoAddExt Then - If Not IO.Directory.Exists(appData) Then IO.Directory.CreateDirectory(appData) + Try If _Settings.AutoAddExt Then If Not IO.Directory.Exists(appData) Then IO.Directory.CreateDirectory(appData) - Dim file As System.IO.FileStream = New System.IO.FileStream(appData & "\fileextension.ico", System.IO.FileMode.OpenOrCreate) - My.Resources.fileextension.Save(file) - file.Close() + If _Settings.AutoAddExt Then + If Not IO.Directory.Exists(appData) Then IO.Directory.CreateDirectory(appData) - file = New System.IO.FileStream(appData & "\settingsfile.ico", System.IO.FileMode.OpenOrCreate) - My.Resources.settingsfile.Save(file) - file.Close() + Dim file As System.IO.FileStream = New System.IO.FileStream(appData & "\fileextension.ico", System.IO.FileMode.OpenOrCreate) + My.Resources.fileextension.Save(file) + file.Close() - CreateFileAssociation(".wpth", "WinPaletter.ThemeFile", "WinPaletter Theme File", """" & Assembly.GetExecutingAssembly().Location & """") - CreateFileAssociation(".wpsf", "WinPaletter.SettingsFile", "WinPaletter Settings File", """" & Assembly.GetExecutingAssembly().Location & """") + file = New System.IO.FileStream(appData & "\settingsfile.ico", System.IO.FileMode.OpenOrCreate) + My.Resources.settingsfile.Save(file) + file.Close() + + CreateFileAssociation(".wpth", "WinPaletter.ThemeFile", "WinPaletter Theme File", """" & Assembly.GetExecutingAssembly().Location & """") + CreateFileAssociation(".wpsf", "WinPaletter.SettingsFile", "WinPaletter Settings File", """" & Assembly.GetExecutingAssembly().Location & """") + End If End If - End If + Catch + End Try AnimatorX = New AnimatorNS.Animator With {.Interval = 1, .TimeStep = 0.07, .DefaultAnimation = AnimatorNS.Animation.Transparent, .AnimationType = AnimatorNS.AnimationType.Transparent} - ExternalLink = False - ExternalLink_File = "" - ComplexSaveResult = "2.0" '' 2 = Don't save, 0 = Don't Apply - - CP.PopulateThemeToListbox(Win32UI.XenonComboBox1) - CP.PopulateThemeToListbox(ColorPickerDlg.XenonComboBox1) - ChangeLogImgLst.ColorDepth = ColorDepth.Depth32Bit - ChangeLogImgLst.ImageSize = New Size(24, 24) - ChangeLogImgLst.Images.Add("Stable", My.Resources.CL_Stable) - ChangeLogImgLst.Images.Add("Beta", My.Resources.CL_Beta) - ChangeLogImgLst.Images.Add("Add", My.Resources.CL_add) - ChangeLogImgLst.Images.Add("Removed", My.Resources.CL_Removed) - ChangeLogImgLst.Images.Add("BugFix", My.Resources.CL_BugFix) - ChangeLogImgLst.Images.Add("New", My.Resources.CL_New) - ChangeLogImgLst.Images.Add("Channel", My.Resources.CL_channel) - ChangeLogImgLst.Images.Add("Error", My.Resources.CL_Error) - ChangeLogImgLst.Images.Add("Date", My.Resources.CL_Date) - Try - For x = 1 To Environment.GetCommandLineArgs.Count - 1 - Dim arg As String = Environment.GetCommandLineArgs(x) - If My.Computer.FileSystem.GetFileInfo(arg).Extension.ToLower = ".wpth" Then - If My.Application._Settings.OpeningPreviewInApp_or_AppliesIt Then - ExternalLink = True - ExternalLink_File = arg - Else - Dim CPx As New CP(CP.Mode.File, arg) - CPx.Save(CP.SavingMode.Registry, arg) - RestartExplorer() - Process.GetCurrentProcess.Kill() - End If - End If - If My.Computer.FileSystem.GetFileInfo(arg).Extension.ToLower = ".wpsf" Then - SettingsX._External = True - SettingsX._File = arg - SettingsX.ShowDialog() + ExternalLink = False + ExternalLink_File = "" + ComplexSaveResult = "2.0" '' 2 = Don't save, 0 = Don't Apply + + CP.PopulateThemeToListbox(Win32UI.XenonComboBox1) + CP.PopulateThemeToListbox(ColorPickerDlg.XenonComboBox1) + + ChangeLogImgLst.ColorDepth = ColorDepth.Depth32Bit + ChangeLogImgLst.ImageSize = New Size(24, 24) + ChangeLogImgLst.Images.Add("Stable", My.Resources.CL_Stable) + ChangeLogImgLst.Images.Add("Beta", My.Resources.CL_Beta) + ChangeLogImgLst.Images.Add("Add", My.Resources.CL_add) + ChangeLogImgLst.Images.Add("Removed", My.Resources.CL_Removed) + ChangeLogImgLst.Images.Add("BugFix", My.Resources.CL_BugFix) + ChangeLogImgLst.Images.Add("New", My.Resources.CL_New) + ChangeLogImgLst.Images.Add("Channel", My.Resources.CL_channel) + ChangeLogImgLst.Images.Add("Error", My.Resources.CL_Error) + ChangeLogImgLst.Images.Add("Date", My.Resources.CL_Date) + + Try + For x = 1 To Environment.GetCommandLineArgs.Count - 1 + Dim arg As String = Environment.GetCommandLineArgs(x) + + If My.Computer.FileSystem.GetFileInfo(arg).Extension.ToLower = ".wpth" Then + If My.Application._Settings.OpeningPreviewInApp_or_AppliesIt Then + ExternalLink = True + ExternalLink_File = arg + Else + Dim CPx As New CP(CP.Mode.File, arg) + CPx.Save(CP.SavingMode.Registry, arg) + RestartExplorer() Process.GetCurrentProcess.Kill() End If - Next - Catch - End Try - WinRes = New WinResources - MsgBox("Overall: " & sw_all.ElapsedMilliseconds) + End If + + If My.Computer.FileSystem.GetFileInfo(arg).Extension.ToLower = ".wpsf" Then + SettingsX._External = True + SettingsX._File = arg + SettingsX.ShowDialog() + Process.GetCurrentProcess.Kill() + End If + Next + Catch + End Try + Try : WinRes = New WinResources : Catch : End Try End Sub Private Sub MyApplication_StartupNextInstance(sender As Object, e As StartupNextInstanceEventArgs) Handles Me.StartupNextInstance Try @@ -746,21 +727,31 @@ Namespace My Private WithEvents Domain As AppDomain = AppDomain.CurrentDomain Private Function DomainCheck(sender As Object, e As System.ResolveEventArgs) As System.Reflection.Assembly Handles Domain.AssemblyResolve - If e.Name.ToUpper.Contains("Animator".ToUpper) Then Return Assembly.Load(My.Resources.Animator) - If e.Name.ToUpper.Contains("Cyotek.Windows.Forms.ColorPicker".ToUpper) Then Return Assembly.Load(My.Resources.Cyotek_Windows_Forms_ColorPicker) - If e.Name.ToUpper.Contains("ColorThief.Desktop.v46".ToUpper) Then Return Assembly.Load(My.Resources.ColorThief_Desktop_v46) - If e.Name.ToUpper.Contains("AnimCur".ToUpper) Then Return Assembly.Load(My.Resources.AnimCur) - If e.Name.ToUpper.Contains("Newtonsoft.Json".ToUpper) Then Return Assembly.Load(My.Resources.Newtonsoft_Json) -#Disable Warning BC42105 + + Try : If e.Name.ToUpper.Contains("Animator".ToUpper) Then Return Assembly.Load(My.Resources.Animator) + Catch : End Try + + Try : If e.Name.ToUpper.Contains("Cyotek.Windows.Forms.ColorPicker".ToUpper) Then Return Assembly.Load(My.Resources.Cyotek_Windows_Forms_ColorPicker) + Catch : End Try + + Try : If e.Name.ToUpper.Contains("ColorThief.Desktop.v46".ToUpper) Then Return Assembly.Load(My.Resources.ColorThief_Desktop_v46) + Catch : End Try + + Try : If e.Name.ToUpper.Contains("AnimCur".ToUpper) Then Return Assembly.Load(My.Resources.AnimCur) + Catch : End Try + + Try : If e.Name.ToUpper.Contains("Newtonsoft.Json".ToUpper) Then Return Assembly.Load(My.Resources.Newtonsoft_Json) + Catch : End Try + End Function Private Sub MyApplication_UnhandledException(sender As Object, e As UnhandledExceptionEventArgs) Handles Me.UnhandledException -#If DEBUG Then - MsgBox(e.Exception.Message & vbCrLf & vbCrLf & e.Exception.StackTrace, MsgBoxStyle.Critical) -#End If + '#If DEBUG Then + Throw e.Exception + 'MsgBox(e.Exception.Message & vbCrLf & vbCrLf & e.Exception.StackTrace, MsgBoxStyle.Critical + MsgboxRt()) + '#End If End Sub -#Enable Warning BC42105 End Class End Namespace \ No newline at end of file diff --git a/WinPaletter/Classes/NativeMethods.vb b/WinPaletter/Classes/NativeMethods.vb index a8336718..f4fdf8c9 100644 --- a/WinPaletter/Classes/NativeMethods.vb +++ b/WinPaletter/Classes/NativeMethods.vb @@ -300,38 +300,43 @@ Namespace NativeMethods Dim hDC As IntPtr = dc.GetHdc() For Each oFontFamily As System.Drawing.FontFamily In System.Drawing.FontFamily.Families + Try - Using oFont As System.Drawing.Font = New System.Drawing.Font(oFontFamily, 10) - Dim hFont As IntPtr = IntPtr.Zero - Dim hFontDefault As IntPtr = IntPtr.Zero + If oFontFamily.IsStyleAvailable(FontStyle.Regular) Then + Using oFont As System.Drawing.Font = New System.Drawing.Font(oFontFamily, 10) + Dim hFont As IntPtr = IntPtr.Zero + Dim hFontDefault As IntPtr = IntPtr.Zero - Try - Dim oTextMetric As TEXTMETRICW - hFont = oFont.ToHfont() - hFontDefault = SelectObject(hDC, hFont) + Try + Dim oTextMetric As TEXTMETRICW + hFont = oFont.ToHfont() + hFontDefault = SelectObject(hDC, hFont) - If GetTextMetrics(hDC, oTextMetric) Then + If GetTextMetrics(hDC, oTextMetric) Then - If (oTextMetric.tmPitchAndFamily And 1) = 0 Then - Yield oFontFamily + If (oTextMetric.tmPitchAndFamily And 1) = 0 Then + Yield oFontFamily + End If End If - End If - Finally + Finally - If hFontDefault <> IntPtr.Zero Then - SelectObject(hDC, hFontDefault) - End If + If hFontDefault <> IntPtr.Zero Then + SelectObject(hDC, hFontDefault) + End If - If hFont <> IntPtr.Zero Then - DeleteObject(hFont) - End If - End Try - End Using + If hFont <> IntPtr.Zero Then + DeleteObject(hFont) + End If + + End Try + End Using + End If Catch End Try Next + dc.ReleaseHdc() End Function End Class diff --git a/WinPaletter/Classes/XeSettings.vb b/WinPaletter/Classes/XeSettings.vb index 527ae365..54fdcbfc 100644 --- a/WinPaletter/Classes/XeSettings.vb +++ b/WinPaletter/Classes/XeSettings.vb @@ -58,19 +58,18 @@ Public Class XeSettings End Enum Sub CheckRegIfIntact() - Dim Key As RegistryKey Dim AppReg As String = "Software\WinPaletter\Settings" Key = Registry.CurrentUser.CreateSubKey(AppReg) - If Key.GetValue("AutoUpdatesChecking", Nothing) Is Nothing Then Key.SetValue("AutoUpdatesChecking", AutoUpdatesChecking, RegistryValueKind.DWord) - If Key.GetValue("AutoAddExt", Nothing) Is Nothing Then Key.SetValue("AutoAddExt", AutoAddExt, RegistryValueKind.DWord) - If Key.GetValue("DragAndDropPreview", Nothing) Is Nothing Then Key.SetValue("DragAndDropPreview", DragAndDropPreview, RegistryValueKind.DWord) - If Key.GetValue("Win7LivePreview", Nothing) Is Nothing Then Key.SetValue("Win7LivePreview", Win7LivePreview, RegistryValueKind.DWord) - If Key.GetValue("OpeningPreviewInApp_or_AppliesIt", Nothing) Is Nothing Then Key.SetValue("OpeningPreviewInApp_or_AppliesIt", OpeningPreviewInApp_or_AppliesIt, RegistryValueKind.DWord) - If Key.GetValue("AutoRestartExplorer", Nothing) Is Nothing Then Key.SetValue("AutoRestartExplorer", AutoRestartExplorer, RegistryValueKind.DWord) - If Key.GetValue("AutoApplyCursors", Nothing) Is Nothing Then Key.SetValue("AutoApplyCursors", AutoApplyCursors, RegistryValueKind.DWord) - If Key.GetValue("CustomPreviewConfig_Enabled", Nothing) Is Nothing Then Key.SetValue("CustomPreviewConfig_Enabled", CustomPreviewConfig_Enabled, RegistryValueKind.DWord) + If Key.GetValue("AutoUpdatesChecking", Nothing) Is Nothing Then Key.SetValue("AutoUpdatesChecking", True, RegistryValueKind.DWord) + If Key.GetValue("AutoAddExt", Nothing) Is Nothing Then Key.SetValue("AutoAddExt", True, RegistryValueKind.DWord) + If Key.GetValue("DragAndDropPreview", Nothing) Is Nothing Then Key.SetValue("DragAndDropPreview", True, RegistryValueKind.DWord) + If Key.GetValue("Win7LivePreview", Nothing) Is Nothing Then Key.SetValue("Win7LivePreview", True, RegistryValueKind.DWord) + If Key.GetValue("OpeningPreviewInApp_or_AppliesIt", Nothing) Is Nothing Then Key.SetValue("OpeningPreviewInApp_or_AppliesIt", True, RegistryValueKind.DWord) + If Key.GetValue("AutoRestartExplorer", Nothing) Is Nothing Then Key.SetValue("AutoRestartExplorer", True, RegistryValueKind.DWord) + If Key.GetValue("AutoApplyCursors", Nothing) Is Nothing Then Key.SetValue("AutoApplyCursors", False, RegistryValueKind.DWord) + If Key.GetValue("CustomPreviewConfig_Enabled", Nothing) Is Nothing Then Key.SetValue("CustomPreviewConfig_Enabled", False, RegistryValueKind.DWord) Select Case CustomPreviewConfig Case WinVer.Eleven @@ -84,13 +83,13 @@ Public Class XeSettings End Select If Key.GetValue("UpdateChannel", Nothing) Is Nothing Then Key.SetValue("UpdateChannel", If(UpdateChannel = UpdateChannels.Stable, 0, 1)) - If Key.GetValue("Appearance_Dark", Nothing) Is Nothing Then Key.SetValue("Appearance_Dark", Appearance_Dark, RegistryValueKind.DWord) - If Key.GetValue("Appearance_Auto", Nothing) Is Nothing Then Key.SetValue("Appearance_Auto", Appearance_Auto, RegistryValueKind.DWord) - If Key.GetValue("WhatsNewRecord", Nothing) Is Nothing Then Key.SetValue("WhatsNewRecord", WhatsNewRecord, RegistryValueKind.MultiString) - If Key.GetValue("Language", Nothing) Is Nothing Then Key.SetValue("Language", Language, RegistryValueKind.DWord) + If Key.GetValue("Appearance_Dark", Nothing) Is Nothing Then Key.SetValue("Appearance_Dark", True, RegistryValueKind.DWord) + If Key.GetValue("Appearance_Auto", Nothing) Is Nothing Then Key.SetValue("Appearance_Auto", True, RegistryValueKind.DWord) + If Key.GetValue("WhatsNewRecord", Nothing) Is Nothing Then Key.SetValue("WhatsNewRecord", {""}, RegistryValueKind.MultiString) + If Key.GetValue("Language", Nothing) Is Nothing Then Key.SetValue("Language", False, RegistryValueKind.DWord) If Key.GetValue("Language_File", Nothing) Is Nothing Then Key.SetValue("Language_File", "", RegistryValueKind.String) - If Key.GetValue("Nerd_Stats", Nothing) Is Nothing Then Key.SetValue("Nerd_Stats", Nerd_Stats, RegistryValueKind.DWord) - If Key.GetValue("Nerd_Stats_HexHash", Nothing) Is Nothing Then Key.SetValue("Nerd_Stats_HexHash", Nerd_Stats_HexHash, RegistryValueKind.DWord) + If Key.GetValue("Nerd_Stats", Nothing) Is Nothing Then Key.SetValue("Nerd_Stats", True, RegistryValueKind.DWord) + If Key.GetValue("Nerd_Stats_HexHash", Nothing) Is Nothing Then Key.SetValue("Nerd_Stats_HexHash", True, RegistryValueKind.DWord) Select Case Nerd_Stats_Kind Case Nerd_Stats_Type.HEX @@ -103,37 +102,38 @@ Public Class XeSettings If Key.GetValue("Nerd_Stats_Kind", Nothing) Is Nothing Then Key.SetValue("Nerd_Stats_Kind", 3) End Select - If Key.GetValue("Terminal_Bypass", Nothing) Is Nothing Then Key.SetValue("Terminal_Bypass", Terminal_Bypass, RegistryValueKind.DWord) - If Key.GetValue("Terminal_OtherFonts", Nothing) Is Nothing Then Key.SetValue("Terminal_OtherFonts", Terminal_OtherFonts, RegistryValueKind.DWord) - If Key.GetValue("Terminal_Path_Deflection", Nothing) Is Nothing Then Key.SetValue("Terminal_Path_Deflection", Terminal_Path_Deflection, RegistryValueKind.DWord) - If Key.GetValue("Terminal_Stable_Path", Nothing) Is Nothing Then Key.SetValue("Terminal_Stable_Path", Terminal_Stable_Path, RegistryValueKind.String) - If Key.GetValue("Terminal_Preview_Path", Nothing) Is Nothing Then Key.SetValue("Terminal_Preview_Path", Terminal_Preview_Path, RegistryValueKind.String) - + If Key.GetValue("Terminal_Bypass", Nothing) Is Nothing Then Key.SetValue("Terminal_Bypass", False, RegistryValueKind.DWord) + If Key.GetValue("Terminal_OtherFonts", Nothing) Is Nothing Then Key.SetValue("Terminal_OtherFonts", False, RegistryValueKind.DWord) + If Key.GetValue("Terminal_Path_Deflection", Nothing) Is Nothing Then Key.SetValue("Terminal_Path_Deflection", False, RegistryValueKind.DWord) + If Key.GetValue("Terminal_Stable_Path", Nothing) Is Nothing Then Key.SetValue("Terminal_Stable_Path", Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json", RegistryValueKind.String) + If Key.GetValue("Terminal_Preview_Path", Nothing) Is Nothing Then Key.SetValue("Terminal_Preview_Path", Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe\LocalState\settings.json", RegistryValueKind.String) End Sub Sub New(ByVal LoadFrom As Mode, Optional ByVal File As String = Nothing) Select Case LoadFrom Case Mode.Registry CheckRegIfIntact() + Dim Key As RegistryKey Dim AppReg As String = "Software\WinPaletter\Settings" Key = Registry.CurrentUser.CreateSubKey(AppReg) - AutoAddExt = Key.GetValue("AutoAddExt", Nothing) - AutoApplyCursors = Key.GetValue("AutoApplyCursors", Nothing) - DragAndDropPreview = Key.GetValue("DragAndDropPreview", Nothing) - OpeningPreviewInApp_or_AppliesIt = Key.GetValue("OpeningPreviewInApp_or_AppliesIt", Nothing) - AutoRestartExplorer = Key.GetValue("AutoRestartExplorer", Nothing) - Win7LivePreview = Key.GetValue("Win7LivePreview", Nothing) - AutoUpdatesChecking = Key.GetValue("AutoUpdatesChecking", Nothing) - CustomPreviewConfig_Enabled = Key.GetValue("CustomPreviewConfig_Enabled", Nothing) - - Terminal_Bypass = Key.GetValue("Terminal_Bypass", Nothing) - Terminal_OtherFonts = Key.GetValue("Terminal_OtherFonts", Nothing) + + AutoAddExt = Key.GetValue("AutoAddExt", True) + AutoApplyCursors = Key.GetValue("AutoApplyCursors", False) + DragAndDropPreview = Key.GetValue("DragAndDropPreview", True) + OpeningPreviewInApp_or_AppliesIt = Key.GetValue("OpeningPreviewInApp_or_AppliesIt", True) + AutoRestartExplorer = Key.GetValue("AutoRestartExplorer", True) + Win7LivePreview = Key.GetValue("Win7LivePreview", True) + AutoUpdatesChecking = Key.GetValue("AutoUpdatesChecking", True) + CustomPreviewConfig_Enabled = Key.GetValue("CustomPreviewConfig_Enabled", False) + + Terminal_Bypass = Key.GetValue("Terminal_Bypass", False) + Terminal_OtherFonts = Key.GetValue("Terminal_OtherFonts", False) Terminal_Path_Deflection = Key.GetValue("Terminal_Path_Deflection", False) Terminal_Stable_Path = Key.GetValue("Terminal_Stable_Path", Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json") Terminal_Preview_Path = Key.GetValue("Terminal_Preview_Path", Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe\LocalState\settings.json") - Select Case Key.GetValue("CustomPreviewConfig", Nothing) + Select Case Key.GetValue("CustomPreviewConfig", 0) Case 0 CustomPreviewConfig = WinVer.Eleven Case 1 @@ -144,17 +144,17 @@ Public Class XeSettings CustomPreviewConfig = WinVer.Seven End Select - UpdateChannel = If(Key.GetValue("UpdateChannel", Nothing) = UpdateChannels.Stable, UpdateChannels.Stable, UpdateChannels.Beta) - Appearance_Dark = Key.GetValue("Appearance_Dark", Nothing) - Appearance_Auto = Key.GetValue("Appearance_Auto", Nothing) - WhatsNewRecord = Key.GetValue("WhatsNewRecord", Nothing) + UpdateChannel = If(Key.GetValue("UpdateChannel", UpdateChannels.Stable) = UpdateChannels.Stable, UpdateChannels.Stable, UpdateChannels.Beta) + Appearance_Dark = Key.GetValue("Appearance_Dark", True) + Appearance_Auto = Key.GetValue("Appearance_Auto", True) + WhatsNewRecord = Key.GetValue("WhatsNewRecord", {""}) Language = Key.GetValue("Language", False) - Language_File = Key.GetValue("Language_File", Nothing) + Language_File = Key.GetValue("Language_File", "") Nerd_Stats = Key.GetValue("Nerd_Stats", True) Nerd_Stats_HexHash = Key.GetValue("Nerd_Stats_HexHash", True) - Select Case Key.GetValue("Nerd_Stats_Kind", 0) + Select Case Key.GetValue("Nerd_Stats_Kind", Nerd_Stats_Type.HEX) Case 0 Nerd_Stats_Kind = Nerd_Stats_Type.HEX Case 1 diff --git a/WinPaletter/Controllers/SubMenu.vb b/WinPaletter/Controllers/SubMenu.vb index 9082a41f..53a712cf 100644 --- a/WinPaletter/Controllers/SubMenu.vb +++ b/WinPaletter/Controllers/SubMenu.vb @@ -80,7 +80,7 @@ Public Class SubMenu Select Case My.Application.ColorEvent Case My.MyApplication.MenuEvent.Copy My.Application.CopiedColor = MainColor.BackColor - Return Nothing + Return ColorHandle.BackColor Case My.MyApplication.MenuEvent.Cut My.Application.CopiedColor = MainColor.BackColor diff --git a/WinPaletter/GUI/XenonUI.vb b/WinPaletter/GUI/XenonUI.vb index e2a88a86..a0f06023 100644 --- a/WinPaletter/GUI/XenonUI.vb +++ b/WinPaletter/GUI/XenonUI.vb @@ -5171,6 +5171,8 @@ Public Class XenonCMD Protected Overrides Sub OnPaint(e As System.Windows.Forms.PaintEventArgs) Dim G As Graphics = e.Graphics G.SmoothingMode = SmoothingMode.AntiAlias + G.TextRenderingHint = TextRenderingHint.ClearTypeGridFit + DoubleBuffered = True Dim Rect As New Rectangle(0, 0, Width - 1, Height - 1) @@ -5453,6 +5455,7 @@ Public Class XenonTerminal Public Property TabIcon As Image Public Property TabColor As Color = Color.FromArgb(0, 0, 0, 0) + Public Property PreviewVersion As Boolean = True Public Property TabIconButItIsString As String = "" Public Property IsFocused As Boolean = True Enum CursorShape_Enum @@ -5635,32 +5638,46 @@ Public Class XenonTerminal G.SmoothingMode = SmoothingMode.AntiAlias DoubleBuffered = True - If Not Light Then - If Color_Titlebar = Color.FromArgb(0, 0, 0, 0) Then Color_Titlebar = Color.FromArgb(46, 46, 46) - If Color_TabFocused = Color.FromArgb(0, 0, 0, 0) Then Color_TabFocused = Color_Background + If PreviewVersion Then + If Not Light Then + If Color_Titlebar = Color.FromArgb(0, 0, 0, 0) Then Color_Titlebar = Color.FromArgb(46, 46, 46) + If Color_TabFocused = Color.FromArgb(0, 0, 0, 0) Then Color_TabFocused = Color_Background - If Color_TabUnFocused = Color.FromArgb(0, 0, 0, 0) Then - If Color_TabFocused = Color_Background Then - Color_TabUnFocused = Color_Titlebar - Else - Color_TabUnFocused = ControlPaint.Dark(Color_TabFocused) + If Color_TabUnFocused = Color.FromArgb(0, 0, 0, 0) Then + If Color_TabFocused = Color_Background Then + Color_TabUnFocused = Color_Titlebar + Else + Color_TabUnFocused = ControlPaint.Dark(Color_TabFocused) + End If End If - End If - If Color_Titlebar_Unfocused = Color.FromArgb(0, 0, 0, 0) Then Color_Titlebar_Unfocused = Color.FromArgb(46, 46, 46) - Else - If Color_Titlebar = Color.FromArgb(0, 0, 0, 0) Then Color_Titlebar = Color.FromArgb(232, 232, 232) - If Color_TabFocused = Color.FromArgb(0, 0, 0, 0) Then Color_TabFocused = Color_Background + If Color_Titlebar_Unfocused = Color.FromArgb(0, 0, 0, 0) Then Color_Titlebar_Unfocused = Color.FromArgb(46, 46, 46) + Else + If Color_Titlebar = Color.FromArgb(0, 0, 0, 0) Then Color_Titlebar = Color.FromArgb(232, 232, 232) + If Color_TabFocused = Color.FromArgb(0, 0, 0, 0) Then Color_TabFocused = Color_Background - If Color_TabUnFocused = Color.FromArgb(0, 0, 0, 0) Then - If Color_TabFocused = Color_Background Then - Color_TabUnFocused = Color_Titlebar - Else - Color_TabUnFocused = ControlPaint.Light(Color_TabFocused) + If Color_TabUnFocused = Color.FromArgb(0, 0, 0, 0) Then + If Color_TabFocused = Color_Background Then + Color_TabUnFocused = Color_Titlebar + Else + Color_TabUnFocused = ControlPaint.Light(Color_TabFocused) + End If End If - End If - If Color_Titlebar_Unfocused = Color.FromArgb(0, 0, 0, 0) Then Color_Titlebar_Unfocused = Color.FromArgb(255, 255, 255) + If Color_Titlebar_Unfocused = Color.FromArgb(0, 0, 0, 0) Then Color_Titlebar_Unfocused = Color.FromArgb(255, 255, 255) + End If + Else + If Not Light Then + Color_Titlebar = Color.FromArgb(10, 10, 10) + Color_Titlebar_Unfocused = Color.FromArgb(10, 10, 10) + Color_TabFocused = Color.FromArgb(40, 40, 40) + Color_TabUnFocused = Color_Titlebar + Else + Color_Titlebar = Color.FromArgb(218, 218, 218) + Color_Titlebar_Unfocused = Color.FromArgb(218, 218, 218) + Color_TabFocused = Color.FromArgb(249, 249, 249) + Color_TabUnFocused = Color_Titlebar + End If End If @@ -5684,12 +5701,12 @@ Public Class XenonTerminal If UseAcrylic Then FillImg(G, adaptedBackBlurred, Rect) FillRect(G, Noise, Rect) - FillRect(G, New SolidBrush(Color.FromArgb((_Opacity / 100) * 200, 35, 35, 35)), Rect) - If BackImage IsNot Nothing Then FillImg(G, img, Rect_Console) + FillRect(G, New SolidBrush(Color.FromArgb((_Opacity / 100) * 255, Color_Background)), Rect) + If BackImage IsNot Nothing Then FillImg(G, img, Rect) Else FillImg(G, adaptedBack, Rect) FillRect(G, New SolidBrush(Color.FromArgb((_Opacity / 100) * 255, Color_Background)), Rect) - If BackImage IsNot Nothing Then FillImg(G, img, Rect_Console) + If BackImage IsNot Nothing Then FillImg(G, img, Rect) End If If UseAcrylicOnTitlebar And Not DesignMode Then @@ -5765,9 +5782,9 @@ Public Class XenonTerminal G.DrawString(s1, Font, New SolidBrush(Color_Foreground), Rect_ConsoleText0, StringAligner(ContentAlignment.TopLeft)) - G.FillRectangle(New SolidBrush(Color_Selection), Rect_ConsoleText1) + G.FillRectangle(New SolidBrush(Color.FromArgb(125, Color_Selection)), Rect_ConsoleText1) - G.DrawString(s2, Font, New SolidBrush(Color_Foreground), Rect_ConsoleText1, StringAligner(ContentAlignment.TopLeft)) + G.DrawString(s2, Font, New SolidBrush(Color.FromArgb(255 - 125, Color_Foreground)), Rect_ConsoleText1, StringAligner(ContentAlignment.TopLeft)) G.DrawString(s3, Font, New SolidBrush(Color_Foreground), Rect_ConsoleText2, StringAligner(ContentAlignment.TopLeft)) @@ -5848,7 +5865,7 @@ Public Class XenonTerminal End Sub Sub GetBack() - adaptedBack = My.Application.GetCurrentWallpaper.Clone(RectangleToScreen(Bounds), My.Application.Wallpaper.PixelFormat) + adaptedBack = My.Application.Wallpaper '.Clone(RectangleToScreen(Bounds), My.Application.Wallpaper.PixelFormat) adaptedBackBlurred = BlurBitmap(New Bitmap(adaptedBack), 5) End Sub diff --git a/WinPaletter/MainFrm.vb b/WinPaletter/MainFrm.vb index 94d49816..bed9800f 100644 --- a/WinPaletter/MainFrm.vb +++ b/WinPaletter/MainFrm.vb @@ -1324,7 +1324,7 @@ Public Class MainFrm If My.Application._Settings.AutoRestartExplorer Then RestartExplorer() Else - If Not My.W7 And Not My.W8 Then Notify(My.Application.LanguageHelper.NoDefResExplorer.Replace("
", vbCrLf), My.Resources.notify_warning, 7500) + If Not My.W7 Then Notify(My.Application.LanguageHelper.NoDefResExplorer.Replace("
", vbCrLf), My.Resources.notify_warning, 7500) End If End Sub diff --git a/WinPaletter/Terminals/ExternalTerminal.Designer.vb b/WinPaletter/Terminals/ExternalTerminal.Designer.vb index 3da2dd95..c3ee6e9c 100644 --- a/WinPaletter/Terminals/ExternalTerminal.Designer.vb +++ b/WinPaletter/Terminals/ExternalTerminal.Designer.vb @@ -122,6 +122,7 @@ Partial Class ExternalTerminal Me.XenonButton10 = New WinPaletter.XenonButton() Me.XenonButton2 = New WinPaletter.XenonButton() Me.XenonCheckBox1 = New WinPaletter.XenonCheckBox() + Me.XenonSeparator2 = New WinPaletter.XenonSeparator() Me.XenonGroupBox52.SuspendLayout() CType(Me.PictureBox18, System.ComponentModel.ISupportInitialize).BeginInit() Me.XenonGroupBox54.SuspendLayout() @@ -163,7 +164,7 @@ Partial Class ExternalTerminal Me.XenonGroupBox52.ForceNoNerd = False Me.XenonGroupBox52.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox52.LineSize = 1 - Me.XenonGroupBox52.Location = New System.Drawing.Point(11, 366) + Me.XenonGroupBox52.Location = New System.Drawing.Point(11, 376) Me.XenonGroupBox52.Name = "XenonGroupBox52" Me.XenonGroupBox52.Size = New System.Drawing.Size(259, 250) Me.XenonGroupBox52.TabIndex = 121 @@ -380,7 +381,7 @@ Partial Class ExternalTerminal Me.XenonGroupBox54.ForceNoNerd = False Me.XenonGroupBox54.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox54.LineSize = 1 - Me.XenonGroupBox54.Location = New System.Drawing.Point(273, 492) + Me.XenonGroupBox54.Location = New System.Drawing.Point(273, 502) Me.XenonGroupBox54.Name = "XenonGroupBox54" Me.XenonGroupBox54.Size = New System.Drawing.Size(221, 124) Me.XenonGroupBox54.TabIndex = 119 @@ -552,7 +553,7 @@ Partial Class ExternalTerminal Me.XenonGroupBox55.ForceNoNerd = False Me.XenonGroupBox55.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox55.LineSize = 1 - Me.XenonGroupBox55.Location = New System.Drawing.Point(273, 366) + Me.XenonGroupBox55.Location = New System.Drawing.Point(273, 376) Me.XenonGroupBox55.Name = "XenonGroupBox55" Me.XenonGroupBox55.Size = New System.Drawing.Size(221, 123) Me.XenonGroupBox55.TabIndex = 118 @@ -727,7 +728,7 @@ Partial Class ExternalTerminal Me.XenonGroupBox56.ForceNoNerd = False Me.XenonGroupBox56.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox56.LineSize = 1 - Me.XenonGroupBox56.Location = New System.Drawing.Point(11, 85) + Me.XenonGroupBox56.Location = New System.Drawing.Point(11, 95) Me.XenonGroupBox56.Name = "XenonGroupBox56" Me.XenonGroupBox56.Size = New System.Drawing.Size(259, 278) Me.XenonGroupBox56.TabIndex = 116 @@ -1184,7 +1185,7 @@ Partial Class ExternalTerminal Me.XenonGroupBox73.ForceNoNerd = False Me.XenonGroupBox73.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox73.LineSize = 1 - Me.XenonGroupBox73.Location = New System.Drawing.Point(273, 85) + Me.XenonGroupBox73.Location = New System.Drawing.Point(273, 95) Me.XenonGroupBox73.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.XenonGroupBox73.Name = "XenonGroupBox73" Me.XenonGroupBox73.Padding = New System.Windows.Forms.Padding(1) @@ -1380,7 +1381,7 @@ Partial Class ExternalTerminal Me.XenonGroupBox53.ForceNoNerd = False Me.XenonGroupBox53.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox53.LineSize = 1 - Me.XenonGroupBox53.Location = New System.Drawing.Point(497, 366) + Me.XenonGroupBox53.Location = New System.Drawing.Point(497, 376) Me.XenonGroupBox53.Name = "XenonGroupBox53" Me.XenonGroupBox53.Size = New System.Drawing.Size(166, 250) Me.XenonGroupBox53.TabIndex = 120 @@ -1537,12 +1538,21 @@ Partial Class ExternalTerminal Me.XenonCheckBox1.Checked = False Me.XenonCheckBox1.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.XenonCheckBox1.ForeColor = System.Drawing.Color.White - Me.XenonCheckBox1.Location = New System.Drawing.Point(10, 624) + Me.XenonCheckBox1.Location = New System.Drawing.Point(10, 631) Me.XenonCheckBox1.Name = "XenonCheckBox1" Me.XenonCheckBox1.Size = New System.Drawing.Size(656, 24) Me.XenonCheckBox1.TabIndex = 125 Me.XenonCheckBox1.Text = "Allow Non Monospace Fonts (Causes wrong font renderering in Enhanced terminal, wo" & "n't be used in legacy terminal)" + ' + 'XenonSeparator2 + ' + Me.XenonSeparator2.Location = New System.Drawing.Point(11, 88) + Me.XenonSeparator2.Name = "XenonSeparator2" + Me.XenonSeparator2.Size = New System.Drawing.Size(652, 1) + Me.XenonSeparator2.TabIndex = 200 + Me.XenonSeparator2.TabStop = False + Me.XenonSeparator2.Text = "XenonSeparator2" ' 'ExternalTerminal ' @@ -1550,6 +1560,7 @@ Partial Class ExternalTerminal Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.FromArgb(CType(CType(25, Byte), Integer), CType(CType(25, Byte), Integer), CType(CType(25, Byte), Integer)) Me.ClientSize = New System.Drawing.Size(674, 701) + Me.Controls.Add(Me.XenonSeparator2) Me.Controls.Add(Me.XenonCheckBox1) Me.Controls.Add(Me.XenonButton10) Me.Controls.Add(Me.XenonButton2) @@ -1689,4 +1700,5 @@ Partial Class ExternalTerminal Friend WithEvents XenonButton2 As XenonButton Friend WithEvents XenonCheckBox1 As XenonCheckBox Friend WithEvents XenonButton1 As XenonButton + Friend WithEvents XenonSeparator2 As XenonSeparator End Class diff --git a/WinPaletter/Terminals/TerminalsDashboard.Designer.vb b/WinPaletter/Terminals/TerminalsDashboard.Designer.vb index 6f000337..94326754 100644 --- a/WinPaletter/Terminals/TerminalsDashboard.Designer.vb +++ b/WinPaletter/Terminals/TerminalsDashboard.Designer.vb @@ -143,7 +143,7 @@ Partial Class TerminalsDashboard Me.XenonButton5.ForeColor = System.Drawing.Color.White Me.XenonButton5.Image = CType(resources.GetObject("XenonButton5.Image"), System.Drawing.Image) Me.XenonButton5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.XenonButton5.LineColor = System.Drawing.Color.FromArgb(CType(CType(55, Byte), Integer), CType(CType(55, Byte), Integer), CType(CType(55, Byte), Integer)) + Me.XenonButton5.LineColor = System.Drawing.Color.FromArgb(CType(CType(79, Byte), Integer), CType(CType(105, Byte), Integer), CType(CType(109, Byte), Integer)) Me.XenonButton5.LineSize = 1 Me.XenonButton5.Location = New System.Drawing.Point(85, 163) Me.XenonButton5.Name = "XenonButton5" diff --git a/WinPaletter/Terminals/TerminalsDashboard.resx b/WinPaletter/Terminals/TerminalsDashboard.resx index 38229f2e..ea8953cd 100644 --- a/WinPaletter/Terminals/TerminalsDashboard.resx +++ b/WinPaletter/Terminals/TerminalsDashboard.resx @@ -134,15 +134,22 @@ - iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAABGdBTUEAALGPC/xhBQAAAapJREFUOE/l - 0rmKAkEQBuB+Ke/7vg/wVjA08AqFXQ12Yh9AjATBV1h8AMGkZQzc0EcwNmpq/24GZhxnwU13B35MrI+q - 6mL/6OOca8jVmuPx+Ller7/sGY/Hn4PB4GrLh0EpTEfIGmAnFJM9w+HwhGKyRTcoxkaj0a3X64lutys6 - nY5ot9uiXq/fq9WqqFQqolwui1KpJIrFokgmk/dUKiV/RSKREPF4XKTT6ZtBMVYoFPR8Pk+5XI6y2Sxl - MhnCHwhFhCJCEaGIYrEYRSIRCofDFAqFKBgMUiAQIL/fb3YGSJeQRCaTyY9QNBp9HcO4dD6fabVa/QYi - n89nYoB0OZ7saLlcKnC32zliDhB5PB4Tw3i6dU/b7VaB8/n8la6cMQktFgs1pqZpL0Fer/cZk13hPGiz - 2dBsNnt4PXlL0+lUPQ6OVu0W90b9fl9C5Ha7TQyQLruSO8KtPexJdnQ4HOhyuTxlv99LyBmzvqB1vFqt - Rq1Wi5rNJjUaDcJBq+CIFeZyuUwM0DsgLgOIoysOjANTwa44dsWxK45dceyJYzwOiAOSeTOov/8x9g0g - 3ryUF/3RYgAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAMISURBVDhPrZRd + SFNhHMZPgQhdSDd12UXRTWIXBSJu07mdbWc6t/mFDbsRvxDT1DX8QBOcg6FOnWjaxxA2DT9CLwoRlWjT + aKsVQl2YkCu/g0D6APuYPr3vK5tTvPSFH+e855znef//5w+HO7Hl9/vPeL3emEgmJydjXC7XIex2e0x5 + efkh8vLyYoqLi6OYkc/nqyBm5hDz8/PmsbExc39/f0sk3d3dLWVlZeaioqIwhYWFzSUlJaKmpqbTnMfj + +T03NxcMMTs7GxwaGgr29PQEiTiMzWYLlpaWBgsKCg6Rn5/fR6qL5rq6utDZ2cno6OhAa2srGhsbYTQa + UV1dzaiqqkJFRQUMBgNycnLCZGdnUxzMiG6ysrLYi9zcXOj1emi1Wmg0GqSlpTFSU1OhVquhVCrB8zxD + LpdDJpNBKpU6BEGI5uhHmZmZsFqtjIyMDCZQKBSMSBElJSWFipGcnIykpCRIJJJ9I3oSrWpwcBAkI1gs + FlbVUZNIgwiTAyOVSsXKJunD6XRienoaZrMZOp0ubHC0ipCJWCxGYmLivlGoDXqlZuPj45iamgIZ9XFt + hA1EIhEjISFh3yjUAs2KTopW1dbWhkwyAKlCiWSVwEhSqiAhezGvYIjkPEQyHokKwanrHDjL0QxoayaT + Cb29vairq2NTk924CZX9EQTXU8jvucA/HIW8/zHk94ehGJiAtMsB3vEE6knvkn55p52jOZDSUFNTg4aG + BjZu2ob8tgnpLz9CePMF8Q9GEXe3HfF9w4hraof02Stcs5FD3q5Ct/I3qFsN/uJoDjSD0HhDOcgqa5H+ + OgClL4ArtRZcKqpEbL0Vl0vvQDz2HBfzb4GfX4J+AwyOnL5MhFskwC0SXhiZsX473f/5n8q/AhERCu/W + IJnwIK7ZDtHIDK6au8mz9X2jtd09johiCeKj8H0ug3bph1Mb2HmhXtx2awJ/3GmL393C+69u1cKmWzqz + 4BY+fHPr1nbduvXdEfYHIOvUUa77EZWx+fN8zjouHIfm08F99sbeOaI5icVx/wE1l1LXRfTkRQAAAABJ + RU5ErkJggg== diff --git a/WinPaletter/Terminals/WinTerminal.vb b/WinPaletter/Terminals/WinTerminal.vb index fcf27639..9ea62241 100644 --- a/WinPaletter/Terminals/WinTerminal.vb +++ b/WinPaletter/Terminals/WinTerminal.vb @@ -582,7 +582,7 @@ Public Class WinTerminal #End Region #Region "Schemes" - CType(JSonFile("schemes"), JArray).Clear() + If JSonFile("schemes") IsNot Nothing Then CType(JSonFile("schemes"), JArray).Clear() Else JSonFile("schemes") = New JArray() For x = 0 To Colors.Count - 1 Dim JS As New JObject JS("background") = RGB2HEX(Colors(x).Background) @@ -682,7 +682,8 @@ Public Class WinTerminal #End Region #Region "Profiles" - CType(JSonFile("profiles")("list"), JArray).Clear() + If JSonFile("profiles")("list") IsNot Nothing Then CType(JSonFile("profiles")("list"), JArray).Clear() Else JSonFile("profiles")("list") = New JArray() + For x = 0 To Profiles.Count - 1 Dim JS As New JObject JS("name") = Profiles(x).Name @@ -749,7 +750,7 @@ Public Class WinTerminal #Region "Themes" If Themes.Count <> 0 Then - CType(JSonFile("themes"), JArray).Clear() + If JSonFile("themes") IsNot Nothing Then CType(JSonFile("themes"), JArray).Clear() Else JSonFile("themes") = New JArray() For x = 0 To Themes.Count - 1 Dim JS As New JObject diff --git a/WinPaletter/Terminals/WindowsTerminal.Designer.vb b/WinPaletter/Terminals/WindowsTerminal.Designer.vb index a0da31bd..044fca71 100644 --- a/WinPaletter/Terminals/WindowsTerminal.Designer.vb +++ b/WinPaletter/Terminals/WindowsTerminal.Designer.vb @@ -27,12 +27,12 @@ Partial Class WindowsTerminal Me.SaveJSONDlg = New System.Windows.Forms.SaveFileDialog() Me.OpenWPTHDlg = New System.Windows.Forms.OpenFileDialog() Me.OpenJSONDlg = New System.Windows.Forms.OpenFileDialog() - Me.XenonButton11 = New WinPaletter.XenonButton() - Me.XenonButton9 = New WinPaletter.XenonButton() - Me.XenonAlertBox1 = New WinPaletter.XenonAlertBox() Me.XenonGroupBox2 = New WinPaletter.XenonGroupBox() + Me.XenonButton11 = New WinPaletter.XenonButton() Me.Label8 = New System.Windows.Forms.Label() + Me.XenonButton9 = New WinPaletter.XenonButton() Me.XenonButton8 = New WinPaletter.XenonButton() + Me.XenonAlertBox1 = New WinPaletter.XenonAlertBox() Me.XenonButton7 = New WinPaletter.XenonButton() Me.TerEnabled = New WinPaletter.XenonToggle() Me.PictureBox5 = New System.Windows.Forms.PictureBox() @@ -139,6 +139,7 @@ Partial Class WindowsTerminal Me.TerFontSizeBar = New WinPaletter.XenonTrackbar() Me.TerFonts = New WinPaletter.XenonComboBox() Me.TerFontWeight = New WinPaletter.XenonComboBox() + Me.XenonSeparator1 = New WinPaletter.XenonSeparator() Me.XenonGroupBox2.SuspendLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() Me.XenonGroupBox1.SuspendLayout() @@ -176,65 +177,17 @@ Partial Class WindowsTerminal 'OpenJSONDlg ' Me.OpenJSONDlg.Filter = "JSON File (*.json)|*.json" - ' - 'XenonButton11 - ' - Me.XenonButton11.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.XenonButton11.BackColor = System.Drawing.Color.FromArgb(CType(CType(34, Byte), Integer), CType(CType(34, Byte), Integer), CType(CType(34, Byte), Integer)) - Me.XenonButton11.Font = New System.Drawing.Font("Segoe UI", 9.0!) - Me.XenonButton11.ForeColor = System.Drawing.Color.White - Me.XenonButton11.Image = Nothing - Me.XenonButton11.LineColor = System.Drawing.Color.FromArgb(CType(CType(58, Byte), Integer), CType(CType(150, Byte), Integer), CType(CType(221, Byte), Integer)) - Me.XenonButton11.LineSize = 1 - Me.XenonButton11.Location = New System.Drawing.Point(463, 626) - Me.XenonButton11.Name = "XenonButton11" - Me.XenonButton11.Size = New System.Drawing.Size(182, 22) - Me.XenonButton11.TabIndex = 200 - Me.XenonButton11.Text = "Open ""Settings.json"" in editor" - Me.XenonButton11.UseVisualStyleBackColor = False - ' - 'XenonButton9 - ' - Me.XenonButton9.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.XenonButton9.BackColor = System.Drawing.Color.FromArgb(CType(CType(34, Byte), Integer), CType(CType(34, Byte), Integer), CType(CType(34, Byte), Integer)) - Me.XenonButton9.Font = New System.Drawing.Font("Segoe UI", 9.0!) - Me.XenonButton9.ForeColor = System.Drawing.Color.White - Me.XenonButton9.Image = Nothing - Me.XenonButton9.LineColor = System.Drawing.Color.FromArgb(CType(CType(58, Byte), Integer), CType(CType(150, Byte), Integer), CType(CType(221, Byte), Integer)) - Me.XenonButton9.LineSize = 1 - Me.XenonButton9.Location = New System.Drawing.Point(463, 599) - Me.XenonButton9.Name = "XenonButton9" - Me.XenonButton9.Size = New System.Drawing.Size(182, 22) - Me.XenonButton9.TabIndex = 199 - Me.XenonButton9.Text = "Backup ""Settings.json""" - Me.XenonButton9.UseVisualStyleBackColor = False - ' - 'XenonAlertBox1 - ' - Me.XenonAlertBox1.AlertStyle = WinPaletter.XenonAlertBox.Style.Adaptive - Me.XenonAlertBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.XenonAlertBox1.BackColor = System.Drawing.Color.FromArgb(CType(CType(68, Byte), Integer), CType(CType(50, Byte), Integer), CType(CType(2, Byte), Integer)) - Me.XenonAlertBox1.CanClose = WinPaletter.XenonAlertBox.Close.No - Me.XenonAlertBox1.CenterText = False - Me.XenonAlertBox1.CustomColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(81, Byte), Integer), CType(CType(210, Byte), Integer)) - Me.XenonAlertBox1.Font = New System.Drawing.Font("Segoe UI", 9.0!) - Me.XenonAlertBox1.Image = Global.WinPaletter.My.Resources.Resources.notify_warning - Me.XenonAlertBox1.Location = New System.Drawing.Point(12, 600) - Me.XenonAlertBox1.Name = "XenonAlertBox1" - Me.XenonAlertBox1.Size = New System.Drawing.Size(445, 47) - Me.XenonAlertBox1.TabIndex = 198 - Me.XenonAlertBox1.TabStop = False - Me.XenonAlertBox1.Text = "You should create a backup to Terminal Settings File ""settings.json"" to avoid und" & - "esired actions as terminal editing feature is still under development" ' 'XenonGroupBox2 ' Me.XenonGroupBox2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.XenonGroupBox2.BackColor = System.Drawing.Color.FromArgb(CType(CType(34, Byte), Integer), CType(CType(34, Byte), Integer), CType(CType(34, Byte), Integer)) + Me.XenonGroupBox2.Controls.Add(Me.XenonButton11) Me.XenonGroupBox2.Controls.Add(Me.Label8) + Me.XenonGroupBox2.Controls.Add(Me.XenonButton9) Me.XenonGroupBox2.Controls.Add(Me.XenonButton8) + Me.XenonGroupBox2.Controls.Add(Me.XenonAlertBox1) Me.XenonGroupBox2.Controls.Add(Me.XenonButton7) Me.XenonGroupBox2.Controls.Add(Me.TerEnabled) Me.XenonGroupBox2.Controls.Add(Me.PictureBox5) @@ -246,21 +199,51 @@ Partial Class WindowsTerminal Me.XenonGroupBox2.LineSize = 1 Me.XenonGroupBox2.Location = New System.Drawing.Point(12, 12) Me.XenonGroupBox2.Name = "XenonGroupBox2" - Me.XenonGroupBox2.Size = New System.Drawing.Size(634, 39) + Me.XenonGroupBox2.Size = New System.Drawing.Size(634, 90) Me.XenonGroupBox2.TabIndex = 197 ' + 'XenonButton11 + ' + Me.XenonButton11.BackColor = System.Drawing.Color.FromArgb(CType(CType(43, Byte), Integer), CType(CType(43, Byte), Integer), CType(CType(43, Byte), Integer)) + Me.XenonButton11.Font = New System.Drawing.Font("Segoe UI", 9.0!) + Me.XenonButton11.ForeColor = System.Drawing.Color.White + Me.XenonButton11.Image = Nothing + Me.XenonButton11.LineColor = System.Drawing.Color.FromArgb(CType(CType(58, Byte), Integer), CType(CType(150, Byte), Integer), CType(CType(221, Byte), Integer)) + Me.XenonButton11.LineSize = 1 + Me.XenonButton11.Location = New System.Drawing.Point(408, 63) + Me.XenonButton11.Name = "XenonButton11" + Me.XenonButton11.Size = New System.Drawing.Size(223, 23) + Me.XenonButton11.TabIndex = 200 + Me.XenonButton11.Text = "Open ""Settings.json"" in editor" + Me.XenonButton11.UseVisualStyleBackColor = False + ' 'Label8 ' Me.Label8.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label8.BackColor = System.Drawing.Color.Transparent Me.Label8.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label8.Location = New System.Drawing.Point(276, 4) + Me.Label8.Location = New System.Drawing.Point(330, 5) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(83, 31) + Me.Label8.Size = New System.Drawing.Size(73, 29) Me.Label8.TabIndex = 112 Me.Label8.Text = "Open From:" Me.Label8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' + 'XenonButton9 + ' + Me.XenonButton9.BackColor = System.Drawing.Color.FromArgb(CType(CType(43, Byte), Integer), CType(CType(43, Byte), Integer), CType(CType(43, Byte), Integer)) + Me.XenonButton9.Font = New System.Drawing.Font("Segoe UI", 9.0!) + Me.XenonButton9.ForeColor = System.Drawing.Color.White + Me.XenonButton9.Image = Nothing + Me.XenonButton9.LineColor = System.Drawing.Color.FromArgb(CType(CType(58, Byte), Integer), CType(CType(150, Byte), Integer), CType(CType(221, Byte), Integer)) + Me.XenonButton9.LineSize = 1 + Me.XenonButton9.Location = New System.Drawing.Point(408, 37) + Me.XenonButton9.Name = "XenonButton9" + Me.XenonButton9.Size = New System.Drawing.Size(223, 23) + Me.XenonButton9.TabIndex = 199 + Me.XenonButton9.Text = "Backup ""Settings.json""" + Me.XenonButton9.UseVisualStyleBackColor = False + ' 'XenonButton8 ' Me.XenonButton8.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -271,12 +254,29 @@ Partial Class WindowsTerminal Me.XenonButton8.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.XenonButton8.LineColor = System.Drawing.Color.FromArgb(CType(CType(108, Byte), Integer), CType(CType(118, Byte), Integer), CType(CType(127, Byte), Integer)) Me.XenonButton8.LineSize = 1 - Me.XenonButton8.Location = New System.Drawing.Point(357, 5) + Me.XenonButton8.Location = New System.Drawing.Point(408, 5) Me.XenonButton8.Name = "XenonButton8" - Me.XenonButton8.Size = New System.Drawing.Size(135, 29) + Me.XenonButton8.Size = New System.Drawing.Size(136, 29) Me.XenonButton8.TabIndex = 110 Me.XenonButton8.Text = "WinPaletter Theme" Me.XenonButton8.UseVisualStyleBackColor = False + ' + 'XenonAlertBox1 + ' + Me.XenonAlertBox1.AlertStyle = WinPaletter.XenonAlertBox.Style.Adaptive + Me.XenonAlertBox1.BackColor = System.Drawing.Color.FromArgb(CType(CType(68, Byte), Integer), CType(CType(50, Byte), Integer), CType(CType(2, Byte), Integer)) + Me.XenonAlertBox1.CanClose = WinPaletter.XenonAlertBox.Close.No + Me.XenonAlertBox1.CenterText = False + Me.XenonAlertBox1.CustomColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(81, Byte), Integer), CType(CType(210, Byte), Integer)) + Me.XenonAlertBox1.Font = New System.Drawing.Font("Segoe UI", 9.0!) + Me.XenonAlertBox1.Image = Global.WinPaletter.My.Resources.Resources.notify_warning + Me.XenonAlertBox1.Location = New System.Drawing.Point(4, 38) + Me.XenonAlertBox1.Name = "XenonAlertBox1" + Me.XenonAlertBox1.Size = New System.Drawing.Size(400, 47) + Me.XenonAlertBox1.TabIndex = 198 + Me.XenonAlertBox1.TabStop = False + Me.XenonAlertBox1.Text = "You should create a backup to Terminal Settings File ""settings.json"" to avoid und" & + "esired actions or errors." ' 'XenonButton7 ' @@ -288,11 +288,11 @@ Partial Class WindowsTerminal Me.XenonButton7.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.XenonButton7.LineColor = System.Drawing.Color.FromArgb(CType(CType(135, Byte), Integer), CType(CType(136, Byte), Integer), CType(CType(130, Byte), Integer)) Me.XenonButton7.LineSize = 1 - Me.XenonButton7.Location = New System.Drawing.Point(494, 5) + Me.XenonButton7.Location = New System.Drawing.Point(546, 5) Me.XenonButton7.Name = "XenonButton7" - Me.XenonButton7.Size = New System.Drawing.Size(135, 29) + Me.XenonButton7.Size = New System.Drawing.Size(85, 29) Me.XenonButton7.TabIndex = 109 - Me.XenonButton7.Text = "External JSON File" + Me.XenonButton7.Text = "JSON File" Me.XenonButton7.UseVisualStyleBackColor = False ' 'TerEnabled @@ -301,7 +301,7 @@ Partial Class WindowsTerminal Me.TerEnabled.BackColor = System.Drawing.Color.FromArgb(CType(CType(34, Byte), Integer), CType(CType(34, Byte), Integer), CType(CType(34, Byte), Integer)) Me.TerEnabled.Checked = False Me.TerEnabled.DarkLight_Toggler = False - Me.TerEnabled.Location = New System.Drawing.Point(147, 8) + Me.TerEnabled.Location = New System.Drawing.Point(147, 7) Me.TerEnabled.Name = "TerEnabled" Me.TerEnabled.Size = New System.Drawing.Size(50, 24) Me.TerEnabled.TabIndex = 85 @@ -344,7 +344,7 @@ Partial Class WindowsTerminal Me.XenonGroupBox1.ForceNoNerd = False Me.XenonGroupBox1.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox1.LineSize = 1 - Me.XenonGroupBox1.Location = New System.Drawing.Point(238, 340) + Me.XenonGroupBox1.Location = New System.Drawing.Point(238, 400) Me.XenonGroupBox1.Name = "XenonGroupBox1" Me.XenonGroupBox1.Size = New System.Drawing.Size(407, 102) Me.XenonGroupBox1.TabIndex = 196 @@ -598,7 +598,7 @@ Partial Class WindowsTerminal Me.XenonGroupBox22.ForceNoNerd = False Me.XenonGroupBox22.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox22.LineSize = 1 - Me.XenonGroupBox22.Location = New System.Drawing.Point(238, 97) + Me.XenonGroupBox22.Location = New System.Drawing.Point(238, 157) Me.XenonGroupBox22.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.XenonGroupBox22.Name = "XenonGroupBox22" Me.XenonGroupBox22.Padding = New System.Windows.Forms.Padding(1) @@ -628,6 +628,7 @@ Partial Class WindowsTerminal Me.XenonTerminal1.Name = "XenonTerminal1" Me.XenonTerminal1.Opacity = 0.15! Me.XenonTerminal1.OpacityBackImage = 100.0! + Me.XenonTerminal1.PreviewVersion = True Me.XenonTerminal1.Size = New System.Drawing.Size(373, 177) Me.XenonTerminal1.TabColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer)) Me.XenonTerminal1.TabIcon = Nothing @@ -696,6 +697,7 @@ Partial Class WindowsTerminal Me.XenonTerminal2.Name = "XenonTerminal2" Me.XenonTerminal2.Opacity = 0.15! Me.XenonTerminal2.OpacityBackImage = 100.0! + Me.XenonTerminal2.PreviewVersion = True Me.XenonTerminal2.Size = New System.Drawing.Size(344, 160) Me.XenonTerminal2.TabColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer)) Me.XenonTerminal2.TabIcon = Nothing @@ -746,7 +748,7 @@ Partial Class WindowsTerminal Me.XenonGroupBox15.ForceNoNerd = False Me.XenonGroupBox15.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox15.LineSize = 1 - Me.XenonGroupBox15.Location = New System.Drawing.Point(238, 445) + Me.XenonGroupBox15.Location = New System.Drawing.Point(238, 505) Me.XenonGroupBox15.Name = "XenonGroupBox15" Me.XenonGroupBox15.Size = New System.Drawing.Size(407, 100) Me.XenonGroupBox15.TabIndex = 193 @@ -980,7 +982,7 @@ Partial Class WindowsTerminal Me.XenonGroupBox11.ForceNoNerd = False Me.XenonGroupBox11.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox11.LineSize = 1 - Me.XenonGroupBox11.Location = New System.Drawing.Point(12, 97) + Me.XenonGroupBox11.Location = New System.Drawing.Point(12, 157) Me.XenonGroupBox11.Name = "XenonGroupBox11" Me.XenonGroupBox11.Size = New System.Drawing.Size(223, 378) Me.XenonGroupBox11.TabIndex = 116 @@ -1514,7 +1516,7 @@ Partial Class WindowsTerminal Me.XenonGroupBox14.ForceNoNerd = False Me.XenonGroupBox14.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox14.LineSize = 1 - Me.XenonGroupBox14.Location = New System.Drawing.Point(12, 478) + Me.XenonGroupBox14.Location = New System.Drawing.Point(12, 538) Me.XenonGroupBox14.Name = "XenonGroupBox14" Me.XenonGroupBox14.Size = New System.Drawing.Size(223, 66) Me.XenonGroupBox14.TabIndex = 192 @@ -1638,7 +1640,7 @@ Partial Class WindowsTerminal Me.XenonGroupBox13.ForceNoNerd = False Me.XenonGroupBox13.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox13.LineSize = 1 - Me.XenonGroupBox13.Location = New System.Drawing.Point(12, 54) + Me.XenonGroupBox13.Location = New System.Drawing.Point(12, 114) Me.XenonGroupBox13.Name = "XenonGroupBox13" Me.XenonGroupBox13.Size = New System.Drawing.Size(634, 40) Me.XenonGroupBox13.TabIndex = 117 @@ -1742,7 +1744,7 @@ Partial Class WindowsTerminal Me.XenonGroupBox21.ForceNoNerd = False Me.XenonGroupBox21.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox21.LineSize = 1 - Me.XenonGroupBox21.Location = New System.Drawing.Point(12, 548) + Me.XenonGroupBox21.Location = New System.Drawing.Point(12, 608) Me.XenonGroupBox21.Name = "XenonGroupBox21" Me.XenonGroupBox21.Size = New System.Drawing.Size(634, 37) Me.XenonGroupBox21.TabIndex = 194 @@ -1828,15 +1830,22 @@ Partial Class WindowsTerminal Me.TerFontWeight.Size = New System.Drawing.Size(136, 24) Me.TerFontWeight.TabIndex = 99 ' + 'XenonSeparator1 + ' + Me.XenonSeparator1.Location = New System.Drawing.Point(12, 108) + Me.XenonSeparator1.Name = "XenonSeparator1" + Me.XenonSeparator1.Size = New System.Drawing.Size(634, 1) + Me.XenonSeparator1.TabIndex = 198 + Me.XenonSeparator1.TabStop = False + Me.XenonSeparator1.Text = "XenonSeparator1" + ' 'WindowsTerminal ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 15.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.FromArgb(CType(CType(25, Byte), Integer), CType(CType(25, Byte), Integer), CType(CType(25, Byte), Integer)) - Me.ClientSize = New System.Drawing.Size(657, 697) - Me.Controls.Add(Me.XenonButton11) - Me.Controls.Add(Me.XenonButton9) - Me.Controls.Add(Me.XenonAlertBox1) + Me.ClientSize = New System.Drawing.Size(657, 696) + Me.Controls.Add(Me.XenonSeparator1) Me.Controls.Add(Me.XenonGroupBox2) Me.Controls.Add(Me.XenonGroupBox1) Me.Controls.Add(Me.XenonButton2) @@ -1998,4 +2007,5 @@ Partial Class WindowsTerminal Friend WithEvents XenonButton18 As XenonButton Friend WithEvents XenonButton19 As XenonButton Friend WithEvents Label8 As Label + Friend WithEvents XenonSeparator1 As XenonSeparator End Class diff --git a/WinPaletter/Terminals/WindowsTerminal.resx b/WinPaletter/Terminals/WindowsTerminal.resx index 5eb97269..ffa919fa 100644 --- a/WinPaletter/Terminals/WindowsTerminal.resx +++ b/WinPaletter/Terminals/WindowsTerminal.resx @@ -133,7 +133,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAApJJREFUSEvl1W9IE2EcB3Df9aZXve2VJWkztRYz7EUQCDGIMioqIURLs9JX5aL/ + vAAADrwBlbxySQAAApJJREFUSEvl1W9IE2EcB3Df9aZXve2VJWkztRYz7EUQCDGIMioqIURLs9JX5aL/ ZpQKTdOUCFdL6Y9WW82yJKm07dSmzu3uprvNWmvu2s4/o9ym25tvtzEhA+FuL3zTF77c8+b5fe4eHrik FU9TQ91etVpVKqQKhWJjfJvwDBmNA5FIBEL6uvMVV11dlRHfKixigDErDYax8Ui1cEQsEH06GIZTCkUS AaKNIoKOSwxAWswxZLGdupfW+JjlswiE+Ya+OhEZsyFstcH9cwohmwM/gmGQ/nmQMyFQXBC0dw6B+XAM diff --git a/WinPaletter/Terminals/WindowsTerminal.vb b/WinPaletter/Terminals/WindowsTerminal.vb index 6599d766..bc79d913 100644 --- a/WinPaletter/Terminals/WindowsTerminal.vb +++ b/WinPaletter/Terminals/WindowsTerminal.vb @@ -17,12 +17,12 @@ Public Class WindowsTerminal Select Case _Mode Case WinTerminal.Version.Stable _Terminal = MainFrm.CP.Terminal - Text = "(BETA) Windows Terminal - Stable Version" + Text = "(BETA) - Windows Terminal Stable" TerEnabled.Checked = MainFrm.CP.Terminal_Stable_Enabled Case WinTerminal.Version.Preview _Terminal = MainFrm.CP.TerminalPreview - Text = "(BETA) Windows Terminal - Preview Version" + Text = "(BETA) - Windows Terminal Preview" TerEnabled.Checked = MainFrm.CP.Terminal_Preview_Enabled Case WinTerminal.Version.Developer @@ -33,27 +33,8 @@ Public Class WindowsTerminal FillFonts(TerFonts, Not My.Application._Settings.Terminal_OtherFonts) - If My.W10 Or My.W11 Then - Dim TerDir As String = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json" - Dim TerPreDir As String = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe\LocalState\settings.json" - - - If My.Application._Settings.Terminal_Bypass Then - Load_FromTerminal() - Else - If IO.File.Exists(TerDir) And _Mode = WinTerminal.Version.Stable Then - Load_FromTerminal() - End If - - If IO.File.Exists(TerPreDir) And _Mode = WinTerminal.Version.Preview Then - Load_FromTerminal() - End If - End If + Load_FromTerminal() - - Else - - End If End Sub Sub Load_FromTerminal() @@ -765,8 +746,8 @@ Public Class WindowsTerminal XenonTerminal2.Font = f_cmd End With - - + XenonTerminal1.PreviewVersion = (_Mode <> WinTerminal.Version.Stable) + XenonTerminal2.PreviewVersion = (_Mode <> WinTerminal.Version.Stable) XenonTerminal1.Refresh() XenonTerminal2.Refresh() @@ -933,21 +914,36 @@ Public Class WindowsTerminal End Sub Private Sub XenonButton15_Click(sender As Object, e As EventArgs) Handles XenonButton15.Click - Dim TerDir As String = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe" - Dim TerPreDir As String = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe" - Dim TerDevDir As String = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalDeveloper_8wekyb3d8bbwe" + Dim TerDir As String + Dim TerPreDir As String + + If Not My.Application._Settings.Terminal_Path_Deflection Then + TerDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json" + TerPreDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe\LocalState\settings.json" + Else + If IO.File.Exists(My.Application._Settings.Terminal_Stable_Path) Then + TerDir = My.Application._Settings.Terminal_Stable_Path + Else + TerDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json" + End If + + If IO.File.Exists(My.Application._Settings.Terminal_Preview_Path) Then + TerPreDir = My.Application._Settings.Terminal_Preview_Path + Else + TerPreDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe\LocalState\settings.json" + End If + End If Select Case _Mode Case WinTerminal.Version.Stable - If IO.Directory.Exists(TerDir) Then Shell("explorer.exe shell:appsFolder\Microsoft.WindowsTerminal_8wekyb3d8bbwe!App") + If IO.File.Exists(TerDir) Then Shell("explorer.exe shell:appsFolder\Microsoft.WindowsTerminal_8wekyb3d8bbwe!App") Case WinTerminal.Version.Preview - If IO.Directory.Exists(TerPreDir) Then Shell("explorer.exe shell:appsFolder\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe!App") - - Case WinTerminal.Version.Developer - If IO.Directory.Exists(TerDevDir) Then Shell("explorer.exe shell:appsFolder\Microsoft.WindowsTerminalDeveloper_8wekyb3d8bbwe!App") + If IO.File.Exists(TerPreDir) Then Shell("explorer.exe shell:appsFolder\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe!App") End Select + + End Sub Private Sub XenonButton5_Click(sender As Object, e As EventArgs) Handles XenonButton5.Click @@ -956,8 +952,8 @@ Public Class WindowsTerminal Private Sub TerBackImage_TextChanged(sender As Object, e As EventArgs) Handles TerBackImage.TextChanged If TerBackImage.Text = "desktopWallpaper" Then - XenonTerminal1.BackImage = ResizeImage(BitmapFillScaler(My.Application.GetCurrentWallpaper, XenonTerminal1.Size), XenonTerminal1.Width - 2, XenonTerminal1.Height - 32) - XenonTerminal2.BackImage = ResizeImage(BitmapFillScaler(My.Application.GetCurrentWallpaper, XenonTerminal2.Size), XenonTerminal2.Width - 2, XenonTerminal2.Height - 32) + XenonTerminal1.BackImage = My.Application.Wallpaper + XenonTerminal2.BackImage = My.Application.Wallpaper Else If IO.File.Exists(TerBackImage.Text) Then XenonTerminal1.BackImage = ResizeImage(BitmapFillScaler(Image.FromStream(New FileStream(TerBackImage.Text, IO.FileMode.Open, IO.FileAccess.Read)), XenonTerminal1.Size), XenonTerminal1.Width - 2, XenonTerminal1.Height - 32) @@ -1024,20 +1020,44 @@ Public Class WindowsTerminal If TerEnabled.Checked Then If My.W10 Or My.W11 Then - Cursor = Cursors.WaitCursor - Dim TerDir As String = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json" - Dim TerPreDir As String = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe\LocalState\settings.json" + Try + Cursor = Cursors.WaitCursor - If IO.File.Exists(TerDir) And _Mode = WinTerminal.Version.Stable Then - _Terminal.Save(TerDir, WinTerminal.Mode.JSONFile) - End If + Dim TerDir As String + Dim TerPreDir As String - If IO.File.Exists(TerPreDir) And _Mode = WinTerminal.Version.Preview Then - _Terminal.Save(TerPreDir, WinTerminal.Mode.JSONFile, WinTerminal.Version.Preview) - End If + If Not My.Application._Settings.Terminal_Path_Deflection Then + TerDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json" + TerPreDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe\LocalState\settings.json" + Else + If IO.File.Exists(My.Application._Settings.Terminal_Stable_Path) Then + TerDir = My.Application._Settings.Terminal_Stable_Path + Else + TerDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json" + End If + + If IO.File.Exists(My.Application._Settings.Terminal_Preview_Path) Then + TerPreDir = My.Application._Settings.Terminal_Preview_Path + Else + TerPreDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe\LocalState\settings.json" + End If + End If + + If IO.File.Exists(TerDir) And _Mode = WinTerminal.Version.Stable Then + _Terminal.Save(TerDir, WinTerminal.Mode.JSONFile) + End If + + If IO.File.Exists(TerPreDir) And _Mode = WinTerminal.Version.Preview Then + _Terminal.Save(TerPreDir, WinTerminal.Mode.JSONFile, WinTerminal.Version.Preview) + End If + + Cursor = Cursors.Default + + Catch ex As Exception + Throw ex + End Try - Cursor = Cursors.Default End If Else @@ -1055,22 +1075,9 @@ Public Class WindowsTerminal Dim TerDir As String Dim TerPreDir As String - If Not My.Application._Settings.Terminal_Path_Deflection Then - TerDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json" - TerPreDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe\LocalState\settings.json" - Else - If IO.File.Exists(My.Application._Settings.Terminal_Stable_Path) Then - TerDir = My.Application._Settings.Terminal_Stable_Path - Else - TerDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json" - End If + TerDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json" + TerPreDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe\LocalState\settings.json" - If IO.File.Exists(My.Application._Settings.Terminal_Preview_Path) Then - TerPreDir = My.Application._Settings.Terminal_Preview_Path - Else - TerPreDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe\LocalState\settings.json" - End If - End If If IO.File.Exists(TerDir) And _Mode = WinTerminal.Version.Stable Then Process.Start(TerDir) @@ -1089,22 +1096,8 @@ Public Class WindowsTerminal Dim TerDir As String Dim TerPreDir As String - If Not My.Application._Settings.Terminal_Path_Deflection Then - TerDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json" - TerPreDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe\LocalState\settings.json" - Else - If IO.File.Exists(My.Application._Settings.Terminal_Stable_Path) Then - TerDir = My.Application._Settings.Terminal_Stable_Path - Else - TerDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json" - End If - - If IO.File.Exists(My.Application._Settings.Terminal_Preview_Path) Then - TerPreDir = My.Application._Settings.Terminal_Preview_Path - Else - TerPreDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe\LocalState\settings.json" - End If - End If + TerDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json" + TerPreDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe\LocalState\settings.json" If IO.File.Exists(TerDir) And _Mode = WinTerminal.Version.Stable Then IO.File.Copy(TerDir, SaveJSONDlg.FileName) @@ -1118,40 +1111,31 @@ Public Class WindowsTerminal End If End Sub + Public SaveState As WinTerminal.Version = _Mode + Private Sub XenonButton8_Click(sender As Object, e As EventArgs) Handles XenonButton8.Click If OpenWPTHDlg.ShowDialog = DialogResult.OK Then - If My.W10 Or My.W11 Then - Dim TerDir As String - Dim TerPreDir As String - - If Not My.Application._Settings.Terminal_Path_Deflection Then - TerDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json" - TerPreDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe\LocalState\settings.json" - Else - If IO.File.Exists(My.Application._Settings.Terminal_Stable_Path) Then - TerDir = My.Application._Settings.Terminal_Stable_Path - Else - TerDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json" - End If - - If IO.File.Exists(My.Application._Settings.Terminal_Preview_Path) Then - TerPreDir = My.Application._Settings.Terminal_Preview_Path - Else - TerPreDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe\LocalState\settings.json" - End If - End If - - If IO.File.Exists(TerDir) And _Mode = WinTerminal.Version.Stable Then - _Terminal = New WinTerminal(OpenWPTHDlg.FileName, WinTerminal.Mode.WinPaletterFile) + If WindowsTerminalDecide.ShowDialog = DialogResult.OK Then + If SaveState = WinTerminal.Version.Stable Then + Dim ls_stable As New List(Of String) + ls_stable.Clear() + For Each lin In IO.File.ReadAllLines(OpenWPTHDlg.FileName) + If lin.ToLower.StartsWith("terminal.") Then ls_stable.Add(lin) + Next + _Terminal = New WinTerminal(CStr_FromList(ls_stable), WinTerminal.Mode.WinPaletterFile) Load_FromTerminal() End If - If IO.File.Exists(TerPreDir) And _Mode = WinTerminal.Version.Preview Then - _Terminal = New WinTerminal(OpenWPTHDlg.FileName, WinTerminal.Mode.WinPaletterFile, WinTerminal.Version.Preview) + If SaveState = WinTerminal.Version.Preview Then + Dim ls_preview As New List(Of String) + ls_preview.Clear() + For Each lin In IO.File.ReadAllLines(OpenWPTHDlg.FileName) + If lin.ToLower.StartsWith("terminalpreview.") Then ls_preview.Add(lin) + Next + _Terminal = New WinTerminal(CStr_FromList(ls_preview), WinTerminal.Mode.WinPaletterFile, WinTerminal.Version.Preview) Load_FromTerminal() End If - End If End If @@ -1161,38 +1145,17 @@ Public Class WindowsTerminal If OpenJSONDlg.ShowDialog = DialogResult.OK Then Try - If My.W10 Or My.W11 Then - Dim TerDir As String - Dim TerPreDir As String - - If Not My.Application._Settings.Terminal_Path_Deflection Then - TerDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json" - TerPreDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe\LocalState\settings.json" - Else - If IO.File.Exists(My.Application._Settings.Terminal_Stable_Path) Then - TerDir = My.Application._Settings.Terminal_Stable_Path - Else - TerDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json" - End If - - If IO.File.Exists(My.Application._Settings.Terminal_Preview_Path) Then - TerPreDir = My.Application._Settings.Terminal_Preview_Path - Else - TerPreDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\AppData\Local\Packages\Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe\LocalState\settings.json" - End If - End If - If IO.File.Exists(TerDir) And _Mode = WinTerminal.Version.Stable Then - _Terminal = New WinTerminal(OpenJSONDlg.FileName, WinTerminal.Mode.JSONFile) - Load_FromTerminal() - End If - - If IO.File.Exists(TerPreDir) And _Mode = WinTerminal.Version.Preview Then - _Terminal = New WinTerminal(OpenJSONDlg.FileName, WinTerminal.Mode.JSONFile, WinTerminal.Version.Preview) - Load_FromTerminal() - End If + If _Mode = WinTerminal.Version.Stable Then + _Terminal = New WinTerminal(OpenJSONDlg.FileName, WinTerminal.Mode.JSONFile) + Load_FromTerminal() + End If + If _Mode = WinTerminal.Version.Preview Then + _Terminal = New WinTerminal(OpenJSONDlg.FileName, WinTerminal.Mode.JSONFile, WinTerminal.Version.Preview) + Load_FromTerminal() End If + Catch ex As Exception MsgBox(My.Application.LanguageHelper.Terminal_ErrorFile & vbCrLf & vbCrLf & ex.Message & vbCrLf & vbCrLf & ex.StackTrace, MsgBoxStyle.Critical + My.Application.MsgboxRt) End Try diff --git a/WinPaletter/Terminals/WindowsTerminalDecide.Designer.vb b/WinPaletter/Terminals/WindowsTerminalDecide.Designer.vb new file mode 100644 index 00000000..cbae8852 --- /dev/null +++ b/WinPaletter/Terminals/WindowsTerminalDecide.Designer.vb @@ -0,0 +1,218 @@ + _ +Partial Class WindowsTerminalDecide + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(WindowsTerminalDecide)) + Me.PictureBox1 = New System.Windows.Forms.PictureBox() + Me.Label7 = New System.Windows.Forms.Label() + Me.Label144 = New System.Windows.Forms.Label() + Me.Label1 = New System.Windows.Forms.Label() + Me.XenonButton2 = New WinPaletter.XenonButton() + Me.XenonButton1 = New WinPaletter.XenonButton() + Me.XenonRadioImage2 = New WinPaletter.XenonRadioImage() + Me.XenonRadioImage1 = New WinPaletter.XenonRadioImage() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.XenonAlertBox1 = New WinPaletter.XenonAlertBox() + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel1.SuspendLayout() + Me.SuspendLayout() + ' + 'PictureBox1 + ' + Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), System.Drawing.Image) + Me.PictureBox1.Location = New System.Drawing.Point(12, 12) + Me.PictureBox1.Name = "PictureBox1" + Me.PictureBox1.Size = New System.Drawing.Size(35, 35) + Me.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage + Me.PictureBox1.TabIndex = 0 + Me.PictureBox1.TabStop = False + ' + 'Label7 + ' + Me.Label7.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label7.BackColor = System.Drawing.Color.Transparent + Me.Label7.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label7.Location = New System.Drawing.Point(53, 12) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(344, 89) + Me.Label7.TabIndex = 85 + Me.Label7.Text = "WinPaletter saves the Windows Terminal Stable and Preview in separete areas in th" & + "e theme file." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "From which one do you want to be imported into current open edi" & + "tor?" + ' + 'Label144 + ' + Me.Label144.BackColor = System.Drawing.Color.Transparent + Me.Label144.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label144.Location = New System.Drawing.Point(131, 197) + Me.Label144.Name = "Label144" + Me.Label144.Size = New System.Drawing.Size(64, 20) + Me.Label144.TabIndex = 88 + Me.Label144.Text = "Stable" + Me.Label144.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + ' + 'Label1 + ' + Me.Label1.BackColor = System.Drawing.Color.Transparent + Me.Label1.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.Location = New System.Drawing.Point(213, 197) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(64, 20) + Me.Label1.TabIndex = 89 + Me.Label1.Text = "Preview" + Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + ' + 'XenonButton2 + ' + Me.XenonButton2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.XenonButton2.BackColor = System.Drawing.Color.FromArgb(CType(CType(34, Byte), Integer), CType(CType(34, Byte), Integer), CType(CType(34, Byte), Integer)) + Me.XenonButton2.Font = New System.Drawing.Font("Segoe UI", 9.0!) + Me.XenonButton2.ForeColor = System.Drawing.Color.White + Me.XenonButton2.Image = Nothing + Me.XenonButton2.LineColor = System.Drawing.Color.FromArgb(CType(CType(199, Byte), Integer), CType(CType(49, Byte), Integer), CType(CType(61, Byte), Integer)) + Me.XenonButton2.LineSize = 1 + Me.XenonButton2.Location = New System.Drawing.Point(232, 298) + Me.XenonButton2.Name = "XenonButton2" + Me.XenonButton2.Size = New System.Drawing.Size(80, 30) + Me.XenonButton2.TabIndex = 108 + Me.XenonButton2.Text = "Cancel" + Me.XenonButton2.UseVisualStyleBackColor = False + ' + 'XenonButton1 + ' + Me.XenonButton1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.XenonButton1.BackColor = System.Drawing.Color.FromArgb(CType(CType(34, Byte), Integer), CType(CType(34, Byte), Integer), CType(CType(34, Byte), Integer)) + Me.XenonButton1.Font = New System.Drawing.Font("Segoe UI", 9.0!) + Me.XenonButton1.ForeColor = System.Drawing.Color.White + Me.XenonButton1.Image = Nothing + Me.XenonButton1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.XenonButton1.LineColor = System.Drawing.Color.FromArgb(CType(CType(52, Byte), Integer), CType(CType(20, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.XenonButton1.LineSize = 1 + Me.XenonButton1.Location = New System.Drawing.Point(318, 298) + Me.XenonButton1.Name = "XenonButton1" + Me.XenonButton1.Size = New System.Drawing.Size(79, 30) + Me.XenonButton1.TabIndex = 107 + Me.XenonButton1.Text = "OK" + Me.XenonButton1.UseVisualStyleBackColor = False + ' + 'XenonRadioImage2 + ' + Me.XenonRadioImage2.AccentColor = System.Drawing.Color.DodgerBlue + Me.XenonRadioImage2.Checked = False + Me.XenonRadioImage2.Font = New System.Drawing.Font("Segoe UI", 9.0!) + Me.XenonRadioImage2.ForeColor = System.Drawing.Color.White + Me.XenonRadioImage2.Image = CType(resources.GetObject("XenonRadioImage2.Image"), System.Drawing.Image) + Me.XenonRadioImage2.Location = New System.Drawing.Point(213, 130) + Me.XenonRadioImage2.Name = "XenonRadioImage2" + Me.XenonRadioImage2.Size = New System.Drawing.Size(64, 64) + Me.XenonRadioImage2.TabIndex = 87 + Me.XenonRadioImage2.Text = "XenonRadioImage2" + ' + 'XenonRadioImage1 + ' + Me.XenonRadioImage1.AccentColor = System.Drawing.Color.DodgerBlue + Me.XenonRadioImage1.Checked = False + Me.XenonRadioImage1.Font = New System.Drawing.Font("Segoe UI", 9.0!) + Me.XenonRadioImage1.ForeColor = System.Drawing.Color.White + Me.XenonRadioImage1.Image = CType(resources.GetObject("XenonRadioImage1.Image"), System.Drawing.Image) + Me.XenonRadioImage1.Location = New System.Drawing.Point(131, 130) + Me.XenonRadioImage1.Name = "XenonRadioImage1" + Me.XenonRadioImage1.Size = New System.Drawing.Size(64, 64) + Me.XenonRadioImage1.TabIndex = 86 + Me.XenonRadioImage1.Text = "XenonRadioImage1" + ' + 'Panel1 + ' + Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(10, Byte), Integer), CType(CType(92, Byte), Integer), CType(CType(144, Byte), Integer)) + Me.Panel1.Controls.Add(Me.PictureBox1) + Me.Panel1.Controls.Add(Me.Label7) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel1.Location = New System.Drawing.Point(0, 0) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(409, 110) + Me.Panel1.TabIndex = 109 + ' + 'XenonAlertBox1 + ' + Me.XenonAlertBox1.AlertStyle = WinPaletter.XenonAlertBox.Style.Adaptive + Me.XenonAlertBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.XenonAlertBox1.BackColor = System.Drawing.Color.FromArgb(CType(CType(68, Byte), Integer), CType(CType(50, Byte), Integer), CType(CType(2, Byte), Integer)) + Me.XenonAlertBox1.CanClose = WinPaletter.XenonAlertBox.Close.No + Me.XenonAlertBox1.CenterText = False + Me.XenonAlertBox1.CustomColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(81, Byte), Integer), CType(CType(210, Byte), Integer)) + Me.XenonAlertBox1.Font = New System.Drawing.Font("Segoe UI", 9.0!) + Me.XenonAlertBox1.Image = Global.WinPaletter.My.Resources.Resources.notify_warning + Me.XenonAlertBox1.Location = New System.Drawing.Point(12, 237) + Me.XenonAlertBox1.Name = "XenonAlertBox1" + Me.XenonAlertBox1.Size = New System.Drawing.Size(385, 50) + Me.XenonAlertBox1.TabIndex = 199 + Me.XenonAlertBox1.TabStop = False + Me.XenonAlertBox1.Text = "This will override the already existing terminal settings (but won't delete them " & + "even if they are not visible)" + ' + 'WindowsTerminalDecide + ' + Me.AcceptButton = Me.XenonButton1 + Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 15.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BackColor = System.Drawing.Color.FromArgb(CType(CType(4, Byte), Integer), CType(CType(43, Byte), Integer), CType(CType(67, Byte), Integer)) + Me.ClientSize = New System.Drawing.Size(409, 340) + Me.Controls.Add(Me.XenonAlertBox1) + Me.Controls.Add(Me.XenonButton2) + Me.Controls.Add(Me.XenonButton1) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.Label144) + Me.Controls.Add(Me.XenonRadioImage2) + Me.Controls.Add(Me.XenonRadioImage1) + Me.Controls.Add(Me.Panel1) + Me.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ForeColor = System.Drawing.Color.White + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle + Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "WindowsTerminalDecide" + Me.ShowIcon = False + Me.ShowInTaskbar = False + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.Text = "Decide" + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel1.ResumeLayout(False) + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents PictureBox1 As PictureBox + Friend WithEvents Label7 As Label + Friend WithEvents XenonRadioImage1 As XenonRadioImage + Friend WithEvents XenonRadioImage2 As XenonRadioImage + Friend WithEvents Label144 As Label + Friend WithEvents Label1 As Label + Friend WithEvents XenonButton2 As XenonButton + Friend WithEvents XenonButton1 As XenonButton + Friend WithEvents Panel1 As Panel + Friend WithEvents XenonAlertBox1 As XenonAlertBox +End Class diff --git a/WinPaletter/Terminals/WindowsTerminalDecide.resx b/WinPaletter/Terminals/WindowsTerminalDecide.resx new file mode 100644 index 00000000..a9428b4d --- /dev/null +++ b/WinPaletter/Terminals/WindowsTerminalDecide.resx @@ -0,0 +1,736 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAP6SURBVFhH7dddTFtlHMdxLjW0FQdlL7C1lTLqWKFlustOXUw0emV08UavvHZemxg7sxfQytvA + dd1gAzK7dYCZwDY6WKPZdAGjS0xX6NspfaWla+sQgU768znu0Wbrac8pbDfGb9Krps/ntH2ef09L/m89 + 1dtiIvV4XKUeS+rUYzGdeiSuqrfERPTpJ5PG+lutdiJ5SGO9O914NZFpuHIX6rE4do/GsevbBTx/aWFN + 9U1sSjUU1ddYYkr6so23d+Je+Z7JZKf2WjKtsSZAcHDgIDjqhqPYORhF7cX5VeWF+bZqS2ATXWZ9NU2m + XmmaTMYJjiJwEBw15yN47uvwguxc5GW6XHE1XU8dIPjKBnAozoUhHwgt7+gPvkOXFdYLtuRLBE8/Bhyy + /hC2nw2mq3sD++jyhdN+vyhtmkiG8+KXYlBd9GPfsBfvjzN47zKDt0cZ1PZ7UGMOceEgOKp6AqGqvmA5 + ZfKnnUx9Veidvznqw+3YEh4tvLiKD64wUAwEuHBsO+XHFtNcJ2W4axhPKQi+Wuhj/8gWoGRu99cy2G92 + cuJbTXPYYpxb2drllVEuN601+Rnfd37Q5kdi+T6Mv8zj4IQfzT+GsJReo5cAGG6Fsf2MnwvH5hM+VHYz + esrlRvBf+Tbcq4Mu7DW7oSTfN7vhFANzGJqJUx448VME1ad9eXAfpF3Mbco93B7bvQo+nN3tyvPBh3a7 + vNeDqdAi5YEPrzKoOu3Ph6Oi05uRtHIMKI01qeHDHz1q8rMMOqbClAYcC39AZpwthKO8w4tn270NlM2m + vpx4vSi8j0HLD0FKA/7UCl7sdWAbgQvibR5sanW/Rtls7AUIxdlz/taQGxmK28mx1PQIw8taPZBwXUD9 + SLRRKC7vD+DLWyHKA2+YyccuEH/G4EZpq0dN2Ww7R8IVgnB2yPQF8Ol32XmgOWUXjEu+cJFNaOf+lST4 + z7w4HTLyk06oTA7UGe+guntGKA5xi2uacrnVDUU/EYL/PWRMXuw23YGuz4HNx51CcYibZz+mXG51lnkF + wdmbicI4OefvDjqR/vPBNjTcCKLyuIcXFzU7V546XGAUsykvRAwFcXbCmXww3MwewevuJKTtTj4cpUed + LZTJn9ISkRI8nBenQ2bXSQeG7XFYXQnsP+NARYeHDw+Jjzr4f47ZZOaQluBL+fB/N1yn68E758d/Lz3i + 1NDlhbVjIHiA4Ct5cQEbjuLLTx+eKe6W7J+qeoKN5MFsAPeWHpnJnfvFxN5GsXcyBE8Xga8SvE2izzNw + 1pPUGKit7GIOSbt80wTPcOBr4s+dU6Jjs3rJMffj+2PClbTbLio3MKqydq+uzODUiQ2zKqne/mT/mv1H + Kyn5C4HLTa6pC3S6AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAXuSURBVGhD7dh9 + aFVlHAfwS2FpUCpaRKLQH1oaas325l7di7pNt5QhotvyL9EaFOR0qRjMkiCwgol7Uedwc27aHzGoQSTB + srE396rOueveJILwj/6IoIJf5/s753d4zrPnurM7JwT3B1/uvc/OPc/nd85zn+0uEKlIRSpSkZpVdXZ2 + pnZ3d3d0dXUFZ5rKysqxcLN///5gGOk4cOBAqkO3y4KMW6FwYkHCjoUJN2MO3S4TzG9MML8xwHzHodtl + gvmNCeY3JpjfOHS7TDC/McH8xgTzG4du19WrVwlpamryncbGRs7JkydnlLKyMjeFhYW+U1BQ4IlDt2vb + tm2kJicnx5Ps7Gw3WVlZnmzdutXNli1bPNm8ebObzMxMTzIyMtykp6d7kpaW5smmTZvcpKamchy6XbOF + 63gVruNVuI73Aw/ZQCg4AuBcwnW8CtfxKSkpHIduV6grrgIBkuc6HAkF1/GzhYdsQMXL1QVm7969VF5e + Tjt27GCMIGcK1/EqXMercB2fnJzMceh2qVddrjwAe/bsocHBQXrw4AHdvHmTdu7cyZMLNhR+LuAq3tiA + js/Pz6fbt2/T5OQkTUxM0Pj4OLW3t1NeXh5PDJiKng6u41W4jn8UPCkpiePQ7RI8gmWByfft28dwwY+N + jdHo6Ci1tbVRbm4uTwoUjtXx4cJ1vApX8cYGZN1LA3jD0aNH6f79+wzHYzAYpJGREW4CdwIAoKQRHa/C + dXy48MTERI5Dt0vwiKxnTJKQkEClpaWMFvy9e/doeHiYbty4wXcCkwvQD1zHq3Adr8JVvLEB2VUQNAAI + JkAThw8fprt37zIcj0NDQ3Tnzh1qbW3lJjCxjp4rOAKTQ7dLxas7ChA4+caNG6mkpITRgscH/NatW9Tb + 20u7d+/m43SwRIXreBWu401wiUO3S+BqZE2jCZw4Pj6eDh06xNsq4HgcGBig/v5+3mKx5QIE4GzhOl6F + I7igDt0uFS5XX5aRLAWcNDY2lk6cOOHB9/X18V24fv06HyMNhILreBWNTAeXOHS7dDii7ipA4OR4ffr0 + aWppaXHhPT09fAcwjmMA9APX8Spcx6twBKvBodtlgiNy9TE5mqyoqKDa2lo6e/YsNTc3u3j8qYG7g4lx + rI5/nHCJQ7dLh5vw1dXVdOXKFbp06RKdP3+e0fKFJiYmhicUoB+4jlfhOl6FI3Fxcd4GVLi6jwu+qqqK + 8ZcvX+YGampq+CshvikBj0mAELxgw8VJ5LXpZw7dLoFLVDygDQ0NLh5L6MKFC1RUVGTEZxz/jHKH/6B3 + fqUnkYdWCgMqXpYNnmPNA15XVzctXvIE8ZKH3IAsGzQACP4ara+vd+EXL17ktY9lEx0dbcQjhgk48fXf + 08r3j9BrHx6nqC9raHvwTx5/+0y9Pf7BMdrwdS1tH/2Lx5Ob23hcktrS5TmfmoDgEewggGCdFRcXMxxX + /dy5c1PwWOcClw+maQJkVXEpLVobRWs+PkVLohNocVQsjy/L3UUvJmXQG8c+pxdWr+PXGF9/6gw9t+JV + HkfSfuz3nE8NN4Arj8gWiA8blsnBgwf5Q4x/ZQgePzPhp2tgxa53+XnmLyP4EFJW328Mfv2jT3g8urKJ + 5r+8jJ+jgaXxKe77H5WA4NUGgJEmAMcjdgIVr8JxRxDTBIg0kDfxD60t+4qeXfoS5U3+yw0szy+kuNpm + vjMr3yvh49HAgleWu0sIzernlLgNAC8NCBBgLCd12egR/HQNPDXvGZq3cDEtfiuGkr79mcfRwPOr1tDC + NetpSWwSN4VxfQllD/7uOZ+agMAFL0ETKg4JBUfQrGkCRF1CamQJ5Y7/TYvWbaDVRz7l8RktIQs7bsJL + VHQouMQ0ATJdA3ie8l0HPT1/AWW0Dk25A4nf/DTlvRIsIcuc0m4laIE9scCeWGA3FtgTa5kFTRMg2Eaj + KxqnjGMbTWj8wX395hdVFFN9bco2iver71Nj/zp+TGWdEL8djRPNUR46Uz+esk5YiJMqE8xlME+BM3Wk + IhWp/2cFAv8Bxtg04spBDIgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAAA9lJREFUaEPt + 2DlPHEEQBWB+E7Dc982yCLFIhAScWkIkUmISCEDiEscPIUQgzl0CUlsWwr+jPdWaNypqanpqSD0tPdmy + HHzvzWyzdlt5ylOe8pSnPDhvb2+119fX31FckZyfn/8om5ubRfNra2urGnPTJ8J8SpwlGs4SBWjJn5ib + PhrOEg1niYIzJeamj4azRMNZouEsibnpo+Es0XCWaDhLYm761Go1R5mbm/OpVqs+s7OzSWZmZnymp6eT + TE1N+UxOTvpMTEwkGR8f9xkbG0syOjrqMzIy4jM8PJxkaGjIZ3BwMMnAwIBPf3+/T8xNHw3PCwDPC0g8 + LwA8LyDxvADwvIDEBwsAr60fwmvrh/Da+iE8L9DX15dfQOJ5AeC19YHnBYDX1geeFwBeW5/wuQWAt64P + vHV94K3rA1+4gFyfsAQgIPC8APC8gMTzAqH1gdfWDxbIWp+AKysr7vb21q2urnpc3vrAW9cHPm/93t7e + /AJy+Y2NDff8/Oze39/9vb+9ve2RWXheILQ+8Nr6WfjcAsCjAGHu7u48HqEya2trHgi8tn4Ir60PPC8A + fOEChEeB6Buge3l5+VYCT4JwGp4XAF5bH3jr+j09PdkFJJ5CN05eCYLJAsDzAhJvXR/4wgVwZYZKNJtN + t7Oz44Gh9YG3rg+8XD+3gFyfgiuTYFkldnd3PU7D8wKh9YEPrW8uIPEUunEItre351qt1rcS9/f3HgM8 + LwA8LyDx2voavru7O7uAxPMChKd16efAwcGBOzs7c9E/QT2ebqX19XWPLYLnBSSeFwC+cAG5PH0Xp+/x + Jycn7vDw0F1eXrqnpyfXaDRUPC8AvLY+8Jb1cwtIPIVQ9MPs6urKXV9fu4uLC19if3/ff+g5nhcIrQ+8 + dX3ggwWA5wXotSE8wW9ubvyvlOPjYzc/P++h1g8u8Nb1gecFurq68gvw9QlCixMeofe/Xq+n8LwA4Tgm + a00CUSqVik9nZ2eSjo4O/2fy78fc9JEF8MFdWlpKSpyenrqFhYUEr61PqxP+8fHRfXx8/DgPDw+uvb09 + VTbmpo/EI4RbXl52R0dHbnFxMYjnBTRU0aAA8MECwPMC+KJGMHqPCSvxvADee3plNFDRyAL0SsXc9MnC + W7+sAY8CdMVqKGvoFaQCHJ9bAHheAHheQOJ5AXpSdKtoH1xgOEh+cCkEp9Dvf1QgtD7wWevLaxNXJr82 + cWXym8pySwULRPCvrPWBt6zP8dqdH8JrT4vjo6f0GXPTJ3oCtQj/V+K19UN4bX3geQHgtfWB5wWi1+kr + KpD93+vlKU95ylOe/+y0tf0DqXvWt3S6teQAAAAASUVORK5CYII= + + + + + AAABAAQAEBAAAAEAIABoBAAARgAAACAgAAABACAAqBAAAK4EAAAwMAAAAQAgAKglAABWFQAAQEAAAAEA + IAAoQgAA/joAACgAAAAQAAAAIAAAAAEAIAAAAAAAMAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AABFRUU0RERERERERERAQEBEQEBAREBAQEQ8PDxEPDw8RDg4OEQ4ODhEODg4RDg4OEQ1NTVENjY2NAAA + AAAAAAAARUVF+kRERP9DQ0P/QUFB/0BAQP8/Pz//Pj4+/zs7O/86Ojr/OTk5/zg4OP82Njb/NjY2/zU1 + NfoAAAAAAAAAAEZGRv9FRUX/S0tL/0JCQv9BQUH/QEBA/2tra//U1NT/1NTU/9TU1P/U1NT/1NTU/2dn + Z/82Njb/AAAAAAAAAABHR0f/RERE/46Ojv+BgYH/QkJC/0FBQf9LS0v/bm5u/21tbf9sbGz/a2tr/2pq + av9FRUX/Nzc3/wAAAAAAAAAASEhI/0ZGRv9VVVX/k5OT/5ycnP9GRkb/QEBA/z8/P/8+Pj7/PDw8/zs7 + O/86Ojr/OTk5/zc3N/8AAAAAAAAAAEhISP9HR0f/SUlJ/62trf/IyMj/WFhY/0FBQf9AQED/Pj4+/z09 + Pf88PDz/Ozs7/zk5Of84ODj/AAAAAAAAAABJSUn/R0dH/6enp//Dw8P/WVlZ/0NDQ/9CQkL/QEBA/z8/ + P/8+Pj7/PT09/zs7O/86Ojr/OTk5/wAAAAAAAAAASkpK/0lJSf92dnb/W1tb/0VFRf9ERET/QkJC/0FB + Qf9AQED/Pz8//z09Pf88PDz/Ozs7/zo6Ov8AAAAAAAAAAEtLS/9JSUn/SEhI/0dHR/9GRkb/RERE/0ND + Q/9CQkL/QUFB/z8/P/8+Pj7/PT09/zw8PP86Ojr/AAAAAAAAAABubm7/bGxs/2xsbP9ra2v/Y2Nj8Fxc + XP9bW1v/Wlpa/1lZWf9KSkrwSUlJ/0hISP9ISEj/RkZG/wAAAAAAAAAAzMzM+szMzP/MzMz/zMzM/8XF + xcaZmZn/mZmZ/5mZmf+ZmZn/bW1txmZmZv9mZmb/ZmZm/2ZmZvoAAAAAAAAAAMrKyjrMzMxVzMzMVczM + zFW+vr5PmZmZVZmZmVWZmZlVmZmZVXR0dE9mZmZVZmZmVWZmZlVlZWU6AAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAP// + AAD//wAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAP//AAD//wAA//8AACgA + AAAgAAAAQAAAAAEAIAAAAAAAgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABERERTREREqURERKpERESqQkJCqkJCQqpBQUGqQUFBqkFB + Qao/Pz+qPz8/qj4+Pqo+Pj6qPj4+qjw8PKo8PDyqOzs7qjs7O6o7OzuqOTk5qjg4OKo4ODiqODg4qjg4 + OKo2NjaqNTU1qjU1Nak2NjZRAAAAAAAAAAAAAAAAAAAAAERERPJFRUX/RERE/0NDQ/9DQ0P/QkJC/0JC + Qv9BQUH/QEBA/0BAQP8/Pz//Pj4+/z4+Pv89PT3/PT09/zw8PP87Ozv/Ozs7/zo6Ov85OTn/OTk5/zg4 + OP84ODj/Nzc3/zY2Nv82Njb/NTU1/zQ0NPEAAAAAAAAAAAAAAAAAAAAARkZG/0VFRf9ERET/RERE/0ND + Q/9DQ0P/QkJC/0FBQf9BQUH/QEBA/z8/P/8/Pz//Pj4+/zs7O/86Ojr/OTk5/zk5Of84ODj/Nzc3/zc3 + N/82Njb/NjY2/zU1Nf80NDT/NDQ0/zY2Nv81NTX/NTU1/wAAAAAAAAAAAAAAAAAAAABGRkb/RUVF/0VF + Rf9ERET/RERE/0JCQv9CQkL/QkJC/0FBQf9AQED/QEBA/z8/P/8+Pj7/nJyc/9TU1P/U1NT/1NTU/9TU + 1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P+ZmZn/NTU1/zY2Nv81NTX/AAAAAAAAAAAAAAAAAAAAAEZG + Rv9GRkb/RUVF/0VFRf9CQkL/bW1t/0hISP9CQkL/QUFB/0FBQf9AQED/QEBA/z4+Pv+fn5//1NTU/9TU + 1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/52dnf82Njb/NjY2/zY2Nv8AAAAAAAAAAAAA + AAAAAAAAR0dH/0ZGRv9GRkb/Q0ND/3t7e/+fn5//j4+P/0dHR/9CQkL/QUFB/0FBQf9AQED/Pj4+/3x8 + fP+qqqr/qqqq/6mpqf+pqan/qamp/6mpqf+pqan/qamp/6ioqP+oqKj/eHh4/zY2Nv83Nzf/NjY2/wAA + AAAAAAAAAAAAAAAAAABHR0f/R0dH/0ZGRv9CQkL/hYWF/5+fn/+enp7/jY2N/0VFRf9CQkL/QUFB/0BA + QP9AQED/Pj4+/z4+Pv89PT3/PDw8/zw8PP87Ozv/Ojo6/zo6Ov85OTn/OTk5/zg4OP83Nzf/ODg4/zc3 + N/82Njb/AAAAAAAAAAAAAAAAAAAAAEhISP9HR0f/RkZG/0ZGRv9FRUX/hoaG/5ycnP+Wlpb/hISE/05O + Tv9BQUH/QUFB/0BAQP9AQED/Pz8//z4+Pv8+Pj7/PT09/zw8PP88PDz/Ozs7/zs7O/86Ojr/OTk5/zk5 + Of84ODj/Nzc3/zc3N/8AAAAAAAAAAAAAAAAAAAAASEhI/0dHR/9HR0f/RkZG/0ZGRv9GRkb/gYGB/5GR + kf/FxcX/v7+//05OTv9BQUH/QUFB/0BAQP8/Pz//Pz8//z4+Pv89PT3/PT09/zw8PP88PDz/Ozs7/zo6 + Ov86Ojr/OTk5/zg4OP84ODj/Nzc3/wAAAAAAAAAAAAAAAAAAAABISEj/SEhI/0dHR/9HR0f/RkZG/0RE + RP9UVFT/xMTE/9DQ0P/Q0ND/lZWV/0FBQf9BQUH/QEBA/0BAQP8/Pz//Pj4+/z4+Pv89PT3/PT09/zw8 + PP87Ozv/Ozs7/zo6Ov85OTn/OTk5/zg4OP84ODj/AAAAAAAAAAAAAAAAAAAAAElJSf9ISEj/SEhI/0dH + R/9GRkb/UlJS/7y8vP/Q0ND/0NDQ/6urq/9DQ0P/QkJC/0FBQf9BQUH/QEBA/z8/P/8/Pz//Pj4+/z4+ + Pv89PT3/PDw8/zw8PP87Ozv/Ojo6/zo6Ov85OTn/OTk5/zg4OP8AAAAAAAAAAAAAAAAAAAAASUlJ/0lJ + Sf9ISEj/R0dH/1NTU/+9vb3/0NDQ/9DQ0P+fn5//Q0ND/0NDQ/9CQkL/QkJC/0FBQf9BQUH/QEBA/z8/ + P/8/Pz//Pj4+/z09Pf89PT3/PDw8/zw8PP87Ozv/Ojo6/zo6Ov85OTn/ODg4/wAAAAAAAAAAAAAAAAAA + AABKSkr/SUlJ/0hISP9FRUX/vb29/9DQ0P/Q0ND/mZmZ/0NDQ/9ERET/Q0ND/0NDQ/9CQkL/QkJC/0FB + Qf9AQED/QEBA/z8/P/8+Pj7/Pj4+/z09Pf89PT3/PDw8/zs7O/87Ozv/Ojo6/zk5Of85OTn/AAAAAAAA + AAAAAAAAAAAAAEpKSv9JSUn/SUlJ/0dHR/9zc3P/z8/P/5+fn/9FRUX/RUVF/0RERP9ERET/Q0ND/0ND + Q/9CQkL/QUFB/0FBQf9AQED/Pz8//z8/P/8+Pj7/Pj4+/z09Pf88PDz/PDw8/zs7O/86Ojr/Ojo6/zk5 + Of8AAAAAAAAAAAAAAAAAAAAASkpK/0pKSv9JSUn/SUlJ/0dHR/9bW1v/RUVF/0ZGRv9FRUX/RUVF/0RE + RP9ERET/Q0ND/0JCQv9CQkL/QUFB/0BAQP9AQED/Pz8//z8/P/8+Pj7/PT09/z09Pf88PDz/Ozs7/zs7 + O/86Ojr/Ojo6/wAAAAAAAAAAAAAAAAAAAABLS0v/SkpK/0pKSv9JSUn/SEhI/0hISP9HR0f/RkZG/0ZG + Rv9FRUX/RUVF/0RERP9DQ0P/Q0ND/0JCQv9BQUH/QUFB/0BAQP9AQED/Pz8//z4+Pv8+Pj7/PT09/zw8 + PP88PDz/Ozs7/zs7O/86Ojr/AAAAAAAAAAAAAAAAAAAAAEtLS/9LS0v/SkpK/0lJSf9JSUn/SEhI/0dH + R/9HR0f/RkZG/0ZGRv9FRUX/RERE/0RERP9DQ0P/QkJC/0JCQv9BQUH/QUFB/0BAQP8/Pz//Pz8//z4+ + Pv89PT3/PT09/zw8PP88PDz/Ozs7/zo6Ov8AAAAAAAAAAAAAAAAAAAAATExM/0tLS/9KSkr/SkpK/0lJ + Sf9JSUn/SEhI/0dHR/9HR0f/RkZG/0VFRf9FRUX/RERE/0RERP9DQ0P/QkJC/0JCQv9BQUH/QEBA/0BA + QP8/Pz//Pz8//z4+Pv89PT3/PT09/zw8PP87Ozv/Ozs7/wAAAAAAAAAAAAAAAAAAAAChoaH/oaGh/6Gh + of+hoaH/oaGh/6CgoP+goKD/oKCg/6CgoP+FhYXafX19/319ff99fX3/fX19/3x8fP98fHz/fHx8/3x8 + fP9qamraWVlZ/1lZWf9ZWVn/WVlZ/1lZWf9YWFj/WFhY/1hYWP9YWFj/AAAAAAAAAAAAAAAAAAAAAMzM + zP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/7CwsMeZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZ + mf+ZmZn/mZmZ/4SEhMdmZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv8AAAAAAAAAAAAA + AAAAAAAAzMzM8szMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/sLCwx5mZmf+ZmZn/mZmZ/5mZ + mf+ZmZn/mZmZ/5mZmf+ZmZn/hISEx2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm8QAA + AAAAAAAAAAAAAAAAAADLy8tTzMzMtM3NzbvNzc27zc3Nu83NzbvNzc27zc3Nu83Nzbuurq6Umpqaq5qa + mquampqrmpqaq5qamquampqrmpqaq5qamquDg4OUZmZmu2ZmZrtmZma7ZmZmu2ZmZrtmZma7ZmZmu2Zm + ZrRlZWVRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////// + ///////////////////gAAAHwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA + AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPgAAAH//////////////////////// + //8oAAAAMAAAAGAAAAABACAAAAAAAFAlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARkZGTEVFReVERET/RERE/0NDQ/9DQ0P/Q0ND/0JC + Qv9CQkL/QUFB/0FBQf9AQED/QEBA/0BAQP8/Pz//Pz8//z4+Pv8+Pj7/Pj4+/z09Pf89PT3/PDw8/zw8 + PP87Ozv/Ozs7/zs7O/86Ojr/Ojo6/zk5Of85OTn/OTk5/zg4OP84ODj/Nzc3/zc3N/82Njb/NjY2/zY2 + Nv81NTX/NTU1/zMzM+Q0NDRKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARUVF5EVFRf9FRUX/RERE/0RE + RP9DQ0P/Q0ND/0JCQv9CQkL/QkJC/0FBQf9BQUH/QEBA/0BAQP9AQED/Pz8//z8/P/8+Pj7/Pj4+/z09 + Pf89PT3/PT09/zw8PP88PDz/Ozs7/zs7O/86Ojr/Ojo6/zo6Ov85OTn/OTk5/zg4OP84ODj/ODg4/zc3 + N/83Nzf/NjY2/zY2Nv81NTX/NTU1/zU1Nf80NDTiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARkZG/0VF + Rf9FRUX/RERE/0RERP9ERET/Q0ND/0NDQ/9CQkL/QkJC/0FBQf9BQUH/QUFB/0BAQP9AQED/Pz8//z8/ + P/8/Pz//Pj4+/z4+Pv89PT3/PT09/zw8PP88PDz/PDw8/zs7O/87Ozv/Ojo6/zo6Ov86Ojr/OTk5/zk5 + Of84ODj/ODg4/zc3N/83Nzf/Nzc3/zY2Nv82Njb/NTU1/zU1Nf81NTX/AAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAARkZG/0VFRf9FRUX/RUVF/0RERP9ERET/Q0ND/0NDQ/9DQ0P/QkJC/0JCQv9BQUH/QUFB/0BA + QP9AQED/QEBA/z8/P/8/Pz//Pj4+/zs7O/85OTn/ODg4/zg4OP83Nzf/Nzc3/zY2Nv82Njb/NjY2/zU1 + Nf81NTX/NDQ0/zQ0NP80NDT/MzMz/zMzM/8yMjL/MjIy/zMzM/82Njb/NjY2/zU1Nf81NTX/AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAARkZG/0ZGRv9FRUX/RUVF/0RERP9ERET/RERE/0NDQ/9DQ0P/QkJC/0JC + Qv9CQkL/QUFB/0FBQf9AQED/QEBA/z8/P/8/Pz//Pz8//zk5Of/Jycn/1NTU/9TU1P/U1NT/1NTU/9TU + 1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/yMjI/zIyMv82Njb/NjY2/zU1 + Nf81NTX/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARkZG/0ZGRv9GRkb/RUVF/0VFRf9ERET/RERE/0BA + QP8+Pj7/QUFB/0JCQv9CQkL/QUFB/0FBQf9BQUH/QEBA/0BAQP8/Pz//Pz8//zk5Of/U1NT/1NTU/9TU + 1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/zIy + Mv83Nzf/NjY2/zY2Nv81NTX/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAR0dH/0ZGRv9GRkb/RUVF/0VF + Rf9FRUX/QUFB/1ZWVv+SkpL/UVFR/0BAQP9CQkL/QkJC/0FBQf9BQUH/QEBA/0BAQP9AQED/Pz8//zo6 + Ov/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU + 1P/U1NT/1NTU/zIyMv83Nzf/NjY2/zY2Nv82Njb/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAR0dH/0dH + R/9GRkb/RkZG/0VFRf9CQkL/U1NT/5qamv+fn5//l5eX/09PT/9AQED/QkJC/0JCQv9BQUH/QUFB/0BA + QP9AQED/Pz8//zo6Ov/IyMj/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU + 1P/U1NT/1NTU/9TU1P/U1NT/xsbG/zIyMv83Nzf/Nzc3/zY2Nv82Njb/AAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAR0dH/0dHR/9GRkb/RkZG/0ZGRv9AQED/mpqa/5+fn/+fn5//n5+f/5iYmP9SUlL/QEBA/0JC + Qv9BQUH/QUFB/0FBQf9AQED/QEBA/zw8PP86Ojr/OTk5/zk5Of85OTn/ODg4/zg4OP83Nzf/Nzc3/zc3 + N/82Njb/NjY2/zU1Nf81NTX/NDQ0/zQ0NP80NDT/MzMz/zU1Nf83Nzf/Nzc3/zc3N/82Njb/AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAR0dH/0dHR/9HR0f/RkZG/0ZGRv9CQkL/ZWVl/56env+fn5//np6e/56e + nv+Tk5P/TU1N/0BAQP9CQkL/QUFB/0FBQf9AQED/QEBA/0BAQP8/Pz//Pz8//z4+Pv8+Pj7/PT09/z09 + Pf89PT3/PDw8/zw8PP87Ozv/Ozs7/zs7O/86Ojr/Ojo6/zk5Of85OTn/ODg4/zg4OP84ODj/Nzc3/zc3 + N/82Njb/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASEhI/0dHR/9HR0f/RkZG/0ZGRv9GRkb/QUFB/2Vl + Zf+dnZ3/np6e/5qamv+Wlpb/iIiI/0lJSf9AQED/QUFB/0FBQf9BQUH/QEBA/0BAQP8/Pz//Pz8//z8/ + P/8+Pj7/Pj4+/z09Pf89PT3/PDw8/zw8PP88PDz/Ozs7/zs7O/86Ojr/Ojo6/zo6Ov85OTn/OTk5/zg4 + OP84ODj/Nzc3/zc3N/83Nzf/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASEhI/0hISP9HR0f/R0dH/0ZG + Rv9GRkb/RUVF/0FBQf9mZmb/mZmZ/5aWlv+Ojo7/nJyc/8nJyf9paWn/QEBA/0FBQf9BQUH/QEBA/0BA + QP9AQED/Pz8//z8/P/8+Pj7/Pj4+/z4+Pv89PT3/PT09/zw8PP88PDz/Ozs7/zs7O/87Ozv/Ojo6/zo6 + Ov85OTn/OTk5/zk5Of84ODj/ODg4/zc3N/83Nzf/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASEhI/0hI + SP9HR0f/R0dH/0dHR/9GRkb/RkZG/0VFRf9CQkL/YmJi/42Njf+YmJj/zc3N/9DQ0P/Kysr/ZGRk/0BA + QP9BQUH/QUFB/0BAQP9AQED/Pz8//z8/P/8/Pz//Pj4+/z4+Pv89PT3/PT09/z09Pf88PDz/PDw8/zs7 + O/87Ozv/Ojo6/zo6Ov86Ojr/OTk5/zk5Of84ODj/ODg4/zg4OP83Nzf/AAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAASUlJ/0hISP9ISEj/R0dH/0dHR/9GRkb/RkZG/0ZGRv9FRUX/QUFB/35+fv/Pz8//0NDQ/9DQ + 0P/Q0ND/xcXF/z09Pf9BQUH/QUFB/0FBQf9AQED/QEBA/z8/P/8/Pz//Pz8//z4+Pv8+Pj7/PT09/z09 + Pf88PDz/PDw8/zw8PP87Ozv/Ozs7/zo6Ov86Ojr/OTk5/zk5Of85OTn/ODg4/zg4OP83Nzf/AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAASUlJ/0hISP9ISEj/SEhI/0dHR/9HR0f/RkZG/0ZGRv9CQkL/Z2dn/8vL + y//Q0ND/0NDQ/9DQ0P/Ozs7/dXV1/z8/P/9CQkL/QUFB/0FBQf9AQED/QEBA/0BAQP8/Pz//Pz8//z4+ + Pv8+Pj7/Pj4+/z09Pf89PT3/PDw8/zw8PP87Ozv/Ozs7/zs7O/86Ojr/Ojo6/zk5Of85OTn/OTk5/zg4 + OP84ODj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASUlJ/0lJSf9ISEj/SEhI/0dHR/9HR0f/R0dH/0ND + Q/9nZ2f/y8vL/9DQ0P/Q0ND/0NDQ/87Ozv9ycnL/QEBA/0JCQv9CQkL/QkJC/0FBQf9BQUH/QEBA/0BA + QP8/Pz//Pz8//z8/P/8+Pj7/Pj4+/z09Pf89PT3/PT09/zw8PP88PDz/Ozs7/zs7O/86Ojr/Ojo6/zo6 + Ov85OTn/OTk5/zg4OP84ODj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASUlJ/0lJSf9ISEj/SEhI/0hI + SP9HR0f/Q0ND/2dnZ//Ly8v/0NDQ/9DQ0P/Q0ND/zMzM/2pqav9AQED/Q0ND/0NDQ/9CQkL/QkJC/0FB + Qf9BQUH/QUFB/0BAQP9AQED/Pz8//z8/P/8+Pj7/Pj4+/z4+Pv89PT3/PT09/zw8PP88PDz/PDw8/zs7 + O/87Ozv/Ojo6/zo6Ov85OTn/OTk5/zk5Of84ODj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASkpK/0lJ + Sf9JSUn/SEhI/0hISP9DQ0P/Z2dn/8vLy//Q0ND/0NDQ/9DQ0P/MzMz/ampq/0FBQf9ERET/Q0ND/0ND + Q/9CQkL/QkJC/0JCQv9BQUH/QUFB/0BAQP9AQED/QEBA/z8/P/8/Pz//Pj4+/z4+Pv89PT3/PT09/z09 + Pf88PDz/PDw8/zs7O/87Ozv/Ozs7/zo6Ov86Ojr/OTk5/zk5Of84ODj/AAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAASkpK/0lJSf9JSUn/SUlJ/0hISP9DQ0P/w8PD/9DQ0P/Q0ND/0NDQ/8rKyv9jY2P/QkJC/0RE + RP9ERET/RERE/0NDQ/9DQ0P/QkJC/0JCQv9BQUH/QUFB/0FBQf9AQED/QEBA/z8/P/8/Pz//Pz8//z4+ + Pv8+Pj7/PT09/z09Pf88PDz/PDw8/zw8PP87Ozv/Ozs7/zo6Ov86Ojr/Ojo6/zk5Of85OTn/AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAASkpK/0pKSv9JSUn/SUlJ/0hISP9GRkb/ZWVl/8rKyv/Q0ND/zMzM/2pq + av9DQ0P/RUVF/0VFRf9ERET/RERE/0NDQ/9DQ0P/Q0ND/0JCQv9CQkL/QUFB/0FBQf9BQUH/QEBA/0BA + QP8/Pz//Pz8//z4+Pv8+Pj7/Pj4+/z09Pf89PT3/PDw8/zw8PP87Ozv/Ozs7/zs7O/86Ojr/Ojo6/zk5 + Of85OTn/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASkpK/0pKSv9KSkr/SUlJ/0lJSf9ISEj/RUVF/15e + Xv+7u7v/YmJi/0NDQ/9GRkb/RUVF/0VFRf9FRUX/RERE/0RERP9DQ0P/Q0ND/0JCQv9CQkL/QkJC/0FB + Qf9BQUH/QEBA/0BAQP9AQED/Pz8//z8/P/8+Pj7/Pj4+/z09Pf89PT3/PT09/zw8PP88PDz/Ozs7/zs7 + O/87Ozv/Ojo6/zo6Ov85OTn/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAS0tL/0pKSv9KSkr/SUlJ/0lJ + Sf9JSUn/SEhI/0ZGRv9BQUH/RERE/0ZGRv9GRkb/RkZG/0VFRf9FRUX/RERE/0RERP9ERET/Q0ND/0ND + Q/9CQkL/QkJC/0FBQf9BQUH/QUFB/0BAQP9AQED/Pz8//z8/P/8/Pz//Pj4+/z4+Pv89PT3/PT09/zw8 + PP88PDz/PDw8/zs7O/87Ozv/Ojo6/zo6Ov86Ojr/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAS0tL/0pK + Sv9KSkr/SkpK/0lJSf9JSUn/SEhI/0hISP9ISEj/R0dH/0dHR/9GRkb/RkZG/0VFRf9FRUX/RUVF/0RE + RP9ERET/Q0ND/0NDQ/9DQ0P/QkJC/0JCQv9BQUH/QUFB/0BAQP9AQED/QEBA/z8/P/8/Pz//Pj4+/z4+ + Pv8+Pj7/PT09/z09Pf88PDz/PDw8/zs7O/87Ozv/Ozs7/zo6Ov86Ojr/AAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAS0tL/0tLS/9KSkr/SkpK/0lJSf9JSUn/SUlJ/0hISP9ISEj/R0dH/0dHR/9HR0f/RkZG/0ZG + Rv9FRUX/RUVF/0RERP9ERET/RERE/0NDQ/9DQ0P/QkJC/0JCQv9CQkL/QUFB/0FBQf9AQED/QEBA/z8/ + P/8/Pz//Pz8//z4+Pv8+Pj7/PT09/z09Pf89PT3/PDw8/zw8PP87Ozv/Ozs7/zo6Ov86Ojr/AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAS0tL/0tLS/9LS0v/SkpK/0pKSv9JSUn/SUlJ/0hISP9ISEj/SEhI/0dH + R/9HR0f/RkZG/0ZGRv9GRkb/RUVF/0VFRf9ERET/RERE/0NDQ/9DQ0P/Q0ND/0JCQv9CQkL/QUFB/0FB + Qf9BQUH/QEBA/0BAQP8/Pz//Pz8//z4+Pv8+Pj7/Pj4+/z09Pf89PT3/PDw8/zw8PP88PDz/Ozs7/zs7 + O/86Ojr/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATExM/0tLS/9LS0v/SkpK/0pKSv9KSkr/SUlJ/0lJ + Sf9ISEj/SEhI/0hISP9HR0f/R0dH/0ZGRv9GRkb/RUVF/0VFRf9FRUX/RERE/0RERP9DQ0P/Q0ND/0ND + Q/9CQkL/QkJC/0FBQf9BQUH/QEBA/0BAQP9AQED/Pz8//z8/P/8+Pj7/Pj4+/z4+Pv89PT3/PT09/zw8 + PP88PDz/Ozs7/zs7O/87Ozv/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATExM/0xMTP9LS0v/S0tL/0pK + Sv9KSkr/SUlJ/0lJSf9JSUn/SEhI/0hISP9HR0f/R0dH/0dHR/9GRkb/RkZG/0VFRf9FRUX/RERE/0RE + RP9ERET/Q0ND/0NDQ/9CQkL/QkJC/0JCQv9BQUH/QUFB/0BAQP9AQED/Pz8//z8/P/8/Pz//Pj4+/z4+ + Pv89PT3/PT09/z09Pf88PDz/PDw8/zs7O/87Ozv/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzMzM/8zM + zP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP+ZmZn/mZmZ/5mZ + mf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/2ZmZv9mZmb/ZmZm/2Zm + Zv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/AAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAzMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zM + zP+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/2Zm + Zv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAzMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zM + zP/MzMz/zMzM/8zMzP+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZ + mf+ZmZn/mZmZ/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2Zm + Zv9mZmb/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzMzM4szMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zM + zP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZ + mf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2Zm + Zv9mZmb/ZmZm/2ZmZv9mZmbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzc3NTMzMzN7MzMz/zMzM/8zM + zP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZ + mf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2Zm + Zv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZt1nZ2dKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////////AAD///////8AAP///////wAA////////AAD///////8AAP// + /////wAA////////AAD///////8AAPAAAAAADwAA4AAAAAAHAADgAAAAAAcAAOAAAAAABwAA4AAAAAAH + AADgAAAAAAcAAOAAAAAABwAA4AAAAAAHAADgAAAAAAcAAOAAAAAABwAA4AAAAAAHAADgAAAAAAcAAOAA + AAAABwAA4AAAAAAHAADgAAAAAAcAAOAAAAAABwAA4AAAAAAHAADgAAAAAAcAAOAAAAAABwAA4AAAAAAH + AADgAAAAAAcAAOAAAAAABwAA4AAAAAAHAADgAAAAAAcAAOAAAAAABwAA4AAAAAAHAADgAAAAAAcAAOAA + AAAABwAA4AAAAAAHAADgAAAAAAcAAOAAAAAABwAA8AAAAAAPAAD///////8AAP///////wAA//////// + AAD///////8AAP///////wAA////////AAD///////8AAP///////wAAKAAAAEAAAACAAAAAAQAgAAAA + AAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAERERA9FRUU/RERERERERERERERERERERERERERERERERERERERE + REREREREQEBAREBAQERAQEBEQEBAREBAQERAQEBEQEBAREBAQERAQEBEQEBAREBAQERAQEBEPDw8RDw8 + PEQ8PDxEPDw8RDw8PEQ8PDxEPDw8RDw8PEQ8PDxEPDw8RDg4OEQ4ODhEODg4RDg4OEQ4ODhEODg4RDg4 + OEQ4ODhEODg4RDg4OEQ4ODhEODg4RDg4OEQ1NTVENTU1RDU1NUQ1NTVENTU1RDU1NUQ1NTU+MzMzDwAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEVFRT9FRUXuRUVF/0RERP9ERET/RERE/0ND + Q/9DQ0P/Q0ND/0JCQv9CQkL/QkJC/0FBQf9BQUH/QUFB/0BAQP9AQED/QEBA/0BAQP8/Pz//Pz8//z8/ + P/8+Pj7/Pj4+/z4+Pv89PT3/PT09/z09Pf88PDz/PDw8/zw8PP87Ozv/Ozs7/zs7O/87Ozv/Ojo6/zo6 + Ov86Ojr/OTk5/zk5Of85OTn/ODg4/zg4OP84ODj/Nzc3/zc3N/83Nzf/NjY2/zY2Nv82Njb/NjY2/zU1 + Nf81NTX/NTU1/zQ0NO0yMjI9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFRUXQRUVF/0VF + Rf9ERET/RERE/0RERP9DQ0P/Q0ND/0NDQ/9DQ0P/QkJC/0JCQv9CQkL/QUFB/0FBQf9BQUH/QEBA/0BA + QP9AQED/Pz8//z8/P/8/Pz//Pj4+/z4+Pv8+Pj7/Pj4+/z09Pf89PT3/PT09/zw8PP88PDz/PDw8/zs7 + O/87Ozv/Ozs7/zo6Ov86Ojr/Ojo6/zk5Of85OTn/OTk5/zk5Of84ODj/ODg4/zg4OP83Nzf/Nzc3/zc3 + N/82Njb/NjY2/zY2Nv81NTX/NTU1/zU1Nf80NDT/NDQ0zgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAARkZG/UVFRf9FRUX/RUVF/0RERP9ERET/RERE/0NDQ/9DQ0P/Q0ND/0JCQv9CQkL/QkJC/0FB + Qf9BQUH/QUFB/0FBQf9AQED/QEBA/0BAQP8/Pz//Pz8//z8/P/8+Pj7/Pj4+/z4+Pv89PT3/PT09/z09 + Pf88PDz/PDw8/zw8PP88PDz/Ozs7/zs7O/87Ozv/Ojo6/zo6Ov86Ojr/OTk5/zk5Of85OTn/ODg4/zg4 + OP84ODj/Nzc3/zc3N/83Nzf/Nzc3/zY2Nv82Njb/NjY2/zU1Nf81NTX/NTU1/zQ0NPwAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAEZGRv9FRUX/RUVF/0VFRf9FRUX/RERE/0RERP9ERET/Q0ND/0ND + Q/9DQ0P/QkJC/0JCQv9CQkL/QUFB/0FBQf9BQUH/QEBA/0BAQP9AQED/QEBA/z8/P/8/Pz//Pz8//z4+ + Pv8+Pj7/PT09/zw8PP88PDz/PDw8/zs7O/87Ozv/Ozs7/zo6Ov86Ojr/Ojo6/zk5Of85OTn/OTk5/zk5 + Of84ODj/ODg4/zg4OP83Nzf/Nzc3/zc3N/82Njb/NjY2/zY2Nv81NTX/NjY2/zY2Nv81NTX/NTU1/zU1 + Nf81NTX/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRkb/RkZG/0VFRf9FRUX/RUVF/0RE + RP9ERET/RERE/0NDQ/9DQ0P/Q0ND/0NDQ/9CQkL/QkJC/0JCQv9BQUH/QUFB/0FBQf9AQED/QEBA/0BA + QP8/Pz//Pz8//z8/P/8+Pj7/PDw8/zk5Of84ODj/Nzc3/zc3N/83Nzf/NjY2/zY2Nv82Njb/NTU1/zU1 + Nf81NTX/NDQ0/zQ0NP80NDT/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zIyMv8yMjL/MjIy/zU1 + Nf82Njb/NjY2/zU1Nf81NTX/NTU1/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARkZG/0ZG + Rv9GRkb/RUVF/0VFRf9FRUX/RERE/0RERP9ERET/Q0ND/0NDQ/9DQ0P/QkJC/0JCQv9CQkL/QUFB/0FB + Qf9BQUH/QUFB/0BAQP9AQED/QEBA/z8/P/8/Pz//Pz8//zw8PP9bW1v/09PT/9TU1P/U1NT/1NTU/9TU + 1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU + 1P/U1NT/09PT/1VVVf81NTX/NjY2/zY2Nv82Njb/NTU1/zU1Nf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAEZGRv9GRkb/RkZG/0VFRf9FRUX/RUVF/0RERP9ERET/RERE/0RERP9BQUH/QUFB/0JC + Qv9CQkL/QkJC/0JCQv9BQUH/QUFB/0FBQf9AQED/QEBA/0BAQP8/Pz//Pz8//z8/P/89PT3/bGxs/9TU + 1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU + 1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P9nZ2f/NTU1/zY2Nv82Njb/NjY2/zU1Nf81NTX/AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABHR0f/RkZG/0ZGRv9GRkb/RUVF/0VFRf9FRUX/RERE/0RE + RP9CQkL/QkJC/09PT/8+Pj7/QUFB/0JCQv9CQkL/QkJC/0FBQf9BQUH/QUFB/0BAQP9AQED/QEBA/z8/ + P/8/Pz//PT09/2xsbP/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU + 1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/Z2dn/zU1Nf83Nzf/NjY2/zY2 + Nv82Njb/NTU1/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAR0dH/0ZGRv9GRkb/RkZG/0VF + Rf9FRUX/RUVF/0VFRf9CQkL/QkJC/4eHh/+fn5//YWFh/z4+Pv9BQUH/QkJC/0JCQv9BQUH/QUFB/0FB + Qf9AQED/QEBA/0BAQP9AQED/Pz8//z09Pf9sbGz/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU + 1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/2dn + Z/81NTX/Nzc3/zY2Nv82Njb/NjY2/zY2Nv8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEdH + R/9HR0f/RkZG/0ZGRv9GRkb/RUVF/0VFRf9DQ0P/QkJC/4aGhv+goKD/n5+f/56env9hYWH/Pj4+/0FB + Qf9CQkL/QkJC/0FBQf9BQUH/QUFB/0BAQP9AQED/QEBA/z8/P/89PT3/aWlp/9TU1P/U1NT/1NTU/9TU + 1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU1P/U1NT/1NTU/9TU + 1P/U1NT/1NTU/9TU1P9lZWX/NTU1/zc3N/83Nzf/NjY2/zY2Nv82Njb/AAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAABHR0f/R0dH/0dHR/9GRkb/RkZG/0ZGRv9ERET/Pz8//4eHh/+goKD/n5+f/5+f + n/+fn5//np6e/2RkZP8+Pj7/QUFB/0JCQv9CQkL/QUFB/0FBQf9BQUH/QEBA/0BAQP9AQED/PT09/z09 + Pf9oaGj/bGxs/2xsbP9sbGz/a2tr/2tra/9ra2v/a2tr/2pqav9qamr/ampq/2pqav9qamr/ampq/2lp + af9paWn/aWlp/2hoaP9oaGj/aGho/2hoaP9jY2P/Nzc3/zY2Nv83Nzf/Nzc3/zc3N/82Njb/NjY2/wAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAR0dH/0dHR/9HR0f/RkZG/0ZGRv9GRkb/Q0ND/0BA + QP+Tk5P/n5+f/5+fn/+fn5//n5+f/56env+dnZ3/Y2Nj/z09Pf9BQUH/QkJC/0FBQf9BQUH/QUFB/0BA + QP9AQED/QEBA/z8/P/89PT3/PT09/z09Pf88PDz/PDw8/zw8PP87Ozv/Ozs7/zs7O/86Ojr/Ojo6/zo6 + Ov85OTn/OTk5/zk5Of85OTn/ODg4/zg4OP84ODj/Nzc3/zc3N/83Nzf/NjY2/zY2Nv84ODj/Nzc3/zc3 + N/83Nzf/NjY2/zY2Nv8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEhISP9HR0f/R0dH/0dH + R/9GRkb/RkZG/0ZGRv9BQUH/SkpK/5WVlf+fn5//n5+f/56env+enp7/nJyc/5iYmP9eXl7/Pj4+/0FB + Qf9CQkL/QUFB/0FBQf9BQUH/QEBA/0BAQP9AQED/Pz8//z8/P/8/Pz//Pj4+/z4+Pv8+Pj7/Pj4+/z09 + Pf89PT3/PT09/zw8PP88PDz/PDw8/zs7O/87Ozv/Ozs7/zo6Ov86Ojr/Ojo6/zk5Of85OTn/OTk5/zk5 + Of84ODj/ODg4/zg4OP83Nzf/Nzc3/zc3N/82Njb/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AABISEj/R0dH/0dHR/9HR0f/RkZG/0ZGRv9GRkb/RkZG/0FBQf9KSkr/lJSU/56env+enp7/nJyc/5mZ + mf+Wlpb/j4+P/1lZWf8+Pj7/QUFB/0FBQf9BQUH/QUFB/0FBQf9AQED/QEBA/0BAQP8/Pz//Pz8//z8/ + P/8+Pj7/Pj4+/z4+Pv89PT3/PT09/z09Pf88PDz/PDw8/zw8PP88PDz/Ozs7/zs7O/87Ozv/Ojo6/zo6 + Ov86Ojr/OTk5/zk5Of85OTn/ODg4/zg4OP84ODj/Nzc3/zc3N/83Nzf/Nzc3/wAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAASEhI/0hISP9HR0f/R0dH/0dHR/9GRkb/RkZG/0ZGRv9FRUX/QUFB/0tL + S/+Tk5P/nJyc/5mZmf+Wlpb/kJCQ/4mJif+kpKT/gICA/z4+Pv9BQUH/QUFB/0FBQf9BQUH/QEBA/0BA + QP9AQED/Pz8//z8/P/8/Pz//Pz8//z4+Pv8+Pj7/Pj4+/z09Pf89PT3/PT09/zw8PP88PDz/PDw8/zs7 + O/87Ozv/Ozs7/zo6Ov86Ojr/Ojo6/zo6Ov85OTn/OTk5/zk5Of84ODj/ODg4/zg4OP83Nzf/Nzc3/zc3 + N/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEhISP9ISEj/SEhI/0dHR/9HR0f/R0dH/0ZG + Rv9GRkb/RkZG/0VFRf9BQUH/SkpK/4+Pj/+Wlpb/kJCQ/4mJif+pqan/0NDQ/8/Pz/+AgID/Pj4+/0FB + Qf9BQUH/QUFB/0FBQf9AQED/QEBA/0BAQP8/Pz//Pz8//z8/P/8+Pj7/Pj4+/z4+Pv89PT3/PT09/z09 + Pf89PT3/PDw8/zw8PP88PDz/Ozs7/zs7O/87Ozv/Ojo6/zo6Ov86Ojr/OTk5/zk5Of85OTn/ODg4/zg4 + OP84ODj/ODg4/zc3N/83Nzf/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABISEj/SEhI/0hI + SP9HR0f/R0dH/0dHR/9GRkb/RkZG/0ZGRv9GRkb/RUVF/0FBQf9KSkr/hoaG/4mJif+pqan/0NDQ/9DQ + 0P/Q0ND/z8/P/4CAgP89PT3/QEBA/0FBQf9BQUH/QUFB/0BAQP9AQED/QEBA/z8/P/8/Pz//Pz8//z4+ + Pv8+Pj7/Pj4+/z09Pf89PT3/PT09/zw8PP88PDz/PDw8/zw8PP87Ozv/Ozs7/zs7O/86Ojr/Ojo6/zo6 + Ov85OTn/OTk5/zk5Of84ODj/ODg4/zg4OP83Nzf/Nzc3/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAASUlJ/0hISP9ISEj/SEhI/0dHR/9HR0f/R0dH/0ZGRv9GRkb/RkZG/0VFRf9FRUX/QUFB/0ZG + Rv+pqan/0NDQ/9DQ0P/Q0ND/0NDQ/9DQ0P/Pz8//YWFh/0BAQP9BQUH/QUFB/0FBQf9AQED/QEBA/0BA + QP8/Pz//Pz8//z8/P/8/Pz//Pj4+/z4+Pv8+Pj7/PT09/z09Pf89PT3/PDw8/zw8PP88PDz/Ozs7/zs7 + O/87Ozv/Ojo6/zo6Ov86Ojr/Ojo6/zk5Of85OTn/OTk5/zg4OP84ODj/ODg4/zc3N/8AAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAElJSf9ISEj/SEhI/0hISP9HR0f/R0dH/0dHR/9HR0f/RkZG/0ZG + Rv9GRkb/Q0ND/0BAQP+Pj4//0NDQ/9DQ0P/Q0ND/0NDQ/9DQ0P/Q0ND/t7e3/0NDQ/9AQED/QkJC/0FB + Qf9BQUH/QUFB/0BAQP9AQED/QEBA/z8/P/8/Pz//Pz8//z4+Pv8+Pj7/Pj4+/z09Pf89PT3/PT09/z09 + Pf88PDz/PDw8/zw8PP87Ozv/Ozs7/zs7O/86Ojr/Ojo6/zo6Ov85OTn/OTk5/zk5Of84ODj/ODg4/zg4 + OP84ODj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABJSUn/SUlJ/0hISP9ISEj/SEhI/0dH + R/9HR0f/R0dH/0ZGRv9GRkb/RUVF/z8/P/+JiYn/0NDQ/9DQ0P/Q0ND/0NDQ/9DQ0P/Q0ND/vLy8/0hI + SP9AQED/QkJC/0JCQv9BQUH/QUFB/0FBQf9AQED/QEBA/0BAQP9AQED/Pz8//z8/P/8/Pz//Pj4+/z4+ + Pv8+Pj7/PT09/z09Pf89PT3/PDw8/zw8PP88PDz/Ozs7/zs7O/87Ozv/Ozs7/zo6Ov86Ojr/Ojo6/zk5 + Of85OTn/OTk5/zg4OP84ODj/ODg4/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASUlJ/0lJ + Sf9ISEj/SEhI/0hISP9ISEj/R0dH/0dHR/9HR0f/RUVF/0BAQP+JiYn/0NDQ/9DQ0P/Q0ND/0NDQ/9DQ + 0P/Q0ND/u7u7/0hISP9BQUH/Q0ND/0JCQv9CQkL/QkJC/0FBQf9BQUH/QUFB/0BAQP9AQED/QEBA/z8/ + P/8/Pz//Pz8//z4+Pv8+Pj7/Pj4+/z4+Pv89PT3/PT09/z09Pf88PDz/PDw8/zw8PP87Ozv/Ozs7/zs7 + O/86Ojr/Ojo6/zo6Ov85OTn/OTk5/zk5Of85OTn/ODg4/zg4OP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAElJSf9JSUn/SUlJ/0hISP9ISEj/SEhI/0dHR/9HR0f/RkZG/0FBQf+JiYn/0NDQ/9DQ + 0P/Q0ND/0NDQ/9DQ0P/Q0ND/s7Oz/0hISP9BQUH/Q0ND/0NDQ/9CQkL/QkJC/0JCQv9CQkL/QUFB/0FB + Qf9BQUH/QEBA/0BAQP9AQED/Pz8//z8/P/8/Pz//Pj4+/z4+Pv8+Pj7/PT09/z09Pf89PT3/PDw8/zw8 + PP88PDz/PDw8/zs7O/87Ozv/Ozs7/zo6Ov86Ojr/Ojo6/zk5Of85OTn/OTk5/zg4OP84ODj/AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABKSkr/SUlJ/0lJSf9JSUn/SEhI/0hISP9ISEj/RkZG/0FB + Qf+Kior/0NDQ/9DQ0P/Q0ND/0NDQ/9DQ0P/Q0ND/s7Oz/0hISP9CQkL/RERE/0NDQ/9DQ0P/Q0ND/0JC + Qv9CQkL/QkJC/0FBQf9BQUH/QUFB/0BAQP9AQED/QEBA/0BAQP8/Pz//Pz8//z8/P/8+Pj7/Pj4+/z4+ + Pv89PT3/PT09/z09Pf88PDz/PDw8/zw8PP87Ozv/Ozs7/zs7O/87Ozv/Ojo6/zo6Ov86Ojr/OTk5/zk5 + Of85OTn/ODg4/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASkpK/0lJSf9JSUn/SUlJ/0hI + SP9ISEj/R0dH/0JCQv+RkZH/0NDQ/9DQ0P/Q0ND/0NDQ/9DQ0P/Q0ND/rq6u/0ZGRv9CQkL/RERE/0RE + RP9DQ0P/Q0ND/0NDQ/9DQ0P/QkJC/0JCQv9CQkL/QUFB/0FBQf9BQUH/QEBA/0BAQP9AQED/Pz8//z8/ + P/8/Pz//Pj4+/z4+Pv8+Pj7/Pj4+/z09Pf89PT3/PT09/zw8PP88PDz/PDw8/zs7O/87Ozv/Ozs7/zo6 + Ov86Ojr/Ojo6/zk5Of85OTn/OTk5/zk5Of8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEpK + Sv9KSkr/SUlJ/0lJSf9JSUn/SEhI/0dHR/9CQkL/v7+//9DQ0P/Q0ND/0NDQ/9DQ0P/Q0ND/rq6u/0ZG + Rv9DQ0P/RUVF/0RERP9ERET/RERE/0NDQ/9DQ0P/Q0ND/0JCQv9CQkL/QkJC/0FBQf9BQUH/QUFB/0FB + Qf9AQED/QEBA/0BAQP8/Pz//Pz8//z8/P/8+Pj7/Pj4+/z4+Pv89PT3/PT09/z09Pf88PDz/PDw8/zw8 + PP88PDz/Ozs7/zs7O/87Ozv/Ojo6/zo6Ov86Ojr/OTk5/zk5Of85OTn/AAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAABKSkr/SkpK/0lJSf9JSUn/SUlJ/0lJSf9ISEj/RERE/1xcXP/Gxsb/0NDQ/9DQ + 0P/Q0ND/tLS0/0pKSv9DQ0P/RUVF/0VFRf9ERET/RERE/0RERP9ERET/Q0ND/0NDQ/9DQ0P/QkJC/0JC + Qv9CQkL/QUFB/0FBQf9BQUH/QEBA/0BAQP9AQED/Pz8//z8/P/8/Pz//Pz8//z4+Pv8+Pj7/Pj4+/z09 + Pf89PT3/PT09/zw8PP88PDz/PDw8/zs7O/87Ozv/Ozs7/zo6Ov86Ojr/Ojo6/zo6Ov85OTn/OTk5/wAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASkpK/0pKSv9KSkr/SUlJ/0lJSf9JSUn/SEhI/0dH + R/9ERET/XFxc/8fHx//Q0ND/tLS0/0lJSf9ERET/RkZG/0VFRf9FRUX/RUVF/0RERP9ERET/RERE/0ND + Q/9DQ0P/Q0ND/0JCQv9CQkL/QkJC/0JCQv9BQUH/QUFB/0FBQf9AQED/QEBA/0BAQP8/Pz//Pz8//z8/ + P/8+Pj7/Pj4+/z4+Pv89PT3/PT09/z09Pf89PT3/PDw8/zw8PP88PDz/Ozs7/zs7O/87Ozv/Ojo6/zo6 + Ov86Ojr/OTk5/zk5Of8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEtLS/9KSkr/SkpK/0pK + Sv9JSUn/SUlJ/0lJSf9ISEj/R0dH/0RERP9YWFj/kZGR/0dHR/9ERET/RkZG/0ZGRv9GRkb/RUVF/0VF + Rf9FRUX/RERE/0RERP9ERET/Q0ND/0NDQ/9DQ0P/QkJC/0JCQv9CQkL/QUFB/0FBQf9BQUH/QUFB/0BA + QP9AQED/QEBA/z8/P/8/Pz//Pz8//z4+Pv8+Pj7/Pj4+/z09Pf89PT3/PT09/zw8PP88PDz/PDw8/zs7 + O/87Ozv/Ozs7/zs7O/86Ojr/Ojo6/zo6Ov85OTn/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AABLS0v/SkpK/0pKSv9KSkr/SUlJ/0lJSf9JSUn/SUlJ/0hISP9ISEj/RERE/0FBQf9FRUX/R0dH/0ZG + Rv9GRkb/RkZG/0VFRf9FRUX/RUVF/0RERP9ERET/RERE/0RERP9DQ0P/Q0ND/0NDQ/9CQkL/QkJC/0JC + Qv9BQUH/QUFB/0FBQf9AQED/QEBA/0BAQP8/Pz//Pz8//z8/P/8/Pz//Pj4+/z4+Pv8+Pj7/PT09/z09 + Pf89PT3/PDw8/zw8PP88PDz/Ozs7/zs7O/87Ozv/Ojo6/zo6Ov86Ojr/Ojo6/wAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAS0tL/0tLS/9KSkr/SkpK/0pKSv9JSUn/SUlJ/0lJSf9ISEj/SEhI/0hI + SP9HR0f/R0dH/0dHR/9HR0f/RkZG/0ZGRv9GRkb/RUVF/0VFRf9FRUX/RERE/0RERP9ERET/Q0ND/0ND + Q/9DQ0P/QkJC/0JCQv9CQkL/QkJC/0FBQf9BQUH/QUFB/0BAQP9AQED/QEBA/z8/P/8/Pz//Pz8//z4+ + Pv8+Pj7/Pj4+/z09Pf89PT3/PT09/z09Pf88PDz/PDw8/zw8PP87Ozv/Ozs7/zs7O/86Ojr/Ojo6/zo6 + Ov8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEtLS/9LS0v/SkpK/0pKSv9KSkr/SkpK/0lJ + Sf9JSUn/SUlJ/0hISP9ISEj/SEhI/0dHR/9HR0f/R0dH/0ZGRv9GRkb/RkZG/0VFRf9FRUX/RUVF/0VF + Rf9ERET/RERE/0RERP9DQ0P/Q0ND/0NDQ/9CQkL/QkJC/0JCQv9BQUH/QUFB/0FBQf9AQED/QEBA/0BA + QP9AQED/Pz8//z8/P/8/Pz//Pj4+/z4+Pv8+Pj7/PT09/z09Pf89PT3/PDw8/zw8PP88PDz/Ozs7/zs7 + O/87Ozv/Ozs7/zo6Ov86Ojr/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABLS0v/S0tL/0tL + S/9KSkr/SkpK/0pKSv9JSUn/SUlJ/0lJSf9ISEj/SEhI/0hISP9ISEj/R0dH/0dHR/9HR0f/RkZG/0ZG + Rv9GRkb/RUVF/0VFRf9FRUX/RERE/0RERP9ERET/Q0ND/0NDQ/9DQ0P/Q0ND/0JCQv9CQkL/QkJC/0FB + Qf9BQUH/QUFB/0BAQP9AQED/QEBA/z8/P/8/Pz//Pz8//z4+Pv8+Pj7/Pj4+/z4+Pv89PT3/PT09/z09 + Pf88PDz/PDw8/zw8PP87Ozv/Ozs7/zs7O/86Ojr/Ojo6/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAS0tL/0tLS/9LS0v/S0tL/0pKSv9KSkr/SkpK/0lJSf9JSUn/SUlJ/0hISP9ISEj/SEhI/0dH + R/9HR0f/R0dH/0ZGRv9GRkb/RkZG/0ZGRv9FRUX/RUVF/0VFRf9ERET/RERE/0RERP9DQ0P/Q0ND/0ND + Q/9CQkL/QkJC/0JCQv9BQUH/QUFB/0FBQf9BQUH/QEBA/0BAQP9AQED/Pz8//z8/P/8/Pz//Pj4+/z4+ + Pv8+Pj7/PT09/z09Pf89PT3/PDw8/zw8PP88PDz/PDw8/zs7O/87Ozv/Ozs7/zo6Ov8AAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAExMTP9LS0v/S0tL/0tLS/9KSkr/SkpK/0pKSv9KSkr/SUlJ/0lJ + Sf9JSUn/SEhI/0hISP9ISEj/R0dH/0dHR/9HR0f/RkZG/0ZGRv9GRkb/RUVF/0VFRf9FRUX/RUVF/0RE + RP9ERET/RERE/0NDQ/9DQ0P/Q0ND/0JCQv9CQkL/QkJC/0FBQf9BQUH/QUFB/0BAQP9AQED/QEBA/0BA + QP8/Pz//Pz8//z8/P/8+Pj7/Pj4+/z4+Pv89PT3/PT09/z09Pf88PDz/PDw8/zw8PP87Ozv/Ozs7/zs7 + O/86Ojr/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABMTEz/TExM/0tLS/9LS0v/S0tL/0pK + Sv9KSkr/SkpK/0lJSf9JSUn/SUlJ/0hISP9ISEj/SEhI/0hISP9HR0f/R0dH/0dHR/9GRkb/RkZG/0ZG + Rv9FRUX/RUVF/0VFRf9ERET/RERE/0RERP9DQ0P/Q0ND/0NDQ/9DQ0P/QkJC/0JCQv9CQkL/QUFB/0FB + Qf9BQUH/QEBA/0BAQP9AQED/Pz8//z8/P/8/Pz//Pj4+/z4+Pv8+Pj7/Pj4+/z09Pf89PT3/PT09/zw8 + PP88PDz/PDw8/zs7O/87Ozv/Ozs7/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbm5u/25u + bv9tbW3/bW1t/21tbf9tbW3/bGxs/2xsbP9sbGz/bGxs/2xsbP9sbGz/a2tr/2tra/9ra2v/ampq/2pq + av9qamr/YmJi8FxcXP9cXFz/XFxc/1xcXP9cXFz/XFxc/1tbW/9bW1v/W1tb/1paWv9aWlr/Wlpa/1lZ + Wf9ZWVn/WVlZ/1lZWf9ZWVn/WVlZ/0tLS/BKSkr/SkpK/0pKSv9JSUn/SUlJ/0lJSf9ISEj/SEhI/0hI + SP9ISEj/SEhI/0hISP9HR0f/R0dH/0dHR/9HR0f/RkZG/0ZGRv8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAMzMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zM + zP/MzMz/zMzM/8zMzP/MzMz/zMzM/8XFxcaZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZ + mf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf9tbW3GZmZm/2ZmZv9mZmb/ZmZm/2Zm + Zv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zM + zP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/FxcXGmZmZ/5mZmf+ZmZn/mZmZ/5mZ + mf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/bW1txmZm + Zv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2Zm + Zv9mZmb/ZmZm/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzMzM/8zMzP/MzMz/zMzM/8zM + zP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/xcXFxpmZ + mf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZ + mf+ZmZn/mZmZ/21tbcZmZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2Zm + Zv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzM + zP3MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zM + zP/MzMz/zMzM/8XFxcaZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZ + mf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf9tbW3GZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2Zm + Zv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb8AAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAADMzMzQzMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zM + zP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/FxcXGmZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZ + mf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/bW1txmZmZv9mZmb/ZmZm/2Zm + Zv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZmzgAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAysrKP8zMzO7MzMz/zMzM/8zMzP/MzMz/zMzM/8zM + zP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/zMzM/8zMzP/MzMz/xcXFxpmZmf+ZmZn/mZmZ/5mZ + mf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/5mZmf+ZmZn/mZmZ/21t + bcZmZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2ZmZv9mZmb/ZmZm/2Zm + Zv9mZmb/ZmZm7WRkZD0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMwPy8vLRMzM + zFXMzMxVzMzMVczMzFXMzMxVzMzMVczMzFXMzMxVzMzMVczMzFXMzMxVzMzMVczMzFXMzMxVzMzMVb6+ + vk+ZmZlVmZmZVZmZmVWZmZlVmZmZVZmZmVWZmZlVmZmZVZmZmVWZmZlVmZmZVZmZmVWZmZlVmZmZVZmZ + mVWZmZlVmZmZVZmZmVV0dHRPZmZmVWZmZlVmZmZVZmZmVWZmZlVmZmZVZmZmVWZmZlVmZmZVZmZmVWZm + ZlVmZmZVZmZmVWZmZlVmZmZVZWVlRGZmZg8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////+AAAAAAA + AB/wAAAAAAAAD/AAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AA + AAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP8AAAAAAA + AA/wAAAAAAAAD/AAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AA + AAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP8AAAAAAA + AA/wAAAAAAAAD/AAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AAAAAAAAAP8AAAAAAAAA/wAAAAAAAAD/AA + AAAAAAAP8AAAAAAAAA/wAAAAAAAAD/gAAAAAAAAf//////////////////////////////////////// + /////////////////////////////////////////////////////////////////////////////w== + + + \ No newline at end of file diff --git a/WinPaletter/Terminals/WindowsTerminalDecide.vb b/WinPaletter/Terminals/WindowsTerminalDecide.vb new file mode 100644 index 00000000..ced7dc8b --- /dev/null +++ b/WinPaletter/Terminals/WindowsTerminalDecide.vb @@ -0,0 +1,28 @@ +Imports WinPaletter.XenonCore + +Public Class WindowsTerminalDecide + + Private Sub WindowsTerminalDecide_Load(sender As Object, e As EventArgs) Handles MyBase.Load + ApplyDarkMode(Me) + Dim c As Color = GetAverageColor(PictureBox1.Image) + Dim c1 As Color = CCB(c, If(GetDarkMode(), -0.35, 0.35)) + Dim c2 As Color = CCB(c, If(GetDarkMode(), -0.75, 0.75)) + Panel1.BackColor = c1 + BackColor = c2 + My.Computer.Audio.PlaySystemSound(Media.SystemSounds.Exclamation) + XenonRadioImage1.Checked = (WindowsTerminal.SaveState = WinTerminal.Version.Stable) + XenonRadioImage2.Checked = (WindowsTerminal.SaveState = WinTerminal.Version.Preview) + End Sub + + Private Sub XenonButton1_Click(sender As Object, e As EventArgs) Handles XenonButton1.Click + If XenonRadioImage1.Checked Then WindowsTerminal.SaveState = WinTerminal.Version.Stable + If XenonRadioImage2.Checked Then WindowsTerminal.SaveState = WinTerminal.Version.Preview + DialogResult = DialogResult.OK + Close() + End Sub + + Private Sub XenonButton2_Click(sender As Object, e As EventArgs) Handles XenonButton2.Click + DialogResult = DialogResult.Cancel + Close() + End Sub +End Class \ No newline at end of file diff --git a/WinPaletter/Terminals/cmd.Designer.vb b/WinPaletter/Terminals/cmd.Designer.vb index ff98ad26..4f8cd2ee 100644 --- a/WinPaletter/Terminals/cmd.Designer.vb +++ b/WinPaletter/Terminals/cmd.Designer.vb @@ -127,6 +127,7 @@ Partial Class cmd Me.Label41 = New System.Windows.Forms.Label() Me.XenonButton1 = New WinPaletter.XenonButton() Me.OpenWPTHDlg = New System.Windows.Forms.OpenFileDialog() + Me.XenonSeparator2 = New WinPaletter.XenonSeparator() Me.XenonGroupBox3.SuspendLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() Me.XenonGroupBox2.SuspendLayout() @@ -275,7 +276,7 @@ Partial Class cmd Me.XenonGroupBox2.ForceNoNerd = False Me.XenonGroupBox2.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox2.LineSize = 1 - Me.XenonGroupBox2.Location = New System.Drawing.Point(12, 356) + Me.XenonGroupBox2.Location = New System.Drawing.Point(12, 362) Me.XenonGroupBox2.Name = "XenonGroupBox2" Me.XenonGroupBox2.Size = New System.Drawing.Size(259, 260) Me.XenonGroupBox2.TabIndex = 102 @@ -480,7 +481,7 @@ Partial Class cmd Me.XenonCheckBox1.Checked = False Me.XenonCheckBox1.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.XenonCheckBox1.ForeColor = System.Drawing.Color.White - Me.XenonCheckBox1.Location = New System.Drawing.Point(12, 627) + Me.XenonCheckBox1.Location = New System.Drawing.Point(12, 630) Me.XenonCheckBox1.Name = "XenonCheckBox1" Me.XenonCheckBox1.Size = New System.Drawing.Size(677, 24) Me.XenonCheckBox1.TabIndex = 100 @@ -505,7 +506,7 @@ Partial Class cmd Me.XenonGroupBox12.ForceNoNerd = False Me.XenonGroupBox12.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox12.LineSize = 1 - Me.XenonGroupBox12.Location = New System.Drawing.Point(514, 356) + Me.XenonGroupBox12.Location = New System.Drawing.Point(514, 362) Me.XenonGroupBox12.Name = "XenonGroupBox12" Me.XenonGroupBox12.Size = New System.Drawing.Size(175, 260) Me.XenonGroupBox12.TabIndex = 100 @@ -642,7 +643,7 @@ Partial Class cmd Me.XenonGroupBox34.ForceNoNerd = False Me.XenonGroupBox34.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox34.LineSize = 1 - Me.XenonGroupBox34.Location = New System.Drawing.Point(277, 492) + Me.XenonGroupBox34.Location = New System.Drawing.Point(277, 498) Me.XenonGroupBox34.Name = "XenonGroupBox34" Me.XenonGroupBox34.Size = New System.Drawing.Size(231, 124) Me.XenonGroupBox34.TabIndex = 99 @@ -831,7 +832,7 @@ Partial Class cmd Me.XenonGroupBox4.ForceNoNerd = False Me.XenonGroupBox4.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox4.LineSize = 1 - Me.XenonGroupBox4.Location = New System.Drawing.Point(277, 356) + Me.XenonGroupBox4.Location = New System.Drawing.Point(277, 362) Me.XenonGroupBox4.Name = "XenonGroupBox4" Me.XenonGroupBox4.Size = New System.Drawing.Size(231, 130) Me.XenonGroupBox4.TabIndex = 98 @@ -1022,7 +1023,7 @@ Partial Class cmd Me.XenonGroupBox1.ForceNoNerd = False Me.XenonGroupBox1.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox1.LineSize = 1 - Me.XenonGroupBox1.Location = New System.Drawing.Point(12, 57) + Me.XenonGroupBox1.Location = New System.Drawing.Point(12, 63) Me.XenonGroupBox1.Name = "XenonGroupBox1" Me.XenonGroupBox1.Size = New System.Drawing.Size(259, 293) Me.XenonGroupBox1.TabIndex = 87 @@ -1480,7 +1481,7 @@ Partial Class cmd Me.XenonGroupBox8.ForceNoNerd = False Me.XenonGroupBox8.LineColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer), CType(CType(32, Byte), Integer)) Me.XenonGroupBox8.LineSize = 1 - Me.XenonGroupBox8.Location = New System.Drawing.Point(277, 57) + Me.XenonGroupBox8.Location = New System.Drawing.Point(277, 63) Me.XenonGroupBox8.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.XenonGroupBox8.Name = "XenonGroupBox8" Me.XenonGroupBox8.Padding = New System.Windows.Forms.Padding(1) @@ -1581,12 +1582,22 @@ Partial Class cmd ' Me.OpenWPTHDlg.Filter = "WinPaletter Theme File (*.wpth)|*.wpth" ' + 'XenonSeparator2 + ' + Me.XenonSeparator2.Location = New System.Drawing.Point(12, 57) + Me.XenonSeparator2.Name = "XenonSeparator2" + Me.XenonSeparator2.Size = New System.Drawing.Size(677, 1) + Me.XenonSeparator2.TabIndex = 199 + Me.XenonSeparator2.TabStop = False + Me.XenonSeparator2.Text = "XenonSeparator2" + ' 'cmd ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 15.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.FromArgb(CType(CType(25, Byte), Integer), CType(CType(25, Byte), Integer), CType(CType(25, Byte), Integer)) Me.ClientSize = New System.Drawing.Size(703, 701) + Me.Controls.Add(Me.XenonSeparator2) Me.Controls.Add(Me.XenonGroupBox3) Me.Controls.Add(Me.XenonGroupBox2) Me.Controls.Add(Me.XenonCheckBox1) @@ -1732,4 +1743,5 @@ Partial Class cmd Friend WithEvents Label3 As Label Friend WithEvents Label4 As Label Friend WithEvents OpenWPTHDlg As OpenFileDialog + Friend WithEvents XenonSeparator2 As XenonSeparator End Class diff --git a/WinPaletter/Terminals/cmd.resx b/WinPaletter/Terminals/cmd.resx index 77f7a3d6..91cd71bc 100644 --- a/WinPaletter/Terminals/cmd.resx +++ b/WinPaletter/Terminals/cmd.resx @@ -125,18 +125,18 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACA - FQAAAk1TRnQBSQFMAgEBAwEAAZgBAAGYAQABFAEAARQBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFQ + FQAAAk1TRnQBSQFMAgEBAwEAAaABAAGgAQABFAEAARQBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFQ AwABFAMAAQEBAAEgBgABGf8A/wDkAAJEAUMBdwJMAUsBjwJMAUsBjwJMAUsBjwJMAUsBjwJMAUsBjwJM AUsBjwJMAUsBjwJMAUsBjwJMAUsBjwJMAUsBjwJMAUsBjwJMAUsBjwJMAUsBjwJMAUsBjwJMAUsBjwM6 AWEDBwEJrAADNgFXA10ByQNdAcwDXQHMA10BzANdAcwDXQHMA10BzANdAcwDXQHMA10BzANdAcwDXQHM - A10BzANdAcwDXQHMA1sBygNCAXIDCQEMAmMBWwHkAX4BYwEmAfwBfgFjASYB/AF+AWMBJgH8AX4BYQEm - AfwBfgFhASYB/AF+AWMBJgH8AX4BYwEmAfwBfgFiASYB/AF+AWIBJgH8AX4BYgEmAfwBfgFiASYB/AF+ - AWIBJgH8AX4BYgEmAfwBfgFiASYB/AF+AWIBJgH8AWQCYAHbAy8BSQwAA0QBegNdAcwDXQHMA10BzANd + A10BzANdAcwDXQHMA1sBygNCAXIDCQEMAmMBWwHkAX4BYwEoAfwBfgFjASgB/AF+AWMBKAH8AX4BYQEo + AfwBfgFhASgB/AF+AWMBKAH8AX4BYwEoAfwBfgFiASgB/AF+AWIBKAH8AX4BYgEoAfwBfgFiASgB/AF+ + AWIBKAH8AX4BYgEoAfwBfgFiASgB/AF+AWIBKAH8AWQCYAHbAy8BSQwAA0QBegNdAcwDXQHMA10BzANd AcwDXQHMA10BzANdAcwDXQHMA10BzANdAcwDXQHMA10BzANdAcwDXQHMA10BzANdAcwDTAGOAw8BFFQA A08BmQNYAf8DVgH/A1YB/wNVAf8DVAH/A1QB/wNSAf8DUgH/A1EB/wNQAf8DUAH/A08B/wNOAf8DTQH/ A00B/wNNAf8DVgGzAxMBGgNYAbgBsAFnAQAB/wGwAWcBAAH/Aa4BZQEAAf8B1gG5AY8B/wHqAd4BzAH/ AbQBegEpAf8BrgFlAQAB/wG4AX8BMQH/AcgBogFvAf8BygGnAXYB/wHKAacBdgH/AcoBpwF2Af8BuQGF - AT0B/wGtAWcBBQH/Aa0BZQEAAf8BgwFsAUYB9wJHAUYBgQwAA14BzQHFAcIBvAH/AZMBjwGKAf8BkgGP + AT0B/wGtAWcBBQH/Aa0BZQEAAf8BggFsAUkB9wJHAUYBgQwAA14BzQHFAcIBvAH/AZMBjwGKAf8BkgGP AYoB/wGSAY8BiQH/AZEBjwGJAf8BkQGOAYkB/wGRAY0BiAH/AZABjQGIAf8BkAGNAYgB/wGQAY0BhwH/ AZABjQGHAf8BjwGLAYYB/wGPAYsBhgH/AY4BiwGFAf8BjgGLAYUB/wGvAawBpQH/A2EB2QMbASZUAANP AZkDWgH/A1kB/wNYAf8DVwH/A1cB/wNWAf8DVQH/A1QB/wNTAf8DUwH/A1IB/wNTAf8DUQH/A1AB/wNP @@ -146,7 +146,7 @@ ATkB/wFAAT0BOQH/AUABPQE5Af8BQAE9ATgB/wE/ATwBOAH/AT8BPAE4Af8BPwE8ATcB/wE+ATsBNwH/ AT4BOwE3Af8BPgE7ATcB/wE9AToBNgH/AT0BOgE2Af8BPAE5ATYB/wF8AXkBdQH/A2EB2QMbASZUAANP AZkDXAH/A1wB/wNbAf8DWgH/A18B/wN8Af8DhgH/A2sB/wOBAf8DVwH/A14B/wNvAf8DWQH/A1MB/wNS - Af8DUQH/A1YBswMTARoDIQEwAZUBgAETAf4BugFtAQAB/wG6AW0BAAH/AbgBbQEEAf8BzAGcAVgB/wHq + Af8DUQH/A1YBswMTARoDIQEwAZMBgAEUAf4BugFtAQAB/wG6AW0BAAH/AbgBbQEEAf8BzAGcAVgB/wHq AdsBxgH/AfMB7QHlAf8B4AHKAawB/wHOAaYBbwH/AckBlwFQAf8ByQGXAVAB/wHJAZYBTgH/Ab4BfwEn Af8BtwFsAQMB/wG3AWsBAAH/AbcBawEAAf8CXAFZAb4DGwElCAADXgHNAaQBoQGcAf8BQAE9ATkB/wFB AT4BOgH/AUEBPgE5Af8BQAE9ATkB/wFAAT0BOQH/AUABPQE5Af8BQAE9ATgB/wE/ATwBOAH/AT8BPAE4 @@ -160,7 +160,7 @@ A08BmQNiAf8DYQH/A2AB/wNgAf8DrQH/A4UB/wNdAf8DXQH/A1kB/wNeAf8DiwH/A4AB/wNZAf8DWAH/ A1cB/wNWAf8DVgGzAxMBGgQAAlcBVgG1AcQBcwEAAf8BwwFzAQAB/wHDAXMBAAH/AcMBcwEAAf8BwwFz AQEB/wHEAX0BFgH/AdgBrwF0Af8B9QHvAecB/wHyAeoB3gH/AdcBrwF2Af8BvwF1AQsB/wHBAXEBAAH/ - AcEBcQEAAf8BwAFxAQAB/wHAAXEBAAH/AXIBbwFRAfMDOAFbCAADXgHNAaUBogGdAf8BQgE/AToB/wFC + AcEBcQEAAf8BwAFxAQAB/wHAAXEBAAH/AXEBbwFSAfMDOAFbCAADXgHNAaUBogGdAf8BQgE/AToB/wFC AT8BOwH/AUIBPwE6Af8BQgE/AToB/wFBAT4BOgH/AUEBPgE6Af8BQQE+ATkB/wFBAT4BOQH/AUABPQE5 Af8BQAE9ATgB/wE/ATwBOAH/AT8BPAE4Af8BPwE8ATgB/wE+ATsBNwH/AX4BewF3Af8DYQHZAxsBJlQA A08BmQNlAf8DYwH/A2MB/wNiAf8DrQH/A4gB/wNfAf8DXQH/A8cB/wNxAf8DmgH/A2YB/wNbAf8DWgH/ @@ -170,7 +170,7 @@ AUMBQAE7Af8BQgE/AToB/wFBAT4BOgH/AUEBPgE5Af8BPwE8ATcB/wE+ATsBNwH/AT4BPAE3Af8BQQE+ ATkB/wFAAT0BOQH/AUABPQE5Af8BQAE9ATgB/wE/ATwBOAH/AT4BOwE3Af8BfwF8AXcB/wNhAdkDGwEm VAADTwGZA2cB/wNmAf8DZQH/A2QB/wOFAf8DvgH/A5IB/wN6Af8DXgH/A30B/wOaAf8DXgH/A14B/wNd - Af8DXAH/A1sB/wNYAbMDEwEaBAADLwFJAaYBeQEmAfwBzQF5AQAB/wHNAXkBAAH/Ac0BeQEAAf8BzQF5 + Af8DXAH/A1sB/wNYAbMDEwEaBAADLwFJAaMBeQEoAfwBzQF5AQAB/wHNAXkBAAH/Ac0BeQEAAf8BzQF5 AQAB/wHMAXgBAAH/AcsBeAEBAf8BzQGJAScB/wHyAecB2AH/AfkB+AH2Af8B5QHLAaQB/wHMAYMBGgH/ AcsBdwEAAf8BygF3AQAB/wHKAXcBAAH/AcoBdwEAAf8DUwGnAxEBFgQAA14BzQGnAaQBnwH/AUMBQAE7 Af8BUQFPAUoB/wGhAaABngH/AYIBgAF+Af8BVgFTAU8B/wF8AXoBdwH/AYwBigGHAf8BZAFiAV8B/wFB @@ -184,7 +184,7 @@ ASZUAANPAZkDbAH/A2sB/wNqAf8DagH/A2kB/wNoAf8DaAH/A2YB/wNmAf8DZAH/A2MB/wNkAf8DYwH/ A2IB/wNhAf8DYQH/A1gBswMTARoEAAMVARwCWQFXAbkB1wF/AQAB/wHWAX8BAAH/AdYBfwEAAf8B1gF/ AQAB/wHXAY0BIQH/AegBywGgAf8B+AH2AfMB/wHyAeYB1AH/AdkBmQE7Af8B0wF+AQEB/wHUAX4BAAH/ - AdQBfQEAAf8B1AF9AQAB/wHTAX0BAAH/AdMBfQEAAf8BdQFvAVEB8wMkATUEAANeAc0BqAGlAaAB/wFE + AdQBfQEAAf8B1AF9AQAB/wHTAX0BAAH/AdMBfQEAAf8BcwFvAVIB8wMkATUEAANeAc0BqAGlAaAB/wFE AUEBPAH/AWYBZAFgAf8BwgHBAb8B/wGCAYABfQH/AUgBRQFBAf8BQwFAATwB/wFDAUABOwH/AUMBQAE7 Af8BQgE/ATsB/wFCAT8BOgH/AUIBPwE6Af8BQgE/AToB/wFBAT4BOgH/AUABPQE5Af8BgQF+AXkB/wNh AdkDGwEmVAADVQGtA24B/wNuAf8DbQH/A20B/wNsAf8DawH/A2oB/wNpAf8DaQH/A2gB/wNnAf8DZgH/ @@ -194,22 +194,22 @@ AUUBQgE8Af8BZgFjAWAB/wHfAd4B3QH/AagBpgGkAf8BSAFFAUAB/wFEAUEBPAH/AUQBQQE8Af8BQwFA ATwB/wFDAUABOwH/AUMBQAE7Af8BQgE/ATsB/wFCAT8BOgH/AUIBPwE6Af8BQQE+ATkB/wGBAX4BeQH/ A2EB2QMbASZUAANXAbUDmgH/A5oB/wOaAf8DmgH/A5oB/wOaAf8DmQH/A5kB/wOYAf8DmAH/A5gB/wOX - Af8DlgH/A5YB/wOWAf8DlQH/A10BxwMYASAEAAQCAz0BaAGzAX4BJgH8AeABhQEAAf8B4AGFAQAB/wHg + Af8DlgH/A5YB/wOWAf8DlQH/A10BxwMYASAEAAQCAz0BaAGxAX4BKAH8AeABhQEAAf8B4AGFAQAB/wHg AaUBUgH/AfoC+QH/AfYB7QHhAf8B3QGbAToB/wHfAYQBAAH/Ad8BhAEAAf8B3wGEAQAB/wHeAYQBAAH/ Ad4BhAEAAf8B3gGDAQAB/wHeAYMBAAH/Ad0BgwEAAf8B3QGDAQAB/wNOAZYEAANeAc0BqQGnAaIB/wFF AUIBPQH/AUYBQwE+Af8BXwFcAVgB/wFNAUoBRwH/AUUBQgE9Af8BRAFBATwB/wFEAUEBPAH/AUQBQQE8 Af8BRAFBATwB/wFDAUABOwH/AUMBQAE7Af8BQwFAATsB/wFCAT8BOwH/AUEBPgE5Af8BggF/AXoB/wNh - AdkDGwEmVAADTAGQA6YB/gPMAf8DzAH/A8wB/wPMAf8DzAH/A8wB/wPMAf8DzAH/A8wB/wPMAf8DzAH/ - A8wB/wPMAf8DswH/A5gB/gNWAasDEgEXCAADLwFJAmUBXgHiAeUBiAEAAf8B5QGIAQAB/wHjAZYBJwH/ + AdkDGwEmVAADTAGQA6QB/gPMAf8DzAH/A8wB/wPMAf8DzAH/A8wB/wPMAf8DzAH/A8wB/wPMAf8DzAH/ + A8wB/wPMAf8DswH/A5YB/gNWAasDEgEXCAADLwFJAmUBXgHiAeUBiAEAAf8B5QGIAQAB/wHjAZYBJwH/ Ae8BzQGcAf8B5QGnAU8B/wHjAYgBBQH/AeQBhwEAAf8B5AGHAQAB/wHjAYcBAAH/AeMBhwEAAf8B4wGH AQAB/wHjAYcBAAH/AeMBhgEAAf8B4gGGAQAB/wHiAYYBAAH/Al8BXAHLBAADXwHLAbcBtAGwAf8BZQFi AV4B/wFlAWIBXQH/AWUBYgFdAf8BZQFiAVwB/wFkAWEBXAH/AWQBYQFcAf8BZAFhAVwB/wFjAWABWwH/ AWMBYAFbAf8BYwFgAVsB/wFiAV8BWgH/AWIBXwFaAf8BYgFfAVoB/wFhAV4BWgH/AZYBlAGPAf8DXwHY AxsBJlQAAysBQQNOAZUDTwGZA08BmQNPAZkDTwGZA08BmQNPAZkDTwGZA08BmQNPAZkDTwGZA08BmQNP - AZkDTwGZA08BmQNOAZYDNAFUAwcBCQgAAxgBIQJWAVQBqwF/AWkBRAH2AeoBiwEAAf8B6QGKAQAB/wHm + AZkDTwGZA08BmQNOAZYDNAFUAwcBCQgAAxgBIQJWAVQBqwF9AWcBRgH2AeoBiwEAAf8B6QGKAQAB/wHm AYkBAAH/AegBigEAAf8B6QGKAQAB/wHpAYoBAAH/AekBigEAAf8B6AGKAQAB/wHoAYoBAAH/AegBigEA - Af8B6AGKAQAB/wHnAYkBAAH/AecBiQEAAf8BvgGJASYB/QJmAWAB4AQAA00BkwNqAeYDZgHpA2YB6QNm - AekDZgHpA2YB6QNmAekDZgHpA2YB6QNmAekDZgHpA2YB6QNmAekDZgHpA2YB6QNlAecDUwGnAxMBGagA + Af8B6AGKAQAB/wHnAYkBAAH/AecBiQEAAf8BvgGJASgB/QJmAWAB4AQAA00BkwNqAeYDZQHpA2UB6QNl + AekDZQHpA2UB6QNlAekDZQHpA2UB6QNlAekDZQHpA2UB6QNlAekDZQHpA2UB6QNlAecDUwGnAxMBGagA AwIBAwMiATECOQE4AV0DPAFmAzwBZgM8AWYDPAFmAzwBZgM8AWYDPAFmAzwBZgM8AWYDPAFmAzwBZgM8 AWYDPAFmAjwBOwFkAzMBUgQAAxUBHAMxAU0DMwFQAzMBUAMzAVADMwFQAzMBUAMzAVADMwFQAzMBUAMz AVADMwFQAzMBUAMzAVADMwFQAzMBUAMxAU4DHAEnAwIBA/8A/wDSAAFCAU0BPgcAAT4DAAEoAwABUAMA diff --git a/WinPaletter/WinPaletter.vbproj b/WinPaletter/WinPaletter.vbproj index af2e072f..20163752 100644 --- a/WinPaletter/WinPaletter.vbproj +++ b/WinPaletter/WinPaletter.vbproj @@ -284,6 +284,12 @@ Form + + WindowsTerminalDecide.vb + + + Form + Changelog.vb @@ -419,6 +425,9 @@ WindowsTerminal.vb + + WindowsTerminalDecide.vb + Changelog.vb