From 4314cea5abd4ed48bc06228c92806429590bd6ef Mon Sep 17 00:00:00 2001 From: Abdelrhman-AK Date: Fri, 1 Dec 2023 00:35:45 +0200 Subject: [PATCH] 1.0.8.3 --- Store/Themes/AMOLED/AMOLED.wpth | 2 +- WinPaletter.SysEventsSounds/Program.cs | 2 +- .../ColorItemControllers/ColorInfoDragDrop.cs | 10 +- .../ColorItemControllers/ColorPickerDlg.cs | 261 +- .../ColorItemControllers/SubMenu.Designer.cs | 50 +- WinPaletter/ColorItemControllers/SubMenu.cs | 42 +- WinPaletter/Converter/Converter.cs | 4 +- WinPaletter/Converter/Converter_CP.cs | 74 +- WinPaletter/Converter/Converter_Form.cs | 2 +- WinPaletter/Converter/Converter_WT.cs | 16 +- .../CursorsStudio/CursorsCustomizer.cs | 2977 ++++++----- .../CursorsStudio/CursorsStudio.Designer.cs | 4386 ++++++++--------- WinPaletter/CursorsStudio/CursorsStudio.cs | 148 +- WinPaletter/CursorsStudio/CursorsStudio.resx | 722 +-- WinPaletter/Dialogs/About.Designer.cs | 100 +- WinPaletter/Dialogs/About.cs | 2 +- WinPaletter/Dialogs/About.resx | 72 +- WinPaletter/Dialogs/BugReport.cs | 4 +- WinPaletter/Dialogs/RescueTools.cs | 4 +- WinPaletter/Dialogs/ThemeLog.cs | 6 +- WinPaletter/Dialogs/UserSwitch.cs | 2 +- WinPaletter/EditInfo.Designer.cs | 4 +- WinPaletter/EditInfo.cs | 25 +- WinPaletter/Extras/AltTabEditor.cs | 10 +- .../Extras/ApplicationThemer.Designer.cs | 4 +- WinPaletter/Extras/ApplicationThemer.cs | 20 +- WinPaletter/Extras/ScreenSaver_Editor.cs | 8 +- WinPaletter/Extras/Sounds_Editor.cs | 37 +- .../Extras/Wallpaper_Editor.Designer.cs | 2 +- WinPaletter/Extras/Wallpaper_Editor.cs | 33 +- WinPaletter/Extras/WinEffecter.cs | 6 +- WinPaletter/Form1.Designer.cs | 157 - WinPaletter/Form1.cs | 46 - WinPaletter/Form1.resx | 441 -- WinPaletter/Forms.cs | 2 +- .../Elements/AdvancedControls/ColorItem.cs | 454 +- .../AdvancedControls/CursorControl.cs | 226 +- .../Elements/AdvancedControls/StoreItem.cs | 251 +- .../AdvancedControls/TextTranslationItem.cs | 108 +- WinPaletter/GUI/Elements/Checkers/CheckBox.cs | 90 +- .../GUI/Elements/Checkers/RadioButton.cs | 67 +- .../GUI/Elements/Checkers/RadioImage.cs | 203 +- WinPaletter/GUI/Elements/Checkers/Toggle.cs | 343 +- .../Elements/ContainersAndBoxes/AlertBox.cs | 61 +- .../ContainersAndBoxes/AnimatedBox.cs | 59 +- .../Elements/ContainersAndBoxes/GroupBox.cs | 13 +- WinPaletter/GUI/Elements/Input/Button.cs | 355 +- WinPaletter/GUI/Elements/Input/ComboBox.cs | 211 +- .../GUI/Elements/Input/NumericUpDown.cs | 263 +- WinPaletter/GUI/Elements/Input/TextBox.cs | 353 +- WinPaletter/GUI/Elements/Labels/LabelAlt.cs | 40 +- WinPaletter/GUI/Elements/Labels/LinkLabel.cs | 4 - .../Elements/Labels/ToolStripStatusLabel.cs | 20 +- .../GUI/Elements/Others/ProgressBar.cs | 165 +- .../GUI/Elements/Others/StripRenderer.cs | 11 +- .../GUI/Elements/Others/ToolStripMenuItem.cs | 19 +- .../Elements/Others/TransparentPictureBox.cs | 30 +- WinPaletter/GUI/Elements/Others/TreeView.cs | 6 +- .../GUI/Elements/Separators/SeparatorH.cs | 12 +- .../GUI/Elements/Separators/SeparatorV.cs | 10 +- WinPaletter/GUI/Elements/Simulation/WinCMD.cs | 48 +- .../GUI/Elements/Simulation/WinElement.cs | 675 ++- .../GUI/Elements/Simulation/WinIcon.cs | 59 +- .../GUI/Elements/Simulation/WinTerminal.cs | 263 +- WinPaletter/GUI/Elements/Simulation/Window.cs | 362 +- .../GUI/Elements/TabControls/TabControl.cs | 61 +- .../Elements/TabControls/TabControlHelpers.cs | 12 +- .../Elements/TabControls/TablessControl.cs | 2 +- .../GUI/Elements/Trackbars/ColorBar.cs | 372 +- .../GUI/Elements/Trackbars/Trackbar.cs | 231 +- .../GUI/RetroElements/Containers/PanelR.cs | 4 +- .../RetroElements/Containers/PanelRaisedR.cs | 4 +- .../GUI/RetroElements/Input/ButtonR.cs | 187 +- .../GUI/RetroElements/Input/TextBoxR.cs | 53 +- .../GUI/RetroElements/Others/ScrollBarR.cs | 4 +- .../GUI/RetroElements/Simulators/Preview3D.cs | 32 +- .../GUI/RetroElements/Simulators/WindowR.cs | 35 +- WinPaletter/GUI/Style/Config.cs | 21 +- WinPaletter/GUI/Style/DefaultColors.cs | 6 +- WinPaletter/GUI/Style/Dialogs/InputBox.cs | 2 +- WinPaletter/GUI/Style/Dialogs/MsgBox.cs | 16 +- WinPaletter/GUI/Style/Helpers.cs | 28 +- WinPaletter/GUI/Style/Structures.cs | 34 +- WinPaletter/GUI/Style/TestControl.cs | 4 +- WinPaletter/GUI/Style/VisualStylesRes.cs | 8 +- .../Languages/Lang_Add_Snippet.Designer.cs | 26 +- .../Languages/Lang_Dashboard.Designer.cs | 28 +- WinPaletter/Languages/Lang_JSON_GUI.cs | 54 +- WinPaletter/Languages/Lang_JSON_Manage.cs | 4 +- WinPaletter/Languages/Lang_JSON_Update.cs | 14 +- .../Languages/Lang_ReplaceText.Designer.cs | 16 +- WinPaletter/Languages/Localizer/Localizer.cs | 24 +- .../Localizer/Strings/General/General.cs | 1 + WinPaletter/LogonUI/LogonUI.cs | 4 +- WinPaletter/LogonUI/LogonUI7.Designer.cs | 2 +- WinPaletter/LogonUI/LogonUI7.cs | 8 +- WinPaletter/LogonUI/LogonUIXP.Designer.cs | 2 +- WinPaletter/LogonUI/LogonUIXP.cs | 6 +- WinPaletter/MainFrm.Designer.cs | 60 +- WinPaletter/MainFrm.cs | 293 +- WinPaletter/Metrics_Fonts/Metrics_Fonts.cs | 26 +- WinPaletter/Metrics_Fonts/VS2Metrics.cs | 2 +- .../PaletteGenerateDashboard.cs | 6 +- .../PaletteGenerateFromColor.Designer.cs | 2 +- .../PaletteGenerateFromColor.cs | 8 +- .../PaletteGenerateFromImage.cs | 14 +- WinPaletter/Program/Arguments.cs | 10 +- .../Assemblies/AnimatedCursors/BitmapOps.cs | 52 +- .../AnimatedCursors/EOIcoCurLoader.cs | 10 +- .../AnimatedCursors/EOIcoCurWriter.cs | 10 +- WinPaletter/Program/AssemblyLoader.cs | 6 +- WinPaletter/Program/Classes/DWM.cs | 8 +- WinPaletter/Program/Classes/MemoryFonts.cs | 2 +- WinPaletter/Program/Classes/PE.cs | 18 +- WinPaletter/Program/Classes/Reg_IO.cs | 4 +- .../Program/GlobalVariables/Exceptions.cs | 4 +- WinPaletter/Program/GlobalVariables/Fonts.cs | 6 +- .../Program/GlobalVariables/ImageLists.cs | 4 +- .../Program/GlobalVariables/Variables.cs | 6 +- WinPaletter/Program/Helpers.cs | 26 +- WinPaletter/Program/Invoker.cs | 2 +- .../Program/NativeMethods/NativeMethods.cs | 4 +- WinPaletter/Program/NativeMethods/User32.cs | 1 - WinPaletter/Program/NativeMethods/advapi.cs | 4 +- WinPaletter/Program/PreferencesMonitor.cs | 20 +- WinPaletter/Program/Program.cs | 6 +- .../Program/TypesExtensions/Bitmaps.cs | 56 +- WinPaletter/Program/TypesExtensions/Colors.cs | 12 +- .../Program/TypesExtensions/Graphics.cs | 298 +- WinPaletter/Program/TypesExtensions/Icons.cs | 4 +- .../Program/TypesExtensions/StringFormats.cs | 2 +- .../Program/TypesExtensions/StringLists.cs | 2 +- .../Program/TypesExtensions/Strings.cs | 27 +- .../Program/TypesExtensions/Structures.cs | 4 - .../Program/TypesExtensions/TreeViews.cs | 10 +- WinPaletter/Program/Users/User.cs | 10 +- WinPaletter/Properties/Resources.Designer.cs | 81 +- WinPaletter/Properties/Resources.resx | 18 +- WinPaletter/Resources/RetroThemesDB.wpdb | 17 + WinPaletter/Settings/Settings.cs | 96 +- WinPaletter/Settings/SettingsX.Designer.cs | 131 +- WinPaletter/Settings/SettingsX.cs | 31 +- WinPaletter/Settings/SettingsX.resx | 530 +- WinPaletter/Settings/Uninstall.cs | 2 +- WinPaletter/Store/Store.cs | 82 +- WinPaletter/Store/Store_CPToggles.Designer.cs | 12 +- .../Store/Store_DownloadProgress.Designer.cs | 14 +- WinPaletter/Store/Store_DownloadProgress.cs | 6 +- WinPaletter/Store/Store_Hover.Designer.cs | 4 +- WinPaletter/Store/Store_Hover.cs | 10 +- WinPaletter/Store/Store_Intro.Designer.cs | 56 +- .../Store/Store_SearchFilter.Designer.cs | 16 +- WinPaletter/Terminals/CMD.Designer.cs | 34 +- WinPaletter/Terminals/CMD.cs | 92 +- .../Terminals/ExternalTerminal.Designer.cs | 34 +- WinPaletter/Terminals/ExternalTerminal.cs | 82 +- .../Terminals/TerminalInfo.Designer.cs | 2 +- WinPaletter/Terminals/TerminalInfo.cs | 11 +- WinPaletter/Terminals/TerminalsDashboard.cs | 6 +- .../Terminals/WindowsTerminal.Designer.cs | 48 +- WinPaletter/Terminals/WindowsTerminal.cs | 508 +- .../WindowsTerminalCopycat.Designer.cs | 12 +- .../WindowsTerminalDecide.Designer.cs | 20 +- WinPaletter/Theme/Default/Windows10.cs | 6 +- WinPaletter/Theme/Default/Windows11.cs | 6 +- WinPaletter/Theme/Default/Windows12.cs | 6 +- WinPaletter/Theme/Default/Windows7.cs | 6 +- WinPaletter/Theme/Default/Windows81.cs | 10 +- WinPaletter/Theme/Default/WindowsVista.cs | 6 +- WinPaletter/Theme/Default/WindowsXP.cs | 18 +- WinPaletter/Theme/Manager.cs | 30 +- WinPaletter/Theme/Properties/Properties.cs | 16 +- .../Theme/Structures/Consoles/WinTerminal.cs | 60 +- .../Theme/Structures/Others/MetricsFonts.cs | 4 +- .../Theme/Structures/Others/WinEffects.cs | 2 +- .../Theme/Structures/Wallpaper/Wallpaper.cs | 4 +- .../Structures/Wallpaper/WallpaperTone.cs | 2 +- .../Theme/Structures/WinPaletter/AppTheme.cs | 22 +- .../Theme/Structures/WindowsColors/Win32UI.cs | 6 +- .../Structures/WindowsColors/Windows10x.cs | 2 +- WinPaletter/Theme/Support/Apply.cs | 22 +- WinPaletter/Theme/Support/CursorsRender.cs | 83 +- WinPaletter/Theme/Support/Functions.cs | 10 +- WinPaletter/Theme/Support/JSON_Helpers.cs | 2 +- WinPaletter/Theme/Support/PreviewHelpers.cs | 72 +- WinPaletter/Theme/Support/Voids.cs | 3 +- WinPaletter/Updates/Updates.Designer.cs | 617 +-- WinPaletter/Updates/Updates.cs | 10 +- WinPaletter/Win32UI/VS2Win32UI.Designer.cs | 14 +- WinPaletter/Win32UI/VS2Win32UI.cs | 2 +- WinPaletter/Win32UI/Win32UI.Designer.cs | 74 +- WinPaletter/Win32UI/Win32UI.cs | 899 ++-- WinPaletter/Win32UI/Win32UI.resx | 2 +- WinPaletter/WinPaletter.csproj | 9 - WinPaletter/bk.Designer.cs | 4 +- 195 files changed, 9848 insertions(+), 10942 deletions(-) delete mode 100644 WinPaletter/Form1.Designer.cs delete mode 100644 WinPaletter/Form1.cs delete mode 100644 WinPaletter/Form1.resx diff --git a/Store/Themes/AMOLED/AMOLED.wpth b/Store/Themes/AMOLED/AMOLED.wpth index 91d284eb..3d1a18e9 100644 --- a/Store/Themes/AMOLED/AMOLED.wpth +++ b/Store/Themes/AMOLED/AMOLED.wpth @@ -1 +1 @@ -7V1bc9s4sn7fqv0PLJ3atymXKN/nzZd47HNsxydy4t1ab6loCbZ5TJE6JBXHs7X/fb9uECBAgrpkMx5PglTiJEKz0Wj0HU3on3/+UxD0ztL7rPdz8E/6D/57MJt9EnkRZyk+7IUb/Y3djd3eT9Xo9aOYistoKmjw4OL9+btjPXYsinEez8rq0evHuAhKgg+e4yQJyvwlKLNgGj2JYJoVZRAVMzEuiyC7D27idJI9F0GcBndJNH7SON99mWV5+UEUPPEVDf0c3EdJIRRF5/FYpAXTo59iYHsVeuxgXj5mOZGPSa+iRJSlyBujw2wcR8mFmMTReZzSlD0NcZQlWR7SR4cWpfz5oP35VUQTEDP7imQwKn5IxeQky0cgIiRsZT7XS2qO9xeP7y15fm/x47uLhz/FRRktBvnrVTVOQvIvXiWJEe8CRpRkvUuju0RMGrgOsafMO3zeYOnBGFtb6sH+T8Fe+FMwCPt6M46j/Okim9Dumwz8kM3TyVGWpxDkasggrRI2ZruijScZnaUT8YW43QsHuz8F6oeezoDqkgCJwyEHxrObK82wRVAOGZMzbC8c3Vk4SjvewAyeEB9H5/HDY4lhS8Wwl92D13mUFrMoF+n4pfngdVwm4i7KRwfjMv7MOhoOiK/0R3NVQ52lkYbDZtNvDTQso7y8EOkcuEgq2ksAlcmLHHyfKpxq+5Xq2UBR8QTqgCpU42fpOBdRIa4PF67rcHSYzOlBkjqHaJEMedGSDuXVRAsaS7+1yCgZgMLUcmUr1B9KqtjOK6liykly95XosoGJf43I//K/MdrQ8hbIYZRE6ZgUM+xr98SoOzA0TLKykGwra8aT0yecirTz7CFLP57hIz3JFUxzlkYJz1OMyAs85GS221Q3QGv9d89+mZ1n46ch9FiQ17UsWT1y/TIjEjdrEtUzw5eiFNOzY6K2Vm1ERpXfIHfqd+H32QW1B+TB1B60hBpjC+T+4B7h2EOSPbfBZIByIPLsSgiK+syY4iB5jl6K0/gOwVxUiuvH+fQujeKEPIwlYy16nEpmQmmSlkKS16mBtDKZyH5JoqL4IO4TxNawBGdpifA4Lsk3a3gVmQ1q+VacVeHeGtw9SGaPFCEOtreVNi2YgINFhV3BaTXkD07ihGOFo59vbyulu73NRZHN87Eobm8ZCH+fz9NI/tyYFkX5kohC2yBmyXBcWaLeZZZPK2PTsxe9SbGaokdKAOGP0wd8bgqAHPsljyaxjD/MQRngHGb5BMkE5G+wjUCV/2iKJAg7JYZAeDPgPzXEbHaT5U+IptgkN4R4kYk8nJdllh4klGlAOE8qBMM4+WwkNxLq+Gn4GCHbIiKwmhc9vRxWz9qOUo6dxkkVH7qeVLFjk26mrZ7ThfhafOGI7uYxLoUmSPF6OecUpPL0msv2ZLRcNdU2Ugn5R89XLU9B2MScZiVCwvETBINli9jndkCKiFoabCrUeAeR1rCbFkrZu0ekyhB99rwUPbs/PeQg2AHungS+NUsSGTk3HuI1uZ/qIkt+fpJXRQWb63LQjdCQRsdm0moNCIdCIs1+KrNZzRLDMFQRS9j/gmFlHY7jgjLYg3H+ksTjWh/fpwwOSNMkVNA8VMOeTaMHMm4mpCtiadNi+jx3Kl1lwtqY8lyoPzzSEi1jeiPuYFqjJJlFM5EbVjaePvQ3/m/2oHVCy7otS1X6Yzk++gyxtsPfkN4VY9RaQIj1yGUWc+mm/eGoWoyOIRnURt/mkeVcFjJJ+0Lamo5FDh+z54ssF++5pqUdvTGtZiEWpqTEPe0wiSeCEI5OsgROYoTaD+9PcY4CS0MgeMDygmeXx+9vhre3z7Rxz+6NC/etndO0DckzYoZQr1kPVVGwZrIeGDG9BdErqfyQZaUSJS0c3eCY7u//UNGAEwxykn+OEgDu9PFrEezwcX6PeAagLCcu/l9nqRjdWCWdeh8s6eLlANXXKsQpntXUDvEfI3M6l/9dQKBZGHgLBFJao6RJ8tDKMt8CiS0CweS2rr2dPXbb6bdDXzPCf4t73GHHv4KJh0lcFBt305k2Wusp8IUo83hcnGRpSQ5gieDJkO8mnrDP1Wb1KGIPciqq6HkwUOauGlFP1ANn4ywdIhGQeciuzqzoc5xslDHcqWucwx41T10coo/VJPWnV9FkIiY20VuKNBnlaZrDXXtAY6s/n3avc6jG1GP1SqswjBcc/0pWfmtPT/UoksQY2dSMG9LIEDmdORzuqAd5v0ZDcC8Rh3F5dQW0lvRUpBIchnpD8ZCJ4OMZFbKeszyZaHGh2ZdDEX9XgSoKhH/LATW7VgAto3LO8rl4HYRpOL8ryricl2J0MWQOHieU5vYuYoT0RXZfBkNU84OhyON7zYHOJylz7l1Hj9k06gJmvnLlr9fIu+m87939PZ0AAs0SvZJpwEEaT7m8iQfM+FmO6gyzPfTxrJ7JHKV4DA8fgTVI6Y/zqJnz07Z2zcpbHvHZk44H6LOhqEovJ3LQnJDHMemxSJB4Q9LrwOcom95lh9mXrukoTMTwcIpA7FHqZrtGcZ1lSRnPunBUwxVhmmoS8cLJPh6pFJQPRBKsrsH9/xEvd1mUTz7i8CxP4lTHabUujueoSI1LpfvaLp5k1UhtZdRDRzhRIs3UsJdZGd/D6lFR63ieKznQhhH0P4nr7CKGkEgzYjL+4OZ61OHoaOgwBy+5zIDqyaRKOrNrTg4ts0HAavM0acM0mh3NUc/Or7NjcS9rJaDdehJIw/CIinPxmAXuCx9nNZiJ4jNt9KdYPHNhykJB4joU2KxJcZbKMvVRglp3cypUCJMsS02O6eRF8fcqiiHxMgOuT8qt6ZjiQ4jbccY62h7E6TwOwwVKklT00vJUZb6X0Wc5YD2I8/fslHIhLiIAgEgzt+pkDsPO1Xt9OtNcIOdryI+QQnTtqgFCpBkheYU7osrYUsNzVoDh87wl09fxVLyfk4Du6GWrhM00dEM60ljBwA3TCbUCQLbuo3nCLokTdpX3TakXQefpQV1P2HiOPmvjq7DglPOXqxOFqDV8dCRtFKiv+xrUs0ePUfqA8rY8wnGMJ1mj20I/mccclhxyx8PLQRLlU5pi0ULQAiHkuY9zIcfiM9o7oC4pzMcyXKcwQs8wG8EZ+kHycgFCCCi0aC2cH8Q0+ywW4DzBWcDKFBKwE9dJ9OVQCK5JLWIbq/ZL8G7ahec8e15nG5bI0wWm+SZkXURflHVuSxY5R3jBaSQPAVtiS+NX2WzO3HGMcmx1OZ9wfW2h1F0Ihg0Y2LkPhhtpE2oa1lU1ttoxabWDXwRaU+Kxc2oL+9nFMpmqEMslwYstx3meZTMAjmwFlR1Yt7eVpeHBfrgmNrTmKIV34Qv7a+LjCNOqXFrkDdZEt7mQuv7mmui2FqPbWhMdt/R0L3Z7TXTcA9SNbmdNdFTWsGtm1lbsromOTtEXoNtbE93+YnT7q6M7QvDUhewD1GYdnSBc3SpB2NbRCMLWqRBM2hr6QMg61YGRraENhKxTGRjZGrpAyDpVgZGtoQmErFMRGNkaekDIOtWAka2hBYSsUwkY2Ro6QMg6VYCRraAB5OW15HcEnpW36Q48LO91lWfk77n5YKFD1oCB+fxypUVUBj8jj9xXiJfAJpFOonw54uHFcEVWLHa872fchNSOIa5y5F+IdmZoQKbswgVRMa8Kf6u26kXLrNlYP+NcKxqqS0Tex9kzd3m3gqlq/KM71KI89LArSpMRzgF6qPK44NbpRRQvCTwlsndfxkmkKz8LBWlFfDEnE61ly+lUa529JXxuhCaUUQNIZWwqsVbZkAQ7rdi0iAdLciCJyNSLZZK5EhP+dw4ZqGSqxQhZASno7Pr+3imdBoRbhCqAjwdHy8j9iGwtQD8ZUuUygOCW6C5wSq1CmVZFj4WS8JGhWnhUyUK2JKOKlD4cowo1rVqKLU5o2EOaUEzcyYeGejedlS+oc72Mqebc5ooGPBFiwikoShDcD29Lmoa7QMZJSc8Z+hFbm6ChUGaJH3gh3TBcxIAddmqtxjQUUT5+hBH5jPpMvgqFSFff5bl8ncLNOkDgFQpBPojKIB0rBdSleF44PnTt0KVAEU3QJo5kl+h/Z3HanqcFdi5Q/lkIh30UaFknx9oiy0BXgX0Q/0/qdJ3R/C344UyI8SNAR+DpJfoG0fvKhSGCdFkG+UAA6Gh6Fz/MudjZEuUa7en87v39/SooAbYET7oSmnQxlmGCIsYqiBhwAa6LuMhR8VwFVQX6kKIKlS2i7ypKRbIKRgf/jToiuu2uozts4ZKzC9V+oeuEMGNh/z2d7XFgtL9tIK3qH9BBGBMnbrNUykVOEJGIPifedo+OMcpvq6DZEB2aeH9mT6uqAcKZBY4Gg3AHnXHhlgtmkwR2ew/D29S5OAhdQJwIhPv0/gxm23TCcHwfbu4AySbB1S+DGBRx3B7uMwAg63dBDBgOxwf9LeqllD9cJHGcHYZEePXDBcUB9DZxgPsyt7cdQDKbw+ElGu8JnYtw7kLpEQMGIdHk5CWeBC8Hm+D1LrDt7bgmY36He+A1fofbrn0DcsKzBbIHW7RxO06ymeGDLcykfuj52KvVMQjQ6RNdHqqjCQxpIZZVdN4JHD6qIq75sAnhxiHPTIbytAY8Jz1AQwp1oKpXDBEOFBkOTTS1dBj5IaLoEnNZBwt8TClxheHu/k59ikwjN+pM3Dhyuwn7o3C/vz+qDm/kKwGajsYwrxWT9hodigoJuDAWn2hbTRXVSMgL6qPBJu0a6lrkyGhwtM+nI/BrnZAyGDJ6rw0rcpU9i5zPd79AsFwWyiTRUCe2IlLcnOr2Nu0IrAzsg1OF+mxEBpvQ1cEmaeSWc13ejPwGZkS/mfQ1ZkQ/7M0I2URtIH4nM7JD8tEOdLwZQQBPL4TLIMybEW9GVBCDmKOKbH70aETFNE4LYoVwMpwE3N8lFwNlcjgu1DFhNJ3doftPxYQ8aEWYeDGHYnMzPmcgK1DtqYwBUUFfpzsMp+M0G6sV+MlZ+QoIxIQdE+KVCC7uIqRqpF7y8ZwaQmXWRkhcGYoFKLG5chQD7Ogl4hqEKwMxwH6pXpDtObIZA+xqnqNGjT3pORIRA+6DrGQ5MhoDSHIQuFQWwvmIvZHMk79hf+Uras7UhlHKqN0dlkuAihGujJUBNAsceS8DGIt3JKsMUq3bkfDycL1iV5LKIPVazWRXaYC8T4MAK/fLzzR1IeCQv6CmWJub1nvVyA/tSJlxea1gNqAHEMqoRcJrRe8PqxXvUxGcRsl9QPfDLNCHLdjlLZRo6vqTSyG4GkR1qsFAV2AYbn030TGhchNcNEOvP3LVfZts21Hsg+59KlSFumxkiPCK2JSb2EPuHO6Rs9y3vWBDIVClIxhQF9aFP2Naw1bK0hiINEqEBqRyFQOwPuxzVU7f2mGA1aazcwckibUBHQyIK/vs+TctDq7sLDrZoS1DNyNWYcHSxa+w7K4Fr+YztHbIF7arsptkvOUuBlzlrX5Y3LRdxjYkiHzsji2N66tHByIl0FTexBsgkFZbD6UU6DBqFzJA8rxvS4CCkjHUElWzlYMmdmJbQSbktKZkUGWcTOsS5aC69wrKIcXF2sRmBDUgFZNKoevVvN0NpehgnOIFqRa9aI3iqiUMmglUqObTgwaAsfgdiAoV40IUFEyatVZgjDRw1967Wic6RbLWCRlFUWU95FZsWuriKGqIEnOO0vFkmcMgf4F92baJt7Uh5JlRfQa3dLGR2b2+QrjnU/rAjNwkSaqvROOJlKhDmylwh8Btw9Q21FMBSX3oplrCKSEIt0h8+YhoRx/tGJPWwkAMwCvH+OEy7oZMSCEncd+3DYicWYlGHxDsG20ZlkCGgABssAURGgxc8xpi0icJ4fOn+pCKV9JQi7aGKWbQeYrkRSOC0FwIN2ld2/hhi0K9/EEIMmh7wk0bRK2bnB9J/Za9nHrFsrgNUgahrTXGWunivJAK4P21VWK5l+jieEMvOvnt9QJi15OCXAtGZfxJft6mXriN0w+gG9d4QyZb5iqss3g2K7Y6sN4P6Ih80Lc1e311aM+lXATH7Kx4DYcrpU3HTHugYw/mYc+2IAqq8hF0nB1S9alJsoRTW0+TDgZsgl0G3TCO8BEM2DCfLVXYJS3gKzl3XKGfMpXkC+kQfMvlmZoGk+bedNFXm80Br4RMeCOiWdlDgAkyXWiEDJoHuxwnkHe24iHDDODF64Ajq4G9N2rRVFeCKtrOo14suRenmNXLhH0BmXiRbWXvIDVgmWdoO05bBTqEzsv/H03+2/ZHmYLvVP4/oXmb7nEyUxj7rKDNElv27avZ2D98S7lHU6i+2I2RK0tepQR0I5NNfVVhkpae3Ye1OB5Wu8p/t4e1UTvH27EO7LVRuwDzwEEHTGXV6K/2BNqqtS2LXF9t06p/mThWNtrXAvcSmU/qhcl/mEP1mqp/mYPVYi6iHK9jWxj1ShxyUC/ifUK3JuuqjvyHvlYJTYL3uCmR2lgXnpdVbdPyiIC7gixScHStb6KzBujlf0ofrQ+rBsXqPf/eX2R3Ot0O9ZfbW/mfzYF+UbluRLq9/Yy75G9vZ9SaxOcUG+KLLSQgRB/mkC9yuDW0ile3r4Ew8+iQZbzuqazvZKoiL77lwzhAqdrMaHlHEa4mw9vVwUWWZuZaqe1Cd40Z24rP1ckuX6BJU5gVBorldR1NXzdlYm6OG4RvqPYzwil7C+pbLI9cJ59SrHH9AV9oaz/OlxLoyxUG3GlqE2vwpKcPleRLuEHVhWosHbd9/AbCMp5OvDDQRQEsLG9MGD7e4bWMuSW9/4kQpLjdoSFQXunfgtIf/IprLgLcJzKfBN/WSfgtf6Oqjds1RJLhAlC8dcXXLlQWP7jP8uDTEFn+wK61esUn50m/6vOEP7y3r6Wgjta8BBg+6nuI9xqpQ/XSKmUQCIF1DKgiQMtid8R8vXZ6gHCVzUiVHLSwLHT0vQWxfc+IifSNadgWerHDpJ8+qq4+74zq3TF9O6KvNbwZrVPSUMdDzVGDVMOtL4/ke11xfDXQiuIVgT15HT6oWpgF4v3KgCGD/7JLhZz84TJv80t66LC4VVPUgOqGcmKEI8+GlzBwtWoFNGxi6Ej16Jt6quvemOxRoq6exwv8T51Jsb64quCv8VD7ZEjXWQoKPnBzIWeQpBqSlz3VqXqV494pfh+1Uo1ex91xLNFLE3Bn2laniMTGjv5Ru2bkG1blZQq+Ne+P25qndME3rPZ8GzdF0pV707FBu7Srqs7fcRv38bx4eglaRW9dRSQXsUsHqnCWA9t9N1wEvWZAzR64xt0IYXG/cXUpre122KNQU82ufmuY90SfC2M+R8OTOl32DUiQX3nyoAv6A2r2+bYNSI4YS+nEd9yBpNtUfRN3d0u4koPOrmUpnfoAq7t3WQLWx1nV/QZkcJzt3tXZ1sA3cbuadGtz0Nm7Xh/z2V3r+rhP22+dn8PaqDMarR3LmjB8E3dPKgd1QPombt/E/ZsEUluIoaiQYQVdPoqSwST3jih/8bu1cf+YUVT9asNyR9EVuNopRuj7uCkd2/tu3m9w53gqsvyOMwzfx+37uOlbW1aoPX2nfay+j9t+9UImwcr0/XDvMbSblhUrvlP5933cdltyo1rk+7gpgQl6vo9bXyj5o/dxW00tVP3XZzRf1bzbdQza1QyCGeVQqx1ENTGQwLoKhnaLn1Wn+E/a+jrfAPgWTd3G9YKsh3VvDW5AUXVSsKTdB0QfLusEAsyy/n7+3jia2uQunmvsOvLBbywX1v7YwqC+8ZCIagrD5ood/r6pm7iHX+2+rze005aMf6Xa+7Zu6hBUX2r8g2x63dJrW33f1mt4jR9A+Ws58K3dy1z96q/yvZ6rX9EBrNfc3Wt8YxH0wB0A/rYd3lZsZzR4G5GdI65bHtW5Yzrt53VEp9qnsfwl0VxzvI5C8UarNihdHd7OCL+K29ovbTYDOvXKpqJ2xWZvdz+ZbuDmb7rmO13pQsLWuaWGM9u0+aIkOkO3G8uom7tG19GjRkAmrmrS5nnpa7R8k9gZHd8yqjK+RFqLZbUTo/b3ouuRLOXvva7fQ1Yj+Kr0OKG2cCke6uMDfFUSfcmRairn/7e+HuYozvEFUq2P8YVx0yh/4Vo1fw2DVazrmcP81SLdw3j3fxLLb1OqSYcamCgUzEVmf8G9CXOZxfxN0J1IGKDWlv5G/Y3p/C3m1nLk9S58x0t9cRf6FvESOhr+5bp5YasAKvLBbIs6G52Cai7ShnIu0wFiLnSgkrTeeQZmpw9yU8nQOPauBePYwBaMIr65xE7A5ipbgM6FuqHMtSoTaC/1NCt5pWQR5B+V0rbgeLUrwBkr1loKsbUoxLQKbOF6Abd8uQrIuVppFwzLYQvaYzTJnkf6ZMnWxupZtNHm2D4tK9XH5nSblX/pqbH7+0KUf8VTA+fI32ikbd9gWSs2YdybH1t7WU5XsSre/NRmTGkZ5MkSfEsbyd4pwIXqSIDL9VFDmRrizU/CN+9bu1BZi7difg7nxYs3PPBV3vBA0d2BACm3j3uoJG2ZUCOggQb5uGe9uOdUJPQV1j7i8YbHGx4ZvMGg+IRLVkx1UqW/i7e/8Y0SLvrqbm94fMTTsxN/y7X7iEeVMCy2+IiHS0f4pvavqfRcDr3Z8WbHmx1dc/fxzmsUmN/deLPjzY43O97s4NTr9c61Lt8NveHhNlbrnNyfaDUO3X1h2ReW6QTqm9V3Lm+G73zE4yMeH/H4iOdVI56P/jzLxztoWU78eZY/z3q9ROuKb1725+j+HN3bHW93Xs/uXGapP0f3AY8PeOqXSPyB1mscaJ3H6ZMv8PgCj8+0fIHnVQs8VzF96a7PtHym5TMtn2m9XqZ1ha/l5u/79qbHmx5verzpeT3Tc3YooqkPenyy5ZMtn2y9arJ1lGcF3dPjYx4f8/iYx8c8v2nM8+c//evf \ No newline at end of file +7V3rb9w4kv++wP4PQh8WuAOCoNV+zzc/4onvbMeXdpJdrA+G3E3buqilPqk7jmcx//v9qvgQKVH9mOlkMgkDuGM3S8UiWVWsKhZL//rrX6Kodzwvq6K8fZUnd5kY936KZuVcvLCbho/JuHjythR5UqLhPskq95nrMkmzCk19B9VhWTKmfxF+dP6uEqdlMTlNM+GgQZP6rnf8083NhzQHBdXNjSQWvySiLG4TwvZyNC973AkeYvzD2TOjk13TENNylInW11dlOknK5+MiK8oY3feOsmT00eCymweLm38uk3Eq8llzDDYKDXNRjGmshjgb5rJIq9ZEtADeTJNROnsmJC9jPfKhGBX52BlOPNh7EekPMywXkAemYRi6A1CT3xyii05DNQfpQnmH6QGxBzrY0SM9LzDZ+YNc1COsmGftWjCeBWzBaOKbQ+wEbI6yBegdqB/KHqvhDQf0dTHjke7tvojkj1mqJhyPdgU4a8RG6iEvTXQabOF4Qd7y4Wog72ilnrE0Ua1WQJRqZWnFCjWEVbUeZVAGP0WGV9TXdndbmo902/19JWZ/x1MDb8s/qIXU1a/crPXl4XSqpgntm1FnT0X5EYz9MslTs7JBoVn6eRU99d0otAHEfLD/ItrdMczgyCVpvu9Iq/VfRAfb2IB2tvzDhebg0a4Ap9UVBDNotfW02tG8Irsi6LNgoLXs0N9poAV95qjvoM++hpX2WmTTjemzRyCrRBYcTnbdXXXAnskPZZ+5wQJHtr8z02wFR5JNsxXggmn2dPvmtzmcF8Un2pI3Y5pNgCzosaDHWnGUoMeiXtBjJtr2BQJnl8ONabG8Cjos6LCgw6zzEO1WBh32JXXYqw8b02EiHGDKo+DgT9qHz8EOC3YYJUjoQ0rryH9DB5iXr4ab02K5qIIeC3oMu2LjXD7osaDHvrAe+zB8tTFrLH+qQlws6LGgx+wcu+BTfo2jynebO6icT0NcLMTFgi0W4mKUuH/79ZJir0S+MVNsKvKgxYIWC1osaLGvrMUui3xzmRbzPPmEq1BBlQVVFlRZUGVfWZWdp/nHjVlkGZAFPRb0WNBjQY99ZT12lW7QsUyDYxlC/CHEH0L8XNfiq4bHUGpjg4pMELpgkQWLLFhkwSL7yhbZ2ZFIJuu5luZifyhq8aMWtQiXJnXhopBU8TWSKo7LoqIqZGvcmgxaqhdS8UMqviyvFrTUF9VSZ/l9YWkn1BR7D58uZR+xF7/sv9x/OTD66PpRTMRlMqGzyd7hxZvzVyem7URUozKdztSj149pFc0IPnpKswxlkJ6jWRFNko8imhTVLEqqqRjNqqi4j1RtxSjNozuqfxj9+6vPo6mYRfdFGY2ypKrSUTSiGonVC8L5LFE+Jp9ElKUPjzPVSB0kn4p0HCWjkcBTd2mGKoVRWlVz8R+G0lefp0U5eysqHs4VCZpdP5Kqz6UjkXMZxJ55ioHduTFth/PZY1HSpGAoV0kmZjNhVYTk1mExSpPsQozTRB2J1Ljr+o+oLUVVanZ3DW5u81TZukqoE3LlD3TROCxB+pCL8SmKaYKQmCpi2OWnmu39xe37S57fW/z4+7SaJYtB/n6l2q3iduBAnmq06C3TUxgUi0QlLjpK8R1i+fOZacSk7seY2LhvZvUkKT+qWoL2DL0t5vn4uChzyECbNMWnMa2Gpo07uT3Lx+IzTWcP1cPQ09YOPnbqsmkWlCmgGFOxsQ4gXm+QHW8Tou19Q7eFaIu6I5gBMQ2I0mxgwWxrmD6oig+8MDsKZndA/TUYT45sV4EQa8b9bV9PxAy9wTbKfR4cEE0GBpNGE317ToIKIHu6sdadbSjfmlfTpBT5iOqB2Y9dp7NM3CXl7eFolnJJCu88GLCzPDGAWxil/DEUDmdJObsQ+Rz4iG/UYOPmnIHa7FmCvMk1cmITp0ikC5VUH0EoYExBzbN8VIqkEtdHjRE6WK6PdFCQBm6Jh+ZBYqNOHoyJLdSHGabFFsyDA2ZUsE5d7s4C8Wgcq5V5z19rx4Ji7nP9LauV+a6zlVmus5W5zW1t8pkznU1GcxoXrkOb1dxuNR9AUGomi0mU+MfMvo/JXEwu46h+tRbSsu0CGe4yNXg3xF2kygJ3WZWYA3chxN3bDHexXaG5i+UC3BYbK4ZVRPpLQpYk/47WxpW+FshRkiX5iMzSuG80LaPuwNCwEPyqTNshRrrOi4cif3eGbkwnV3wCkmTcT3VLRslDSVZEm+oGaL3Z+Hu/LM6L0cchdgtOaXZUVt1y/TylYZsbuXXL8LmaicnZCVHb3kBIg+o1aE1nm3Yb5PAehudDxlXUGwsjLbVDVEa/EoLManvbPsyekufqdXoHszWZievH+eQuVzXandHZnfHv3uW1oQxJSyEpE70GMstoI/uZPI634j6DfwIePMtncAZUtXOthzVr2GWZ1das7d41Zvcwmz6SqQxrcIUO2GrW2DUhhgH4C2/l+lJUxbyEY3Rzw0D4/xy5ofLz5aSqqGh9ZXYsnpLhiFw44ofLopwoNu+57LRl28OSAwg/6kg3GEC2dRRgk7bcUVGO4Tqhv3ifjBj1YYiSULzpElBrB/2AAtawGlkV9OI9WP36w6BYJKJH89msyA8z8qzAoqcKkduNBDr5KC/GExkn6QSjeq67YDT66cE2GejqowHzGh6qtIt7Hx7TmWg0a6O5N6BC+vqjAVTTEe/SnKmPBtS1+MyWrTsWvRgL51UDaRPHTP825lf+mM5oHnRXcZ9cAfVhINSQNZA7bER7YI6NqAg58197kTURNacMtsmRItdjsFP7HRrOELsFe1f+GFIcGD9BFB/RLe7UUYsUeSKSRJflF6tU+33kVXCrlwWo9Yi9A3hOPh4hAH/n2BaKLJOuRW+APS/SH2ZwPHD9tDvLNdm+709LFeGhvZQ3VPoweOXDGrE7JxY749EDTEm8WzuvNBwXYhsOJcwBrfQQoPg4K6b1oluKRu29cf8zmrX2O0kremfI4ah8ztJRLdlvcgYHpL0BKWhuqmHPJskDaTgb0rf3tmmx91B/jEKFGIxy5r4QuXmkITqvFfkg7vCSkSTLpslUlNb7RtLJQ//l/04fzCR1yIW6YuVspPQdHBPP/kViWo0QqQIhziPeFyjwl7dqMMYakt866Ntz5GxWCyfJ7MW0NB2DHD4WTxdFKd5wnNH43la3ZgoxMM0l/m6HWToWhPD2tMiw6dwiasbrU50jctVgCG5wdtWzy5M3H4Y3N0+0cE/+hYsPnJUztOn3wMBFJ9JhWZsmZc+ZSTYNt0xvRfRKKt8WxUyzkmGObnAM6J//0+rOxgo+KT8lGQB3+/i3CHb4OL+HfQRQZh7f/F/jCsvtBydWVq+Dw3I8HKD6rQLxGs8aaof4w/IBzuWfCwi0AynfJIG2L/4tEui4c98igX41/e2wYNNh+BbnsEON/4ZJPMpwHPPybjI1Oms9+b0QszIdVadFPiP939bxDk3SSvyQjnnLNVr1OOEN5LVQxvfAvHhHtegn6oYzvNxqSDWw2K3ZM44afY9joVmK3dTXzkaP7qeOctDXupP626tkPBZjl+htrYilzWdojvfcBoOt/n7SPc6hbtOP1SNVVhgPOP2FlPz2vukKFegzqwWhdLWDDallCBfRbo53dTOv1+0Qs5eJo3R2dQW0zkopUgkOTUgAeChE9O4MFuQAbyXKxoZdqPflUDS/q0BVFay/5YBmulYAnSWzOfPn4nEQpuH8rpqls/lM3F4MeQZPMvKaexcpDPyquJ9FQxyDRENRpvdmBjqf5KD9dfJYTJIuYJ5XDmH1Gm48vd7u1f09HcqCgiVyJZ2AwzydcJwOD9jms2w1fmm76d1Z3ZPdSuYYHj7G1OAg5qRMmiEE2aMgADhA1RkCM2Mhu2vQQAzQRR8zR+K+BI++GwoV8zmVjTZp3A7yTkQGTx8yUVtIx8XkrjgqPnd1R/YkmocTWGyPUorbwZHroshm6bQLh2pWhBlzh4Sh8k40tyhR5hOODKNrzNF/iee7IinH73B8WeJunTHoaqkdzREKG820ljAa9LRQLbU+0g8d49COZNjAXhaz9B76kaJpJ/NSc4xRoaD/o7guLlKwk1Q49sQffrjueiEbNR2VmEsOXyBgM5ascF1csxfpKBgC1otnSBvmyVS+0fG6OBH3MrQD2p0ngTSOj2UeArPmZz4ubEwm4q200O9T8cQRMQcFMbbMaQLPysjscYbwbrMrhCazosjtGTNejp7fqySFbEhXuU5IcLpjio/AbicFS3O7EUkQyKcQiIVStM3wk3KRL5NPssF5EGkOxWtymjj4AAAizV6q0zm2AA5Ym+Ou5gDZsYMjBV+ja1UtEJs0tQDvi+wi/cwxQibOMu1V10gLoTEt0WBnFdZjXrZY/jqdiDdz4l/E0dTeph0/W2MOKci/gqYc5mNKxgDr3SfzjPc2dvy1/zihjBDj70d1XOLlU/LJaHGNBed/P1+dakSt5uNjqcJAfZ1dop89fkzyB4TdVUC3/XBWNHJezJNlyvbNEeecPB9mSUmJ19Jh6xgIklCEPAnxDuREfEKSDaQph3ZZhus1dNQTtEoEfQ9TawFC8C804lo43wp+FYVvtiWRpzijWJlCAvbSd5p8PhKCY1uL1p8l/zl6NenCc148rbMMS/jpAt1shKyL5LNW3m3Oo70Tm+QkkcdiLc6j9qtiOufZ8bSykXY5H3OcbiHXXSDtCwZdxMDedbB2mTahtt5dVWLVikmlHv0skDuUjrxdO9jPLpbxlEIsh4RNbjnO86KYAvDWFVD95mKlabixH6+JDblTWuB9+OL+mvjYVHUioA55gzXRbS2krr+1Jrrtxei210THqS7dg91ZEx3nxnSj210THSfTdKPbWxPd/uK5218T3cFidAerozuGbdWF7C3EZh2ZIFzdIkHY1pEIwtYpEEzaGvJAyDrFgZGtIQ2ErFMYGNkaskDIOkWBka0hCYSsUxAY2RpyQMg6xYCRrSEFhKxTCBjZGjJAyDpFgJGtIAG0yxvO77DX1G7TbXg4u9dVWdB+z6+AX7ghG8DIfn650MIqwz4jUwFYNy0mG9Mk6N3zyxEPL4YrTsXijfcNqgMSopa5clXCPYO1M0UaOHkXPgg1ecr8VSnzi4ZZT2P9jHesSGufwfI+KZ781Kl2LvXapozc1KMuK01aOIfIKirTijzXhQu/xPCUyJDnnyUmhLQJfCk7E61Fkd3pZDN34Hz+hOSY2waQ9ti0F6i9IQn2Wk3TolVb4gNJRLZcbGRS/3sOHlA81ZoIGSCp6Az8/t7LnRaEn4UUwLvD42XkvoO3FiHPDa7yLALjUszOy7UaZa5iIgs54R1DtfDoiIbMCkeQKX84QZBqojK6nZkwsEfUoRj7nQ8D9WoynT0jDPY8ouB1e1YM4KkQY3ZBEYIQnALo75bepEhOzxky9FqLYLAhCpM+8EC6YTiIAT3slVqDaSiScvQIJfIJ4ZtyFQrhrr4qS3mpxT8GQOAii6A9iMIgrkyZngF1KZ4Wtg99K3QpEGMTtIi3Mm/yP4s0b/fTAjsXCP8shMM6CtwaoI21RZaFToG9Ff9H4nRdUP8t+OFUiNEjQG8xp5fIZ0Q2KAeGCNKnGeQDEaCTyV36MOdYaIuVa7Sv53d4WecqKAG2BE++Epp8MZZhhiDGKogYcAGui7QqxahYBZUCfcgRhUK1kWakpp6tqyQX2SoYl8w/1BHF7OhEhPJpW8uOSFr5IEq1FXsEXQGwoHE0SsFYwUokGV4nd0C9JE6pc0VMMBKExf36rYgHOxZSFWSBoENjeXHb4VoOtIKITCC9Cwzr5nJZrXxfBAldnOMW1wldFgi7LzjIRMIXJV027gjJTraok519NO9QwtqgTvyyELG3ER8gmy9G+tiWF4adiHgLyWN0iSW2sv4sROwcxAcMAMg6gc2CYZt/0Kf8QfVhdJ0FxcZ8HBPh6sMHxVb6Dl9+otE1b3/xFEiXEUetyHcndHW6Yt0dX9vr0QQMYiLMO5ecV9MbbGGu94Btv3FtS3bG880ptCAo3vGtG5BjTQbbIHtAmZzxbp28aJHEEz7YRk/6w8wAb521oQN05vyZm2o7EE2GiWWonnvAUamOFNsP2xB+HPLcZihPjHAJTgfrkbSr76hCQqsCBzeGWjo6fZuQCYu+nMMNPlSVuOJ472C3PvOmlg/6BN869vsQ92/jg/7BrTpAkpn4ho5GM48VnTbyfA0UZmEk3pMY2SJqmmmrNceTTdoN1LUo4TYhEYFPaLB5dkJK9WYlnlta5Kp4EiWfRn8GY/k0lE1izSZ/Si0CHUNJqD4B6rMKGWxBUgdbJI/bQYl8LSVirgP9FiViHg5KhJNLtaL6g5TILm0ybTMnKBFLdQZL5AtYIkYPBCViGSp/IktE2zNe/eGYbzwo8vv/Kc3ASCscTq839mAymd4hT1Hbg9zoWJe99t1tBnKMVNy48bgMDGdsNBerc89G9kqVTkBvV4e4u8HR47bbJR8vKXVVemyExOedOIASm88/scCOnxMOcvi8DwvsZ3UnFdfSWp6MBXY1LxEE5zHSPT7XCbHg3krv2OPNWEByBtlZ8bghFuA/sL7ybqrXrWFIabH7BUECqInweasMYKbA4/MygDV4j6PKIGrcHmeXm+sRd3JbPVbb0dUS8KtyiRbLQsTmfkXpu4vEomknM4lBKngakIMIYTQsEaSi96eVije5iF4n2X1EFYIWyAPd16R7p3XsyScQXJqHC60MjOPEcOtvEx0d6m2CA2a4lQBP9cAl290oDkA3V+iJjcdrsfCK2PQ2sQ/POd7nPcAE/CxsRiAQoaN9gq6D1kE/C9DSlTIsBiKt8KAFqbeKAaY+7nNEbs8z3Fp1dq6AlNlagQ4GFLo7IELrijjc88qbRed0rDARq0zB0sGvMOyuAa+2ZxjpkBfTzf6iynHVlS8GHOFVH84CuVvGDjiI9ti64BlP+fri0YFIMzSFNqnsU7zvyqHkAmNG7YEHiJ8PTE0ki/c0riWi5goHdezFtgJPSOJszqCoOKnWJcJBMe8VhEOyi7OIrCxsHiERk0JhYtU+oeiYOD0XJFo7NBV7rnIyk8B1HujkoAFgDX4XrEKhuBjhBJtmIxVoIwncc9eulolOlqzHK60oiqrHnOtNQ11sRQ0RXi4RNh4v2zBov8C67LjEu9IQc8+IPGO2TKiRp3t9gfD3p3mYJ3KLOKkuiscdNQWCKG6JpwaSPkU31RJOM0FMJRrk8dCuOdaxOq2ZgSZAli/zKXeLJySTE7sf+LYzzRpUyY33RpeHJXkWgwBsQCUJUGjDYTEJaLFJnziEz57qAyoeycp7BZ2lyLloWBBmFmIqVsHlBF1WqIc/iEEGLU+85YLocdPmR1y/7Q6nHrEMbYOUQexKjTVWKp0YU/i7v7ZILN8luma8IRed8x3kAmzXk/xZM4ZS/sQ/36Zc+JWTVhTfsWxc4wpOsWyrcM7hWa244sByP6Dj8UHflez1xaHdl94i2GZnwWtsuJLbjM20Dzr2oR72XQ2iodQeQUfZMUWfmiRLOL301OmAyoziw6OCLeWIPYIBG+qzJQp7JAVUPcmqRGNtOlpV0l7oljKygJoKk/re8tFXq02UIiIgdN6waFbeITAJ0m9qmAxmDvbYTqDd2ZkpSw3ginjEllXDo9GDprgSRNHdPOrB0vbiZbN6mNAvNLOMZDUXQkrAsp1BEmGbea4IdDBd4P8/G/+39Y9WBd8p/79HdjgVnLJ52z0raE+Jy/vDNKMbrjaCTfI9sk5NJTtLBxp9T6WjnM5dTc/bh02bq+B5ddvNRqmd4/qtB3ut1C4weZhBD4zSavRfuwOj1dqaRRJY6zT1m41jZaV9LVBAyX7SDEz+YjfVY1K/2Y1qMBdJievgDkYzEg8f1IN4k1FlbKOS5S+m/hMSBO9TKva45LxMJUHKIwLOCHJIQZqZKa/nNFDxATr3cb5UyYmqzkDvbzL9ncpY/e3mRv6xNTA3oeskpJubT3gRwc3NlNKS+JzipfjsMgkIMYc5tBd5tjXkoqsycSDMPjpkHq/zKeviUdxAyV94QGUv0Fewt3Vlx+MENdRwfTu6KPLCHitV9DIZY9ay4nuVrxZz5VCJr44wkC1vKsiaulg25ma7RfhLnXrGNPJ81OU7j30nn5KtUX6Ba8i6j8/xZr/SFHcYcJYpIa6JteakZw5Y5S3fSGWgWkPvfRFmGU3GgRmoEgEzyzfGDO/ucO9j7nDv72GCHNUlGgwVhP5bEPrDX1BHI0I9k/k42uwmEZb8GxVtVMYQWYFKpbjWxXUdlMbnV/a8H8LLH7ix1iD4cq+3N9A//W5fc0FtrQUOsPao78Hea7gO6lYseRC2XawtQEdjd9h8vbZ70HOdgxaWhRt9b4Ft37NsIlOxDcvStuuXW/V+m75t0dcmctNad32iZqtFqrWtY2pQqWuRJd/rsuNVQ8uK1wT25HsAQNXCrElc4IwYMvo3N1TIzh+KkFsvYuLD4lZM0QDqius0ER4/G7uEhasVK6BmG0OHq6evzPVQEOBjpw9sCmFV/KIMbaZazHSWo8O3nEvYLDWmE1OvStSx4vutyhvqdVRv5UVc6m97vbTaI6RZC/mpmISQnxryUxtiEfJTg1Too4PvOGv7ZF59fI5aMW4TNKQtYo/OT7E3Dtzd2j1F4BeWUG5H/f4Njht2HCXwjQfKodkzF4QZ3BwLoD9PfpM+TA75RuTscXadid8P+FWhG8038phUWia+46QKk5Uacra7M8A1H3QmKUvuNOdVIWdbvncPb/SlVD1f8np9gKeqOZDObSS4q3O8QWfCeq0OOlPV61M9N0ndnO6ZiIPvSMZIx7Kci5Cz3ZPCQQmPIWc75Gx/EUOK3uhNcQsdbwhWFL8BS04DG0haZf5hWds/phVV32RYvlGEtG0E4n686wx+H09blt+xhxHStkPaNuVDmWOodhahloLvNG01pG27Ny3crNYf7tpCO0f5O+f/kLbtZiE3okUhbZscmKgX0rZN7cgfPW3byWGh6L85o/lNubpdZXq6cj/Qo2xqZX/YKWi+gKGb0efEKX5PFl9nwv8mcritWoIsh3UqDQqe6DgppqSd9kNfomIsnZv9nnT+ft2Jzq5hQhqrjm42zBfO+rjMoF+wyIQ0mGFrxYT+kMNNs4d/7TQvW47Q/keutMPjjZVe9epGyOKmiz76bcs/yKLXGbyu1g9ZvNau8QMIf80HIZN7czf3vt5Wv+IGsF4ud6/xBiTIgd8A/LIJ3Y5tZ+VzW5adx65bbtUtSec2Fl1tzy3b45vttRWKC6xGoXQldHst/C+d2+3PJzP52vxibTaOqf5g69zSwNlZ2VwXic7Q3SJPlLxdo+vIUSMgG5fqtHle+gUyvInLSDx+/etffv1/ \ No newline at end of file diff --git a/WinPaletter.SysEventsSounds/Program.cs b/WinPaletter.SysEventsSounds/Program.cs index ffaee998..6917c3e8 100644 --- a/WinPaletter.SysEventsSounds/Program.cs +++ b/WinPaletter.SysEventsSounds/Program.cs @@ -10,7 +10,7 @@ internal static class Program static void Main() { ServiceBase[] ServicesToRun; - ServicesToRun = new ServiceBase[] + ServicesToRun = new[] { new Service1() }; diff --git a/WinPaletter/ColorItemControllers/ColorInfoDragDrop.cs b/WinPaletter/ColorItemControllers/ColorInfoDragDrop.cs index a61a27db..0694e96d 100644 --- a/WinPaletter/ColorItemControllers/ColorInfoDragDrop.cs +++ b/WinPaletter/ColorItemControllers/ColorInfoDragDrop.cs @@ -15,11 +15,11 @@ protected override CreateParams CreateParams { get { - var cp = base.CreateParams; + CreateParams cp = base.CreateParams; if (!DWMAPI.IsCompositionEnabled()) { - cp.ClassStyle = cp.ClassStyle | DWMAPI.CS_DROPSHADOW; - cp.ExStyle = cp.ExStyle | 33554432; + cp.ClassStyle |= DWMAPI.CS_DROPSHADOW; + cp.ExStyle |= 33554432; return cp; } else @@ -82,7 +82,7 @@ private void ColorInfoDragDrop_Load(object sender, EventArgs e) private void Color_From_BackColorChanged(object sender, EventArgs e) { - var Color = ((Panel)sender).BackColor; + Color Color = ((Panel)sender).BackColor; BackColor = Program.Style.DarkMode ? Color.Dark(_dark) : Color.LightLight(); Label6.Text = Color.ReturnFormat(ColorsExtensions.ColorFormat.RGB, true, Color.A < 255).Replace(" ", ", "); @@ -98,7 +98,7 @@ private void Color_From_BackColorChanged(object sender, EventArgs e) private void Color_To_BackColorChanged(object sender, EventArgs e) { - var Color = ((Panel)sender).BackColor; + Color Color = ((Panel)sender).BackColor; Label13.Text = Color.ReturnFormat(ColorsExtensions.ColorFormat.RGB, true, Color.A < 255).Replace(" ", ", "); Label12.Text = Color.ReturnFormat(ColorsExtensions.ColorFormat.HEX, true, Color.A < 255).Replace(" ", ", "); diff --git a/WinPaletter/ColorItemControllers/ColorPickerDlg.cs b/WinPaletter/ColorItemControllers/ColorPickerDlg.cs index 7517bc54..8cd52662 100644 --- a/WinPaletter/ColorItemControllers/ColorPickerDlg.cs +++ b/WinPaletter/ColorItemControllers/ColorPickerDlg.cs @@ -21,11 +21,11 @@ public partial class ColorPickerDlg { private Color InitColor; private Image img; - private readonly List ChildControls_List = new List(); - private List ColorControls_List = new List(); - private readonly List
Forms_List = new List(); - private List Colors_List = new List(); - private Conditions _Conditions = new Conditions(); + private readonly List ChildControls_List = new(); + private List ColorControls_List = new(); + private readonly List Forms_List = new(); + private List Colors_List = new(); + private Conditions _conditions = new(); private readonly int _Speed = 40; private bool _EnableAlpha; @@ -34,11 +34,11 @@ protected override CreateParams CreateParams { get { - var cp = base.CreateParams; + CreateParams cp = base.CreateParams; if (!DWMAPI.IsCompositionEnabled()) { - cp.ClassStyle = cp.ClassStyle | DWMAPI.CS_DROPSHADOW; - cp.ExStyle = cp.ExStyle | 33554432; + cp.ClassStyle |= DWMAPI.CS_DROPSHADOW; + cp.ExStyle |= 33554432; return cp; } else @@ -81,8 +81,8 @@ protected override void WndProc(ref Message m) } #endregion - private Point newPoint = new Point(); - private Point xPoint = new Point(); + private Point newPoint = new(); + private Point xPoint = new(); private void ColorPicker_MouseDown(object sender, MouseEventArgs e) { @@ -129,12 +129,12 @@ public void GetColorsHistory(UI.Controllers.ColorItem ColorItem) foreach (Color c in ColorItem.ColorsHistory) { - UI.Controllers.ColorItem MiniColorItem = new UI.Controllers.ColorItem(); + UI.Controllers.ColorItem MiniColorItem = new(); MiniColorItem.Size = MiniColorItem.GetMiniColorItemSize(); MiniColorItem.AllowDrop = false; MiniColorItem.PauseColorsHistory = true; MiniColorItem.BackColor = c; - MiniColorItem.DefaultColor = MiniColorItem.BackColor; + MiniColorItem.DefaultBackColor = MiniColorItem.BackColor; FlowLayoutPanel1.Controls.Add(MiniColorItem); MiniColorItem.Click += MiniColorItem_click; @@ -159,12 +159,12 @@ public void GetColorsFromPalette(Theme.Manager TM) foreach (Color c in TM.Colors()) { - UI.Controllers.ColorItem MiniColorItem = new UI.Controllers.ColorItem(); + UI.Controllers.ColorItem MiniColorItem = new(); MiniColorItem.Size = MiniColorItem.GetMiniColorItemSize(); MiniColorItem.AllowDrop = false; MiniColorItem.PauseColorsHistory = true; MiniColorItem.BackColor = c; - MiniColorItem.DefaultColor = MiniColorItem.BackColor; + MiniColorItem.DefaultBackColor = MiniColorItem.BackColor; PaletteContainer.Controls.Add(MiniColorItem); MiniColorItem.Click += MiniColorItem_click; @@ -217,7 +217,7 @@ public Color Pick(List Ctrl, Conditions Conditions = null, bool EnableA { if (!Program.Settings.NerdStats.Classic_Color_Picker) { - var c = Ctrl[0].BackColor; + Color c = Ctrl[0].BackColor; ColorEditorManager1.Color = Ctrl[0].BackColor; InitColor = Ctrl[0].BackColor; _EnableAlpha = EnableAlpha; @@ -236,20 +236,17 @@ public Color Pick(List Ctrl, Conditions Conditions = null, bool EnableA } } - if (Conditions is null) - _Conditions = new Conditions(); - else - _Conditions = Conditions; - + _conditions = Conditions is null ? new() : Conditions; + Location = Ctrl[0].PointToScreen(Point.Empty) + (Size)new Point(-Width + Ctrl[0].Width + 5, Ctrl[0].Height - 1); if (Location.Y + Height > Program.Computer.Screen.Bounds.Height) - Location = new Point(Location.X, Program.Computer.Screen.Bounds.Height - Height); + Location = new(Location.X, Program.Computer.Screen.Bounds.Height - Height); if (Location.Y < 0) - Location = new Point(Location.X, 0); + Location = new(Location.X, 0); if (Location.X + Width > Program.Computer.Screen.Bounds.Width) - Location = new Point(Program.Computer.Screen.Bounds.Width - Width, Location.Y); + Location = new(Program.Computer.Screen.Bounds.Width - Width, Location.Y); if (Location.X < 0) - Location = new Point(0, Location.Y); + Location = new(0, Location.Y); if (ShowDialog() == DialogResult.OK) c = ColorEditorManager1.Color; @@ -257,7 +254,7 @@ public Color Pick(List Ctrl, Conditions Conditions = null, bool EnableA if (Ctrl[0] is UI.Controllers.ColorItem) { { - var ColorItem = (UI.Controllers.ColorItem)Ctrl[0]; + UI.Controllers.ColorItem ColorItem = (UI.Controllers.ColorItem)Ctrl[0]; ColorItem.Refresh(); ColorItem.PauseColorsHistory = false; ColorItem.ColorPickerOpened = false; @@ -278,7 +275,7 @@ public Color Pick(List Ctrl, Conditions Conditions = null, bool EnableA else { var c = Color.FromArgb(Ctrl[0].BackColor.A, Ctrl[0].BackColor); - using (var CCP = new ColorDialog() { AllowFullOpen = true, AnyColor = true, Color = c, FullOpen = true, SolidColorOnly = false }) + using (ColorDialog CCP = new() { AllowFullOpen = true, AnyColor = true, Color = c, FullOpen = true, SolidColorOnly = false }) { if (CCP.ShowDialog() == DialogResult.OK) { @@ -318,12 +315,12 @@ private void Change_Color_Preview(object sender, EventArgs e) { var Window = (UI.Simulation.Window)control; - if (!_Conditions.Win7) + if (!_conditions.Win7) { - if (_Conditions.Window_ActiveTitlebar) + if (_conditions.Window_ActiveTitlebar) Window.AccentColor_Active = color; - else if (_Conditions.Window_InactiveTitlebar) + else if (_conditions.Window_InactiveTitlebar) Window.AccentColor_Inactive = color; else @@ -331,13 +328,13 @@ private void Change_Color_Preview(object sender, EventArgs e) } - else if (_Conditions.Color1) + else if (_conditions.Color1) { Window.AccentColor_Active = color; Window.AccentColor_Inactive = color; } - else if (_Conditions.Color2) + else if (_conditions.Color2) { Window.AccentColor2_Active = color; Window.AccentColor2_Inactive = color; @@ -353,32 +350,32 @@ private void Change_Color_Preview(object sender, EventArgs e) if (WinElement.Style == UI.Simulation.WinElement.Styles.Taskbar11 | WinElement.Style == UI.Simulation.WinElement.Styles.Taskbar10) { - if (_Conditions.AppUnderlineOnly) + if (_conditions.AppUnderlineOnly) { FluentTransitions.Transition.With(WinElement, nameof(WinElement.AppUnderline), color.Light()).Linear(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } - else if (_Conditions.AppUnderlineWithTaskbar) + else if (_conditions.AppUnderlineWithTaskbar) { FluentTransitions.Transition.With(WinElement, nameof(WinElement.Background), color).Linear(TimeSpan.FromMilliseconds(Program.AnimationDuration)); FluentTransitions.Transition.With(WinElement, nameof(WinElement.AppUnderline), color.Light()).Linear(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } - else if (_Conditions.AppBackgroundOnly) + else if (_conditions.AppBackgroundOnly) { FluentTransitions.Transition.With(WinElement, nameof(WinElement.AppBackground), color).Linear(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } - else if (_Conditions.StartColorOnly) + else if (_conditions.StartColorOnly) { FluentTransitions.Transition.With(WinElement, nameof(WinElement.StartColor), color).Linear(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } else { - if (_Conditions.Background) + if (_conditions.Background) { WinElement.Background = color; } - else if (_Conditions.Background2) + else if (_conditions.Background2) { WinElement.Background2 = color; } @@ -389,23 +386,23 @@ private void Change_Color_Preview(object sender, EventArgs e) } } - else if (WinElement.Style == UI.Simulation.WinElement.Styles.ActionCenter11 & _Conditions.ActionCenterBtn) + else if (WinElement.Style == UI.Simulation.WinElement.Styles.ActionCenter11 & _conditions.ActionCenterBtn) { FluentTransitions.Transition.With(WinElement, nameof(WinElement.ActionCenterButton_Normal), color).Linear(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } - else if (WinElement.Style == UI.Simulation.WinElement.Styles.ActionCenter10 & _Conditions.ActionCenterLink) + else if (WinElement.Style == UI.Simulation.WinElement.Styles.ActionCenter10 & _conditions.ActionCenterLink) { FluentTransitions.Transition.With(WinElement, nameof(WinElement.LinkColor), color).Linear(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } else { - if (_Conditions.Background) + if (_conditions.Background) { WinElement.Background = color; } - else if (_Conditions.Background2) + else if (_conditions.Background2) { WinElement.Background2 = color; } @@ -423,11 +420,11 @@ private void Change_Color_Preview(object sender, EventArgs e) else if (control is UI.Controllers.StoreItem) { var StoreItem = (UI.Controllers.StoreItem)control; - if (_Conditions.Background) + if (_conditions.Background) { StoreItem.TM.Info.Color1 = color; } - else if (_Conditions.Background2) + else if (_conditions.Background2) { StoreItem.TM.Info.Color2 = color; @@ -437,7 +434,7 @@ private void Change_Color_Preview(object sender, EventArgs e) else if (control is Label) { - if (_Conditions.RetroAppWorkspace | _Conditions.RetroBackground) + if (_conditions.RetroAppWorkspace | _conditions.RetroBackground) { control.BackColor = Color.FromArgb(255, color); } @@ -450,31 +447,31 @@ private void Change_Color_Preview(object sender, EventArgs e) else if (control is UI.Retro.WindowR) { var WindowR = (UI.Retro.WindowR)control; - if (_Conditions.WindowRColor1) + if (_conditions.WindowRColor1) WindowR.Color1 = color; - if (_Conditions.WindowRColor2) + if (_conditions.WindowRColor2) WindowR.Color2 = color; - if (_Conditions.WindowRForeColor) + if (_conditions.WindowRForeColor) WindowR.ForeColor = color; - if (_Conditions.WindowRBorder) + if (_conditions.WindowRBorder) WindowR.ColorBorder = color; - if (_Conditions.ButtonRShadow) + if (_conditions.ButtonRShadow) WindowR.ButtonShadow = color; - if (_Conditions.ButtonRDkShadow) + if (_conditions.ButtonRDkShadow) WindowR.ButtonDkShadow = color; - if (_Conditions.ButtonRHilight) + if (_conditions.ButtonRHilight) WindowR.ButtonHilight = color; - if (_Conditions.ButtonRLight) + if (_conditions.ButtonRLight) WindowR.ButtonLight = color; - if (_Conditions.ButtonRFace) + if (_conditions.ButtonRFace) { if (!WindowR.UseItAsMenu) { @@ -486,7 +483,7 @@ private void Change_Color_Preview(object sender, EventArgs e) } } - if (_Conditions.RetroBackground) + if (_conditions.RetroBackground) WindowR.BackColor = color; WindowR.Refresh(); @@ -495,25 +492,25 @@ private void Change_Color_Preview(object sender, EventArgs e) else if (control is UI.Retro.Preview3D) { var Preview3D = (UI.Retro.Preview3D)control; - if (_Conditions.ButtonRFace) + if (_conditions.ButtonRFace) Preview3D.BackColor = color; - if (_Conditions.WindowRFrame) + if (_conditions.WindowRFrame) Preview3D.WindowFrame = color; - if (_Conditions.ButtonRText) + if (_conditions.ButtonRText) Preview3D.ForeColor = color; - if (_Conditions.ButtonRShadow) + if (_conditions.ButtonRShadow) Preview3D.ButtonShadow = color; - if (_Conditions.ButtonRDkShadow) + if (_conditions.ButtonRDkShadow) Preview3D.ButtonDkShadow = color; - if (_Conditions.ButtonRHilight) + if (_conditions.ButtonRHilight) Preview3D.ButtonHilight = color; - if (_Conditions.ButtonRLight) + if (_conditions.ButtonRLight) Preview3D.ButtonLight = color; Preview3D.Refresh(); @@ -522,25 +519,25 @@ private void Change_Color_Preview(object sender, EventArgs e) else if (control is UI.Retro.TextBoxR) { var TextBoxR = (UI.Retro.TextBoxR)control; - if (_Conditions.WindowRForeColor) + if (_conditions.WindowRForeColor) TextBoxR.ForeColor = color; - if (_Conditions.ButtonRShadow) + if (_conditions.ButtonRShadow) TextBoxR.ButtonShadow = color; - if (_Conditions.ButtonRDkShadow) + if (_conditions.ButtonRDkShadow) TextBoxR.ButtonDkShadow = color; - if (_Conditions.ButtonRHilight) + if (_conditions.ButtonRHilight) TextBoxR.ButtonHilight = color; - if (_Conditions.ButtonRLight) + if (_conditions.ButtonRLight) TextBoxR.ButtonLight = color; - if (_Conditions.ButtonRFace) + if (_conditions.ButtonRFace) TextBoxR.BackColor = color; - if (_Conditions.RetroBackground) + if (_conditions.RetroBackground) TextBoxR.BackColor = color; TextBoxR.Refresh(); @@ -549,25 +546,25 @@ private void Change_Color_Preview(object sender, EventArgs e) else if (control is UI.Retro.ButtonR) { var ButtonR = (UI.Retro.ButtonR)control; - if (_Conditions.ButtonRFace) + if (_conditions.ButtonRFace) ButtonR.BackColor = color; - if (_Conditions.WindowRFrame) + if (_conditions.WindowRFrame) ButtonR.WindowFrame = color; - if (_Conditions.ButtonRText) + if (_conditions.ButtonRText) ButtonR.ForeColor = color; - if (_Conditions.ButtonRShadow) + if (_conditions.ButtonRShadow) ButtonR.ButtonShadow = color; - if (_Conditions.ButtonRDkShadow) + if (_conditions.ButtonRDkShadow) ButtonR.ButtonDkShadow = color; - if (_Conditions.ButtonRHilight) + if (_conditions.ButtonRHilight) ButtonR.ButtonHilight = color; - if (_Conditions.ButtonRLight) + if (_conditions.ButtonRLight) ButtonR.ButtonLight = color; ButtonR.Refresh(); @@ -577,7 +574,7 @@ private void Change_Color_Preview(object sender, EventArgs e) { var ScrollBarR = (UI.Retro.ScrollBarR)control; - if (_Conditions.ButtonRHilight) + if (_conditions.ButtonRHilight) ScrollBarR.ButtonHilight = color; else @@ -588,22 +585,22 @@ private void Change_Color_Preview(object sender, EventArgs e) else if (control is Panel) { - if (_Conditions.RetroHighlight17BitFixer && control is UI.Retro.PanelR) + if (_conditions.RetroHighlight17BitFixer && control is UI.Retro.PanelR) { ((UI.Retro.PanelR)control).ButtonShadow = color; } else if (control is not UI.WP.GroupBox && control is not UI.Controllers.ColorItem) { - if (_Conditions.RetroAppWorkspace | _Conditions.RetroBackground) + if (_conditions.RetroAppWorkspace | _conditions.RetroBackground) control.BackColor = color; if (control is UI.Retro.PanelR) { - if (_Conditions.ButtonRHilight) + if (_conditions.ButtonRHilight) ((UI.Retro.PanelR)control).ButtonHilight = color; - if (_Conditions.ButtonRShadow) + if (_conditions.ButtonRShadow) ((UI.Retro.PanelR)control).ButtonShadow = color; } @@ -625,7 +622,7 @@ private void Change_Color_Preview(object sender, EventArgs e) { var TextBoxR = (UI.Retro.TextBoxR)control; - if (_Conditions.WindowRText) + if (_conditions.WindowRText) { TextBoxR.ForeColor = Color.FromArgb(control.ForeColor.A, color); } @@ -642,47 +639,47 @@ private void Change_Color_Preview(object sender, EventArgs e) { var WinTerminal = (UI.Simulation.WinTerminal)control; - if (_Conditions.Terminal_Back) + if (_conditions.Terminal_Back) { WinTerminal.Color_Background = Color.FromArgb(255, color); } - else if (_Conditions.Terminal_Fore) + else if (_conditions.Terminal_Fore) { WinTerminal.Color_Foreground = Color.FromArgb(255, color); } - else if (_Conditions.Terminal_Selection) + else if (_conditions.Terminal_Selection) { WinTerminal.Color_Selection = Color.FromArgb(255, color); } - else if (_Conditions.Terminal_Cursor) + else if (_conditions.Terminal_Cursor) { WinTerminal.Color_Cursor = Color.FromArgb(255, color); } - else if (_Conditions.Terminal_TabColor) + else if (_conditions.Terminal_TabColor) { WinTerminal.TabColor = Color.FromArgb(255, color); } - else if (_Conditions.Terminal_TabActive) + else if (_conditions.Terminal_TabActive) { WinTerminal.Color_TabFocused = Color.FromArgb(255, color); } - else if (_Conditions.Terminal_TabInactive) + else if (_conditions.Terminal_TabInactive) { WinTerminal.Color_TabUnFocused = Color.FromArgb(255, color); } - else if (_Conditions.Terminal_TitlebarActive) + else if (_conditions.Terminal_TitlebarActive) { WinTerminal.Color_Titlebar = Color.FromArgb(255, color); } - else if (_Conditions.Terminal_TitlebarInactive) + else if (_conditions.Terminal_TitlebarInactive) { WinTerminal.Color_Titlebar_Unfocused = Color.FromArgb(255, color); } @@ -693,95 +690,95 @@ private void Change_Color_Preview(object sender, EventArgs e) else if (control is UI.Simulation.WinCMD) { var WinCMD = (UI.Simulation.WinCMD)control; - if (_Conditions.CMD_ColorTable00) + if (_conditions.CMD_ColorTable00) { WinCMD.CMD_ColorTable00 = Color.FromArgb(255, color); } - else if (_Conditions.CMD_ColorTable01) + else if (_conditions.CMD_ColorTable01) { WinCMD.CMD_ColorTable01 = Color.FromArgb(255, color); } - else if (_Conditions.CMD_ColorTable02) + else if (_conditions.CMD_ColorTable02) { WinCMD.CMD_ColorTable02 = Color.FromArgb(255, color); } - else if (_Conditions.CMD_ColorTable03) + else if (_conditions.CMD_ColorTable03) { WinCMD.CMD_ColorTable03 = Color.FromArgb(255, color); } - else if (_Conditions.CMD_ColorTable04) + else if (_conditions.CMD_ColorTable04) { WinCMD.CMD_ColorTable04 = Color.FromArgb(255, color); } - else if (_Conditions.CMD_ColorTable05) + else if (_conditions.CMD_ColorTable05) { WinCMD.CMD_ColorTable05 = Color.FromArgb(255, color); } - else if (_Conditions.CMD_ColorTable06) + else if (_conditions.CMD_ColorTable06) { WinCMD.CMD_ColorTable06 = Color.FromArgb(255, color); } - else if (_Conditions.CMD_ColorTable07) + else if (_conditions.CMD_ColorTable07) { WinCMD.CMD_ColorTable07 = Color.FromArgb(255, color); } - else if (_Conditions.CMD_ColorTable08) + else if (_conditions.CMD_ColorTable08) { WinCMD.CMD_ColorTable08 = Color.FromArgb(255, color); } - else if (_Conditions.CMD_ColorTable09) + else if (_conditions.CMD_ColorTable09) { WinCMD.CMD_ColorTable09 = Color.FromArgb(255, color); } - else if (_Conditions.CMD_ColorTable10) + else if (_conditions.CMD_ColorTable10) { WinCMD.CMD_ColorTable10 = Color.FromArgb(255, color); } - else if (_Conditions.CMD_ColorTable11) + else if (_conditions.CMD_ColorTable11) { WinCMD.CMD_ColorTable11 = Color.FromArgb(255, color); } - else if (_Conditions.CMD_ColorTable12) + else if (_conditions.CMD_ColorTable12) { WinCMD.CMD_ColorTable12 = Color.FromArgb(255, color); } - else if (_Conditions.CMD_ColorTable13) + else if (_conditions.CMD_ColorTable13) { WinCMD.CMD_ColorTable13 = Color.FromArgb(255, color); } - else if (_Conditions.CMD_ColorTable14) + else if (_conditions.CMD_ColorTable14) { WinCMD.CMD_ColorTable14 = Color.FromArgb(255, color); } - else if (_Conditions.CMD_ColorTable15) + else if (_conditions.CMD_ColorTable15) { WinCMD.CMD_ColorTable15 = Color.FromArgb(255, color); } @@ -797,43 +794,43 @@ private void Change_Color_Preview(object sender, EventArgs e) { var CursorControl = (UI.Controllers.CursorControl)control; - if (_Conditions.CursorBack1) + if (_conditions.CursorBack1) { CursorControl.Prop_PrimaryColor1 = color; } - else if (_Conditions.CursorBack2) + else if (_conditions.CursorBack2) { CursorControl.Prop_PrimaryColor2 = color; } - else if (_Conditions.CursorLine1) + else if (_conditions.CursorLine1) { CursorControl.Prop_SecondaryColor1 = color; } - else if (_Conditions.CursorLine2) + else if (_conditions.CursorLine2) { CursorControl.Prop_SecondaryColor2 = color; } - else if (_Conditions.CursorCircle1) + else if (_conditions.CursorCircle1) { CursorControl.Prop_LoadingCircleBack1 = color; } - else if (_Conditions.CursorCircle2) + else if (_conditions.CursorCircle2) { CursorControl.Prop_LoadingCircleBack2 = color; } - else if (_Conditions.CursorCircleHot1) + else if (_conditions.CursorCircleHot1) { CursorControl.Prop_LoadingCircleHot1 = color; } - else if (_Conditions.CursorCircleHot2) + else if (_conditions.CursorCircleHot2) { CursorControl.Prop_LoadingCircleHot2 = color; } - else if (_Conditions.CursorShadow) + else if (_conditions.CursorShadow) { CursorControl.Prop_Shadow_Color = color; @@ -855,12 +852,12 @@ private void Change_Color_Preview(object sender, EventArgs e) if ((OS.WVista || OS.W7 || OS.W8 || OS.W81) && Program.Settings.Miscellaneous.Win7LivePreview) { - if (_Conditions.LivePreview_Colorization) + if (_conditions.LivePreview_Colorization) { UpdateDWMPreview(ColorEditorManager1.Color, Program.TM.Windows7.ColorizationAfterglow); } - if (_Conditions.LivePreview_AfterGlow) + if (_conditions.LivePreview_AfterGlow) { UpdateDWMPreview(Program.TM.Windows7.ColorizationColor, ColorEditorManager1.Color); } @@ -878,7 +875,7 @@ public static void UpdateDWMPreview(Color Color1, Color Color2) { if (DWMAPI.IsCompositionEnabled()) { - var DCP = new DWMAPI.DWM_COLORIZATION_PARAMS() + DWMAPI.DWM_COLORIZATION_PARAMS DCP = new() { clrColor = (uint)Color1.ToArgb(), clrAfterGlow = (uint)Color2.ToArgb() @@ -959,10 +956,12 @@ private void BackgroundWorker1_DoWork(object sender, DoWorkEventArgs e) { if (img is not null) { - var ColorThiefX = new ColorThiefDotNet.ColorThief(); - var Colors = ColorThiefX.GetPalette((Bitmap)img, Trackbar1.Value, Trackbar2.Value, CheckBox1.Checked); + ColorThiefDotNet.ColorThief ColorThiefX = new(); + List Colors = ColorThiefX.GetPalette((Bitmap)img, Trackbar1.Value, Trackbar2.Value, CheckBox1.Checked); + foreach (ColorThiefDotNet.QuantizedColor C in Colors) Colors_List.Add(Color.FromArgb(255, C.Color.R, C.Color.G, C.Color.B)); + GC.Collect(); GC.SuppressFinalize(Colors); GC.SuppressFinalize(ColorThiefX); @@ -985,12 +984,12 @@ private void BackgroundWorker1_RunWorkerCompleted(object sender, RunWorkerComple foreach (Color C in Colors_List) { - UI.Controllers.ColorItem MiniColorItem = new UI.Controllers.ColorItem(); + UI.Controllers.ColorItem MiniColorItem = new(); MiniColorItem.Size = MiniColorItem.GetMiniColorItemSize(); MiniColorItem.AllowDrop = false; MiniColorItem.PauseColorsHistory = true; MiniColorItem.BackColor = Color.FromArgb(255, C); - MiniColorItem.DefaultColor = MiniColorItem.BackColor; + MiniColorItem.DefaultBackColor = MiniColorItem.BackColor; ImgPaletteContainer.Controls.Add(MiniColorItem); MiniColorItem.Click += MiniColorItem_click; @@ -1095,12 +1094,12 @@ private void ColorPickerDlg_FormClosed(object sender, FormClosedEventArgs e) { if (DialogResult != DialogResult.OK & (OS.WVista | OS.W7 | OS.W8 | OS.W81) & Program.Settings.Miscellaneous.Win7LivePreview) { - if (_Conditions.LivePreview_Colorization) + if (_conditions.LivePreview_Colorization) { UpdateDWMPreview(InitColor, Program.TM.Windows7.ColorizationAfterglow); } - if (_Conditions.LivePreview_AfterGlow) + if (_conditions.LivePreview_AfterGlow) { UpdateDWMPreview(Program.TM.Windows7.ColorizationColor, InitColor); } @@ -1128,12 +1127,12 @@ private void ComboBox1_SelectedIndexChanged(object sender, EventArgs e) { foreach (Color C in Theme.Manager.GetPaletteFromString(Properties.Resources.RetroThemesDB, ComboBox1.SelectedItem.ToString())) { - UI.Controllers.ColorItem MiniColorItem = new UI.Controllers.ColorItem(); + UI.Controllers.ColorItem MiniColorItem = new(); MiniColorItem.Size = MiniColorItem.GetMiniColorItemSize(); MiniColorItem.AllowDrop = false; MiniColorItem.PauseColorsHistory = true; MiniColorItem.BackColor = Color.FromArgb(255, C); - MiniColorItem.DefaultColor = MiniColorItem.BackColor; + MiniColorItem.DefaultBackColor = MiniColorItem.BackColor; ThemePaletteContainer.Controls.Add(MiniColorItem); MiniColorItem.Click += MiniColorItem_click; @@ -1190,12 +1189,12 @@ private void TextBox1_TextChanged(object sender, EventArgs e) { foreach (Color C in Theme.Manager.GetPaletteFromMSTheme(TextBox2.Text)) { - UI.Controllers.ColorItem MiniColorItem = new UI.Controllers.ColorItem(); + UI.Controllers.ColorItem MiniColorItem = new(); MiniColorItem.Size = MiniColorItem.GetMiniColorItemSize(); MiniColorItem.AllowDrop = false; MiniColorItem.PauseColorsHistory = true; MiniColorItem.BackColor = Color.FromArgb(255, C); - MiniColorItem.DefaultColor = MiniColorItem.BackColor; + MiniColorItem.DefaultBackColor = MiniColorItem.BackColor; ThemePaletteContainer.Controls.Add(MiniColorItem); MiniColorItem.Click += MiniColorItem_click; @@ -1213,19 +1212,19 @@ private void TextBox1_TextChanged(object sender, EventArgs e) { System.IO.File.WriteAllText(PathsExt.appData + @"\VisualStyles\Luna\win32uischeme.theme", string.Format("[VisualStyles]{1}Path={0}{1}ColorStyle=NormalColor{1}Size=NormalSize", TextBox2.Text, "\r\n")); - var vs = new VisualStyleFile(PathsExt.appData + @"\VisualStyles\Luna\win32uischeme.theme"); + VisualStyleFile vs = new(PathsExt.appData + @"\VisualStyles\Luna\win32uischeme.theme"); foreach (var field in typeof(VisualStyleMetricColors).GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public)) { if (field.FieldType.Name.ToLower() == "color") { - UI.Controllers.ColorItem MiniColorItem = new UI.Controllers.ColorItem(); + UI.Controllers.ColorItem MiniColorItem = new(); MiniColorItem.Size = MiniColorItem.GetMiniColorItemSize(); MiniColorItem.AllowDrop = false; MiniColorItem.PauseColorsHistory = true; MiniColorItem.BackColor = (Color)field.GetValue(vs.Metrics.Colors); - MiniColorItem.DefaultColor = MiniColorItem.BackColor; + MiniColorItem.DefaultBackColor = MiniColorItem.BackColor; ThemePaletteContainer.Controls.Add(MiniColorItem); MiniColorItem.Click += MiniColorItem_click; diff --git a/WinPaletter/ColorItemControllers/SubMenu.Designer.cs b/WinPaletter/ColorItemControllers/SubMenu.Designer.cs index 40adedb0..fd10fadc 100644 --- a/WinPaletter/ColorItemControllers/SubMenu.Designer.cs +++ b/WinPaletter/ColorItemControllers/SubMenu.Designer.cs @@ -52,7 +52,7 @@ private void InitializeComponent() Button9.Click += new EventHandler(Button9_Click); Trackbar4 = new UI.WP.Trackbar(); Trackbar4.Scroll += new UI.WP.Trackbar.ScrollEventHandler(Trackbar4_Scroll); - PreviousColor = new UI.Controllers.ColorItem(); + PreviousColor = new(); PreviousColor.Click += new EventHandler(PreviousColor_Click); Button8 = new UI.WP.Button(); Button8.Click += new EventHandler(Button8_Click); @@ -70,11 +70,11 @@ private void InitializeComponent() Button4 = new UI.WP.Button(); Button4.Click += new EventHandler(Button4_Click); Separator3 = new UI.WP.SeparatorH(); - InvertedColor = new UI.Controllers.ColorItem(); + InvertedColor = new(); InvertedColor.Click += new EventHandler(MainColor_Click); - DefaultColor = new UI.Controllers.ColorItem(); + DefaultColor = new(); DefaultColor.Click += new EventHandler(MainColor_Click); - MainColor = new UI.Controllers.ColorItem(); + MainColor = new(); MainColor.Click += new EventHandler(MainColor_Click); Button10 = new UI.WP.Button(); Button10.Click += new EventHandler(Button10_Click); @@ -177,7 +177,7 @@ private void InitializeComponent() // Label2 // Label2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - Label2.Font = new Font("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); + Label2.Font = new("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); Label2.Location = new Point(200, 7); Label2.Name = "Label2"; Label2.Size = new Size(207, 24); @@ -216,7 +216,7 @@ private void InitializeComponent() // Button9 // Button9.BackColor = Color.FromArgb(72, 10, 10); - Button9.Font = new Font("Segoe UI", 9.0f); + Button9.Font = new("Segoe UI", 9.0f); Button9.ForeColor = Color.White; Button9.Image = (Image)resources.GetObject("Button9.Image"); Button9.Location = new Point(157, 180); @@ -240,10 +240,10 @@ private void InitializeComponent() // PreviousColor // PreviousColor.BackColor = Color.Crimson; - PreviousColor.DefaultColor = Color.Black; + PreviousColor.DefaultBackColor = Color.Black; PreviousColor.DontShowInfo = false; PreviousColor.Location = new Point(97, 156); - PreviousColor.Margin = new Padding(4, 3, 4, 3); + PreviousColor.Margin = new(4, 3, 4, 3); PreviousColor.Name = "PreviousColor"; PreviousColor.Size = new Size(85, 20); PreviousColor.TabIndex = 71; @@ -251,7 +251,7 @@ private void InitializeComponent() // Button8 // Button8.BackColor = Color.FromArgb(72, 10, 10); - Button8.Font = new Font("Segoe UI", 9.0f); + Button8.Font = new("Segoe UI", 9.0f); Button8.ForeColor = Color.White; Button8.Image = (Image)resources.GetObject("Button8.Image"); Button8.Location = new Point(157, 236); @@ -263,7 +263,7 @@ private void InitializeComponent() // Button7 // Button7.BackColor = Color.FromArgb(72, 10, 10); - Button7.Font = new Font("Segoe UI", 9.0f); + Button7.Font = new("Segoe UI", 9.0f); Button7.ForeColor = Color.White; Button7.Image = (Image)resources.GetObject("Button7.Image"); Button7.Location = new Point(157, 123); @@ -275,7 +275,7 @@ private void InitializeComponent() // Button6 // Button6.BackColor = Color.FromArgb(72, 10, 10); - Button6.Font = new Font("Segoe UI", 9.0f); + Button6.Font = new("Segoe UI", 9.0f); Button6.ForeColor = Color.White; Button6.Image = (Image)resources.GetObject("Button6.Image"); Button6.Location = new Point(157, 68); @@ -333,7 +333,7 @@ private void InitializeComponent() // Button4.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left; Button4.BackColor = Color.FromArgb(72, 10, 10); - Button4.Font = new Font("Segoe UI", 9.0f); + Button4.Font = new("Segoe UI", 9.0f); Button4.ForeColor = Color.White; Button4.Image = null; Button4.Location = new Point(187, 42); @@ -355,10 +355,10 @@ private void InitializeComponent() // InvertedColor // InvertedColor.BackColor = Color.Crimson; - InvertedColor.DefaultColor = Color.Black; + InvertedColor.DefaultBackColor = Color.Black; InvertedColor.DontShowInfo = false; InvertedColor.Location = new Point(97, 212); - InvertedColor.Margin = new Padding(4, 3, 4, 3); + InvertedColor.Margin = new(4, 3, 4, 3); InvertedColor.Name = "InvertedColor"; InvertedColor.Size = new Size(85, 20); InvertedColor.TabIndex = 25; @@ -366,10 +366,10 @@ private void InitializeComponent() // DefaultColor // DefaultColor.BackColor = Color.Crimson; - DefaultColor.DefaultColor = Color.Black; + DefaultColor.DefaultBackColor = Color.Black; DefaultColor.DontShowInfo = false; DefaultColor.Location = new Point(97, 99); - DefaultColor.Margin = new Padding(4, 3, 4, 3); + DefaultColor.Margin = new(4, 3, 4, 3); DefaultColor.Name = "DefaultColor"; DefaultColor.Size = new Size(85, 20); DefaultColor.TabIndex = 19; @@ -377,10 +377,10 @@ private void InitializeComponent() // MainColor // MainColor.BackColor = Color.Crimson; - MainColor.DefaultColor = Color.Black; + MainColor.DefaultBackColor = Color.Black; MainColor.DontShowInfo = false; MainColor.Location = new Point(97, 44); - MainColor.Margin = new Padding(4, 3, 4, 3); + MainColor.Margin = new(4, 3, 4, 3); MainColor.Name = "MainColor"; MainColor.Size = new Size(85, 20); MainColor.TabIndex = 4; @@ -388,7 +388,7 @@ private void InitializeComponent() // Button10 // Button10.BackColor = Color.FromArgb(72, 10, 10); - Button10.Font = new Font("Segoe UI", 9.0f); + Button10.Font = new("Segoe UI", 9.0f); Button10.ForeColor = Color.White; Button10.Image = (Image)resources.GetObject("Button10.Image"); Button10.Location = new Point(100, 4); @@ -400,7 +400,7 @@ private void InitializeComponent() // Button2 // Button2.BackColor = Color.FromArgb(72, 10, 10); - Button2.Font = new Font("Segoe UI", 9.0f); + Button2.Font = new("Segoe UI", 9.0f); Button2.ForeColor = Color.White; Button2.Image = (Image)resources.GetObject("Button2.Image"); Button2.Location = new Point(4, 4); @@ -412,7 +412,7 @@ private void InitializeComponent() // Button12 // Button1.BackColor = Color.FromArgb(72, 10, 10); - Button1.Font = new Font("Segoe UI", 9.0f); + Button1.Font = new("Segoe UI", 9.0f); Button1.ForeColor = Color.White; Button1.Image = (Image)resources.GetObject("Button1.Image"); Button1.Location = new Point(36, 4); @@ -425,7 +425,7 @@ private void InitializeComponent() // Button3.BackColor = Color.FromArgb(72, 10, 10); Button3.Enabled = false; - Button3.Font = new Font("Segoe UI", 9.0f); + Button3.Font = new("Segoe UI", 9.0f); Button3.ForeColor = Color.White; Button3.Image = (Image)resources.GetObject("Button3.Image"); Button3.Location = new Point(68, 4); @@ -437,7 +437,7 @@ private void InitializeComponent() // Button5 // Button5.BackColor = Color.FromArgb(72, 10, 10); - Button5.Font = new Font("Segoe UI", 9.0f); + Button5.Font = new("Segoe UI", 9.0f); Button5.ForeColor = Color.White; Button5.Image = (Image)resources.GetObject("Button5.Image"); Button5.Location = new Point(132, 4); @@ -478,11 +478,11 @@ private void InitializeComponent() Controls.Add(PictureBox3); Controls.Add(MainColor); Controls.Add(Panel1); - Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); ForeColor = Color.White; FormBorderStyle = FormBorderStyle.None; Icon = (Icon)resources.GetObject("$this.Icon"); - Margin = new Padding(4, 3, 4, 3); + Margin = new(4, 3, 4, 3); MaximizeBox = false; MinimizeBox = false; Name = "SubMenu"; diff --git a/WinPaletter/ColorItemControllers/SubMenu.cs b/WinPaletter/ColorItemControllers/SubMenu.cs index 2e7f5cfe..002b57e4 100644 --- a/WinPaletter/ColorItemControllers/SubMenu.cs +++ b/WinPaletter/ColorItemControllers/SubMenu.cs @@ -23,11 +23,11 @@ protected override CreateParams CreateParams { get { - var cp = base.CreateParams; + CreateParams cp = base.CreateParams; if (!DWMAPI.IsCompositionEnabled()) { - cp.ClassStyle = cp.ClassStyle | DWMAPI.CS_DROPSHADOW; - cp.ExStyle = cp.ExStyle | 33554432; + cp.ClassStyle |= DWMAPI.CS_DROPSHADOW; + cp.ExStyle |= 33554432; return cp; } else @@ -81,25 +81,25 @@ public Color ShowMenu(UI.Controllers.ColorItem ColorItem, bool EnableDelete = fa Button5.Visible = EnableDelete; MainColor.BackColor = ColorItem.BackColor.CB((float)((Trackbar1.Value - 100) / 100d)); - DefaultColor.BackColor = ColorItem.DefaultColor.CB((float)((Trackbar2.Value - 100) / 100d)); + DefaultColor.BackColor = ColorItem.DefaultBackColor.CB((float)((Trackbar2.Value - 100) / 100d)); InvertedColor.BackColor = ColorItem.BackColor.Invert().CB((float)((Trackbar3.Value - 100) / 100d)); - MainColor.DefaultColor = ColorItem.BackColor; - DefaultColor.DefaultColor = ColorItem.DefaultColor; - InvertedColor.DefaultColor = ColorItem.BackColor.Invert(); + MainColor.DefaultBackColor = ColorItem.BackColor; + DefaultColor.DefaultBackColor = ColorItem.DefaultBackColor; + InvertedColor.DefaultBackColor = ColorItem.BackColor.Invert(); if (ColorItem.ColorsHistory.Count > 1) { PreviousColor.BackColor = ColorItem.ColorsHistory[ColorItem.ColorsHistory.Count - 2].CB((float)((Trackbar4.Value - 100) / 100d)); - PreviousColor.DefaultColor = ColorItem.ColorsHistory[ColorItem.ColorsHistory.Count - 2]; + PreviousColor.DefaultBackColor = ColorItem.ColorsHistory[ColorItem.ColorsHistory.Count - 2]; } else { PreviousColor.BackColor = ColorItem.BackColor.CB((float)((Trackbar4.Value - 100) / 100d)); - PreviousColor.DefaultColor = ColorItem.BackColor; + PreviousColor.DefaultBackColor = ColorItem.BackColor; } - PreviousClr = PreviousColor.DefaultColor; + PreviousClr = PreviousColor.DefaultBackColor; GetHistoryColors(ColorItem); @@ -140,7 +140,7 @@ public Color ShowMenu(UI.Controllers.ColorItem ColorItem, bool EnableDelete = fa case ColorClipboard.MenuEvent.None: { - return MainColor.DefaultColor; + return MainColor.DefaultBackColor; } } @@ -148,7 +148,7 @@ public Color ShowMenu(UI.Controllers.ColorItem ColorItem, bool EnableDelete = fa else { ColorClipboard.Event = ColorClipboard.MenuEvent.None; - return MainColor.DefaultColor; + return MainColor.DefaultBackColor; } // Nothing return default; @@ -313,10 +313,10 @@ private void SubMenu_Load(object sender, EventArgs e) public void MiniColorItem_Clicked(object sender, EventArgs e) { MainColor.BackColor = ((UI.Controllers.ColorItem)sender).BackColor; - MainColor.DefaultColor = ((UI.Controllers.ColorItem)sender).BackColor; + MainColor.DefaultBackColor = ((UI.Controllers.ColorItem)sender).BackColor; InvertedColor.BackColor = MainColor.BackColor.Invert().CB((float)((Trackbar3.Value - 100) / 100d)); - InvertedColor.DefaultColor = MainColor.BackColor.Invert(); + InvertedColor.DefaultBackColor = MainColor.BackColor.Invert(); Collapse_Expand(); } @@ -336,12 +336,12 @@ public void GetHistoryColors(UI.Controllers.ColorItem ColorItem) foreach (Color c in ColorItem.ColorsHistory) { - UI.Controllers.ColorItem MiniColorItem = new UI.Controllers.ColorItem(); + UI.Controllers.ColorItem MiniColorItem = new(); MiniColorItem.Size = MiniColorItem.GetMiniColorItemSize(); MiniColorItem.AllowDrop = false; MiniColorItem.PauseColorsHistory = true; MiniColorItem.BackColor = c; - MiniColorItem.DefaultColor = MiniColorItem.BackColor; + MiniColorItem.DefaultBackColor = MiniColorItem.BackColor; PaletteContainer.Controls.Add(MiniColorItem); MiniColorItem.Click += MiniColorItem_Clicked; @@ -352,7 +352,7 @@ public void GetHistoryColors(UI.Controllers.ColorItem ColorItem) public void Update_Variants() { - InvertedColor.DefaultColor = MainColor.DefaultColor.Invert(); + InvertedColor.DefaultBackColor = MainColor.DefaultBackColor.Invert(); } private void Button1_Click(object sender, EventArgs e) @@ -404,17 +404,17 @@ private void Button5_Click(object sender, EventArgs e) private void Trackbar1_Scroll(object sender) { - MainColor.BackColor = MainColor.DefaultColor.CB((float)((Trackbar1.Value - 100) / 100d)); + MainColor.BackColor = MainColor.DefaultBackColor.CB((float)((Trackbar1.Value - 100) / 100d)); } private void Trackbar2_Scroll(object sender) { - DefaultColor.BackColor = DefaultColor.DefaultColor.CB((float)((Trackbar2.Value - 100) / 100d)); + DefaultColor.BackColor = DefaultColor.DefaultBackColor.CB((float)((Trackbar2.Value - 100) / 100d)); } private void Trackbar3_Scroll(object sender) { - InvertedColor.BackColor = InvertedColor.DefaultColor.CB((float)((Trackbar3.Value - 100) / 100d)); + InvertedColor.BackColor = InvertedColor.DefaultBackColor.CB((float)((Trackbar3.Value - 100) / 100d)); } private void Button6_Click(object sender, EventArgs e) @@ -434,7 +434,7 @@ private void Button8_Click(object sender, EventArgs e) private void Trackbar4_Scroll(object sender) { - PreviousColor.BackColor = PreviousColor.DefaultColor.CB((float)((Trackbar4.Value - 100) / 100d)); + PreviousColor.BackColor = PreviousColor.DefaultBackColor.CB((float)((Trackbar4.Value - 100) / 100d)); } private void Button9_Click(object sender, EventArgs e) diff --git a/WinPaletter/Converter/Converter.cs b/WinPaletter/Converter/Converter.cs index 10c72ae8..7168ac6f 100644 --- a/WinPaletter/Converter/Converter.cs +++ b/WinPaletter/Converter/Converter.cs @@ -11,7 +11,7 @@ public Converter_CP.WP_Format GetFormat(string File) { if (System.IO.File.Exists(File)) { - Converter_CP = new Converter_CP(File); + Converter_CP = new(File); return Format; } else @@ -24,7 +24,7 @@ public void Convert(string File, string SaveAs, bool Compress, bool OldWPTH1069) { if (System.IO.File.Exists(File)) { - Converter_CP = new Converter_CP(File); + Converter_CP = new(File); switch (Format) { diff --git a/WinPaletter/Converter/Converter_CP.cs b/WinPaletter/Converter/Converter_CP.cs index 864c7bf5..76729c81 100644 --- a/WinPaletter/Converter/Converter_CP.cs +++ b/WinPaletter/Converter/Converter_CP.cs @@ -31,7 +31,7 @@ public struct Info public override string ToString() { - var tx = new List(); + List tx = new(); tx.Clear(); tx.Add(""); tx.Add("*Palette Name= " + ThemeName); @@ -81,7 +81,7 @@ public enum AccentTaskbarLevels public string ToString(string Signature, string MiniSignature) { - var tx = new List(); + List tx = new(); tx.Clear(); tx.Add(string.Format("<{0}>", Signature)); tx.Add(string.Format("*{0}_Color_Index0= {1}", MiniSignature, Color_Index0.ToArgb())); @@ -225,7 +225,7 @@ public struct Windows8 public int LockScreenSystemID; public override string ToString() { - var tx = new List(); + List tx = new(); tx.Clear(); tx.Add(""); tx.Add("*Metro_ColorizationColor= " + ColorizationColor.ToArgb()); @@ -300,7 +300,7 @@ public enum Themes public override string ToString() { - var tx = new List(); + List tx = new(); tx.Clear(); tx.Add(""); tx.Add("*Aero_ColorizationColor= " + ColorizationColor.ToArgb()); @@ -361,7 +361,7 @@ public struct WindowsVista public override string ToString() { - var tx = new List(); + List tx = new(); tx.Clear(); tx.Add(""); tx.Add("*Vista_ColorizationColor= " + ColorizationColor.ToArgb()); @@ -403,7 +403,7 @@ public enum Themes public override string ToString() { - var tx = new List(); + List tx = new(); tx.Clear(); tx.Add(""); tx.Add("*WinXP_Theme= " + (int)Theme); @@ -474,7 +474,7 @@ public enum Method public override string ToString() { - var tx = new List(); + List tx = new(); tx.Clear(); tx.Add(""); @@ -663,7 +663,7 @@ public enum MenuAnimType public override string ToString() { - var tx = new List(); + List tx = new(); tx.Clear(); tx.Add(""); tx.Add("*WinEffects_Enabled= " + Enabled); @@ -817,7 +817,7 @@ public void FromListOfString(IEnumerable Lines) // As WallpaperTone public string ToString(string Signature) { - var tx = new List(); + List tx = new(); tx.Clear(); tx.Add(string.Format("", Signature)); tx.Add(string.Format("*WallpaperTone_{0}_Enabled= {1}", Signature, Enabled)); @@ -860,7 +860,7 @@ public struct MetricsFonts public string AddFontsToThemeFile(string PropName, Font Font) { - var s = new List(); + List s = new(); s.Clear(); s.Add(string.Format("*Fonts_{0}_{1}= {2}", PropName, "Name", Font.Name)); s.Add(string.Format("*Fonts_{0}_{1}= {2}", PropName, "Size", Font.SizeInPoints)); @@ -870,7 +870,7 @@ public string AddFontsToThemeFile(string PropName, Font Font) public override string ToString() { - var tx = new List(); + List tx = new(); tx.Clear(); tx.Add(""); tx.Add("*MetricsFonts_Enabled= " + Enabled); @@ -903,7 +903,7 @@ public override string ToString() public void FromListOfString(IEnumerable Lines) { - var fonts = new List(); + List fonts = new(); fonts.Clear(); foreach (string line in Lines) @@ -1002,7 +1002,7 @@ public void FromListOfString(IEnumerable Lines) public Font SetToFont(string PropName, string PropValue, Font Font) { - var F = new Font(Font.Name, Font.Size, Font.Style); + Font F = new(Font.Name, Font.Size, Font.Style); switch (PropName.ToLower() ?? string.Empty) { @@ -1010,19 +1010,19 @@ public Font SetToFont(string PropName, string PropValue, Font Font) { if (PropValue.ToUpper() == "MS SANS SERIF") PropValue = "Microsoft Sans Serif"; - F = new Font(PropValue, Font.Size, Font.Style); + F = new(PropValue, Font.Size, Font.Style); break; } case var case1 when case1 == ("Size".ToLower() ?? string.Empty): { - F = new Font(Font.Name, Conversions.ToSingle(PropValue), Font.Style); + F = new(Font.Name, Conversions.ToSingle(PropValue), Font.Style); break; } case var case2 when case2 == ("Style".ToLower() ?? string.Empty): { - F = new Font(Font.Name, Font.Size, ReturnFontStyle(PropValue)); + F = new(Font.Name, Font.Size, ReturnFontStyle(PropValue)); break; } @@ -1145,7 +1145,7 @@ public enum Styles public override string ToString() { - var tx = new List(); + List tx = new(); tx.Clear(); tx.Add(""); tx.Add("*AltTab_Enabled= " + Enabled); @@ -1178,7 +1178,7 @@ public struct LogonUI10x public override string ToString() { - var tx = new List(); + List tx = new(); tx.Clear(); tx.Add(""); tx.Add("*LogonUI_DisableAcrylicBackgroundOnLogon= " + DisableAcrylicBackgroundOnLogon); @@ -1232,7 +1232,7 @@ public enum Modes public override string ToString() { - var tx = new List(); + List tx = new(); tx.Clear(); tx.Add(""); tx.Add("*LogonUI7_Enabled= " + Enabled); @@ -1293,7 +1293,7 @@ public enum Modes public override string ToString() { - var tx = new List(); + List tx = new(); tx.Clear(); tx.Add(""); tx.Add("*LogonUIXP_Enabled= " + Enabled); @@ -1358,7 +1358,7 @@ public struct Console public string ToString(string Signature) { - var tx = new List(); + List tx = new(); tx.Clear(); tx.Add(string.Format("<{0}>", Signature)); tx.Add(string.Format("*Terminal_{0}_Enabled= {1}", Signature, Enabled)); @@ -1761,7 +1761,7 @@ public void FromListOfString(IEnumerable Lines) // As Cursor public string ToString(string Signature) { - var tx = new List(); + List tx = new(); tx.Clear(); tx.Add(string.Format("<{0}>", Signature)); tx.Add(string.Format("*Cursor_{0}_ArrowStyle= {1}", Signature, (int)ArrowStyle)); @@ -2070,12 +2070,12 @@ public string ToString(string Signature) SmCaptionWidth = 22, DesktopIconSize = 48, ShellIconSize = 32, - CaptionFont = new Font("Segoe UI", 9f, FontStyle.Regular), - IconFont = new Font("Segoe UI", 9f, FontStyle.Regular), - MenuFont = new Font("Segoe UI", 9f, FontStyle.Regular), - MessageFont = new Font("Segoe UI", 9f, FontStyle.Regular), - SmCaptionFont = new Font("Segoe UI", 9f, FontStyle.Regular), - StatusFont = new Font("Segoe UI", 9f, FontStyle.Regular), + CaptionFont = new("Segoe UI", 9f, FontStyle.Regular), + IconFont = new("Segoe UI", 9f, FontStyle.Regular), + MenuFont = new("Segoe UI", 9f, FontStyle.Regular), + MessageFont = new("Segoe UI", 9f, FontStyle.Regular), + SmCaptionFont = new("Segoe UI", 9f, FontStyle.Regular), + StatusFont = new("Segoe UI", 9f, FontStyle.Regular), FontSubstitute_MSShellDlg = "Microsoft Sans Serif", FontSubstitute_MSShellDlg2 = "Tahoma", FontSubstitute_SegoeUI = string.Empty @@ -2191,9 +2191,9 @@ public string ToString(string Signature) W10_1909_WindowAlpha = 255 }; - public WinTerminal_Converter Terminal = new WinTerminal_Converter(string.Empty, WinTerminal_Converter.Mode.Empty); + public WinTerminal_Converter Terminal = new(string.Empty, WinTerminal_Converter.Mode.Empty); - public WinTerminal_Converter TerminalPreview = new WinTerminal_Converter(string.Empty, WinTerminal_Converter.Mode.Empty); + public WinTerminal_Converter TerminalPreview = new(string.Empty, WinTerminal_Converter.Mode.Empty); #region Cursors public bool Cursor_Enabled = false; @@ -2889,7 +2889,7 @@ public void Save(WP_Format Format, string File, bool Compress, bool OldWPTH1069) public void LoadFromOldWPTHFile(string File) { - var txt = new List(); + List txt = new(); txt.Clear(); txt = (List)Decompress(File); @@ -3124,8 +3124,8 @@ public void LoadFromOldWPTHFile(string File) string str_stable, str_preview; str_stable = string.Join("\r\n", txt.Where(l => l.StartsWith("terminal.", StringComparison.OrdinalIgnoreCase))); str_preview = string.Join("\r\n", txt.Where(l => l.StartsWith("terminalpreview.", StringComparison.OrdinalIgnoreCase))); - Terminal = new WinTerminal_Converter(str_stable, WinTerminal_Converter.Mode.WinPaletterFile, WinTerminal_Converter.Version.Stable); - TerminalPreview = new WinTerminal_Converter(str_preview, WinTerminal_Converter.Mode.WinPaletterFile, WinTerminal_Converter.Version.Preview); + Terminal = new(str_stable, WinTerminal_Converter.Mode.WinPaletterFile, WinTerminal_Converter.Version.Stable); + TerminalPreview = new(str_preview, WinTerminal_Converter.Mode.WinPaletterFile, WinTerminal_Converter.Version.Preview); WallpaperTone_W11.FromListOfString(txt.Where(l => l.StartsWith("*WallpaperTone_Win11_", StringComparison.OrdinalIgnoreCase))); WallpaperTone_W10.FromListOfString(txt.Where(l => l.StartsWith("*WallpaperTone_Win10_", StringComparison.OrdinalIgnoreCase))); @@ -3184,7 +3184,7 @@ public void LoadFromOldWPTHFile(string File) public string ToString(bool OldWPTH1069) { - var tx = new List(); + List tx = new(); tx.Clear(); tx.Add(""); tx.Add("*Created from App Version= " + Info.AppVersion); @@ -3318,7 +3318,7 @@ public IEnumerable Decompress(string File) private JObject DeserializeProps(Type StructureType, object Structure) { - var j = new JObject(); + JObject j = new(); j.RemoveAll(); @@ -3343,13 +3343,13 @@ private JObject DeserializeProps(Type StructureType, object Structure) public string ToJSON() { - var JSON_Overall = new JObject(); + JObject JSON_Overall = new(); JSON_Overall.RemoveAll(); foreach (FieldInfo field in GetType().GetFields(bindingFlags)) { - var type = field.FieldType; + Type type = field.FieldType; if (IsStructure(type)) { diff --git a/WinPaletter/Converter/Converter_Form.cs b/WinPaletter/Converter/Converter_Form.cs index 13ed8184..17992886 100644 --- a/WinPaletter/Converter/Converter_Form.cs +++ b/WinPaletter/Converter/Converter_Form.cs @@ -9,7 +9,7 @@ namespace WinPaletter public partial class Converter_Form { - private readonly Converter _Convert = new Converter(); + private readonly Converter _Convert = new(); public Converter_Form() { diff --git a/WinPaletter/Converter/Converter_WT.cs b/WinPaletter/Converter/Converter_WT.cs index b7d25eaf..cbbfdcde 100644 --- a/WinPaletter/Converter/Converter_WT.cs +++ b/WinPaletter/Converter/Converter_WT.cs @@ -33,9 +33,9 @@ public WinTerminal_Converter(string str, Mode Mode, Version Version = Version.St case Mode.WinPaletterFile: { - var Collected = new List(); + List Collected = new(); + List lst = new(); - var lst = new List(); lst.Clear(); lst = str.CList(); @@ -69,10 +69,10 @@ public WinTerminal_Converter(string str, Mode Mode, Version Version = Version.St } - var Defs = new List(); - List CollectedColors = new List(), EnumColors = new List(); - List CollectedProfiles = new List(), EnumProfiles = new List(); - List CollectedThemes = new List(), EnumThemes = new List(); + List Defs = new(); + List CollectedColors = new(), EnumColors = new(); + List CollectedProfiles = new(), EnumProfiles = new(); + List CollectedThemes = new(), EnumThemes = new(); Defs.Clear(); @@ -611,7 +611,7 @@ public string Save(string File, Mode Mode, Version Version = Version.Stable) } - var S = new List(); + List S = new(); S.Clear(); try @@ -757,7 +757,7 @@ public string Save(string File, Mode Mode, Version Version = Version.Stable) public string ToString(string Signature, Version Edition) { - var tx = new List(); + List tx = new(); tx.Clear(); tx.Add(string.Format("<{0}>", Signature)); tx.Add(Save(string.Empty, Mode.WinPaletterFile, Edition)); diff --git a/WinPaletter/CursorsStudio/CursorsCustomizer.cs b/WinPaletter/CursorsStudio/CursorsCustomizer.cs index e278964d..16f6e526 100644 --- a/WinPaletter/CursorsStudio/CursorsCustomizer.cs +++ b/WinPaletter/CursorsStudio/CursorsCustomizer.cs @@ -38,8 +38,6 @@ public enum GradientMode Circle } - private static TextureBrush Noise = new(Properties.Resources.GaussianBlurOpaque.Fade(0.2d)); - public static GradientMode ReturnGradientModeFromString(string String) { if (String.Trim().ToLower() == "vertical") @@ -148,23 +146,23 @@ public static Brush ReturnGradience(Rectangle Rectangle, Color Color1, Color Col public static Bitmap Draw(CursorOptions CursorOptions) { - var b = new Bitmap((int)Math.Round(32f * CursorOptions.Scale), (int)Math.Round(32f * CursorOptions.Scale), PixelFormat.Format32bppPArgb); - var G = Graphics.FromImage(b); + Bitmap b = new((int)Math.Round(32f * CursorOptions.Scale), (int)Math.Round(32f * CursorOptions.Scale), PixelFormat.Format32bppPArgb); + Graphics G = Graphics.FromImage(b); //G.SmoothingMode = (CursorOptions.ArrowStyle == ArrowStyle.Classic || CursorOptions.CircleStyle == CircleStyle.Classic) ? SmoothingMode.HighSpeed : SmoothingMode.HighQuality; - G.SmoothingMode = SmoothingMode.HighQuality; + G.SmoothingMode = SmoothingMode.AntiAlias; G.Clear(Color.Transparent); #region Rectangles Helpers - var _Arrow = new Rectangle(0, 0, b.Width, b.Height); - var _Help = new Rectangle(11, 6, b.Width, b.Height); - var _Busy = new Rectangle(0, 0, 22, 22); - var _CurRect = new Rectangle(0, 8, b.Width, b.Height); - var _LoadRect = new Rectangle(6, 0, (int)Math.Round(22f * CursorOptions.Scale), (int)Math.Round(22f * CursorOptions.Scale)); - var _Pin = new Rectangle(15, 11, b.Width, b.Height); - var _Person = new Rectangle(19, 17, b.Width, b.Height); + Rectangle _Arrow = new(0, 0, b.Width, b.Height); + Rectangle _Help = new(11, 6, b.Width, b.Height); + Rectangle _Busy = new(0, 0, 22, 22); + Rectangle _CurRect = new(0, 8, b.Width, b.Height); + Rectangle _LoadRect = new(6, 0, (int)Math.Round(22f * CursorOptions.Scale), (int)Math.Round(22f * CursorOptions.Scale)); + Rectangle _Pin = new(15, 11, b.Width, b.Height); + Rectangle _Person = new(19, 17, b.Width, b.Height); #endregion if (!CursorOptions.UseFromFile || !System.IO.File.Exists(CursorOptions.File)) @@ -173,7 +171,6 @@ public static Bitmap Draw(CursorOptions CursorOptions) { case CursorType.Arrow: { - #region Arrow Brush BB, BL; if (CursorOptions.PrimaryColorGradient) { @@ -192,30 +189,39 @@ public static Bitmap Draw(CursorOptions CursorOptions) BL = new SolidBrush(CursorOptions.SecondaryColor1); } - var PL = new Pen(BL, CursorOptions.LineThickness); + using (GraphicsPath cursorPath = DefaultCursor(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)) + { + G.FillPath(BB, cursorPath); + + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, cursorPath); + } + } - G.FillPath(BB, DefaultCursor(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); + using (Pen PL = new(BL, CursorOptions.LineThickness)) { G.DrawPath(PL, cursorPath); } - if (CursorOptions.PrimaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, DefaultCursor(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); + if (CursorOptions.SecondaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, cursorPath); + } + } } - G.DrawPath(PL, DefaultCursor(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); + BB.Dispose(); + BL.Dispose(); - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), DefaultCursor(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); - } break; } - #endregion + case CursorType.Help: { - #region Help Brush BB, BL; if (CursorOptions.PrimaryColorGradient) { @@ -233,7 +239,6 @@ public static Bitmap Draw(CursorOptions CursorOptions) { BL = new SolidBrush(CursorOptions.SecondaryColor1); } - var PL = new Pen(BL, CursorOptions.LineThickness); Brush BB_H, BL_H; if (CursorOptions.PrimaryColorGradient) @@ -252,53 +257,73 @@ public static Bitmap Draw(CursorOptions CursorOptions) { BL_H = new SolidBrush(CursorOptions.SecondaryColor1); } - var PL_H = new Pen(BL_H, CursorOptions.LineThickness); - - G.FillPath(BB, DefaultCursor(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); - - if (CursorOptions.PrimaryNoise) + using (GraphicsPath cursorPath = DefaultCursor(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, DefaultCursor(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); - } + G.FillPath(BB, cursorPath); - G.DrawPath(PL, DefaultCursor(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, cursorPath); + } + } - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), DefaultCursor(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); - } + using (Pen PL = new(BL, CursorOptions.LineThickness)) { G.DrawPath(PL, cursorPath); } - G.FillPath(BB_H, Help(_Help, CursorOptions.ArrowStyle, CursorOptions.Scale)); + if (CursorOptions.SecondaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, cursorPath); + } + } + } - if (CursorOptions.PrimaryNoise) + using (GraphicsPath helpPath = Help(_Help, CursorOptions.ArrowStyle, CursorOptions.Scale)) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, Help(_Help, CursorOptions.ArrowStyle, CursorOptions.Scale)); - } + G.FillPath(BB_H, helpPath); - if (CursorOptions.ArrowStyle != ArrowStyle.Classic) - G.DrawPath(PL_H, Help(_Help, CursorOptions.ArrowStyle, CursorOptions.Scale)); + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, helpPath); + } + } - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), Help(_Help, CursorOptions.ArrowStyle, CursorOptions.Scale)); + if (CursorOptions.ArrowStyle != ArrowStyle.Classic) + using (Pen PL_H = new(BL_H, CursorOptions.LineThickness)) + { + G.DrawPath(PL_H, helpPath); + } + + if (CursorOptions.SecondaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, helpPath); + } + } } + BB.Dispose(); + BL.Dispose(); + BB_H.Dispose(); + BL_H.Dispose(); + break; } - #endregion case CursorType.Busy: { - #region Busy Brush BC, BH; if (CursorOptions.LoadingCircleBackGradient) { - BC = ReturnGradience(_Arrow, CursorOptions.LoadingCircleBack1, CursorOptions.LoadingCircleBack2, CursorOptions.LoadingCircleBackGradientMode, CursorOptions._Angle); + BC = ReturnGradience(_Arrow, CursorOptions.LoadingCircleBack1, CursorOptions.LoadingCircleBack2, CursorOptions.LoadingCircleBackGradientMode, CursorOptions.Angle); } else { @@ -306,67 +331,156 @@ public static Bitmap Draw(CursorOptions CursorOptions) } if (CursorOptions.LoadingCircleHotGradient) { - BH = ReturnGradience(_Arrow, CursorOptions.LoadingCircleHot1, CursorOptions.LoadingCircleHot2, CursorOptions.LoadingCircleHotGradientMode, CursorOptions._Angle); + BH = ReturnGradience(_Arrow, CursorOptions.LoadingCircleHot1, CursorOptions.LoadingCircleHot2, CursorOptions.LoadingCircleHotGradientMode, CursorOptions.Angle); } else { BH = new SolidBrush(CursorOptions.LoadingCircleHot1); } - if (CursorOptions.CircleStyle == CircleStyle.Classic) + using (GraphicsPath busyPath = Busy(_Busy, CursorOptions.Angle, CursorOptions.CircleStyle, CursorOptions.Scale)) + using (GraphicsPath busyLoaderPath = BusyLoader(_Busy, CursorOptions.Angle, CursorOptions.CircleStyle, CursorOptions.Scale)) { - var PL = new Pen(BH, CursorOptions.LineThickness); - - G.FillPath(BC, Busy(_Busy, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); - G.DrawPath(PL, BusyLoader(_Busy, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); - G.DrawPath(PL, Busy(_Busy, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); - - if (CursorOptions.LoadingCircleBackNoise) + if (CursorOptions.CircleStyle == CircleStyle.Classic) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleBackNoiseOpacity)); - G.FillPath(Noise, Busy(_Busy, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); + using (Pen PL = new(BH, CursorOptions.LineThickness)) + { + G.FillPath(BC, busyPath); + G.DrawPath(PL, busyLoaderPath); + G.DrawPath(PL, busyPath); + } + + if (CursorOptions.LoadingCircleBackNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleBackNoiseOpacity))) + { + G.FillPath(noise, busyPath); + } + } + + if (CursorOptions.LoadingCircleHotNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleHotNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, busyLoaderPath); + G.DrawPath(noisePen, busyPath); + } + } } - if (CursorOptions.LoadingCircleHotNoise) + else if (CursorOptions.CircleStyle == CircleStyle.Aero) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleHotNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), BusyLoader(_Busy, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), Busy(_Busy, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); + G.FillPath(BC, busyPath); + + if (CursorOptions.LoadingCircleBackNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleBackNoiseOpacity))) + { + G.FillPath(noise, busyPath); + } + } + + G.FillPath(BH, busyLoaderPath); + + if (CursorOptions.LoadingCircleHotNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleHotNoiseOpacity))) + { + G.FillPath(noise, busyLoaderPath); + } + } } - } - - else - { - G.FillPath(BC, Busy(_Busy, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); - if (CursorOptions.LoadingCircleBackNoise) + else if (CursorOptions.CircleStyle == CircleStyle.Modern) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleBackNoiseOpacity)); - G.FillPath(Noise, Busy(_Busy, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); + float PenWidth = 0.17f * Math.Max(_Arrow.Width, _Arrow.Height); + float _percent = 0.3f; + + Rectangle CircleRect = new(_Arrow.X + (int)PenWidth - 2, _Arrow.Y + (int)PenWidth - 2, _Arrow.Width - (int)PenWidth * 2 - 4, _Arrow.Height - (int)PenWidth * 2 - 4); + + using (Pen pen = new(BH, PenWidth)) + using (Pen pen2 = new(BC, PenWidth)) + { + pen.StartCap = LineCap.Round; + pen.EndCap = pen.StartCap; + + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleBackNoiseOpacity))) + using (Pen noisePen = new(noise, PenWidth)) + { + G.DrawArc(pen2, CircleRect, -90, 360); + + if (CursorOptions.LoadingCircleBackNoise) + { + G.DrawArc(noisePen, CircleRect, -90, 360); + } + } + + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleHotNoiseOpacity))) + using (Pen noisePen = new(noise, PenWidth)) + { + G.DrawArc(pen, CircleRect, CursorOptions.Angle, (int)Math.Round((double)(_percent * 360))); + + if (CursorOptions.LoadingCircleHotNoise) + { + G.DrawArc(noisePen, CircleRect, CursorOptions.Angle, (int)Math.Round((double)(_percent * 360))); + } + } + } } - G.FillPath(BH, BusyLoader(_Busy, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); - - if (CursorOptions.LoadingCircleHotNoise) + else if (CursorOptions.CircleStyle == CircleStyle.Fluid) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleHotNoiseOpacity)); - G.FillPath(Noise, BusyLoader(_Busy, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); + float PenWidth = 0.3f * Math.Max(_Arrow.Width, _Arrow.Height); + float PenWidth2 = 0.17f * Math.Max(_Arrow.Width, _Arrow.Height); + + float _percent = 0.2f; + + Rectangle CircleRect = new(_Arrow.X + (int)PenWidth - 2, _Arrow.Y + (int)PenWidth - 2, _Arrow.Width - (int)PenWidth * 2 - 4, _Arrow.Height - (int)PenWidth * 2 - 4); + + using (Pen pen = new(BH, PenWidth)) + using (Pen pen2 = new(BC, PenWidth)) + { + pen.StartCap = LineCap.Round; + pen.EndCap = pen.StartCap; + + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleBackNoiseOpacity))) + using (Pen noisePen = new(noise, PenWidth)) + { + G.DrawArc(pen2, CircleRect, -90, 360); + + if (CursorOptions.LoadingCircleBackNoise) + { + G.DrawArc(noisePen, CircleRect, -90, 360); + } + } + + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleHotNoiseOpacity))) + using (Pen noisePen = new(noise, PenWidth)) + { + G.DrawArc(pen, CircleRect, CursorOptions.Angle, (int)Math.Round((double)(_percent * 360))); + + if (CursorOptions.LoadingCircleHotNoise) + { + G.DrawArc(noisePen, CircleRect, CursorOptions.Angle, (int)Math.Round((double)(_percent * 360))); + } + } + } } - } + BC.Dispose(); + BH.Dispose(); + break; } - - #endregion case CursorType.AppLoading: { - #region AppLoading Brush BB, BL; if (CursorOptions.PrimaryColorGradient) { - BB = ReturnGradience(_Arrow, CursorOptions.PrimaryColor1, CursorOptions.PrimaryColor2, CursorOptions.PrimaryColorGradientMode, CursorOptions._Angle); + BB = ReturnGradience(_Arrow, CursorOptions.PrimaryColor1, CursorOptions.PrimaryColor2, CursorOptions.PrimaryColorGradientMode, CursorOptions.Angle); } else { @@ -374,18 +488,17 @@ public static Bitmap Draw(CursorOptions CursorOptions) } if (CursorOptions.SecondaryColorGradient) { - BL = ReturnGradience(_Arrow, CursorOptions.SecondaryColor1, CursorOptions.SecondaryColor2, CursorOptions.SecondaryColorGradientMode, CursorOptions._Angle); + BL = ReturnGradience(_Arrow, CursorOptions.SecondaryColor1, CursorOptions.SecondaryColor2, CursorOptions.SecondaryColorGradientMode, CursorOptions.Angle); } else { BL = new SolidBrush(CursorOptions.SecondaryColor1); } - var PL = new Pen(BL, CursorOptions.LineThickness); Brush BC, BH; if (CursorOptions.LoadingCircleBackGradient) { - BC = ReturnGradience(_LoadRect, CursorOptions.LoadingCircleBack1, CursorOptions.LoadingCircleBack2, CursorOptions.LoadingCircleBackGradientMode, CursorOptions._Angle); + BC = ReturnGradience(_LoadRect, CursorOptions.LoadingCircleBack1, CursorOptions.LoadingCircleBack2, CursorOptions.LoadingCircleBackGradientMode, CursorOptions.Angle); } else { @@ -393,77 +506,184 @@ public static Bitmap Draw(CursorOptions CursorOptions) } if (CursorOptions.LoadingCircleHotGradient) { - BH = ReturnGradience(_LoadRect, CursorOptions.LoadingCircleHot1, CursorOptions.LoadingCircleHot2, CursorOptions.LoadingCircleHotGradientMode, CursorOptions._Angle); + BH = ReturnGradience(_LoadRect, CursorOptions.LoadingCircleHot1, CursorOptions.LoadingCircleHot2, CursorOptions.LoadingCircleHotGradientMode, CursorOptions.Angle); } else { BH = new SolidBrush(CursorOptions.LoadingCircleHot1); } - G.FillPath(BB, DefaultCursor(_CurRect, CursorOptions.ArrowStyle, CursorOptions.Scale)); - - if (CursorOptions.PrimaryNoise) + using (GraphicsPath cursorPath = DefaultCursor(_CurRect, CursorOptions.ArrowStyle, CursorOptions.Scale)) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, DefaultCursor(_CurRect, CursorOptions.ArrowStyle, CursorOptions.Scale)); - } + G.FillPath(BB, cursorPath); - G.DrawPath(PL, DefaultCursor(_CurRect, CursorOptions.ArrowStyle, CursorOptions.Scale)); - - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), DefaultCursor(_CurRect, CursorOptions.ArrowStyle, CursorOptions.Scale)); - } - - if (CursorOptions.CircleStyle == CircleStyle.Classic) - { - var PLx = new Pen(BH, CursorOptions.LineThickness); + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, cursorPath); + } + } - G.FillPath(BC, AppLoading(_Busy, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); - G.DrawPath(PLx, AppLoaderCircle(_Busy, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); - G.DrawPath(PLx, AppLoading(_Busy, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); + using (Pen PL = new(BL, CursorOptions.LineThickness)) { G.DrawPath(PL, cursorPath); } - if (CursorOptions.LoadingCircleBackNoise) + if (CursorOptions.SecondaryNoise) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleBackNoiseOpacity)); - G.FillPath(Noise, AppLoading(_Busy, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, cursorPath); + } } - if (CursorOptions.LoadingCircleHotNoise) + if (CursorOptions.CircleStyle == CircleStyle.Classic) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleHotNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), AppLoaderCircle(_Busy, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), AppLoading(_Busy, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); + using (GraphicsPath appLoadingPath = AppLoading(_Busy, CursorOptions.Angle, CursorOptions.CircleStyle, CursorOptions.Scale)) + using (GraphicsPath appLoadingCirclePath = AppLoaderCircle(_Busy, CursorOptions.Angle, CursorOptions.CircleStyle, CursorOptions.Scale)) + { + using (Pen PLx = new(BH, CursorOptions.LineThickness)) + { + G.FillPath(BC, appLoadingPath); + G.DrawPath(PLx, appLoadingCirclePath); + G.DrawPath(PLx, appLoadingPath); + } + + if (CursorOptions.LoadingCircleBackNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleBackNoiseOpacity))) + { + G.FillPath(noise, appLoadingPath); + } + } + + if (CursorOptions.LoadingCircleHotNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleHotNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, appLoadingCirclePath); + G.DrawPath(noisePen, appLoadingPath); + } + } + } } - } - - else - { - G.FillPath(BC, AppLoading(_LoadRect, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); - if (CursorOptions.LoadingCircleBackNoise) + else if (CursorOptions.CircleStyle == CircleStyle.Aero) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleBackNoiseOpacity)); - G.FillPath(Noise, AppLoading(_LoadRect, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); + using (GraphicsPath appLoadingPath = AppLoading(_LoadRect, CursorOptions.Angle, CursorOptions.CircleStyle, CursorOptions.Scale)) + using (GraphicsPath appLoadingCirclePath = AppLoaderCircle(_LoadRect, CursorOptions.Angle, CursorOptions.CircleStyle, CursorOptions.Scale)) + { + G.FillPath(BC, appLoadingPath); + + if (CursorOptions.LoadingCircleBackNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleBackNoiseOpacity))) + { + G.FillPath(noise, appLoadingPath); + } + } + + G.FillPath(BH, appLoadingCirclePath); + + if (CursorOptions.LoadingCircleHotNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleHotNoiseOpacity))) + { + G.FillPath(noise, appLoadingCirclePath); + } + } + } } - G.FillPath(BH, AppLoaderCircle(_LoadRect, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); + else if (CursorOptions.CircleStyle == CircleStyle.Modern) + { + float PenWidth = 0.2f * Math.Max(_LoadRect.Width, _LoadRect.Height); + float _percent = 0.3f; + + Rectangle CircleRect = new(_LoadRect.X + (int)PenWidth, _LoadRect.Y + (int)PenWidth, _LoadRect.Width - (int)PenWidth * 2 - 2, _LoadRect.Height - (int)PenWidth * 2 - 2); + + using (Pen pen = new(BH, PenWidth)) + using (Pen pen2 = new(BC, PenWidth)) + { + pen.StartCap = LineCap.Round; + pen.EndCap = pen.StartCap; + + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleBackNoiseOpacity))) + using (Pen noisePen = new(noise, PenWidth)) + { + G.DrawArc(pen2, CircleRect, -90, 360); + + if (CursorOptions.LoadingCircleBackNoise) + { + G.DrawArc(noisePen, CircleRect, -90, 360); + } + } + + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleHotNoiseOpacity))) + using (Pen noisePen = new(noise, PenWidth)) + { + G.DrawArc(pen, CircleRect, CursorOptions.Angle, (int)Math.Round((double)(_percent * 360))); + + if (CursorOptions.LoadingCircleHotNoise) + { + G.DrawArc(noisePen, CircleRect, CursorOptions.Angle, (int)Math.Round((double)(_percent * 360))); + } + } + } + } - if (CursorOptions.LoadingCircleHotNoise) + else if (CursorOptions.CircleStyle == CircleStyle.Fluid) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleHotNoiseOpacity)); - G.FillPath(Noise, AppLoaderCircle(_LoadRect, CursorOptions._Angle, CursorOptions.CircleStyle, CursorOptions.Scale)); + Rectangle _rect = new(_Arrow.Right - _LoadRect.Width, _LoadRect.Y, _LoadRect.Width, _LoadRect.Height); + + float PenWidth = 0.32f * Math.Max(_rect.Width, _rect.Height); + float _percent = 0.2f; + + Rectangle CircleRect = new(_LoadRect.X + (int)PenWidth, _LoadRect.Y + (int)PenWidth - 2, _LoadRect.Width - (int)PenWidth * 2 - 1, _LoadRect.Height - (int)PenWidth * 2 - 1); + + PenWidth = 0.35f * Math.Max(_rect.Width, _rect.Height); + + using (Pen pen = new(BH, PenWidth)) + using (Pen pen2 = new(BC, PenWidth)) + { + pen.StartCap = LineCap.Round; + pen.EndCap = pen.StartCap; + + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleBackNoiseOpacity))) + using (Pen noisePen = new(noise, PenWidth)) + { + G.DrawArc(pen2, CircleRect, -90, 360); + + if (CursorOptions.LoadingCircleBackNoise) + { + G.DrawArc(noisePen, CircleRect, -90, 360); + } + } + + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.LoadingCircleHotNoiseOpacity))) + using (Pen noisePen = new(noise, PenWidth)) + { + G.DrawArc(pen, CircleRect, CursorOptions.Angle, (int)Math.Round((double)(_percent * 360))); + + if (CursorOptions.LoadingCircleHotNoise) + { + G.DrawArc(noisePen, CircleRect, CursorOptions.Angle, (int)Math.Round((double)(_percent * 360))); + } + } + } } } + BB.Dispose(); + BL.Dispose(); + BC.Dispose(); + BH.Dispose(); + break; } - #endregion case CursorType.None: { - #region None Brush BB, BL; if (CursorOptions.PrimaryColorGradient) { @@ -481,31 +701,40 @@ public static Bitmap Draw(CursorOptions CursorOptions) { BL = new SolidBrush(CursorOptions.SecondaryColor1); } - var PL = new Pen(BL, CursorOptions.LineThickness); + using (GraphicsPath nonePath = None(_Arrow, CursorOptions.Scale)) + using (GraphicsPath noneBackgroundPath = NoneBackground(_Arrow, CursorOptions.Scale)) + { + G.FillPath(BB, noneBackgroundPath); + + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, noneBackgroundPath); + } + } - G.FillPath(BB, NoneBackground(_Arrow, CursorOptions.Scale)); + G.FillPath(BL, nonePath); - if (CursorOptions.PrimaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, NoneBackground(_Arrow, CursorOptions.Scale)); + if (CursorOptions.SecondaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + { + G.FillPath(noise, nonePath); + } + } } - G.FillPath(BL, None(_Arrow, CursorOptions.Scale)); + BB.Dispose(); + BL.Dispose(); - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.FillPath(Noise, None(_Arrow, CursorOptions.Scale)); - } break; } - #endregion + case CursorType.Move: { - #region Move Brush BB, BL; if (CursorOptions.PrimaryColorGradient) { @@ -523,30 +752,39 @@ public static Bitmap Draw(CursorOptions CursorOptions) { BL = new SolidBrush(CursorOptions.SecondaryColor1); } - var PL = new Pen(BL, CursorOptions.LineThickness); - - G.FillPath(BB, Move(_Arrow, CursorOptions.Scale)); - if (CursorOptions.PrimaryNoise) + using (GraphicsPath movePath = Move(_Arrow, CursorOptions.Scale)) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, Move(_Arrow, CursorOptions.Scale)); - } + G.FillPath(BB, movePath); - G.DrawPath(PL, Move(_Arrow, CursorOptions.Scale)); + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, movePath); + } + } - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), Move(_Arrow, CursorOptions.Scale)); + using (Pen PL = new(BL, CursorOptions.LineThickness)) { G.DrawPath(PL, movePath); } + + if (CursorOptions.SecondaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, movePath); + } + } } + BB.Dispose(); + BL.Dispose(); + break; } - #endregion + case CursorType.Up: { - #region Up Brush BB, BL; if (CursorOptions.PrimaryColorGradient) { @@ -564,30 +802,39 @@ public static Bitmap Draw(CursorOptions CursorOptions) { BL = new SolidBrush(CursorOptions.SecondaryColor1); } - var PL = new Pen(BL, CursorOptions.LineThickness); - G.FillPath(BB, Up(_Arrow, CursorOptions.Scale)); - - if (CursorOptions.PrimaryNoise) + using (GraphicsPath upPath = Up(_Arrow, CursorOptions.Scale)) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, Up(_Arrow, CursorOptions.Scale)); - } + G.FillPath(BB, upPath); - G.DrawPath(PL, Up(_Arrow, CursorOptions.Scale)); + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, upPath); + } + } - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), Up(_Arrow, CursorOptions.Scale)); + using (Pen PL = new(BL, CursorOptions.LineThickness)) { G.DrawPath(PL, upPath); } + + if (CursorOptions.SecondaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, upPath); + } + } } + BB.Dispose(); + BL.Dispose(); + break; } - #endregion + case CursorType.NS: { - #region NS Brush BB, BL; if (CursorOptions.PrimaryColorGradient) { @@ -605,30 +852,39 @@ public static Bitmap Draw(CursorOptions CursorOptions) { BL = new SolidBrush(CursorOptions.SecondaryColor1); } - var PL = new Pen(BL, CursorOptions.LineThickness); - - G.FillPath(BB, NS(_Arrow, CursorOptions.Scale)); - if (CursorOptions.PrimaryNoise) + using (GraphicsPath nsPath = NS(_Arrow, CursorOptions.Scale)) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, NS(_Arrow, CursorOptions.Scale)); - } + G.FillPath(BB, nsPath); - G.DrawPath(PL, NS(_Arrow, CursorOptions.Scale)); + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, nsPath); + } + } - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), NS(_Arrow, CursorOptions.Scale)); + using (Pen PL = new(BL, CursorOptions.LineThickness)) { G.DrawPath(PL, nsPath); } + + if (CursorOptions.SecondaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, nsPath); + } + } } + BB.Dispose(); + BL.Dispose(); + break; } - #endregion + case CursorType.EW: { - #region EW Brush BB, BL; if (CursorOptions.PrimaryColorGradient) { @@ -646,30 +902,39 @@ public static Bitmap Draw(CursorOptions CursorOptions) { BL = new SolidBrush(CursorOptions.SecondaryColor1); } - var PL = new Pen(BL, CursorOptions.LineThickness); - G.FillPath(BB, EW(_Arrow, CursorOptions.Scale)); - - if (CursorOptions.PrimaryNoise) + using (GraphicsPath ewPath = EW(_Arrow, CursorOptions.Scale)) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, EW(_Arrow, CursorOptions.Scale)); - } + G.FillPath(BB, ewPath); - G.DrawPath(PL, EW(_Arrow, CursorOptions.Scale)); + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, ewPath); + } + } - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), EW(_Arrow, CursorOptions.Scale)); + using (Pen PL = new(BL, CursorOptions.LineThickness)) { G.DrawPath(PL, ewPath); } + + if (CursorOptions.SecondaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, ewPath); + } + } } + BB.Dispose(); + BL.Dispose(); + break; } - #endregion + case CursorType.NESW: { - #region NESW Brush BB, BL; if (CursorOptions.PrimaryColorGradient) { @@ -687,31 +952,39 @@ public static Bitmap Draw(CursorOptions CursorOptions) { BL = new SolidBrush(CursorOptions.SecondaryColor1); } - var PL = new Pen(BL, CursorOptions.LineThickness); - - G.FillPath(BB, NESW(_Arrow, CursorOptions.Scale)); - if (CursorOptions.PrimaryNoise) + using (GraphicsPath neswPath = NESW(_Arrow, CursorOptions.Scale)) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, NESW(_Arrow, CursorOptions.Scale)); - } + G.FillPath(BB, neswPath); + + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, neswPath); + } + } - G.DrawPath(PL, NESW(_Arrow, CursorOptions.Scale)); + using (Pen PL = new(BL, CursorOptions.LineThickness)) { G.DrawPath(PL, neswPath); } - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), NESW(_Arrow, CursorOptions.Scale)); + if (CursorOptions.SecondaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, neswPath); + } + } } + BB.Dispose(); + BL.Dispose(); + break; } - #endregion case CursorType.NWSE: { - #region NWSE Brush BB, BL; if (CursorOptions.PrimaryColorGradient) { @@ -729,30 +1002,39 @@ public static Bitmap Draw(CursorOptions CursorOptions) { BL = new SolidBrush(CursorOptions.SecondaryColor1); } - var PL = new Pen(BL, CursorOptions.LineThickness); - - G.FillPath(BB, NWSE(_Arrow, CursorOptions.Scale)); - if (CursorOptions.PrimaryNoise) + using (GraphicsPath nwsePath = NWSE(_Arrow, CursorOptions.Scale)) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, NWSE(_Arrow, CursorOptions.Scale)); - } + G.FillPath(BB, nwsePath); - G.DrawPath(PL, NWSE(_Arrow, CursorOptions.Scale)); + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, nwsePath); + } + } - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), NWSE(_Arrow, CursorOptions.Scale)); + using (Pen PL = new(BL, CursorOptions.LineThickness)) { G.DrawPath(PL, nwsePath); } + + if (CursorOptions.SecondaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, nwsePath); + } + } } + BB.Dispose(); + BL.Dispose(); + break; } - #endregion + case CursorType.Pen: { - #region Pen Brush BB, BL; if (CursorOptions.PrimaryColorGradient) { @@ -770,30 +1052,40 @@ public static Bitmap Draw(CursorOptions CursorOptions) { BL = new SolidBrush(CursorOptions.SecondaryColor1); } - var PL = new Pen(BL, CursorOptions.LineThickness); - G.FillPath(BB, PenBackground(_Arrow, CursorOptions.Scale)); - - if (CursorOptions.PrimaryNoise) + using (GraphicsPath penPath = Pen(_Arrow, CursorOptions.Scale)) + using (GraphicsPath penBackgroundPath = PenBackground(_Arrow, CursorOptions.Scale)) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, PenBackground(_Arrow, CursorOptions.Scale)); - } + G.FillPath(BB, penBackgroundPath); - G.DrawPath(PL, Pen(_Arrow, CursorOptions.Scale)); + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, penBackgroundPath); + } + } - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), Pen(_Arrow, CursorOptions.Scale)); + using (Pen PL = new(BL, CursorOptions.LineThickness)) { G.DrawPath(PL, penPath); } + + if (CursorOptions.SecondaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, penPath); + } + } } + BB.Dispose(); + BL.Dispose(); + break; } - #endregion + case CursorType.Link: { - #region Link Brush BB, BL; if (CursorOptions.PrimaryColorGradient) { @@ -811,30 +1103,36 @@ public static Bitmap Draw(CursorOptions CursorOptions) { BL = new SolidBrush(CursorOptions.SecondaryColor1); } - var PL = new Pen(BL, CursorOptions.LineThickness); - - G.FillPath(BB, Hand(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); - if (CursorOptions.PrimaryNoise) + using (GraphicsPath handPath = Hand(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, Hand(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); - } + G.FillPath(BB, handPath); + + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, handPath); + } + } - G.DrawPath(PL, Hand(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); + using (Pen PL = new(BL, CursorOptions.LineThickness)) { G.DrawPath(PL, handPath); } - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), Hand(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, handPath); + } } + BB.Dispose(); + BL.Dispose(); + break; } - #endregion + case CursorType.Pin: { - #region Pin Brush BB, BL; if (CursorOptions.PrimaryColorGradient) { @@ -852,7 +1150,6 @@ public static Bitmap Draw(CursorOptions CursorOptions) { BL = new SolidBrush(CursorOptions.SecondaryColor1); } - var PL = new Pen(BL, CursorOptions.LineThickness); Brush BB_P, BL_P; if (CursorOptions.PrimaryColorGradient) @@ -872,52 +1169,74 @@ public static Bitmap Draw(CursorOptions CursorOptions) BL_P = new SolidBrush(CursorOptions.SecondaryColor1); } - G.FillPath(BB, Hand(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); - - if (CursorOptions.PrimaryNoise) + using (Pen PL = new(BL, CursorOptions.LineThickness)) + using (GraphicsPath handPath = Hand(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)) + using (GraphicsPath pinPath = Pin(_Pin, CursorOptions.Scale)) + using (GraphicsPath pinCenterPointPath = Pin_CenterPoint(_Pin, CursorOptions.Scale)) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, Hand(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); - } + G.FillPath(BB, handPath); - G.DrawPath(PL, Hand(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, handPath); + } + } - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), Hand(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); - } + G.DrawPath(PL, handPath); - G.FillPath(BB_P, Pin(_Pin, CursorOptions.Scale)); + if (CursorOptions.SecondaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, handPath); + } + } - if (CursorOptions.PrimaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, Pin(_Pin, CursorOptions.Scale)); - } + G.FillPath(BB_P, pinPath); - G.FillPath(BL_P, Pin_CenterPoint(_Pin, CursorOptions.Scale)); + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, pinPath); + } + } - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, Pin_CenterPoint(_Pin, CursorOptions.Scale)); - } + G.FillPath(BL_P, pinCenterPointPath); - G.DrawPath(new Pen(BL_P, 2f), Pin(_Pin, CursorOptions.Scale)); + if (CursorOptions.SecondaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, pinCenterPointPath); + } + } - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), Pin(_Pin, CursorOptions.Scale)); + using (Pen P = new(BL_P, 2f)) { G.DrawPath(P, pinPath); } + + if (CursorOptions.SecondaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, pinPath); + } + } } + BB.Dispose(); + BL.Dispose(); + BB_P.Dispose(); + BL_P.Dispose(); + break; } - #endregion + case CursorType.Person: { - #region Person Brush BB, BL; if (CursorOptions.PrimaryColorGradient) { @@ -935,7 +1254,6 @@ public static Bitmap Draw(CursorOptions CursorOptions) { BL = new SolidBrush(CursorOptions.SecondaryColor1); } - var PL = new Pen(BL, CursorOptions.LineThickness); Brush BB_P, BL_P; if (CursorOptions.PrimaryColorGradient) @@ -955,44 +1273,64 @@ public static Bitmap Draw(CursorOptions CursorOptions) BL_P = new SolidBrush(CursorOptions.SecondaryColor1); } - G.FillPath(BB, Hand(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); - - if (CursorOptions.PrimaryNoise) + using (Pen PL = new(BL, CursorOptions.LineThickness)) + using (GraphicsPath handPath = Hand(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)) + using (GraphicsPath personPath = Person(_Person, CursorOptions.Scale)) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, Hand(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); - } + G.FillPath(BB, handPath); - G.DrawPath(PL, Hand(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, handPath); + } + } - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), Hand(_Arrow, CursorOptions.ArrowStyle, CursorOptions.Scale)); - } + G.DrawPath(PL, handPath); + + if (CursorOptions.SecondaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, handPath); + } + } - G.FillPath(BB_P, Person(_Person, CursorOptions.Scale)); + G.FillPath(BB_P, personPath); - if (CursorOptions.PrimaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, Person(_Person, CursorOptions.Scale)); - } + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, personPath); + } + } - G.DrawPath(new Pen(BL_P, 2f), Person(_Person, CursorOptions.Scale)); + using (Pen P = new(BL_P, 2f)) { G.DrawPath(P, personPath); } - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), Person(_Person, CursorOptions.Scale)); + if (CursorOptions.SecondaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, personPath); + } + } } + BB.Dispose(); + BL.Dispose(); + BB_P.Dispose(); + BL_P.Dispose(); + + break; } - #endregion + case CursorType.IBeam: { - #region IBeam Brush BB, BL; if (CursorOptions.PrimaryColorGradient) { @@ -1010,30 +1348,40 @@ public static Bitmap Draw(CursorOptions CursorOptions) { BL = new SolidBrush(CursorOptions.SecondaryColor1); } - var PL = new Pen(BL, CursorOptions.LineThickness); - - G.FillPath(BB, IBeam(_Arrow, CursorOptions.Scale)); - if (CursorOptions.PrimaryNoise) + using (Pen PL = new(BL, CursorOptions.LineThickness)) + using (GraphicsPath iBeamPath = IBeam(_Arrow, CursorOptions.Scale)) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, IBeam(_Arrow, CursorOptions.Scale)); - } + G.FillPath(BB, iBeamPath); - G.DrawPath(PL, IBeam(_Arrow, CursorOptions.Scale)); + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, iBeamPath); + } + } - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), IBeam(_Arrow, CursorOptions.Scale)); + G.DrawPath(PL, iBeamPath); + + if (CursorOptions.SecondaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, iBeamPath); + } + } } + BB.Dispose(); + BL.Dispose(); + break; } - #endregion + case CursorType.Cross: { - #region Cross Brush BB, BL; if (CursorOptions.PrimaryColorGradient) { @@ -1051,27 +1399,37 @@ public static Bitmap Draw(CursorOptions CursorOptions) { BL = new SolidBrush(CursorOptions.SecondaryColor1); } - var PL = new Pen(BL, CursorOptions.LineThickness); - - G.FillPath(BB, Cross(_Arrow, CursorOptions.Scale)); - if (CursorOptions.PrimaryNoise) + using (Pen PL = new(BL, CursorOptions.LineThickness)) + using (GraphicsPath crossPath = Cross(_Arrow, CursorOptions.Scale)) { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity)); - G.FillPath(Noise, Cross(_Arrow, CursorOptions.Scale)); - } + G.FillPath(BB, crossPath); - G.DrawPath(PL, Cross(_Arrow, CursorOptions.Scale)); + if (CursorOptions.PrimaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.PrimaryNoiseOpacity))) + { + G.FillPath(noise, crossPath); + } + } - if (CursorOptions.SecondaryNoise) - { - Noise = new TextureBrush(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity)); - G.DrawPath(new Pen(Noise, CursorOptions.LineThickness), Cross(_Arrow, CursorOptions.Scale)); + G.DrawPath(PL, crossPath); + + if (CursorOptions.SecondaryNoise) + { + using (TextureBrush noise = new(Properties.Resources.GaussianBlurOpaque.Fade(CursorOptions.SecondaryNoiseOpacity))) + using (Pen noisePen = new(noise, CursorOptions.LineThickness)) + { + G.DrawPath(noisePen, crossPath); + } + } } + BB.Dispose(); + BL.Dispose(); + break; } - #endregion } } @@ -1105,12 +1463,12 @@ public static Bitmap Draw(CursorOptions CursorOptions) G.Flush(); G.Save(); - var B_Final = new Bitmap(b.Width, b.Height); - var G_Final = Graphics.FromImage(B_Final); + Bitmap B_Final = new(b.Width, b.Height); + Graphics G_Final = Graphics.FromImage(B_Final); if (CursorOptions.Shadow_Enabled) { - var shadowedBMP = new Bitmap(b); + Bitmap shadowedBMP = new(b); for (int x = 0, loopTo = b.Width - 1; x <= loopTo; x++) { @@ -1145,1238 +1503,1267 @@ public enum ArrowStyle public enum CircleStyle { Aero, - Dot, - Classic + Modern, + Classic, + Fluid } public static GraphicsPath DefaultCursor(Rectangle Rectangle, ArrowStyle Style, float Scale = 1f) { - var path = new GraphicsPath(); - var R = new Rectangle(Rectangle.X, Rectangle.Y, 12, 18); - - switch (Style) + using (GraphicsPath path = new()) { - case ArrowStyle.Aero: - { - // #### Left Border - var LLine1 = new Point(R.X, R.Y); - var LLine2 = new Point(R.X, R.Y + R.Height - 2); - path.AddLine(LLine1, LLine2); - - // #### Left Down Border - var DLLine1 = LLine2 + (Size)new Point(1, 0); - var DLLine2 = new Point(DLLine1.X + 3, DLLine1.Y - 3); - path.AddLine(DLLine1, DLLine2); - - // #### Left Down Handle Border - var DLHLine1 = DLLine2; - var DLHLine2 = new Point(DLHLine1.X + 3, DLHLine1.Y + 5); - path.AddLine(DLHLine1, DLHLine2); - - // #### Down Handle Border - var DHLine1 = DLHLine2; - var DHLine2 = new Point(DHLine1.X + 2, DHLine1.Y - 1); - - // #### Right Down Handle Border - var DRHLine1 = DHLine2; - var DRHLine2 = new Point(DLHLine1.X + 3, DLHLine1.Y - 1); - path.AddLine(DRHLine1, DRHLine2); - - // #### Right Down Border - var DRLine1 = DRHLine2; - var DRLine2 = new Point(R.X + R.Width - 1, DLHLine1.Y - 1); - path.AddLine(DRLine1, DRLine2); - - // #### Right Border - var RLine1 = DRLine2 + (Size)new Point(0, -1); - var RLine2 = LLine1; - path.AddLine(RLine1, RLine2); - break; - } + Rectangle R = new(Rectangle.X, Rectangle.Y, 12, 18); - case ArrowStyle.Classic: - { - // #### Left Border - var LLine1 = new Point(R.X, R.Y); - var LLine2 = new Point(R.X, R.Y + R.Height - 2); - path.AddLine(LLine1, LLine2); - - // #### Left Down Border - var DLLine1 = LLine2 + (Size)new Point(1, -1); - var DLLine2 = new Point(DLLine1.X + 3, DLLine1.Y - 3); - path.AddLine(DLLine1, DLLine2); - - // #### Left Down Handle Border - var DLHLine1 = DLLine2; - var DLHLine2 = new Point(DLHLine1.X + 4, DLHLine1.Y + 8); - path.AddLine(DLHLine1, DLHLine2); - - // #### Down Handle Border - var DHLine1 = DLHLine2; - var DHLine2 = new Point(DHLine1.X + 2, DHLine1.Y - 1); - - // #### Right Down Handle Border - var DRHLine1 = DHLine2; - var DRHLine2 = new Point(DLHLine1.X + 3, DLHLine1.Y); - path.AddLine(DRHLine1, DRHLine2); - - // #### Right Down Border - var DRLine1 = DRHLine2 + (Size)new Point(0, -1); - var DRLine2 = new Point(R.X + R.Width - 1, DRLine1.Y); - path.AddLine(DRLine1, DRLine2); - - // #### Right Border - var RLine1 = DRLine2 + (Size)new Point(-1, -1); - var RLine2 = LLine1; - path.AddLine(RLine1, RLine2); - break; - } - - case ArrowStyle.Modern: - { - // #### Left Border - var LLine1 = new Point(R.X, R.Y); - var LLine2 = new Point(R.X, R.Y + R.Height - 2); - path.AddLine(LLine1, LLine2); - - // #### Left Down Border - var DLLine1 = LLine2 + (Size)new Point(1, 0); - var DLLine2 = new Point(DLLine1.X + 4, DLLine1.Y - 4); - path.AddLine(DLLine1, DLLine2); - - // #### Right Down Border - var DRLine1 = DLLine2; - var DRLine2 = new Point(R.X + R.Width - 1, DRLine1.Y); - path.AddLine(DRLine1, DRLine2); - - // #### Right Border - var RLine1 = DRLine2 + (Size)new Point(0, -1); - var RLine2 = LLine1; - path.AddLine(RLine1, RLine2); - break; - } + switch (Style) + { + case ArrowStyle.Aero: + { + // #### Left Border + Point LLine1 = new(R.X, R.Y); + Point LLine2 = new(R.X, R.Y + R.Height - 2); + path.AddLine(LLine1, LLine2); + + // #### Left Down Border + Point DLLine1 = LLine2 + (Size)new Point(1, 0); + Point DLLine2 = new(DLLine1.X + 3, DLLine1.Y - 3); + path.AddLine(DLLine1, DLLine2); + + // #### Left Down Handle Border + Point DLHLine1 = DLLine2; + Point DLHLine2 = new(DLHLine1.X + 3, DLHLine1.Y + 5); + path.AddLine(DLHLine1, DLHLine2); + + // #### Down Handle Border + Point DHLine1 = DLHLine2; + Point DHLine2 = new(DHLine1.X + 2, DHLine1.Y - 1); + + // #### Right Down Handle Border + Point DRHLine1 = DHLine2; + Point DRHLine2 = new(DLHLine1.X + 3, DLHLine1.Y - 1); + path.AddLine(DRHLine1, DRHLine2); + + // #### Right Down Border + Point DRLine1 = DRHLine2; + Point DRLine2 = new(R.X + R.Width - 1, DLHLine1.Y - 1); + path.AddLine(DRLine1, DRLine2); + + // #### Right Border + Point RLine1 = DRLine2 + (Size)new Point(0, -1); + Point RLine2 = LLine1; + path.AddLine(RLine1, RLine2); + break; + } - } + case ArrowStyle.Classic: + { + // #### Left Border + Point LLine1 = new(R.X, R.Y); + Point LLine2 = new(R.X, R.Y + R.Height - 2); + path.AddLine(LLine1, LLine2); + + // #### Left Down Border + Point DLLine1 = LLine2 + (Size)new Point(1, -1); + Point DLLine2 = new(DLLine1.X + 3, DLLine1.Y - 3); + path.AddLine(DLLine1, DLLine2); + + // #### Left Down Handle Border + Point DLHLine1 = DLLine2; + Point DLHLine2 = new(DLHLine1.X + 4, DLHLine1.Y + 8); + path.AddLine(DLHLine1, DLHLine2); + + // #### Down Handle Border + Point DHLine1 = DLHLine2; + Point DHLine2 = new(DHLine1.X + 2, DHLine1.Y - 1); + + // #### Right Down Handle Border + Point DRHLine1 = DHLine2; + Point DRHLine2 = new(DLHLine1.X + 3, DLHLine1.Y); + path.AddLine(DRHLine1, DRHLine2); + + // #### Right Down Border + Point DRLine1 = DRHLine2 + (Size)new Point(0, -1); + Point DRLine2 = new(R.X + R.Width - 1, DRLine1.Y); + path.AddLine(DRLine1, DRLine2); + + // #### Right Border + Point RLine1 = DRLine2 + (Size)new Point(-1, -1); + Point RLine2 = LLine1; + path.AddLine(RLine1, RLine2); + break; + } - // path.CloseFigure() + case ArrowStyle.Modern: + { + // #### Left Border + Point LLine1 = new(R.X, R.Y); + Point LLine2 = new(R.X, R.Y + R.Height - 2); + path.AddLine(LLine1, LLine2); + + // #### Left Down Border + Point DLLine1 = LLine2 + (Size)new Point(1, 0); + Point DLLine2 = new(DLLine1.X + 4, DLLine1.Y - 4); + path.AddLine(DLLine1, DLLine2); + + // #### Right Down Border + Point DRLine1 = DLLine2; + Point DRLine2 = new(R.X + R.Width - 1, DRLine1.Y); + path.AddLine(DRLine1, DRLine2); + + // #### Right Border + Point RLine1 = DRLine2 + (Size)new Point(0, -1); + Point RLine2 = LLine1; + path.AddLine(RLine1, RLine2); + break; + } + } - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); - return path; + using (Matrix m = new()) + { + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + } + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath Busy(Rectangle Rectangle, float Angle, CircleStyle Style, float Scale = 1f) { - Rectangle.Width = 22; - Rectangle.Height = 22; - var path = new GraphicsPath(); - - switch (Style) + using (GraphicsPath path = new()) + using (Matrix m = new()) { - case CircleStyle.Aero: - { - path.AddEllipse(Rectangle.X, Rectangle.Y, 22, 22); - var R = new Rectangle(Rectangle.X + 5, Rectangle.Y + 5, 12, 12); - path.AddEllipse(R); - path.CloseFigure(); - break; - } + Rectangle.Width = 22; + Rectangle.Height = 22; - case CircleStyle.Classic: - { - path.AddLine(new Point(Rectangle.X + 12, Rectangle.Y + 0), new Point(Rectangle.X + 6, Rectangle.Y + 0)); - path.AddLine(new Point(Rectangle.X + 6, Rectangle.Y + 0), new Point(Rectangle.X + 6, Rectangle.Y + 2)); - path.AddLine(new Point(Rectangle.X + 6, Rectangle.Y + 2), new Point(Rectangle.X + 12, Rectangle.Y + 2)); + switch (Style) + { + case CircleStyle.Aero: + { + path.AddEllipse(Rectangle.X, Rectangle.Y, 22, 22); + Rectangle R = new(Rectangle.X + 5, Rectangle.Y + 5, 12, 12); + path.AddEllipse(R); + path.CloseFigure(); + break; + } - path.AddLine(new Point(Rectangle.X + 7, Rectangle.Y + 2), new Point(Rectangle.X + 7, Rectangle.Y + 7)); - path.AddLine(new Point(Rectangle.X + 7, Rectangle.Y + 7), new Point(Rectangle.X + 11, Rectangle.Y + 10)); - path.AddLine(new Point(Rectangle.X + 11, Rectangle.Y + 11), new Point(Rectangle.X + 7, Rectangle.Y + 14)); - path.AddLine(new Point(Rectangle.X + 7, Rectangle.Y + 14), new Point(Rectangle.X + 7, Rectangle.Y + 19)); + case CircleStyle.Classic: + { + path.AddLine(new Point(Rectangle.X + 12, Rectangle.Y + 0), new Point(Rectangle.X + 6, Rectangle.Y + 0)); + path.AddLine(new Point(Rectangle.X + 6, Rectangle.Y + 0), new Point(Rectangle.X + 6, Rectangle.Y + 2)); + path.AddLine(new Point(Rectangle.X + 6, Rectangle.Y + 2), new Point(Rectangle.X + 12, Rectangle.Y + 2)); - path.AddLine(new Point(Rectangle.X + 12, Rectangle.Y + 19), new Point(Rectangle.X + 6, Rectangle.Y + 19)); - path.AddLine(new Point(Rectangle.X + 6, Rectangle.Y + 19), new Point(Rectangle.X + 6, Rectangle.Y + 21)); - path.AddLine(new Point(Rectangle.X + 6, Rectangle.Y + 21), new Point(Rectangle.X + 12, Rectangle.Y + 21)); + path.AddLine(new Point(Rectangle.X + 7, Rectangle.Y + 2), new Point(Rectangle.X + 7, Rectangle.Y + 7)); + path.AddLine(new Point(Rectangle.X + 7, Rectangle.Y + 7), new Point(Rectangle.X + 11, Rectangle.Y + 10)); + path.AddLine(new Point(Rectangle.X + 11, Rectangle.Y + 11), new Point(Rectangle.X + 7, Rectangle.Y + 14)); + path.AddLine(new Point(Rectangle.X + 7, Rectangle.Y + 14), new Point(Rectangle.X + 7, Rectangle.Y + 19)); - path.AddPath(MirrorRight(path), false); + path.AddLine(new Point(Rectangle.X + 12, Rectangle.Y + 19), new Point(Rectangle.X + 6, Rectangle.Y + 19)); + path.AddLine(new Point(Rectangle.X + 6, Rectangle.Y + 19), new Point(Rectangle.X + 6, Rectangle.Y + 21)); + path.AddLine(new Point(Rectangle.X + 6, Rectangle.Y + 21), new Point(Rectangle.X + 12, Rectangle.Y + 21)); - if (Angle >= 270f) - { - var m_rotate = new Matrix(); - m_rotate.RotateAt((Angle - 180f) * 3f, new Point((int)Math.Round(Rectangle.X + Rectangle.Width / 2d), (int)Math.Round(Rectangle.Y + Rectangle.Height / 2d))); - path.Transform(m_rotate); - } + path.AddPath(MirrorRight(path), false); - break; - } - - case CircleStyle.Dot: - { - path.AddEllipse(Rectangle.X, Rectangle.Y, 22, 22); - var R = new Rectangle(Rectangle.X + 5, Rectangle.Y + 5, 12, 12); - path.AddEllipse(R); - path.CloseFigure(); - break; - } + if (Angle >= 270f) + { + using (Matrix m_rotate = new()) + { + m_rotate.RotateAt((Angle - 180f) * 3f, new Point((int)Math.Round(Rectangle.X + Rectangle.Width / 2d), (int)Math.Round(Rectangle.Y + Rectangle.Height / 2d))); + path.Transform(m_rotate); + } + } - } + break; + } + } - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); - return path; + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath BusyLoader(Rectangle Rectangle, float Angle, CircleStyle Style, float Scale = 1f) { - Rectangle.X += 0; - Rectangle.Y += 0; + using (GraphicsPath path = new()) + using (Matrix m = new()) + { + Rectangle.X += 0; + Rectangle.Y += 0; - Rectangle.Width = 22; - Rectangle.Height = 22; + Rectangle.Width = 22; + Rectangle.Height = 22; - var path = new GraphicsPath(); - var CPoint = new Point((int)Math.Round(Rectangle.X + Rectangle.Width / 2d), (int)Math.Round(Rectangle.Y + Rectangle.Height / 2d)); - var R = new Rectangle(Rectangle.X + 5, Rectangle.Y + 5, 12, 12); + Point CPoint = new((int)Math.Round(Rectangle.X + Rectangle.Width / 2d), (int)Math.Round(Rectangle.Y + Rectangle.Height / 2d)); + Rectangle R = new(Rectangle.X + 5, Rectangle.Y + 5, 12, 12); - int innerR = 15; - int thickness = 10; - int arcLength = 70; - int outerR = innerR + thickness; + int innerR = 15; + int thickness = 10; + int arcLength = 70; + int outerR = innerR + thickness; - switch (Style) - { - case CircleStyle.Aero: - { - var outerRect = Rectangle; - var innerRect = R; - path.AddArc(outerRect, Angle, arcLength); - path.AddArc(innerRect, Angle + arcLength, -arcLength); - path.CloseFigure(); - break; - } + switch (Style) + { + case CircleStyle.Aero: + { + var outerRect = Rectangle; + var innerRect = R; + path.AddArc(outerRect, Angle, arcLength); + path.AddArc(innerRect, Angle + arcLength, -arcLength); + path.CloseFigure(); + break; + } - case CircleStyle.Classic: - { - var PU1 = new Point(Rectangle.X + 12, Rectangle.Y + 5); - var PU3 = new Point(Rectangle.X + 10, Rectangle.Y + 5); - var PU4 = PU3 + (Size)new Point(2, 2); + case CircleStyle.Classic: + { + Point PU1 = new(Rectangle.X + 12, Rectangle.Y + 5); + Point PU3 = new(Rectangle.X + 10, Rectangle.Y + 5); + Point PU4 = PU3 + (Size)new Point(2, 2); - path.AddLine(PU1, PU1); - path.CloseFigure(); - path.AddLine(PU3, PU4); - path.CloseFigure(); + path.AddLine(PU1, PU1); + path.CloseFigure(); + path.AddLine(PU3, PU4); + path.CloseFigure(); - var PL1 = new Point(Rectangle.X + 12, Rectangle.Y + 17); - var PL2 = PL1 - (Size)new Point(1, -1); + Point PL1 = new(Rectangle.X + 12, Rectangle.Y + 17); + Point PL2 = PL1 - (Size)new Point(1, -1); - var PL3 = PL1 - (Size)new Point(0, 2); - var PL4 = PL3 - (Size)new Point(3, -3); + Point PL3 = PL1 - (Size)new Point(0, 2); + Point PL4 = PL3 - (Size)new Point(3, -3); - path.AddLine(PL1, PL2); - path.CloseFigure(); + path.AddLine(PL1, PL2); + path.CloseFigure(); - path.AddLine(PL3, PL4); - path.CloseFigure(); + path.AddLine(PL3, PL4); + path.CloseFigure(); - path.AddPath(MirrorRight(path), false); + path.AddPath(MirrorRight(path), false); - var C1 = PU1 + (Size)new Point(0, 4); - path.AddLine(C1, C1); - path.CloseFigure(); + Point C1 = PU1 + (Size)new Point(0, 4); + path.AddLine(C1, C1); + path.CloseFigure(); - var C2 = C1 + (Size)new Point(0, 4); - path.AddLine(C2, C2); - path.CloseFigure(); + Point C2 = C1 + (Size)new Point(0, 4); + path.AddLine(C2, C2); + path.CloseFigure(); - if (Angle >= 270f) - { - var m_rotate = new Matrix(); - m_rotate.RotateAt((Angle - 180f) * 3f, new Point((int)Math.Round(Rectangle.X + Rectangle.Width / 2d), (int)Math.Round(Rectangle.Y + Rectangle.Height / 2d))); - path.Transform(m_rotate); - } + if (Angle >= 270f) + { + using (Matrix m_rotate = new()) + { + m_rotate.RotateAt((Angle - 180f) * 3f, new Point((int)Math.Round(Rectangle.X + Rectangle.Width / 2d), (int)Math.Round(Rectangle.Y + Rectangle.Height / 2d))); + path.Transform(m_rotate); + } + } - break; - } + break; + } + } - case CircleStyle.Dot: - { - float x = (float)(0.85d * CPoint.X + 0.65d * R.Width * (double)(float)Math.Cos((double)(Angle / 180f) * Math.PI)); - float y = (float)(0.85d * CPoint.Y + 0.65d * R.Height * (double)(float)Math.Sin((double)(Angle / 180f) * Math.PI)); - x = Math.Max(Rectangle.Left, Math.Min(x, Rectangle.Right)); - y = Math.Max(Rectangle.Top, Math.Min(y, Rectangle.Bottom)); - path.AddEllipse(new Rectangle((int)Math.Round(x), (int)Math.Round(y), 5, 5)); - break; - } + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + return (GraphicsPath)path.Clone(); } - - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); - - return path; } public static GraphicsPath AppLoading(Rectangle Rectangle, float Angle, CircleStyle Style, float Scale = 1f) { - Rectangle.Width = 16; - Rectangle.Height = 16; - var path = new GraphicsPath(); - - switch (Style) + using (GraphicsPath path = new()) + using (Matrix m = new()) { - case CircleStyle.Aero: - { - path.AddEllipse(Rectangle); - var R = new Rectangle(Rectangle.X + 4, Rectangle.Y + 4, 8, 8); - path.AddEllipse(R); - path.CloseFigure(); - break; - } - - case CircleStyle.Classic: - { - var UpperRectangle = new Rectangle(Rectangle.X + 12, Rectangle.Y + 9, 9, 2); - var LowerRectangle = new Rectangle(Rectangle.X + 12, Rectangle.Y + 23, 9, 2); - var Container = new Rectangle(UpperRectangle.X, UpperRectangle.Y, UpperRectangle.Width, LowerRectangle.Bottom - UpperRectangle.Top); - - var pL1 = new Point(UpperRectangle.X + 1, UpperRectangle.Y + UpperRectangle.Height); - var pL2 = new Point(pL1.X, pL1.Y + 4); - path.AddLine(pL1, pL2); + Rectangle.Width = 16; + Rectangle.Height = 16; - var pL3 = pL2 + (Size)new Point(1, 0); - var pL4 = pL3 + (Size)new Point(1, 1); - path.AddLine(pL3, pL4); + switch (Style) + { + case CircleStyle.Aero: + { + path.AddEllipse(Rectangle); + Rectangle R = new(Rectangle.X + 4, Rectangle.Y + 4, 8, 8); + path.AddEllipse(R); + path.CloseFigure(); + break; + } - var pL5 = pL4 + (Size)new Point(0, 1); - path.AddLine(pL5, pL5); + case CircleStyle.Classic: + { + Rectangle UpperRectangle = new(Rectangle.X + 12, Rectangle.Y + 9, 9, 2); + Rectangle LowerRectangle = new(Rectangle.X + 12, Rectangle.Y + 23, 9, 2); + Rectangle Container = new(UpperRectangle.X, UpperRectangle.Y, UpperRectangle.Width, LowerRectangle.Bottom - UpperRectangle.Top); - var pL6 = pL5 + (Size)new Point(0, 1); - var pl7 = pL6 + (Size)new Point(-1, 1); - path.AddLine(pL6, pl7); + Point pL1 = new(UpperRectangle.X + 1, UpperRectangle.Y + UpperRectangle.Height); + Point pL2 = new(pL1.X, pL1.Y + 4); + path.AddLine(pL1, pL2); - var pL8 = pl7 - (Size)new Point(1, 0); - var pL9 = pL8 + (Size)new Point(0, 4); - path.AddLine(pL8, pL9); + Point pL3 = pL2 + (Size)new Point(1, 0); + Point pL4 = pL3 + (Size)new Point(1, 1); + path.AddLine(pL3, pL4); - var pL10 = pL9 + (Size)new Point(7, 0); - var pL11 = pL10 - (Size)new Point(0, 4); - path.AddLine(pL10, pL11); + Point pL5 = pL4 + (Size)new Point(0, 1); + path.AddLine(pL5, pL5); - var pL12 = pL11 + (Size)new Point(-1, 0); - var pL13 = pL12 + (Size)new Point(-1, -1); - path.AddLine(pL12, pL13); + Point pL6 = pL5 + (Size)new Point(0, 1); + Point pl7 = pL6 + (Size)new Point(-1, 1); + path.AddLine(pL6, pl7); - var pL14 = pL13 + (Size)new Point(0, -1); - path.AddLine(pL14, pL14); + Point pL8 = pl7 - (Size)new Point(1, 0); + Point pL9 = pL8 + (Size)new Point(0, 4); + path.AddLine(pL8, pL9); - var pL15 = pL14 + (Size)new Point(0, -1); - var pl16 = pL15 + (Size)new Point(1, -1); - path.AddLine(pL15, pl16); + Point pL10 = pL9 + (Size)new Point(7, 0); + Point pL11 = pL10 - (Size)new Point(0, 4); + path.AddLine(pL10, pL11); - var pL17 = pl16 + (Size)new Point(1, 0); - var pL18 = pL17 + (Size)new Point(0, -4); - path.AddLine(pL17, pL18); + Point pL12 = pL11 + (Size)new Point(-1, 0); + Point pL13 = pL12 + (Size)new Point(-1, -1); + path.AddLine(pL12, pL13); - path.AddRectangle(UpperRectangle); + Point pL14 = pL13 + (Size)new Point(0, -1); + path.AddLine(pL14, pL14); - path.AddRectangle(LowerRectangle); + Point pL15 = pL14 + (Size)new Point(0, -1); + Point pl16 = pL15 + (Size)new Point(1, -1); + path.AddLine(pL15, pl16); - path.CloseFigure(); + Point pL17 = pl16 + (Size)new Point(1, 0); + Point pL18 = pL17 + (Size)new Point(0, -4); + path.AddLine(pL17, pL18); - var FixerL0 = pL3 + (Size)new Point(0, 1); - var FixerL1 = pL3 + (Size)new Point(0, 3); + path.AddRectangle(UpperRectangle); - var FixerR0 = pL12 - (Size)new Point(0, 1); - var FixerR1 = pL12 - (Size)new Point(0, 3); + path.AddRectangle(LowerRectangle); - path.AddLine(FixerL0, FixerL0); - path.CloseFigure(); + path.CloseFigure(); - path.AddLine(FixerL1, FixerL1); - path.CloseFigure(); + Point FixerL0 = pL3 + (Size)new Point(0, 1); + Point FixerL1 = pL3 + (Size)new Point(0, 3); - path.AddLine(FixerR0, FixerR0); - path.CloseFigure(); + Point FixerR0 = pL12 - (Size)new Point(0, 1); + Point FixerR1 = pL12 - (Size)new Point(0, 3); - path.AddLine(FixerR1, FixerR1); - path.CloseFigure(); + path.AddLine(FixerL0, FixerL0); + path.CloseFigure(); - if (Angle >= 270f) - { - var m_rotate = new Matrix(); - m_rotate.RotateAt((Angle - 180f) * 3f, new Point((int)Math.Round(Container.X + Container.Width / 2d), (int)Math.Round(Container.Y + Container.Height / 2d))); - path.Transform(m_rotate); - } + path.AddLine(FixerL1, FixerL1); + path.CloseFigure(); - break; - } + path.AddLine(FixerR0, FixerR0); + path.CloseFigure(); - case CircleStyle.Dot: - { - path.AddEllipse(Rectangle); - var R = new Rectangle(Rectangle.X + 4, Rectangle.Y + 4, 8, 8); - path.AddEllipse(R); - path.CloseFigure(); - break; - } + path.AddLine(FixerR1, FixerR1); + path.CloseFigure(); - } + if (Angle >= 270f) + { + using (Matrix m_rotate = new()) + { + m_rotate.RotateAt((Angle - 180f) * 3f, new Point((int)Math.Round(Container.X + Container.Width / 2d), (int)Math.Round(Container.Y + Container.Height / 2d))); + path.Transform(m_rotate); + } + } + break; + } + } - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); - return path; + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath AppLoaderCircle(Rectangle Rectangle, float Angle, CircleStyle Style, float Scale = 1f) { - Rectangle.Width = 16; - Rectangle.Height = 16; + using (GraphicsPath path = new()) + using (Matrix m = new()) + { + Rectangle.Width = 16; + Rectangle.Height = 16; - var path = new GraphicsPath(); - var CPoint = new Point((int)Math.Round(Rectangle.X + Rectangle.Width / 2d), (int)Math.Round(Rectangle.Y + Rectangle.Height / 2d)); - var R = new Rectangle(Rectangle.X + 4, Rectangle.Y + 4, 8, 8); + Point CPoint = new((int)Math.Round(Rectangle.X + Rectangle.Width / 2d), (int)Math.Round(Rectangle.Y + Rectangle.Height / 2d)); + Rectangle R = new(Rectangle.X + 4, Rectangle.Y + 4, 8, 8); - int innerR = 15; - int thickness = 6; - int arcLength = 70; - int outerR = innerR + thickness; + int innerR = 15; + int thickness = 6; + int arcLength = 70; + int outerR = innerR + thickness; - switch (Style) - { - case CircleStyle.Aero: - { - var outerRect = Rectangle; - var innerRect = R; - path.AddArc(outerRect, Angle, arcLength); - path.AddArc(innerRect, Angle + arcLength, -arcLength); - break; - } + switch (Style) + { + case CircleStyle.Aero: + { + var outerRect = Rectangle; + var innerRect = R; + path.AddArc(outerRect, Angle, arcLength); + path.AddArc(innerRect, Angle + arcLength, -arcLength); + break; + } - case CircleStyle.Classic: - { - var UpperRectangle = new Rectangle(Rectangle.X + 12, Rectangle.Y + 9, 9, 2); - var LowerRectangle = new Rectangle(Rectangle.X + 12, Rectangle.Y + 23, 9, 2); - var Container = new Rectangle(UpperRectangle.X, UpperRectangle.Y, UpperRectangle.Width, LowerRectangle.Bottom - UpperRectangle.Top); + case CircleStyle.Classic: + { + Rectangle UpperRectangle = new(Rectangle.X + 12, Rectangle.Y + 9, 9, 2); + Rectangle LowerRectangle = new(Rectangle.X + 12, Rectangle.Y + 23, 9, 2); + Rectangle Container = new(UpperRectangle.X, UpperRectangle.Y, UpperRectangle.Width, LowerRectangle.Bottom - UpperRectangle.Top); - var PU1 = new Point(Rectangle.X + 17, Rectangle.Y + 14); - var PU3 = new Point(Rectangle.X + 14, Rectangle.Y + 15); - var PU4 = PU3 + (Size)new Point(2, 2); + Point PU1 = new(Rectangle.X + 17, Rectangle.Y + 14); + Point PU3 = new(Rectangle.X + 14, Rectangle.Y + 15); + Point PU4 = PU3 + (Size)new Point(2, 2); - path.AddLine(PU1, PU3); - path.CloseFigure(); - path.AddLine(PU3, PU4); - path.CloseFigure(); + path.AddLine(PU1, PU3); + path.CloseFigure(); + path.AddLine(PU3, PU4); + path.CloseFigure(); + Point PL1 = new(Rectangle.X + 16, Rectangle.Y + 20); + Point PL2 = PL1 - (Size)new Point(2, -2); + path.AddLine(PL1, PL2); + path.CloseFigure(); - var PL1 = new Point(Rectangle.X + 16, Rectangle.Y + 20); - var PL2 = PL1 - (Size)new Point(2, -2); - path.AddLine(PL1, PL2); - path.CloseFigure(); + Point PL3 = PL1 + (Size)new Point(1, 1); + Point PL4 = PL3 - (Size)new Point(1, -1); + path.AddLine(PL3, PL4); + path.CloseFigure(); - var PL3 = PL1 + (Size)new Point(1, 1); - var PL4 = PL3 - (Size)new Point(1, -1); - path.AddLine(PL3, PL4); - path.CloseFigure(); + Point C1 = PL3 + (Size)new Point(1, 1); + path.AddLine(C1, C1); + path.CloseFigure(); - var C1 = PL3 + (Size)new Point(1, 1); - path.AddLine(C1, C1); - path.CloseFigure(); + if (Angle >= 270f) + { + using (Matrix m_rotate = new()) + { + m_rotate.RotateAt((Angle - 180f) * 3f, new Point((int)Math.Round(Container.X + Container.Width / 2d), (int)Math.Round(Container.Y + Container.Height / 2d))); + path.Transform(m_rotate); + } + } - if (Angle >= 270f) - { - var m_rotate = new Matrix(); - m_rotate.RotateAt((Angle - 180f) * 3f, new Point((int)Math.Round(Container.X + Container.Width / 2d), (int)Math.Round(Container.Y + Container.Height / 2d))); - path.Transform(m_rotate); + break; } + } - break; - } + path.CloseFigure(); - case CircleStyle.Dot: - { - float x = (float)(0.85d * CPoint.X + 0.65d * R.Width * (double)(float)Math.Cos((double)(Angle / 180f) * Math.PI)); - float y = (float)(0.85d * CPoint.Y + 0.65d * R.Height * (double)(float)Math.Sin((double)(Angle / 180f) * Math.PI)); - x = Math.Max(Rectangle.Left, Math.Min(x, Rectangle.Right)); - y = Math.Max(Rectangle.Top, Math.Min(y, Rectangle.Bottom)); - path.AddEllipse(new Rectangle((int)Math.Round(x), (int)Math.Round(y), 5, 5)); - break; - } + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + return (GraphicsPath)path.Clone(); } - - - path.CloseFigure(); - - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); - - return path; } public static GraphicsPath Move(Rectangle Rectangle, float Scale = 1f) { - var path = new GraphicsPath(); - Rectangle.Width = 21; - Rectangle.Height = 21; - Rectangle.X = 0; - Rectangle.Y = 0; - - var UL1 = new Point(Rectangle.X + 11, Rectangle.Y); - var UL2 = new Point(UL1.X - 4, Rectangle.Y + 4); - path.AddLine(UL1, UL2); + using (GraphicsPath path = new()) + { + Rectangle.Width = 21; + Rectangle.Height = 21; + Rectangle.X = 0; + Rectangle.Y = 0; - var ULX1 = new Point(UL2.X, UL2.Y + 1); - var ULX2 = new Point(ULX1.X + 3, ULX1.Y); - path.AddLine(ULX1, ULX2); + Point UL1 = new(Rectangle.X + 11, Rectangle.Y); + Point UL2 = new(UL1.X - 4, Rectangle.Y + 4); + path.AddLine(UL1, UL2); - var MUL1 = ULX2; - var MUL2 = new Point(MUL1.X, ULX2.Y + 4); - path.AddLine(MUL1, MUL2); + Point ULX1 = new(UL2.X, UL2.Y + 1); + Point ULX2 = new(ULX1.X + 3, ULX1.Y); + path.AddLine(ULX1, ULX2); - var MULX1 = new Point(MUL2.X, MUL2.Y + 1); - var MULX2 = new Point(MULX1.X - 5, MULX1.Y); - path.AddLine(MULX1, MULX2); + Point MUL1 = ULX2; + Point MUL2 = new(MUL1.X, ULX2.Y + 4); + path.AddLine(MUL1, MUL2); - var LU1 = MULX2; - var LU2 = new Point(MULX2.X, MULX2.Y - 3); - path.AddLine(LU1, LU2); + Point MULX1 = new(MUL2.X, MUL2.Y + 1); + Point MULX2 = new(MULX1.X - 5, MULX1.Y); + path.AddLine(MULX1, MULX2); - var LUX1 = new Point(LU2.X - 1, LU2.Y); - var LUX2 = new Point(Rectangle.X, Rectangle.Y + 11); - path.AddLine(LUX1, LUX2); + Point LU1 = MULX2; + Point LU2 = new(MULX2.X, MULX2.Y - 3); + path.AddLine(LU1, LU2); - var LDX1 = LUX2; - var LDX2 = new Point(LDX1.X + 4, LDX1.Y + 4); - path.AddLine(LDX1, LDX2); + Point LUX1 = new(LU2.X - 1, LU2.Y); + Point LUX2 = new(Rectangle.X, Rectangle.Y + 11); + path.AddLine(LUX1, LUX2); - var LD1 = new Point(LDX2.X + 1, LDX2.Y); - var LD2 = new Point(LD1.X, LD1.Y - 2); - path.AddLine(LD1, LD2); + Point LDX1 = LUX2; + Point LDX2 = new(LDX1.X + 4, LDX1.Y + 4); + path.AddLine(LDX1, LDX2); - var L1 = new Point(LD2.X, LD2.Y - 1); - var L2 = new Point(L1.X + 5, L1.Y); - path.AddLine(L1, L2); + Point LD1 = new(LDX2.X + 1, LDX2.Y); + Point LD2 = new(LD1.X, LD1.Y - 2); + path.AddLine(LD1, LD2); - var DL1 = L2; - var DL2 = new Point(L2.X, LD2.Y + 3); - path.AddLine(DL1, DL2); + Point L1 = new(LD2.X, LD2.Y - 1); + Point L2 = new(L1.X + 5, L1.Y); + path.AddLine(L1, L2); - var DX1 = new Point(DL2.X, DL2.Y + 1); - var DX2 = new Point(DX1.X - 3, DX1.Y); - path.AddLine(DX1, DX2); + Point DL1 = L2; + Point DL2 = new(L2.X, LD2.Y + 3); + path.AddLine(DL1, DL2); - var DLX1 = new Point(DX2.X, DX2.Y + 1); - var DLX2 = new Point(DLX1.X + 4, DLX1.Y + 4); - path.AddLine(DLX1, DLX2); + Point DX1 = new(DL2.X, DL2.Y + 1); + Point DX2 = new(DX1.X - 3, DX1.Y); + path.AddLine(DX1, DX2); - path.AddPath(MirrorRight(path), false); + Point DLX1 = new(DX2.X, DX2.Y + 1); + Point DLX2 = new(DLX1.X + 4, DLX1.Y + 4); + path.AddLine(DLX1, DLX2); - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); + path.AddPath(MirrorRight(path), false); - return path; + using (Matrix m = new()) + { + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + } + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath Help(Rectangle Rectangle, ArrowStyle Style, float Scale = 1f) { - var path = new GraphicsPath(); - Rectangle.Width = 7; - Rectangle.Height = 11; - Rectangle.X = 11; - Rectangle.Y = 6; - - FontFamily F; - - switch (Style) + using (GraphicsPath path = new()) { - case ArrowStyle.Classic: - { - F = new FontFamily("Marlett"); + Rectangle.Width = 7; + Rectangle.Height = 11; + Rectangle.X = 11; + Rectangle.Y = 6; - path.AddString("s", F, (int)FontStyle.Bold, 15f, Rectangle, StringFormat.GenericDefault); - break; - } - - default: - { + FontFamily F; - if (OS.WXP) + switch (Style) + { + case ArrowStyle.Classic: { - F = new FontFamily("Tahoma"); - } + F = new("Marlett"); + using (Font font = new(F, 15f, FontStyle.Bold)) { path.AddString("s", F, (int)FontStyle.Bold, 15f, Rectangle, StringFormat.GenericDefault); } - else if (OS.W7 | OS.WVista) - { - F = new FontFamily("Segoe UI"); + break; } - else + + default: { - F = new FontFamily("Segoe UI Black"); - } - path.AddString("?", F, (int)FontStyle.Bold, 15f, Rectangle, StringFormat.GenericDefault); - break; - } + if (OS.WXP) { F = new("Tahoma"); } + else if (OS.W7 | OS.WVista) { F = new("Segoe UI"); } + else { F = new("Segoe UI Black"); } - } + using (Font font = new(F, 15f, FontStyle.Bold)) { path.AddString("?", F, (int)FontStyle.Bold, 15f, Rectangle, StringFormat.GenericDefault); } + + break; + } + } + + using (Matrix m = new()) + { + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + } - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); + F.Dispose(); - return path; + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath None(Rectangle Rectangle, float Scale = 1f) { - var path = new GraphicsPath(); - Rectangle.Width = 17; - Rectangle.Height = 17; - Rectangle.X = 0; - Rectangle.Y = 0; + using (GraphicsPath path = new()) + { + Rectangle.Width = 17; + Rectangle.Height = 17; + Rectangle.X = 0; + Rectangle.Y = 0; - var R = new Rectangle(Rectangle.X + 2, Rectangle.Y + 2, Rectangle.Width - 4, Rectangle.Height - 4); + Rectangle R = new(Rectangle.X + 2, Rectangle.Y + 2, Rectangle.Width - 4, Rectangle.Height - 4); - path.AddArc(R, 50f, 160f); - path.CloseFigure(); + path.AddArc(R, 50f, 160f); + path.CloseFigure(); - path.AddArc(R, 230f, 160f); - path.CloseFigure(); + path.AddArc(R, 230f, 160f); + path.CloseFigure(); - path.AddEllipse(Rectangle); + path.AddEllipse(Rectangle); - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); + using (Matrix m = new()) + { + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + } - return path; + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath NoneBackground(Rectangle Rectangle, float Scale = 1f) { - var path = new GraphicsPath(); - Rectangle.Width = 17; - Rectangle.Height = 17; - Rectangle.X = 0; - Rectangle.Y = 0; + using (GraphicsPath path = new()) + { + Rectangle.Width = 17; + Rectangle.Height = 17; + Rectangle.X = 0; + Rectangle.Y = 0; - path.AddEllipse(Rectangle); + path.AddEllipse(Rectangle); - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); + using (Matrix m = new()) + { + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + } - return path; + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath Up(Rectangle Rectangle, float Scale = 1f) { - var path = new GraphicsPath(); - Rectangle.Width = 9; - Rectangle.Height = 19; - Rectangle.X = 0; - Rectangle.Y = 0; + using (GraphicsPath path = new()) + { + Rectangle.Width = 9; + Rectangle.Height = 19; + Rectangle.X = 0; + Rectangle.Y = 0; - var UL1 = new Point(Rectangle.X + 4, Rectangle.Y); - var UL2 = new Point(Rectangle.X, Rectangle.Y + 4); - path.AddLine(UL1, UL2); + Point UL1 = new(Rectangle.X + 4, Rectangle.Y); + Point UL2 = new(Rectangle.X, Rectangle.Y + 4); + path.AddLine(UL1, UL2); - var ULX1 = new Point(UL2.X, UL2.Y + 1); - var ULX2 = new Point(ULX1.X + 3, ULX1.Y); - path.AddLine(ULX1, ULX2); + Point ULX1 = new(UL2.X, UL2.Y + 1); + Point ULX2 = new(ULX1.X + 3, ULX1.Y); + path.AddLine(ULX1, ULX2); - var MUL1 = ULX2; - var MUL2 = new Point(MUL1.X, MUL1.Y + 12); - path.AddLine(MUL1, MUL2); + Point MUL1 = ULX2; + Point MUL2 = new(MUL1.X, MUL1.Y + 12); + path.AddLine(MUL1, MUL2); - var D1 = new Point(MUL2.X, MUL2.Y + 1); - var D2 = new Point(D1.X + 1, D1.Y); - path.AddLine(D1, D2); + Point D1 = new(MUL2.X, MUL2.Y + 1); + Point D2 = new(D1.X + 1, D1.Y); + path.AddLine(D1, D2); - path.AddPath(MirrorRight(path), false); + path.AddPath(MirrorRight(path), false); - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); + using (Matrix m = new()) + { + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + } - return path; + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath NS(Rectangle Rectangle, float Scale = 1f) { - var path = new GraphicsPath(); - Rectangle.Width = 9; - Rectangle.Height = 23; - Rectangle.X = 0; - Rectangle.Y = 0; - + using (GraphicsPath path = new()) + { + Rectangle.Width = 9; + Rectangle.Height = 23; + Rectangle.X = 0; + Rectangle.Y = 0; - var UL1 = new Point(Rectangle.X + 4, Rectangle.Y); - var UL2 = new Point(Rectangle.X, Rectangle.Y + 4); - path.AddLine(UL1, UL2); + Point UL1 = new(Rectangle.X + 4, Rectangle.Y); + Point UL2 = new(Rectangle.X, Rectangle.Y + 4); + path.AddLine(UL1, UL2); - var ULX1 = new Point(UL2.X, UL2.Y + 1); - var ULX2 = new Point(ULX1.X + 3, ULX1.Y); - path.AddLine(ULX1, ULX2); + Point ULX1 = new(UL2.X, UL2.Y + 1); + Point ULX2 = new(ULX1.X + 3, ULX1.Y); + path.AddLine(ULX1, ULX2); - var MUL1 = ULX2; - var MUL2 = new Point(MUL1.X, MUL1.Y + 12); - path.AddLine(MUL1, MUL2); + Point MUL1 = ULX2; + Point MUL2 = new(MUL1.X, MUL1.Y + 12); + path.AddLine(MUL1, MUL2); - var DL1 = MUL2; - var DL2 = new Point(MUL2.X - 3, MUL2.Y); - path.AddLine(DL1, DL2); + Point DL1 = MUL2; + Point DL2 = new(MUL2.X - 3, MUL2.Y); + path.AddLine(DL1, DL2); - var DX1 = new Point(DL2.X, DL2.Y + 1); - var DX2 = new Point(DX1.X + 4, DX1.Y + 4); - path.AddLine(DX1, DX2); + Point DX1 = new(DL2.X, DL2.Y + 1); + Point DX2 = new(DX1.X + 4, DX1.Y + 4); + path.AddLine(DX1, DX2); - path.AddPath(MirrorRight(path), false); + path.AddPath(MirrorRight(path), false); - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); + using (Matrix m = new()) + { + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + } - return path; + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath NESW(Rectangle Rectangle, float Scale = 1f) { - var path = new GraphicsPath(); - Rectangle.Width = 17; - Rectangle.Height = 17; - Rectangle.X = 0; - Rectangle.Y = 0; - - var UR1 = new Point(Rectangle.X + Rectangle.Width - 1, Rectangle.Y); - var UR2 = new Point(UR1.X - 6, UR1.Y); - path.AddLine(UR1, UR2); - - var RX1 = new Point(UR2.X, UR2.Y + 1); - var RX2 = new Point(RX1.X + 1, RX1.Y + 1); - path.AddLine(RX1, RX2); - - var LX1 = new Point(RX2.X + 1, RX2.Y + 1); - var LX2 = new Point(LX1.X - 9, LX1.Y + 9); - path.AddLine(LX1, LX2); - - var DX1 = new Point(LX2.X - 1, LX2.Y - 1); - var DX2 = new Point(DX1.X - 1, DX1.Y - 1); - path.AddLine(DX1, DX2); - - var L1 = new Point(DX2.X - 1, DX2.Y); - var L2 = new Point(L1.X, L1.Y + 6); - path.AddLine(L1, L2); - - var D1 = new Point(L2.X + 1, L2.Y); - var D2 = new Point(D1.X + 5, D1.Y); - path.AddLine(D1, D2); - - var DL1 = new Point(D2.X, D2.Y - 1); - var DL2 = new Point(DL1.X - 1, DL1.Y - 1); - path.AddLine(DL1, DL2); - - var LX3 = new Point(DL2.X - 1, DL2.Y - 1); - var LX4 = new Point(LX3.X + 9, LX3.Y - 9); - path.AddLine(LX3, LX4); - - var DR1 = new Point(LX4.X + 1, LX4.Y + 1); - var DR2 = new Point(DR1.X + 1, DR1.Y + 1); - path.AddLine(DR1, DR2); - - var R1 = new Point(DR2.X + 1, DR2.Y); - var R2 = new Point(R1.X, R1.Y - 6); - path.AddLine(R1, R2); - - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); - - return path; + using (GraphicsPath path = new()) + { + Rectangle.Width = 17; + Rectangle.Height = 17; + Rectangle.X = 0; + Rectangle.Y = 0; + + Point UR1 = new(Rectangle.X + Rectangle.Width - 1, Rectangle.Y); + Point UR2 = new(UR1.X - 6, UR1.Y); + path.AddLine(UR1, UR2); + + Point RX1 = new(UR2.X, UR2.Y + 1); + Point RX2 = new(RX1.X + 1, RX1.Y + 1); + path.AddLine(RX1, RX2); + + Point LX1 = new(RX2.X + 1, RX2.Y + 1); + Point LX2 = new(LX1.X - 9, LX1.Y + 9); + path.AddLine(LX1, LX2); + + Point DX1 = new(LX2.X - 1, LX2.Y - 1); + Point DX2 = new(DX1.X - 1, DX1.Y - 1); + path.AddLine(DX1, DX2); + + Point L1 = new(DX2.X - 1, DX2.Y); + Point L2 = new(L1.X, L1.Y + 6); + path.AddLine(L1, L2); + + Point D1 = new(L2.X + 1, L2.Y); + Point D2 = new(D1.X + 5, D1.Y); + path.AddLine(D1, D2); + + Point DL1 = new(D2.X, D2.Y - 1); + Point DL2 = new(DL1.X - 1, DL1.Y - 1); + path.AddLine(DL1, DL2); + + Point LX3 = new(DL2.X - 1, DL2.Y - 1); + Point LX4 = new(LX3.X + 9, LX3.Y - 9); + path.AddLine(LX3, LX4); + + Point DR1 = new(LX4.X + 1, LX4.Y + 1); + Point DR2 = new(DR1.X + 1, DR1.Y + 1); + path.AddLine(DR1, DR2); + + Point R1 = new(DR2.X + 1, DR2.Y); + Point R2 = new(R1.X, R1.Y - 6); + path.AddLine(R1, R2); + + using (Matrix m = new()) + { + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + } + + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath NWSE(Rectangle Rectangle, float Scale = 1f) { - var path = NESW(Rectangle); - Rectangle.Width = 17; - Rectangle.Height = 17; - Rectangle.X = 0; - Rectangle.Y = 0; - - var flipXMatrix = new Matrix(-1, 0f, 0f, 1f, Rectangle.Width, -1); - var transformMatrix = new Matrix(); - transformMatrix.Multiply(flipXMatrix); - path.Transform(transformMatrix); - - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); - - return path; + using (var path = NESW(Rectangle)) + { + Rectangle.Width = 17; + Rectangle.Height = 17; + Rectangle.X = 0; + Rectangle.Y = 0; + + Matrix flipXMatrix = new(-1, 0f, 0f, 1f, Rectangle.Width, -1); + Matrix transformMatrix = new(); + transformMatrix.Multiply(flipXMatrix); + path.Transform(transformMatrix); + + using (Matrix m = new()) + { + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + } + + flipXMatrix.Dispose(); + transformMatrix.Dispose(); + + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath EW(Rectangle Rectangle, float Scale = 1f) { - var path = new GraphicsPath(); - Rectangle.Width = 23; - Rectangle.Height = 9; - Rectangle.X = 0; - Rectangle.Y = 0; - - var L1 = new Point(Rectangle.X, Rectangle.Y + 4); - var L2 = new Point(L1.X + 4, L1.Y - 4); - path.AddLine(L1, L2); - - var LX1 = new Point(L2.X + 1, L2.Y); - var LX2 = new Point(LX1.X, LX1.Y + 2); - path.AddLine(LX1, LX2); - - var U1 = new Point(LX2.X, LX2.Y + 1); - var U2 = new Point(U1.X + 12, U1.Y); - path.AddLine(U1, U2); - - var RX1 = new Point(U2.X, U2.Y - 1); - var RX2 = new Point(RX1.X, RX1.Y - 2); - path.AddLine(RX1, RX2); - - var R1 = new Point(RX2.X + 1, RX2.Y); - var R2 = new Point(R1.X + 4, R1.Y + 4); - path.AddLine(R1, R2); - - var R3 = new Point(R2.X, R2.Y); - var R4 = new Point(R3.X - 4, R3.Y + 4); - path.AddLine(R3, R4); - - var RX3 = new Point(R4.X - 1, R4.Y); - var RX4 = new Point(RX3.X, RX3.Y - 2); - path.AddLine(RX3, RX4); - - var D1 = new Point(RX4.X, RX4.Y - 1); - var D2 = new Point(D1.X - 12, D1.Y); - path.AddLine(D1, D2); - - var LX3 = new Point(D2.X, D2.Y + 1); - var LX4 = new Point(LX3.X, LX3.Y + 2); - path.AddLine(LX3, LX4); - - var L3 = new Point(LX4.X - 1, LX4.Y); - var L4 = new Point(L3.X - 4, L3.Y - 4); - path.AddLine(L3, L4); - - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); - - return path; + using (GraphicsPath path = new()) + { + Rectangle.Width = 23; + Rectangle.Height = 9; + Rectangle.X = 0; + Rectangle.Y = 0; + + Point L1 = new(Rectangle.X, Rectangle.Y + 4); + Point L2 = new(L1.X + 4, L1.Y - 4); + path.AddLine(L1, L2); + + Point LX1 = new(L2.X + 1, L2.Y); + Point LX2 = new(LX1.X, LX1.Y + 2); + path.AddLine(LX1, LX2); + + Point U1 = new(LX2.X, LX2.Y + 1); + Point U2 = new(U1.X + 12, U1.Y); + path.AddLine(U1, U2); + + Point RX1 = new(U2.X, U2.Y - 1); + Point RX2 = new(RX1.X, RX1.Y - 2); + path.AddLine(RX1, RX2); + + Point R1 = new(RX2.X + 1, RX2.Y); + Point R2 = new(R1.X + 4, R1.Y + 4); + path.AddLine(R1, R2); + + Point R3 = new(R2.X, R2.Y); + Point R4 = new(R3.X - 4, R3.Y + 4); + path.AddLine(R3, R4); + + Point RX3 = new(R4.X - 1, R4.Y); + Point RX4 = new(RX3.X, RX3.Y - 2); + path.AddLine(RX3, RX4); + + Point D1 = new(RX4.X, RX4.Y - 1); + Point D2 = new(D1.X - 12, D1.Y); + path.AddLine(D1, D2); + + Point LX3 = new(D2.X, D2.Y + 1); + Point LX4 = new(LX3.X, LX3.Y + 2); + path.AddLine(LX3, LX4); + + Point L3 = new(LX4.X - 1, LX4.Y); + Point L4 = new(L3.X - 4, L3.Y - 4); + path.AddLine(L3, L4); + + using (Matrix m = new()) + { + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + } + + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath Pen(Rectangle Rectangle, float Scale = 1f) { - var path = new GraphicsPath(); - Rectangle.Width = 22; - Rectangle.Height = 22; - Rectangle.X = 0; - Rectangle.Y = 0; + using (GraphicsPath path = new()) + { + Rectangle.Width = 22; + Rectangle.Height = 22; + Rectangle.X = 0; + Rectangle.Y = 0; - var T1 = new Point(Rectangle.X, Rectangle.Y); - var T2 = T1 + (Size)new Point(6, 2); - path.AddLine(T1, T2); + Point T1 = new(Rectangle.X, Rectangle.Y); + Point T2 = T1 + (Size)new Point(6, 2); + path.AddLine(T1, T2); - var R1 = new Point(T2.X, T2.Y); - var R2 = new Point(R1.X + 15, R1.Y + 15); - path.AddLine(R1, R2); + Point R1 = new(T2.X, T2.Y); + Point R2 = new(R1.X + 15, R1.Y + 15); + path.AddLine(R1, R2); - var B1 = new Point(R2.X, R2.Y + 1); - var B2 = new Point(B1.X - 3, B1.Y + 3); - path.AddLine(B1, B2); + Point B1 = new(R2.X, R2.Y + 1); + Point B2 = new(B1.X - 3, B1.Y + 3); + path.AddLine(B1, B2); - var L1 = new Point(B2.X - 1, B2.Y); - var L2 = new Point(L1.X - 15, L1.Y - 15); - path.AddLine(L1, L2); + Point L1 = new(B2.X - 1, B2.Y); + Point L2 = new(L1.X - 15, L1.Y - 15); + path.AddLine(L1, L2); - var LX1 = new Point(L2.X, L2.Y); - path.AddLine(LX1, T1); + Point LX1 = new(L2.X, L2.Y); + path.AddLine(LX1, T1); - path.CloseFigure(); + path.CloseFigure(); - var S1 = new Point(Rectangle.X + 14, Rectangle.Y + 18); - var S2 = new Point(S1.X + 4, S1.Y - 4); - path.AddLine(S2, S1); + Point S1 = new(Rectangle.X + 14, Rectangle.Y + 18); + Point S2 = new(S1.X + 4, S1.Y - 4); + path.AddLine(S2, S1); - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); + using (Matrix m = new()) + { + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + } - return path; + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath PenBackground(Rectangle Rectangle, float Scale = 1f) { - var path = new GraphicsPath(); - Rectangle.Width = 22; - Rectangle.Height = 22; - Rectangle.X = 0; - Rectangle.Y = 0; - - var T1 = new Point(Rectangle.X, Rectangle.Y); - var T2 = T1 + (Size)new Point(6, 2); - path.AddLine(T1, T2); + using (GraphicsPath path = new()) + { + Rectangle.Width = 22; + Rectangle.Height = 22; + Rectangle.X = 0; + Rectangle.Y = 0; - var R1 = new Point(T2.X, T2.Y); - var R2 = new Point(R1.X + 15, R1.Y + 15); - path.AddLine(R1, R2); + Point T1 = new(Rectangle.X, Rectangle.Y); + Point T2 = T1 + (Size)new Point(6, 2); + path.AddLine(T1, T2); - var B1 = new Point(R2.X, R2.Y + 1); - var B2 = new Point(B1.X - 3, B1.Y + 3); - path.AddLine(B1, B2); + Point R1 = new(T2.X, T2.Y); + Point R2 = new(R1.X + 15, R1.Y + 15); + path.AddLine(R1, R2); - var L1 = new Point(B2.X - 1, B2.Y); - var L2 = new Point(L1.X - 15, L1.Y - 15); - path.AddLine(L1, L2); + Point B1 = new(R2.X, R2.Y + 1); + Point B2 = new(B1.X - 3, B1.Y + 3); + path.AddLine(B1, B2); - var LX1 = new Point(L2.X, L2.Y); - path.AddLine(LX1, T1); + Point L1 = new(B2.X - 1, B2.Y); + Point L2 = new(L1.X - 15, L1.Y - 15); + path.AddLine(L1, L2); - path.CloseFigure(); + Point LX1 = new(L2.X, L2.Y); + path.AddLine(LX1, T1); + path.CloseFigure(); - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); + using (Matrix m = new()) + { + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + } - return path; + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath Hand(Rectangle Rectangle, ArrowStyle Style, float Scale = 1f) { - var path = new GraphicsPath(); - Rectangle.Width = 18; - Rectangle.Height = 24; - Rectangle.X = 0; - Rectangle.Y = 0; - - switch (Style) + using (GraphicsPath path = new()) { - case ArrowStyle.Classic: - { - var Index_LB1 = new Point(Rectangle.X + 5, Rectangle.Y + 14); - var Index_LB2 = new Point(Index_LB1.X, Index_LB1.Y - 11); - path.AddLine(Index_LB1, Index_LB2); - - var Index_RB1 = new Point(Index_LB1.X + 3, Index_LB1.Y - 4); - var Index_RB2 = new Point(Index_RB1.X, Index_RB1.Y - 8); - path.AddArc(Index_LB2.X, Index_LB2.Y - 2, 3, 2, 180f, 180f); - - path.AddLine(Index_RB1, Index_RB2); - path.AddArc(Index_RB2.X, Index_LB2.Y + 3, 3, 2, 180f, 180f); - - var Middle_RB1 = new Point(Index_RB1.X + 3, Index_RB1.Y); - var Middle_RB2 = new Point(Middle_RB1.X, Middle_RB1.Y - 3); - path.AddLine(Middle_RB1, Middle_RB2); - path.AddArc(Middle_RB2.X, Index_LB2.Y + 4, 3, 2, 180f, 180f); - - var Ring_RB1 = new Point(Middle_RB1.X + 3, Middle_RB1.Y + 1); - var Ring_RB2 = new Point(Ring_RB1.X, Ring_RB1.Y - 2); - path.AddLine(Ring_RB1, Ring_RB2); - path.AddArc(Ring_RB2.X, Index_LB2.Y + 6, 3, 2, 180f, 180f); - - var FreeBorder1 = new Point(Ring_RB1.X + 3, Ring_RB1.Y - 1); - var FreeBorder2 = new Point(FreeBorder1.X, FreeBorder1.Y + 6); - path.AddLine(FreeBorder1, FreeBorder2); - - var LW1 = FreeBorder2 + (Size)new Point(0, 1); - var RW1 = new Point(LW1.X - 14, LW1.Y); - var Btm = new Rectangle(RW1.X + 3, RW1.Y - 8, 9, 13); - path.AddLine(FreeBorder2, new Point(Btm.X + Btm.Width, Btm.Y + Btm.Height)); - path.AddLine(new Point(Btm.X + Btm.Width, Btm.Y + Btm.Height), new Point(Btm.X, Btm.Y + Btm.Height)); - - var L1 = RW1 - (Size)new Point(0, 1); - var L2 = new Point(L1.X - 1, L1.Y - 3); - var Thumb = new Rectangle(L2.X - 1, L2.Y - 3, 2, 3); - path.AddArc(Thumb, 90f, 180f); - - var LastBorder1 = new Point(Thumb.X + Thumb.Width, Thumb.Y); - var LastBorder2 = new Point(LastBorder1.X + 2, LastBorder1.Y + 1); - path.AddLine(LastBorder1, LastBorder2); - - path.CloseFigure(); - break; - } + Rectangle.Width = 18; + Rectangle.Height = 24; + Rectangle.X = 0; + Rectangle.Y = 0; - default: - { - var Index_LB1 = new Point(Rectangle.X + 5, Rectangle.Y + 14); - var Index_LB2 = new Point(Index_LB1.X, Index_LB1.Y - 12); - path.AddLine(Index_LB1, Index_LB2); + switch (Style) + { + case ArrowStyle.Classic: + { + Point Index_LB1 = new(Rectangle.X + 5, Rectangle.Y + 14); + Point Index_LB2 = new(Index_LB1.X, Index_LB1.Y - 11); + path.AddLine(Index_LB1, Index_LB2); + + Point Index_RB1 = new(Index_LB1.X + 3, Index_LB1.Y - 4); + Point Index_RB2 = new(Index_RB1.X, Index_RB1.Y - 8); + path.AddArc(Index_LB2.X, Index_LB2.Y - 2, 3, 2, 180f, 180f); + + path.AddLine(Index_RB1, Index_RB2); + path.AddArc(Index_RB2.X, Index_LB2.Y + 3, 3, 2, 180f, 180f); + + Point Middle_RB1 = new(Index_RB1.X + 3, Index_RB1.Y); + Point Middle_RB2 = new(Middle_RB1.X, Middle_RB1.Y - 3); + path.AddLine(Middle_RB1, Middle_RB2); + path.AddArc(Middle_RB2.X, Index_LB2.Y + 4, 3, 2, 180f, 180f); + + Point Ring_RB1 = new(Middle_RB1.X + 3, Middle_RB1.Y + 1); + Point Ring_RB2 = new(Ring_RB1.X, Ring_RB1.Y - 2); + path.AddLine(Ring_RB1, Ring_RB2); + path.AddArc(Ring_RB2.X, Index_LB2.Y + 6, 3, 2, 180f, 180f); + + Point FreeBorder1 = new(Ring_RB1.X + 3, Ring_RB1.Y - 1); + Point FreeBorder2 = new(FreeBorder1.X, FreeBorder1.Y + 6); + path.AddLine(FreeBorder1, FreeBorder2); + + Point LW1 = FreeBorder2 + (Size)new Point(0, 1); + Point RW1 = new(LW1.X - 14, LW1.Y); + Rectangle Btm = new(RW1.X + 3, RW1.Y - 8, 9, 13); + path.AddLine(FreeBorder2, new Point(Btm.X + Btm.Width, Btm.Y + Btm.Height)); + path.AddLine(new Point(Btm.X + Btm.Width, Btm.Y + Btm.Height), new Point(Btm.X, Btm.Y + Btm.Height)); + + Point L1 = RW1 - (Size)new Point(0, 1); + Point L2 = new(L1.X - 1, L1.Y - 3); + Rectangle Thumb = new(L2.X - 1, L2.Y - 3, 2, 3); + path.AddArc(Thumb, 90f, 180f); + + Point LastBorder1 = new(Thumb.X + Thumb.Width, Thumb.Y); + Point LastBorder2 = new(LastBorder1.X + 2, LastBorder1.Y + 1); + path.AddLine(LastBorder1, LastBorder2); + + path.CloseFigure(); + break; + } + + default: + { + Point Index_LB1 = new(Rectangle.X + 5, Rectangle.Y + 14); + Point Index_LB2 = new(Index_LB1.X, Index_LB1.Y - 12); + path.AddLine(Index_LB1, Index_LB2); - var Index_RB1 = new Point(Index_LB1.X + 3, Index_LB1.Y - 4); - var Index_RB2 = new Point(Index_RB1.X, Index_RB1.Y - 8); + Point Index_RB1 = new(Index_LB1.X + 3, Index_LB1.Y - 4); + Point Index_RB2 = new(Index_RB1.X, Index_RB1.Y - 8); - path.AddArc(Index_LB2.X, Index_LB2.Y - 2, 3, 2, 180f, 180f); + path.AddArc(Index_LB2.X, Index_LB2.Y - 2, 3, 2, 180f, 180f); - path.AddLine(Index_RB1, Index_RB2); + path.AddLine(Index_RB1, Index_RB2); - path.AddArc(Index_RB2.X, Index_LB2.Y + 3, 3, 2, 180f, 180f); + path.AddArc(Index_RB2.X, Index_LB2.Y + 3, 3, 2, 180f, 180f); - var Middle_RB1 = new Point(Index_RB1.X + 3, Index_RB1.Y); - var Middle_RB2 = new Point(Middle_RB1.X, Middle_RB1.Y - 3); - path.AddLine(Middle_RB1, Middle_RB2); + Point Middle_RB1 = new(Index_RB1.X + 3, Index_RB1.Y); + Point Middle_RB2 = new(Middle_RB1.X, Middle_RB1.Y - 3); + path.AddLine(Middle_RB1, Middle_RB2); - path.AddArc(Middle_RB2.X, Index_LB2.Y + 4, 3, 2, 180f, 180f); + path.AddArc(Middle_RB2.X, Index_LB2.Y + 4, 3, 2, 180f, 180f); - var Ring_RB1 = new Point(Middle_RB1.X + 3, Middle_RB1.Y); - var Ring_RB2 = new Point(Ring_RB1.X, Ring_RB1.Y - 2); - path.AddLine(Ring_RB1, Ring_RB2); + Point Ring_RB1 = new(Middle_RB1.X + 3, Middle_RB1.Y); + Point Ring_RB2 = new(Ring_RB1.X, Ring_RB1.Y - 2); + path.AddLine(Ring_RB1, Ring_RB2); - path.AddArc(Ring_RB2.X, Index_LB2.Y + 5, 3, 2, 180f, 180f); + path.AddArc(Ring_RB2.X, Index_LB2.Y + 5, 3, 2, 180f, 180f); - var FreeBorder1 = new Point(Ring_RB1.X + 3, Ring_RB1.Y - 1); - var FreeBorder2 = new Point(FreeBorder1.X, FreeBorder1.Y + 8); - path.AddLine(FreeBorder1, FreeBorder2); + Point FreeBorder1 = new(Ring_RB1.X + 3, Ring_RB1.Y - 1); + Point FreeBorder2 = new(FreeBorder1.X, FreeBorder1.Y + 8); + path.AddLine(FreeBorder1, FreeBorder2); - var LW1 = FreeBorder2 + (Size)new Point(0, 1); - var RW1 = new Point(LW1.X - 14, LW1.Y); - var Btm = new Rectangle(RW1.X, RW1.Y - 8, 14, 13); - path.AddArc(Btm, 0f, 180f); + Point LW1 = FreeBorder2 + (Size)new Point(0, 1); + Point RW1 = new(LW1.X - 14, LW1.Y); + Rectangle Btm = new(RW1.X, RW1.Y - 8, 14, 13); + path.AddArc(Btm, 0f, 180f); - var L1 = RW1 - (Size)new Point(0, 1); - var L2 = new Point(L1.X - 2, L1.Y - 2); - var Thumb = new Rectangle(L2.X - 1, L2.Y - 3, 2, 3); - path.AddArc(Thumb, 90f, 180f); - // path.AddRectangle(Thumb) + Point L1 = RW1 - (Size)new Point(0, 1); + Point L2 = new(L1.X - 2, L1.Y - 2); + Rectangle Thumb = new(L2.X - 1, L2.Y - 3, 2, 3); + path.AddArc(Thumb, 90f, 180f); - var LastBorder1 = new Point(Thumb.X + Thumb.Width, Thumb.Y); - var LastBorder2 = new Point(LastBorder1.X + 2, LastBorder1.Y + 1); - path.AddLine(LastBorder1, LastBorder2); + Point LastBorder1 = new(Thumb.X + Thumb.Width, Thumb.Y); + Point LastBorder2 = new(LastBorder1.X + 2, LastBorder1.Y + 1); + path.AddLine(LastBorder1, LastBorder2); - path.CloseFigure(); - break; - } - } + path.CloseFigure(); + break; + } + } - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); + using (Matrix m = new()) + { + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + } - return path; + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath Pin(Rectangle Rectangle, float Scale = 1f) { - var path = new GraphicsPath(); - Rectangle.Width = 13; - Rectangle.Height = 20; - Rectangle.X = 15; - Rectangle.Y = 11; - - var U = new Rectangle(Rectangle.X, Rectangle.Y, 12, 10); - path.AddArc(U, 180f, 180f); - - var C = new Point(Rectangle.X + 6, Rectangle.Y + 18); - var p1 = new Point(Rectangle.X + 0, Rectangle.Y + 6); - var p2 = new Point(Rectangle.X + 12, Rectangle.Y + 6); - path.AddLine(p2, C); - path.AddLine(C, p1); - path.CloseFigure(); - - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); - - return path; + using (GraphicsPath path = new()) + { + Rectangle.Width = 13; + Rectangle.Height = 20; + Rectangle.X = 15; + Rectangle.Y = 11; + + Rectangle U = new(Rectangle.X, Rectangle.Y, 12, 10); + path.AddArc(U, 180f, 180f); + + Point C = new(Rectangle.X + 6, Rectangle.Y + 18); + Point p1 = new(Rectangle.X + 0, Rectangle.Y + 6); + Point p2 = new(Rectangle.X + 12, Rectangle.Y + 6); + path.AddLine(p2, C); + path.AddLine(C, p1); + path.CloseFigure(); + + using (Matrix m = new()) + { + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + } + + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath Person(Rectangle Rectangle, float Scale = 1f) { - var path = new GraphicsPath(); - Rectangle.Width = 10; - Rectangle.Height = 13; - Rectangle.X = 19; - Rectangle.Y = 17; + using (GraphicsPath path = new()) + { + Rectangle.Width = 10; + Rectangle.Height = 13; + Rectangle.X = 19; + Rectangle.Y = 17; - var Face = new Rectangle(Rectangle.X, Rectangle.Y, 5, 6); - path.AddEllipse(Face); + Rectangle Face = new(Rectangle.X, Rectangle.Y, 5, 6); + path.AddEllipse(Face); - var TrunkUpper = new Rectangle(Face.X - 2, Face.Y + Face.Height, 9, 9); - path.AddArc(TrunkUpper, 180f, 180f); + Rectangle TrunkUpper = new(Face.X - 2, Face.Y + Face.Height, 9, 9); + path.AddArc(TrunkUpper, 180f, 180f); - var TrunkLower = new Rectangle(TrunkUpper.X, TrunkUpper.Y + 3, 9, 3); - path.AddArc(TrunkLower, 0f, 180f); + Rectangle TrunkLower = new(TrunkUpper.X, TrunkUpper.Y + 3, 9, 3); + path.AddArc(TrunkLower, 0f, 180f); - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); + using (Matrix m = new()) + { + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + } - return path; + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath IBeam(Rectangle Rectangle, float Scale = 1f) { - var path = new GraphicsPath(); - - Rectangle.X = 0; - Rectangle.Y = 0; - - var L1 = new Point(Rectangle.X, Rectangle.Y); - var L2 = new Point(L1.X, L1.Y + 2); - path.AddLine(L1, L2); + using (GraphicsPath path = new()) + { + Rectangle.X = 0; + Rectangle.Y = 0; - var BU1 = new Point(L2.X + 3, L2.Y); - path.AddLine(L2, BU1); + Point L1 = new(Rectangle.X, Rectangle.Y); + Point L2 = new(L1.X, L1.Y + 2); + path.AddLine(L1, L2); - var LX = new Point(BU1.X, BU1.Y + 13); - path.AddLine(BU1, LX); + Point BU1 = new(L2.X + 3, L2.Y); + path.AddLine(L2, BU1); - var BU2 = new Point(LX.X - 3, LX.Y); - path.AddLine(LX, BU2); + Point LX = new(BU1.X, BU1.Y + 13); + path.AddLine(BU1, LX); - var L3 = new Point(BU2.X, BU2.Y + 2); - path.AddLine(BU2, L3); + Point BU2 = new(LX.X - 3, LX.Y); + path.AddLine(LX, BU2); - var Bl = new Point(L3.X + 3, L3.Y); - path.AddLine(L3, Bl); + Point L3 = new(BU2.X, BU2.Y + 2); + path.AddLine(BU2, L3); - var XB = new Point(Bl.X + 1, Bl.Y - 1); - path.AddLine(Bl, XB); + Point BL = new(L3.X + 3, L3.Y); + path.AddLine(L3, BL); - var Br = new Point(XB.X + 1, XB.Y + 1); - path.AddLine(XB, Br); + Point XB = new(BL.X + 1, BL.Y - 1); + path.AddLine(BL, XB); - var RB = new Point(Br.X + 3, Br.Y); - path.AddLine(Br, RB); + Point Br = new(XB.X + 1, XB.Y + 1); + path.AddLine(XB, Br); - var R1 = new Point(RB.X, RB.Y - 2); - path.AddLine(RB, R1); + Point RB = new(Br.X + 3, Br.Y); + path.AddLine(Br, RB); - var BU3 = new Point(R1.X - 3, R1.Y); - path.AddLine(R1, BU3); + Point R1 = new(RB.X, RB.Y - 2); + path.AddLine(RB, R1); - var RX = new Point(BU3.X, BU3.Y - 13); - path.AddLine(BU3, RX); + Point BU3 = new(R1.X - 3, R1.Y); + path.AddLine(R1, BU3); - var TU = new Point(RX.X + 3, RX.Y); - path.AddLine(RX, TU); + Point RX = new(BU3.X, BU3.Y - 13); + path.AddLine(BU3, RX); - var RR = new Point(TU.X, TU.Y - 2); - path.AddLine(TU, RR); + Point TU = new(RX.X + 3, RX.Y); + path.AddLine(RX, TU); - var T = new Point(RR.X - 3, RR.Y); - path.AddLine(RR, T); + Point RR = new(TU.X, TU.Y - 2); + path.AddLine(TU, RR); - var Tx = new Point(T.X - 1, T.Y + 1); - path.AddLine(T, Tx); + Point T = new(RR.X - 3, RR.Y); + path.AddLine(RR, T); - var TXL = new Point(Tx.X - 1, Tx.Y - 1); - path.AddLine(Tx, TXL); + Point Tx = new(T.X - 1, T.Y + 1); + path.AddLine(T, Tx); - var TL = new Point(TXL.X - 3, TXL.Y); - path.AddLine(TXL, TL); + Point TXL = new(Tx.X - 1, Tx.Y - 1); + path.AddLine(Tx, TXL); + Point TL = new(TXL.X - 3, TXL.Y); + path.AddLine(TXL, TL); - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); + using (Matrix m = new()) + { + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + } - return path; + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath Cross(Rectangle Rectangle, float Scale = 1f) { - var path = new GraphicsPath(); - Rectangle.Width = 19; - Rectangle.Height = 19; - - var L1 = new Point(9, 0); - var L2 = new Point(L1.X - 1, L1.Y); - path.AddLine(L1, L2); + using (GraphicsPath path = new()) + { + Rectangle.Width = 19; + Rectangle.Height = 19; - var L3 = new Point(L2.X, L2.Y + 8); - path.AddLine(L2, L3); + Point L1 = new(9, 0); + Point L2 = new(L1.X - 1, L1.Y); + path.AddLine(L1, L2); - var L4 = new Point(L3.X - 8, L3.Y); - path.AddLine(L3, L4); + Point L3 = new(L2.X, L2.Y + 8); + path.AddLine(L2, L3); - var L5 = new Point(L4.X, L4.Y + 2); - path.AddLine(L4, L5); + Point L4 = new(L3.X - 8, L3.Y); + path.AddLine(L3, L4); - var L6 = new Point(L5.X + 8, L5.Y); - path.AddLine(L5, L6); + Point L5 = new(L4.X, L4.Y + 2); + path.AddLine(L4, L5); - var L7 = new Point(L6.X, L6.Y + 8); - path.AddLine(L6, L7); + Point L6 = new(L5.X + 8, L5.Y); + path.AddLine(L5, L6); - var L8 = new Point(L7.X + 1, L7.Y); - path.AddLine(L7, L8); + Point L7 = new(L6.X, L6.Y + 8); + path.AddLine(L6, L7); - path.AddPath(MirrorRight(path), false); + Point L8 = new(L7.X + 1, L7.Y); + path.AddLine(L7, L8); - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); + path.AddPath(MirrorRight(path), false); - return path; + using (Matrix m = new()) + { + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + } + return (GraphicsPath)path.Clone(); + } } public static GraphicsPath Pin_CenterPoint(Rectangle Rectangle, float Scale = 1f) { - var path = new GraphicsPath(); - Rectangle.Width = 13; - Rectangle.Height = 20; - Rectangle.X = 15; - Rectangle.Y = 11; - - var o = new Rectangle(Rectangle.X, Rectangle.Y, 12, 12); - var o1 = new Rectangle(Rectangle.X, Rectangle.Y, 6, 6); - o1.X = (int)Math.Round(Rectangle.X + (o.Width - o1.Width) / 2d); - o1.Y = (int)Math.Round(Rectangle.Y + (o.Height - o1.Height) / 2d); - path.AddEllipse(o1); - - var m = new Matrix(); - m.Scale(Scale, Scale, MatrixOrder.Append); - m.Translate(1f, 1f, MatrixOrder.Append); - path.Transform(m); - - return path; + using (GraphicsPath path = new()) + { + Rectangle.Width = 13; + Rectangle.Height = 20; + Rectangle.X = 15; + Rectangle.Y = 11; + + Rectangle o = new(Rectangle.X, Rectangle.Y, 12, 12); + Rectangle o1 = new(Rectangle.X, Rectangle.Y, 6, 6); + o1.X = (int)Math.Round(Rectangle.X + (o.Width - o1.Width) / 2d); + o1.Y = (int)Math.Round(Rectangle.Y + (o.Height - o1.Height) / 2d); + path.AddEllipse(o1); + + using (Matrix m = new()) + { + m.Scale(Scale, Scale, MatrixOrder.Append); + m.Translate(1f, 1f, MatrixOrder.Append); + path.Transform(m); + } + return (GraphicsPath)path.Clone(); + } } private static GraphicsPath MirrorRight(GraphicsPath path) { - var r = path.GetBounds(); - GraphicsPath p = (GraphicsPath)path.Clone(); - p.Transform(new Matrix(-1, 0f, 0f, 1f, 2f * (r.Left + r.Width), 0f)); - return p; + RectangleF r = path.GetBounds(); + using (GraphicsPath p = (GraphicsPath)path.Clone()) + { + p.Transform(new Matrix(-1, 0f, 0f, 1f, 2f * (r.Left + r.Width), 0f)); + return (GraphicsPath)p.Clone(); + } } - } public class CursorOptions @@ -2453,7 +2840,7 @@ public CursorOptions(Theme.Structures.Cursor Cursor = default) public float LoadingCircleHotNoiseOpacity; public float LineThickness = 1f; public float Scale = 1f; - public float _Angle = 180f; + public float Angle = 180f; public bool Shadow_Enabled = false; public Color Shadow_Color = Color.Black; public int Shadow_Blur = 5; diff --git a/WinPaletter/CursorsStudio/CursorsStudio.Designer.cs b/WinPaletter/CursorsStudio/CursorsStudio.Designer.cs index 293883ec..7eaf69bc 100644 --- a/WinPaletter/CursorsStudio/CursorsStudio.Designer.cs +++ b/WinPaletter/CursorsStudio/CursorsStudio.Designer.cs @@ -39,65 +39,108 @@ private void InitializeComponent() System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CursorsStudio)); this.Timer1 = new System.Windows.Forms.Timer(this.components); this.OpenFileDialog1 = new System.Windows.Forms.OpenFileDialog(); + this.openFileDialog2 = new System.Windows.Forms.OpenFileDialog(); + this.tabControl1 = new WinPaletter.UI.WP.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.label18 = new System.Windows.Forms.Label(); + this.source1 = new WinPaletter.UI.WP.RadioImage(); + this.source0 = new WinPaletter.UI.WP.RadioImage(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.label23 = new System.Windows.Forms.Label(); + this.Label8 = new System.Windows.Forms.Label(); + this.PictureBox11 = new System.Windows.Forms.PictureBox(); + this.PictureBox14 = new System.Windows.Forms.PictureBox(); + this.ComboBox6 = new WinPaletter.UI.WP.ComboBox(); + this.Label10 = new System.Windows.Forms.Label(); + this.ComboBox5 = new WinPaletter.UI.WP.ComboBox(); + this.PictureBox15 = new System.Windows.Forms.PictureBox(); + this.Label7 = new System.Windows.Forms.Label(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.Button15 = new WinPaletter.UI.WP.Button(); + this.Button14 = new WinPaletter.UI.WP.Button(); + this.Trackbar6 = new WinPaletter.UI.WP.Trackbar(); + this.label15 = new System.Windows.Forms.Label(); + this.CheckBox6 = new WinPaletter.UI.WP.CheckBox(); + this.Trackbar5 = new WinPaletter.UI.WP.Trackbar(); + this.Button13 = new WinPaletter.UI.WP.Button(); + this.CheckBox7 = new WinPaletter.UI.WP.CheckBox(); + this.ComboBox3 = new WinPaletter.UI.WP.ComboBox(); + this.LoadingColor1 = new WinPaletter.UI.Controllers.ColorItem(); + this.ComboBox4 = new WinPaletter.UI.WP.ComboBox(); + this.CheckBox2 = new WinPaletter.UI.WP.CheckBox(); + this.CircleColor1 = new WinPaletter.UI.Controllers.ColorItem(); + this.CheckBox8 = new WinPaletter.UI.WP.CheckBox(); + this.label17 = new System.Windows.Forms.Label(); + this.LoadingColor2 = new WinPaletter.UI.Controllers.ColorItem(); + this.CircleColor2 = new WinPaletter.UI.Controllers.ColorItem(); + this.Trackbar4 = new WinPaletter.UI.WP.Trackbar(); + this.Button12 = new WinPaletter.UI.WP.Button(); + this.CheckBox3 = new WinPaletter.UI.WP.CheckBox(); + this.CheckBox4 = new WinPaletter.UI.WP.CheckBox(); + this.ComboBox2 = new WinPaletter.UI.WP.ComboBox(); + this.PictureBox3 = new System.Windows.Forms.PictureBox(); + this.Trackbar3 = new WinPaletter.UI.WP.Trackbar(); + this.SecondaryColor1 = new WinPaletter.UI.Controllers.ColorItem(); + this.SecondaryColor2 = new WinPaletter.UI.Controllers.ColorItem(); + this.Label13 = new System.Windows.Forms.Label(); + this.PrimaryColor2 = new WinPaletter.UI.Controllers.ColorItem(); + this.PictureBox6 = new System.Windows.Forms.PictureBox(); + this.PrimaryColor1 = new WinPaletter.UI.Controllers.ColorItem(); + this.ComboBox1 = new WinPaletter.UI.WP.ComboBox(); + this.CheckBox1 = new WinPaletter.UI.WP.CheckBox(); + this.Label2 = new System.Windows.Forms.Label(); + this.CheckBox5 = new WinPaletter.UI.WP.CheckBox(); + this.PictureBox2 = new System.Windows.Forms.PictureBox(); + this.Label3 = new System.Windows.Forms.Label(); + this.PictureBox4 = new System.Windows.Forms.PictureBox(); + this.PictureBox7 = new System.Windows.Forms.PictureBox(); + this.PictureBox8 = new System.Windows.Forms.PictureBox(); + this.PictureBox5 = new System.Windows.Forms.PictureBox(); + this.Label21 = new System.Windows.Forms.Label(); + this.PictureBox10 = new System.Windows.Forms.PictureBox(); + this.tabPage3 = new System.Windows.Forms.TabPage(); + this.label4 = new System.Windows.Forms.Label(); + this.pictureBox23 = new System.Windows.Forms.PictureBox(); this.CheckBox11 = new WinPaletter.UI.WP.CheckBox(); + this.AlertBox1 = new WinPaletter.UI.WP.AlertBox(); + this.PictureBox16 = new System.Windows.Forms.PictureBox(); this.PictureBox24 = new System.Windows.Forms.PictureBox(); + this.PictureBox18 = new System.Windows.Forms.PictureBox(); this.Button19 = new WinPaletter.UI.WP.Button(); + this.PictureBox17 = new System.Windows.Forms.PictureBox(); this.Trackbar10 = new WinPaletter.UI.WP.Trackbar(); + this.Label25 = new System.Windows.Forms.Label(); this.Button18 = new WinPaletter.UI.WP.Button(); + this.Label24 = new System.Windows.Forms.Label(); this.Trackbar9 = new WinPaletter.UI.WP.Trackbar(); + this.Label14 = new System.Windows.Forms.Label(); this.Label22 = new System.Windows.Forms.Label(); + this.Trackbar7 = new WinPaletter.UI.WP.Trackbar(); this.PictureBox20 = new System.Windows.Forms.PictureBox(); + this.ColorItem1 = new WinPaletter.UI.Controllers.ColorItem(); this.Button17 = new WinPaletter.UI.WP.Button(); + this.Button16 = new WinPaletter.UI.WP.Button(); this.Trackbar8 = new WinPaletter.UI.WP.Trackbar(); - this.PictureBox19 = new System.Windows.Forms.PictureBox(); this.Label26 = new System.Windows.Forms.Label(); - this.Button16 = new WinPaletter.UI.WP.Button(); - this.ColorItem1 = new WinPaletter.UI.Controllers.ColorItem(); - this.Trackbar7 = new WinPaletter.UI.WP.Trackbar(); - this.PictureBox16 = new System.Windows.Forms.PictureBox(); - this.Label14 = new System.Windows.Forms.Label(); - this.Label24 = new System.Windows.Forms.Label(); - this.Label25 = new System.Windows.Forms.Label(); - this.PictureBox17 = new System.Windows.Forms.PictureBox(); - this.PictureBox18 = new System.Windows.Forms.PictureBox(); + this.PictureBox19 = new System.Windows.Forms.PictureBox(); + this.tabPage5 = new System.Windows.Forms.TabPage(); + this.button20 = new WinPaletter.UI.WP.Button(); + this.textBox1 = new WinPaletter.UI.WP.TextBox(); + this.pictureBox26 = new System.Windows.Forms.PictureBox(); + this.label16 = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); + this.pictureBox25 = new System.Windows.Forms.PictureBox(); + this.tabPage4 = new System.Windows.Forms.TabPage(); this.PictureBox13 = new System.Windows.Forms.PictureBox(); this.Label6 = new System.Windows.Forms.Label(); + this.CheckBox10 = new WinPaletter.UI.WP.CheckBox(); this.PictureBox9 = new System.Windows.Forms.PictureBox(); + this.Trackbar2 = new WinPaletter.UI.WP.Trackbar(); this.trails_btn = new WinPaletter.UI.WP.Button(); + this.PictureBox21 = new System.Windows.Forms.PictureBox(); this.PictureBox22 = new System.Windows.Forms.PictureBox(); - this.Label11 = new System.Windows.Forms.Label(); this.CheckBox9 = new WinPaletter.UI.WP.CheckBox(); - this.PictureBox21 = new System.Windows.Forms.PictureBox(); - this.Trackbar2 = new WinPaletter.UI.WP.Trackbar(); - this.CheckBox10 = new WinPaletter.UI.WP.CheckBox(); - this.Label8 = new System.Windows.Forms.Label(); - this.PictureBox14 = new System.Windows.Forms.PictureBox(); - this.Label10 = new System.Windows.Forms.Label(); - this.PictureBox15 = new System.Windows.Forms.PictureBox(); - this.PictureBox11 = new System.Windows.Forms.PictureBox(); - this.Label7 = new System.Windows.Forms.Label(); - this.ComboBox5 = new WinPaletter.UI.WP.ComboBox(); - this.ComboBox6 = new WinPaletter.UI.WP.ComboBox(); - this.PictureBox3 = new System.Windows.Forms.PictureBox(); - this.Label13 = new System.Windows.Forms.Label(); - this.Button14 = new WinPaletter.UI.WP.Button(); - this.Trackbar5 = new WinPaletter.UI.WP.Trackbar(); - this.CircleColor1 = new WinPaletter.UI.Controllers.ColorItem(); - this.CheckBox7 = new WinPaletter.UI.WP.CheckBox(); - this.CircleColor2 = new WinPaletter.UI.Controllers.ColorItem(); - this.ComboBox4 = new WinPaletter.UI.WP.ComboBox(); - this.CheckBox8 = new WinPaletter.UI.WP.CheckBox(); - this.Button15 = new WinPaletter.UI.WP.Button(); - this.Trackbar6 = new WinPaletter.UI.WP.Trackbar(); - this.LoadingColor1 = new WinPaletter.UI.Controllers.ColorItem(); - this.ComboBox3 = new WinPaletter.UI.WP.ComboBox(); - this.CheckBox2 = new WinPaletter.UI.WP.CheckBox(); - this.LoadingColor2 = new WinPaletter.UI.Controllers.ColorItem(); - this.CheckBox6 = new WinPaletter.UI.WP.CheckBox(); - this.PictureBox7 = new System.Windows.Forms.PictureBox(); - this.PictureBox8 = new System.Windows.Forms.PictureBox(); - this.Label21 = new System.Windows.Forms.Label(); - this.PictureBox10 = new System.Windows.Forms.PictureBox(); + this.Label11 = new System.Windows.Forms.Label(); this.Button11 = new WinPaletter.UI.WP.Button(); this.GroupBox13 = new WinPaletter.UI.WP.GroupBox(); this.checker_img = new System.Windows.Forms.PictureBox(); @@ -106,26 +149,6 @@ private void InitializeComponent() this.Button8 = new WinPaletter.UI.WP.Button(); this.Button9 = new WinPaletter.UI.WP.Button(); this.Label12 = new System.Windows.Forms.Label(); - this.PictureBox6 = new System.Windows.Forms.PictureBox(); - this.Label2 = new System.Windows.Forms.Label(); - this.Button13 = new WinPaletter.UI.WP.Button(); - this.Trackbar4 = new WinPaletter.UI.WP.Trackbar(); - this.CheckBox4 = new WinPaletter.UI.WP.CheckBox(); - this.CheckBox3 = new WinPaletter.UI.WP.CheckBox(); - this.SecondaryColor1 = new WinPaletter.UI.Controllers.ColorItem(); - this.SecondaryColor2 = new WinPaletter.UI.Controllers.ColorItem(); - this.ComboBox2 = new WinPaletter.UI.WP.ComboBox(); - this.Button12 = new WinPaletter.UI.WP.Button(); - this.Trackbar3 = new WinPaletter.UI.WP.Trackbar(); - this.PrimaryColor2 = new WinPaletter.UI.Controllers.ColorItem(); - this.PrimaryColor1 = new WinPaletter.UI.Controllers.ColorItem(); - this.ComboBox1 = new WinPaletter.UI.WP.ComboBox(); - this.CheckBox1 = new WinPaletter.UI.WP.CheckBox(); - this.CheckBox5 = new WinPaletter.UI.WP.CheckBox(); - this.PictureBox5 = new System.Windows.Forms.PictureBox(); - this.PictureBox4 = new System.Windows.Forms.PictureBox(); - this.Label3 = new System.Windows.Forms.Label(); - this.PictureBox2 = new System.Windows.Forms.PictureBox(); this.Button3 = new WinPaletter.UI.WP.Button(); this.Button4 = new WinPaletter.UI.WP.Button(); this.GroupBox1 = new WinPaletter.UI.WP.GroupBox(); @@ -156,65 +179,42 @@ private void InitializeComponent() this.Button6 = new WinPaletter.UI.WP.Button(); this.Button2 = new WinPaletter.UI.WP.Button(); this.Button1 = new WinPaletter.UI.WP.Button(); - this.AlertBox1 = new WinPaletter.UI.WP.AlertBox(); - this.tabControl1 = new WinPaletter.UI.WP.TabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.label18 = new System.Windows.Forms.Label(); - this.source1 = new WinPaletter.UI.WP.RadioImage(); - this.source0 = new WinPaletter.UI.WP.RadioImage(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.label23 = new System.Windows.Forms.Label(); - this.tabPage2 = new System.Windows.Forms.TabPage(); - this.label15 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); - this.tabPage3 = new System.Windows.Forms.TabPage(); - this.label4 = new System.Windows.Forms.Label(); - this.pictureBox23 = new System.Windows.Forms.PictureBox(); - this.tabPage5 = new System.Windows.Forms.TabPage(); - this.button20 = new WinPaletter.UI.WP.Button(); - this.textBox1 = new WinPaletter.UI.WP.TextBox(); - this.pictureBox26 = new System.Windows.Forms.PictureBox(); - this.label16 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.pictureBox25 = new System.Windows.Forms.PictureBox(); - this.tabPage4 = new System.Windows.Forms.TabPage(); - this.openFileDialog2 = new System.Windows.Forms.OpenFileDialog(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox24)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox20)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox19)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox16)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox17)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox18)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox13)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox9)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox22)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox21)).BeginInit(); + this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PictureBox14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PictureBox15)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox11)).BeginInit(); + this.tabPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.PictureBox3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PictureBox7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PictureBox8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox10)).BeginInit(); - this.GroupBox13.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.checker_img)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PictureBox5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox2)).BeginInit(); - this.GroupBox1.SuspendLayout(); - this.FlowLayoutPanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox12)).BeginInit(); - this.tabControl1.SuspendLayout(); - this.tabPage1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.tabPage2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox10)).BeginInit(); this.tabPage3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox23)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox16)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox24)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox18)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox20)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox19)).BeginInit(); this.tabPage5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox26)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox25)).BeginInit(); this.tabPage4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox13)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox21)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox22)).BeginInit(); + this.GroupBox13.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.checker_img)).BeginInit(); + this.GroupBox1.SuspendLayout(); + this.FlowLayoutPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox12)).BeginInit(); this.SuspendLayout(); // // Timer1 @@ -227,395 +227,200 @@ private void InitializeComponent() this.OpenFileDialog1.DefaultExt = "wpt"; this.OpenFileDialog1.Filter = "WinPaletter Theme (*.wpth)|*.wpth|All Files|*.*"; // - // CheckBox11 + // openFileDialog2 // - this.CheckBox11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.CheckBox11.Checked = false; - this.CheckBox11.Font = new System.Drawing.Font("Segoe UI", 9F); - this.CheckBox11.ForeColor = System.Drawing.Color.White; - this.CheckBox11.Location = new System.Drawing.Point(47, 47); - this.CheckBox11.Name = "CheckBox11"; - this.CheckBox11.Size = new System.Drawing.Size(78, 24); - this.CheckBox11.TabIndex = 150; - this.CheckBox11.Text = "Enabled"; - this.CheckBox11.CheckedChanged += new WinPaletter.UI.WP.CheckBox.CheckedChangedEventHandler(this.CheckBox11_CheckedChanged); + this.openFileDialog2.DefaultExt = "wpt"; + this.openFileDialog2.Filter = "Windows cursor file (*.cur)|*.cur|Animated cursor file (*.ani)|*.ani"; // - // PictureBox24 + // tabControl1 // - this.PictureBox24.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox24.Image"))); - this.PictureBox24.Location = new System.Drawing.Point(17, 47); - this.PictureBox24.Name = "PictureBox24"; - this.PictureBox24.Size = new System.Drawing.Size(24, 24); - this.PictureBox24.TabIndex = 149; - this.PictureBox24.TabStop = false; + this.tabControl1.Alignment = System.Windows.Forms.TabAlignment.Left; + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Controls.Add(this.tabPage3); + this.tabControl1.Controls.Add(this.tabPage5); + this.tabControl1.Controls.Add(this.tabPage4); + this.tabControl1.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed; + this.tabControl1.Font = new System.Drawing.Font("Segoe UI", 9F); + this.tabControl1.ItemSize = new System.Drawing.Size(40, 150); + this.tabControl1.Location = new System.Drawing.Point(12, 57); + this.tabControl1.Multiline = true; + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(616, 507); + this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; + this.tabControl1.TabIndex = 138; + this.tabControl1.Visible = false; // - // Button19 - // - this.Button19.CustomColor = System.Drawing.Color.Empty; - this.Button19.Flag = WinPaletter.UI.WP.Button.Flags.None; - this.Button19.Font = new System.Drawing.Font("Segoe UI", 9F); - this.Button19.ForeColor = System.Drawing.Color.White; - this.Button19.Image = null; - this.Button19.Location = new System.Drawing.Point(418, 197); - this.Button19.Name = "Button19"; - this.Button19.Size = new System.Drawing.Size(34, 24); - this.Button19.TabIndex = 148; - this.Button19.UseVisualStyleBackColor = false; - this.Button19.Click += new System.EventHandler(this.Button19_Click); - // - // Trackbar10 + // tabPage1 // - this.Trackbar10.BackColor = System.Drawing.Color.Transparent; - this.Trackbar10.LargeChange = 2; - this.Trackbar10.Location = new System.Drawing.Point(122, 200); - this.Trackbar10.Maximum = 5; - this.Trackbar10.Minimum = 0; - this.Trackbar10.Name = "Trackbar10"; - this.Trackbar10.Size = new System.Drawing.Size(290, 19); - this.Trackbar10.SmallChange = 1; - this.Trackbar10.TabIndex = 147; - this.Trackbar10.Value = 0; - this.Trackbar10.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar10_Scroll); + this.tabPage1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); + this.tabPage1.Controls.Add(this.label18); + this.tabPage1.Controls.Add(this.source1); + this.tabPage1.Controls.Add(this.source0); + this.tabPage1.Controls.Add(this.pictureBox1); + this.tabPage1.Controls.Add(this.label23); + this.tabPage1.Controls.Add(this.Label8); + this.tabPage1.Controls.Add(this.PictureBox11); + this.tabPage1.Controls.Add(this.PictureBox14); + this.tabPage1.Controls.Add(this.ComboBox6); + this.tabPage1.Controls.Add(this.Label10); + this.tabPage1.Controls.Add(this.ComboBox5); + this.tabPage1.Controls.Add(this.PictureBox15); + this.tabPage1.Controls.Add(this.Label7); + this.tabPage1.Location = new System.Drawing.Point(154, 4); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(458, 499); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "Configuration"; // - // Button18 + // label18 // - this.Button18.CustomColor = System.Drawing.Color.Empty; - this.Button18.Flag = WinPaletter.UI.WP.Button.Flags.None; - this.Button18.Font = new System.Drawing.Font("Segoe UI", 9F); - this.Button18.ForeColor = System.Drawing.Color.White; - this.Button18.Image = null; - this.Button18.Location = new System.Drawing.Point(418, 167); - this.Button18.Name = "Button18"; - this.Button18.Size = new System.Drawing.Size(34, 24); - this.Button18.TabIndex = 144; - this.Button18.UseVisualStyleBackColor = false; - this.Button18.Click += new System.EventHandler(this.Button18_Click); + this.label18.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.label18.BackColor = System.Drawing.Color.Transparent; + this.label18.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label18.Location = new System.Drawing.Point(47, 113); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(405, 38); + this.label18.TabIndex = 81; + this.label18.Text = "- After selecting a source, select tabs in the left side and design cursor as you" + + " want."; + this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // Trackbar9 + // source1 // - this.Trackbar9.BackColor = System.Drawing.Color.Transparent; - this.Trackbar9.LargeChange = 2; - this.Trackbar9.Location = new System.Drawing.Point(122, 170); - this.Trackbar9.Maximum = 5; - this.Trackbar9.Minimum = 0; - this.Trackbar9.Name = "Trackbar9"; - this.Trackbar9.Size = new System.Drawing.Size(290, 19); - this.Trackbar9.SmallChange = 1; - this.Trackbar9.TabIndex = 143; - this.Trackbar9.Value = 0; - this.Trackbar9.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar9_Scroll); + this.source1.Checked = false; + this.source1.Font = new System.Drawing.Font("Segoe UI", 9F); + this.source1.ForeColor = System.Drawing.Color.White; + this.source1.Image = null; + this.source1.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.source1.Location = new System.Drawing.Point(47, 78); + this.source1.Name = "source1"; + this.source1.Size = new System.Drawing.Size(405, 28); + this.source1.TabIndex = 80; + this.source1.Text = "From file"; + this.source1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.source1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.source1.CheckedChanged += new WinPaletter.UI.WP.RadioImage.CheckedChangedEventHandler(this.source1_CheckedChanged); // - // Label22 + // source0 // - this.Label22.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label22.Location = new System.Drawing.Point(47, 167); - this.Label22.Name = "Label22"; - this.Label22.Size = new System.Drawing.Size(69, 24); - this.Label22.TabIndex = 142; - this.Label22.Text = "Offset X:"; - this.Label22.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.source0.Checked = true; + this.source0.Font = new System.Drawing.Font("Segoe UI", 9F); + this.source0.ForeColor = System.Drawing.Color.White; + this.source0.Image = null; + this.source0.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.source0.Location = new System.Drawing.Point(47, 44); + this.source0.Name = "source0"; + this.source0.Size = new System.Drawing.Size(405, 28); + this.source0.TabIndex = 79; + this.source0.Text = "Rendered by WinPaletter"; + this.source0.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.source0.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.source0.CheckedChanged += new WinPaletter.UI.WP.RadioImage.CheckedChangedEventHandler(this.source0_CheckedChanged); // - // PictureBox20 + // pictureBox1 // - this.PictureBox20.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox20.Image"))); - this.PictureBox20.Location = new System.Drawing.Point(17, 167); - this.PictureBox20.Name = "PictureBox20"; - this.PictureBox20.Size = new System.Drawing.Size(24, 24); - this.PictureBox20.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.PictureBox20.TabIndex = 141; - this.PictureBox20.TabStop = false; + this.pictureBox1.BackColor = System.Drawing.Color.Transparent; + this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Location = new System.Drawing.Point(6, 6); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(35, 35); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox1.TabIndex = 78; + this.pictureBox1.TabStop = false; // - // Button17 + // label23 // - this.Button17.CustomColor = System.Drawing.Color.Empty; - this.Button17.Flag = WinPaletter.UI.WP.Button.Flags.None; - this.Button17.Font = new System.Drawing.Font("Segoe UI", 9F); - this.Button17.ForeColor = System.Drawing.Color.White; - this.Button17.Image = null; - this.Button17.Location = new System.Drawing.Point(418, 137); - this.Button17.Name = "Button17"; - this.Button17.Size = new System.Drawing.Size(34, 24); - this.Button17.TabIndex = 140; - this.Button17.UseVisualStyleBackColor = false; - this.Button17.Click += new System.EventHandler(this.Button17_Click); + this.label23.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.label23.BackColor = System.Drawing.Color.Transparent; + this.label23.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Bold); + this.label23.Location = new System.Drawing.Point(43, 6); + this.label23.Name = "label23"; + this.label23.Size = new System.Drawing.Size(409, 35); + this.label23.TabIndex = 77; + this.label23.Text = "Source"; + this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // Trackbar8 + // Label8 // - this.Trackbar8.BackColor = System.Drawing.Color.Transparent; - this.Trackbar8.LargeChange = 2; - this.Trackbar8.Location = new System.Drawing.Point(122, 140); - this.Trackbar8.Maximum = 100; - this.Trackbar8.Minimum = 0; - this.Trackbar8.Name = "Trackbar8"; - this.Trackbar8.Size = new System.Drawing.Size(290, 19); - this.Trackbar8.SmallChange = 1; - this.Trackbar8.TabIndex = 139; - this.Trackbar8.Value = 0; - this.Trackbar8.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar8_Scroll); + this.Label8.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label8.Location = new System.Drawing.Point(47, 259); + this.Label8.Name = "Label8"; + this.Label8.Size = new System.Drawing.Size(56, 24); + this.Label8.TabIndex = 76; + this.Label8.Text = "Busy:"; + this.Label8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // PictureBox19 + // PictureBox11 // - this.PictureBox19.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox19.Image"))); - this.PictureBox19.Location = new System.Drawing.Point(17, 77); - this.PictureBox19.Name = "PictureBox19"; - this.PictureBox19.Size = new System.Drawing.Size(24, 24); - this.PictureBox19.TabIndex = 9; - this.PictureBox19.TabStop = false; + this.PictureBox11.BackColor = System.Drawing.Color.Transparent; + this.PictureBox11.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox11.Image"))); + this.PictureBox11.Location = new System.Drawing.Point(6, 188); + this.PictureBox11.Name = "PictureBox11"; + this.PictureBox11.Size = new System.Drawing.Size(35, 35); + this.PictureBox11.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.PictureBox11.TabIndex = 72; + this.PictureBox11.TabStop = false; // - // Label26 + // PictureBox14 // - this.Label26.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label26.Location = new System.Drawing.Point(47, 77); - this.Label26.Name = "Label26"; - this.Label26.Size = new System.Drawing.Size(69, 24); - this.Label26.TabIndex = 12; - this.Label26.Text = "Color:"; - this.Label26.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.PictureBox14.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox14.Image"))); + this.PictureBox14.Location = new System.Drawing.Point(17, 259); + this.PictureBox14.Name = "PictureBox14"; + this.PictureBox14.Size = new System.Drawing.Size(24, 24); + this.PictureBox14.TabIndex = 75; + this.PictureBox14.TabStop = false; // - // Button16 + // ComboBox6 // - this.Button16.CustomColor = System.Drawing.Color.Empty; - this.Button16.Flag = WinPaletter.UI.WP.Button.Flags.None; - this.Button16.Font = new System.Drawing.Font("Segoe UI", 9F); - this.Button16.ForeColor = System.Drawing.Color.White; - this.Button16.Image = null; - this.Button16.Location = new System.Drawing.Point(418, 107); - this.Button16.Name = "Button16"; - this.Button16.Size = new System.Drawing.Size(34, 24); - this.Button16.TabIndex = 138; - this.Button16.UseVisualStyleBackColor = false; - this.Button16.Click += new System.EventHandler(this.Button16_Click); + this.ComboBox6.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.ComboBox6.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ComboBox6.Font = new System.Drawing.Font("Segoe UI", 9F); + this.ComboBox6.ForeColor = System.Drawing.Color.White; + this.ComboBox6.FormattingEnabled = true; + this.ComboBox6.ItemHeight = 20; + this.ComboBox6.Items.AddRange(new object[] { + "Aero", + "Modern", + "Classic", + "Fluid"}); + this.ComboBox6.Location = new System.Drawing.Point(109, 259); + this.ComboBox6.Name = "ComboBox6"; + this.ComboBox6.Size = new System.Drawing.Size(343, 26); + this.ComboBox6.TabIndex = 68; + this.ComboBox6.SelectedIndexChanged += new System.EventHandler(this.ComboBox6_SelectedIndexChanged); // - // ColorItem1 + // Label10 // - this.ColorItem1.AllowDrop = true; - this.ColorItem1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.ColorItem1.DefaultColor = System.Drawing.Color.White; - this.ColorItem1.DontShowInfo = false; - this.ColorItem1.Location = new System.Drawing.Point(123, 77); - this.ColorItem1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.ColorItem1.Name = "ColorItem1"; - this.ColorItem1.Size = new System.Drawing.Size(115, 24); - this.ColorItem1.TabIndex = 77; - this.ColorItem1.Click += new System.EventHandler(this.ColorItem1_Click); - this.ColorItem1.DragDrop += new System.Windows.Forms.DragEventHandler(this.ColorItem1_Click); + this.Label10.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label10.Location = new System.Drawing.Point(47, 229); + this.Label10.Name = "Label10"; + this.Label10.Size = new System.Drawing.Size(56, 24); + this.Label10.TabIndex = 74; + this.Label10.Text = "Arrow:"; + this.Label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // Trackbar7 + // ComboBox5 // - this.Trackbar7.BackColor = System.Drawing.Color.Transparent; - this.Trackbar7.LargeChange = 2; - this.Trackbar7.Location = new System.Drawing.Point(122, 110); - this.Trackbar7.Maximum = 10; - this.Trackbar7.Minimum = 0; - this.Trackbar7.Name = "Trackbar7"; - this.Trackbar7.Size = new System.Drawing.Size(290, 19); - this.Trackbar7.SmallChange = 1; - this.Trackbar7.TabIndex = 137; - this.Trackbar7.Value = 0; - this.Trackbar7.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar7_Scroll); - // - // PictureBox16 - // - this.PictureBox16.BackColor = System.Drawing.Color.Transparent; - this.PictureBox16.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox16.Image"))); - this.PictureBox16.Location = new System.Drawing.Point(6, 6); - this.PictureBox16.Name = "PictureBox16"; - this.PictureBox16.Size = new System.Drawing.Size(35, 35); - this.PictureBox16.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.PictureBox16.TabIndex = 76; - this.PictureBox16.TabStop = false; - // - // Label14 - // - this.Label14.BackColor = System.Drawing.Color.Transparent; - this.Label14.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Bold); - this.Label14.Location = new System.Drawing.Point(43, 6); - this.Label14.Name = "Label14"; - this.Label14.Size = new System.Drawing.Size(303, 35); - this.Label14.TabIndex = 75; - this.Label14.Text = "Custom shadow"; - this.Label14.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // Label24 - // - this.Label24.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label24.Location = new System.Drawing.Point(47, 107); - this.Label24.Name = "Label24"; - this.Label24.Size = new System.Drawing.Size(69, 24); - this.Label24.TabIndex = 69; - this.Label24.Text = "Blur Power:"; - this.Label24.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // Label25 - // - this.Label25.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label25.Location = new System.Drawing.Point(47, 137); - this.Label25.Name = "Label25"; - this.Label25.Size = new System.Drawing.Size(67, 24); - this.Label25.TabIndex = 68; - this.Label25.Text = "Opacity:"; - this.Label25.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // PictureBox17 - // - this.PictureBox17.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox17.Image"))); - this.PictureBox17.Location = new System.Drawing.Point(17, 137); - this.PictureBox17.Name = "PictureBox17"; - this.PictureBox17.Size = new System.Drawing.Size(24, 24); - this.PictureBox17.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.PictureBox17.TabIndex = 54; - this.PictureBox17.TabStop = false; - // - // PictureBox18 - // - this.PictureBox18.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox18.Image"))); - this.PictureBox18.Location = new System.Drawing.Point(17, 107); - this.PictureBox18.Name = "PictureBox18"; - this.PictureBox18.Size = new System.Drawing.Size(24, 24); - this.PictureBox18.TabIndex = 53; - this.PictureBox18.TabStop = false; - // - // PictureBox13 - // - this.PictureBox13.BackColor = System.Drawing.Color.Transparent; - this.PictureBox13.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox13.Image"))); - this.PictureBox13.Location = new System.Drawing.Point(6, 6); - this.PictureBox13.Name = "PictureBox13"; - this.PictureBox13.Size = new System.Drawing.Size(35, 35); - this.PictureBox13.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.PictureBox13.TabIndex = 134; - this.PictureBox13.TabStop = false; - // - // Label6 - // - this.Label6.BackColor = System.Drawing.Color.Transparent; - this.Label6.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Bold); - this.Label6.Location = new System.Drawing.Point(43, 6); - this.Label6.Name = "Label6"; - this.Label6.Size = new System.Drawing.Size(409, 35); - this.Label6.TabIndex = 133; - this.Label6.Text = "Miscellaneous (For all cursors)"; - this.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // PictureBox9 - // - this.PictureBox9.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox9.Image"))); - this.PictureBox9.Location = new System.Drawing.Point(17, 47); - this.PictureBox9.Name = "PictureBox9"; - this.PictureBox9.Size = new System.Drawing.Size(24, 24); - this.PictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.PictureBox9.TabIndex = 84; - this.PictureBox9.TabStop = false; - // - // trails_btn - // - this.trails_btn.CustomColor = System.Drawing.Color.Empty; - this.trails_btn.Flag = WinPaletter.UI.WP.Button.Flags.None; - this.trails_btn.Font = new System.Drawing.Font("Segoe UI", 9F); - this.trails_btn.ForeColor = System.Drawing.Color.White; - this.trails_btn.Image = null; - this.trails_btn.Location = new System.Drawing.Point(418, 107); - this.trails_btn.Name = "trails_btn"; - this.trails_btn.Size = new System.Drawing.Size(34, 24); - this.trails_btn.TabIndex = 130; - this.trails_btn.UseVisualStyleBackColor = false; - this.trails_btn.Click += new System.EventHandler(this.Ttl_h_Click); - // - // PictureBox22 - // - this.PictureBox22.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox22.Image"))); - this.PictureBox22.Location = new System.Drawing.Point(17, 77); - this.PictureBox22.Name = "PictureBox22"; - this.PictureBox22.Size = new System.Drawing.Size(24, 24); - this.PictureBox22.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.PictureBox22.TabIndex = 132; - this.PictureBox22.TabStop = false; - // - // Label11 - // - this.Label11.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label11.Location = new System.Drawing.Point(47, 107); - this.Label11.Name = "Label11"; - this.Label11.Size = new System.Drawing.Size(69, 24); - this.Label11.TabIndex = 86; - this.Label11.Text = "Trails:"; - this.Label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // CheckBox9 - // - this.CheckBox9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.CheckBox9.Checked = false; - this.CheckBox9.Font = new System.Drawing.Font("Segoe UI", 9F); - this.CheckBox9.ForeColor = System.Drawing.Color.White; - this.CheckBox9.Location = new System.Drawing.Point(47, 47); - this.CheckBox9.Name = "CheckBox9"; - this.CheckBox9.Size = new System.Drawing.Size(405, 24); - this.CheckBox9.TabIndex = 83; - this.CheckBox9.Text = "Make cursors have a shadow"; - // - // PictureBox21 - // - this.PictureBox21.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox21.Image"))); - this.PictureBox21.Location = new System.Drawing.Point(17, 107); - this.PictureBox21.Name = "PictureBox21"; - this.PictureBox21.Size = new System.Drawing.Size(24, 24); - this.PictureBox21.TabIndex = 87; - this.PictureBox21.TabStop = false; - // - // Trackbar2 - // - this.Trackbar2.BackColor = System.Drawing.Color.Transparent; - this.Trackbar2.LargeChange = 2; - this.Trackbar2.Location = new System.Drawing.Point(122, 110); - this.Trackbar2.Maximum = 16; - this.Trackbar2.Minimum = 0; - this.Trackbar2.Name = "Trackbar2"; - this.Trackbar2.Size = new System.Drawing.Size(290, 19); - this.Trackbar2.SmallChange = 1; - this.Trackbar2.TabIndex = 85; - this.Trackbar2.Value = 0; - this.Trackbar2.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar2_Scroll); - // - // CheckBox10 - // - this.CheckBox10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.CheckBox10.Checked = false; - this.CheckBox10.Font = new System.Drawing.Font("Segoe UI", 9F); - this.CheckBox10.ForeColor = System.Drawing.Color.White; - this.CheckBox10.Location = new System.Drawing.Point(47, 77); - this.CheckBox10.Name = "CheckBox10"; - this.CheckBox10.Size = new System.Drawing.Size(405, 24); - this.CheckBox10.TabIndex = 131; - this.CheckBox10.Text = "Cursor tracking (Sonar)"; - // - // Label8 - // - this.Label8.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label8.Location = new System.Drawing.Point(47, 259); - this.Label8.Name = "Label8"; - this.Label8.Size = new System.Drawing.Size(56, 24); - this.Label8.TabIndex = 76; - this.Label8.Text = "Busy:"; - this.Label8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // PictureBox14 - // - this.PictureBox14.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox14.Image"))); - this.PictureBox14.Location = new System.Drawing.Point(17, 259); - this.PictureBox14.Name = "PictureBox14"; - this.PictureBox14.Size = new System.Drawing.Size(24, 24); - this.PictureBox14.TabIndex = 75; - this.PictureBox14.TabStop = false; - // - // Label10 - // - this.Label10.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label10.Location = new System.Drawing.Point(47, 229); - this.Label10.Name = "Label10"; - this.Label10.Size = new System.Drawing.Size(56, 24); - this.Label10.TabIndex = 74; - this.Label10.Text = "Arrow:"; - this.Label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.ComboBox5.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.ComboBox5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ComboBox5.Font = new System.Drawing.Font("Segoe UI", 9F); + this.ComboBox5.ForeColor = System.Drawing.Color.White; + this.ComboBox5.FormattingEnabled = true; + this.ComboBox5.ItemHeight = 20; + this.ComboBox5.Items.AddRange(new object[] { + "Aero", + "Modern", + "Classic"}); + this.ComboBox5.Location = new System.Drawing.Point(109, 228); + this.ComboBox5.Name = "ComboBox5"; + this.ComboBox5.Size = new System.Drawing.Size(343, 26); + this.ComboBox5.TabIndex = 65; + this.ComboBox5.SelectedIndexChanged += new System.EventHandler(this.ComboBox5_SelectedIndexChanged); // // PictureBox15 // @@ -626,17 +431,6 @@ private void InitializeComponent() this.PictureBox15.TabIndex = 73; this.PictureBox15.TabStop = false; // - // PictureBox11 - // - this.PictureBox11.BackColor = System.Drawing.Color.Transparent; - this.PictureBox11.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox11.Image"))); - this.PictureBox11.Location = new System.Drawing.Point(6, 188); - this.PictureBox11.Name = "PictureBox11"; - this.PictureBox11.Size = new System.Drawing.Size(35, 35); - this.PictureBox11.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.PictureBox11.TabIndex = 72; - this.PictureBox11.TabStop = false; - // // Label7 // this.Label7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -650,63 +444,71 @@ private void InitializeComponent() this.Label7.Text = "Style (if rendered by WinPaletter)"; this.Label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // ComboBox5 - // - this.ComboBox5.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.ComboBox5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ComboBox5.Font = new System.Drawing.Font("Segoe UI", 9F); - this.ComboBox5.ForeColor = System.Drawing.Color.White; - this.ComboBox5.FormattingEnabled = true; - this.ComboBox5.ItemHeight = 20; - this.ComboBox5.Items.AddRange(new object[] { - "Aero", - "Modern", - "Classic"}); - this.ComboBox5.Location = new System.Drawing.Point(109, 228); - this.ComboBox5.Name = "ComboBox5"; - this.ComboBox5.Size = new System.Drawing.Size(343, 26); - this.ComboBox5.TabIndex = 65; - this.ComboBox5.SelectedIndexChanged += new System.EventHandler(this.ComboBox5_SelectedIndexChanged); - // - // ComboBox6 + // tabPage2 // - this.ComboBox6.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.ComboBox6.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ComboBox6.Font = new System.Drawing.Font("Segoe UI", 9F); - this.ComboBox6.ForeColor = System.Drawing.Color.White; - this.ComboBox6.FormattingEnabled = true; - this.ComboBox6.ItemHeight = 20; - this.ComboBox6.Items.AddRange(new object[] { - "Aero", - "Dot", - "Classic"}); - this.ComboBox6.Location = new System.Drawing.Point(109, 259); - this.ComboBox6.Name = "ComboBox6"; - this.ComboBox6.Size = new System.Drawing.Size(343, 26); - this.ComboBox6.TabIndex = 68; - this.ComboBox6.SelectedIndexChanged += new System.EventHandler(this.ComboBox6_SelectedIndexChanged); - // - // PictureBox3 - // - this.PictureBox3.BackColor = System.Drawing.Color.Transparent; - this.PictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox3.Image"))); - this.PictureBox3.Location = new System.Drawing.Point(6, 260); - this.PictureBox3.Name = "PictureBox3"; - this.PictureBox3.Size = new System.Drawing.Size(35, 35); - this.PictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.PictureBox3.TabIndex = 76; - this.PictureBox3.TabStop = false; + this.tabPage2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); + this.tabPage2.Controls.Add(this.Button15); + this.tabPage2.Controls.Add(this.Button14); + this.tabPage2.Controls.Add(this.Trackbar6); + this.tabPage2.Controls.Add(this.label15); + this.tabPage2.Controls.Add(this.CheckBox6); + this.tabPage2.Controls.Add(this.Trackbar5); + this.tabPage2.Controls.Add(this.Button13); + this.tabPage2.Controls.Add(this.CheckBox7); + this.tabPage2.Controls.Add(this.ComboBox3); + this.tabPage2.Controls.Add(this.LoadingColor1); + this.tabPage2.Controls.Add(this.ComboBox4); + this.tabPage2.Controls.Add(this.CheckBox2); + this.tabPage2.Controls.Add(this.CircleColor1); + this.tabPage2.Controls.Add(this.CheckBox8); + this.tabPage2.Controls.Add(this.label17); + this.tabPage2.Controls.Add(this.LoadingColor2); + this.tabPage2.Controls.Add(this.CircleColor2); + this.tabPage2.Controls.Add(this.Trackbar4); + this.tabPage2.Controls.Add(this.Button12); + this.tabPage2.Controls.Add(this.CheckBox3); + this.tabPage2.Controls.Add(this.CheckBox4); + this.tabPage2.Controls.Add(this.ComboBox2); + this.tabPage2.Controls.Add(this.PictureBox3); + this.tabPage2.Controls.Add(this.Trackbar3); + this.tabPage2.Controls.Add(this.SecondaryColor1); + this.tabPage2.Controls.Add(this.SecondaryColor2); + this.tabPage2.Controls.Add(this.Label13); + this.tabPage2.Controls.Add(this.PrimaryColor2); + this.tabPage2.Controls.Add(this.PictureBox6); + this.tabPage2.Controls.Add(this.PrimaryColor1); + this.tabPage2.Controls.Add(this.ComboBox1); + this.tabPage2.Controls.Add(this.CheckBox1); + this.tabPage2.Controls.Add(this.Label2); + this.tabPage2.Controls.Add(this.CheckBox5); + this.tabPage2.Controls.Add(this.PictureBox2); + this.tabPage2.Controls.Add(this.Label3); + this.tabPage2.Controls.Add(this.PictureBox4); + this.tabPage2.Controls.Add(this.PictureBox7); + this.tabPage2.Controls.Add(this.PictureBox8); + this.tabPage2.Controls.Add(this.PictureBox5); + this.tabPage2.Controls.Add(this.Label21); + this.tabPage2.Controls.Add(this.PictureBox10); + this.tabPage2.Location = new System.Drawing.Point(154, 4); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(458, 499); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "Cursor colors"; // - // Label13 + // Button15 // - this.Label13.BackColor = System.Drawing.Color.Transparent; - this.Label13.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Bold); - this.Label13.Location = new System.Drawing.Point(43, 260); - this.Label13.Name = "Label13"; - this.Label13.Size = new System.Drawing.Size(406, 35); - this.Label13.TabIndex = 75; - this.Label13.Text = "Loading cursor (if selected cursor is app waiting or busy)"; - this.Label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.Button15.CustomColor = System.Drawing.Color.Empty; + this.Button15.Flag = WinPaletter.UI.WP.Button.Flags.None; + this.Button15.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button15.ForeColor = System.Drawing.Color.White; + this.Button15.Image = null; + this.Button15.Location = new System.Drawing.Point(418, 463); + this.Button15.Name = "Button15"; + this.Button15.Size = new System.Drawing.Size(34, 24); + this.Button15.TabIndex = 138; + this.Button15.UseVisualStyleBackColor = false; + this.Button15.Click += new System.EventHandler(this.Button15_Click); // // Button14 // @@ -722,6 +524,42 @@ private void InitializeComponent() this.Button14.UseVisualStyleBackColor = false; this.Button14.Click += new System.EventHandler(this.Button14_Click); // + // Trackbar6 + // + this.Trackbar6.BackColor = System.Drawing.Color.Transparent; + this.Trackbar6.LargeChange = 2; + this.Trackbar6.Location = new System.Drawing.Point(223, 466); + this.Trackbar6.Maximum = 100; + this.Trackbar6.Minimum = 0; + this.Trackbar6.Name = "Trackbar6"; + this.Trackbar6.Size = new System.Drawing.Size(189, 19); + this.Trackbar6.SmallChange = 1; + this.Trackbar6.TabIndex = 137; + this.Trackbar6.Value = 0; + this.Trackbar6.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar6_Scroll); + // + // label15 + // + this.label15.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label15.Location = new System.Drawing.Point(47, 331); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(169, 24); + this.label15.TabIndex = 135; + this.label15.Text = "Spinning part:"; + this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // CheckBox6 + // + this.CheckBox6.Checked = false; + this.CheckBox6.Font = new System.Drawing.Font("Segoe UI", 9F); + this.CheckBox6.ForeColor = System.Drawing.Color.White; + this.CheckBox6.Location = new System.Drawing.Point(47, 464); + this.CheckBox6.Name = "CheckBox6"; + this.CheckBox6.Size = new System.Drawing.Size(170, 24); + this.CheckBox6.TabIndex = 59; + this.CheckBox6.Text = "Spinning part noise:"; + this.CheckBox6.CheckedChanged += new WinPaletter.UI.WP.CheckBox.CheckedChangedEventHandler(this.CheckBox6_CheckedChanged); + // // Trackbar5 // this.Trackbar5.BackColor = System.Drawing.Color.Transparent; @@ -736,23 +574,22 @@ private void InitializeComponent() this.Trackbar5.Value = 0; this.Trackbar5.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar5_Scroll); // - // CircleColor1 + // Button13 // - this.CircleColor1.AllowDrop = true; - this.CircleColor1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.CircleColor1.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.CircleColor1.DontShowInfo = false; - this.CircleColor1.Location = new System.Drawing.Point(223, 301); - this.CircleColor1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.CircleColor1.Name = "CircleColor1"; - this.CircleColor1.Size = new System.Drawing.Size(110, 24); - this.CircleColor1.TabIndex = 11; - this.CircleColor1.Click += new System.EventHandler(this.GroupBox10_Click); - this.CircleColor1.DragDrop += new System.Windows.Forms.DragEventHandler(this.GroupBox10_Click); + this.Button13.CustomColor = System.Drawing.Color.Empty; + this.Button13.Flag = WinPaletter.UI.WP.Button.Flags.None; + this.Button13.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button13.ForeColor = System.Drawing.Color.White; + this.Button13.Image = null; + this.Button13.Location = new System.Drawing.Point(418, 209); + this.Button13.Name = "Button13"; + this.Button13.Size = new System.Drawing.Size(34, 24); + this.Button13.TabIndex = 134; + this.Button13.UseVisualStyleBackColor = false; + this.Button13.Click += new System.EventHandler(this.Button13_Click); // // CheckBox7 // - this.CheckBox7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox7.Checked = false; this.CheckBox7.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox7.ForeColor = System.Drawing.Color.White; @@ -763,19 +600,39 @@ private void InitializeComponent() this.CheckBox7.Text = "Background noise:"; this.CheckBox7.CheckedChanged += new WinPaletter.UI.WP.CheckBox.CheckedChangedEventHandler(this.CheckBox7_CheckedChanged); // - // CircleColor2 + // ComboBox3 // - this.CircleColor2.AllowDrop = true; - this.CircleColor2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.CircleColor2.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.CircleColor2.DontShowInfo = false; - this.CircleColor2.Location = new System.Drawing.Point(339, 301); - this.CircleColor2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.CircleColor2.Name = "CircleColor2"; - this.CircleColor2.Size = new System.Drawing.Size(110, 24); - this.CircleColor2.TabIndex = 13; - this.CircleColor2.Click += new System.EventHandler(this.GroupBox9_Click); - this.CircleColor2.DragDrop += new System.Windows.Forms.DragEventHandler(this.GroupBox9_Click); + this.ComboBox3.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.ComboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ComboBox3.Font = new System.Drawing.Font("Segoe UI", 9F); + this.ComboBox3.ForeColor = System.Drawing.Color.White; + this.ComboBox3.FormattingEnabled = true; + this.ComboBox3.ItemHeight = 20; + this.ComboBox3.Items.AddRange(new object[] { + "Vertical", + "Horizontal", + "Forward Diagonal", + "Backward Diagonal", + "Circle"}); + this.ComboBox3.Location = new System.Drawing.Point(223, 396); + this.ComboBox3.Name = "ComboBox3"; + this.ComboBox3.Size = new System.Drawing.Size(229, 26); + this.ComboBox3.TabIndex = 35; + this.ComboBox3.SelectedIndexChanged += new System.EventHandler(this.ComboBox3_SelectedIndexChanged); + // + // LoadingColor1 + // + this.LoadingColor1.AllowDrop = true; + this.LoadingColor1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); + this.LoadingColor1.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.LoadingColor1.DontShowInfo = false; + this.LoadingColor1.Location = new System.Drawing.Point(223, 331); + this.LoadingColor1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.LoadingColor1.Name = "LoadingColor1"; + this.LoadingColor1.Size = new System.Drawing.Size(110, 24); + this.LoadingColor1.TabIndex = 31; + this.LoadingColor1.Click += new System.EventHandler(this.GroupBox8_Click); + this.LoadingColor1.DragDrop += new System.Windows.Forms.DragEventHandler(this.GroupBox8_Click); // // ComboBox4 // @@ -797,9 +654,34 @@ private void InitializeComponent() this.ComboBox4.TabIndex = 17; this.ComboBox4.SelectedIndexChanged += new System.EventHandler(this.ComboBox4_SelectedIndexChanged); // + // CheckBox2 + // + this.CheckBox2.Checked = false; + this.CheckBox2.Font = new System.Drawing.Font("Segoe UI", 9F); + this.CheckBox2.ForeColor = System.Drawing.Color.White; + this.CheckBox2.Location = new System.Drawing.Point(47, 397); + this.CheckBox2.Name = "CheckBox2"; + this.CheckBox2.Size = new System.Drawing.Size(170, 24); + this.CheckBox2.TabIndex = 52; + this.CheckBox2.Text = "Spinning part gradience:"; + this.CheckBox2.CheckedChanged += new WinPaletter.UI.WP.CheckBox.CheckedChangedEventHandler(this.CheckBox2_CheckedChanged); + // + // CircleColor1 + // + this.CircleColor1.AllowDrop = true; + this.CircleColor1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); + this.CircleColor1.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.CircleColor1.DontShowInfo = false; + this.CircleColor1.Location = new System.Drawing.Point(223, 301); + this.CircleColor1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.CircleColor1.Name = "CircleColor1"; + this.CircleColor1.Size = new System.Drawing.Size(110, 24); + this.CircleColor1.TabIndex = 11; + this.CircleColor1.Click += new System.EventHandler(this.GroupBox10_Click); + this.CircleColor1.DragDrop += new System.Windows.Forms.DragEventHandler(this.GroupBox10_Click); + // // CheckBox8 // - this.CheckBox8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox8.Checked = false; this.CheckBox8.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox8.ForeColor = System.Drawing.Color.White; @@ -810,86 +692,21 @@ private void InitializeComponent() this.CheckBox8.Text = "Background gradience:"; this.CheckBox8.CheckedChanged += new WinPaletter.UI.WP.CheckBox.CheckedChangedEventHandler(this.CheckBox8_CheckedChanged); // - // Button15 - // - this.Button15.CustomColor = System.Drawing.Color.Empty; - this.Button15.Flag = WinPaletter.UI.WP.Button.Flags.None; - this.Button15.Font = new System.Drawing.Font("Segoe UI", 9F); - this.Button15.ForeColor = System.Drawing.Color.White; - this.Button15.Image = null; - this.Button15.Location = new System.Drawing.Point(418, 463); - this.Button15.Name = "Button15"; - this.Button15.Size = new System.Drawing.Size(34, 24); - this.Button15.TabIndex = 138; - this.Button15.UseVisualStyleBackColor = false; - this.Button15.Click += new System.EventHandler(this.Button15_Click); + // label17 // - // Trackbar6 + this.label17.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label17.Location = new System.Drawing.Point(47, 77); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(169, 24); + this.label17.TabIndex = 133; + this.label17.Text = "Border color:"; + this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - this.Trackbar6.BackColor = System.Drawing.Color.Transparent; - this.Trackbar6.LargeChange = 2; - this.Trackbar6.Location = new System.Drawing.Point(223, 466); - this.Trackbar6.Maximum = 100; - this.Trackbar6.Minimum = 0; - this.Trackbar6.Name = "Trackbar6"; - this.Trackbar6.Size = new System.Drawing.Size(189, 19); - this.Trackbar6.SmallChange = 1; - this.Trackbar6.TabIndex = 137; - this.Trackbar6.Value = 0; - this.Trackbar6.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar6_Scroll); - // - // LoadingColor1 - // - this.LoadingColor1.AllowDrop = true; - this.LoadingColor1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.LoadingColor1.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.LoadingColor1.DontShowInfo = false; - this.LoadingColor1.Location = new System.Drawing.Point(223, 331); - this.LoadingColor1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.LoadingColor1.Name = "LoadingColor1"; - this.LoadingColor1.Size = new System.Drawing.Size(110, 24); - this.LoadingColor1.TabIndex = 31; - this.LoadingColor1.Click += new System.EventHandler(this.GroupBox8_Click); - this.LoadingColor1.DragDrop += new System.Windows.Forms.DragEventHandler(this.GroupBox8_Click); - // - // ComboBox3 - // - this.ComboBox3.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.ComboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ComboBox3.Font = new System.Drawing.Font("Segoe UI", 9F); - this.ComboBox3.ForeColor = System.Drawing.Color.White; - this.ComboBox3.FormattingEnabled = true; - this.ComboBox3.ItemHeight = 20; - this.ComboBox3.Items.AddRange(new object[] { - "Vertical", - "Horizontal", - "Forward Diagonal", - "Backward Diagonal", - "Circle"}); - this.ComboBox3.Location = new System.Drawing.Point(223, 396); - this.ComboBox3.Name = "ComboBox3"; - this.ComboBox3.Size = new System.Drawing.Size(229, 26); - this.ComboBox3.TabIndex = 35; - this.ComboBox3.SelectedIndexChanged += new System.EventHandler(this.ComboBox3_SelectedIndexChanged); - // - // CheckBox2 - // - this.CheckBox2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.CheckBox2.Checked = false; - this.CheckBox2.Font = new System.Drawing.Font("Segoe UI", 9F); - this.CheckBox2.ForeColor = System.Drawing.Color.White; - this.CheckBox2.Location = new System.Drawing.Point(47, 397); - this.CheckBox2.Name = "CheckBox2"; - this.CheckBox2.Size = new System.Drawing.Size(170, 24); - this.CheckBox2.TabIndex = 52; - this.CheckBox2.Text = "Spinning part gradience:"; - this.CheckBox2.CheckedChanged += new WinPaletter.UI.WP.CheckBox.CheckedChangedEventHandler(this.CheckBox2_CheckedChanged); - // - // LoadingColor2 + // LoadingColor2 // this.LoadingColor2.AllowDrop = true; this.LoadingColor2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.LoadingColor2.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.LoadingColor2.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); this.LoadingColor2.DontShowInfo = false; this.LoadingColor2.Location = new System.Drawing.Point(339, 331); this.LoadingColor2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -899,276 +716,136 @@ private void InitializeComponent() this.LoadingColor2.Click += new System.EventHandler(this.GroupBox7_Click); this.LoadingColor2.DragDrop += new System.Windows.Forms.DragEventHandler(this.GroupBox7_Click); // - // CheckBox6 + // CircleColor2 // - this.CheckBox6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.CheckBox6.Checked = false; - this.CheckBox6.Font = new System.Drawing.Font("Segoe UI", 9F); - this.CheckBox6.ForeColor = System.Drawing.Color.White; - this.CheckBox6.Location = new System.Drawing.Point(47, 464); - this.CheckBox6.Name = "CheckBox6"; - this.CheckBox6.Size = new System.Drawing.Size(170, 24); - this.CheckBox6.TabIndex = 59; - this.CheckBox6.Text = "Spinning part noise:"; - this.CheckBox6.CheckedChanged += new WinPaletter.UI.WP.CheckBox.CheckedChangedEventHandler(this.CheckBox6_CheckedChanged); + this.CircleColor2.AllowDrop = true; + this.CircleColor2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); + this.CircleColor2.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.CircleColor2.DontShowInfo = false; + this.CircleColor2.Location = new System.Drawing.Point(339, 301); + this.CircleColor2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.CircleColor2.Name = "CircleColor2"; + this.CircleColor2.Size = new System.Drawing.Size(110, 24); + this.CircleColor2.TabIndex = 13; + this.CircleColor2.Click += new System.EventHandler(this.GroupBox9_Click); + this.CircleColor2.DragDrop += new System.Windows.Forms.DragEventHandler(this.GroupBox9_Click); // - // PictureBox7 + // Trackbar4 // - this.PictureBox7.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox7.Image"))); - this.PictureBox7.Location = new System.Drawing.Point(17, 433); - this.PictureBox7.Name = "PictureBox7"; - this.PictureBox7.Size = new System.Drawing.Size(24, 24); - this.PictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.PictureBox7.TabIndex = 54; - this.PictureBox7.TabStop = false; + this.Trackbar4.BackColor = System.Drawing.Color.Transparent; + this.Trackbar4.LargeChange = 2; + this.Trackbar4.Location = new System.Drawing.Point(223, 212); + this.Trackbar4.Maximum = 100; + this.Trackbar4.Minimum = 0; + this.Trackbar4.Name = "Trackbar4"; + this.Trackbar4.Size = new System.Drawing.Size(189, 19); + this.Trackbar4.SmallChange = 1; + this.Trackbar4.TabIndex = 133; + this.Trackbar4.Value = 0; + this.Trackbar4.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar4_Scroll); // - // PictureBox8 + // Button12 // - this.PictureBox8.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox8.Image"))); - this.PictureBox8.Location = new System.Drawing.Point(17, 367); - this.PictureBox8.Name = "PictureBox8"; - this.PictureBox8.Size = new System.Drawing.Size(24, 24); - this.PictureBox8.TabIndex = 53; - this.PictureBox8.TabStop = false; + this.Button12.CustomColor = System.Drawing.Color.Empty; + this.Button12.Flag = WinPaletter.UI.WP.Button.Flags.None; + this.Button12.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button12.ForeColor = System.Drawing.Color.White; + this.Button12.Image = null; + this.Button12.Location = new System.Drawing.Point(418, 179); + this.Button12.Name = "Button12"; + this.Button12.Size = new System.Drawing.Size(34, 24); + this.Button12.TabIndex = 132; + this.Button12.UseVisualStyleBackColor = false; + this.Button12.Click += new System.EventHandler(this.Button12_Click); // - // Label21 + // CheckBox3 // - this.Label21.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label21.Location = new System.Drawing.Point(47, 301); - this.Label21.Name = "Label21"; - this.Label21.Size = new System.Drawing.Size(169, 24); - this.Label21.TabIndex = 12; - this.Label21.Text = "Background color:"; - this.Label21.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.CheckBox3.Checked = false; + this.CheckBox3.Font = new System.Drawing.Font("Segoe UI", 9F); + this.CheckBox3.ForeColor = System.Drawing.Color.White; + this.CheckBox3.Location = new System.Drawing.Point(47, 210); + this.CheckBox3.Name = "CheckBox3"; + this.CheckBox3.Size = new System.Drawing.Size(170, 24); + this.CheckBox3.TabIndex = 59; + this.CheckBox3.Text = "Border noise:"; + this.CheckBox3.CheckedChanged += new WinPaletter.UI.WP.CheckBox.CheckedChangedEventHandler(this.CheckBox3_CheckedChanged); // - // PictureBox10 + // CheckBox4 // - this.PictureBox10.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox10.Image"))); - this.PictureBox10.Location = new System.Drawing.Point(17, 301); - this.PictureBox10.Name = "PictureBox10"; - this.PictureBox10.Size = new System.Drawing.Size(24, 24); - this.PictureBox10.TabIndex = 9; - this.PictureBox10.TabStop = false; + this.CheckBox4.Checked = false; + this.CheckBox4.Font = new System.Drawing.Font("Segoe UI", 9F); + this.CheckBox4.ForeColor = System.Drawing.Color.White; + this.CheckBox4.Location = new System.Drawing.Point(47, 143); + this.CheckBox4.Name = "CheckBox4"; + this.CheckBox4.Size = new System.Drawing.Size(170, 24); + this.CheckBox4.TabIndex = 52; + this.CheckBox4.Text = "Border gradience:"; + this.CheckBox4.CheckedChanged += new WinPaletter.UI.WP.CheckBox.CheckedChangedEventHandler(this.CheckBox4_CheckedChanged); // - // Button11 + // ComboBox2 // - this.Button11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button11.CustomColor = System.Drawing.Color.Empty; - this.Button11.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; - this.Button11.Font = new System.Drawing.Font("Segoe UI", 9F); - this.Button11.ForeColor = System.Drawing.Color.White; - this.Button11.Image = ((System.Drawing.Image)(resources.GetObject("Button11.Image"))); - this.Button11.Location = new System.Drawing.Point(639, 572); - this.Button11.Name = "Button11"; - this.Button11.Size = new System.Drawing.Size(115, 34); - this.Button11.TabIndex = 82; - this.Button11.Text = "Quick apply"; - this.Button11.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - this.Button11.UseVisualStyleBackColor = false; - this.Button11.Click += new System.EventHandler(this.Button11_Click); + this.ComboBox2.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.ComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ComboBox2.Font = new System.Drawing.Font("Segoe UI", 9F); + this.ComboBox2.ForeColor = System.Drawing.Color.White; + this.ComboBox2.FormattingEnabled = true; + this.ComboBox2.ItemHeight = 20; + this.ComboBox2.Items.AddRange(new object[] { + "Vertical", + "Horizontal", + "Forward Diagonal", + "Backward Diagonal", + "Circle"}); + this.ComboBox2.Location = new System.Drawing.Point(223, 142); + this.ComboBox2.Name = "ComboBox2"; + this.ComboBox2.Size = new System.Drawing.Size(229, 26); + this.ComboBox2.TabIndex = 35; + this.ComboBox2.SelectedIndexChanged += new System.EventHandler(this.ComboBox2_SelectedIndexChanged); // - // GroupBox13 + // PictureBox3 // - this.GroupBox13.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.GroupBox13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34))))); - this.GroupBox13.Controls.Add(this.checker_img); - this.GroupBox13.Controls.Add(this.Toggle1); - this.GroupBox13.Controls.Add(this.Button7); - this.GroupBox13.Controls.Add(this.Button8); - this.GroupBox13.Controls.Add(this.Button9); - this.GroupBox13.Controls.Add(this.Label12); - this.GroupBox13.Location = new System.Drawing.Point(12, 12); - this.GroupBox13.Name = "GroupBox13"; - this.GroupBox13.Size = new System.Drawing.Size(928, 39); - this.GroupBox13.TabIndex = 78; + this.PictureBox3.BackColor = System.Drawing.Color.Transparent; + this.PictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox3.Image"))); + this.PictureBox3.Location = new System.Drawing.Point(6, 260); + this.PictureBox3.Name = "PictureBox3"; + this.PictureBox3.Size = new System.Drawing.Size(35, 35); + this.PictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.PictureBox3.TabIndex = 76; + this.PictureBox3.TabStop = false; // - // checker_img + // Trackbar3 // - this.checker_img.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.checker_img.BackColor = System.Drawing.Color.Transparent; - this.checker_img.Image = ((System.Drawing.Image)(resources.GetObject("checker_img.Image"))); - this.checker_img.Location = new System.Drawing.Point(840, 4); - this.checker_img.Name = "checker_img"; - this.checker_img.Size = new System.Drawing.Size(35, 31); - this.checker_img.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.checker_img.TabIndex = 84; - this.checker_img.TabStop = false; + this.Trackbar3.BackColor = System.Drawing.Color.Transparent; + this.Trackbar3.LargeChange = 2; + this.Trackbar3.Location = new System.Drawing.Point(223, 182); + this.Trackbar3.Maximum = 100; + this.Trackbar3.Minimum = 0; + this.Trackbar3.Name = "Trackbar3"; + this.Trackbar3.Size = new System.Drawing.Size(189, 19); + this.Trackbar3.SmallChange = 1; + this.Trackbar3.TabIndex = 131; + this.Trackbar3.Value = 0; + this.Trackbar3.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar3_Scroll); // - // Toggle1 + // SecondaryColor1 // - this.Toggle1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Toggle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); - this.Toggle1.Checked = true; - this.Toggle1.DarkLight_Toggler = false; - this.Toggle1.Location = new System.Drawing.Point(880, 9); - this.Toggle1.Name = "Toggle1"; - this.Toggle1.Size = new System.Drawing.Size(40, 20); - this.Toggle1.TabIndex = 77; - this.Toggle1.CheckedChanged += new WinPaletter.UI.WP.Toggle.CheckedChangedEventHandler(this.Toggle1_CheckedChanged); + this.SecondaryColor1.AllowDrop = true; + this.SecondaryColor1.BackColor = System.Drawing.Color.Black; + this.SecondaryColor1.DefaultBackColor = System.Drawing.Color.Black; + this.SecondaryColor1.DontShowInfo = false; + this.SecondaryColor1.Location = new System.Drawing.Point(223, 77); + this.SecondaryColor1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.SecondaryColor1.Name = "SecondaryColor1"; + this.SecondaryColor1.Size = new System.Drawing.Size(110, 24); + this.SecondaryColor1.TabIndex = 31; + this.SecondaryColor1.Click += new System.EventHandler(this.GroupBox5_Click); + this.SecondaryColor1.DragDrop += new System.Windows.Forms.DragEventHandler(this.GroupBox5_Click); // - // Button7 - // - this.Button7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.Button7.CustomColor = System.Drawing.Color.Empty; - this.Button7.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; - this.Button7.Font = new System.Drawing.Font("Segoe UI", 9F); - this.Button7.ForeColor = System.Drawing.Color.White; - this.Button7.Image = ((System.Drawing.Image)(resources.GetObject("Button7.Image"))); - this.Button7.Location = new System.Drawing.Point(82, 5); - this.Button7.Name = "Button7"; - this.Button7.Size = new System.Drawing.Size(146, 29); - this.Button7.TabIndex = 69; - this.Button7.Text = "WinPaletter Theme"; - this.Button7.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - this.Button7.UseVisualStyleBackColor = false; - this.Button7.Click += new System.EventHandler(this.Button7_Click); - // - // Button8 - // - this.Button8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.Button8.CustomColor = System.Drawing.Color.Empty; - this.Button8.Flag = WinPaletter.UI.WP.Button.Flags.None; - this.Button8.Font = new System.Drawing.Font("Segoe UI", 9F); - this.Button8.ForeColor = System.Drawing.Color.White; - this.Button8.Image = null; - this.Button8.Location = new System.Drawing.Point(366, 5); - this.Button8.Name = "Button8"; - this.Button8.Size = new System.Drawing.Size(134, 29); - this.Button8.TabIndex = 68; - this.Button8.Text = "Default Windows"; - this.Button8.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - this.Button8.UseVisualStyleBackColor = false; - this.Button8.Click += new System.EventHandler(this.Button8_Click); - // - // Button9 - // - this.Button9.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.Button9.CustomColor = System.Drawing.Color.Empty; - this.Button9.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; - this.Button9.Font = new System.Drawing.Font("Segoe UI", 9F); - this.Button9.ForeColor = System.Drawing.Color.White; - this.Button9.Image = ((System.Drawing.Image)(resources.GetObject("Button9.Image"))); - this.Button9.Location = new System.Drawing.Point(230, 5); - this.Button9.Name = "Button9"; - this.Button9.Size = new System.Drawing.Size(134, 29); - this.Button9.TabIndex = 67; - this.Button9.Text = "Current applied"; - this.Button9.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - this.Button9.UseVisualStyleBackColor = false; - this.Button9.Click += new System.EventHandler(this.Button9_Click); - // - // Label12 - // - this.Label12.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.Label12.BackColor = System.Drawing.Color.Transparent; - this.Label12.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label12.Location = new System.Drawing.Point(5, 5); - this.Label12.Name = "Label12"; - this.Label12.Size = new System.Drawing.Size(71, 28); - this.Label12.TabIndex = 4; - this.Label12.Text = "Open from:"; - this.Label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // PictureBox6 - // - this.PictureBox6.BackColor = System.Drawing.Color.Transparent; - this.PictureBox6.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox6.Image"))); - this.PictureBox6.Location = new System.Drawing.Point(6, 6); - this.PictureBox6.Name = "PictureBox6"; - this.PictureBox6.Size = new System.Drawing.Size(35, 35); - this.PictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.PictureBox6.TabIndex = 74; - this.PictureBox6.TabStop = false; - // - // Label2 - // - this.Label2.BackColor = System.Drawing.Color.Transparent; - this.Label2.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Bold); - this.Label2.Location = new System.Drawing.Point(43, 6); - this.Label2.Name = "Label2"; - this.Label2.Size = new System.Drawing.Size(406, 35); - this.Label2.TabIndex = 73; - this.Label2.Text = "Cursor"; - this.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // Button13 - // - this.Button13.CustomColor = System.Drawing.Color.Empty; - this.Button13.Flag = WinPaletter.UI.WP.Button.Flags.None; - this.Button13.Font = new System.Drawing.Font("Segoe UI", 9F); - this.Button13.ForeColor = System.Drawing.Color.White; - this.Button13.Image = null; - this.Button13.Location = new System.Drawing.Point(418, 209); - this.Button13.Name = "Button13"; - this.Button13.Size = new System.Drawing.Size(34, 24); - this.Button13.TabIndex = 134; - this.Button13.UseVisualStyleBackColor = false; - this.Button13.Click += new System.EventHandler(this.Button13_Click); - // - // Trackbar4 - // - this.Trackbar4.BackColor = System.Drawing.Color.Transparent; - this.Trackbar4.LargeChange = 2; - this.Trackbar4.Location = new System.Drawing.Point(223, 212); - this.Trackbar4.Maximum = 100; - this.Trackbar4.Minimum = 0; - this.Trackbar4.Name = "Trackbar4"; - this.Trackbar4.Size = new System.Drawing.Size(189, 19); - this.Trackbar4.SmallChange = 1; - this.Trackbar4.TabIndex = 133; - this.Trackbar4.Value = 0; - this.Trackbar4.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar4_Scroll); - // - // CheckBox4 - // - this.CheckBox4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.CheckBox4.Checked = false; - this.CheckBox4.Font = new System.Drawing.Font("Segoe UI", 9F); - this.CheckBox4.ForeColor = System.Drawing.Color.White; - this.CheckBox4.Location = new System.Drawing.Point(47, 143); - this.CheckBox4.Name = "CheckBox4"; - this.CheckBox4.Size = new System.Drawing.Size(170, 24); - this.CheckBox4.TabIndex = 52; - this.CheckBox4.Text = "Border gradience:"; - this.CheckBox4.CheckedChanged += new WinPaletter.UI.WP.CheckBox.CheckedChangedEventHandler(this.CheckBox4_CheckedChanged); - // - // CheckBox3 - // - this.CheckBox3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.CheckBox3.Checked = false; - this.CheckBox3.Font = new System.Drawing.Font("Segoe UI", 9F); - this.CheckBox3.ForeColor = System.Drawing.Color.White; - this.CheckBox3.Location = new System.Drawing.Point(47, 210); - this.CheckBox3.Name = "CheckBox3"; - this.CheckBox3.Size = new System.Drawing.Size(170, 24); - this.CheckBox3.TabIndex = 59; - this.CheckBox3.Text = "Border noise:"; - this.CheckBox3.CheckedChanged += new WinPaletter.UI.WP.CheckBox.CheckedChangedEventHandler(this.CheckBox3_CheckedChanged); - // - // SecondaryColor1 - // - this.SecondaryColor1.AllowDrop = true; - this.SecondaryColor1.BackColor = System.Drawing.Color.Black; - this.SecondaryColor1.DefaultColor = System.Drawing.Color.Black; - this.SecondaryColor1.DontShowInfo = false; - this.SecondaryColor1.Location = new System.Drawing.Point(223, 77); - this.SecondaryColor1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.SecondaryColor1.Name = "SecondaryColor1"; - this.SecondaryColor1.Size = new System.Drawing.Size(110, 24); - this.SecondaryColor1.TabIndex = 31; - this.SecondaryColor1.Click += new System.EventHandler(this.GroupBox5_Click); - this.SecondaryColor1.DragDrop += new System.Windows.Forms.DragEventHandler(this.GroupBox5_Click); - // - // SecondaryColor2 + // SecondaryColor2 // this.SecondaryColor2.AllowDrop = true; this.SecondaryColor2.BackColor = System.Drawing.Color.Black; - this.SecondaryColor2.DefaultColor = System.Drawing.Color.Black; + this.SecondaryColor2.DefaultBackColor = System.Drawing.Color.Black; this.SecondaryColor2.DontShowInfo = false; this.SecondaryColor2.Location = new System.Drawing.Point(339, 77); this.SecondaryColor2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1178,59 +855,22 @@ private void InitializeComponent() this.SecondaryColor2.Click += new System.EventHandler(this.GroupBox4_Click); this.SecondaryColor2.DragDrop += new System.Windows.Forms.DragEventHandler(this.GroupBox4_Click); // - // ComboBox2 - // - this.ComboBox2.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.ComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ComboBox2.Font = new System.Drawing.Font("Segoe UI", 9F); - this.ComboBox2.ForeColor = System.Drawing.Color.White; - this.ComboBox2.FormattingEnabled = true; - this.ComboBox2.ItemHeight = 20; - this.ComboBox2.Items.AddRange(new object[] { - "Vertical", - "Horizontal", - "Forward Diagonal", - "Backward Diagonal", - "Circle"}); - this.ComboBox2.Location = new System.Drawing.Point(223, 142); - this.ComboBox2.Name = "ComboBox2"; - this.ComboBox2.Size = new System.Drawing.Size(229, 26); - this.ComboBox2.TabIndex = 35; - this.ComboBox2.SelectedIndexChanged += new System.EventHandler(this.ComboBox2_SelectedIndexChanged); - // - // Button12 - // - this.Button12.CustomColor = System.Drawing.Color.Empty; - this.Button12.Flag = WinPaletter.UI.WP.Button.Flags.None; - this.Button12.Font = new System.Drawing.Font("Segoe UI", 9F); - this.Button12.ForeColor = System.Drawing.Color.White; - this.Button12.Image = null; - this.Button12.Location = new System.Drawing.Point(418, 179); - this.Button12.Name = "Button12"; - this.Button12.Size = new System.Drawing.Size(34, 24); - this.Button12.TabIndex = 132; - this.Button12.UseVisualStyleBackColor = false; - this.Button12.Click += new System.EventHandler(this.Button12_Click); - // - // Trackbar3 + // Label13 // - this.Trackbar3.BackColor = System.Drawing.Color.Transparent; - this.Trackbar3.LargeChange = 2; - this.Trackbar3.Location = new System.Drawing.Point(223, 182); - this.Trackbar3.Maximum = 100; - this.Trackbar3.Minimum = 0; - this.Trackbar3.Name = "Trackbar3"; - this.Trackbar3.Size = new System.Drawing.Size(189, 19); - this.Trackbar3.SmallChange = 1; - this.Trackbar3.TabIndex = 131; - this.Trackbar3.Value = 0; - this.Trackbar3.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar3_Scroll); + this.Label13.BackColor = System.Drawing.Color.Transparent; + this.Label13.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Bold); + this.Label13.Location = new System.Drawing.Point(43, 260); + this.Label13.Name = "Label13"; + this.Label13.Size = new System.Drawing.Size(406, 35); + this.Label13.TabIndex = 75; + this.Label13.Text = "Loading cursor (if selected cursor is app waiting or busy)"; + this.Label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // PrimaryColor2 // this.PrimaryColor2.AllowDrop = true; this.PrimaryColor2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.PrimaryColor2.DefaultColor = System.Drawing.Color.White; + this.PrimaryColor2.DefaultBackColor = System.Drawing.Color.White; this.PrimaryColor2.DontShowInfo = false; this.PrimaryColor2.Location = new System.Drawing.Point(339, 47); this.PrimaryColor2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1240,11 +880,22 @@ private void InitializeComponent() this.PrimaryColor2.Click += new System.EventHandler(this.GroupBox3_Click); this.PrimaryColor2.DragDrop += new System.Windows.Forms.DragEventHandler(this.GroupBox3_Click); // + // PictureBox6 + // + this.PictureBox6.BackColor = System.Drawing.Color.Transparent; + this.PictureBox6.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox6.Image"))); + this.PictureBox6.Location = new System.Drawing.Point(6, 6); + this.PictureBox6.Name = "PictureBox6"; + this.PictureBox6.Size = new System.Drawing.Size(35, 35); + this.PictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.PictureBox6.TabIndex = 74; + this.PictureBox6.TabStop = false; + // // PrimaryColor1 // this.PrimaryColor1.AllowDrop = true; this.PrimaryColor1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.PrimaryColor1.DefaultColor = System.Drawing.Color.White; + this.PrimaryColor1.DefaultBackColor = System.Drawing.Color.White; this.PrimaryColor1.DontShowInfo = false; this.PrimaryColor1.Location = new System.Drawing.Point(223, 47); this.PrimaryColor1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1276,7 +927,6 @@ private void InitializeComponent() // // CheckBox1 // - this.CheckBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox1.Checked = false; this.CheckBox1.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox1.ForeColor = System.Drawing.Color.White; @@ -1287,9 +937,19 @@ private void InitializeComponent() this.CheckBox1.Text = "Background gradience:"; this.CheckBox1.CheckedChanged += new WinPaletter.UI.WP.CheckBox.CheckedChangedEventHandler(this.CheckBox1_CheckedChanged); // + // Label2 + // + this.Label2.BackColor = System.Drawing.Color.Transparent; + this.Label2.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Bold); + this.Label2.Location = new System.Drawing.Point(43, 6); + this.Label2.Name = "Label2"; + this.Label2.Size = new System.Drawing.Size(406, 35); + this.Label2.TabIndex = 73; + this.Label2.Text = "Cursor"; + this.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // CheckBox5 // - this.CheckBox5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox5.Checked = false; this.CheckBox5.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox5.ForeColor = System.Drawing.Color.White; @@ -1300,24 +960,14 @@ private void InitializeComponent() this.CheckBox5.Text = "Background noise:"; this.CheckBox5.CheckedChanged += new WinPaletter.UI.WP.CheckBox.CheckedChangedEventHandler(this.CheckBox5_CheckedChanged); // - // PictureBox5 - // - this.PictureBox5.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox5.Image"))); - this.PictureBox5.Location = new System.Drawing.Point(17, 179); - this.PictureBox5.Name = "PictureBox5"; - this.PictureBox5.Size = new System.Drawing.Size(24, 24); - this.PictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.PictureBox5.TabIndex = 54; - this.PictureBox5.TabStop = false; - // - // PictureBox4 + // PictureBox2 // - this.PictureBox4.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox4.Image"))); - this.PictureBox4.Location = new System.Drawing.Point(17, 113); - this.PictureBox4.Name = "PictureBox4"; - this.PictureBox4.Size = new System.Drawing.Size(24, 24); - this.PictureBox4.TabIndex = 53; - this.PictureBox4.TabStop = false; + this.PictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox2.Image"))); + this.PictureBox2.Location = new System.Drawing.Point(17, 47); + this.PictureBox2.Name = "PictureBox2"; + this.PictureBox2.Size = new System.Drawing.Size(24, 24); + this.PictureBox2.TabIndex = 9; + this.PictureBox2.TabStop = false; // // Label3 // @@ -1329,1329 +979,1671 @@ private void InitializeComponent() this.Label3.Text = "Background color:"; this.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // PictureBox2 + // PictureBox4 // - this.PictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox2.Image"))); - this.PictureBox2.Location = new System.Drawing.Point(17, 47); - this.PictureBox2.Name = "PictureBox2"; - this.PictureBox2.Size = new System.Drawing.Size(24, 24); - this.PictureBox2.TabIndex = 9; - this.PictureBox2.TabStop = false; + this.PictureBox4.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox4.Image"))); + this.PictureBox4.Location = new System.Drawing.Point(17, 113); + this.PictureBox4.Name = "PictureBox4"; + this.PictureBox4.Size = new System.Drawing.Size(24, 24); + this.PictureBox4.TabIndex = 53; + this.PictureBox4.TabStop = false; // - // Button3 + // PictureBox7 // - this.Button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button3.CustomColor = System.Drawing.Color.Empty; - this.Button3.Flag = WinPaletter.UI.WP.Button.Flags.None; - this.Button3.Font = new System.Drawing.Font("Segoe UI", 9F); - this.Button3.ForeColor = System.Drawing.Color.White; - this.Button3.Image = null; - this.Button3.Location = new System.Drawing.Point(553, 572); - this.Button3.Name = "Button3"; - this.Button3.Size = new System.Drawing.Size(80, 34); - this.Button3.TabIndex = 66; - this.Button3.Text = "Cancel"; - this.Button3.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - this.Button3.UseVisualStyleBackColor = false; - this.Button3.Click += new System.EventHandler(this.Button3_Click); + this.PictureBox7.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox7.Image"))); + this.PictureBox7.Location = new System.Drawing.Point(17, 433); + this.PictureBox7.Name = "PictureBox7"; + this.PictureBox7.Size = new System.Drawing.Size(24, 24); + this.PictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.PictureBox7.TabIndex = 54; + this.PictureBox7.TabStop = false; // - // Button4 + // PictureBox8 // - this.Button4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button4.CustomColor = System.Drawing.Color.Empty; - this.Button4.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; - this.Button4.Font = new System.Drawing.Font("Segoe UI", 9F); - this.Button4.ForeColor = System.Drawing.Color.White; - this.Button4.Image = ((System.Drawing.Image)(resources.GetObject("Button4.Image"))); - this.Button4.Location = new System.Drawing.Point(760, 572); - this.Button4.Name = "Button4"; - this.Button4.Size = new System.Drawing.Size(180, 34); - this.Button4.TabIndex = 65; - this.Button4.Text = "Load into current theme"; - this.Button4.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - this.Button4.UseVisualStyleBackColor = false; - this.Button4.Click += new System.EventHandler(this.Button4_Click); + this.PictureBox8.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox8.Image"))); + this.PictureBox8.Location = new System.Drawing.Point(17, 367); + this.PictureBox8.Name = "PictureBox8"; + this.PictureBox8.Size = new System.Drawing.Size(24, 24); + this.PictureBox8.TabIndex = 53; + this.PictureBox8.TabStop = false; // - // GroupBox1 + // PictureBox5 // - this.GroupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.GroupBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34))))); - this.GroupBox1.Controls.Add(this.Button5); - this.GroupBox1.Controls.Add(this.Button10); - this.GroupBox1.Controls.Add(this.Label1); - this.GroupBox1.Controls.Add(this.FlowLayoutPanel1); - this.GroupBox1.Controls.Add(this.PictureBox12); - this.GroupBox1.Controls.Add(this.Label5); - this.GroupBox1.Controls.Add(this.Trackbar1); - this.GroupBox1.Controls.Add(this.Button6); - this.GroupBox1.Controls.Add(this.Button2); - this.GroupBox1.Controls.Add(this.Button1); - this.GroupBox1.Location = new System.Drawing.Point(630, 61); - this.GroupBox1.Name = "GroupBox1"; - this.GroupBox1.Padding = new System.Windows.Forms.Padding(3); - this.GroupBox1.Size = new System.Drawing.Size(310, 499); - this.GroupBox1.TabIndex = 7; + this.PictureBox5.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox5.Image"))); + this.PictureBox5.Location = new System.Drawing.Point(17, 179); + this.PictureBox5.Name = "PictureBox5"; + this.PictureBox5.Size = new System.Drawing.Size(24, 24); + this.PictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.PictureBox5.TabIndex = 54; + this.PictureBox5.TabStop = false; // - // Button5 + // Label21 // - this.Button5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Button5.CustomColor = System.Drawing.Color.Empty; - this.Button5.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; - this.Button5.Font = new System.Drawing.Font("Segoe UI", 9F); - this.Button5.ForeColor = System.Drawing.Color.White; - this.Button5.Image = ((System.Drawing.Image)(resources.GetObject("Button5.Image"))); - this.Button5.Location = new System.Drawing.Point(150, 465); - this.Button5.Name = "Button5"; - this.Button5.Size = new System.Drawing.Size(152, 28); - this.Button5.TabIndex = 66; - this.Button5.Text = "Animate (3 Cycles)"; - this.Button5.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - this.Button5.UseVisualStyleBackColor = false; - this.Button5.Click += new System.EventHandler(this.Button5_Click); + this.Label21.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label21.Location = new System.Drawing.Point(47, 301); + this.Label21.Name = "Label21"; + this.Label21.Size = new System.Drawing.Size(169, 24); + this.Label21.TabIndex = 12; + this.Label21.Text = "Background color:"; + this.Label21.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // Button10 + // PictureBox10 // - this.Button10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Button10.CustomColor = System.Drawing.Color.Empty; - this.Button10.Flag = WinPaletter.UI.WP.Button.Flags.None; - this.Button10.Font = new System.Drawing.Font("Segoe UI", 9F); - this.Button10.ForeColor = System.Drawing.Color.White; - this.Button10.Image = null; - this.Button10.Location = new System.Drawing.Point(281, 437); - this.Button10.Name = "Button10"; - this.Button10.Size = new System.Drawing.Size(20, 21); - this.Button10.TabIndex = 58; - this.Button10.Text = "?"; - this.Button10.UseVisualStyleBackColor = false; - this.Button10.Click += new System.EventHandler(this.Button10_Click); + this.PictureBox10.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox10.Image"))); + this.PictureBox10.Location = new System.Drawing.Point(17, 301); + this.PictureBox10.Name = "PictureBox10"; + this.PictureBox10.Size = new System.Drawing.Size(24, 24); + this.PictureBox10.TabIndex = 9; + this.PictureBox10.TabStop = false; // - // Label1 + // tabPage3 // - this.Label1.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label1.Location = new System.Drawing.Point(10, 6); - this.Label1.Name = "Label1"; - this.Label1.Size = new System.Drawing.Size(291, 30); - this.Label1.TabIndex = 8; - this.Label1.Text = "Select a cursor to edit its properties"; - this.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.tabPage3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); + this.tabPage3.Controls.Add(this.label4); + this.tabPage3.Controls.Add(this.pictureBox23); + this.tabPage3.Controls.Add(this.CheckBox11); + this.tabPage3.Controls.Add(this.AlertBox1); + this.tabPage3.Controls.Add(this.PictureBox16); + this.tabPage3.Controls.Add(this.PictureBox24); + this.tabPage3.Controls.Add(this.PictureBox18); + this.tabPage3.Controls.Add(this.Button19); + this.tabPage3.Controls.Add(this.PictureBox17); + this.tabPage3.Controls.Add(this.Trackbar10); + this.tabPage3.Controls.Add(this.Label25); + this.tabPage3.Controls.Add(this.Button18); + this.tabPage3.Controls.Add(this.Label24); + this.tabPage3.Controls.Add(this.Trackbar9); + this.tabPage3.Controls.Add(this.Label14); + this.tabPage3.Controls.Add(this.Label22); + this.tabPage3.Controls.Add(this.Trackbar7); + this.tabPage3.Controls.Add(this.PictureBox20); + this.tabPage3.Controls.Add(this.ColorItem1); + this.tabPage3.Controls.Add(this.Button17); + this.tabPage3.Controls.Add(this.Button16); + this.tabPage3.Controls.Add(this.Trackbar8); + this.tabPage3.Controls.Add(this.Label26); + this.tabPage3.Controls.Add(this.PictureBox19); + this.tabPage3.Location = new System.Drawing.Point(154, 4); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Padding = new System.Windows.Forms.Padding(3); + this.tabPage3.Size = new System.Drawing.Size(458, 499); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "Custom shadow"; // - // FlowLayoutPanel1 + // label4 // - this.FlowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.FlowLayoutPanel1.AutoScroll = true; - this.FlowLayoutPanel1.Controls.Add(this.Arrow); - this.FlowLayoutPanel1.Controls.Add(this.Help); - this.FlowLayoutPanel1.Controls.Add(this.AppLoading); - this.FlowLayoutPanel1.Controls.Add(this.Busy); - this.FlowLayoutPanel1.Controls.Add(this.Move_Cur); - this.FlowLayoutPanel1.Controls.Add(this.Up); - this.FlowLayoutPanel1.Controls.Add(this.NS); - this.FlowLayoutPanel1.Controls.Add(this.EW); - this.FlowLayoutPanel1.Controls.Add(this.NESW); - this.FlowLayoutPanel1.Controls.Add(this.NWSE); - this.FlowLayoutPanel1.Controls.Add(this.Pen); - this.FlowLayoutPanel1.Controls.Add(this.None); - this.FlowLayoutPanel1.Controls.Add(this.Link); - this.FlowLayoutPanel1.Controls.Add(this.Pin); - this.FlowLayoutPanel1.Controls.Add(this.Person); - this.FlowLayoutPanel1.Controls.Add(this.IBeam); - this.FlowLayoutPanel1.Controls.Add(this.Cross); - this.FlowLayoutPanel1.Location = new System.Drawing.Point(3, 41); - this.FlowLayoutPanel1.Name = "FlowLayoutPanel1"; - this.FlowLayoutPanel1.Padding = new System.Windows.Forms.Padding(4, 4, 0, 4); - this.FlowLayoutPanel1.Size = new System.Drawing.Size(301, 389); - this.FlowLayoutPanel1.TabIndex = 6; + this.label4.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label4.Location = new System.Drawing.Point(47, 197); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(69, 24); + this.label4.TabIndex = 152; + this.label4.Text = "Offset Y:"; + this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // Arrow + // pictureBox23 // - this.Arrow.Location = new System.Drawing.Point(7, 7); - this.Arrow.Name = "Arrow"; - this.Arrow.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; - this.Arrow.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; - this.Arrow.Prop_Cursor = WinPaletter.Paths.CursorType.Arrow; - this.Arrow.Prop_File = ""; - this.Arrow.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Arrow.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Arrow.Prop_LoadingCircleBackGradient = false; - this.Arrow.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Arrow.Prop_LoadingCircleBackNoise = false; - this.Arrow.Prop_LoadingCircleBackNoiseOpacity = 0.25F; - this.Arrow.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Arrow.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Arrow.Prop_LoadingCircleHotGradient = false; - this.Arrow.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Arrow.Prop_LoadingCircleHotNoise = false; - this.Arrow.Prop_LoadingCircleHotNoiseOpacity = 0.25F; - this.Arrow.Prop_PrimaryColor1 = System.Drawing.Color.White; - this.Arrow.Prop_PrimaryColor2 = System.Drawing.Color.White; - this.Arrow.Prop_PrimaryColorGradient = false; - this.Arrow.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Arrow.Prop_PrimaryNoise = false; - this.Arrow.Prop_PrimaryNoiseOpacity = 0.25F; - this.Arrow.Prop_Scale = 1F; - this.Arrow.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Arrow.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Arrow.Prop_SecondaryColorGradient = false; - this.Arrow.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Arrow.Prop_SecondaryNoise = false; - this.Arrow.Prop_SecondaryNoiseOpacity = 0.25F; - this.Arrow.Prop_Shadow_Blur = 5; - this.Arrow.Prop_Shadow_Color = System.Drawing.Color.Black; - this.Arrow.Prop_Shadow_Enabled = false; - this.Arrow.Prop_Shadow_OffsetX = 2; - this.Arrow.Prop_Shadow_OffsetY = 2; - this.Arrow.Prop_Shadow_Opacity = 0.3F; - this.Arrow.Prop_UseFromFile = false; - this.Arrow.Size = new System.Drawing.Size(64, 64); - this.Arrow.TabIndex = 5; + this.pictureBox23.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox23.Image"))); + this.pictureBox23.Location = new System.Drawing.Point(17, 197); + this.pictureBox23.Name = "pictureBox23"; + this.pictureBox23.Size = new System.Drawing.Size(24, 24); + this.pictureBox23.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox23.TabIndex = 151; + this.pictureBox23.TabStop = false; // - // Help + // CheckBox11 // - this.Help.Location = new System.Drawing.Point(77, 7); - this.Help.Name = "Help"; - this.Help.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; - this.Help.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; - this.Help.Prop_Cursor = WinPaletter.Paths.CursorType.Help; - this.Help.Prop_File = ""; - this.Help.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Help.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Help.Prop_LoadingCircleBackGradient = false; - this.Help.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Help.Prop_LoadingCircleBackNoise = false; - this.Help.Prop_LoadingCircleBackNoiseOpacity = 0.25F; - this.Help.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Help.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Help.Prop_LoadingCircleHotGradient = false; - this.Help.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Help.Prop_LoadingCircleHotNoise = false; - this.Help.Prop_LoadingCircleHotNoiseOpacity = 0.25F; - this.Help.Prop_PrimaryColor1 = System.Drawing.Color.White; - this.Help.Prop_PrimaryColor2 = System.Drawing.Color.White; - this.Help.Prop_PrimaryColorGradient = false; - this.Help.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Help.Prop_PrimaryNoise = false; - this.Help.Prop_PrimaryNoiseOpacity = 0.25F; - this.Help.Prop_Scale = 1F; - this.Help.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Help.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Help.Prop_SecondaryColorGradient = false; - this.Help.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Help.Prop_SecondaryNoise = false; - this.Help.Prop_SecondaryNoiseOpacity = 0.25F; - this.Help.Prop_Shadow_Blur = 5; - this.Help.Prop_Shadow_Color = System.Drawing.Color.Black; - this.Help.Prop_Shadow_Enabled = false; - this.Help.Prop_Shadow_OffsetX = 2; - this.Help.Prop_Shadow_OffsetY = 2; - this.Help.Prop_Shadow_Opacity = 0.3F; - this.Help.Prop_UseFromFile = false; - this.Help.Size = new System.Drawing.Size(64, 64); - this.Help.TabIndex = 6; + this.CheckBox11.Checked = false; + this.CheckBox11.Font = new System.Drawing.Font("Segoe UI", 9F); + this.CheckBox11.ForeColor = System.Drawing.Color.White; + this.CheckBox11.Location = new System.Drawing.Point(47, 47); + this.CheckBox11.Name = "CheckBox11"; + this.CheckBox11.Size = new System.Drawing.Size(78, 24); + this.CheckBox11.TabIndex = 150; + this.CheckBox11.Text = "Enabled"; + this.CheckBox11.CheckedChanged += new WinPaletter.UI.WP.CheckBox.CheckedChangedEventHandler(this.CheckBox11_CheckedChanged); // - // AppLoading + // AlertBox1 // - this.AppLoading.Location = new System.Drawing.Point(147, 7); - this.AppLoading.Name = "AppLoading"; - this.AppLoading.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; - this.AppLoading.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; - this.AppLoading.Prop_Cursor = WinPaletter.Paths.CursorType.AppLoading; - this.AppLoading.Prop_File = ""; - this.AppLoading.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.AppLoading.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.AppLoading.Prop_LoadingCircleBackGradient = false; - this.AppLoading.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Circle; - this.AppLoading.Prop_LoadingCircleBackNoise = false; - this.AppLoading.Prop_LoadingCircleBackNoiseOpacity = 0.25F; - this.AppLoading.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.AppLoading.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.AppLoading.Prop_LoadingCircleHotGradient = false; - this.AppLoading.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Circle; - this.AppLoading.Prop_LoadingCircleHotNoise = false; - this.AppLoading.Prop_LoadingCircleHotNoiseOpacity = 0.25F; - this.AppLoading.Prop_PrimaryColor1 = System.Drawing.Color.White; - this.AppLoading.Prop_PrimaryColor2 = System.Drawing.Color.White; - this.AppLoading.Prop_PrimaryColorGradient = false; - this.AppLoading.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Circle; - this.AppLoading.Prop_PrimaryNoise = false; - this.AppLoading.Prop_PrimaryNoiseOpacity = 0.25F; - this.AppLoading.Prop_Scale = 1F; - this.AppLoading.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.AppLoading.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.AppLoading.Prop_SecondaryColorGradient = false; - this.AppLoading.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Circle; - this.AppLoading.Prop_SecondaryNoise = false; - this.AppLoading.Prop_SecondaryNoiseOpacity = 0.25F; - this.AppLoading.Prop_Shadow_Blur = 5; - this.AppLoading.Prop_Shadow_Color = System.Drawing.Color.Black; - this.AppLoading.Prop_Shadow_Enabled = false; - this.AppLoading.Prop_Shadow_OffsetX = 2; - this.AppLoading.Prop_Shadow_OffsetY = 2; - this.AppLoading.Prop_Shadow_Opacity = 0.3F; - this.AppLoading.Prop_UseFromFile = false; - this.AppLoading.Size = new System.Drawing.Size(64, 64); - this.AppLoading.TabIndex = 6; + this.AlertBox1.AlertStyle = WinPaletter.UI.WP.AlertBox.Style.Simple; + this.AlertBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.AlertBox1.BackColor = System.Drawing.Color.Transparent; + this.AlertBox1.CenterText = false; + this.AlertBox1.CustomColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(81)))), ((int)(((byte)(210))))); + this.AlertBox1.Font = new System.Drawing.Font("Segoe UI", 9F); + this.AlertBox1.Image = null; + this.AlertBox1.Location = new System.Drawing.Point(6, 423); + this.AlertBox1.Name = "AlertBox1"; + this.AlertBox1.Size = new System.Drawing.Size(446, 70); + this.AlertBox1.TabIndex = 137; + this.AlertBox1.TabStop = false; + this.AlertBox1.Text = "- Shadow in \"Miscellaneous\" part is rendered by Windows, while custom shadow is r" + + "endered by WinPaletter itself.\r\n- The more you enable custom shadow, the more Wi" + + "nPaletter will take to render."; // - // Busy + // PictureBox16 // - this.Busy.Location = new System.Drawing.Point(217, 7); - this.Busy.Name = "Busy"; - this.Busy.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; - this.Busy.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; - this.Busy.Prop_Cursor = WinPaletter.Paths.CursorType.Busy; - this.Busy.Prop_File = ""; - this.Busy.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Busy.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Busy.Prop_LoadingCircleBackGradient = false; - this.Busy.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Circle; - this.Busy.Prop_LoadingCircleBackNoise = false; - this.Busy.Prop_LoadingCircleBackNoiseOpacity = 0.25F; - this.Busy.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Busy.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Busy.Prop_LoadingCircleHotGradient = false; - this.Busy.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Circle; - this.Busy.Prop_LoadingCircleHotNoise = false; - this.Busy.Prop_LoadingCircleHotNoiseOpacity = 0.25F; - this.Busy.Prop_PrimaryColor1 = System.Drawing.Color.White; - this.Busy.Prop_PrimaryColor2 = System.Drawing.Color.White; - this.Busy.Prop_PrimaryColorGradient = false; - this.Busy.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Circle; - this.Busy.Prop_PrimaryNoise = false; - this.Busy.Prop_PrimaryNoiseOpacity = 0.25F; - this.Busy.Prop_Scale = 1F; - this.Busy.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Busy.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Busy.Prop_SecondaryColorGradient = false; - this.Busy.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Circle; - this.Busy.Prop_SecondaryNoise = false; - this.Busy.Prop_SecondaryNoiseOpacity = 0.25F; - this.Busy.Prop_Shadow_Blur = 5; - this.Busy.Prop_Shadow_Color = System.Drawing.Color.Black; - this.Busy.Prop_Shadow_Enabled = false; - this.Busy.Prop_Shadow_OffsetX = 2; - this.Busy.Prop_Shadow_OffsetY = 2; - this.Busy.Prop_Shadow_Opacity = 0.3F; - this.Busy.Prop_UseFromFile = false; - this.Busy.Size = new System.Drawing.Size(64, 64); - this.Busy.TabIndex = 7; + this.PictureBox16.BackColor = System.Drawing.Color.Transparent; + this.PictureBox16.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox16.Image"))); + this.PictureBox16.Location = new System.Drawing.Point(6, 6); + this.PictureBox16.Name = "PictureBox16"; + this.PictureBox16.Size = new System.Drawing.Size(35, 35); + this.PictureBox16.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.PictureBox16.TabIndex = 76; + this.PictureBox16.TabStop = false; // - // Move_Cur + // PictureBox24 // - this.Move_Cur.Location = new System.Drawing.Point(7, 77); - this.Move_Cur.Name = "Move_Cur"; - this.Move_Cur.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; - this.Move_Cur.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; - this.Move_Cur.Prop_Cursor = WinPaletter.Paths.CursorType.Move; - this.Move_Cur.Prop_File = ""; - this.Move_Cur.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Move_Cur.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Move_Cur.Prop_LoadingCircleBackGradient = false; - this.Move_Cur.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Move_Cur.Prop_LoadingCircleBackNoise = false; - this.Move_Cur.Prop_LoadingCircleBackNoiseOpacity = 0.25F; - this.Move_Cur.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Move_Cur.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Move_Cur.Prop_LoadingCircleHotGradient = false; - this.Move_Cur.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Move_Cur.Prop_LoadingCircleHotNoise = false; - this.Move_Cur.Prop_LoadingCircleHotNoiseOpacity = 0.25F; - this.Move_Cur.Prop_PrimaryColor1 = System.Drawing.Color.White; - this.Move_Cur.Prop_PrimaryColor2 = System.Drawing.Color.White; - this.Move_Cur.Prop_PrimaryColorGradient = false; - this.Move_Cur.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Move_Cur.Prop_PrimaryNoise = false; - this.Move_Cur.Prop_PrimaryNoiseOpacity = 0.25F; - this.Move_Cur.Prop_Scale = 1F; - this.Move_Cur.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Move_Cur.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Move_Cur.Prop_SecondaryColorGradient = false; - this.Move_Cur.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Move_Cur.Prop_SecondaryNoise = false; - this.Move_Cur.Prop_SecondaryNoiseOpacity = 0.25F; - this.Move_Cur.Prop_Shadow_Blur = 5; - this.Move_Cur.Prop_Shadow_Color = System.Drawing.Color.Black; - this.Move_Cur.Prop_Shadow_Enabled = false; - this.Move_Cur.Prop_Shadow_OffsetX = 2; - this.Move_Cur.Prop_Shadow_OffsetY = 2; - this.Move_Cur.Prop_Shadow_Opacity = 0.3F; - this.Move_Cur.Prop_UseFromFile = false; - this.Move_Cur.Size = new System.Drawing.Size(64, 64); - this.Move_Cur.TabIndex = 8; + this.PictureBox24.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox24.Image"))); + this.PictureBox24.Location = new System.Drawing.Point(17, 47); + this.PictureBox24.Name = "PictureBox24"; + this.PictureBox24.Size = new System.Drawing.Size(24, 24); + this.PictureBox24.TabIndex = 149; + this.PictureBox24.TabStop = false; // - // Up + // PictureBox18 // - this.Up.Location = new System.Drawing.Point(77, 77); - this.Up.Name = "Up"; - this.Up.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; - this.Up.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; - this.Up.Prop_Cursor = WinPaletter.Paths.CursorType.Up; - this.Up.Prop_File = ""; - this.Up.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Up.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Up.Prop_LoadingCircleBackGradient = false; - this.Up.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Up.Prop_LoadingCircleBackNoise = false; - this.Up.Prop_LoadingCircleBackNoiseOpacity = 0.25F; - this.Up.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Up.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Up.Prop_LoadingCircleHotGradient = false; - this.Up.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Up.Prop_LoadingCircleHotNoise = false; - this.Up.Prop_LoadingCircleHotNoiseOpacity = 0.25F; - this.Up.Prop_PrimaryColor1 = System.Drawing.Color.White; - this.Up.Prop_PrimaryColor2 = System.Drawing.Color.White; - this.Up.Prop_PrimaryColorGradient = false; - this.Up.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Up.Prop_PrimaryNoise = false; - this.Up.Prop_PrimaryNoiseOpacity = 0.25F; - this.Up.Prop_Scale = 1F; - this.Up.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Up.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Up.Prop_SecondaryColorGradient = false; - this.Up.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Up.Prop_SecondaryNoise = false; - this.Up.Prop_SecondaryNoiseOpacity = 0.25F; - this.Up.Prop_Shadow_Blur = 5; - this.Up.Prop_Shadow_Color = System.Drawing.Color.Black; - this.Up.Prop_Shadow_Enabled = false; - this.Up.Prop_Shadow_OffsetX = 2; - this.Up.Prop_Shadow_OffsetY = 2; - this.Up.Prop_Shadow_Opacity = 0.3F; - this.Up.Prop_UseFromFile = false; - this.Up.Size = new System.Drawing.Size(64, 64); - this.Up.TabIndex = 9; + this.PictureBox18.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox18.Image"))); + this.PictureBox18.Location = new System.Drawing.Point(17, 107); + this.PictureBox18.Name = "PictureBox18"; + this.PictureBox18.Size = new System.Drawing.Size(24, 24); + this.PictureBox18.TabIndex = 53; + this.PictureBox18.TabStop = false; // - // NS + // Button19 // - this.NS.Location = new System.Drawing.Point(147, 77); - this.NS.Name = "NS"; - this.NS.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; - this.NS.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; - this.NS.Prop_Cursor = WinPaletter.Paths.CursorType.NS; - this.NS.Prop_File = ""; - this.NS.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.NS.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.NS.Prop_LoadingCircleBackGradient = false; - this.NS.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.NS.Prop_LoadingCircleBackNoise = false; - this.NS.Prop_LoadingCircleBackNoiseOpacity = 0.25F; - this.NS.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.NS.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.NS.Prop_LoadingCircleHotGradient = false; - this.NS.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.NS.Prop_LoadingCircleHotNoise = false; - this.NS.Prop_LoadingCircleHotNoiseOpacity = 0.25F; - this.NS.Prop_PrimaryColor1 = System.Drawing.Color.White; - this.NS.Prop_PrimaryColor2 = System.Drawing.Color.White; - this.NS.Prop_PrimaryColorGradient = false; - this.NS.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.NS.Prop_PrimaryNoise = false; - this.NS.Prop_PrimaryNoiseOpacity = 0.25F; - this.NS.Prop_Scale = 1F; - this.NS.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.NS.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.NS.Prop_SecondaryColorGradient = false; - this.NS.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.NS.Prop_SecondaryNoise = false; - this.NS.Prop_SecondaryNoiseOpacity = 0.25F; - this.NS.Prop_Shadow_Blur = 5; - this.NS.Prop_Shadow_Color = System.Drawing.Color.Black; - this.NS.Prop_Shadow_Enabled = false; - this.NS.Prop_Shadow_OffsetX = 2; - this.NS.Prop_Shadow_OffsetY = 2; - this.NS.Prop_Shadow_Opacity = 0.3F; - this.NS.Prop_UseFromFile = false; - this.NS.Size = new System.Drawing.Size(64, 64); - this.NS.TabIndex = 10; + this.Button19.CustomColor = System.Drawing.Color.Empty; + this.Button19.Flag = WinPaletter.UI.WP.Button.Flags.None; + this.Button19.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button19.ForeColor = System.Drawing.Color.White; + this.Button19.Image = null; + this.Button19.Location = new System.Drawing.Point(418, 197); + this.Button19.Name = "Button19"; + this.Button19.Size = new System.Drawing.Size(34, 24); + this.Button19.TabIndex = 148; + this.Button19.UseVisualStyleBackColor = false; + this.Button19.Click += new System.EventHandler(this.Button19_Click); // - // EW + // PictureBox17 // - this.EW.Location = new System.Drawing.Point(217, 77); - this.EW.Name = "EW"; - this.EW.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; - this.EW.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; - this.EW.Prop_Cursor = WinPaletter.Paths.CursorType.EW; - this.EW.Prop_File = ""; - this.EW.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.EW.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.EW.Prop_LoadingCircleBackGradient = false; - this.EW.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.EW.Prop_LoadingCircleBackNoise = false; - this.EW.Prop_LoadingCircleBackNoiseOpacity = 0.25F; - this.EW.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.EW.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.EW.Prop_LoadingCircleHotGradient = false; - this.EW.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.EW.Prop_LoadingCircleHotNoise = false; - this.EW.Prop_LoadingCircleHotNoiseOpacity = 0.25F; - this.EW.Prop_PrimaryColor1 = System.Drawing.Color.White; - this.EW.Prop_PrimaryColor2 = System.Drawing.Color.White; - this.EW.Prop_PrimaryColorGradient = false; - this.EW.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.EW.Prop_PrimaryNoise = false; - this.EW.Prop_PrimaryNoiseOpacity = 0.25F; - this.EW.Prop_Scale = 1F; - this.EW.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.EW.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.EW.Prop_SecondaryColorGradient = false; - this.EW.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.EW.Prop_SecondaryNoise = false; - this.EW.Prop_SecondaryNoiseOpacity = 0.25F; - this.EW.Prop_Shadow_Blur = 5; - this.EW.Prop_Shadow_Color = System.Drawing.Color.Black; - this.EW.Prop_Shadow_Enabled = false; - this.EW.Prop_Shadow_OffsetX = 2; - this.EW.Prop_Shadow_OffsetY = 2; - this.EW.Prop_Shadow_Opacity = 0.3F; - this.EW.Prop_UseFromFile = false; - this.EW.Size = new System.Drawing.Size(64, 64); - this.EW.TabIndex = 11; + this.PictureBox17.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox17.Image"))); + this.PictureBox17.Location = new System.Drawing.Point(17, 137); + this.PictureBox17.Name = "PictureBox17"; + this.PictureBox17.Size = new System.Drawing.Size(24, 24); + this.PictureBox17.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.PictureBox17.TabIndex = 54; + this.PictureBox17.TabStop = false; // - // NESW + // Trackbar10 // - this.NESW.Location = new System.Drawing.Point(7, 147); - this.NESW.Name = "NESW"; - this.NESW.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; - this.NESW.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; - this.NESW.Prop_Cursor = WinPaletter.Paths.CursorType.NESW; - this.NESW.Prop_File = ""; - this.NESW.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.NESW.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.NESW.Prop_LoadingCircleBackGradient = false; - this.NESW.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.NESW.Prop_LoadingCircleBackNoise = false; - this.NESW.Prop_LoadingCircleBackNoiseOpacity = 0.25F; - this.NESW.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.NESW.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.NESW.Prop_LoadingCircleHotGradient = false; - this.NESW.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.NESW.Prop_LoadingCircleHotNoise = false; - this.NESW.Prop_LoadingCircleHotNoiseOpacity = 0.25F; - this.NESW.Prop_PrimaryColor1 = System.Drawing.Color.White; - this.NESW.Prop_PrimaryColor2 = System.Drawing.Color.White; - this.NESW.Prop_PrimaryColorGradient = false; - this.NESW.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.NESW.Prop_PrimaryNoise = false; - this.NESW.Prop_PrimaryNoiseOpacity = 0.25F; - this.NESW.Prop_Scale = 1F; - this.NESW.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.NESW.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.NESW.Prop_SecondaryColorGradient = false; - this.NESW.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.NESW.Prop_SecondaryNoise = false; - this.NESW.Prop_SecondaryNoiseOpacity = 0.25F; - this.NESW.Prop_Shadow_Blur = 5; - this.NESW.Prop_Shadow_Color = System.Drawing.Color.Black; - this.NESW.Prop_Shadow_Enabled = false; - this.NESW.Prop_Shadow_OffsetX = 2; - this.NESW.Prop_Shadow_OffsetY = 2; - this.NESW.Prop_Shadow_Opacity = 0.3F; - this.NESW.Prop_UseFromFile = false; - this.NESW.Size = new System.Drawing.Size(64, 64); - this.NESW.TabIndex = 12; + this.Trackbar10.BackColor = System.Drawing.Color.Transparent; + this.Trackbar10.LargeChange = 2; + this.Trackbar10.Location = new System.Drawing.Point(122, 200); + this.Trackbar10.Maximum = 5; + this.Trackbar10.Minimum = 0; + this.Trackbar10.Name = "Trackbar10"; + this.Trackbar10.Size = new System.Drawing.Size(290, 19); + this.Trackbar10.SmallChange = 1; + this.Trackbar10.TabIndex = 147; + this.Trackbar10.Value = 0; + this.Trackbar10.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar10_Scroll); // - // NWSE + // Label25 // - this.NWSE.Location = new System.Drawing.Point(77, 147); - this.NWSE.Name = "NWSE"; - this.NWSE.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; - this.NWSE.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; - this.NWSE.Prop_Cursor = WinPaletter.Paths.CursorType.NWSE; - this.NWSE.Prop_File = ""; - this.NWSE.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.NWSE.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.NWSE.Prop_LoadingCircleBackGradient = false; - this.NWSE.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.NWSE.Prop_LoadingCircleBackNoise = false; - this.NWSE.Prop_LoadingCircleBackNoiseOpacity = 0.25F; - this.NWSE.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.NWSE.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.NWSE.Prop_LoadingCircleHotGradient = false; - this.NWSE.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.NWSE.Prop_LoadingCircleHotNoise = false; - this.NWSE.Prop_LoadingCircleHotNoiseOpacity = 0.25F; - this.NWSE.Prop_PrimaryColor1 = System.Drawing.Color.White; - this.NWSE.Prop_PrimaryColor2 = System.Drawing.Color.White; - this.NWSE.Prop_PrimaryColorGradient = false; - this.NWSE.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.NWSE.Prop_PrimaryNoise = false; - this.NWSE.Prop_PrimaryNoiseOpacity = 0.25F; - this.NWSE.Prop_Scale = 1F; - this.NWSE.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.NWSE.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.NWSE.Prop_SecondaryColorGradient = false; - this.NWSE.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.NWSE.Prop_SecondaryNoise = false; - this.NWSE.Prop_SecondaryNoiseOpacity = 0.25F; - this.NWSE.Prop_Shadow_Blur = 5; - this.NWSE.Prop_Shadow_Color = System.Drawing.Color.Black; - this.NWSE.Prop_Shadow_Enabled = false; - this.NWSE.Prop_Shadow_OffsetX = 2; - this.NWSE.Prop_Shadow_OffsetY = 2; - this.NWSE.Prop_Shadow_Opacity = 0.3F; - this.NWSE.Prop_UseFromFile = false; - this.NWSE.Size = new System.Drawing.Size(64, 64); - this.NWSE.TabIndex = 13; + this.Label25.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label25.Location = new System.Drawing.Point(47, 137); + this.Label25.Name = "Label25"; + this.Label25.Size = new System.Drawing.Size(67, 24); + this.Label25.TabIndex = 68; + this.Label25.Text = "Opacity:"; + this.Label25.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // Pen + // Button18 // - this.Pen.Location = new System.Drawing.Point(147, 147); - this.Pen.Name = "Pen"; - this.Pen.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; - this.Pen.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; - this.Pen.Prop_Cursor = WinPaletter.Paths.CursorType.Pen; - this.Pen.Prop_File = ""; - this.Pen.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Pen.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Pen.Prop_LoadingCircleBackGradient = false; - this.Pen.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Pen.Prop_LoadingCircleBackNoise = false; - this.Pen.Prop_LoadingCircleBackNoiseOpacity = 0.25F; - this.Pen.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Pen.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Pen.Prop_LoadingCircleHotGradient = false; - this.Pen.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Pen.Prop_LoadingCircleHotNoise = false; - this.Pen.Prop_LoadingCircleHotNoiseOpacity = 0.25F; - this.Pen.Prop_PrimaryColor1 = System.Drawing.Color.White; - this.Pen.Prop_PrimaryColor2 = System.Drawing.Color.White; - this.Pen.Prop_PrimaryColorGradient = false; - this.Pen.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Pen.Prop_PrimaryNoise = false; - this.Pen.Prop_PrimaryNoiseOpacity = 0.25F; - this.Pen.Prop_Scale = 1F; - this.Pen.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Pen.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Pen.Prop_SecondaryColorGradient = false; - this.Pen.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Pen.Prop_SecondaryNoise = false; - this.Pen.Prop_SecondaryNoiseOpacity = 0.25F; - this.Pen.Prop_Shadow_Blur = 5; - this.Pen.Prop_Shadow_Color = System.Drawing.Color.Black; - this.Pen.Prop_Shadow_Enabled = false; - this.Pen.Prop_Shadow_OffsetX = 2; - this.Pen.Prop_Shadow_OffsetY = 2; - this.Pen.Prop_Shadow_Opacity = 0.3F; - this.Pen.Prop_UseFromFile = false; - this.Pen.Size = new System.Drawing.Size(64, 64); - this.Pen.TabIndex = 14; + this.Button18.CustomColor = System.Drawing.Color.Empty; + this.Button18.Flag = WinPaletter.UI.WP.Button.Flags.None; + this.Button18.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button18.ForeColor = System.Drawing.Color.White; + this.Button18.Image = null; + this.Button18.Location = new System.Drawing.Point(418, 167); + this.Button18.Name = "Button18"; + this.Button18.Size = new System.Drawing.Size(34, 24); + this.Button18.TabIndex = 144; + this.Button18.UseVisualStyleBackColor = false; + this.Button18.Click += new System.EventHandler(this.Button18_Click); // - // None + // Label24 // - this.None.Location = new System.Drawing.Point(217, 147); - this.None.Name = "None"; - this.None.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; - this.None.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; - this.None.Prop_Cursor = WinPaletter.Paths.CursorType.None; - this.None.Prop_File = ""; - this.None.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.None.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.None.Prop_LoadingCircleBackGradient = false; - this.None.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.None.Prop_LoadingCircleBackNoise = false; - this.None.Prop_LoadingCircleBackNoiseOpacity = 0.25F; - this.None.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.None.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.None.Prop_LoadingCircleHotGradient = false; - this.None.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.None.Prop_LoadingCircleHotNoise = false; - this.None.Prop_LoadingCircleHotNoiseOpacity = 0.25F; - this.None.Prop_PrimaryColor1 = System.Drawing.Color.White; - this.None.Prop_PrimaryColor2 = System.Drawing.Color.White; - this.None.Prop_PrimaryColorGradient = false; - this.None.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.None.Prop_PrimaryNoise = false; - this.None.Prop_PrimaryNoiseOpacity = 0.25F; - this.None.Prop_Scale = 1F; - this.None.Prop_SecondaryColor1 = System.Drawing.Color.Red; - this.None.Prop_SecondaryColor2 = System.Drawing.Color.Red; - this.None.Prop_SecondaryColorGradient = false; - this.None.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.None.Prop_SecondaryNoise = false; - this.None.Prop_SecondaryNoiseOpacity = 0.25F; - this.None.Prop_Shadow_Blur = 5; - this.None.Prop_Shadow_Color = System.Drawing.Color.Black; - this.None.Prop_Shadow_Enabled = false; - this.None.Prop_Shadow_OffsetX = 2; - this.None.Prop_Shadow_OffsetY = 2; - this.None.Prop_Shadow_Opacity = 0.3F; - this.None.Prop_UseFromFile = false; - this.None.Size = new System.Drawing.Size(64, 64); - this.None.TabIndex = 15; + this.Label24.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label24.Location = new System.Drawing.Point(47, 107); + this.Label24.Name = "Label24"; + this.Label24.Size = new System.Drawing.Size(69, 24); + this.Label24.TabIndex = 69; + this.Label24.Text = "Blur Power:"; + this.Label24.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // Link + // Trackbar9 // - this.Link.Location = new System.Drawing.Point(7, 217); - this.Link.Name = "Link"; - this.Link.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; - this.Link.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; - this.Link.Prop_Cursor = WinPaletter.Paths.CursorType.Link; - this.Link.Prop_File = ""; - this.Link.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Link.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Link.Prop_LoadingCircleBackGradient = false; - this.Link.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Link.Prop_LoadingCircleBackNoise = false; - this.Link.Prop_LoadingCircleBackNoiseOpacity = 0.25F; - this.Link.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Link.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Link.Prop_LoadingCircleHotGradient = false; - this.Link.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Link.Prop_LoadingCircleHotNoise = false; - this.Link.Prop_LoadingCircleHotNoiseOpacity = 0.25F; - this.Link.Prop_PrimaryColor1 = System.Drawing.Color.White; - this.Link.Prop_PrimaryColor2 = System.Drawing.Color.White; - this.Link.Prop_PrimaryColorGradient = false; - this.Link.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Link.Prop_PrimaryNoise = false; - this.Link.Prop_PrimaryNoiseOpacity = 0.25F; - this.Link.Prop_Scale = 1F; - this.Link.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Link.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Link.Prop_SecondaryColorGradient = false; - this.Link.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Link.Prop_SecondaryNoise = false; - this.Link.Prop_SecondaryNoiseOpacity = 0.25F; - this.Link.Prop_Shadow_Blur = 5; - this.Link.Prop_Shadow_Color = System.Drawing.Color.Black; - this.Link.Prop_Shadow_Enabled = false; - this.Link.Prop_Shadow_OffsetX = 2; - this.Link.Prop_Shadow_OffsetY = 2; - this.Link.Prop_Shadow_Opacity = 0.3F; - this.Link.Prop_UseFromFile = false; - this.Link.Size = new System.Drawing.Size(64, 64); - this.Link.TabIndex = 16; + this.Trackbar9.BackColor = System.Drawing.Color.Transparent; + this.Trackbar9.LargeChange = 2; + this.Trackbar9.Location = new System.Drawing.Point(122, 170); + this.Trackbar9.Maximum = 5; + this.Trackbar9.Minimum = 0; + this.Trackbar9.Name = "Trackbar9"; + this.Trackbar9.Size = new System.Drawing.Size(290, 19); + this.Trackbar9.SmallChange = 1; + this.Trackbar9.TabIndex = 143; + this.Trackbar9.Value = 0; + this.Trackbar9.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar9_Scroll); // - // Pin + // Label14 // - this.Pin.Location = new System.Drawing.Point(77, 217); - this.Pin.Name = "Pin"; - this.Pin.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; - this.Pin.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; - this.Pin.Prop_Cursor = WinPaletter.Paths.CursorType.Pin; - this.Pin.Prop_File = ""; - this.Pin.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Pin.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Pin.Prop_LoadingCircleBackGradient = false; - this.Pin.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Pin.Prop_LoadingCircleBackNoise = false; - this.Pin.Prop_LoadingCircleBackNoiseOpacity = 0.25F; - this.Pin.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Pin.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Pin.Prop_LoadingCircleHotGradient = false; - this.Pin.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Pin.Prop_LoadingCircleHotNoise = false; - this.Pin.Prop_LoadingCircleHotNoiseOpacity = 0.25F; - this.Pin.Prop_PrimaryColor1 = System.Drawing.Color.White; - this.Pin.Prop_PrimaryColor2 = System.Drawing.Color.White; - this.Pin.Prop_PrimaryColorGradient = false; - this.Pin.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Pin.Prop_PrimaryNoise = false; - this.Pin.Prop_PrimaryNoiseOpacity = 0.25F; - this.Pin.Prop_Scale = 1F; - this.Pin.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Pin.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Pin.Prop_SecondaryColorGradient = false; - this.Pin.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Pin.Prop_SecondaryNoise = false; - this.Pin.Prop_SecondaryNoiseOpacity = 0.25F; - this.Pin.Prop_Shadow_Blur = 5; - this.Pin.Prop_Shadow_Color = System.Drawing.Color.Black; - this.Pin.Prop_Shadow_Enabled = false; - this.Pin.Prop_Shadow_OffsetX = 2; - this.Pin.Prop_Shadow_OffsetY = 2; - this.Pin.Prop_Shadow_Opacity = 0.3F; - this.Pin.Prop_UseFromFile = false; - this.Pin.Size = new System.Drawing.Size(64, 64); - this.Pin.TabIndex = 17; + this.Label14.BackColor = System.Drawing.Color.Transparent; + this.Label14.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Bold); + this.Label14.Location = new System.Drawing.Point(43, 6); + this.Label14.Name = "Label14"; + this.Label14.Size = new System.Drawing.Size(303, 35); + this.Label14.TabIndex = 75; + this.Label14.Text = "Custom shadow"; + this.Label14.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // Person + // Label22 // - this.Person.Location = new System.Drawing.Point(147, 217); - this.Person.Name = "Person"; - this.Person.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; - this.Person.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; - this.Person.Prop_Cursor = WinPaletter.Paths.CursorType.Person; - this.Person.Prop_File = ""; - this.Person.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Person.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Person.Prop_LoadingCircleBackGradient = false; - this.Person.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Person.Prop_LoadingCircleBackNoise = false; - this.Person.Prop_LoadingCircleBackNoiseOpacity = 0.25F; - this.Person.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Person.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Person.Prop_LoadingCircleHotGradient = false; - this.Person.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Person.Prop_LoadingCircleHotNoise = false; - this.Person.Prop_LoadingCircleHotNoiseOpacity = 0.25F; - this.Person.Prop_PrimaryColor1 = System.Drawing.Color.White; - this.Person.Prop_PrimaryColor2 = System.Drawing.Color.White; - this.Person.Prop_PrimaryColorGradient = false; - this.Person.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Person.Prop_PrimaryNoise = false; - this.Person.Prop_PrimaryNoiseOpacity = 0.25F; - this.Person.Prop_Scale = 1F; - this.Person.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Person.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Person.Prop_SecondaryColorGradient = false; - this.Person.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Person.Prop_SecondaryNoise = false; - this.Person.Prop_SecondaryNoiseOpacity = 0.25F; - this.Person.Prop_Shadow_Blur = 5; - this.Person.Prop_Shadow_Color = System.Drawing.Color.Black; - this.Person.Prop_Shadow_Enabled = false; - this.Person.Prop_Shadow_OffsetX = 2; - this.Person.Prop_Shadow_OffsetY = 2; - this.Person.Prop_Shadow_Opacity = 0.3F; - this.Person.Prop_UseFromFile = false; - this.Person.Size = new System.Drawing.Size(64, 64); - this.Person.TabIndex = 18; + this.Label22.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label22.Location = new System.Drawing.Point(47, 167); + this.Label22.Name = "Label22"; + this.Label22.Size = new System.Drawing.Size(69, 24); + this.Label22.TabIndex = 142; + this.Label22.Text = "Offset X:"; + this.Label22.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // IBeam + // Trackbar7 // - this.IBeam.Location = new System.Drawing.Point(217, 217); - this.IBeam.Name = "IBeam"; - this.IBeam.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; - this.IBeam.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; - this.IBeam.Prop_Cursor = WinPaletter.Paths.CursorType.IBeam; - this.IBeam.Prop_File = ""; - this.IBeam.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.IBeam.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.IBeam.Prop_LoadingCircleBackGradient = false; - this.IBeam.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.IBeam.Prop_LoadingCircleBackNoise = false; - this.IBeam.Prop_LoadingCircleBackNoiseOpacity = 0.25F; - this.IBeam.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.IBeam.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.IBeam.Prop_LoadingCircleHotGradient = false; - this.IBeam.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.IBeam.Prop_LoadingCircleHotNoise = false; - this.IBeam.Prop_LoadingCircleHotNoiseOpacity = 0.25F; - this.IBeam.Prop_PrimaryColor1 = System.Drawing.Color.White; - this.IBeam.Prop_PrimaryColor2 = System.Drawing.Color.White; - this.IBeam.Prop_PrimaryColorGradient = false; - this.IBeam.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.IBeam.Prop_PrimaryNoise = false; - this.IBeam.Prop_PrimaryNoiseOpacity = 0.25F; - this.IBeam.Prop_Scale = 1F; - this.IBeam.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.IBeam.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.IBeam.Prop_SecondaryColorGradient = false; - this.IBeam.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.IBeam.Prop_SecondaryNoise = false; - this.IBeam.Prop_SecondaryNoiseOpacity = 0.25F; - this.IBeam.Prop_Shadow_Blur = 5; - this.IBeam.Prop_Shadow_Color = System.Drawing.Color.Black; - this.IBeam.Prop_Shadow_Enabled = false; - this.IBeam.Prop_Shadow_OffsetX = 2; - this.IBeam.Prop_Shadow_OffsetY = 2; - this.IBeam.Prop_Shadow_Opacity = 0.3F; - this.IBeam.Prop_UseFromFile = false; - this.IBeam.Size = new System.Drawing.Size(64, 64); - this.IBeam.TabIndex = 19; + this.Trackbar7.BackColor = System.Drawing.Color.Transparent; + this.Trackbar7.LargeChange = 2; + this.Trackbar7.Location = new System.Drawing.Point(122, 110); + this.Trackbar7.Maximum = 10; + this.Trackbar7.Minimum = 0; + this.Trackbar7.Name = "Trackbar7"; + this.Trackbar7.Size = new System.Drawing.Size(290, 19); + this.Trackbar7.SmallChange = 1; + this.Trackbar7.TabIndex = 137; + this.Trackbar7.Value = 0; + this.Trackbar7.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar7_Scroll); // - // Cross + // PictureBox20 // - this.Cross.Location = new System.Drawing.Point(7, 287); - this.Cross.Name = "Cross"; - this.Cross.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; - this.Cross.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; - this.Cross.Prop_Cursor = WinPaletter.Paths.CursorType.Cross; - this.Cross.Prop_File = ""; - this.Cross.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Cross.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); - this.Cross.Prop_LoadingCircleBackGradient = false; - this.Cross.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Cross.Prop_LoadingCircleBackNoise = false; - this.Cross.Prop_LoadingCircleBackNoiseOpacity = 0.25F; - this.Cross.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Cross.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); - this.Cross.Prop_LoadingCircleHotGradient = false; - this.Cross.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Cross.Prop_LoadingCircleHotNoise = false; - this.Cross.Prop_LoadingCircleHotNoiseOpacity = 0.25F; - this.Cross.Prop_PrimaryColor1 = System.Drawing.Color.White; - this.Cross.Prop_PrimaryColor2 = System.Drawing.Color.White; - this.Cross.Prop_PrimaryColorGradient = false; - this.Cross.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Cross.Prop_PrimaryNoise = false; - this.Cross.Prop_PrimaryNoiseOpacity = 0.25F; - this.Cross.Prop_Scale = 1F; - this.Cross.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Cross.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); - this.Cross.Prop_SecondaryColorGradient = false; - this.Cross.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; - this.Cross.Prop_SecondaryNoise = false; - this.Cross.Prop_SecondaryNoiseOpacity = 0.25F; - this.Cross.Prop_Shadow_Blur = 5; - this.Cross.Prop_Shadow_Color = System.Drawing.Color.Black; - this.Cross.Prop_Shadow_Enabled = false; - this.Cross.Prop_Shadow_OffsetX = 2; - this.Cross.Prop_Shadow_OffsetY = 2; - this.Cross.Prop_Shadow_Opacity = 0.3F; - this.Cross.Prop_UseFromFile = false; - this.Cross.Size = new System.Drawing.Size(64, 64); - this.Cross.TabIndex = 20; - // - // PictureBox12 - // - this.PictureBox12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.PictureBox12.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox12.Image"))); - this.PictureBox12.Location = new System.Drawing.Point(8, 435); - this.PictureBox12.Name = "PictureBox12"; - this.PictureBox12.Size = new System.Drawing.Size(24, 24); - this.PictureBox12.TabIndex = 57; - this.PictureBox12.TabStop = false; + this.PictureBox20.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox20.Image"))); + this.PictureBox20.Location = new System.Drawing.Point(17, 167); + this.PictureBox20.Name = "PictureBox20"; + this.PictureBox20.Size = new System.Drawing.Size(24, 24); + this.PictureBox20.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.PictureBox20.TabIndex = 141; + this.PictureBox20.TabStop = false; // - // Label5 + // ColorItem1 // - this.Label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Label5.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label5.Location = new System.Drawing.Point(38, 435); - this.Label5.Name = "Label5"; - this.Label5.Size = new System.Drawing.Size(85, 24); - this.Label5.TabIndex = 56; - this.Label5.Text = "Scaling (1x)"; - this.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.ColorItem1.AllowDrop = true; + this.ColorItem1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); + this.ColorItem1.DefaultBackColor = System.Drawing.Color.Black; + this.ColorItem1.DontShowInfo = false; + this.ColorItem1.Location = new System.Drawing.Point(123, 77); + this.ColorItem1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.ColorItem1.Name = "ColorItem1"; + this.ColorItem1.Size = new System.Drawing.Size(115, 24); + this.ColorItem1.TabIndex = 77; + this.ColorItem1.Click += new System.EventHandler(this.ColorItem1_Click); + this.ColorItem1.DragDrop += new System.Windows.Forms.DragEventHandler(this.ColorItem1_Click); // - // Trackbar1 + // Button17 // - this.Trackbar1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Trackbar1.BackColor = System.Drawing.Color.Transparent; - this.Trackbar1.LargeChange = 50; - this.Trackbar1.Location = new System.Drawing.Point(129, 438); - this.Trackbar1.Maximum = 320; - this.Trackbar1.Minimum = 100; - this.Trackbar1.Name = "Trackbar1"; - this.Trackbar1.Size = new System.Drawing.Size(146, 19); - this.Trackbar1.SmallChange = 20; - this.Trackbar1.TabIndex = 9; - this.Trackbar1.Value = 100; - this.Trackbar1.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar1_Scroll); + this.Button17.CustomColor = System.Drawing.Color.Empty; + this.Button17.Flag = WinPaletter.UI.WP.Button.Flags.None; + this.Button17.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button17.ForeColor = System.Drawing.Color.White; + this.Button17.Image = null; + this.Button17.Location = new System.Drawing.Point(418, 137); + this.Button17.Name = "Button17"; + this.Button17.Size = new System.Drawing.Size(34, 24); + this.Button17.TabIndex = 140; + this.Button17.UseVisualStyleBackColor = false; + this.Button17.Click += new System.EventHandler(this.Button17_Click); // - // Button6 + // Button16 // - this.Button6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Button6.CustomColor = System.Drawing.Color.Empty; - this.Button6.Enabled = false; - this.Button6.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; - this.Button6.Font = new System.Drawing.Font("Segoe UI", 9F); - this.Button6.ForeColor = System.Drawing.Color.White; - this.Button6.Image = ((System.Drawing.Image)(resources.GetObject("Button6.Image"))); - this.Button6.Location = new System.Drawing.Point(74, 465); - this.Button6.Name = "Button6"; - this.Button6.Size = new System.Drawing.Size(70, 28); - this.Button6.TabIndex = 67; - this.Button6.Text = "to all"; - this.Button6.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - this.Button6.UseVisualStyleBackColor = false; - this.Button6.Click += new System.EventHandler(this.Button6_Click); + this.Button16.CustomColor = System.Drawing.Color.Empty; + this.Button16.Flag = WinPaletter.UI.WP.Button.Flags.None; + this.Button16.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button16.ForeColor = System.Drawing.Color.White; + this.Button16.Image = null; + this.Button16.Location = new System.Drawing.Point(418, 107); + this.Button16.Name = "Button16"; + this.Button16.Size = new System.Drawing.Size(34, 24); + this.Button16.TabIndex = 138; + this.Button16.UseVisualStyleBackColor = false; + this.Button16.Click += new System.EventHandler(this.Button16_Click); // - // Button2 + // Trackbar8 // - this.Button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Button2.CustomColor = System.Drawing.Color.Empty; - this.Button2.Enabled = false; - this.Button2.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; - this.Button2.Font = new System.Drawing.Font("Segoe UI", 9F); - this.Button2.ForeColor = System.Drawing.Color.White; - this.Button2.Image = ((System.Drawing.Image)(resources.GetObject("Button2.Image"))); - this.Button2.Location = new System.Drawing.Point(41, 465); - this.Button2.Name = "Button2"; - this.Button2.Size = new System.Drawing.Size(27, 28); - this.Button2.TabIndex = 11; - this.Button2.UseVisualStyleBackColor = false; - this.Button2.Click += new System.EventHandler(this.Button2_Click); + this.Trackbar8.BackColor = System.Drawing.Color.Transparent; + this.Trackbar8.LargeChange = 2; + this.Trackbar8.Location = new System.Drawing.Point(122, 140); + this.Trackbar8.Maximum = 100; + this.Trackbar8.Minimum = 0; + this.Trackbar8.Name = "Trackbar8"; + this.Trackbar8.Size = new System.Drawing.Size(290, 19); + this.Trackbar8.SmallChange = 1; + this.Trackbar8.TabIndex = 139; + this.Trackbar8.Value = 0; + this.Trackbar8.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar8_Scroll); // - // Button1 + // Label26 // - this.Button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Button1.CustomColor = System.Drawing.Color.Empty; - this.Button1.Enabled = false; - this.Button1.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; - this.Button1.Font = new System.Drawing.Font("Segoe UI", 9F); - this.Button1.ForeColor = System.Drawing.Color.White; - this.Button1.Image = ((System.Drawing.Image)(resources.GetObject("Button1.Image"))); - this.Button1.Location = new System.Drawing.Point(8, 465); - this.Button1.Name = "Button1"; - this.Button1.Size = new System.Drawing.Size(27, 28); - this.Button1.TabIndex = 10; - this.Button1.UseVisualStyleBackColor = false; - this.Button1.Click += new System.EventHandler(this.Button1_Click); + this.Label26.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label26.Location = new System.Drawing.Point(47, 77); + this.Label26.Name = "Label26"; + this.Label26.Size = new System.Drawing.Size(69, 24); + this.Label26.TabIndex = 12; + this.Label26.Text = "Color:"; + this.Label26.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // AlertBox1 + // PictureBox19 // - this.AlertBox1.AlertStyle = WinPaletter.UI.WP.AlertBox.Style.Simple; - this.AlertBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.AlertBox1.BackColor = System.Drawing.Color.Transparent; - this.AlertBox1.CenterText = false; - this.AlertBox1.CustomColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(81)))), ((int)(((byte)(210))))); - this.AlertBox1.Font = new System.Drawing.Font("Segoe UI", 9F); - this.AlertBox1.Image = null; - this.AlertBox1.Location = new System.Drawing.Point(6, 423); - this.AlertBox1.Name = "AlertBox1"; - this.AlertBox1.Size = new System.Drawing.Size(446, 70); - this.AlertBox1.TabIndex = 137; - this.AlertBox1.TabStop = false; - this.AlertBox1.Text = "- Shadow in \"Miscellaneous\" part is rendered by Windows, while custom shadow is r" + - "endered by WinPaletter itself.\r\n- The more you enable custom shadow, the more Wi" + - "nPaletter will take to render."; + this.PictureBox19.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox19.Image"))); + this.PictureBox19.Location = new System.Drawing.Point(17, 77); + this.PictureBox19.Name = "PictureBox19"; + this.PictureBox19.Size = new System.Drawing.Size(24, 24); + this.PictureBox19.TabIndex = 9; + this.PictureBox19.TabStop = false; // - // tabControl1 + // tabPage5 // - this.tabControl1.Alignment = System.Windows.Forms.TabAlignment.Left; - this.tabControl1.Controls.Add(this.tabPage1); - this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Controls.Add(this.tabPage3); - this.tabControl1.Controls.Add(this.tabPage5); - this.tabControl1.Controls.Add(this.tabPage4); - this.tabControl1.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed; - this.tabControl1.Font = new System.Drawing.Font("Segoe UI", 9F); - this.tabControl1.ItemSize = new System.Drawing.Size(40, 150); - this.tabControl1.Location = new System.Drawing.Point(12, 57); - this.tabControl1.Multiline = true; - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(616, 507); - this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; - this.tabControl1.TabIndex = 138; - this.tabControl1.Visible = false; + this.tabPage5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); + this.tabPage5.Controls.Add(this.button20); + this.tabPage5.Controls.Add(this.textBox1); + this.tabPage5.Controls.Add(this.pictureBox26); + this.tabPage5.Controls.Add(this.label16); + this.tabPage5.Controls.Add(this.label9); + this.tabPage5.Controls.Add(this.pictureBox25); + this.tabPage5.Location = new System.Drawing.Point(154, 4); + this.tabPage5.Name = "tabPage5"; + this.tabPage5.Padding = new System.Windows.Forms.Padding(3); + this.tabPage5.Size = new System.Drawing.Size(458, 499); + this.tabPage5.TabIndex = 4; + this.tabPage5.Text = "Cursor from file"; // - // tabPage1 + // button20 // - this.tabPage1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.tabPage1.Controls.Add(this.label18); - this.tabPage1.Controls.Add(this.source1); - this.tabPage1.Controls.Add(this.source0); - this.tabPage1.Controls.Add(this.pictureBox1); - this.tabPage1.Controls.Add(this.label23); - this.tabPage1.Controls.Add(this.Label8); - this.tabPage1.Controls.Add(this.PictureBox11); - this.tabPage1.Controls.Add(this.PictureBox14); - this.tabPage1.Controls.Add(this.ComboBox6); - this.tabPage1.Controls.Add(this.Label10); - this.tabPage1.Controls.Add(this.ComboBox5); - this.tabPage1.Controls.Add(this.PictureBox15); - this.tabPage1.Controls.Add(this.Label7); - this.tabPage1.Location = new System.Drawing.Point(154, 4); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(458, 499); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "Configuration"; + this.button20.CustomColor = System.Drawing.Color.Empty; + this.button20.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; + this.button20.Font = new System.Drawing.Font("Segoe UI", 9F); + this.button20.ForeColor = System.Drawing.Color.White; + this.button20.Image = ((System.Drawing.Image)(resources.GetObject("button20.Image"))); + this.button20.Location = new System.Drawing.Point(418, 47); + this.button20.Name = "button20"; + this.button20.Size = new System.Drawing.Size(34, 24); + this.button20.TabIndex = 139; + this.button20.UseVisualStyleBackColor = false; + this.button20.Click += new System.EventHandler(this.button20_Click); // - // label18 + // textBox1 // - this.label18.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.label18.BackColor = System.Drawing.Color.Transparent; - this.label18.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label18.Location = new System.Drawing.Point(47, 113); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(405, 38); - this.label18.TabIndex = 81; - this.label18.Text = "- After selecting a source, select tabs in the left side and design cursor as you" + - " want."; - this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // source1 - // - this.source1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); - this.source1.Checked = false; - this.source1.Font = new System.Drawing.Font("Segoe UI", 9F); - this.source1.ForeColor = System.Drawing.Color.White; - this.source1.Image = null; - this.source1.Location = new System.Drawing.Point(47, 78); - this.source1.Name = "source1"; - this.source1.Size = new System.Drawing.Size(405, 28); - this.source1.TabIndex = 80; - this.source1.Text = "From file"; - this.source1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.source1.CheckedChanged += new WinPaletter.UI.WP.RadioImage.CheckedChangedEventHandler(this.source1_CheckedChanged); + this.textBox1.ForeColor = System.Drawing.Color.White; + this.textBox1.Location = new System.Drawing.Point(122, 47); + this.textBox1.MaxLength = 32767; + this.textBox1.Multiline = false; + this.textBox1.Name = "textBox1"; + this.textBox1.ReadOnly = false; + this.textBox1.Scrollbars = System.Windows.Forms.ScrollBars.None; + this.textBox1.SelectedText = ""; + this.textBox1.SelectionLength = 0; + this.textBox1.SelectionStart = 0; + this.textBox1.Size = new System.Drawing.Size(290, 24); + this.textBox1.TabIndex = 79; + this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Left; + this.textBox1.UseSystemPasswordChar = false; + this.textBox1.WordWrap = true; + this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged); // - // source0 + // pictureBox26 // - this.source0.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); - this.source0.Checked = true; - this.source0.Font = new System.Drawing.Font("Segoe UI", 9F); - this.source0.ForeColor = System.Drawing.Color.White; - this.source0.Image = null; - this.source0.Location = new System.Drawing.Point(47, 44); - this.source0.Name = "source0"; - this.source0.Size = new System.Drawing.Size(405, 28); - this.source0.TabIndex = 79; - this.source0.Text = "Rendered by WinPaletter"; - this.source0.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.source0.CheckedChanged += new WinPaletter.UI.WP.RadioImage.CheckedChangedEventHandler(this.source0_CheckedChanged); + this.pictureBox26.BackColor = System.Drawing.Color.Transparent; + this.pictureBox26.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox26.Image"))); + this.pictureBox26.Location = new System.Drawing.Point(6, 6); + this.pictureBox26.Name = "pictureBox26"; + this.pictureBox26.Size = new System.Drawing.Size(35, 35); + this.pictureBox26.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox26.TabIndex = 78; + this.pictureBox26.TabStop = false; // - // pictureBox1 + // label16 // - this.pictureBox1.BackColor = System.Drawing.Color.Transparent; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(6, 6); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(35, 35); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox1.TabIndex = 78; - this.pictureBox1.TabStop = false; + this.label16.BackColor = System.Drawing.Color.Transparent; + this.label16.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Bold); + this.label16.Location = new System.Drawing.Point(43, 6); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(409, 35); + this.label16.TabIndex = 77; + this.label16.Text = "Cursor from file"; + this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // label23 + // label9 // - this.label23.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.label23.BackColor = System.Drawing.Color.Transparent; - this.label23.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Bold); - this.label23.Location = new System.Drawing.Point(43, 6); - this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(409, 35); - this.label23.TabIndex = 77; - this.label23.Text = "Source"; - this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.label9.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label9.Location = new System.Drawing.Point(47, 47); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(69, 24); + this.label9.TabIndex = 14; + this.label9.Text = "File:"; + this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // tabPage2 + // pictureBox25 // - this.tabPage2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.tabPage2.Controls.Add(this.Button15); - this.tabPage2.Controls.Add(this.Button14); - this.tabPage2.Controls.Add(this.Trackbar6); - this.tabPage2.Controls.Add(this.label15); - this.tabPage2.Controls.Add(this.CheckBox6); - this.tabPage2.Controls.Add(this.Trackbar5); - this.tabPage2.Controls.Add(this.Button13); - this.tabPage2.Controls.Add(this.CheckBox7); - this.tabPage2.Controls.Add(this.ComboBox3); - this.tabPage2.Controls.Add(this.LoadingColor1); - this.tabPage2.Controls.Add(this.ComboBox4); - this.tabPage2.Controls.Add(this.CheckBox2); - this.tabPage2.Controls.Add(this.CircleColor1); - this.tabPage2.Controls.Add(this.CheckBox8); - this.tabPage2.Controls.Add(this.label17); - this.tabPage2.Controls.Add(this.LoadingColor2); - this.tabPage2.Controls.Add(this.CircleColor2); - this.tabPage2.Controls.Add(this.Trackbar4); - this.tabPage2.Controls.Add(this.Button12); - this.tabPage2.Controls.Add(this.CheckBox3); - this.tabPage2.Controls.Add(this.CheckBox4); - this.tabPage2.Controls.Add(this.ComboBox2); - this.tabPage2.Controls.Add(this.PictureBox3); - this.tabPage2.Controls.Add(this.Trackbar3); - this.tabPage2.Controls.Add(this.SecondaryColor1); - this.tabPage2.Controls.Add(this.SecondaryColor2); - this.tabPage2.Controls.Add(this.Label13); - this.tabPage2.Controls.Add(this.PrimaryColor2); - this.tabPage2.Controls.Add(this.PictureBox6); - this.tabPage2.Controls.Add(this.PrimaryColor1); - this.tabPage2.Controls.Add(this.ComboBox1); - this.tabPage2.Controls.Add(this.CheckBox1); - this.tabPage2.Controls.Add(this.Label2); - this.tabPage2.Controls.Add(this.CheckBox5); - this.tabPage2.Controls.Add(this.PictureBox2); - this.tabPage2.Controls.Add(this.Label3); - this.tabPage2.Controls.Add(this.PictureBox4); - this.tabPage2.Controls.Add(this.PictureBox7); - this.tabPage2.Controls.Add(this.PictureBox8); - this.tabPage2.Controls.Add(this.PictureBox5); - this.tabPage2.Controls.Add(this.Label21); - this.tabPage2.Controls.Add(this.PictureBox10); - this.tabPage2.Location = new System.Drawing.Point(154, 4); - this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(458, 499); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "Cursor colors"; + this.pictureBox25.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox25.Image"))); + this.pictureBox25.Location = new System.Drawing.Point(17, 47); + this.pictureBox25.Name = "pictureBox25"; + this.pictureBox25.Size = new System.Drawing.Size(24, 24); + this.pictureBox25.TabIndex = 13; + this.pictureBox25.TabStop = false; // - // label15 + // tabPage4 // - this.label15.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label15.Location = new System.Drawing.Point(47, 331); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(169, 24); - this.label15.TabIndex = 135; - this.label15.Text = "Spinning part:"; - this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.tabPage4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); + this.tabPage4.Controls.Add(this.PictureBox13); + this.tabPage4.Controls.Add(this.Label6); + this.tabPage4.Controls.Add(this.CheckBox10); + this.tabPage4.Controls.Add(this.PictureBox9); + this.tabPage4.Controls.Add(this.Trackbar2); + this.tabPage4.Controls.Add(this.trails_btn); + this.tabPage4.Controls.Add(this.PictureBox21); + this.tabPage4.Controls.Add(this.PictureBox22); + this.tabPage4.Controls.Add(this.CheckBox9); + this.tabPage4.Controls.Add(this.Label11); + this.tabPage4.Location = new System.Drawing.Point(154, 4); + this.tabPage4.Name = "tabPage4"; + this.tabPage4.Padding = new System.Windows.Forms.Padding(3); + this.tabPage4.Size = new System.Drawing.Size(458, 499); + this.tabPage4.TabIndex = 3; + this.tabPage4.Text = "Miscellaneous"; // - // label17 + // PictureBox13 // - this.label17.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label17.Location = new System.Drawing.Point(47, 77); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(169, 24); - this.label17.TabIndex = 133; - this.label17.Text = "Border color:"; - this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.PictureBox13.BackColor = System.Drawing.Color.Transparent; + this.PictureBox13.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox13.Image"))); + this.PictureBox13.Location = new System.Drawing.Point(6, 6); + this.PictureBox13.Name = "PictureBox13"; + this.PictureBox13.Size = new System.Drawing.Size(35, 35); + this.PictureBox13.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.PictureBox13.TabIndex = 134; + this.PictureBox13.TabStop = false; // - // tabPage3 + // Label6 // - this.tabPage3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.tabPage3.Controls.Add(this.label4); - this.tabPage3.Controls.Add(this.pictureBox23); - this.tabPage3.Controls.Add(this.CheckBox11); - this.tabPage3.Controls.Add(this.AlertBox1); - this.tabPage3.Controls.Add(this.PictureBox16); - this.tabPage3.Controls.Add(this.PictureBox24); - this.tabPage3.Controls.Add(this.PictureBox18); - this.tabPage3.Controls.Add(this.Button19); - this.tabPage3.Controls.Add(this.PictureBox17); - this.tabPage3.Controls.Add(this.Trackbar10); - this.tabPage3.Controls.Add(this.Label25); - this.tabPage3.Controls.Add(this.Button18); - this.tabPage3.Controls.Add(this.Label24); - this.tabPage3.Controls.Add(this.Trackbar9); - this.tabPage3.Controls.Add(this.Label14); - this.tabPage3.Controls.Add(this.Label22); - this.tabPage3.Controls.Add(this.Trackbar7); - this.tabPage3.Controls.Add(this.PictureBox20); - this.tabPage3.Controls.Add(this.ColorItem1); - this.tabPage3.Controls.Add(this.Button17); - this.tabPage3.Controls.Add(this.Button16); - this.tabPage3.Controls.Add(this.Trackbar8); - this.tabPage3.Controls.Add(this.Label26); - this.tabPage3.Controls.Add(this.PictureBox19); - this.tabPage3.Location = new System.Drawing.Point(154, 4); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(458, 499); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "Custom shadow"; + this.Label6.BackColor = System.Drawing.Color.Transparent; + this.Label6.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Bold); + this.Label6.Location = new System.Drawing.Point(43, 6); + this.Label6.Name = "Label6"; + this.Label6.Size = new System.Drawing.Size(409, 35); + this.Label6.TabIndex = 133; + this.Label6.Text = "Miscellaneous (For all cursors)"; + this.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // label4 + // CheckBox10 // - this.label4.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point(47, 197); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(69, 24); - this.label4.TabIndex = 152; - this.label4.Text = "Offset Y:"; - this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.CheckBox10.Checked = false; + this.CheckBox10.Font = new System.Drawing.Font("Segoe UI", 9F); + this.CheckBox10.ForeColor = System.Drawing.Color.White; + this.CheckBox10.Location = new System.Drawing.Point(47, 77); + this.CheckBox10.Name = "CheckBox10"; + this.CheckBox10.Size = new System.Drawing.Size(405, 24); + this.CheckBox10.TabIndex = 131; + this.CheckBox10.Text = "Cursor tracking (Sonar)"; // - // pictureBox23 + // PictureBox9 // - this.pictureBox23.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox23.Image"))); - this.pictureBox23.Location = new System.Drawing.Point(17, 197); - this.pictureBox23.Name = "pictureBox23"; - this.pictureBox23.Size = new System.Drawing.Size(24, 24); - this.pictureBox23.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox23.TabIndex = 151; - this.pictureBox23.TabStop = false; + this.PictureBox9.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox9.Image"))); + this.PictureBox9.Location = new System.Drawing.Point(17, 47); + this.PictureBox9.Name = "PictureBox9"; + this.PictureBox9.Size = new System.Drawing.Size(24, 24); + this.PictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.PictureBox9.TabIndex = 84; + this.PictureBox9.TabStop = false; + // + // Trackbar2 + // + this.Trackbar2.BackColor = System.Drawing.Color.Transparent; + this.Trackbar2.LargeChange = 2; + this.Trackbar2.Location = new System.Drawing.Point(122, 110); + this.Trackbar2.Maximum = 16; + this.Trackbar2.Minimum = 0; + this.Trackbar2.Name = "Trackbar2"; + this.Trackbar2.Size = new System.Drawing.Size(290, 19); + this.Trackbar2.SmallChange = 1; + this.Trackbar2.TabIndex = 85; + this.Trackbar2.Value = 0; + this.Trackbar2.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar2_Scroll); + // + // trails_btn + // + this.trails_btn.CustomColor = System.Drawing.Color.Empty; + this.trails_btn.Flag = WinPaletter.UI.WP.Button.Flags.None; + this.trails_btn.Font = new System.Drawing.Font("Segoe UI", 9F); + this.trails_btn.ForeColor = System.Drawing.Color.White; + this.trails_btn.Image = null; + this.trails_btn.Location = new System.Drawing.Point(418, 107); + this.trails_btn.Name = "trails_btn"; + this.trails_btn.Size = new System.Drawing.Size(34, 24); + this.trails_btn.TabIndex = 130; + this.trails_btn.UseVisualStyleBackColor = false; + this.trails_btn.Click += new System.EventHandler(this.Ttl_h_Click); + // + // PictureBox21 + // + this.PictureBox21.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox21.Image"))); + this.PictureBox21.Location = new System.Drawing.Point(17, 107); + this.PictureBox21.Name = "PictureBox21"; + this.PictureBox21.Size = new System.Drawing.Size(24, 24); + this.PictureBox21.TabIndex = 87; + this.PictureBox21.TabStop = false; + // + // PictureBox22 + // + this.PictureBox22.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox22.Image"))); + this.PictureBox22.Location = new System.Drawing.Point(17, 77); + this.PictureBox22.Name = "PictureBox22"; + this.PictureBox22.Size = new System.Drawing.Size(24, 24); + this.PictureBox22.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.PictureBox22.TabIndex = 132; + this.PictureBox22.TabStop = false; + // + // CheckBox9 + // + this.CheckBox9.Checked = false; + this.CheckBox9.Font = new System.Drawing.Font("Segoe UI", 9F); + this.CheckBox9.ForeColor = System.Drawing.Color.White; + this.CheckBox9.Location = new System.Drawing.Point(47, 47); + this.CheckBox9.Name = "CheckBox9"; + this.CheckBox9.Size = new System.Drawing.Size(405, 24); + this.CheckBox9.TabIndex = 83; + this.CheckBox9.Text = "Make cursors have a shadow"; + // + // Label11 + // + this.Label11.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label11.Location = new System.Drawing.Point(47, 107); + this.Label11.Name = "Label11"; + this.Label11.Size = new System.Drawing.Size(69, 24); + this.Label11.TabIndex = 86; + this.Label11.Text = "Trails:"; + this.Label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // Button11 + // + this.Button11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.Button11.CustomColor = System.Drawing.Color.Empty; + this.Button11.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; + this.Button11.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button11.ForeColor = System.Drawing.Color.White; + this.Button11.Image = ((System.Drawing.Image)(resources.GetObject("Button11.Image"))); + this.Button11.Location = new System.Drawing.Point(639, 572); + this.Button11.Name = "Button11"; + this.Button11.Size = new System.Drawing.Size(115, 34); + this.Button11.TabIndex = 82; + this.Button11.Text = "Quick apply"; + this.Button11.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.Button11.UseVisualStyleBackColor = false; + this.Button11.Click += new System.EventHandler(this.Button11_Click); + // + // GroupBox13 + // + this.GroupBox13.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.GroupBox13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34))))); + this.GroupBox13.Controls.Add(this.checker_img); + this.GroupBox13.Controls.Add(this.Toggle1); + this.GroupBox13.Controls.Add(this.Button7); + this.GroupBox13.Controls.Add(this.Button8); + this.GroupBox13.Controls.Add(this.Button9); + this.GroupBox13.Controls.Add(this.Label12); + this.GroupBox13.Location = new System.Drawing.Point(12, 12); + this.GroupBox13.Name = "GroupBox13"; + this.GroupBox13.Size = new System.Drawing.Size(928, 39); + this.GroupBox13.TabIndex = 78; + // + // checker_img + // + this.checker_img.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.checker_img.BackColor = System.Drawing.Color.Transparent; + this.checker_img.Image = ((System.Drawing.Image)(resources.GetObject("checker_img.Image"))); + this.checker_img.Location = new System.Drawing.Point(840, 4); + this.checker_img.Name = "checker_img"; + this.checker_img.Size = new System.Drawing.Size(35, 31); + this.checker_img.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.checker_img.TabIndex = 84; + this.checker_img.TabStop = false; + // + // Toggle1 + // + this.Toggle1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.Toggle1.Checked = true; + this.Toggle1.DarkLight_Toggler = false; + this.Toggle1.Location = new System.Drawing.Point(880, 9); + this.Toggle1.Name = "Toggle1"; + this.Toggle1.Size = new System.Drawing.Size(40, 20); + this.Toggle1.TabIndex = 77; + this.Toggle1.CheckedChanged += new WinPaletter.UI.WP.Toggle.CheckedChangedEventHandler(this.Toggle1_CheckedChanged); + // + // Button7 + // + this.Button7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.Button7.CustomColor = System.Drawing.Color.Empty; + this.Button7.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; + this.Button7.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button7.ForeColor = System.Drawing.Color.White; + this.Button7.Image = ((System.Drawing.Image)(resources.GetObject("Button7.Image"))); + this.Button7.Location = new System.Drawing.Point(82, 5); + this.Button7.Name = "Button7"; + this.Button7.Size = new System.Drawing.Size(146, 29); + this.Button7.TabIndex = 69; + this.Button7.Text = "WinPaletter Theme"; + this.Button7.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.Button7.UseVisualStyleBackColor = false; + this.Button7.Click += new System.EventHandler(this.Button7_Click); + // + // Button8 + // + this.Button8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.Button8.CustomColor = System.Drawing.Color.Empty; + this.Button8.Flag = WinPaletter.UI.WP.Button.Flags.None; + this.Button8.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button8.ForeColor = System.Drawing.Color.White; + this.Button8.Image = null; + this.Button8.Location = new System.Drawing.Point(366, 5); + this.Button8.Name = "Button8"; + this.Button8.Size = new System.Drawing.Size(134, 29); + this.Button8.TabIndex = 68; + this.Button8.Text = "Default Windows"; + this.Button8.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.Button8.UseVisualStyleBackColor = false; + this.Button8.Click += new System.EventHandler(this.Button8_Click); + // + // Button9 + // + this.Button9.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.Button9.CustomColor = System.Drawing.Color.Empty; + this.Button9.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; + this.Button9.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button9.ForeColor = System.Drawing.Color.White; + this.Button9.Image = ((System.Drawing.Image)(resources.GetObject("Button9.Image"))); + this.Button9.Location = new System.Drawing.Point(230, 5); + this.Button9.Name = "Button9"; + this.Button9.Size = new System.Drawing.Size(134, 29); + this.Button9.TabIndex = 67; + this.Button9.Text = "Current applied"; + this.Button9.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.Button9.UseVisualStyleBackColor = false; + this.Button9.Click += new System.EventHandler(this.Button9_Click); + // + // Label12 + // + this.Label12.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.Label12.BackColor = System.Drawing.Color.Transparent; + this.Label12.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label12.Location = new System.Drawing.Point(5, 5); + this.Label12.Name = "Label12"; + this.Label12.Size = new System.Drawing.Size(71, 28); + this.Label12.TabIndex = 4; + this.Label12.Text = "Open from:"; + this.Label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // Button3 + // + this.Button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.Button3.CustomColor = System.Drawing.Color.Empty; + this.Button3.Flag = WinPaletter.UI.WP.Button.Flags.None; + this.Button3.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button3.ForeColor = System.Drawing.Color.White; + this.Button3.Image = null; + this.Button3.Location = new System.Drawing.Point(553, 572); + this.Button3.Name = "Button3"; + this.Button3.Size = new System.Drawing.Size(80, 34); + this.Button3.TabIndex = 66; + this.Button3.Text = "Cancel"; + this.Button3.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.Button3.UseVisualStyleBackColor = false; + this.Button3.Click += new System.EventHandler(this.Button3_Click); + // + // Button4 + // + this.Button4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.Button4.CustomColor = System.Drawing.Color.Empty; + this.Button4.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; + this.Button4.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button4.ForeColor = System.Drawing.Color.White; + this.Button4.Image = ((System.Drawing.Image)(resources.GetObject("Button4.Image"))); + this.Button4.Location = new System.Drawing.Point(760, 572); + this.Button4.Name = "Button4"; + this.Button4.Size = new System.Drawing.Size(180, 34); + this.Button4.TabIndex = 65; + this.Button4.Text = "Load into current theme"; + this.Button4.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.Button4.UseVisualStyleBackColor = false; + this.Button4.Click += new System.EventHandler(this.Button4_Click); + // + // GroupBox1 + // + this.GroupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.GroupBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34))))); + this.GroupBox1.Controls.Add(this.Button5); + this.GroupBox1.Controls.Add(this.Button10); + this.GroupBox1.Controls.Add(this.Label1); + this.GroupBox1.Controls.Add(this.FlowLayoutPanel1); + this.GroupBox1.Controls.Add(this.PictureBox12); + this.GroupBox1.Controls.Add(this.Label5); + this.GroupBox1.Controls.Add(this.Trackbar1); + this.GroupBox1.Controls.Add(this.Button6); + this.GroupBox1.Controls.Add(this.Button2); + this.GroupBox1.Controls.Add(this.Button1); + this.GroupBox1.Location = new System.Drawing.Point(630, 61); + this.GroupBox1.Name = "GroupBox1"; + this.GroupBox1.Padding = new System.Windows.Forms.Padding(3); + this.GroupBox1.Size = new System.Drawing.Size(310, 499); + this.GroupBox1.TabIndex = 7; + // + // Button5 + // + this.Button5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.Button5.CustomColor = System.Drawing.Color.Empty; + this.Button5.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; + this.Button5.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button5.ForeColor = System.Drawing.Color.White; + this.Button5.Image = ((System.Drawing.Image)(resources.GetObject("Button5.Image"))); + this.Button5.Location = new System.Drawing.Point(150, 465); + this.Button5.Name = "Button5"; + this.Button5.Size = new System.Drawing.Size(152, 28); + this.Button5.TabIndex = 66; + this.Button5.Text = "Animate (3 Cycles)"; + this.Button5.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.Button5.UseVisualStyleBackColor = false; + this.Button5.Click += new System.EventHandler(this.Button5_Click); + // + // Button10 + // + this.Button10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.Button10.CustomColor = System.Drawing.Color.Empty; + this.Button10.Flag = WinPaletter.UI.WP.Button.Flags.None; + this.Button10.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button10.ForeColor = System.Drawing.Color.White; + this.Button10.Image = null; + this.Button10.Location = new System.Drawing.Point(281, 437); + this.Button10.Name = "Button10"; + this.Button10.Size = new System.Drawing.Size(20, 21); + this.Button10.TabIndex = 58; + this.Button10.Text = "?"; + this.Button10.UseVisualStyleBackColor = false; + this.Button10.Click += new System.EventHandler(this.Button10_Click); + // + // Label1 + // + this.Label1.BackColor = System.Drawing.Color.Transparent; + this.Label1.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label1.Location = new System.Drawing.Point(10, 6); + this.Label1.Name = "Label1"; + this.Label1.Size = new System.Drawing.Size(291, 30); + this.Label1.TabIndex = 8; + this.Label1.Text = "Select a cursor to edit its properties"; + this.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // FlowLayoutPanel1 + // + this.FlowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.FlowLayoutPanel1.AutoScroll = true; + this.FlowLayoutPanel1.Controls.Add(this.Arrow); + this.FlowLayoutPanel1.Controls.Add(this.Help); + this.FlowLayoutPanel1.Controls.Add(this.AppLoading); + this.FlowLayoutPanel1.Controls.Add(this.Busy); + this.FlowLayoutPanel1.Controls.Add(this.Move_Cur); + this.FlowLayoutPanel1.Controls.Add(this.Up); + this.FlowLayoutPanel1.Controls.Add(this.NS); + this.FlowLayoutPanel1.Controls.Add(this.EW); + this.FlowLayoutPanel1.Controls.Add(this.NESW); + this.FlowLayoutPanel1.Controls.Add(this.NWSE); + this.FlowLayoutPanel1.Controls.Add(this.Pen); + this.FlowLayoutPanel1.Controls.Add(this.None); + this.FlowLayoutPanel1.Controls.Add(this.Link); + this.FlowLayoutPanel1.Controls.Add(this.Pin); + this.FlowLayoutPanel1.Controls.Add(this.Person); + this.FlowLayoutPanel1.Controls.Add(this.IBeam); + this.FlowLayoutPanel1.Controls.Add(this.Cross); + this.FlowLayoutPanel1.Location = new System.Drawing.Point(3, 41); + this.FlowLayoutPanel1.Name = "FlowLayoutPanel1"; + this.FlowLayoutPanel1.Padding = new System.Windows.Forms.Padding(4, 4, 0, 4); + this.FlowLayoutPanel1.Size = new System.Drawing.Size(301, 389); + this.FlowLayoutPanel1.TabIndex = 6; + // + // Arrow + // + this.Arrow.Location = new System.Drawing.Point(7, 7); + this.Arrow.Name = "Arrow"; + this.Arrow.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; + this.Arrow.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; + this.Arrow.Prop_Cursor = WinPaletter.Paths.CursorType.Arrow; + this.Arrow.Prop_File = ""; + this.Arrow.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Arrow.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Arrow.Prop_LoadingCircleBackGradient = false; + this.Arrow.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Arrow.Prop_LoadingCircleBackNoise = false; + this.Arrow.Prop_LoadingCircleBackNoiseOpacity = 0.25F; + this.Arrow.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Arrow.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Arrow.Prop_LoadingCircleHotGradient = false; + this.Arrow.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Arrow.Prop_LoadingCircleHotNoise = false; + this.Arrow.Prop_LoadingCircleHotNoiseOpacity = 0.25F; + this.Arrow.Prop_PrimaryColor1 = System.Drawing.Color.White; + this.Arrow.Prop_PrimaryColor2 = System.Drawing.Color.White; + this.Arrow.Prop_PrimaryColorGradient = false; + this.Arrow.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Arrow.Prop_PrimaryNoise = false; + this.Arrow.Prop_PrimaryNoiseOpacity = 0.25F; + this.Arrow.Prop_Scale = 1F; + this.Arrow.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Arrow.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Arrow.Prop_SecondaryColorGradient = false; + this.Arrow.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Arrow.Prop_SecondaryNoise = false; + this.Arrow.Prop_SecondaryNoiseOpacity = 0.25F; + this.Arrow.Prop_Shadow_Blur = 5; + this.Arrow.Prop_Shadow_Color = System.Drawing.Color.Black; + this.Arrow.Prop_Shadow_Enabled = false; + this.Arrow.Prop_Shadow_OffsetX = 2; + this.Arrow.Prop_Shadow_OffsetY = 2; + this.Arrow.Prop_Shadow_Opacity = 0.3F; + this.Arrow.Prop_UseFromFile = false; + this.Arrow.Size = new System.Drawing.Size(64, 64); + this.Arrow.TabIndex = 5; + // + // Help + // + this.Help.Location = new System.Drawing.Point(77, 7); + this.Help.Name = "Help"; + this.Help.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; + this.Help.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; + this.Help.Prop_Cursor = WinPaletter.Paths.CursorType.Help; + this.Help.Prop_File = ""; + this.Help.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Help.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Help.Prop_LoadingCircleBackGradient = false; + this.Help.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Help.Prop_LoadingCircleBackNoise = false; + this.Help.Prop_LoadingCircleBackNoiseOpacity = 0.25F; + this.Help.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Help.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Help.Prop_LoadingCircleHotGradient = false; + this.Help.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Help.Prop_LoadingCircleHotNoise = false; + this.Help.Prop_LoadingCircleHotNoiseOpacity = 0.25F; + this.Help.Prop_PrimaryColor1 = System.Drawing.Color.White; + this.Help.Prop_PrimaryColor2 = System.Drawing.Color.White; + this.Help.Prop_PrimaryColorGradient = false; + this.Help.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Help.Prop_PrimaryNoise = false; + this.Help.Prop_PrimaryNoiseOpacity = 0.25F; + this.Help.Prop_Scale = 1F; + this.Help.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Help.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Help.Prop_SecondaryColorGradient = false; + this.Help.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Help.Prop_SecondaryNoise = false; + this.Help.Prop_SecondaryNoiseOpacity = 0.25F; + this.Help.Prop_Shadow_Blur = 5; + this.Help.Prop_Shadow_Color = System.Drawing.Color.Black; + this.Help.Prop_Shadow_Enabled = false; + this.Help.Prop_Shadow_OffsetX = 2; + this.Help.Prop_Shadow_OffsetY = 2; + this.Help.Prop_Shadow_Opacity = 0.3F; + this.Help.Prop_UseFromFile = false; + this.Help.Size = new System.Drawing.Size(64, 64); + this.Help.TabIndex = 6; + // + // AppLoading + // + this.AppLoading.Location = new System.Drawing.Point(147, 7); + this.AppLoading.Name = "AppLoading"; + this.AppLoading.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; + this.AppLoading.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; + this.AppLoading.Prop_Cursor = WinPaletter.Paths.CursorType.AppLoading; + this.AppLoading.Prop_File = ""; + this.AppLoading.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.AppLoading.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.AppLoading.Prop_LoadingCircleBackGradient = false; + this.AppLoading.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Circle; + this.AppLoading.Prop_LoadingCircleBackNoise = false; + this.AppLoading.Prop_LoadingCircleBackNoiseOpacity = 0.25F; + this.AppLoading.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.AppLoading.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.AppLoading.Prop_LoadingCircleHotGradient = false; + this.AppLoading.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Circle; + this.AppLoading.Prop_LoadingCircleHotNoise = false; + this.AppLoading.Prop_LoadingCircleHotNoiseOpacity = 0.25F; + this.AppLoading.Prop_PrimaryColor1 = System.Drawing.Color.White; + this.AppLoading.Prop_PrimaryColor2 = System.Drawing.Color.White; + this.AppLoading.Prop_PrimaryColorGradient = false; + this.AppLoading.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Circle; + this.AppLoading.Prop_PrimaryNoise = false; + this.AppLoading.Prop_PrimaryNoiseOpacity = 0.25F; + this.AppLoading.Prop_Scale = 1F; + this.AppLoading.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.AppLoading.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.AppLoading.Prop_SecondaryColorGradient = false; + this.AppLoading.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Circle; + this.AppLoading.Prop_SecondaryNoise = false; + this.AppLoading.Prop_SecondaryNoiseOpacity = 0.25F; + this.AppLoading.Prop_Shadow_Blur = 5; + this.AppLoading.Prop_Shadow_Color = System.Drawing.Color.Black; + this.AppLoading.Prop_Shadow_Enabled = false; + this.AppLoading.Prop_Shadow_OffsetX = 2; + this.AppLoading.Prop_Shadow_OffsetY = 2; + this.AppLoading.Prop_Shadow_Opacity = 0.3F; + this.AppLoading.Prop_UseFromFile = false; + this.AppLoading.Size = new System.Drawing.Size(64, 64); + this.AppLoading.TabIndex = 6; + // + // Busy + // + this.Busy.Location = new System.Drawing.Point(217, 7); + this.Busy.Name = "Busy"; + this.Busy.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; + this.Busy.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; + this.Busy.Prop_Cursor = WinPaletter.Paths.CursorType.Busy; + this.Busy.Prop_File = ""; + this.Busy.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Busy.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Busy.Prop_LoadingCircleBackGradient = false; + this.Busy.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Circle; + this.Busy.Prop_LoadingCircleBackNoise = false; + this.Busy.Prop_LoadingCircleBackNoiseOpacity = 0.25F; + this.Busy.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Busy.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Busy.Prop_LoadingCircleHotGradient = false; + this.Busy.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Circle; + this.Busy.Prop_LoadingCircleHotNoise = false; + this.Busy.Prop_LoadingCircleHotNoiseOpacity = 0.25F; + this.Busy.Prop_PrimaryColor1 = System.Drawing.Color.White; + this.Busy.Prop_PrimaryColor2 = System.Drawing.Color.White; + this.Busy.Prop_PrimaryColorGradient = false; + this.Busy.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Circle; + this.Busy.Prop_PrimaryNoise = false; + this.Busy.Prop_PrimaryNoiseOpacity = 0.25F; + this.Busy.Prop_Scale = 1F; + this.Busy.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Busy.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Busy.Prop_SecondaryColorGradient = false; + this.Busy.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Circle; + this.Busy.Prop_SecondaryNoise = false; + this.Busy.Prop_SecondaryNoiseOpacity = 0.25F; + this.Busy.Prop_Shadow_Blur = 5; + this.Busy.Prop_Shadow_Color = System.Drawing.Color.Black; + this.Busy.Prop_Shadow_Enabled = false; + this.Busy.Prop_Shadow_OffsetX = 2; + this.Busy.Prop_Shadow_OffsetY = 2; + this.Busy.Prop_Shadow_Opacity = 0.3F; + this.Busy.Prop_UseFromFile = false; + this.Busy.Size = new System.Drawing.Size(64, 64); + this.Busy.TabIndex = 7; + // + // Move_Cur + // + this.Move_Cur.Location = new System.Drawing.Point(7, 77); + this.Move_Cur.Name = "Move_Cur"; + this.Move_Cur.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; + this.Move_Cur.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; + this.Move_Cur.Prop_Cursor = WinPaletter.Paths.CursorType.Move; + this.Move_Cur.Prop_File = ""; + this.Move_Cur.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Move_Cur.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Move_Cur.Prop_LoadingCircleBackGradient = false; + this.Move_Cur.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Move_Cur.Prop_LoadingCircleBackNoise = false; + this.Move_Cur.Prop_LoadingCircleBackNoiseOpacity = 0.25F; + this.Move_Cur.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Move_Cur.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Move_Cur.Prop_LoadingCircleHotGradient = false; + this.Move_Cur.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Move_Cur.Prop_LoadingCircleHotNoise = false; + this.Move_Cur.Prop_LoadingCircleHotNoiseOpacity = 0.25F; + this.Move_Cur.Prop_PrimaryColor1 = System.Drawing.Color.White; + this.Move_Cur.Prop_PrimaryColor2 = System.Drawing.Color.White; + this.Move_Cur.Prop_PrimaryColorGradient = false; + this.Move_Cur.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Move_Cur.Prop_PrimaryNoise = false; + this.Move_Cur.Prop_PrimaryNoiseOpacity = 0.25F; + this.Move_Cur.Prop_Scale = 1F; + this.Move_Cur.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Move_Cur.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Move_Cur.Prop_SecondaryColorGradient = false; + this.Move_Cur.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Move_Cur.Prop_SecondaryNoise = false; + this.Move_Cur.Prop_SecondaryNoiseOpacity = 0.25F; + this.Move_Cur.Prop_Shadow_Blur = 5; + this.Move_Cur.Prop_Shadow_Color = System.Drawing.Color.Black; + this.Move_Cur.Prop_Shadow_Enabled = false; + this.Move_Cur.Prop_Shadow_OffsetX = 2; + this.Move_Cur.Prop_Shadow_OffsetY = 2; + this.Move_Cur.Prop_Shadow_Opacity = 0.3F; + this.Move_Cur.Prop_UseFromFile = false; + this.Move_Cur.Size = new System.Drawing.Size(64, 64); + this.Move_Cur.TabIndex = 8; + // + // Up + // + this.Up.Location = new System.Drawing.Point(77, 77); + this.Up.Name = "Up"; + this.Up.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; + this.Up.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; + this.Up.Prop_Cursor = WinPaletter.Paths.CursorType.Up; + this.Up.Prop_File = ""; + this.Up.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Up.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Up.Prop_LoadingCircleBackGradient = false; + this.Up.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Up.Prop_LoadingCircleBackNoise = false; + this.Up.Prop_LoadingCircleBackNoiseOpacity = 0.25F; + this.Up.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Up.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Up.Prop_LoadingCircleHotGradient = false; + this.Up.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Up.Prop_LoadingCircleHotNoise = false; + this.Up.Prop_LoadingCircleHotNoiseOpacity = 0.25F; + this.Up.Prop_PrimaryColor1 = System.Drawing.Color.White; + this.Up.Prop_PrimaryColor2 = System.Drawing.Color.White; + this.Up.Prop_PrimaryColorGradient = false; + this.Up.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Up.Prop_PrimaryNoise = false; + this.Up.Prop_PrimaryNoiseOpacity = 0.25F; + this.Up.Prop_Scale = 1F; + this.Up.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Up.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Up.Prop_SecondaryColorGradient = false; + this.Up.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Up.Prop_SecondaryNoise = false; + this.Up.Prop_SecondaryNoiseOpacity = 0.25F; + this.Up.Prop_Shadow_Blur = 5; + this.Up.Prop_Shadow_Color = System.Drawing.Color.Black; + this.Up.Prop_Shadow_Enabled = false; + this.Up.Prop_Shadow_OffsetX = 2; + this.Up.Prop_Shadow_OffsetY = 2; + this.Up.Prop_Shadow_Opacity = 0.3F; + this.Up.Prop_UseFromFile = false; + this.Up.Size = new System.Drawing.Size(64, 64); + this.Up.TabIndex = 9; + // + // NS + // + this.NS.Location = new System.Drawing.Point(147, 77); + this.NS.Name = "NS"; + this.NS.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; + this.NS.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; + this.NS.Prop_Cursor = WinPaletter.Paths.CursorType.NS; + this.NS.Prop_File = ""; + this.NS.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.NS.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.NS.Prop_LoadingCircleBackGradient = false; + this.NS.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.NS.Prop_LoadingCircleBackNoise = false; + this.NS.Prop_LoadingCircleBackNoiseOpacity = 0.25F; + this.NS.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.NS.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.NS.Prop_LoadingCircleHotGradient = false; + this.NS.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.NS.Prop_LoadingCircleHotNoise = false; + this.NS.Prop_LoadingCircleHotNoiseOpacity = 0.25F; + this.NS.Prop_PrimaryColor1 = System.Drawing.Color.White; + this.NS.Prop_PrimaryColor2 = System.Drawing.Color.White; + this.NS.Prop_PrimaryColorGradient = false; + this.NS.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.NS.Prop_PrimaryNoise = false; + this.NS.Prop_PrimaryNoiseOpacity = 0.25F; + this.NS.Prop_Scale = 1F; + this.NS.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.NS.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.NS.Prop_SecondaryColorGradient = false; + this.NS.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.NS.Prop_SecondaryNoise = false; + this.NS.Prop_SecondaryNoiseOpacity = 0.25F; + this.NS.Prop_Shadow_Blur = 5; + this.NS.Prop_Shadow_Color = System.Drawing.Color.Black; + this.NS.Prop_Shadow_Enabled = false; + this.NS.Prop_Shadow_OffsetX = 2; + this.NS.Prop_Shadow_OffsetY = 2; + this.NS.Prop_Shadow_Opacity = 0.3F; + this.NS.Prop_UseFromFile = false; + this.NS.Size = new System.Drawing.Size(64, 64); + this.NS.TabIndex = 10; + // + // EW + // + this.EW.Location = new System.Drawing.Point(217, 77); + this.EW.Name = "EW"; + this.EW.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; + this.EW.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; + this.EW.Prop_Cursor = WinPaletter.Paths.CursorType.EW; + this.EW.Prop_File = ""; + this.EW.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.EW.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.EW.Prop_LoadingCircleBackGradient = false; + this.EW.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.EW.Prop_LoadingCircleBackNoise = false; + this.EW.Prop_LoadingCircleBackNoiseOpacity = 0.25F; + this.EW.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.EW.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.EW.Prop_LoadingCircleHotGradient = false; + this.EW.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.EW.Prop_LoadingCircleHotNoise = false; + this.EW.Prop_LoadingCircleHotNoiseOpacity = 0.25F; + this.EW.Prop_PrimaryColor1 = System.Drawing.Color.White; + this.EW.Prop_PrimaryColor2 = System.Drawing.Color.White; + this.EW.Prop_PrimaryColorGradient = false; + this.EW.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.EW.Prop_PrimaryNoise = false; + this.EW.Prop_PrimaryNoiseOpacity = 0.25F; + this.EW.Prop_Scale = 1F; + this.EW.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.EW.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.EW.Prop_SecondaryColorGradient = false; + this.EW.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.EW.Prop_SecondaryNoise = false; + this.EW.Prop_SecondaryNoiseOpacity = 0.25F; + this.EW.Prop_Shadow_Blur = 5; + this.EW.Prop_Shadow_Color = System.Drawing.Color.Black; + this.EW.Prop_Shadow_Enabled = false; + this.EW.Prop_Shadow_OffsetX = 2; + this.EW.Prop_Shadow_OffsetY = 2; + this.EW.Prop_Shadow_Opacity = 0.3F; + this.EW.Prop_UseFromFile = false; + this.EW.Size = new System.Drawing.Size(64, 64); + this.EW.TabIndex = 11; + // + // NESW + // + this.NESW.Location = new System.Drawing.Point(7, 147); + this.NESW.Name = "NESW"; + this.NESW.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; + this.NESW.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; + this.NESW.Prop_Cursor = WinPaletter.Paths.CursorType.NESW; + this.NESW.Prop_File = ""; + this.NESW.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.NESW.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.NESW.Prop_LoadingCircleBackGradient = false; + this.NESW.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.NESW.Prop_LoadingCircleBackNoise = false; + this.NESW.Prop_LoadingCircleBackNoiseOpacity = 0.25F; + this.NESW.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.NESW.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.NESW.Prop_LoadingCircleHotGradient = false; + this.NESW.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.NESW.Prop_LoadingCircleHotNoise = false; + this.NESW.Prop_LoadingCircleHotNoiseOpacity = 0.25F; + this.NESW.Prop_PrimaryColor1 = System.Drawing.Color.White; + this.NESW.Prop_PrimaryColor2 = System.Drawing.Color.White; + this.NESW.Prop_PrimaryColorGradient = false; + this.NESW.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.NESW.Prop_PrimaryNoise = false; + this.NESW.Prop_PrimaryNoiseOpacity = 0.25F; + this.NESW.Prop_Scale = 1F; + this.NESW.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.NESW.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.NESW.Prop_SecondaryColorGradient = false; + this.NESW.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.NESW.Prop_SecondaryNoise = false; + this.NESW.Prop_SecondaryNoiseOpacity = 0.25F; + this.NESW.Prop_Shadow_Blur = 5; + this.NESW.Prop_Shadow_Color = System.Drawing.Color.Black; + this.NESW.Prop_Shadow_Enabled = false; + this.NESW.Prop_Shadow_OffsetX = 2; + this.NESW.Prop_Shadow_OffsetY = 2; + this.NESW.Prop_Shadow_Opacity = 0.3F; + this.NESW.Prop_UseFromFile = false; + this.NESW.Size = new System.Drawing.Size(64, 64); + this.NESW.TabIndex = 12; + // + // NWSE + // + this.NWSE.Location = new System.Drawing.Point(77, 147); + this.NWSE.Name = "NWSE"; + this.NWSE.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; + this.NWSE.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; + this.NWSE.Prop_Cursor = WinPaletter.Paths.CursorType.NWSE; + this.NWSE.Prop_File = ""; + this.NWSE.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.NWSE.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.NWSE.Prop_LoadingCircleBackGradient = false; + this.NWSE.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.NWSE.Prop_LoadingCircleBackNoise = false; + this.NWSE.Prop_LoadingCircleBackNoiseOpacity = 0.25F; + this.NWSE.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.NWSE.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.NWSE.Prop_LoadingCircleHotGradient = false; + this.NWSE.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.NWSE.Prop_LoadingCircleHotNoise = false; + this.NWSE.Prop_LoadingCircleHotNoiseOpacity = 0.25F; + this.NWSE.Prop_PrimaryColor1 = System.Drawing.Color.White; + this.NWSE.Prop_PrimaryColor2 = System.Drawing.Color.White; + this.NWSE.Prop_PrimaryColorGradient = false; + this.NWSE.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.NWSE.Prop_PrimaryNoise = false; + this.NWSE.Prop_PrimaryNoiseOpacity = 0.25F; + this.NWSE.Prop_Scale = 1F; + this.NWSE.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.NWSE.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.NWSE.Prop_SecondaryColorGradient = false; + this.NWSE.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.NWSE.Prop_SecondaryNoise = false; + this.NWSE.Prop_SecondaryNoiseOpacity = 0.25F; + this.NWSE.Prop_Shadow_Blur = 5; + this.NWSE.Prop_Shadow_Color = System.Drawing.Color.Black; + this.NWSE.Prop_Shadow_Enabled = false; + this.NWSE.Prop_Shadow_OffsetX = 2; + this.NWSE.Prop_Shadow_OffsetY = 2; + this.NWSE.Prop_Shadow_Opacity = 0.3F; + this.NWSE.Prop_UseFromFile = false; + this.NWSE.Size = new System.Drawing.Size(64, 64); + this.NWSE.TabIndex = 13; + // + // Pen // - // tabPage5 + this.Pen.Location = new System.Drawing.Point(147, 147); + this.Pen.Name = "Pen"; + this.Pen.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; + this.Pen.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; + this.Pen.Prop_Cursor = WinPaletter.Paths.CursorType.Pen; + this.Pen.Prop_File = ""; + this.Pen.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Pen.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Pen.Prop_LoadingCircleBackGradient = false; + this.Pen.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Pen.Prop_LoadingCircleBackNoise = false; + this.Pen.Prop_LoadingCircleBackNoiseOpacity = 0.25F; + this.Pen.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Pen.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Pen.Prop_LoadingCircleHotGradient = false; + this.Pen.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Pen.Prop_LoadingCircleHotNoise = false; + this.Pen.Prop_LoadingCircleHotNoiseOpacity = 0.25F; + this.Pen.Prop_PrimaryColor1 = System.Drawing.Color.White; + this.Pen.Prop_PrimaryColor2 = System.Drawing.Color.White; + this.Pen.Prop_PrimaryColorGradient = false; + this.Pen.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Pen.Prop_PrimaryNoise = false; + this.Pen.Prop_PrimaryNoiseOpacity = 0.25F; + this.Pen.Prop_Scale = 1F; + this.Pen.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Pen.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Pen.Prop_SecondaryColorGradient = false; + this.Pen.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Pen.Prop_SecondaryNoise = false; + this.Pen.Prop_SecondaryNoiseOpacity = 0.25F; + this.Pen.Prop_Shadow_Blur = 5; + this.Pen.Prop_Shadow_Color = System.Drawing.Color.Black; + this.Pen.Prop_Shadow_Enabled = false; + this.Pen.Prop_Shadow_OffsetX = 2; + this.Pen.Prop_Shadow_OffsetY = 2; + this.Pen.Prop_Shadow_Opacity = 0.3F; + this.Pen.Prop_UseFromFile = false; + this.Pen.Size = new System.Drawing.Size(64, 64); + this.Pen.TabIndex = 14; // - this.tabPage5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.tabPage5.Controls.Add(this.button20); - this.tabPage5.Controls.Add(this.textBox1); - this.tabPage5.Controls.Add(this.pictureBox26); - this.tabPage5.Controls.Add(this.label16); - this.tabPage5.Controls.Add(this.label9); - this.tabPage5.Controls.Add(this.pictureBox25); - this.tabPage5.Location = new System.Drawing.Point(154, 4); - this.tabPage5.Name = "tabPage5"; - this.tabPage5.Padding = new System.Windows.Forms.Padding(3); - this.tabPage5.Size = new System.Drawing.Size(458, 499); - this.tabPage5.TabIndex = 4; - this.tabPage5.Text = "Cursor from file"; + // None // - // button20 + this.None.Location = new System.Drawing.Point(217, 147); + this.None.Name = "None"; + this.None.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; + this.None.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; + this.None.Prop_Cursor = WinPaletter.Paths.CursorType.None; + this.None.Prop_File = ""; + this.None.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.None.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.None.Prop_LoadingCircleBackGradient = false; + this.None.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.None.Prop_LoadingCircleBackNoise = false; + this.None.Prop_LoadingCircleBackNoiseOpacity = 0.25F; + this.None.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.None.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.None.Prop_LoadingCircleHotGradient = false; + this.None.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.None.Prop_LoadingCircleHotNoise = false; + this.None.Prop_LoadingCircleHotNoiseOpacity = 0.25F; + this.None.Prop_PrimaryColor1 = System.Drawing.Color.White; + this.None.Prop_PrimaryColor2 = System.Drawing.Color.White; + this.None.Prop_PrimaryColorGradient = false; + this.None.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.None.Prop_PrimaryNoise = false; + this.None.Prop_PrimaryNoiseOpacity = 0.25F; + this.None.Prop_Scale = 1F; + this.None.Prop_SecondaryColor1 = System.Drawing.Color.Red; + this.None.Prop_SecondaryColor2 = System.Drawing.Color.Red; + this.None.Prop_SecondaryColorGradient = false; + this.None.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.None.Prop_SecondaryNoise = false; + this.None.Prop_SecondaryNoiseOpacity = 0.25F; + this.None.Prop_Shadow_Blur = 5; + this.None.Prop_Shadow_Color = System.Drawing.Color.Black; + this.None.Prop_Shadow_Enabled = false; + this.None.Prop_Shadow_OffsetX = 2; + this.None.Prop_Shadow_OffsetY = 2; + this.None.Prop_Shadow_Opacity = 0.3F; + this.None.Prop_UseFromFile = false; + this.None.Size = new System.Drawing.Size(64, 64); + this.None.TabIndex = 15; // - this.button20.CustomColor = System.Drawing.Color.Empty; - this.button20.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; - this.button20.Font = new System.Drawing.Font("Segoe UI", 9F); - this.button20.ForeColor = System.Drawing.Color.White; - this.button20.Image = ((System.Drawing.Image)(resources.GetObject("button20.Image"))); - this.button20.Location = new System.Drawing.Point(418, 47); - this.button20.Name = "button20"; - this.button20.Size = new System.Drawing.Size(34, 24); - this.button20.TabIndex = 139; - this.button20.UseVisualStyleBackColor = false; - this.button20.Click += new System.EventHandler(this.button20_Click); + // Link + // + this.Link.Location = new System.Drawing.Point(7, 217); + this.Link.Name = "Link"; + this.Link.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; + this.Link.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; + this.Link.Prop_Cursor = WinPaletter.Paths.CursorType.Link; + this.Link.Prop_File = ""; + this.Link.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Link.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Link.Prop_LoadingCircleBackGradient = false; + this.Link.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Link.Prop_LoadingCircleBackNoise = false; + this.Link.Prop_LoadingCircleBackNoiseOpacity = 0.25F; + this.Link.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Link.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Link.Prop_LoadingCircleHotGradient = false; + this.Link.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Link.Prop_LoadingCircleHotNoise = false; + this.Link.Prop_LoadingCircleHotNoiseOpacity = 0.25F; + this.Link.Prop_PrimaryColor1 = System.Drawing.Color.White; + this.Link.Prop_PrimaryColor2 = System.Drawing.Color.White; + this.Link.Prop_PrimaryColorGradient = false; + this.Link.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Link.Prop_PrimaryNoise = false; + this.Link.Prop_PrimaryNoiseOpacity = 0.25F; + this.Link.Prop_Scale = 1F; + this.Link.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Link.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Link.Prop_SecondaryColorGradient = false; + this.Link.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Link.Prop_SecondaryNoise = false; + this.Link.Prop_SecondaryNoiseOpacity = 0.25F; + this.Link.Prop_Shadow_Blur = 5; + this.Link.Prop_Shadow_Color = System.Drawing.Color.Black; + this.Link.Prop_Shadow_Enabled = false; + this.Link.Prop_Shadow_OffsetX = 2; + this.Link.Prop_Shadow_OffsetY = 2; + this.Link.Prop_Shadow_Opacity = 0.3F; + this.Link.Prop_UseFromFile = false; + this.Link.Size = new System.Drawing.Size(64, 64); + this.Link.TabIndex = 16; + // + // Pin + // + this.Pin.Location = new System.Drawing.Point(77, 217); + this.Pin.Name = "Pin"; + this.Pin.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; + this.Pin.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; + this.Pin.Prop_Cursor = WinPaletter.Paths.CursorType.Pin; + this.Pin.Prop_File = ""; + this.Pin.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Pin.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Pin.Prop_LoadingCircleBackGradient = false; + this.Pin.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Pin.Prop_LoadingCircleBackNoise = false; + this.Pin.Prop_LoadingCircleBackNoiseOpacity = 0.25F; + this.Pin.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Pin.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Pin.Prop_LoadingCircleHotGradient = false; + this.Pin.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Pin.Prop_LoadingCircleHotNoise = false; + this.Pin.Prop_LoadingCircleHotNoiseOpacity = 0.25F; + this.Pin.Prop_PrimaryColor1 = System.Drawing.Color.White; + this.Pin.Prop_PrimaryColor2 = System.Drawing.Color.White; + this.Pin.Prop_PrimaryColorGradient = false; + this.Pin.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Pin.Prop_PrimaryNoise = false; + this.Pin.Prop_PrimaryNoiseOpacity = 0.25F; + this.Pin.Prop_Scale = 1F; + this.Pin.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Pin.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Pin.Prop_SecondaryColorGradient = false; + this.Pin.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Pin.Prop_SecondaryNoise = false; + this.Pin.Prop_SecondaryNoiseOpacity = 0.25F; + this.Pin.Prop_Shadow_Blur = 5; + this.Pin.Prop_Shadow_Color = System.Drawing.Color.Black; + this.Pin.Prop_Shadow_Enabled = false; + this.Pin.Prop_Shadow_OffsetX = 2; + this.Pin.Prop_Shadow_OffsetY = 2; + this.Pin.Prop_Shadow_Opacity = 0.3F; + this.Pin.Prop_UseFromFile = false; + this.Pin.Size = new System.Drawing.Size(64, 64); + this.Pin.TabIndex = 17; + // + // Person + // + this.Person.Location = new System.Drawing.Point(147, 217); + this.Person.Name = "Person"; + this.Person.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; + this.Person.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; + this.Person.Prop_Cursor = WinPaletter.Paths.CursorType.Person; + this.Person.Prop_File = ""; + this.Person.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Person.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Person.Prop_LoadingCircleBackGradient = false; + this.Person.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Person.Prop_LoadingCircleBackNoise = false; + this.Person.Prop_LoadingCircleBackNoiseOpacity = 0.25F; + this.Person.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Person.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Person.Prop_LoadingCircleHotGradient = false; + this.Person.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Person.Prop_LoadingCircleHotNoise = false; + this.Person.Prop_LoadingCircleHotNoiseOpacity = 0.25F; + this.Person.Prop_PrimaryColor1 = System.Drawing.Color.White; + this.Person.Prop_PrimaryColor2 = System.Drawing.Color.White; + this.Person.Prop_PrimaryColorGradient = false; + this.Person.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Person.Prop_PrimaryNoise = false; + this.Person.Prop_PrimaryNoiseOpacity = 0.25F; + this.Person.Prop_Scale = 1F; + this.Person.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Person.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Person.Prop_SecondaryColorGradient = false; + this.Person.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Person.Prop_SecondaryNoise = false; + this.Person.Prop_SecondaryNoiseOpacity = 0.25F; + this.Person.Prop_Shadow_Blur = 5; + this.Person.Prop_Shadow_Color = System.Drawing.Color.Black; + this.Person.Prop_Shadow_Enabled = false; + this.Person.Prop_Shadow_OffsetX = 2; + this.Person.Prop_Shadow_OffsetY = 2; + this.Person.Prop_Shadow_Opacity = 0.3F; + this.Person.Prop_UseFromFile = false; + this.Person.Size = new System.Drawing.Size(64, 64); + this.Person.TabIndex = 18; + // + // IBeam + // + this.IBeam.Location = new System.Drawing.Point(217, 217); + this.IBeam.Name = "IBeam"; + this.IBeam.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; + this.IBeam.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; + this.IBeam.Prop_Cursor = WinPaletter.Paths.CursorType.IBeam; + this.IBeam.Prop_File = ""; + this.IBeam.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.IBeam.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.IBeam.Prop_LoadingCircleBackGradient = false; + this.IBeam.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.IBeam.Prop_LoadingCircleBackNoise = false; + this.IBeam.Prop_LoadingCircleBackNoiseOpacity = 0.25F; + this.IBeam.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.IBeam.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.IBeam.Prop_LoadingCircleHotGradient = false; + this.IBeam.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.IBeam.Prop_LoadingCircleHotNoise = false; + this.IBeam.Prop_LoadingCircleHotNoiseOpacity = 0.25F; + this.IBeam.Prop_PrimaryColor1 = System.Drawing.Color.White; + this.IBeam.Prop_PrimaryColor2 = System.Drawing.Color.White; + this.IBeam.Prop_PrimaryColorGradient = false; + this.IBeam.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.IBeam.Prop_PrimaryNoise = false; + this.IBeam.Prop_PrimaryNoiseOpacity = 0.25F; + this.IBeam.Prop_Scale = 1F; + this.IBeam.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.IBeam.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.IBeam.Prop_SecondaryColorGradient = false; + this.IBeam.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.IBeam.Prop_SecondaryNoise = false; + this.IBeam.Prop_SecondaryNoiseOpacity = 0.25F; + this.IBeam.Prop_Shadow_Blur = 5; + this.IBeam.Prop_Shadow_Color = System.Drawing.Color.Black; + this.IBeam.Prop_Shadow_Enabled = false; + this.IBeam.Prop_Shadow_OffsetX = 2; + this.IBeam.Prop_Shadow_OffsetY = 2; + this.IBeam.Prop_Shadow_Opacity = 0.3F; + this.IBeam.Prop_UseFromFile = false; + this.IBeam.Size = new System.Drawing.Size(64, 64); + this.IBeam.TabIndex = 19; // - // textBox1 + // Cross // - this.textBox1.ForeColor = System.Drawing.Color.White; - this.textBox1.Location = new System.Drawing.Point(122, 47); - this.textBox1.MaxLength = 32767; - this.textBox1.Multiline = false; - this.textBox1.Name = "textBox1"; - this.textBox1.ReadOnly = false; - this.textBox1.Scrollbars = System.Windows.Forms.ScrollBars.None; - this.textBox1.SelectedText = ""; - this.textBox1.SelectionLength = 0; - this.textBox1.SelectionStart = 0; - this.textBox1.Size = new System.Drawing.Size(290, 24); - this.textBox1.TabIndex = 79; - this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Left; - this.textBox1.UseSystemPasswordChar = false; - this.textBox1.WordWrap = true; - this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged); + this.Cross.Location = new System.Drawing.Point(7, 287); + this.Cross.Name = "Cross"; + this.Cross.Prop_ArrowStyle = WinPaletter.Paths.ArrowStyle.Aero; + this.Cross.Prop_CircleStyle = WinPaletter.Paths.CircleStyle.Aero; + this.Cross.Prop_Cursor = WinPaletter.Paths.CursorType.Cross; + this.Cross.Prop_File = ""; + this.Cross.Prop_LoadingCircleBack1 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Cross.Prop_LoadingCircleBack2 = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(151)))), ((int)(((byte)(243))))); + this.Cross.Prop_LoadingCircleBackGradient = false; + this.Cross.Prop_LoadingCircleBackGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Cross.Prop_LoadingCircleBackNoise = false; + this.Cross.Prop_LoadingCircleBackNoiseOpacity = 0.25F; + this.Cross.Prop_LoadingCircleHot1 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Cross.Prop_LoadingCircleHot2 = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(204)))), ((int)(((byte)(255))))); + this.Cross.Prop_LoadingCircleHotGradient = false; + this.Cross.Prop_LoadingCircleHotGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Cross.Prop_LoadingCircleHotNoise = false; + this.Cross.Prop_LoadingCircleHotNoiseOpacity = 0.25F; + this.Cross.Prop_PrimaryColor1 = System.Drawing.Color.White; + this.Cross.Prop_PrimaryColor2 = System.Drawing.Color.White; + this.Cross.Prop_PrimaryColorGradient = false; + this.Cross.Prop_PrimaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Cross.Prop_PrimaryNoise = false; + this.Cross.Prop_PrimaryNoiseOpacity = 0.25F; + this.Cross.Prop_Scale = 1F; + this.Cross.Prop_SecondaryColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Cross.Prop_SecondaryColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(65)))), ((int)(((byte)(75))))); + this.Cross.Prop_SecondaryColorGradient = false; + this.Cross.Prop_SecondaryColorGradientMode = WinPaletter.Paths.GradientMode.Horizontal; + this.Cross.Prop_SecondaryNoise = false; + this.Cross.Prop_SecondaryNoiseOpacity = 0.25F; + this.Cross.Prop_Shadow_Blur = 5; + this.Cross.Prop_Shadow_Color = System.Drawing.Color.Black; + this.Cross.Prop_Shadow_Enabled = false; + this.Cross.Prop_Shadow_OffsetX = 2; + this.Cross.Prop_Shadow_OffsetY = 2; + this.Cross.Prop_Shadow_Opacity = 0.3F; + this.Cross.Prop_UseFromFile = false; + this.Cross.Size = new System.Drawing.Size(64, 64); + this.Cross.TabIndex = 20; // - // pictureBox26 + // PictureBox12 // - this.pictureBox26.BackColor = System.Drawing.Color.Transparent; - this.pictureBox26.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox26.Image"))); - this.pictureBox26.Location = new System.Drawing.Point(6, 6); - this.pictureBox26.Name = "pictureBox26"; - this.pictureBox26.Size = new System.Drawing.Size(35, 35); - this.pictureBox26.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox26.TabIndex = 78; - this.pictureBox26.TabStop = false; + this.PictureBox12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.PictureBox12.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox12.Image"))); + this.PictureBox12.Location = new System.Drawing.Point(8, 435); + this.PictureBox12.Name = "PictureBox12"; + this.PictureBox12.Size = new System.Drawing.Size(24, 24); + this.PictureBox12.TabIndex = 57; + this.PictureBox12.TabStop = false; // - // label16 + // Label5 // - this.label16.BackColor = System.Drawing.Color.Transparent; - this.label16.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Bold); - this.label16.Location = new System.Drawing.Point(43, 6); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(409, 35); - this.label16.TabIndex = 77; - this.label16.Text = "Cursor from file"; - this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.Label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.Label5.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label5.Location = new System.Drawing.Point(38, 435); + this.Label5.Name = "Label5"; + this.Label5.Size = new System.Drawing.Size(85, 24); + this.Label5.TabIndex = 56; + this.Label5.Text = "Scaling (1x)"; + this.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // label9 + // Trackbar1 // - this.label9.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label9.Location = new System.Drawing.Point(47, 47); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(69, 24); - this.label9.TabIndex = 14; - this.label9.Text = "File:"; - this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.Trackbar1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.Trackbar1.BackColor = System.Drawing.Color.Transparent; + this.Trackbar1.LargeChange = 50; + this.Trackbar1.Location = new System.Drawing.Point(129, 438); + this.Trackbar1.Maximum = 320; + this.Trackbar1.Minimum = 100; + this.Trackbar1.Name = "Trackbar1"; + this.Trackbar1.Size = new System.Drawing.Size(146, 19); + this.Trackbar1.SmallChange = 20; + this.Trackbar1.TabIndex = 9; + this.Trackbar1.Value = 100; + this.Trackbar1.Scroll += new WinPaletter.UI.WP.Trackbar.ScrollEventHandler(this.Trackbar1_Scroll); // - // pictureBox25 + // Button6 // - this.pictureBox25.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox25.Image"))); - this.pictureBox25.Location = new System.Drawing.Point(17, 47); - this.pictureBox25.Name = "pictureBox25"; - this.pictureBox25.Size = new System.Drawing.Size(24, 24); - this.pictureBox25.TabIndex = 13; - this.pictureBox25.TabStop = false; + this.Button6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.Button6.CustomColor = System.Drawing.Color.Empty; + this.Button6.Enabled = false; + this.Button6.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; + this.Button6.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button6.ForeColor = System.Drawing.Color.White; + this.Button6.Image = ((System.Drawing.Image)(resources.GetObject("Button6.Image"))); + this.Button6.Location = new System.Drawing.Point(74, 465); + this.Button6.Name = "Button6"; + this.Button6.Size = new System.Drawing.Size(70, 28); + this.Button6.TabIndex = 67; + this.Button6.Text = "to all"; + this.Button6.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.Button6.UseVisualStyleBackColor = false; + this.Button6.Click += new System.EventHandler(this.Button6_Click); // - // tabPage4 + // Button2 // - this.tabPage4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.tabPage4.Controls.Add(this.PictureBox13); - this.tabPage4.Controls.Add(this.Label6); - this.tabPage4.Controls.Add(this.CheckBox10); - this.tabPage4.Controls.Add(this.PictureBox9); - this.tabPage4.Controls.Add(this.Trackbar2); - this.tabPage4.Controls.Add(this.trails_btn); - this.tabPage4.Controls.Add(this.PictureBox21); - this.tabPage4.Controls.Add(this.PictureBox22); - this.tabPage4.Controls.Add(this.CheckBox9); - this.tabPage4.Controls.Add(this.Label11); - this.tabPage4.Location = new System.Drawing.Point(154, 4); - this.tabPage4.Name = "tabPage4"; - this.tabPage4.Padding = new System.Windows.Forms.Padding(3); - this.tabPage4.Size = new System.Drawing.Size(458, 499); - this.tabPage4.TabIndex = 3; - this.tabPage4.Text = "Miscellaneous"; + this.Button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.Button2.CustomColor = System.Drawing.Color.Empty; + this.Button2.Enabled = false; + this.Button2.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; + this.Button2.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button2.ForeColor = System.Drawing.Color.White; + this.Button2.Image = ((System.Drawing.Image)(resources.GetObject("Button2.Image"))); + this.Button2.Location = new System.Drawing.Point(41, 465); + this.Button2.Name = "Button2"; + this.Button2.Size = new System.Drawing.Size(27, 28); + this.Button2.TabIndex = 11; + this.Button2.UseVisualStyleBackColor = false; + this.Button2.Click += new System.EventHandler(this.Button2_Click); // - // openFileDialog2 + // Button1 // - this.openFileDialog2.DefaultExt = "wpt"; - this.openFileDialog2.Filter = "Windows cursor file (*.cur)|*.cur|Animated cursor file (*.ani)|*.ani"; + this.Button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.Button1.CustomColor = System.Drawing.Color.Empty; + this.Button1.Enabled = false; + this.Button1.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; + this.Button1.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button1.ForeColor = System.Drawing.Color.White; + this.Button1.Image = ((System.Drawing.Image)(resources.GetObject("Button1.Image"))); + this.Button1.Location = new System.Drawing.Point(8, 465); + this.Button1.Name = "Button1"; + this.Button1.Size = new System.Drawing.Size(27, 28); + this.Button1.TabIndex = 10; + this.Button1.UseVisualStyleBackColor = false; + this.Button1.Click += new System.EventHandler(this.Button1_Click); // // CursorsStudio // @@ -2680,42 +2672,42 @@ private void InitializeComponent() this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.CursorsStudio_HelpButtonClicked); this.Load += new System.EventHandler(this.Form1_Load); this.Shown += new System.EventHandler(this.CursorsStudio_Shown); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox24)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox20)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox19)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox16)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox17)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox18)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox13)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox9)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox22)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox21)).EndInit(); + this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PictureBox14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PictureBox15)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox11)).EndInit(); + this.tabPage2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.PictureBox3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PictureBox7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PictureBox8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox10)).EndInit(); - this.GroupBox13.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.checker_img)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PictureBox5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox2)).EndInit(); - this.GroupBox1.ResumeLayout(false); - this.FlowLayoutPanel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox12)).EndInit(); - this.tabControl1.ResumeLayout(false); - this.tabPage1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.tabPage2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox10)).EndInit(); this.tabPage3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox23)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox16)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox24)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox18)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox20)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox19)).EndInit(); this.tabPage5.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox26)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox25)).EndInit(); this.tabPage4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox13)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox21)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox22)).EndInit(); + this.GroupBox13.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.checker_img)).EndInit(); + this.GroupBox1.ResumeLayout(false); + this.FlowLayoutPanel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox12)).EndInit(); this.ResumeLayout(false); } diff --git a/WinPaletter/CursorsStudio/CursorsStudio.cs b/WinPaletter/CursorsStudio/CursorsStudio.cs index e194f747..999660db 100644 --- a/WinPaletter/CursorsStudio/CursorsStudio.cs +++ b/WinPaletter/CursorsStudio/CursorsStudio.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.Drawing; using System.Linq; using System.Windows.Forms; using WinPaletter.UI.Controllers; @@ -325,15 +326,15 @@ private void TaskbarFrontAndFoldersOnStart_picker_Click(object sender, EventArgs return; } - var CList = new List() { (UI.Controllers.ColorItem)sender, _SelectedControl }; + List CList = new() { (UI.Controllers.ColorItem)sender, _SelectedControl }; - var _Condition = new Conditions() { CursorBack1 = true, Win7 = false, LivePreview_AfterGlow = false, LivePreview_Colorization = false }; - var c = Forms.ColorPickerDlg.Pick(CList, _Condition, true); + Conditions _conditions = new() { CursorBack1 = true, Win7 = false, LivePreview_AfterGlow = false, LivePreview_Colorization = false }; + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions, true); - _SelectedControl.Prop_PrimaryColor1 = c; + _SelectedControl.Prop_PrimaryColor1 = C; _SelectedControl.Invalidate(); - ((UI.Controllers.ColorItem)sender).BackColor = c; + ((UI.Controllers.ColorItem)sender).BackColor = C; ((UI.Controllers.ColorItem)sender).Invalidate(); CList.Clear(); @@ -360,14 +361,14 @@ private void GroupBox3_Click(object sender, EventArgs e) return; } - var CList = new List() { (UI.Controllers.ColorItem)sender, _SelectedControl }; + List CList = new() { (UI.Controllers.ColorItem)sender, _SelectedControl }; - var _Condition = new Conditions() { CursorBack2 = true, Win7 = false, LivePreview_AfterGlow = false, LivePreview_Colorization = false }; - var c = Forms.ColorPickerDlg.Pick(CList, _Condition, true); + Conditions _conditions = new() { CursorBack2 = true, Win7 = false, LivePreview_AfterGlow = false, LivePreview_Colorization = false }; + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions, true); - _SelectedControl.Prop_PrimaryColor2 = c; + _SelectedControl.Prop_PrimaryColor2 = C; _SelectedControl.Invalidate(); - ((UI.Controllers.ColorItem)sender).BackColor = c; + ((UI.Controllers.ColorItem)sender).BackColor = C; ((UI.Controllers.ColorItem)sender).Invalidate(); CList.Clear(); @@ -395,14 +396,14 @@ private void GroupBox5_Click(object sender, EventArgs e) return; } - var CList = new List() { (UI.Controllers.ColorItem)sender, _SelectedControl }; + List CList = new() { (UI.Controllers.ColorItem)sender, _SelectedControl }; - var _Condition = new Conditions() { CursorLine1 = true, Win7 = false, LivePreview_AfterGlow = false, LivePreview_Colorization = false }; - var c = Forms.ColorPickerDlg.Pick(CList, _Condition, true); + Conditions _conditions = new() { CursorLine1 = true, Win7 = false, LivePreview_AfterGlow = false, LivePreview_Colorization = false }; + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions, true); - _SelectedControl.Prop_SecondaryColor1 = c; + _SelectedControl.Prop_SecondaryColor1 = C; _SelectedControl.Invalidate(); - ((UI.Controllers.ColorItem)sender).BackColor = c; + ((UI.Controllers.ColorItem)sender).BackColor = C; ((UI.Controllers.ColorItem)sender).Invalidate(); CList.Clear(); @@ -430,14 +431,14 @@ private void GroupBox4_Click(object sender, EventArgs e) return; } - var CList = new List() { (UI.Controllers.ColorItem)sender, _SelectedControl }; + List CList = new() { (UI.Controllers.ColorItem)sender, _SelectedControl }; - var _Condition = new Conditions() { CursorLine2 = true, Win7 = false, LivePreview_AfterGlow = false, LivePreview_Colorization = false }; - var c = Forms.ColorPickerDlg.Pick(CList, _Condition, true); + Conditions _conditions = new() { CursorLine2 = true, Win7 = false, LivePreview_AfterGlow = false, LivePreview_Colorization = false }; + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions, true); - _SelectedControl.Prop_SecondaryColor2 = c; + _SelectedControl.Prop_SecondaryColor2 = C; _SelectedControl.Invalidate(); - ((UI.Controllers.ColorItem)sender).BackColor = c; + ((UI.Controllers.ColorItem)sender).BackColor = C; ((UI.Controllers.ColorItem)sender).Invalidate(); CList.Clear(); @@ -465,14 +466,14 @@ private void GroupBox10_Click(object sender, EventArgs e) return; } - var CList = new List() { (UI.Controllers.ColorItem)sender, _SelectedControl }; + List CList = new() { (UI.Controllers.ColorItem)sender, _SelectedControl }; - var _Condition = new Conditions() { CursorCircle1 = true, Win7 = false, LivePreview_AfterGlow = false, LivePreview_Colorization = false }; - var c = Forms.ColorPickerDlg.Pick(CList, _Condition, true); + Conditions _conditions = new() { CursorCircle1 = true, Win7 = false, LivePreview_AfterGlow = false, LivePreview_Colorization = false }; + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions, true); - _SelectedControl.Prop_LoadingCircleBack1 = c; + _SelectedControl.Prop_LoadingCircleBack1 = C; _SelectedControl.Invalidate(); - ((UI.Controllers.ColorItem)sender).BackColor = c; + ((UI.Controllers.ColorItem)sender).BackColor = C; ((UI.Controllers.ColorItem)sender).Invalidate(); CList.Clear(); @@ -638,14 +639,14 @@ private void GroupBox9_Click(object sender, EventArgs e) return; } - var CList = new List() { (UI.Controllers.ColorItem)sender, _SelectedControl }; + List CList = new() { (UI.Controllers.ColorItem)sender, _SelectedControl }; - var _Condition = new Conditions() { CursorCircle2 = true, Win7 = false, LivePreview_AfterGlow = false, LivePreview_Colorization = false }; - var c = Forms.ColorPickerDlg.Pick(CList, _Condition, true); + Conditions _conditions = new() { CursorCircle2 = true, Win7 = false, LivePreview_AfterGlow = false, LivePreview_Colorization = false }; + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions, true); - _SelectedControl.Prop_LoadingCircleBack2 = c; + _SelectedControl.Prop_LoadingCircleBack2 = C; _SelectedControl.Invalidate(); - ((UI.Controllers.ColorItem)sender).BackColor = c; + ((UI.Controllers.ColorItem)sender).BackColor = C; ((UI.Controllers.ColorItem)sender).Invalidate(); CList.Clear(); @@ -673,14 +674,14 @@ private void GroupBox8_Click(object sender, EventArgs e) return; } - var CList = new List() { (UI.Controllers.ColorItem)sender, _SelectedControl }; + List CList = new() { (UI.Controllers.ColorItem)sender, _SelectedControl }; - var _Condition = new Conditions() { CursorCircleHot1 = true, Win7 = false, LivePreview_AfterGlow = false, LivePreview_Colorization = false }; - var c = Forms.ColorPickerDlg.Pick(CList, _Condition, true); + Conditions _conditions = new() { CursorCircleHot1 = true, Win7 = false, LivePreview_AfterGlow = false, LivePreview_Colorization = false }; + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions, true); - _SelectedControl.Prop_LoadingCircleHot1 = c; + _SelectedControl.Prop_LoadingCircleHot1 = C; _SelectedControl.Invalidate(); - ((UI.Controllers.ColorItem)sender).BackColor = c; + ((UI.Controllers.ColorItem)sender).BackColor = C; ((UI.Controllers.ColorItem)sender).Invalidate(); CList.Clear(); @@ -708,14 +709,14 @@ private void GroupBox7_Click(object sender, EventArgs e) return; } - var CList = new List() { (UI.Controllers.ColorItem)sender, _SelectedControl }; + List CList = new() { (UI.Controllers.ColorItem)sender, _SelectedControl }; - var _Condition = new Conditions() { CursorCircleHot2 = true, Win7 = false, LivePreview_AfterGlow = false, LivePreview_Colorization = false }; - var c = Forms.ColorPickerDlg.Pick(CList, _Condition, true); + Conditions _conditions = new() { CursorCircleHot2 = true, Win7 = false, LivePreview_AfterGlow = false, LivePreview_Colorization = false }; + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions, true); - _SelectedControl.Prop_LoadingCircleHot2 = c; + _SelectedControl.Prop_LoadingCircleHot2 = C; _SelectedControl.Invalidate(); - ((UI.Controllers.ColorItem)sender).BackColor = c; + ((UI.Controllers.ColorItem)sender).BackColor = C; ((UI.Controllers.ColorItem)sender).Invalidate(); CList.Clear(); @@ -827,13 +828,13 @@ private void Button7_Click(object sender, EventArgs e) { if (OpenFileDialog1.ShowDialog() == DialogResult.OK) { - var TMx = new Theme.Manager(Theme.Manager.Source.File, OpenFileDialog1.FileName); + Theme.Manager TMx = new(Theme.Manager.Source.File, OpenFileDialog1.FileName); LoadFromTM(TMx); TMx.Dispose(); foreach (var x in FlowLayoutPanel1.Controls.OfType()) { - if (x._Focused) + if (x.Focused) { ApplyColorsFromCursor(x); break; @@ -845,13 +846,13 @@ private void Button7_Click(object sender, EventArgs e) private void Button9_Click(object sender, EventArgs e) { - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); LoadFromTM(TMx); TMx.Dispose(); foreach (var x in FlowLayoutPanel1.Controls.OfType()) { - if (x._Focused) + if (x.Focused) { ApplyColorsFromCursor(x); break; @@ -868,7 +869,7 @@ private void Button8_Click(object sender, EventArgs e) foreach (var x in FlowLayoutPanel1.Controls.OfType()) { - if (x._Focused) + if (x.Focused) { ApplyColorsFromCursor(x); break; @@ -884,7 +885,7 @@ private void Button10_Click(object sender, EventArgs e) private void Button11_Click(object sender, EventArgs e) { Cursor = Cursors.WaitCursor; - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); SaveToTM(TMx); SaveToTM(Program.TM); TMx.Apply_Cursors(); @@ -1061,14 +1062,14 @@ private void ColorItem1_Click(object sender, EventArgs e) return; } - var CList = new List() { (UI.Controllers.ColorItem)sender, _SelectedControl }; + List CList = new() { (UI.Controllers.ColorItem)sender, _SelectedControl }; - var _Condition = new Conditions() { CursorShadow = true }; - var c = Forms.ColorPickerDlg.Pick(CList, _Condition); + Conditions _conditions = new() { CursorShadow = true }; + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions); - _SelectedControl.Prop_Shadow_Color = c; + _SelectedControl.Prop_Shadow_Color = C; _SelectedControl.Invalidate(); - ((UI.Controllers.ColorItem)sender).BackColor = c; + ((UI.Controllers.ColorItem)sender).BackColor = C; ((UI.Controllers.ColorItem)sender).Invalidate(); CList.Clear(); @@ -1241,5 +1242,50 @@ private void source1_CheckedChanged(object sender) tabControl1.TabPages[3].GetAllControls().ToList().ForEach(x => x.Enabled = true); } } + + private void GroupBox8_Click(object sender, DragEventArgs e) + { + + } + + private void GroupBox10_Click(object sender, DragEventArgs e) + { + + } + + private void GroupBox7_Click(object sender, DragEventArgs e) + { + + } + + private void GroupBox9_Click(object sender, DragEventArgs e) + { + + } + + private void GroupBox5_Click(object sender, DragEventArgs e) + { + + } + + private void GroupBox4_Click(object sender, DragEventArgs e) + { + + } + + private void GroupBox3_Click(object sender, DragEventArgs e) + { + + } + + private void TaskbarFrontAndFoldersOnStart_picker_Click(object sender, DragEventArgs e) + { + + } + + private void ColorItem1_Click(object sender, DragEventArgs e) + { + + } } } \ No newline at end of file diff --git a/WinPaletter/CursorsStudio/CursorsStudio.resx b/WinPaletter/CursorsStudio/CursorsStudio.resx index c2c2be51..05b892cf 100644 --- a/WinPaletter/CursorsStudio/CursorsStudio.resx +++ b/WinPaletter/CursorsStudio/CursorsStudio.resx @@ -123,203 +123,49 @@ 106, 17 + + 245, 17 + - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAnZJREFUSEvd - 1d1PUmEcB3C21uy+i7rqv6jN6Vqtqy6aLAFRyo3AnFNqbS1nq6zl0gwEDmcaGGDN0iijstflipilqVNR - KBkBubQX86XEhnPot+fYMd7OCag7v9vZzsV5Ps+z3/M8vyNY36Hgy2qO9B1ojPR20Euv/dRi96x20Tmr - /unw14ee36790SWj8CiL/TyzWDAoMi0PBJsib0Av9YDg0IadIDgIjtr5Z6j5/hTn5h4Hzsw8zGeHpY4N - tg1mDOpNy/1IA0f1zAOc+nYfVVP3tGIylmX4Y8YQnTl+F5Vf7uD4p1t6luHOFQwJ/wPHscmbK6rJG/tY - Lj5WvNiUZs35cBz52IaK8daAykclb7wp0i/NFD/xuQN7rEdR5FSv4Sj7cA2HA1Yxy0ZDjmJ7pni2XoHN - su3YVro7Bm+Bwm+5zrLRENyXiJ+esOP83BNunCL4wR3YcigHBY6LMbgZ8vfNYywbDcFDsbjKZcFWZS52 - GctRPd0ZjxuUv3ElwV/Wx+O+ZhR7jfMsGw3BF2LLUjFsXl0dA+28XIaqr3ZUruIlqXDIxpqSJ1AvOLyJ - NVf0Gv5MkttYimyaXbkiBxJHHR+OQg/9jmWjIXg714bK+2gwpWJg5mHepd2X+PG3NArc+uRNrgt1SfnO - eXGPbhVOB5e4KYhGdMnH1IiBjQT3JuJrl6joVQMKuzUp8fwRnVts4+lJZ6c7hVx4/CX6Cz6qW8lzNXC3 - irWcnLJf+EcceS5NDcvwh2m5BNdnigtdGi1vabiimmgTlY+3BtPAAwRP/4cTG6YrlgStUmXAfFXuM3kI - HiZ4mOAeidvQsn9UV7CXq3OuowgEvwDE7c98vykk9gAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAV9JREFUSEvV - lV9Lg1AYxu0D7C6Y2/1q/unjhVeBbJB2NRpM5qLrCoKmng8TtFEyuvAcP8NO79HXlbkU5oHqBw/b43l9 - HxXfo/KnMAgbDR/fr9HKxSCpa5KUg7ZdbzVVOD/CpfacETYxCeNwB5kggPf8eILL7TgNWAeu3sqVB6je - 2uovYuv49rmDZXIoAtDKx4ggAIRWPlICxDPHvxWaAurOzTBC6poRs9FW0KG5ENoKesBsPaQO2i/AO60T - NscG9QFhU0BWMy/NiRGl4+LqdsoLDxTlWpSMsL2inNxvpnpA9xTWSdT/oCDhg4dNeUtRZ2sbBoiLXzxU - oWiAtsKuBwwiHirTu4mdvv96cIA4t7eIL9Hup278NXiMQmgrtN46mgJa8z8DxPjrS+poS+qCuFDXe3HF - CyFtu9aC5HwIjQuJD47qv13gshzgTq4wYKvOVp9TKhPtiY4Hd98m9HdRlA8/bFOVsT414gAAAABJRU5E - rkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAmZJREFUSEvV - kt1PUmEcx/krmt20NQLkRZG7VletVlqa1ahprrrrIt3ayppzalBtHAijAfUPhK3CFIgszK56wTfUv6A5 - 2uKcA+eVg/PKX8+Bh5eCAMGL+m6fjfM75/l+9nuG4p/JPjdl1Pq2DuPHvc9BX+Jpi4eS9FPpY3i0dzEt - sIRpgQPNDA0tHnLL4Mt041fNxzifIowRFjrmWTB9ZEH9JifRPs+cwZ80nra5FNH+noH2DwwYI0xW0pGV - UM1L9GGaMLxLgWEuBUgEsshYIlJPy5tQmYYk2gBN6EJJ0L9FhJMgi2RJ2x/bqHISSTslncBHa0czS9lb - AzRogzToQghZgjCE0TZYVHpt8nXt95DpuiQqP2WXD2hmKGidRRRElbZBot1IlK8SdpWfRGuT6ACZlaBt - CpJSkaFElN9GPY0kXjKt80nHcWUxyhc/zylfJgBJ4NDrBMgidVZUaRt8bRW2UfvRv8tLCmWSLs+PLscY - t/lojIvLOMdLmODikxN8EQvGyscfFxDirvs5bliS1AE39R1XF2MfZR2xqxJsXMk0xbNxIYQry2MbYRwr - A2lYuyw1hHe0Snk+truMY7lfhFhfeld4R4Qgrqgd2zDjWLokwOpFsS7cd7j6y/N5MJy0fDPzsHJBqMqT - 2+XlG9e2T+Kf1WO9lbR8Pc/Bci9fEdfNVFn5+oB4dK1f2lnvE4/gUfXIki+9HCz28L/hHCovlxMzi8FV - M7o6sxjAo9qxDlH3PnezED3NZXEOJv9650tneREBCAGP6svDQdr1qYfZmbxOR/CoYhY7WUe0k92OnmIJ - PPqvo1D8AhGFx7CY+vuYAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAYAAAAe2bNZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAC7BJREFUWEelmAl0VOUVx783SViKyiJYBJLMvPe+73vve2+yz5JkJiH7ajKBREIw - ELMASTABWZIoYAATdkFElIKVA55iXYp1qahVa6vFikLVA62KRRHQI1jcrQvYe99MQiKg1H7nfIeThDPv - N/f+773/+0jPGTVqFBk7dhwZFxlFoqKiSbTdQewOmdhlhThklTgUCpcRh8rh6sRBBXEwk8jcSWQtligi - nqhGIqHOJMLgcmci4WY84bpJVFUNPeUiz+jRowEkkkQCSFS0A2AAxKECTA+EBgAAwQy4TuLgsUTW44ks - Eoliuoka4yU0NpmwuGTCY72Ex7gIAxiKMJQTRVFCT7qIM3bs2BCI3QKJ7gHBSPRA8Bji0OIAIpHIhpvI - Ti9RYlKJGucnNCGdMLg8IY3w+FTCYtyEGglE1Z1EYTpRVEpkWQ497SdOJESlPwgjdisaCAGR0DAKSUQ2 - vZIc45PkuHSiJGQSNSmHUHcuYe48wt05hCdlApCfMIgONRMBJgZgBJFViC6k3G63h574Iyc6GnXSH8RO - TSsdDoiEw4Lw2+T4zDAlKS9c8RSHqcmlEk0tI8xXRnhqKeHJxYR7ACxxPKQshahmEsCAnrhBZKoRGXQn - Q7p+MmVIbHcAOaQmCAIRgZQ4hIs4nKkSQITLroLBSnLgMsU/aag6/pohNHPqAJY1LYxnVkva+Eqi+ScA - UBFhSVmExvmI6nRbwlZQ5JAqGVLeA+RwOEJPPs+xYBBEQY1gaiAiCIIpScgJlz0llyj+yiuVzFqm5jUJ - WtQq8+I5I7XilsFaQWOYllMraRmTCfcFCPPkg4bGg6iTiQIVpkC1yaA5KzqQLlmB6oRKvSAQ/iFYNShW - 0AimxplK5IRsm+wtHaSkXzNayWtKVEsWlLDyzkpe2VWoVXbF61d3jtHL2oboRbPCdQRKn0RYSgmhrhxL - 2IrT0yc6qJ1gdFA/DhD0eUVtwViVE0qP4SFy3Hgiu4vD5LSqS5W8ZqaWLQzQKWtu4LV3rtUa7rpJr/9V - tajZkCwmd0eKCR2XIJCWXSPxtArCvEWEJmYRNTYVSt9FFB2qEPsSVGYwOpguFfSjntuHgjBQPVZUEiAq - KUROzJHklInhSlb9cLW0PR5AGtj0bVu01t/t1q9/5Pdizq71RvM9DUbtJp9RtTxaTGi/VC9sjuBZ0yTm - n0iop5CoCRlQ/slWP5K1mN50KfDFFYBSKSUULmMsRAInCAMpwl6CJRzjJ3JSviT7KyMgKper5UvctHZz - K2/d9YDW8adXxeI9B4yFf3nGnP/4JnPWzplG3aZ0ALLrZe2XaQVNETxzqsRSJxDVnU8UbAOmF/pTAnTs - YKkrAITNUKVBoH7RsWCwuVkwLiLHphHZVShBiiKUgpaR6qQuL51+91w+b/fDeufLb4vugx8aXa8fNm96 - 8c/mgic2m9fd22zU3ZEhqpbLADQUgVhGtY2mlEEvyiUKfJ5ign6ga6N+VABSWQ/QBWGCVWTBuIskJW1K - hFLYOlKtXO5lM7bP421PP6rd/Pq7Ys3hz4w173xirvjnEbPzpRecbU9uNVt+22LU35kFQIpW1j6M5zcO - oOOvsanJAaIk5gCQD6rLBb0njqgcxgSUuwUD3blf77kgTHoPzAovnbljHm9/5lGt++ARccvRL41bP/jG - WHf0M3PlG+85l+zd42x/6m6z5b45Rv3mXL1qBeWBtuEsb+YAml5lU70loB8QdAw0QwFjQgtFB+cWRKVf - VV08zLMA848j+vrjX4mNH502bjv5rbn+2OfmqjePOpe+/Ddnxx+3m633zxP1m/O1qhWcl7aNYLnTB1L/ - JBt1F0AzTIMxgdGJtWBQxMG+06fn/O8w738lbj91Wtz+8Rlj40cAdPwLc9Vbx53L9u01O565x2h9oE2v - 31ykVXZr/Kq5I1hmzUCWHLBRmGcUeg+m6oIz62fCnBGbPv1ebLKAvrOAVh9631y27xWz4+md4rr7OvSa - jcXaxMUaz5s5nPkrBrCkHIlCqSMMNkH0SeibcDb2np8H83EI5tPvDQS67eR35rpjX5or3/wARL3PmPeH - ncaMX7eLyq58rfA6hadVXspceWGgG8lqgvg8HEE4oP9/mJ7IwL394+8B5oyx7tg3xqpDnxlL971ntj25 - x2jcvhWqa4Ze1OLm6ZWjAGYAzCxJwS4Pfc0OLhJdZVRUVIgEzsXAsF6Yg0GYjf9GzYRAPjpjrD9+Wqw6 - 9B9x82unxKIX3jXmPrLXmL51p5i0bL5e0DSe+yvG0KScgaoT7AgMT+z46BSiwUddHEzfPmPBQGl3HTii - 33L0K7Hhw9Niw4kz8K8FYqx++2uxdN8pvePZf+lzHn5Rb9yxS5+6bp1e1tGg5dR5WUrglzQhYyD0Ggm9 - swMcQjTAoKlDc9d7zsL078BKbwfu9sJcmscXPPWovuzv74pVb38Oje9rsfrw18aaw99ad/nBLyAix/TZ - D+2BQbqdV9/SqZUvvpYXNGfy9MkqcxcMVWN94YpIkHBG2cEloKGLAr2cC9NvNvms2QRGyppNtGKph9Vt - uV6DAakv+ushiMAJseSVk6Jz70mxbP8nRveBL2E8fAowh/XZux7Xajd18YrOSlbY4mEZUx00uXQ4lDWk - yGOz/A18cfRPQb2cFwanNlhNdP1OmLQJ2ZKSMiFcza4fQQPtSbx63Sy98Z57xfWPvCIWPHFAzH1sP0zv - /aL96beMJS+fMLpeO2V07n1HzN+9W5+x7SZe2V3AoIpoWuUwFYUbm2pTRCKkCJ4BU7uveMeNGxcigWPB - oLnCfQiiIwdTJSmuwnA1bfJQmt/k5BMXTdWr190q6rc8KGbc/YBev2Wb1rB1u9764JMwwd8wlu0/AfeY - ceNzz4uW+9fq024t44F2lWVdewn1XhWmxvolSJFlI/BZfcV7Lgwua30MloxTNj7DpnquGkLTp9hh8GVr - gbYmvaJzoQ4VwiuWNPLJK2dDFDZCpJ4zOl86Yi7d94Gx6PlXjTkPbRO1d9SCZmJ43oxhzFceDpUkWVa0 - t8dAZFC8P4Tpa8iD6QIThOsJbAUANIB6ikYw/9WcZ9X44MNzeH5TOstvTmZlN+RqNRtbReuDvzFuePY1 - Y/Ge9yAyB4zZu+4XdXe06OWLPVr+zJHcf3UE9BgJjTrFrQGMFu5TOCDPgcEOaLdW2rNAlk1E/2F6bGpc - 2kCalDsMwj0GTFMk9ZWPgWl8JStq1fnk5QG94a7lAoRrLNgNnfexF4xZO7cZNRsaxcQbXXre9Ms1f3kE - d+dJzIJxwaYJgxJWGPQxkbBSnwMTjdGBUkMgnBmyBWSAu4+TVMNlgzYeAVCDwEoOVhOzB8He9AuaXXcF - K13g0qpW1up1m9eKxh07RNOOrWAjFhpTVgREYL4GRn2o5psQzl05AJNqRQZhaC9MZH8YFBHmLxgdWCNg - klqmGf2qBQT+QwcokWiDpmVTnCk2XOZU/6QhNKchipXM84GGpmhTVjfp1WvrRNWKYlG+MBZM+hV6ZvUg - LaXUxmGfYrDcUXxBAJumysHPnA8GfxFMFWoHxYww4N5hxCtogHBfRv8BZWmtHdCLwNtKirswQvVVXEYz - ayJZQbOTl8x1aYH2OC2wQNGLW0bquXWDYX0J494iicEuRfEFQa+5gs8Eh/ejMFhZKKwgDFhC64ag4Frr - hlVtsPgDkJqUF2GlDPoJy5x2OcupH85zG4Zo2dcO0DKqwnhqQOK4j8f7wcu4wekFbacCHvi8q24QJpgm - 3PZkiAz+R7SEwRuEslKHixhGB9w+vg4BbyupCZlhqis/nCaXRFDfxHDwLmEwGCWOe7i3EFZeMFWwQ/Xu - 35h63DDPt8RhmPpGxQIJLVh4LSD4GaNlLWHQHIMvisCxYcqcXljY/ACVAZECAwUrCvUUWKsuc2Vbr0ww - RaoBXwBS1LNd4vPOOQjTF6QHohfGgkMd4QUYjA6mC78h7kLYAgyEAksZemejxgMA6iQefC9U0dkXAWc3 - y7MwhPwXz0rgYwNXdhEAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAgNJREFUSEvt - 0MluGkEQxnFe14m3xOyrwdhgvETyzUc/SZSXiBNjBoZlgGEYK09Q6a+7qmncGim5u6T/cX5dNbmP+a9J - 07fvyfaNUKv/zbbZpqYkpcbVvepOFydbW617q3t4fEqZ8ycRSNXs3ZsUuHGg+uWd6la33mxVia56ccMN - iDl/XEi2BBhryGBmU4Ot44RWXKUz0JU719kPuKhsBsSiqlW8se3QAS3XGy7OfgBn15ACzWYGwrYVdTow - Fyq3r6mk61O0im3M+YMN5V/uQXw6QBcqnve5Hi2Waxtz/gCLkPpY/qegi5X6WFWyaF9jc67QvKI8x5w/ - spmG+HSAe1CrZ1LQPFrRjDtrXNqY80dOBKS3VBACJJhsmVfQbLGkKfe13rUx54/8T6Cy2Sxa7qECvkfD - eWRjzh85HbmQPf8d9KV2YZvMFrqxijl/sCEC5kJ6y1rXg06rHd1JpUPj6ZwCFM6zHxAQgJwOFBgA5KJB - ONONVMflc92Rijl/XAjwaRXtIHRSadMxKrdpNJnSK3dUatEhx5w/OG8HmS0B7kHYsmQajkNTENLnYtNU - aGY/IKcD1eAYhfZ0jSrsJZjoDgVV/R6Nbcz5g7NNBhoKhNOLJhf6VGiY8g369RronodB9gPtm4c/+JfI - hXC2JBA6yNfp4Mz0PBzRT/Qy+sHcx/zL5HJ/AS5O4l89Eo2uAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAZtJREFUSEvlVc0uQ0EYnVbGzFx9BQkJD8AjiIUFidiIEM8hEQ2t9ra3v9hUY2Vl - 6R1sRJBc5ErpbS+VVCzsrWrOdEgkrRAGiZN8yXfOnPPNzf2ZS/4HrK3bhCjezGlK0EPT9OtgaU/Q6AHV - lKCHpunnQFddxjNXM2zdG9SS3KAyzp3KqKYEPTRNCbzIIKul7rA2gulI+bElCs09cJa8HBLF+ydrs+nR - +CFDoYeGNXjgRQZZ8HfBEhcDzPb3Wbo6q3jStVjKL0ttRRkk0CtNrikuvSojs8rwu5gohWj0fJjGziKg - 8qr6Waq6wx0/2Rs/Fij00LAGD7zIIAveEfL+2cxxmcj7YyLbaHGnvg1d5O9KIv/QUpVrLKh64XINHniR - QRYzMAv6G4hcbb6vdNojCrURnvFrPB0st/UggWE8Iwdk65Mo1asNA/UtwIsMsmqGnAW9K+jaiaAxN9zu - jyxmXy8yuzoVXtoNodBDw5rySC8y6D8EIxsYv0XGH/IrTL2mPwZ87kaPChxYRg8748d1J3zrD6cTjP8y - /zAIeQYHBnwk5JpYOgAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAYAAAAe2bNZAAAABGdBTUEAALGPC/xhBQAAAZ9JREFUWEft - k8tOwkAUhjHR6EuI5SrIpVzcSngMQ1AWJjyKYa1vIAICkUDUcqnAC/gGLtzAUFqYKht2PU6bIaEVkKUm - 8y3P/DPz5eQcG4PBYDAYjH8NwE60qyb4Dk4H29NDWl1JXMShSFvNhNs4SEsrITm7/l64hc/092l5M/E3 - 2Iu94hbfxhASJhB4Uub+hnJOj03EuzgX6WAt3JxC4FnRThryNT0yEe/hFC/iebg1heDLBPwNWUj2YZce - ryfW+8wuiYCvLoO3Jn25hfd9GjE4FdUoEQEqon8Ax7Wx5q2NeRoxSPY/DiIini2J6DlwV6QrGlkPaeWt - SeRRIhdHwBWRj0YMoqJ6aREBd3UEjhK6oBGDmDjxW0U8VQlcD6MbGllPqKlkrSLOEvrRGV5Qo1YRktMc - +YGpMxzpDBGZmUUQHBWGv3dGnxki0loSmXOF4cqZ8dflHPlAW4hw94OVM+OrKymSmy9EuMJAsG0zMwZk - 2j1llHAUUdpVGm7cJmdFCrmKo4zrTtq4Tc4KsrvLKO3Io+23icFgMBgMxp/EZvsGEEohYWVA+kwAAAAA - SUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAA45JREFUSEu1VUtPU0EUvreCUDAmJi4kxvQBbaH0AfIuLdDybnmEQMUFKd3UmCiG - hdEg/gIWxoXGhVuiIeLasKkEFt20QggN0ZjQhcEYd5ooJLTjdybOTW+h2pq4+NI7w8z3nfOdcwZJr9f/ - V6gWfX19KvT29kper5ejp6dHQXd3t+RyuaS2tjapvb1d6ujoUPFkQ7X4g4AsyLu6uk6Qu91uvp/NJaBa - EKFATU1NmcFgWDQajW4InAd5BUg0+cgpKwogm4+gWvh8PgUgDjidzqO6urqfjY2ND0HiAeElkJecRk6/ - FotFxUdQLbIFEH1waGjo+9raGrPZbMcOhyPa0tJyHQI6kJfmRk6iJpOJ7qk4VQtRUAIOXiOBVCrF1tfX - GbJJQyje2toahk1Gj8dTKsgJ2OcZwFqpublZ8vv90uTkZGEChFgsxnAxbbfbk8jgBgRMEDhLZ0mALGto - aOBCRD4xMSGNj48XLkBIJBKss7MzjWzeI4vbELDAzjJApmzItmzykZGR4gQIOzs7DF2WRrQpiM3jrBXr - ckAeHBzkxGNjY5w8EAgUL0BIJpMMf6NMDlDoe8jA3t/frx0eHpaJlECZEP5JgLC3t8dGR0czaOEvEFnE - YDqRgRbgmQgULbC/v8+2trZYNBply8vLDFZlUPh3uHMfNpmBUkAZ2IIF4vE4/11YWGAYQoaWPEbbHgHf - MCMxFPg5usmHu5XZPAUJrK6ustraWh719vY2w0ClIZBA9G+bmppeYPiegvwu1YK6KpvnrwIrKysZEB4D - P+bm5jIkGIlE0nhCPmEuXmOCQ+gmB4ivoA4VsEWDb+VFyCug0+n89fX1h5jMIxRyE98JRJ3Z3d1lGxsb - 3CLsv8E83IE9lzEHGvEC5xUQY/8bJSC/CZIIBB8h0ieI+mBpaYnXYmpqKg3bPmL/GbroKs6cFYXNK4Be - zsUZRFWFg15E6aqurp7Hg3dIb9P09HQGxf2KQF4NDAyQnRcAGZAI1KInBILBoAJEyKcSl0tw8Bws0CLi - SrPZ/NlqtR7C/w8o8CYifomBCmFyLwIyTbDACYFQKKRgZmaGv4YQ4AeFdSCuhJgdj90DFPcxBG5hgm2Y - 3nIxxQLEqRIIh8Mcs7OzXISyyBUA6N+nFiIGeE+DVYUz5bBTzrE3vwDhNAHqLioikWFfA58J9M33RQcK - FCVAFygq2MEfMbxDSq1onZMlh16vl34BOBhdsDG5sy4AAAAASUVORK5CYII= - - - + - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAulJREFUSEvFVb9PWmEUNaZLky5VnCAihfAbsSQGJ+PQxC5d2vIHuICjccAuiIqy - sBGjYXFrE0sn1MkQWEjbhP4BLkKsQ9ukklTbpj/w6zmvlxeRhz+aNj3JSXj3nnvu43vfd7+e/4aFhYVe - 0AxGwS3wEGwK+XsbjIHU9ErZ1YACUzKZfJJKpT4sLS0pPDfAt+C+kL8bzFFDLZ5NUn4xIPYuLi5up9Np - Gh+A6+Ak2C8SvkC/xJg7oBbNdlDrE4kx5ufnfcvLyy9XVlZOIX6B4qCkuoIaalnDWnpIqh1ImPAWW2K+ - hsIBxv1+/+uRkZFXPp/vliY0ALWoWWUtPeglqd9IJBI3sCxxWZY8qC+HzWZTKP4RDAb3zGazHj8P1PSB - z+lBL3pKSktyJzSQqMEsJGENbFCv11U2m23i37wfHBy8I6kOsJYe9AItEtYaRGW3rEtIR6sBubGxcYom - R3a73S/pDtBDvKYlpAW5z4/A+xLScbYBubm5qdDk09DQUFgkbaCHeO1ISAvy4HBvd6zx+QZkoVBQw8PD - J06n857IdNBDvA4lpAV5OvflsQ1GDcjd3V2FD3/idrsfiVQHvegpj3/WgCyVSioUCrHJQ5FrMGpwrSUq - l8vat8jlcmpmZkZ5vd6PIqeX4RJxcPHDTEpIx9kGXPtarabi8XjT5XI1cADLOIDPHA7HY5HTy/Ajxy7b - pjgH37E9T/P5vKpWq3zrhsViuSkyHfQw2qYWsOtBy2QyX7Bj3qFBLhKJfGbDqampY8SiItPQ9aDJqJg7 - Myr6JMVZVPV4PHtoZOWogOm3SqWiisWiCgQCXGftLkDNbbA1KubaRgWBATWAv7Ytw24VYsP5jqV5Ojs7 - +5PfYmJi4hiNx6lFTRa1TXrQS+Tt4Ki9bFxbrda7/BdjY2NfR0dH38RisXFo8zS/cFy3APGlF044HH6A - bzAtuatfOC2g6N9dmS2ggJc+dxffdAc8f+kzxhw117v0/x56en4BzmGK84+2UngAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAArBJREFUSEvt + 1EtPU0EYBuAaUFBBBZFLkVKsguDalTHqyshFwf9hYjEGFgoIInKRW6Uw3IaWKnF2btz5C4zRhUakUG7l + HIEeDxSqMVE+v9EDDZSWEQ5u9E3exSST78lkJmPYrZTIcKFYgh9YCOkMvNS27U5KJGjeFMZqW3YpAHuu + yTD01+GrMlxCJLAR5dW2BJMzFDCeGQzY81wBlutaYrlOP8tx+Fk2L/Wzk/0LzNKvMkuvyrJ6VGbuUZiZ + KMzU5WMZvHYfS++QmPmOc7ho4tvKZiivxgWT9yRgy3MtQ+7gEpx2+gFRyB5YhFN0ERAFS58KJ3pVyOr5 + DOZuBTKJAohCRuc8HLfPQ3qbBKZbvVAwsrwRU/FRPVtda1wwiNKdoX0haKHny/frMpzld45rO3ZF44Lh + 8LbR244QtMC9BCZr9xtt/K8HVyzDRW0VDKJ0O6i53AFFnq/r0PwPC5BaOghHH01RbXz4ZA/4qV5oCkcb + pyGxySsCL9I/QssioE1ejorBiNKdoFfeKZB807GGJjR64UiDAGxBWATNLHMKotNw6KEI3KfSiGjHHJjK + XVDoDoSiN/pX73QNPVzPYYHHhSiNhBrrh+H8i7fr0PyPfkgrHQiHQnzdpAis0LDo4zlIs81CitUJl1/L + IiflKBwUgRGlkdDU9k+Q0oa1PoVzz19BqhVP2jAVFo17gHCtAGzqUuhWaHKrDMdaJEiqeY+fw8wW6AQc + uD8uAvuoENosiaJicEanj+qJ7q8Zh9jqsa3hdIT1RT2wr0oE7pijeqIx98bEYESpzijsrRwVgWepzihE + icCI2vREoyvcEFUx0q6ND58k27wRwdbkFokgShKbvQRRktDAO00QJfG8dZMkrpZ3nCBKYnmrPSSm6ncR + JVGVIyT6rrvFUDVs1Mb/zz8Tg+EnvmZQOZbIS0EAAAAASUVORK5CYII= - + - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAxVJREFUSEu1lV1IU2EYx+0iIvqiDxTacplrzqlz8wO8iPJOmOKNeJNX2414Z4Kj - rlY3QWzmGvrCxA2SJjlrzA8oGLLRmJ5gXURC6M0klU4QQURFufn2fw6ew9lcUjAP/OF5f3vO83/er7Oy - Q38454eqorCUKgpLqaKwlFKC+vr61xaLRairqzupYkGwANhxFXOCOcGOyewgKUFVVRV3uVw7jY2NaxqN - 5vweE8BSYGGwM3uMgY2B3QU7Ib//NykBGWxsbHCfz5dDl58qKyuvkAGYALYM9gJMQwZgDGwc7AHYBXXB - QimBbEAKBoO7ePkL2FsyIIGtgMXAnpABCYxMPNXV1RfVRdVSArUBaWZmhmOds5FIZBVjyQRMMJlMW2BP - MZZMwBhMHl7Goy4sSwkKDUjz8/O8paUlFwqF3mMsz0Ts7Ozcnp6efoaxZII8ZjabvQaDwaguTjrQgBSL - xXhra2vO7/evYyykUikxkUiIXV1d25OTk3NgkgnyGDbeazQarf9lQIrH47ytrS03MTGxTgZgYjKZFLu7 - u7cDgUAUY8kEeaypqYlMLP9kgE6lvUD3fHBwkJZrJxwOi9FoVJyamhJxXEWbzbaJPGkvkMeQx7BP7gMN - aO0zmQwfHh7muFTZnp6er9Bnxtj6wMCA2NHRselwOFb7+vrSKDrndDrHa2pqRpB7CwfDodfrlWXaZ4Dz - /RvHbnd2dpan02ne3Nyc9Xg8y2ArYMLi4qLUNRgDGwdjyKOuR7Ra7VG5nqw8A7fb/QMnQcSL/t7e3u9k - iE6zYO/AboMlaA/6+/s3wZ6D3QTzIo/Z7fZRsGvq4iQlwFlO19bWrsFIR58KJP9CMb60tMTx28eKioqz - YMmFhYUP2IctsJfl5eWnwHzIY8hjDQ0N9/EXc6SoQaEw5dDQ0FCW9qK9vf0bjK+D3QNbBhPA4mBWMDvY - GBgDGwXTq+vkFVVLp9NZaRY4nj9xD95gfc+BARmSYK/AHoOdBrtEswB7BHYHLO8DmFe0ULj9N9CRuYBZ - C7sEuwqmUTNZ+0CpVRSWUkVh6cTL/gCKSn0/hCJWlgAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAABERJREFUSEvt + 0ntMU2cYx3GyzGU3527ZRYNtoeVWoS0VsINhlWJBJ2QmGLZkmftjbOJmdHO6jR3n5tSMlDDUIFoZm/MS + mBJYWQGLKOAUAyjUMSi9QumNii0M3TIzfzut77hMEM6WLP7hN3nyNqc5z6d504B73TW1ZmFWXdpIVFkG + HiCP/p9qVoyUVKcO40f58KBqmbe4QjYkPy3F/eTrgGtpmaJfV75SP7IycyN59N/TyK7OUacM/161bAg/ + JA+hIsmL8iVeHF/suVaW6CnTJGo2OeWrvZ7UDAwvz8BQakYhtm27j7w+84SnPY/H1HmDIn1T5Q3a/qZ1 + y770PuxN68Xul3pRsNyC/BQLFHIzcpPNUEhN+DpGh6pFlWhOyEHfkpfhTko/DKl09EambWGdN1mk8dwQ + 1FxFpHoQfNUVRFS6EVY+gJDjLnDLnAg+5gDniB2sQzYEftOPecVWyDbpcUBog1IwgBKBDpWi73A+LlsD + cdYssvrO0egnTNG5yj7wFCbsXWBBEd+FwnAn9oQ6sD9UC0u8XG2WSh8k66dOUOOhmKLPFfUi6EsTCsJo + PMyJ3SEOfMW142BII2wSGQYl8mqrRPIQISaPRimm6DOFFnB2GpHHM6KA50B+sB0Ktg1V4bvgjpXhSkwS + 3DFLG9zx8bMJc3v8qkGKKfr0HjPYOwzI5RiQx7H50Ty2FdqoNLijpRgQ+WYxBoSJLUN8yZOEmhi/0k0x + RZ8qMCHwcz12sgx+1DfKoDr0RSXAFfUiXJH0GRkP14J4OPmS5kFu3GOEGyv8hJtiij6Rb8S8T3smwCru + Z3DwX4AzQgJn+CL/OMLi4AiNhT0k9j3CjRX6vYtiis5RGDCX0o2DrWjnyvyIIyQGDl4M7LyFsHPFsAeL + r9NnNOHG4pW6KKbo7Fw9ns/pHoWV7BqYg6JphB76tHFEsLGFvrnez4paSqiJ0SjFFH10Vw+e/ahrFK6c + n4P+W9C4Efxm4wiTCXN7nCMOiin68A7dONiKS/MTJ6B2tvAP+kwnxOSxvu2nmKLjYSVLDTNLMAazhDfs + LMEqsn7qAkv6KaboeFgV+OH4a/7TzhG9RlbfuY0V2q2bS8/dfP/oWWw4dAbrS+rxbskprCs+hWylBmv3 + n0RWUS3e3leLt+jPaw/Qz4o0yFbUIi9KjXZWwihK/4A1ZO30nTzTVGrutcJo7kWP0YxuvRGdOj0u/6JD + +89duKjtRGv7ZVy42IHzrZdw9kIbGptbUVPfhI/Xb4Hl1jXftHEE75CVM8tk6aMMM0FbxtC/4cw3snEw + eZXvz7SBrJt5BpOFmgptmQQ9Wq7CMXqq6xuxInMNvkh/9TBZxaweg4nq8qHd06O+yf6AwrrNW6Gua0DK + 6te3kzXM69abMiZF2zpw7h+obzQNP/nnhKrWRlb8+zo79RFabZe4zT9acXObb9rETc1TT21HxyPk9Xvd + jQUE/AVJbsohsOVAAgAAAABJRU5ErkJggg== @@ -349,30 +195,6 @@ ZDihysgHIAu6u7u/AVPMC6AFM0NDQ7+CLExMTPwMFEuDKiMfANP8GU1NzZtAi+RBRQXQ0J9Hjx79v3fv 3v+6urpPgEqYICqpBIBBs7SoqOgPKC4cHBw+Ay22g0pRB8jLyxuCfGFhYfHd1NT0LDAehKBS1APAYsIe 6HI9KHcUUAIYGAB9Y+vr0PaxigAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAABERJREFUSEvt - 0ntMU2cYx3GyzGU3527ZRYNtoeVWoS0VsINhlWJBJ2QmGLZkmftjbOJmdHO6jR3n5tSMlDDUIFoZm/MS - mBJYWQGLKOAUAyjUMSi9QumNii0M3TIzfzut77hMEM6WLP7hN3nyNqc5z6d504B73TW1ZmFWXdpIVFkG - HiCP/p9qVoyUVKcO40f58KBqmbe4QjYkPy3F/eTrgGtpmaJfV75SP7IycyN59N/TyK7OUacM/161bAg/ - JA+hIsmL8iVeHF/suVaW6CnTJGo2OeWrvZ7UDAwvz8BQakYhtm27j7w+84SnPY/H1HmDIn1T5Q3a/qZ1 - y770PuxN68Xul3pRsNyC/BQLFHIzcpPNUEhN+DpGh6pFlWhOyEHfkpfhTko/DKl09EambWGdN1mk8dwQ - 1FxFpHoQfNUVRFS6EVY+gJDjLnDLnAg+5gDniB2sQzYEftOPecVWyDbpcUBog1IwgBKBDpWi73A+LlsD - cdYssvrO0egnTNG5yj7wFCbsXWBBEd+FwnAn9oQ6sD9UC0u8XG2WSh8k66dOUOOhmKLPFfUi6EsTCsJo - PMyJ3SEOfMW142BII2wSGQYl8mqrRPIQISaPRimm6DOFFnB2GpHHM6KA50B+sB0Ktg1V4bvgjpXhSkwS - 3DFLG9zx8bMJc3v8qkGKKfr0HjPYOwzI5RiQx7H50Ty2FdqoNLijpRgQ+WYxBoSJLUN8yZOEmhi/0k0x - RZ8qMCHwcz12sgx+1DfKoDr0RSXAFfUiXJH0GRkP14J4OPmS5kFu3GOEGyv8hJtiij6Rb8S8T3smwCru - Z3DwX4AzQgJn+CL/OMLi4AiNhT0k9j3CjRX6vYtiis5RGDCX0o2DrWjnyvyIIyQGDl4M7LyFsHPFsAeL - r9NnNOHG4pW6KKbo7Fw9ns/pHoWV7BqYg6JphB76tHFEsLGFvrnez4paSqiJ0SjFFH10Vw+e/ahrFK6c - n4P+W9C4Efxm4wiTCXN7nCMOiin68A7dONiKS/MTJ6B2tvAP+kwnxOSxvu2nmKLjYSVLDTNLMAazhDfs - LMEqsn7qAkv6KaboeFgV+OH4a/7TzhG9RlbfuY0V2q2bS8/dfP/oWWw4dAbrS+rxbskprCs+hWylBmv3 - n0RWUS3e3leLt+jPaw/Qz4o0yFbUIi9KjXZWwihK/4A1ZO30nTzTVGrutcJo7kWP0YxuvRGdOj0u/6JD - +89duKjtRGv7ZVy42IHzrZdw9kIbGptbUVPfhI/Xb4Hl1jXftHEE75CVM8tk6aMMM0FbxtC/4cw3snEw - eZXvz7SBrJt5BpOFmgptmQQ9Wq7CMXqq6xuxInMNvkh/9TBZxaweg4nq8qHd06O+yf6AwrrNW6Gua0DK - 6te3kzXM69abMiZF2zpw7h+obzQNP/nnhKrWRlb8+zo79RFabZe4zT9acXObb9rETc1TT21HxyPk9Xvd - jQUE/AVJbsohsOVAAgAAAABJRU5ErkJggg== @@ -406,6 +228,49 @@ Ic+9LWrv0D9MItNgYw81TlkVLy75OZP6EeyRaqoxVPSYxxVPNysaptm4P+LxdzdMG5sWwNP0CaBUvJYa I6otVOw8Nj4niq74QDFBy+LEBGXE4wRXhh17KCNAGTTkDQIVOaq61AYwj2eqNdRK0s0KZQQow7P0EaAM axWp2lL599j4HFb0uhTpE2X+HQjC3zPgwKfNGuhJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAYAAAAe2bNZAAAABGdBTUEAALGPC/xhBQAAAllJREFUWEft + lj2IGkEUxzdpQki4KkFIVPz+QAsLC4lyQpQQsLCISadFOtsEIbWFpkpArM/KxhBiJRZWCRjFwsKAoOcH + pEiXQEgROHcn/ze8A7l83AV2N0X2B4/dnXlv5r9v3syuYmFhYaEolz0ezzOXy/XC5/Nd4bZ/g9vtPoQJ + v9+vBoPBt5FI5Dp3mQ+EPCQxnU5HxOPxXSgU+oAM3eRuczkVMxqNxHg8FslkkgRtvF6vg13MY1/MdrsV + 0+lUZDKZHZbsE2opwG7mcFYM2Ww2E7lcTg0EAp9R2DF2NZ5fiSGbz+eiUCiQoG9Ysjvsbiy/E0O2XC5F + qVTSsNO+w+cehxjHn8SQrVYrUS6XBepnB78ChxnDeWLINpuNqFQqJEiDPeZQ/bmImFOr1WokSOAcesLh + +vI3Ysiq1aoUhMJ+ykPox0XFUDFPJhMxGAyoqEmQ6nA4bvEw+nCeGKqVcDiskc++YYd9tNls13gYfcDA + P4mh71Sr1ZL3vV5PTo7D7zWyUcb9I5w7d+12+1UeQj/Oimk0GgKTael0WqVdRG35fP4ERfueQ4xjX0y9 + Xqfl0JCFY2rrdrtSTLvdltlBZuIcZgyY4AFNRCctXSHkCFk4gH0tFotSzHq9FqlUirLzisOMAWt/G5N8 + 4Td/iaZL1E5/frRcw+FQCmo2m3IHOZ1OD/UbBs6MG5g8xI8SCPFhco12E4lZLBYiFoudoL3BLuYCMT38 + hqr0Be/3+yKbzdJh9467zQXZuk/Ll0gkZD1Fo9FjtCW423yQnedYmje45vAo68nC4j9BUX4AsA/y4UG6 + FvcAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAmZJREFUSEvV + kt1PUmEcx/krmt20NQLkRZG7VletVlqa1ahprrrrIt3ayppzalBtHAijAfUPhK3CFIgszK56wTfUv6A5 + 2uKcA+eVg/PKX8+Bh5eCAMGL+m6fjfM75/l+9nuG4p/JPjdl1Pq2DuPHvc9BX+Jpi4eS9FPpY3i0dzEt + sIRpgQPNDA0tHnLL4Mt041fNxzifIowRFjrmWTB9ZEH9JifRPs+cwZ80nra5FNH+noH2DwwYI0xW0pGV + UM1L9GGaMLxLgWEuBUgEsshYIlJPy5tQmYYk2gBN6EJJ0L9FhJMgi2RJ2x/bqHISSTslncBHa0czS9lb + AzRogzToQghZgjCE0TZYVHpt8nXt95DpuiQqP2WXD2hmKGidRRRElbZBot1IlK8SdpWfRGuT6ACZlaBt + CpJSkaFElN9GPY0kXjKt80nHcWUxyhc/zylfJgBJ4NDrBMgidVZUaRt8bRW2UfvRv8tLCmWSLs+PLscY + t/lojIvLOMdLmODikxN8EQvGyscfFxDirvs5bliS1AE39R1XF2MfZR2xqxJsXMk0xbNxIYQry2MbYRwr + A2lYuyw1hHe0Snk+truMY7lfhFhfeld4R4Qgrqgd2zDjWLokwOpFsS7cd7j6y/N5MJy0fDPzsHJBqMqT + 2+XlG9e2T+Kf1WO9lbR8Pc/Bci9fEdfNVFn5+oB4dK1f2lnvE4/gUfXIki+9HCz28L/hHCovlxMzi8FV + M7o6sxjAo9qxDlH3PnezED3NZXEOJv9650tneREBCAGP6svDQdr1qYfZmbxOR/CoYhY7WUe0k92OnmIJ + PPqvo1D8AhGFx7CY+vuYAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAARBJREFUSEtj+P//P00xVkFqYqyC1MRYBamJUThMJWcWMpac+Q/CTIUn/zPnHfnP + lHf4P1f6rv8afrP+O1rV/w/SzvgfqxDxP1XC53+mkNP/bH6b/1m8Fv9TeYzBOInHYCGymSgWMJaeBxtO + oQVAo8iwQHPUAhAmbEEd2II4eRIsQAaMpef+MxbDLDgBtoAZbMHO/5q+M/47Wtb+D9ZKB1oQ/j9VnFIL + CkAWHAbiQ1ALpg9SC5A5WC3IhVkACaIgLVAcAC0gL5LP/WfCZkHaTmBGm/HfgWILSuhoATOGBTPBFgRq + Z1JqwWmsFqgjWRCrQC0LcqlsAQuwuKaCBbiLa1pgrILUxFgFqYmxClIP/2cAAFticY4P1iDvAAAAAElF + TkSuQmCC @@ -446,6 +311,35 @@ CkAWHAbiQ1ALpg9SC5A5WC3IhVkACaIgLVAcAC0gL5LP/WfCZkHaTmBGm/HfgWILSuhoATOGBTPBFgRq Z1JqwWmsFqgjWRCrQC0LcqlsAQuwuKaCBbiLa1pgrILUxFgFqYmxClIP/2cAAFticY4P1iDvAAAAAElF TkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAABWBJREFUSEuVVltIlF0UPU9BiGEhlU8hRgaGCVFQ3sqsTIyazNRhakrNS2nmpbyU + dqeLdrGsUNPSsiw1rWbUtBwdU/ZDWm8mvfUgFYKPPdpa+5f6I//kPzB8H+c75+y111p7nzF/G6mpqWb3 + 7t2mvLzc3Lx503z8+NE8fvzYrFmzxpw+fdp8+/bNvHv3bnr1/xhTU1P6czqdPMzz9u3bwffv34///Pmz + FQGsQUFBCSUlJaFYM09EzPr16xXMrGPVqlX67O/vZ4AFX79+zQb6tqioqN65c+e6jhw54mptbXXl5OS4 + 7t692/v06dN2BMjHFm9m9fbt2/8OxA/r1q1T5Ldu3YoB0oYzZ84MpKWlyd69e2XXrl2SkpIiCCLJyclS + XFwstbW18vr164GJiYlGT09Pi4+Pj1m7du1PoL8NBsjMzDQ4JLOmpsbBA3fs2CHgWioqKgQaCGiR/fv3 + y7Vr1+Thw4eSn58vd+7c0WB79uxx2u32HAL8YzDitm3beHgMEDiI+uTJk3L27FkB/0QpHR0dcvDgQQkM + DNRMHj16pEFBIQ8X7sHazpGREcvz589NVVXV9Om/xgIga+BC8KloJycnNQioEmxS9AAi169f1yz4jU9m + QgDManR09Mm5c+e8fwYgNffu3TN9fX3ZEG3AYrEo0um0lfuVK1fK4cOHZefOnQLBBRRKfHy8bN26VQoK + CuTYsWPS3NwsR48eZUaDcFweTPBPFvS5r6+vZ3t7exs4lGXLlsnVq1eV+zlz5khwcLBs375d9u3bp4eH + hYUJECp6ZhQSEiIZGRly/PhxBbRx40YGcnz48MHr1atXxty4ccNAxGBE64X91CUIqk7hgbGxsZKenq68 + JyYmSlxcnGZXWVmpOtXX16sWAClWq1VWrFgh58+fd0dERIRv2bLFaEViYTw2uLi4rq5OXcNghw4dkhMn + TsipU6fk0qVLSgWcprwDmJSVlcmVK1cUCA6TpqYmuXjxolRXV7s3bdpki46ONiYyMpLetb548cJ14cIF + AVWKiBwzfaJ88+aN5ObmKhXQS5CtZkBxmSFpIb3QUMbGxgR15IZJ7NhrDIrIIG1rd3e3iyKiwCQ7O1sQ + WA8k4oaGBg3ETN6/f68gyDmposMoNI1A50FgzaCrq8sOZxl1ECYTUJWuzZs3a3W2tbWpFrQmq5jW5Nyz + Z88EG/VJjbj2wYMHqg2z4TzfAcjtcrlsyNwYeNeAu1Bw3EskTJ1I+A6xVFRqQW5pTxYY35kZ1zQ2NioY + Zk0QDJqXl+eGPhtwpjGfPn1i/5kHpO09PT3aHvz8/NTT3MSDeAityV9LS4tqxOD8npWVJYWFhWpvZkEK + ly5d6oTr5kNHo/0ciAwslj8+Pj5Ad7CSbTabuoZOoaNYfLRrUVGRzhEAkAoLk0VIZyUlJcmBAwcGoUcR + ivBXZ+ULqPCGixrpEjri8uXL+mPr4K+0tFSpoNisWqJmEWKvUsXAfIKiZi8vr8W/dVQGgGgGAlkQxDk8 + PCydnZ2yaNEiCQ8PF5S9oqR16XUIqOiJ+suXL1oLnIN7umDhOHblP1r29+/f9ZmQkJDz8uXLTofDIaGh + oVpgRMyD0a9kaGhIrYgiUgPQEKhaUtOFIi1A+56xk+qk9g6MmJgYCwI8gfiDQKU9h1wHBAQoz+xVrPDp + njWIwM0LFy6MA4UGBTlzAA5+4IUBLg3c4g3a8qCHAwVGX7tZQDCBG/eDG05yw7ZO0FSErYuXL1/+9yvz + 34OBUDQGzjFA6oWrNHzJkiU22NQOr9tx6diwbAPomY/vBtflzNfkbINoYFX91+Dv72/gfYNL36xevdp4 + eHgYtOxZEBvzA4Ae20/5chPUAAAAAElFTkSuQmCC @@ -462,6 +356,257 @@ 2+XlG9e2T+Kf1WO9lbR8Pc/Bci9fEdfNVFn5+oB4dK1f2lnvE4/gUfXIki+9HCz28L/hHCovlxMzi8FV M7o6sxjAo9qxDlH3PnezED3NZXEOJv9650tneREBCAGP6svDQdr1qYfZmbxOR/CoYhY7WUe0k92OnmIJ PPqvo1D8AhGFx7CY+vuYAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAV9JREFUSEvV + lV9Lg1AYxu0D7C6Y2/1q/unjhVeBbJB2NRpM5qLrCoKmng8TtFEyuvAcP8NO79HXlbkU5oHqBw/b43l9 + HxXfo/KnMAgbDR/fr9HKxSCpa5KUg7ZdbzVVOD/CpfacETYxCeNwB5kggPf8eILL7TgNWAeu3sqVB6je + 2uovYuv49rmDZXIoAtDKx4ggAIRWPlICxDPHvxWaAurOzTBC6poRs9FW0KG5ENoKesBsPaQO2i/AO60T + NscG9QFhU0BWMy/NiRGl4+LqdsoLDxTlWpSMsL2inNxvpnpA9xTWSdT/oCDhg4dNeUtRZ2sbBoiLXzxU + oWiAtsKuBwwiHirTu4mdvv96cIA4t7eIL9Hup278NXiMQmgrtN46mgJa8z8DxPjrS+poS+qCuFDXe3HF + CyFtu9aC5HwIjQuJD47qv13gshzgTq4wYKvOVp9TKhPtiY4Hd98m9HdRlA8/bFOVsT414gAAAABJRU5E + rkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAYAAAAe2bNZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAC7BJREFUWEelmAl0VOUVx783SViKyiJYBJLMvPe+73vve2+yz5JkJiH7ajKBREIw + ELMASTABWZIoYAATdkFElIKVA55iXYp1qahVa6vFikLVA62KRRHQI1jcrQvYe99MQiKg1H7nfIeThDPv + N/f+773/+0jPGTVqFBk7dhwZFxlFoqKiSbTdQewOmdhlhThklTgUCpcRh8rh6sRBBXEwk8jcSWQtligi + nqhGIqHOJMLgcmci4WY84bpJVFUNPeUiz+jRowEkkkQCSFS0A2AAxKECTA+EBgAAwQy4TuLgsUTW44ks + Eoliuoka4yU0NpmwuGTCY72Ex7gIAxiKMJQTRVFCT7qIM3bs2BCI3QKJ7gHBSPRA8Bji0OIAIpHIhpvI + Ti9RYlKJGucnNCGdMLg8IY3w+FTCYtyEGglE1Z1EYTpRVEpkWQ497SdOJESlPwgjdisaCAGR0DAKSUQ2 + vZIc45PkuHSiJGQSNSmHUHcuYe48wt05hCdlApCfMIgONRMBJgZgBJFViC6k3G63h574Iyc6GnXSH8RO + TSsdDoiEw4Lw2+T4zDAlKS9c8RSHqcmlEk0tI8xXRnhqKeHJxYR7ACxxPKQshahmEsCAnrhBZKoRGXQn + Q7p+MmVIbHcAOaQmCAIRgZQ4hIs4nKkSQITLroLBSnLgMsU/aag6/pohNHPqAJY1LYxnVkva+Eqi+ScA + UBFhSVmExvmI6nRbwlZQ5JAqGVLeA+RwOEJPPs+xYBBEQY1gaiAiCIIpScgJlz0llyj+yiuVzFqm5jUJ + WtQq8+I5I7XilsFaQWOYllMraRmTCfcFCPPkg4bGg6iTiQIVpkC1yaA5KzqQLlmB6oRKvSAQ/iFYNShW + 0AimxplK5IRsm+wtHaSkXzNayWtKVEsWlLDyzkpe2VWoVXbF61d3jtHL2oboRbPCdQRKn0RYSgmhrhxL + 2IrT0yc6qJ1gdFA/DhD0eUVtwViVE0qP4SFy3Hgiu4vD5LSqS5W8ZqaWLQzQKWtu4LV3rtUa7rpJr/9V + tajZkCwmd0eKCR2XIJCWXSPxtArCvEWEJmYRNTYVSt9FFB2qEPsSVGYwOpguFfSjntuHgjBQPVZUEiAq + KUROzJHklInhSlb9cLW0PR5AGtj0bVu01t/t1q9/5Pdizq71RvM9DUbtJp9RtTxaTGi/VC9sjuBZ0yTm + n0iop5CoCRlQ/slWP5K1mN50KfDFFYBSKSUULmMsRAInCAMpwl6CJRzjJ3JSviT7KyMgKper5UvctHZz + K2/d9YDW8adXxeI9B4yFf3nGnP/4JnPWzplG3aZ0ALLrZe2XaQVNETxzqsRSJxDVnU8UbAOmF/pTAnTs + YKkrAITNUKVBoH7RsWCwuVkwLiLHphHZVShBiiKUgpaR6qQuL51+91w+b/fDeufLb4vugx8aXa8fNm96 + 8c/mgic2m9fd22zU3ZEhqpbLADQUgVhGtY2mlEEvyiUKfJ5ign6ga6N+VABSWQ/QBWGCVWTBuIskJW1K + hFLYOlKtXO5lM7bP421PP6rd/Pq7Ys3hz4w173xirvjnEbPzpRecbU9uNVt+22LU35kFQIpW1j6M5zcO + oOOvsanJAaIk5gCQD6rLBb0njqgcxgSUuwUD3blf77kgTHoPzAovnbljHm9/5lGt++ARccvRL41bP/jG + WHf0M3PlG+85l+zd42x/6m6z5b45Rv3mXL1qBeWBtuEsb+YAml5lU70loB8QdAw0QwFjQgtFB+cWRKVf + VV08zLMA848j+vrjX4mNH502bjv5rbn+2OfmqjePOpe+/Ddnxx+3m633zxP1m/O1qhWcl7aNYLnTB1L/ + JBt1F0AzTIMxgdGJtWBQxMG+06fn/O8w738lbj91Wtz+8Rlj40cAdPwLc9Vbx53L9u01O565x2h9oE2v + 31ykVXZr/Kq5I1hmzUCWHLBRmGcUeg+m6oIz62fCnBGbPv1ebLKAvrOAVh9631y27xWz4+md4rr7OvSa + jcXaxMUaz5s5nPkrBrCkHIlCqSMMNkH0SeibcDb2np8H83EI5tPvDQS67eR35rpjX5or3/wARL3PmPeH + ncaMX7eLyq58rfA6hadVXspceWGgG8lqgvg8HEE4oP9/mJ7IwL394+8B5oyx7tg3xqpDnxlL971ntj25 + x2jcvhWqa4Ze1OLm6ZWjAGYAzCxJwS4Pfc0OLhJdZVRUVIgEzsXAsF6Yg0GYjf9GzYRAPjpjrD9+Wqw6 + 9B9x82unxKIX3jXmPrLXmL51p5i0bL5e0DSe+yvG0KScgaoT7AgMT+z46BSiwUddHEzfPmPBQGl3HTii + 33L0K7Hhw9Niw4kz8K8FYqx++2uxdN8pvePZf+lzHn5Rb9yxS5+6bp1e1tGg5dR5WUrglzQhYyD0Ggm9 + swMcQjTAoKlDc9d7zsL078BKbwfu9sJcmscXPPWovuzv74pVb38Oje9rsfrw18aaw99ad/nBLyAix/TZ + D+2BQbqdV9/SqZUvvpYXNGfy9MkqcxcMVWN94YpIkHBG2cEloKGLAr2cC9NvNvms2QRGyppNtGKph9Vt + uV6DAakv+ushiMAJseSVk6Jz70mxbP8nRveBL2E8fAowh/XZux7Xajd18YrOSlbY4mEZUx00uXQ4lDWk + yGOz/A18cfRPQb2cFwanNlhNdP1OmLQJ2ZKSMiFcza4fQQPtSbx63Sy98Z57xfWPvCIWPHFAzH1sP0zv + /aL96beMJS+fMLpeO2V07n1HzN+9W5+x7SZe2V3AoIpoWuUwFYUbm2pTRCKkCJ4BU7uveMeNGxcigWPB + oLnCfQiiIwdTJSmuwnA1bfJQmt/k5BMXTdWr190q6rc8KGbc/YBev2Wb1rB1u9764JMwwd8wlu0/AfeY + ceNzz4uW+9fq024t44F2lWVdewn1XhWmxvolSJFlI/BZfcV7Lgwua30MloxTNj7DpnquGkLTp9hh8GVr + gbYmvaJzoQ4VwiuWNPLJK2dDFDZCpJ4zOl86Yi7d94Gx6PlXjTkPbRO1d9SCZmJ43oxhzFceDpUkWVa0 + t8dAZFC8P4Tpa8iD6QIThOsJbAUANIB6ikYw/9WcZ9X44MNzeH5TOstvTmZlN+RqNRtbReuDvzFuePY1 + Y/Ge9yAyB4zZu+4XdXe06OWLPVr+zJHcf3UE9BgJjTrFrQGMFu5TOCDPgcEOaLdW2rNAlk1E/2F6bGpc + 2kCalDsMwj0GTFMk9ZWPgWl8JStq1fnk5QG94a7lAoRrLNgNnfexF4xZO7cZNRsaxcQbXXre9Ms1f3kE + d+dJzIJxwaYJgxJWGPQxkbBSnwMTjdGBUkMgnBmyBWSAu4+TVMNlgzYeAVCDwEoOVhOzB8He9AuaXXcF + K13g0qpW1up1m9eKxh07RNOOrWAjFhpTVgREYL4GRn2o5psQzl05AJNqRQZhaC9MZH8YFBHmLxgdWCNg + klqmGf2qBQT+QwcokWiDpmVTnCk2XOZU/6QhNKchipXM84GGpmhTVjfp1WvrRNWKYlG+MBZM+hV6ZvUg + LaXUxmGfYrDcUXxBAJumysHPnA8GfxFMFWoHxYww4N5hxCtogHBfRv8BZWmtHdCLwNtKirswQvVVXEYz + ayJZQbOTl8x1aYH2OC2wQNGLW0bquXWDYX0J494iicEuRfEFQa+5gs8Eh/ejMFhZKKwgDFhC64ag4Frr + hlVtsPgDkJqUF2GlDPoJy5x2OcupH85zG4Zo2dcO0DKqwnhqQOK4j8f7wcu4wekFbacCHvi8q24QJpgm + 3PZkiAz+R7SEwRuEslKHixhGB9w+vg4BbyupCZlhqis/nCaXRFDfxHDwLmEwGCWOe7i3EFZeMFWwQ/Xu + 35h63DDPt8RhmPpGxQIJLVh4LSD4GaNlLWHQHIMvisCxYcqcXljY/ACVAZECAwUrCvUUWKsuc2Vbr0ww + RaoBXwBS1LNd4vPOOQjTF6QHohfGgkMd4QUYjA6mC78h7kLYAgyEAksZemejxgMA6iQefC9U0dkXAWc3 + y7MwhPwXz0rgYwNXdhEAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAnZJREFUSEvd + 1d1PUmEcB3C21uy+i7rqv6jN6Vqtqy6aLAFRyo3AnFNqbS1nq6zl0gwEDmcaGGDN0iijstflipilqVNR + KBkBubQX86XEhnPot+fYMd7OCag7v9vZzsV5Ps+z3/M8vyNY36Hgy2qO9B1ojPR20Euv/dRi96x20Tmr + /unw14ee36790SWj8CiL/TyzWDAoMi0PBJsib0Av9YDg0IadIDgIjtr5Z6j5/hTn5h4Hzsw8zGeHpY4N + tg1mDOpNy/1IA0f1zAOc+nYfVVP3tGIylmX4Y8YQnTl+F5Vf7uD4p1t6luHOFQwJ/wPHscmbK6rJG/tY + Lj5WvNiUZs35cBz52IaK8daAykclb7wp0i/NFD/xuQN7rEdR5FSv4Sj7cA2HA1Yxy0ZDjmJ7pni2XoHN + su3YVro7Bm+Bwm+5zrLRENyXiJ+esOP83BNunCL4wR3YcigHBY6LMbgZ8vfNYywbDcFDsbjKZcFWZS52 + GctRPd0ZjxuUv3ElwV/Wx+O+ZhR7jfMsGw3BF2LLUjFsXl0dA+28XIaqr3ZUruIlqXDIxpqSJ1AvOLyJ + NVf0Gv5MkttYimyaXbkiBxJHHR+OQg/9jmWjIXg714bK+2gwpWJg5mHepd2X+PG3NArc+uRNrgt1SfnO + eXGPbhVOB5e4KYhGdMnH1IiBjQT3JuJrl6joVQMKuzUp8fwRnVts4+lJZ6c7hVx4/CX6Cz6qW8lzNXC3 + irWcnLJf+EcceS5NDcvwh2m5BNdnigtdGi1vabiimmgTlY+3BtPAAwRP/4cTG6YrlgStUmXAfFXuM3kI + HiZ4mOAeidvQsn9UV7CXq3OuowgEvwDE7c98vykk9gAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAAZtJREFUSEvlVc0uQ0EYnVbGzFx9BQkJD8AjiIUFidiIEM8hEQ2t9ra3v9hUY2Vl + 6R1sRJBc5ErpbS+VVCzsrWrOdEgkrRAGiZN8yXfOnPPNzf2ZS/4HrK3bhCjezGlK0EPT9OtgaU/Q6AHV + lKCHpunnQFddxjNXM2zdG9SS3KAyzp3KqKYEPTRNCbzIIKul7rA2gulI+bElCs09cJa8HBLF+ydrs+nR + +CFDoYeGNXjgRQZZ8HfBEhcDzPb3Wbo6q3jStVjKL0ttRRkk0CtNrikuvSojs8rwu5gohWj0fJjGziKg + 8qr6Waq6wx0/2Rs/Fij00LAGD7zIIAveEfL+2cxxmcj7YyLbaHGnvg1d5O9KIv/QUpVrLKh64XINHniR + QRYzMAv6G4hcbb6vdNojCrURnvFrPB0st/UggWE8Iwdk65Mo1asNA/UtwIsMsmqGnAW9K+jaiaAxN9zu + jyxmXy8yuzoVXtoNodBDw5rySC8y6D8EIxsYv0XGH/IrTL2mPwZ87kaPChxYRg8748d1J3zrD6cTjP8y + /zAIeQYHBnwk5JpYOgAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAgNJREFUSEvt + 0MluGkEQxnFe14m3xOyrwdhgvETyzUc/SZSXiBNjBoZlgGEYK09Q6a+7qmncGim5u6T/cX5dNbmP+a9J + 07fvyfaNUKv/zbbZpqYkpcbVvepOFydbW617q3t4fEqZ8ycRSNXs3ZsUuHGg+uWd6la33mxVia56ccMN + iDl/XEi2BBhryGBmU4Ot44RWXKUz0JU719kPuKhsBsSiqlW8se3QAS3XGy7OfgBn15ACzWYGwrYVdTow + Fyq3r6mk61O0im3M+YMN5V/uQXw6QBcqnve5Hi2Waxtz/gCLkPpY/qegi5X6WFWyaF9jc67QvKI8x5w/ + spmG+HSAe1CrZ1LQPFrRjDtrXNqY80dOBKS3VBACJJhsmVfQbLGkKfe13rUx54/8T6Cy2Sxa7qECvkfD + eWRjzh85HbmQPf8d9KV2YZvMFrqxijl/sCEC5kJ6y1rXg06rHd1JpUPj6ZwCFM6zHxAQgJwOFBgA5KJB + ONONVMflc92Rijl/XAjwaRXtIHRSadMxKrdpNJnSK3dUatEhx5w/OG8HmS0B7kHYsmQajkNTENLnYtNU + aGY/IKcD1eAYhfZ0jSrsJZjoDgVV/R6Nbcz5g7NNBhoKhNOLJhf6VGiY8g369RronodB9gPtm4c/+JfI + hXC2JBA6yNfp4Mz0PBzRT/Qy+sHcx/zL5HJ/AS5O4l89Eo2uAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAV9JREFUSEvV + lV9Lg1AYxu0D7C6Y2/1q/unjhVeBbJB2NRpM5qLrCoKmng8TtFEyuvAcP8NO79HXlbkU5oHqBw/b43l9 + HxXfo/KnMAgbDR/fr9HKxSCpa5KUg7ZdbzVVOD/CpfacETYxCeNwB5kggPf8eILL7TgNWAeu3sqVB6je + 2uovYuv49rmDZXIoAtDKx4ggAIRWPlICxDPHvxWaAurOzTBC6poRs9FW0KG5ENoKesBsPaQO2i/AO60T + NscG9QFhU0BWMy/NiRGl4+LqdsoLDxTlWpSMsL2inNxvpnpA9xTWSdT/oCDhg4dNeUtRZ2sbBoiLXzxU + oWiAtsKuBwwiHirTu4mdvv96cIA4t7eIL9Hup278NXiMQmgrtN46mgJa8z8DxPjrS+poS+qCuFDXe3HF + CyFtu9aC5HwIjQuJD47qv13gshzgTq4wYKvOVp9TKhPtiY4Hd98m9HdRlA8/bFOVsT414gAAAABJRU5E + rkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAmZJREFUSEvV + kt1PUmEcx/krmt20NQLkRZG7VletVlqa1ahprrrrIt3ayppzalBtHAijAfUPhK3CFIgszK56wTfUv6A5 + 2uKcA+eVg/PKX8+Bh5eCAMGL+m6fjfM75/l+9nuG4p/JPjdl1Pq2DuPHvc9BX+Jpi4eS9FPpY3i0dzEt + sIRpgQPNDA0tHnLL4Mt041fNxzifIowRFjrmWTB9ZEH9JifRPs+cwZ80nra5FNH+noH2DwwYI0xW0pGV + UM1L9GGaMLxLgWEuBUgEsshYIlJPy5tQmYYk2gBN6EJJ0L9FhJMgi2RJ2x/bqHISSTslncBHa0czS9lb + AzRogzToQghZgjCE0TZYVHpt8nXt95DpuiQqP2WXD2hmKGidRRRElbZBot1IlK8SdpWfRGuT6ACZlaBt + CpJSkaFElN9GPY0kXjKt80nHcWUxyhc/zylfJgBJ4NDrBMgidVZUaRt8bRW2UfvRv8tLCmWSLs+PLscY + t/lojIvLOMdLmODikxN8EQvGyscfFxDirvs5bliS1AE39R1XF2MfZR2xqxJsXMk0xbNxIYQry2MbYRwr + A2lYuyw1hHe0Snk+truMY7lfhFhfeld4R4Qgrqgd2zDjWLokwOpFsS7cd7j6y/N5MJy0fDPzsHJBqMqT + 2+XlG9e2T+Kf1WO9lbR8Pc/Bci9fEdfNVFn5+oB4dK1f2lnvE4/gUfXIki+9HCz28L/hHCovlxMzi8FV + M7o6sxjAo9qxDlH3PnezED3NZXEOJv9650tneREBCAGP6svDQdr1qYfZmbxOR/CoYhY7WUe0k92OnmIJ + PPqvo1D8AhGFx7CY+vuYAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAORJREFUOE9j + GBzg1VKGya+XMuxGwxuA2BiqBD94NI/hPw78/vF8htSH8xlC0fGDeQxWUO0MDLemM/wnA/+CamdguDyR + 4T85GKqdgeF0F8N/XPhcH9v/t3td/n887IOB/19Ld2X4fy3G6MY8uf+48MeDbv//X4nGgWP6GP5f8J34 + /4Lff7Lweb8yoDudy/6dcfpPDv5/xjme4f9Js6h/J0z/k4P/HzP1YPh/RMv231Ht/+Tg/0e1DRj+H9RT + xCZJDP5/SFOS4f+qUOa3m+Qvvtui+JgU/Hqj/IX//xkYoSlhwAADAwAxztcX2tpnugAAAABJRU5ErkJg + gg== + + + + + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAA5RJREFUSEvt + lndME2EYh1tBKdWoCFYqRaOARiTRuHAkCkZN1BgxMRrAPXHgntEguMABMkTjJBWk7gniAoFWQVSwxh0E + RRmCVBSjaMSf3/f1er0DTGiC//EmT/L2d+/d07v7vqaS5mqu/18b9Z6Sdfpy6do8SNc8QotVD9Bi5X1Y + rciC1fK7sFqmhfXSDFgvuYOWi1PRctEttAq4gVYLrsNm/jXYzEuCzdwrkM25BNmsC7CdeQ62M85APv0U + 5NMSIfeLL7f1Uw/ibIJa/yRIsu4xpGtzIV39kIhziDibF1sHNiBeSMUpRJxMxFeJ+DJksy/WF/snorVf + AuS+J4I4m6A26IOlVLymrvgeuVsdEWcScToRpxnFAfXFsjkm8XkiPkvEp8ndaoj4JBO38VMHczZz2Ufn + Ryli8qGIfg1FFOUlFJEv0CniGeEpHMOfwHGvHso9eVDuzoVy10PCAyjD7qNzaDY678yC0457cNqug2qb + lpABVUg6VMFphFQ4b7kN1aaUKE5nrlHPa2J9SoD/yRj9l1hOZy6fYgQ3NNykEAenM9e/xL2P5MJp0w0M + SXnLZ2NffUeXkFQG7YXzbhF3odp8HSO0ZaKcYYlYGXgadv7H0Csyk8+8dGVoNyOeQXvhvP3UA4x+cTmi + nGGJ2ClADYcpMXAPv81nXtpStPc/zqA9zca9qYX7qWr0OFYJt6Of0FNdhSEZNfw5jMaIJxYDQ+/UkEf3 + DN1D9XA/XIgROb/YMe/MEnTwPcygPcse/4RDRIkIl4RP/PUYjRGPzf9NtlOpCOcj5eyYd+YH8jhjGbSn + 2fjCWrieKYebxsBw0VTAU1fNX4/RGPGEoj9w2P8edvs+oAOhfUQRumk4ccZ7dJwcyaC98Dy3uCrGMO0P + Uc5ojNhEL81XuB6vwoCbxtU7vqAW/S9WwDUyn0F7mpnmux6qZAxOF692hiViF7UBzgcr0DfZ+NgGpn6D + Y/RHETQzzStjPjKEGY8lYvpe6fv1uFzFPntqq9F6RyHk243QfrDOLLEPL2b0u/mVz3gsESv2l6BtWBF6 + nqvks5FkBZsWHO2F83SW0ifF+EVFWCKmi8ompADduYVFGf7oB2y3FTJoL5yXbS1geCR9FuUMS8R0S/RO + qoSX3vxjMOFdLTyuGRi0F873T/sCj2QDRr8w7nkRDYknlSKo3mATQx2czlwTy+BJDhrqDjchBp9SNPDX + p7maq0lLIvkLu222SX4W84gAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAAORJREFUSEvtlTsOgkAURXFHswVjp4U0Jq7AXcEySHABfkJFBSR0lMAaxvcSNM59 + I84YSCwoTjE3zDnNJARKqdmxjlMjhqZpVl3X7YnTGHVdH/HuJ8TQtu2GJPobWZbpJEnOeN+GGEgQotAG + R6Io4tAVHYgYSOAVGUI39LwjBhJ4R4bQHV1PxEACp0ie5zqOYyOUpukFfYwYSOAUoQeiq6rSZVm+KIpC + 0+vcodM4MCRwiowQotM4MPwRXPJliXixRLxYIl78ScT1zzjCGp3GgeF/fN/3W+LwA1u+j07jMBfWcVpU + 8ACAK1fmlV0mbwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAYAAAAe2bNZAAAABGdBTUEAALGPC/xhBQAAAZ9JREFUWEft + k8tOwkAUhjHR6EuI5SrIpVzcSngMQ1AWJjyKYa1vIAICkUDUcqnAC/gGLtzAUFqYKht2PU6bIaEVkKUm + 8y3P/DPz5eQcG4PBYDAYjH8NwE60qyb4Dk4H29NDWl1JXMShSFvNhNs4SEsrITm7/l64hc/092l5M/E3 + 2Iu94hbfxhASJhB4Uub+hnJOj03EuzgX6WAt3JxC4FnRThryNT0yEe/hFC/iebg1heDLBPwNWUj2YZce + ryfW+8wuiYCvLoO3Jn25hfd9GjE4FdUoEQEqon8Ax7Wx5q2NeRoxSPY/DiIini2J6DlwV6QrGlkPaeWt + SeRRIhdHwBWRj0YMoqJ6aREBd3UEjhK6oBGDmDjxW0U8VQlcD6MbGllPqKlkrSLOEvrRGV5Qo1YRktMc + +YGpMxzpDBGZmUUQHBWGv3dGnxki0loSmXOF4cqZ8dflHPlAW4hw94OVM+OrKymSmy9EuMJAsG0zMwZk + 2j1llHAUUdpVGm7cJmdFCrmKo4zrTtq4Tc4KsrvLKO3Io+23icFgMBgMxp/EZvsGEEohYWVA+kwAAAAA + SUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAA45JREFUSEu1VUtPU0EUvreCUDAmJi4kxvQBbaH0AfIuLdDybnmEQMUFKd3UmCiG + hdEg/gIWxoXGhVuiIeLasKkEFt20QggN0ZjQhcEYd5ooJLTjdybOTW+h2pq4+NI7w8z3nfOdcwZJr9f/ + V6gWfX19KvT29kper5ejp6dHQXd3t+RyuaS2tjapvb1d6ujoUPFkQ7X4g4AsyLu6uk6Qu91uvp/NJaBa + EKFATU1NmcFgWDQajW4InAd5BUg0+cgpKwogm4+gWvh8PgUgDjidzqO6urqfjY2ND0HiAeElkJecRk6/ + FotFxUdQLbIFEH1waGjo+9raGrPZbMcOhyPa0tJyHQI6kJfmRk6iJpOJ7qk4VQtRUAIOXiOBVCrF1tfX + GbJJQyje2toahk1Gj8dTKsgJ2OcZwFqpublZ8vv90uTkZGEChFgsxnAxbbfbk8jgBgRMEDhLZ0mALGto + aOBCRD4xMSGNj48XLkBIJBKss7MzjWzeI4vbELDAzjJApmzItmzykZGR4gQIOzs7DF2WRrQpiM3jrBXr + ckAeHBzkxGNjY5w8EAgUL0BIJpMMf6NMDlDoe8jA3t/frx0eHpaJlECZEP5JgLC3t8dGR0czaOEvEFnE + YDqRgRbgmQgULbC/v8+2trZYNBply8vLDFZlUPh3uHMfNpmBUkAZ2IIF4vE4/11YWGAYQoaWPEbbHgHf + MCMxFPg5usmHu5XZPAUJrK6ustraWh719vY2w0ClIZBA9G+bmppeYPiegvwu1YK6KpvnrwIrKysZEB4D + P+bm5jIkGIlE0nhCPmEuXmOCQ+gmB4ivoA4VsEWDb+VFyCug0+n89fX1h5jMIxRyE98JRJ3Z3d1lGxsb + 3CLsv8E83IE9lzEHGvEC5xUQY/8bJSC/CZIIBB8h0ieI+mBpaYnXYmpqKg3bPmL/GbroKs6cFYXNK4Be + zsUZRFWFg15E6aqurp7Hg3dIb9P09HQGxf2KQF4NDAyQnRcAGZAI1KInBILBoAJEyKcSl0tw8Bws0CLi + SrPZ/NlqtR7C/w8o8CYifomBCmFyLwIyTbDACYFQKKRgZmaGv4YQ4AeFdSCuhJgdj90DFPcxBG5hgm2Y + 3nIxxQLEqRIIh8Mcs7OzXISyyBUA6N+nFiIGeE+DVYUz5bBTzrE3vwDhNAHqLioikWFfA58J9M33RQcK + FCVAFygq2MEfMbxDSq1onZMlh16vl34BOBhdsDG5sy4AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAAxVJREFUSEu1lV1IU2EYx+0iIvqiDxTacplrzqlz8wO8iPJOmOKNeJNX2414Z4Kj + rlY3QWzmGvrCxA2SJjlrzA8oGLLRmJ5gXURC6M0klU4QQURFufn2fw6ew9lcUjAP/OF5f3vO83/er7Oy + Q38454eqorCUKgpLqaKwlFKC+vr61xaLRairqzupYkGwANhxFXOCOcGOyewgKUFVVRV3uVw7jY2NaxqN + 5vweE8BSYGGwM3uMgY2B3QU7Ib//NykBGWxsbHCfz5dDl58qKyuvkAGYALYM9gJMQwZgDGwc7AHYBXXB + QimBbEAKBoO7ePkL2FsyIIGtgMXAnpABCYxMPNXV1RfVRdVSArUBaWZmhmOds5FIZBVjyQRMMJlMW2BP + MZZMwBhMHl7Goy4sSwkKDUjz8/O8paUlFwqF3mMsz0Ts7Ozcnp6efoaxZII8ZjabvQaDwaguTjrQgBSL + xXhra2vO7/evYyykUikxkUiIXV1d25OTk3NgkgnyGDbeazQarf9lQIrH47ytrS03MTGxTgZgYjKZFLu7 + u7cDgUAUY8kEeaypqYlMLP9kgE6lvUD3fHBwkJZrJxwOi9FoVJyamhJxXEWbzbaJPGkvkMeQx7BP7gMN + aO0zmQwfHh7muFTZnp6er9Bnxtj6wMCA2NHRselwOFb7+vrSKDrndDrHa2pqRpB7CwfDodfrlWXaZ4Dz + /RvHbnd2dpan02ne3Nyc9Xg8y2ArYMLi4qLUNRgDGwdjyKOuR7Ra7VG5nqw8A7fb/QMnQcSL/t7e3u9k + iE6zYO/AboMlaA/6+/s3wZ6D3QTzIo/Z7fZRsGvq4iQlwFlO19bWrsFIR58KJP9CMb60tMTx28eKioqz + YMmFhYUP2IctsJfl5eWnwHzIY8hjDQ0N9/EXc6SoQaEw5dDQ0FCW9qK9vf0bjK+D3QNbBhPA4mBWMDvY + GBgDGwXTq+vkFVVLp9NZaRY4nj9xD95gfc+BARmSYK/AHoOdBrtEswB7BHYHLO8DmFe0ULj9N9CRuYBZ + C7sEuwqmUTNZ+0CpVRSWUkVh6cTL/gCKSn0/hCJWlgAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAAulJREFUSEvFVb9PWmEUNaZLky5VnCAihfAbsSQGJ+PQxC5d2vIHuICjccAuiIqy + sBGjYXFrE0sn1MkQWEjbhP4BLkKsQ9ukklTbpj/w6zmvlxeRhz+aNj3JSXj3nnvu43vfd7+e/4aFhYVe + 0AxGwS3wEGwK+XsbjIHU9ErZ1YACUzKZfJJKpT4sLS0pPDfAt+C+kL8bzFFDLZ5NUn4xIPYuLi5up9Np + Gh+A6+Ak2C8SvkC/xJg7oBbNdlDrE4kx5ufnfcvLyy9XVlZOIX6B4qCkuoIaalnDWnpIqh1ImPAWW2K+ + hsIBxv1+/+uRkZFXPp/vliY0ALWoWWUtPeglqd9IJBI3sCxxWZY8qC+HzWZTKP4RDAb3zGazHj8P1PSB + z+lBL3pKSktyJzSQqMEsJGENbFCv11U2m23i37wfHBy8I6kOsJYe9AItEtYaRGW3rEtIR6sBubGxcYom + R3a73S/pDtBDvKYlpAW5z4/A+xLScbYBubm5qdDk09DQUFgkbaCHeO1ISAvy4HBvd6zx+QZkoVBQw8PD + J06n857IdNBDvA4lpAV5OvflsQ1GDcjd3V2FD3/idrsfiVQHvegpj3/WgCyVSioUCrHJQ5FrMGpwrSUq + l8vat8jlcmpmZkZ5vd6PIqeX4RJxcPHDTEpIx9kGXPtarabi8XjT5XI1cADLOIDPHA7HY5HTy/Ajxy7b + pjgH37E9T/P5vKpWq3zrhsViuSkyHfQw2qYWsOtBy2QyX7Bj3qFBLhKJfGbDqampY8SiItPQ9aDJqJg7 + Myr6JMVZVPV4PHtoZOWogOm3SqWiisWiCgQCXGftLkDNbbA1KubaRgWBATWAv7Ytw24VYsP5jqV5Ojs7 + +5PfYmJi4hiNx6lFTRa1TXrQS+Tt4Ki9bFxbrda7/BdjY2NfR0dH38RisXFo8zS/cFy3APGlF044HH6A + bzAtuatfOC2g6N9dmS2ggJc+dxffdAc8f+kzxhw117v0/x56en4BzmGK84+2UngAAAAASUVORK5CYII= @@ -522,78 +667,6 @@ A1IvQMLAcMlKsEvMjp3/r7AE7uf/Jbun/S/eORVsM0gzd6vrLbBmEAAa8Gvl/cf/e27d+9987MT/6oNH wOySk9vhflafHvtfbWoUWDNXq+s/9kZHREwAM5MJELtgw6nbu2skp4Q8RbYZRTNRAJh4OHq85DlanNAS EgMDAEY46oa+K/cyAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAYAAAAe2bNZAAAABGdBTUEAALGPC/xhBQAAAllJREFUWEft - lj2IGkEUxzdpQki4KkFIVPz+QAsLC4lyQpQQsLCISadFOtsEIbWFpkpArM/KxhBiJRZWCRjFwsKAoOcH - pEiXQEgROHcn/ze8A7l83AV2N0X2B4/dnXlv5r9v3syuYmFhYaEolz0ezzOXy/XC5/Nd4bZ/g9vtPoQJ - v9+vBoPBt5FI5Dp3mQ+EPCQxnU5HxOPxXSgU+oAM3eRuczkVMxqNxHg8FslkkgRtvF6vg13MY1/MdrsV - 0+lUZDKZHZbsE2opwG7mcFYM2Ww2E7lcTg0EAp9R2DF2NZ5fiSGbz+eiUCiQoG9Ysjvsbiy/E0O2XC5F - qVTSsNO+w+cehxjHn8SQrVYrUS6XBepnB78ChxnDeWLINpuNqFQqJEiDPeZQ/bmImFOr1WokSOAcesLh - +vI3Ysiq1aoUhMJ+ykPox0XFUDFPJhMxGAyoqEmQ6nA4bvEw+nCeGKqVcDiskc++YYd9tNls13gYfcDA - P4mh71Sr1ZL3vV5PTo7D7zWyUcb9I5w7d+12+1UeQj/Oimk0GgKTael0WqVdRG35fP4ERfueQ4xjX0y9 - Xqfl0JCFY2rrdrtSTLvdltlBZuIcZgyY4AFNRCctXSHkCFk4gH0tFotSzHq9FqlUirLzisOMAWt/G5N8 - 4Td/iaZL1E5/frRcw+FQCmo2m3IHOZ1OD/UbBs6MG5g8xI8SCPFhco12E4lZLBYiFoudoL3BLuYCMT38 - hqr0Be/3+yKbzdJh9467zQXZuk/Ll0gkZD1Fo9FjtCW423yQnedYmje45vAo68nC4j9BUX4AsA/y4UG6 - FvcAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAABWBJREFUSEuVVltIlF0UPU9BiGEhlU8hRgaGCVFQ3sqsTIyazNRhakrNS2nmpbyU - dqeLdrGsUNPSsiw1rWbUtBwdU/ZDWm8mvfUgFYKPPdpa+5f6I//kPzB8H+c75+y111p7nzF/G6mpqWb3 - 7t2mvLzc3Lx503z8+NE8fvzYrFmzxpw+fdp8+/bNvHv3bnr1/xhTU1P6czqdPMzz9u3bwffv34///Pmz - FQGsQUFBCSUlJaFYM09EzPr16xXMrGPVqlX67O/vZ4AFX79+zQb6tqioqN65c+e6jhw54mptbXXl5OS4 - 7t692/v06dN2BMjHFm9m9fbt2/8OxA/r1q1T5Ldu3YoB0oYzZ84MpKWlyd69e2XXrl2SkpIiCCLJyclS - XFwstbW18vr164GJiYlGT09Pi4+Pj1m7du1PoL8NBsjMzDQ4JLOmpsbBA3fs2CHgWioqKgQaCGiR/fv3 - y7Vr1+Thw4eSn58vd+7c0WB79uxx2u32HAL8YzDitm3beHgMEDiI+uTJk3L27FkB/0QpHR0dcvDgQQkM - DNRMHj16pEFBIQ8X7sHazpGREcvz589NVVXV9Om/xgIga+BC8KloJycnNQioEmxS9AAi169f1yz4jU9m - QgDManR09Mm5c+e8fwYgNffu3TN9fX3ZEG3AYrEo0um0lfuVK1fK4cOHZefOnQLBBRRKfHy8bN26VQoK - CuTYsWPS3NwsR48eZUaDcFweTPBPFvS5r6+vZ3t7exs4lGXLlsnVq1eV+zlz5khwcLBs375d9u3bp4eH - hYUJECp6ZhQSEiIZGRly/PhxBbRx40YGcnz48MHr1atXxty4ccNAxGBE64X91CUIqk7hgbGxsZKenq68 - JyYmSlxcnGZXWVmpOtXX16sWAClWq1VWrFgh58+fd0dERIRv2bLFaEViYTw2uLi4rq5OXcNghw4dkhMn - TsipU6fk0qVLSgWcprwDmJSVlcmVK1cUCA6TpqYmuXjxolRXV7s3bdpki46ONiYyMpLetb548cJ14cIF - AVWKiBwzfaJ88+aN5ObmKhXQS5CtZkBxmSFpIb3QUMbGxgR15IZJ7NhrDIrIIG1rd3e3iyKiwCQ7O1sQ - WA8k4oaGBg3ETN6/f68gyDmposMoNI1A50FgzaCrq8sOZxl1ECYTUJWuzZs3a3W2tbWpFrQmq5jW5Nyz - Z88EG/VJjbj2wYMHqg2z4TzfAcjtcrlsyNwYeNeAu1Bw3EskTJ1I+A6xVFRqQW5pTxYY35kZ1zQ2NioY - Zk0QDJqXl+eGPhtwpjGfPn1i/5kHpO09PT3aHvz8/NTT3MSDeAityV9LS4tqxOD8npWVJYWFhWpvZkEK - ly5d6oTr5kNHo/0ciAwslj8+Pj5Ad7CSbTabuoZOoaNYfLRrUVGRzhEAkAoLk0VIZyUlJcmBAwcGoUcR - ivBXZ+ULqPCGixrpEjri8uXL+mPr4K+0tFSpoNisWqJmEWKvUsXAfIKiZi8vr8W/dVQGgGgGAlkQxDk8 - PCydnZ2yaNEiCQ8PF5S9oqR16XUIqOiJ+suXL1oLnIN7umDhOHblP1r29+/f9ZmQkJDz8uXLTofDIaGh - oVpgRMyD0a9kaGhIrYgiUgPQEKhaUtOFIi1A+56xk+qk9g6MmJgYCwI8gfiDQKU9h1wHBAQoz+xVrPDp - njWIwM0LFy6MA4UGBTlzAA5+4IUBLg3c4g3a8qCHAwVGX7tZQDCBG/eDG05yw7ZO0FSErYuXL1/+9yvz - 34OBUDQGzjFA6oWrNHzJkiU22NQOr9tx6diwbAPomY/vBtflzNfkbINoYFX91+Dv72/gfYNL36xevdp4 - eHgYtOxZEBvzA4Ae20/5chPUAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAARBJREFUSEtj+P//P00xVkFqYqyC1MRYBamJUThMJWcWMpac+Q/CTIUn/zPnHfnP - lHf4P1f6rv8afrP+O1rV/w/SzvgfqxDxP1XC53+mkNP/bH6b/1m8Fv9TeYzBOInHYCGymSgWMJaeBxtO - oQVAo8iwQHPUAhAmbEEd2II4eRIsQAaMpef+MxbDLDgBtoAZbMHO/5q+M/47Wtb+D9ZKB1oQ/j9VnFIL - CkAWHAbiQ1ALpg9SC5A5WC3IhVkACaIgLVAcAC0gL5LP/WfCZkHaTmBGm/HfgWILSuhoATOGBTPBFgRq - Z1JqwWmsFqgjWRCrQC0LcqlsAQuwuKaCBbiLa1pgrILUxFgFqYmxClIP/2cAAFticY4P1iDvAAAAAElF - TkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAmZJREFUSEvV - kt1PUmEcx/krmt20NQLkRZG7VletVlqa1ahprrrrIt3ayppzalBtHAijAfUPhK3CFIgszK56wTfUv6A5 - 2uKcA+eVg/PKX8+Bh5eCAMGL+m6fjfM75/l+9nuG4p/JPjdl1Pq2DuPHvc9BX+Jpi4eS9FPpY3i0dzEt - sIRpgQPNDA0tHnLL4Mt041fNxzifIowRFjrmWTB9ZEH9JifRPs+cwZ80nra5FNH+noH2DwwYI0xW0pGV - UM1L9GGaMLxLgWEuBUgEsshYIlJPy5tQmYYk2gBN6EJJ0L9FhJMgi2RJ2x/bqHISSTslncBHa0czS9lb - AzRogzToQghZgjCE0TZYVHpt8nXt95DpuiQqP2WXD2hmKGidRRRElbZBot1IlK8SdpWfRGuT6ACZlaBt - CpJSkaFElN9GPY0kXjKt80nHcWUxyhc/zylfJgBJ4NDrBMgidVZUaRt8bRW2UfvRv8tLCmWSLs+PLscY - t/lojIvLOMdLmODikxN8EQvGyscfFxDirvs5bliS1AE39R1XF2MfZR2xqxJsXMk0xbNxIYQry2MbYRwr - A2lYuyw1hHe0Snk+truMY7lfhFhfeld4R4Qgrqgd2zDjWLokwOpFsS7cd7j6y/N5MJy0fDPzsHJBqMqT - 2+XlG9e2T+Kf1WO9lbR8Pc/Bci9fEdfNVFn5+oB4dK1f2lnvE4/gUfXIki+9HCz28L/hHCovlxMzi8FV - M7o6sxjAo9qxDlH3PnezED3NZXEOJv9650tneREBCAGP6svDQdr1qYfZmbxOR/CoYhY7WUe0k92OnmIJ - PPqvo1D8AhGFx7CY+vuYAAAAAElFTkSuQmCC @@ -674,79 +747,6 @@ T+GFAAAAAElFTkSuQmCC - - - iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAArBJREFUSEvt - 1EtPU0EYBuAaUFBBBZFLkVKsguDalTHqyshFwf9hYjEGFgoIInKRW6Uw3IaWKnF2btz5C4zRhUakUG7l - HIEeDxSqMVE+v9EDDZSWEQ5u9E3exSST78lkJmPYrZTIcKFYgh9YCOkMvNS27U5KJGjeFMZqW3YpAHuu - yTD01+GrMlxCJLAR5dW2BJMzFDCeGQzY81wBlutaYrlOP8tx+Fk2L/Wzk/0LzNKvMkuvyrJ6VGbuUZiZ - KMzU5WMZvHYfS++QmPmOc7ho4tvKZiivxgWT9yRgy3MtQ+7gEpx2+gFRyB5YhFN0ERAFS58KJ3pVyOr5 - DOZuBTKJAohCRuc8HLfPQ3qbBKZbvVAwsrwRU/FRPVtda1wwiNKdoX0haKHny/frMpzld45rO3ZF44Lh - 8LbR244QtMC9BCZr9xtt/K8HVyzDRW0VDKJ0O6i53AFFnq/r0PwPC5BaOghHH01RbXz4ZA/4qV5oCkcb - pyGxySsCL9I/QssioE1ejorBiNKdoFfeKZB807GGJjR64UiDAGxBWATNLHMKotNw6KEI3KfSiGjHHJjK - XVDoDoSiN/pX73QNPVzPYYHHhSiNhBrrh+H8i7fr0PyPfkgrHQiHQnzdpAis0LDo4zlIs81CitUJl1/L - IiflKBwUgRGlkdDU9k+Q0oa1PoVzz19BqhVP2jAVFo17gHCtAGzqUuhWaHKrDMdaJEiqeY+fw8wW6AQc - uD8uAvuoENosiaJicEanj+qJ7q8Zh9jqsa3hdIT1RT2wr0oE7pijeqIx98bEYESpzijsrRwVgWepzihE - icCI2vREoyvcEFUx0q6ND58k27wRwdbkFokgShKbvQRRktDAO00QJfG8dZMkrpZ3nCBKYnmrPSSm6ncR - JVGVIyT6rrvFUDVs1Mb/zz8Tg+EnvmZQOZbIS0EAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAV9JREFUSEvV - lV9Lg1AYxu0D7C6Y2/1q/unjhVeBbJB2NRpM5qLrCoKmng8TtFEyuvAcP8NO79HXlbkU5oHqBw/b43l9 - HxXfo/KnMAgbDR/fr9HKxSCpa5KUg7ZdbzVVOD/CpfacETYxCeNwB5kggPf8eILL7TgNWAeu3sqVB6je - 2uovYuv49rmDZXIoAtDKx4ggAIRWPlICxDPHvxWaAurOzTBC6poRs9FW0KG5ENoKesBsPaQO2i/AO60T - NscG9QFhU0BWMy/NiRGl4+LqdsoLDxTlWpSMsL2inNxvpnpA9xTWSdT/oCDhg4dNeUtRZ2sbBoiLXzxU - oWiAtsKuBwwiHirTu4mdvv96cIA4t7eIL9Hup278NXiMQmgrtN46mgJa8z8DxPjrS+poS+qCuFDXe3HF - CyFtu9aC5HwIjQuJD47qv13gshzgTq4wYKvOVp9TKhPtiY4Hd98m9HdRlA8/bFOVsT414gAAAABJRU5E - rkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAORJREFUOE9j - GBzg1VKGya+XMuxGwxuA2BiqBD94NI/hPw78/vF8htSH8xlC0fGDeQxWUO0MDLemM/wnA/+CamdguDyR - 4T85GKqdgeF0F8N/XPhcH9v/t3td/n887IOB/19Ld2X4fy3G6MY8uf+48MeDbv//X4nGgWP6GP5f8J34 - /4Lff7Lweb8yoDudy/6dcfpPDv5/xjme4f9Js6h/J0z/k4P/HzP1YPh/RMv231Ht/+Tg/0e1DRj+H9RT - xCZJDP5/SFOS4f+qUOa3m+Qvvtui+JgU/Hqj/IX//xkYoSlhwAADAwAxztcX2tpnugAAAABJRU5ErkJg - gg== - - - - - iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAA5RJREFUSEvt - lndME2EYh1tBKdWoCFYqRaOARiTRuHAkCkZN1BgxMRrAPXHgntEguMABMkTjJBWk7gniAoFWQVSwxh0E - RRmCVBSjaMSf3/f1er0DTGiC//EmT/L2d+/d07v7vqaS5mqu/18b9Z6Sdfpy6do8SNc8QotVD9Bi5X1Y - rciC1fK7sFqmhfXSDFgvuYOWi1PRctEttAq4gVYLrsNm/jXYzEuCzdwrkM25BNmsC7CdeQ62M85APv0U - 5NMSIfeLL7f1Uw/ibIJa/yRIsu4xpGtzIV39kIhziDibF1sHNiBeSMUpRJxMxFeJ+DJksy/WF/snorVf - AuS+J4I4m6A26IOlVLymrvgeuVsdEWcScToRpxnFAfXFsjkm8XkiPkvEp8ndaoj4JBO38VMHczZz2Ufn - Ryli8qGIfg1FFOUlFJEv0CniGeEpHMOfwHGvHso9eVDuzoVy10PCAyjD7qNzaDY678yC0457cNqug2qb - lpABVUg6VMFphFQ4b7kN1aaUKE5nrlHPa2J9SoD/yRj9l1hOZy6fYgQ3NNykEAenM9e/xL2P5MJp0w0M - SXnLZ2NffUeXkFQG7YXzbhF3odp8HSO0ZaKcYYlYGXgadv7H0Csyk8+8dGVoNyOeQXvhvP3UA4x+cTmi - nGGJ2ClADYcpMXAPv81nXtpStPc/zqA9zca9qYX7qWr0OFYJt6Of0FNdhSEZNfw5jMaIJxYDQ+/UkEf3 - DN1D9XA/XIgROb/YMe/MEnTwPcygPcse/4RDRIkIl4RP/PUYjRGPzf9NtlOpCOcj5eyYd+YH8jhjGbSn - 2fjCWrieKYebxsBw0VTAU1fNX4/RGPGEoj9w2P8edvs+oAOhfUQRumk4ccZ7dJwcyaC98Dy3uCrGMO0P - Uc5ojNhEL81XuB6vwoCbxtU7vqAW/S9WwDUyn0F7mpnmux6qZAxOF692hiViF7UBzgcr0DfZ+NgGpn6D - Y/RHETQzzStjPjKEGY8lYvpe6fv1uFzFPntqq9F6RyHk243QfrDOLLEPL2b0u/mVz3gsESv2l6BtWBF6 - nqvks5FkBZsWHO2F83SW0ifF+EVFWCKmi8ompADduYVFGf7oB2y3FTJoL5yXbS1geCR9FuUMS8R0S/RO - qoSX3vxjMOFdLTyuGRi0F873T/sCj2QDRr8w7nkRDYknlSKo3mATQx2czlwTy+BJDhrqDjchBp9SNPDX - p7maq0lLIvkLu222SX4W84gAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAORJREFUSEvtlTsOgkAURXFHswVjp4U0Jq7AXcEySHABfkJFBSR0lMAaxvcSNM59 - I84YSCwoTjE3zDnNJARKqdmxjlMjhqZpVl3X7YnTGHVdH/HuJ8TQtu2GJPobWZbpJEnOeN+GGEgQotAG - R6Io4tAVHYgYSOAVGUI39LwjBhJ4R4bQHV1PxEACp0ie5zqOYyOUpukFfYwYSOAUoQeiq6rSZVm+KIpC - 0+vcodM4MCRwiowQotM4MPwRXPJliXixRLxYIl78ScT1zzjCGp3GgeF/fN/3W+LwA1u+j07jMBfWcVpU - 8ACAK1fmlV0mbwAAAABJRU5ErkJggg== - - - - 245, 17 - AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAADAE diff --git a/WinPaletter/Dialogs/About.Designer.cs b/WinPaletter/Dialogs/About.Designer.cs index 39ff67e8..ae7c9bb0 100644 --- a/WinPaletter/Dialogs/About.Designer.cs +++ b/WinPaletter/Dialogs/About.Designer.cs @@ -94,9 +94,10 @@ private void InitializeComponent() // // PictureBox1 // + this.PictureBox1.Anchor = System.Windows.Forms.AnchorStyles.Top; this.PictureBox1.BackColor = System.Drawing.Color.Transparent; this.PictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox1.Image"))); - this.PictureBox1.Location = new System.Drawing.Point(151, 9); + this.PictureBox1.Location = new System.Drawing.Point(173, 9); this.PictureBox1.Name = "PictureBox1"; this.PictureBox1.Size = new System.Drawing.Size(64, 64); this.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -105,10 +106,11 @@ private void InitializeComponent() // // Label17 // + this.Label17.Anchor = System.Windows.Forms.AnchorStyles.Top; this.Label17.AutoSize = true; this.Label17.BackColor = System.Drawing.Color.Transparent; this.Label17.Font = new System.Drawing.Font("Segoe UI", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label17.Location = new System.Drawing.Point(221, 20); + this.Label17.Location = new System.Drawing.Point(243, 20); this.Label17.Name = "Label17"; this.Label17.Size = new System.Drawing.Size(117, 25); this.Label17.TabIndex = 1; @@ -117,10 +119,11 @@ private void InitializeComponent() // // Label1 // + this.Label1.Anchor = System.Windows.Forms.AnchorStyles.Top; this.Label1.AutoSize = true; this.Label1.BackColor = System.Drawing.Color.Transparent; this.Label1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label1.Location = new System.Drawing.Point(224, 48); + this.Label1.Location = new System.Drawing.Point(246, 48); this.Label1.Name = "Label1"; this.Label1.Size = new System.Drawing.Size(109, 15); this.Label1.TabIndex = 2; @@ -129,10 +132,11 @@ private void InitializeComponent() // // Label2 // + this.Label2.Anchor = System.Windows.Forms.AnchorStyles.Top; this.Label2.AutoSize = true; this.Label2.BackColor = System.Drawing.Color.Transparent; this.Label2.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label2.Location = new System.Drawing.Point(334, 28); + this.Label2.Location = new System.Drawing.Point(356, 28); this.Label2.Name = "Label2"; this.Label2.Size = new System.Drawing.Size(40, 13); this.Label2.TabIndex = 3; @@ -179,7 +183,7 @@ private void InitializeComponent() this.LinkLabel1.LinkColor = System.Drawing.Color.White; this.LinkLabel1.Location = new System.Drawing.Point(42, 158); this.LinkLabel1.Name = "LinkLabel1"; - this.LinkLabel1.Size = new System.Drawing.Size(471, 24); + this.LinkLabel1.Size = new System.Drawing.Size(515, 24); this.LinkLabel1.TabIndex = 11; this.LinkLabel1.TabStop = true; this.LinkLabel1.Text = "Icons by Pichon"; @@ -196,7 +200,7 @@ private void InitializeComponent() this.LinkLabel2.LinkColor = System.Drawing.Color.White; this.LinkLabel2.Location = new System.Drawing.Point(42, 188); this.LinkLabel2.Name = "LinkLabel2"; - this.LinkLabel2.Size = new System.Drawing.Size(471, 24); + this.LinkLabel2.Size = new System.Drawing.Size(515, 24); this.LinkLabel2.TabIndex = 12; this.LinkLabel2.TabStop = true; this.LinkLabel2.Text = "Color picking controls by Cyotek"; @@ -213,7 +217,7 @@ private void InitializeComponent() this.LinkLabel3.LinkColor = System.Drawing.Color.White; this.LinkLabel3.Location = new System.Drawing.Point(42, 218); this.LinkLabel3.Name = "LinkLabel3"; - this.LinkLabel3.Size = new System.Drawing.Size(471, 24); + this.LinkLabel3.Size = new System.Drawing.Size(515, 24); this.LinkLabel3.TabIndex = 13; this.LinkLabel3.TabStop = true; this.LinkLabel3.Text = "Image to palette conversion mechanism by ColorThief; KSemenenko"; @@ -241,7 +245,7 @@ private void InitializeComponent() this.Button1.Font = new System.Drawing.Font("Segoe UI", 9F); this.Button1.ForeColor = System.Drawing.Color.White; this.Button1.Image = ((System.Drawing.Image)(resources.GetObject("Button1.Image"))); - this.Button1.Location = new System.Drawing.Point(276, 607); + this.Button1.Location = new System.Drawing.Point(320, 607); this.Button1.Name = "Button1"; this.Button1.Size = new System.Drawing.Size(80, 34); this.Button1.TabIndex = 16; @@ -258,7 +262,7 @@ private void InitializeComponent() this.Button3.Font = new System.Drawing.Font("Segoe UI", 9F); this.Button3.ForeColor = System.Drawing.Color.White; this.Button3.Image = null; - this.Button3.Location = new System.Drawing.Point(447, 607); + this.Button3.Location = new System.Drawing.Point(491, 607); this.Button3.Name = "Button3"; this.Button3.Size = new System.Drawing.Size(66, 34); this.Button3.TabIndex = 18; @@ -277,10 +281,10 @@ private void InitializeComponent() this.LinkLabel4.LinkColor = System.Drawing.Color.White; this.LinkLabel4.Location = new System.Drawing.Point(42, 248); this.LinkLabel4.Name = "LinkLabel4"; - this.LinkLabel4.Size = new System.Drawing.Size(471, 24); + this.LinkLabel4.Size = new System.Drawing.Size(515, 24); this.LinkLabel4.TabIndex = 20; this.LinkLabel4.TabStop = true; - this.LinkLabel4.Text = "Animation for controls by Pavel Torgashov"; + this.LinkLabel4.Text = "Controls animation by Pavel Torgashov"; this.LinkLabel4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.LinkLabel4.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LinkLabel4_LinkClicked); // @@ -302,7 +306,7 @@ private void InitializeComponent() this.Label4.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label4.Location = new System.Drawing.Point(12, 78); this.Label4.Name = "Label4"; - this.Label4.Size = new System.Drawing.Size(501, 44); + this.Label4.Size = new System.Drawing.Size(545, 44); this.Label4.TabIndex = 21; this.Label4.Text = "The following components are used to increase the functionality of the program, a" + "ll rights go to their owners."; @@ -318,7 +322,7 @@ private void InitializeComponent() this.LinkLabel5.LinkColor = System.Drawing.Color.White; this.LinkLabel5.Location = new System.Drawing.Point(42, 128); this.LinkLabel5.Name = "LinkLabel5"; - this.LinkLabel5.Size = new System.Drawing.Size(471, 24); + this.LinkLabel5.Size = new System.Drawing.Size(515, 24); this.LinkLabel5.TabIndex = 23; this.LinkLabel5.TabStop = true; this.LinkLabel5.Text = "Modifying Modern Windows Elements inspired by u/aveyo and u/Egg-Tricky on Reddit"; @@ -345,7 +349,7 @@ private void InitializeComponent() this.LinkLabel6.LinkColor = System.Drawing.Color.White; this.LinkLabel6.Location = new System.Drawing.Point(42, 520); this.LinkLabel6.Name = "LinkLabel6"; - this.LinkLabel6.Size = new System.Drawing.Size(471, 63); + this.LinkLabel6.Size = new System.Drawing.Size(515, 63); this.LinkLabel6.TabIndex = 25; this.LinkLabel6.TabStop = true; this.LinkLabel6.Text = "The following items are by Microsoft:\r\n• Classic colors schemes\r\n• Luna theme pre" + @@ -370,12 +374,12 @@ private void InitializeComponent() this.LinkLabel7.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.LinkLabel7.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; this.LinkLabel7.LinkColor = System.Drawing.Color.White; - this.LinkLabel7.Location = new System.Drawing.Point(42, 308); + this.LinkLabel7.Location = new System.Drawing.Point(42, 278); this.LinkLabel7.Name = "LinkLabel7"; - this.LinkLabel7.Size = new System.Drawing.Size(471, 24); + this.LinkLabel7.Size = new System.Drawing.Size(515, 24); this.LinkLabel7.TabIndex = 27; this.LinkLabel7.TabStop = true; - this.LinkLabel7.Text = "Animating colors change by Luke Berg"; + this.LinkLabel7.Text = "Controls animation and transition effects by Andreas Wäscher: FluentTransitions"; this.LinkLabel7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.LinkLabel7.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LinkLabel7_LinkClicked); // @@ -383,7 +387,7 @@ private void InitializeComponent() // this.PictureBox8.BackColor = System.Drawing.Color.Transparent; this.PictureBox8.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox8.Image"))); - this.PictureBox8.Location = new System.Drawing.Point(12, 308); + this.PictureBox8.Location = new System.Drawing.Point(12, 278); this.PictureBox8.Name = "PictureBox8"; this.PictureBox8.Size = new System.Drawing.Size(24, 24); this.PictureBox8.TabIndex = 26; @@ -397,9 +401,9 @@ private void InitializeComponent() this.LinkLabel8.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.LinkLabel8.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; this.LinkLabel8.LinkColor = System.Drawing.Color.White; - this.LinkLabel8.Location = new System.Drawing.Point(42, 338); + this.LinkLabel8.Location = new System.Drawing.Point(42, 428); this.LinkLabel8.Name = "LinkLabel8"; - this.LinkLabel8.Size = new System.Drawing.Size(471, 24); + this.LinkLabel8.Size = new System.Drawing.Size(515, 24); this.LinkLabel8.TabIndex = 29; this.LinkLabel8.TabStop = true; this.LinkLabel8.Text = "JetBrainsMono font as a monospaced font specific for WinPaletter"; @@ -410,7 +414,7 @@ private void InitializeComponent() // this.PictureBox9.BackColor = System.Drawing.Color.Transparent; this.PictureBox9.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox9.Image"))); - this.PictureBox9.Location = new System.Drawing.Point(12, 338); + this.PictureBox9.Location = new System.Drawing.Point(12, 428); this.PictureBox9.Name = "PictureBox9"; this.PictureBox9.Size = new System.Drawing.Size(24, 24); this.PictureBox9.TabIndex = 28; @@ -424,9 +428,9 @@ private void InitializeComponent() this.LinkLabel9.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.LinkLabel9.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; this.LinkLabel9.LinkColor = System.Drawing.Color.White; - this.LinkLabel9.Location = new System.Drawing.Point(42, 368); + this.LinkLabel9.Location = new System.Drawing.Point(42, 458); this.LinkLabel9.Name = "LinkLabel9"; - this.LinkLabel9.Size = new System.Drawing.Size(471, 24); + this.LinkLabel9.Size = new System.Drawing.Size(515, 24); this.LinkLabel9.TabIndex = 33; this.LinkLabel9.TabStop = true; this.LinkLabel9.Text = "Handling JSON files by Newtonsoft JSON; James Newton-King"; @@ -437,7 +441,7 @@ private void InitializeComponent() // this.PictureBox11.BackColor = System.Drawing.Color.Transparent; this.PictureBox11.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox11.Image"))); - this.PictureBox11.Location = new System.Drawing.Point(12, 368); + this.PictureBox11.Location = new System.Drawing.Point(12, 458); this.PictureBox11.Name = "PictureBox11"; this.PictureBox11.Size = new System.Drawing.Size(24, 24); this.PictureBox11.TabIndex = 32; @@ -451,22 +455,22 @@ private void InitializeComponent() this.AnimatedBox1.Controls.Add(this.LinkLabel14); this.AnimatedBox1.Controls.Add(this.PictureBox15); this.AnimatedBox1.Controls.Add(this.LinkLabel13); - this.AnimatedBox1.Controls.Add(this.PictureBox12); - this.AnimatedBox1.Controls.Add(this.LinkLabel12); - this.AnimatedBox1.Controls.Add(this.PictureBox14); this.AnimatedBox1.Controls.Add(this.LinkLabel11); - this.AnimatedBox1.Controls.Add(this.PictureBox13); this.AnimatedBox1.Controls.Add(this.LinkLabel10); + this.AnimatedBox1.Controls.Add(this.LinkLabel12); + this.AnimatedBox1.Controls.Add(this.PictureBox13); this.AnimatedBox1.Controls.Add(this.PictureBox10); + this.AnimatedBox1.Controls.Add(this.PictureBox14); + this.AnimatedBox1.Controls.Add(this.PictureBox9); this.AnimatedBox1.Controls.Add(this.LinkLabel9); this.AnimatedBox1.Controls.Add(this.PictureBox1); + this.AnimatedBox1.Controls.Add(this.LinkLabel8); + this.AnimatedBox1.Controls.Add(this.PictureBox12); this.AnimatedBox1.Controls.Add(this.PictureBox11); this.AnimatedBox1.Controls.Add(this.Label2); this.AnimatedBox1.Controls.Add(this.Label17); - this.AnimatedBox1.Controls.Add(this.LinkLabel8); this.AnimatedBox1.Controls.Add(this.Label1); this.AnimatedBox1.Controls.Add(this.Label4); - this.AnimatedBox1.Controls.Add(this.PictureBox9); this.AnimatedBox1.Controls.Add(this.PictureBox2); this.AnimatedBox1.Controls.Add(this.LinkLabel7); this.AnimatedBox1.Controls.Add(this.PictureBox3); @@ -484,7 +488,7 @@ private void InitializeComponent() this.AnimatedBox1.Dock = System.Windows.Forms.DockStyle.Top; this.AnimatedBox1.Location = new System.Drawing.Point(0, 0); this.AnimatedBox1.Name = "AnimatedBox1"; - this.AnimatedBox1.Size = new System.Drawing.Size(525, 595); + this.AnimatedBox1.Size = new System.Drawing.Size(569, 595); this.AnimatedBox1.Style = WinPaletter.UI.WP.AnimatedBox.Styles.SwapColors; this.AnimatedBox1.TabIndex = 34; // @@ -496,9 +500,9 @@ private void InitializeComponent() this.LinkLabel14.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.LinkLabel14.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; this.LinkLabel14.LinkColor = System.Drawing.Color.White; - this.LinkLabel14.Location = new System.Drawing.Point(42, 488); + this.LinkLabel14.Location = new System.Drawing.Point(42, 398); this.LinkLabel14.Name = "LinkLabel14"; - this.LinkLabel14.Size = new System.Drawing.Size(471, 24); + this.LinkLabel14.Size = new System.Drawing.Size(515, 24); this.LinkLabel14.TabIndex = 45; this.LinkLabel14.TabStop = true; this.LinkLabel14.Text = "Patching PE files by Tyrrrz/Ressy"; @@ -509,7 +513,7 @@ private void InitializeComponent() // this.PictureBox15.BackColor = System.Drawing.Color.Transparent; this.PictureBox15.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox15.Image"))); - this.PictureBox15.Location = new System.Drawing.Point(12, 488); + this.PictureBox15.Location = new System.Drawing.Point(12, 398); this.PictureBox15.Name = "PictureBox15"; this.PictureBox15.Size = new System.Drawing.Size(24, 24); this.PictureBox15.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -524,9 +528,9 @@ private void InitializeComponent() this.LinkLabel13.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.LinkLabel13.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; this.LinkLabel13.LinkColor = System.Drawing.Color.White; - this.LinkLabel13.Location = new System.Drawing.Point(42, 278); + this.LinkLabel13.Location = new System.Drawing.Point(42, 338); this.LinkLabel13.Name = "LinkLabel13"; - this.LinkLabel13.Size = new System.Drawing.Size(471, 24); + this.LinkLabel13.Size = new System.Drawing.Size(515, 24); this.LinkLabel13.TabIndex = 43; this.LinkLabel13.TabStop = true; this.LinkLabel13.Text = "Bitmaps to cursors conversion mechanism by Evan Olds"; @@ -537,7 +541,7 @@ private void InitializeComponent() // this.PictureBox12.BackColor = System.Drawing.Color.Transparent; this.PictureBox12.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox12.Image"))); - this.PictureBox12.Location = new System.Drawing.Point(12, 278); + this.PictureBox12.Location = new System.Drawing.Point(12, 338); this.PictureBox12.Name = "PictureBox12"; this.PictureBox12.Size = new System.Drawing.Size(24, 24); this.PictureBox12.TabIndex = 42; @@ -551,9 +555,9 @@ private void InitializeComponent() this.LinkLabel12.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.LinkLabel12.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; this.LinkLabel12.LinkColor = System.Drawing.Color.White; - this.LinkLabel12.Location = new System.Drawing.Point(42, 458); + this.LinkLabel12.Location = new System.Drawing.Point(42, 308); this.LinkLabel12.Name = "LinkLabel12"; - this.LinkLabel12.Size = new System.Drawing.Size(471, 24); + this.LinkLabel12.Size = new System.Drawing.Size(515, 24); this.LinkLabel12.TabIndex = 41; this.LinkLabel12.TabStop = true; this.LinkLabel12.Text = "Bitmaps effects by ImageProcessor"; @@ -564,7 +568,7 @@ private void InitializeComponent() // this.PictureBox14.BackColor = System.Drawing.Color.Transparent; this.PictureBox14.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox14.Image"))); - this.PictureBox14.Location = new System.Drawing.Point(12, 458); + this.PictureBox14.Location = new System.Drawing.Point(12, 308); this.PictureBox14.Name = "PictureBox14"; this.PictureBox14.Size = new System.Drawing.Size(24, 24); this.PictureBox14.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -579,9 +583,9 @@ private void InitializeComponent() this.LinkLabel11.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.LinkLabel11.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; this.LinkLabel11.LinkColor = System.Drawing.Color.White; - this.LinkLabel11.Location = new System.Drawing.Point(42, 428); + this.LinkLabel11.Location = new System.Drawing.Point(42, 368); this.LinkLabel11.Name = "LinkLabel11"; - this.LinkLabel11.Size = new System.Drawing.Size(471, 24); + this.LinkLabel11.Size = new System.Drawing.Size(515, 24); this.LinkLabel11.TabIndex = 39; this.LinkLabel11.TabStop = true; this.LinkLabel11.Text = "Getting bitmap elements of visual styles (*.msstyles) by Advanced UxTheme wrapper" + @@ -593,7 +597,7 @@ private void InitializeComponent() // this.PictureBox13.BackColor = System.Drawing.Color.Transparent; this.PictureBox13.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox13.Image"))); - this.PictureBox13.Location = new System.Drawing.Point(12, 428); + this.PictureBox13.Location = new System.Drawing.Point(12, 368); this.PictureBox13.Name = "PictureBox13"; this.PictureBox13.Size = new System.Drawing.Size(24, 24); this.PictureBox13.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -608,9 +612,9 @@ private void InitializeComponent() this.LinkLabel10.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.LinkLabel10.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; this.LinkLabel10.LinkColor = System.Drawing.Color.White; - this.LinkLabel10.Location = new System.Drawing.Point(42, 398); + this.LinkLabel10.Location = new System.Drawing.Point(42, 488); this.LinkLabel10.Name = "LinkLabel10"; - this.LinkLabel10.Size = new System.Drawing.Size(471, 24); + this.LinkLabel10.Size = new System.Drawing.Size(515, 24); this.LinkLabel10.TabIndex = 35; this.LinkLabel10.TabStop = true; this.LinkLabel10.Text = "Modern dialogs design by Ookii.Dialogs.WinForms"; @@ -621,7 +625,7 @@ private void InitializeComponent() // this.PictureBox10.BackColor = System.Drawing.Color.Transparent; this.PictureBox10.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox10.Image"))); - this.PictureBox10.Location = new System.Drawing.Point(12, 398); + this.PictureBox10.Location = new System.Drawing.Point(12, 488); this.PictureBox10.Name = "PictureBox10"; this.PictureBox10.Size = new System.Drawing.Size(24, 24); this.PictureBox10.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -636,7 +640,7 @@ private void InitializeComponent() this.Button2.Font = new System.Drawing.Font("Segoe UI", 9F); this.Button2.ForeColor = System.Drawing.Color.White; this.Button2.Image = ((System.Drawing.Image)(resources.GetObject("Button2.Image"))); - this.Button2.Location = new System.Drawing.Point(362, 607); + this.Button2.Location = new System.Drawing.Point(406, 607); this.Button2.Name = "Button2"; this.Button2.Size = new System.Drawing.Size(79, 34); this.Button2.TabIndex = 17; @@ -650,7 +654,7 @@ private void InitializeComponent() this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.ClientSize = new System.Drawing.Size(525, 654); + this.ClientSize = new System.Drawing.Size(569, 654); this.Controls.Add(this.Button1); this.Controls.Add(this.Button2); this.Controls.Add(this.Button3); diff --git a/WinPaletter/Dialogs/About.cs b/WinPaletter/Dialogs/About.cs index c3856eb2..8bf55c83 100644 --- a/WinPaletter/Dialogs/About.cs +++ b/WinPaletter/Dialogs/About.cs @@ -61,7 +61,7 @@ private void LinkLabel5_LinkClicked(object sender, LinkLabelLinkClickedEventArgs private void LinkLabel7_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - // ##### + Process.Start("https://github.com/awaescher/FluentTransitions"); } private void LinkLabel6_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) diff --git a/WinPaletter/Dialogs/About.resx b/WinPaletter/Dialogs/About.resx index ee931337..750a27a3 100644 --- a/WinPaletter/Dialogs/About.resx +++ b/WinPaletter/Dialogs/About.resx @@ -393,7 +393,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAABbtJREFUSEutVmtQlFUY3sZs6k85Zb+a1AQBzXvJkIYCkyI6lDapoC6XJa5qhpWC + vwAADr8BOAVTJAAABbtJREFUSEutVmtQlFUY3sZs6k85Zb+a1AQBzXvJkIYCkyI6lDapoC6XJa5qhpWC oqOQCKEgoIjDBAYqscqS3JH7ZQUREAFhEXaXvUCJCC6wwO7CPr3ftx+mM1lO0zvz7nfOd77zPOd9zvue s7yXtQZgplptfKe3F7MbGjCTe/3fzMx2x/vma/kB3Qr9x3KlLqKoqrMpPadeL1cbwPiP8df0cpWuXt5r ONEqebJq3uqdB82td73JTf93m7fGxX2Zoy8Lxniq6BYOhKVwfT2Wb/RGDz2Zfqd0BPNW74KlnYcjN/2f @@ -419,41 +419,6 @@ eNu2zeDgXmxCIWYo1Ho/urVUzM2VX94BM+d9MPc+ifluYfjIeS+jM91q7BU6qFDpg9va8Bo3/eWN+fcg Vxq20GmbXFgpabmW16S5XtCsvX23TyZV6m5QtfoMDBhf/rL//43H+xMaSQBXj6xsJAAAAABJRU5ErkJg gg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAZVJREFUSEvt - k19LwlAUwEcPPUdZOC1SQiHsD6Ezeuytt75KvfQe9S2yErMHg9CwJik4t6APEPVSRKQ2nZu5OygjaGvX - jjJHDzbXS/SDw7hn557fvXe7xD99MUNLV7O0sAFD+6EKSHZHy2qAlrYhZS8UizR/SqiQkZI2naltQdo+ - sGCBaRTJnaL2KxIswOFJVFFb4rNT0hYEctJtSwCSqTObJG2BHupEnH83Srx2SAwC/Wiku44AJJP9SoyC - UF5+ce2XVbNknBY3ofznGAU4vKlaqUsAEpdViVkwz8hVMmIS4NjV41Rcg2m9YxbgcB9VG13N9/RjO+Df - nEmBg2m9853An32+bzVOCeeutOKAUmuYmtcpVj7Wnyp5yDfJON8kNG0ASq3RaV5A12FW9gYZxaGPmx76 - 6+I5MvV1KLUGXi3FKczSJRqGFBHmUCzEKq/O6NPHWKJSgbQ1KAatBG60QRi2WLyQg3hX5EntAf9RQ6fi - MryyD/1bsHN5WcR3YCQp5CBtHyFOWdV38ehIS7HRLPJB+k9CEJ8k0WmACMazcAAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAA/1JREFUSEu9lX1oVXUYxyfb7jnqTEe6l3vnfT8v9253L3dv7sXNzcs2d7010fly - TaOSlpAjphNfmne0zBACrUUpQZsmvuRQgwiiiP5QSUFqMYv+qaCgqRkFqQT56bl3Q1vcppDrwJff5Zzz - +36e73Oec0/K/3KoNqNftZkjouEHJPEy+sft44CEOQ9YI+P2CUCcmuym/6LhcfvJAWnZJtPmGqQ8bE7U - PJPUHJP03LHfKXJfunXC3nsD4uauMj8LHimgpd0kslInskq0XCcc0vAX6Vh1g9aQl6V1Gg6viXIXkgQg - Fy1ZBpa5OqmZOplukx37izlxtozhER9XvnUnNHrRyehgHgNbnWxY4eGbV+382OOmrcJIJEoOEPPpTh9Z - zUHyopXkLK8gGgty5kIpH14u5/L3Af685YJbTm5fssOQlStHbJzb4+Bar5s/tmr0NhvMtkuRYykmApRc - g5m6HyNWT/nxJZQcamHFmRCDFyv5+KsyPhou4dJnXobPu/nt/fncPm3l5pE8fu1zc/U5jZtbNN5dLS2T - 1GlJATkGGYYf/4v1VJ1uTUBKj7ey+oMQm98opbwln0Vhg7qwzqJ6jaHtTm7sdnNdzH+OA7o1TkU1bHHA - WJv+0SIBzNAD2GJtFJxcRemxMJVDSzB765m/uIj6aCFvHTI4fsDN+rCHxnKDo/LAb0jl1wTwe6ckaJME - rn9JoObqqHoRlh1Pox6OMXugm9yBDuY0VZFRUkikfyHRzny6nvTwySYPft0kXGzww1qdUZmqX9oMjtUZ - WB2TAbQ4oAPL4RewDPZieWULyoJapj/7GDOfWEb1UyF2RgL0VensrzaolLE8FzK4utTgeuR+AJJAkQSW - QQEc7EPZvQu1dCFKTTOzWruxGm3UOBp52RukRcxLpN/n60x+WnK/AK0Y5ZkulJ4DqBvfRn38KErFOhRP - LY7gJqrNjSzTO9joehSPzHp7nsklV4AvfAV8V+5nMOjDKmOaHGAVgDOI2vIS6tpTqGuOYVl/kjnhfczz - NjNDJsMl1TudDbK5gGJHLQOuar505nPBEWDYHuB1ewE5eT7Skr9oAnAJoHWPVH4aZd0JMtvfoaSun6rC - nfi0NWiu5oQWe1bTZWzjoNHJp+5aPhfI184AbzruBYgnaNqFEj3MQ8sOkF+9h5rA89QWxmgKxGj3b2el - qNMXY5u5i81mD3u1DbznquSsQPba88kS8/SkAJuBmpePajaiFEaYZbaQLe3IEWW7GrHJ6nI2JuR1NOAT - mdIyU9aK+UEa5HkUSfUZYq4kByROouZ6UXM8KLke+U/x3lH635QmSrVqd9ZpUlyK7E29az4J4MFpAmCq - P5lT8tF/bdx+Ko+UlL8A4t/8w0WNZqsAAAAASUVORK5CYII= @@ -491,6 +456,41 @@ uY+K8e6CqSxBGmO1V7qbp3PY2WvnnTDeWTCUrgBiz86AhdvKo9sPO/0ZxtsFq09CtmzSotC6kCuP3nOO 8gOAxbFVvyOMV4Li0r0l2/hzgA3HhfrA6WTnleDltYNpdV9sn+v0ZJa22wDznoa3NkhG+OniZBivBBFo Ye5G74o1UoB2Mp6CB6AZaAkaNLgWGXb438UwvgGOBdwZfvBDlQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAA/1JREFUSEu9lX1oVXUYxyfb7jnqTEe6l3vnfT8v9253L3dv7sXNzcs2d7010fly + TaOSlpAjphNfmne0zBACrUUpQZsmvuRQgwiiiP5QSUFqMYv+qaCgqRkFqQT56bl3Q1vcppDrwJff5Zzz + +36e73Oec0/K/3KoNqNftZkjouEHJPEy+sft44CEOQ9YI+P2CUCcmuym/6LhcfvJAWnZJtPmGqQ8bE7U + PJPUHJP03LHfKXJfunXC3nsD4uauMj8LHimgpd0kslInskq0XCcc0vAX6Vh1g9aQl6V1Gg6viXIXkgQg + Fy1ZBpa5OqmZOplukx37izlxtozhER9XvnUnNHrRyehgHgNbnWxY4eGbV+382OOmrcJIJEoOEPPpTh9Z + zUHyopXkLK8gGgty5kIpH14u5/L3Af685YJbTm5fssOQlStHbJzb4+Bar5s/tmr0NhvMtkuRYykmApRc + g5m6HyNWT/nxJZQcamHFmRCDFyv5+KsyPhou4dJnXobPu/nt/fncPm3l5pE8fu1zc/U5jZtbNN5dLS2T + 1GlJATkGGYYf/4v1VJ1uTUBKj7ey+oMQm98opbwln0Vhg7qwzqJ6jaHtTm7sdnNdzH+OA7o1TkU1bHHA + WJv+0SIBzNAD2GJtFJxcRemxMJVDSzB765m/uIj6aCFvHTI4fsDN+rCHxnKDo/LAb0jl1wTwe6ckaJME + rn9JoObqqHoRlh1Pox6OMXugm9yBDuY0VZFRUkikfyHRzny6nvTwySYPft0kXGzww1qdUZmqX9oMjtUZ + WB2TAbQ4oAPL4RewDPZieWULyoJapj/7GDOfWEb1UyF2RgL0VensrzaolLE8FzK4utTgeuR+AJJAkQSW + QQEc7EPZvQu1dCFKTTOzWruxGm3UOBp52RukRcxLpN/n60x+WnK/AK0Y5ZkulJ4DqBvfRn38KErFOhRP + LY7gJqrNjSzTO9joehSPzHp7nsklV4AvfAV8V+5nMOjDKmOaHGAVgDOI2vIS6tpTqGuOYVl/kjnhfczz + NjNDJsMl1TudDbK5gGJHLQOuar505nPBEWDYHuB1ewE5eT7Skr9oAnAJoHWPVH4aZd0JMtvfoaSun6rC + nfi0NWiu5oQWe1bTZWzjoNHJp+5aPhfI184AbzruBYgnaNqFEj3MQ8sOkF+9h5rA89QWxmgKxGj3b2el + qNMXY5u5i81mD3u1DbznquSsQPba88kS8/SkAJuBmpePajaiFEaYZbaQLe3IEWW7GrHJ6nI2JuR1NOAT + mdIyU9aK+UEa5HkUSfUZYq4kByROouZ6UXM8KLke+U/x3lH635QmSrVqd9ZpUlyK7E29az4J4MFpAmCq + P5lT8tF/bdx+Ko+UlL8A4t/8w0WNZqsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAZVJREFUSEvt + k19LwlAUwEcPPUdZOC1SQiHsD6Ezeuytt75KvfQe9S2yErMHg9CwJik4t6APEPVSRKQ2nZu5OygjaGvX + jjJHDzbXS/SDw7hn557fvXe7xD99MUNLV7O0sAFD+6EKSHZHy2qAlrYhZS8UizR/SqiQkZI2naltQdo+ + sGCBaRTJnaL2KxIswOFJVFFb4rNT0hYEctJtSwCSqTObJG2BHupEnH83Srx2SAwC/Wiku44AJJP9SoyC + UF5+ce2XVbNknBY3ofznGAU4vKlaqUsAEpdViVkwz8hVMmIS4NjV41Rcg2m9YxbgcB9VG13N9/RjO+Df + nEmBg2m9853An32+bzVOCeeutOKAUmuYmtcpVj7Wnyp5yDfJON8kNG0ASq3RaV5A12FW9gYZxaGPmx76 + 6+I5MvV1KLUGXi3FKczSJRqGFBHmUCzEKq/O6NPHWKJSgbQ1KAatBG60QRi2WLyQg3hX5EntAf9RQ6fi + MryyD/1bsHN5WcR3YCQp5CBtHyFOWdV38ehIS7HRLPJB+k9CEJ8k0WmACMazcAAAAABJRU5ErkJggg== diff --git a/WinPaletter/Dialogs/BugReport.cs b/WinPaletter/Dialogs/BugReport.cs index ba2740d9..192c2471 100644 --- a/WinPaletter/Dialogs/BugReport.cs +++ b/WinPaletter/Dialogs/BugReport.cs @@ -21,7 +21,7 @@ public BugReport() private void Center() { - Location = new Point(Location.X - 15, Location.Y - 15); + Location = new(Location.X - 15, Location.Y - 15); Task.Delay(10).ContinueWith(_ => { @@ -215,7 +215,7 @@ private void Button4_Click(object sender, EventArgs e) public string GetDetails() { - var SB = new StringBuilder(); + StringBuilder SB = new(); SB.Clear(); SB.AppendLine("```cs"); SB.AppendLine("//General information"); diff --git a/WinPaletter/Dialogs/RescueTools.cs b/WinPaletter/Dialogs/RescueTools.cs index 1c37ed26..2d559ce1 100644 --- a/WinPaletter/Dialogs/RescueTools.cs +++ b/WinPaletter/Dialogs/RescueTools.cs @@ -108,9 +108,9 @@ private void button10_Click(object sender, EventArgs e) IntPtr intPtr = IntPtr.Zero; Kernel32.Wow64DisableWow64FsRedirection(ref intPtr); - using (var process = new Process() + using (Process process = new() { - StartInfo = new ProcessStartInfo() + StartInfo = new() { FileName = PathsExt.System32 + "\\cmd.exe", Verb = "runas", diff --git a/WinPaletter/Dialogs/ThemeLog.cs b/WinPaletter/Dialogs/ThemeLog.cs index e3df26b6..e45ad3ef 100644 --- a/WinPaletter/Dialogs/ThemeLog.cs +++ b/WinPaletter/Dialogs/ThemeLog.cs @@ -72,7 +72,7 @@ public void Apply_Theme(Theme.Manager TM = null, bool AdditionalStoreTips = fals this.Show(); } - Apply_Thread = new Thread(() => + Apply_Thread = new(() => { bool LogEnabled = Program.Settings.ThemeLog.VerboseLevel != Settings.Structures.ThemeLog.VerboseLevels.None; @@ -120,7 +120,7 @@ public void Apply_Theme(Theme.Manager TM = null, bool AdditionalStoreTips = fals Exceptions.ThemeApply.Add(new Tuple(ex.Message, ex)); } - Program.TM_Original = new Theme.Manager(Theme.Manager.Source.Registry); + Program.TM_Original = new(Theme.Manager.Source.Registry); Cursor = Cursors.Default; @@ -195,7 +195,7 @@ private void Button22_Click(object sender, EventArgs e) if (Forms.MainFrm.SaveFileDialog3.ShowDialog() == DialogResult.OK) { - var sb = new StringBuilder(); + StringBuilder sb = new(); sb.Clear(); foreach (TreeNode N in TreeView1.Nodes) diff --git a/WinPaletter/Dialogs/UserSwitch.cs b/WinPaletter/Dialogs/UserSwitch.cs index 2b84d224..79f0328a 100644 --- a/WinPaletter/Dialogs/UserSwitch.cs +++ b/WinPaletter/Dialogs/UserSwitch.cs @@ -85,7 +85,7 @@ private void ListUsers(Dictionary UsersList) TextImageRelation = TextImageRelation.ImageBeforeText, Padding = new(5, 0, 0, 0), Checked = (User.SID != null) ? user.Key == User.SID : user.Key == User.AdminSID_GrantedUAC, - Size = new Size(250, 70), + Size = new(250, 70), Tag = user.Key, Image = NativeMethods.Shell32.GetUserAccountPicture(user.Value.Split('\\').Last()).Resize(48, 48), Text = Scheme, diff --git a/WinPaletter/EditInfo.Designer.cs b/WinPaletter/EditInfo.Designer.cs index a11d91c7..37e8e8c9 100644 --- a/WinPaletter/EditInfo.Designer.cs +++ b/WinPaletter/EditInfo.Designer.cs @@ -917,7 +917,7 @@ private void InitializeComponent() // this.color2.AllowDrop = true; this.color2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(199)))), ((int)(((byte)(49)))), ((int)(((byte)(61))))); - this.color2.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(199)))), ((int)(((byte)(49)))), ((int)(((byte)(61))))); + this.color2.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(199)))), ((int)(((byte)(49)))), ((int)(((byte)(61))))); this.color2.DontShowInfo = false; this.color2.Location = new System.Drawing.Point(167, 36); this.color2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -931,7 +931,7 @@ private void InitializeComponent() // this.color1.AllowDrop = true; this.color1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(81)))), ((int)(((byte)(210))))); - this.color1.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(81)))), ((int)(((byte)(210))))); + this.color1.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(81)))), ((int)(((byte)(210))))); this.color1.DontShowInfo = false; this.color1.Location = new System.Drawing.Point(167, 6); this.color1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); diff --git a/WinPaletter/EditInfo.cs b/WinPaletter/EditInfo.cs index d9de3cdd..1d1e457b 100644 --- a/WinPaletter/EditInfo.cs +++ b/WinPaletter/EditInfo.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Diagnostics; +using System.Drawing; using System.Linq; using System.Windows.Forms; @@ -142,14 +143,14 @@ private void Color1_Click(object sender, EventArgs e) return; } - var _conditions = new Conditions() { Background = true }; - var clist = new List() { color1, StoreItem1 }; - var c = Forms.ColorPickerDlg.Pick(clist, _conditions); + Conditions _conditions = new(){ Background = true }; + List CList = new() { color1, StoreItem1 }; + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions); - StoreItem1.TM.Info.Color1 = c; - color1.BackColor = c; + StoreItem1.TM.Info.Color1 = C; + color1.BackColor = C; - clist.Clear(); + CList.Clear(); } private void Color2_Click(object sender, EventArgs e) @@ -161,14 +162,14 @@ private void Color2_Click(object sender, EventArgs e) return; } - var _conditions = new Conditions() { Background2 = true }; - var clist = new List() { color2, StoreItem1 }; - var c = Forms.ColorPickerDlg.Pick(clist, _conditions); + Conditions _conditions = new(){ Background2 = true }; + List CList = new() { color2, StoreItem1 }; + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions); - StoreItem1.TM.Info.Color2 = c; - color2.BackColor = c; + StoreItem1.TM.Info.Color2 = C; + color2.BackColor = C; - clist.Clear(); + CList.Clear(); } private void CheckBox1_CheckedChanged(object sender) diff --git a/WinPaletter/Extras/AltTabEditor.cs b/WinPaletter/Extras/AltTabEditor.cs index 78ba3870..0e9d5b78 100644 --- a/WinPaletter/Extras/AltTabEditor.cs +++ b/WinPaletter/Extras/AltTabEditor.cs @@ -190,11 +190,11 @@ private void AltTabEditor_Load(object sender, EventArgs e) if (WinElement1.Style == UI.Simulation.WinElement.Styles.AltTab7Basic) { - WinElement1.Size = new Size(360, 100); + WinElement1.Size = new(360, 100); } else { - WinElement1.Size = new Size(450, 150); + WinElement1.Size = new(450, 150); } WinElement1.Left = (int)Math.Round((WinElement1.Parent.Width - WinElement1.Width) / 2d); @@ -227,7 +227,7 @@ private void Button11_Click(object sender, EventArgs e) { if (OpenFileDialog1.ShowDialog() == DialogResult.OK) { - var TMx = new Theme.Manager(Theme.Manager.Source.File, OpenFileDialog1.FileName); + Theme.Manager TMx = new(Theme.Manager.Source.File, OpenFileDialog1.FileName); ApplyFromTM(TMx); TMx.Dispose(); } @@ -235,7 +235,7 @@ private void Button11_Click(object sender, EventArgs e) private void Button9_Click(object sender, EventArgs e) { - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyFromTM(TMx); TMx.Dispose(); } @@ -256,7 +256,7 @@ private void Button7_Click(object sender, EventArgs e) private void Button10_Click(object sender, EventArgs e) { Cursor = Cursors.WaitCursor; - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyToTM(TMx); ApplyToTM(Program.TM); TMx.AltTab.Apply(); diff --git a/WinPaletter/Extras/ApplicationThemer.Designer.cs b/WinPaletter/Extras/ApplicationThemer.Designer.cs index adc6eb1c..748494df 100644 --- a/WinPaletter/Extras/ApplicationThemer.Designer.cs +++ b/WinPaletter/Extras/ApplicationThemer.Designer.cs @@ -143,7 +143,7 @@ private void InitializeComponent() // this.BackColorPick.AllowDrop = true; this.BackColorPick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.BackColorPick.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); + this.BackColorPick.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.BackColorPick.DontShowInfo = false; this.BackColorPick.Location = new System.Drawing.Point(178, 181); this.BackColorPick.Name = "BackColorPick"; @@ -156,7 +156,7 @@ private void InitializeComponent() // this.AccentColor.AllowDrop = true; this.AccentColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(81)))), ((int)(((byte)(210))))); - this.AccentColor.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(81)))), ((int)(((byte)(210))))); + this.AccentColor.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(81)))), ((int)(((byte)(210))))); this.AccentColor.DontShowInfo = false; this.AccentColor.Location = new System.Drawing.Point(178, 151); this.AccentColor.Name = "AccentColor"; diff --git a/WinPaletter/Extras/ApplicationThemer.cs b/WinPaletter/Extras/ApplicationThemer.cs index 55bbfefd..e29c14af 100644 --- a/WinPaletter/Extras/ApplicationThemer.cs +++ b/WinPaletter/Extras/ApplicationThemer.cs @@ -81,7 +81,7 @@ private void Button11_Click(object sender, EventArgs e) { if (OpenFileDialog1.ShowDialog() == DialogResult.OK) { - var TMx = new Theme.Manager(Theme.Manager.Source.File, OpenFileDialog1.FileName); + Theme.Manager TMx = new(Theme.Manager.Source.File, OpenFileDialog1.FileName); ApplyFromTM(TMx); AdjustPreview(); TMx.Dispose(); @@ -90,7 +90,7 @@ private void Button11_Click(object sender, EventArgs e) private void Button9_Click(object sender, EventArgs e) { - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyFromTM(TMx); AdjustPreview(); TMx.Dispose(); @@ -114,7 +114,7 @@ private void Button8_Click(object sender, EventArgs e) private void Button10_Click_1(object sender, EventArgs e) { Cursor = Cursors.WaitCursor; - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyToTM(TMx); ApplyToTM(Program.TM); TMx.AppTheme.Apply(); @@ -151,9 +151,9 @@ private void AccentColor_Click(object sender, EventArgs e) return; } - var clist = new List() { AccentColor }; - Forms.ColorPickerDlg.Pick(clist); - clist.Clear(); + List CList = new() { AccentColor }; + Forms.ColorPickerDlg.Pick(CList); + CList.Clear(); AdjustPreview(); } @@ -167,9 +167,9 @@ private void BackColorPick_Click(object sender, EventArgs e) return; } - var clist = new List() { BackColorPick }; - Forms.ColorPickerDlg.Pick(clist); - clist.Clear(); + List CList = new() { BackColorPick }; + Forms.ColorPickerDlg.Pick(CList); + CList.Clear(); AdjustPreview(); } @@ -272,7 +272,7 @@ private void Appearance_list_SelectedIndexChanged(object sender, EventArgs e) RoundedCorners.Checked = false; AccentColor.BackColor = Color.FromArgb(130, 132, 135); BackColorPick.BackColor = Color.FromArgb(255, 255, 255); - break; + break; } } diff --git a/WinPaletter/Extras/ScreenSaver_Editor.cs b/WinPaletter/Extras/ScreenSaver_Editor.cs index 347fe090..06d3e511 100644 --- a/WinPaletter/Extras/ScreenSaver_Editor.cs +++ b/WinPaletter/Extras/ScreenSaver_Editor.cs @@ -47,7 +47,7 @@ private void Button11_Click(object sender, EventArgs e) { if (OpenFileDialog1.ShowDialog() == DialogResult.OK) { - var TMx = new Theme.Manager(Theme.Manager.Source.File, OpenFileDialog1.FileName); + Theme.Manager TMx = new(Theme.Manager.Source.File, OpenFileDialog1.FileName); ApplyFromTM(TMx); TMx.Dispose(); } @@ -55,7 +55,7 @@ private void Button11_Click(object sender, EventArgs e) private void Button9_Click(object sender, EventArgs e) { - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyFromTM(TMx); TMx.Dispose(); } @@ -77,7 +77,7 @@ private void Button8_Click(object sender, EventArgs e) private void Button10_Click(object sender, EventArgs e) { Cursor = Cursors.WaitCursor; - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyToTM(TMx); ApplyToTM(Program.TM); TMx.ScreenSaver.Apply(); @@ -180,7 +180,7 @@ private void Button259_Click(object sender, EventArgs e) public void GetFromClassicThemeFile(string File, Theme.Structures.ScreenSaver _DefaultScrSvr) { - using (var _ini = new INI(File)) + using (INI _ini = new(File)) { TextBox1.Text = _ini.Read("boot", "SCRNSAVE.EXE", _DefaultScrSvr.File).PhrasePath(); } diff --git a/WinPaletter/Extras/Sounds_Editor.cs b/WinPaletter/Extras/Sounds_Editor.cs index f2e4c9d1..f6309289 100644 --- a/WinPaletter/Extras/Sounds_Editor.cs +++ b/WinPaletter/Extras/Sounds_Editor.cs @@ -13,7 +13,7 @@ namespace WinPaletter public partial class Sounds_Editor { private string snd; - private SoundPlayer SP = new SoundPlayer(); + private SoundPlayer SP = new(); private bool AltPlayingMethod = false; public Sounds_Editor() @@ -36,9 +36,9 @@ private void Button20_Click(object sender, EventArgs e) // imageres.dll player byte[] SoundBytes = PE.GetResource(PathsExt.imageres, "WAVE", OS.WVista ? 5051 : 5080); try { - using (var ms = new MemoryStream(SoundBytes)) + using (MemoryStream ms = new(SoundBytes)) { - SP = new SoundPlayer(ms); + SP = new(ms); SP.Load(); SP.Play(); } @@ -63,9 +63,9 @@ private void Button20_Click(object sender, EventArgs e) // imageres.dll player try { - using (var FS = new FileStream(PathsExt.appData + @"\WindowsStartup_Backup.wav", FileMode.Open, FileAccess.Read)) + using (FileStream FS = new(PathsExt.appData + @"\WindowsStartup_Backup.wav", FileMode.Open, FileAccess.Read)) { - SP = new SoundPlayer(FS); + SP = new(FS); SP.Load(); SP.Play(); } @@ -93,9 +93,9 @@ private void Button20_Click(object sender, EventArgs e) // imageres.dll player try { - using (var FS = new FileStream(snd, FileMode.Open, FileAccess.Read)) + using (FileStream FS = new(snd, FileMode.Open, FileAccess.Read)) { - SP = new SoundPlayer(FS); + SP = new(FS); SP.Load(); SP.Play(); } @@ -142,9 +142,9 @@ public void PressPlay(object sender, EventArgs e) try { - using (var FS = new FileStream(snd, FileMode.Open, FileAccess.Read)) + using (FileStream FS = new(snd, FileMode.Open, FileAccess.Read)) { - SP = new SoundPlayer(FS); + SP = new(FS); SP.Load(); SP.Play(); } @@ -199,9 +199,9 @@ public void BrowseForWAV(object sender, EventArgs e) ((UI.WP.Button)sender).Parent.Controls.OfType().ElementAt(0).Text = snd; try { - using (var FS = new FileStream(snd, FileMode.Open, FileAccess.Read)) + using (FileStream FS = new(snd, FileMode.Open, FileAccess.Read)) { - SP = new SoundPlayer(FS); + SP = new(FS); SP.Load(); SP.Play(); } @@ -481,7 +481,7 @@ private void Button11_Click(object sender, EventArgs e) { if (OpenFileDialog1.ShowDialog() == DialogResult.OK) { - var TMx = new Theme.Manager(Theme.Manager.Source.File, OpenFileDialog1.FileName); + Theme.Manager TMx = new(Theme.Manager.Source.File, OpenFileDialog1.FileName); ApplyFromTM(TMx); TMx.Dispose(); } @@ -489,7 +489,7 @@ private void Button11_Click(object sender, EventArgs e) private void Button9_Click(object sender, EventArgs e) { - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyFromTM(TMx); TMx.Dispose(); } @@ -518,7 +518,7 @@ private void Button10_Click(object sender, EventArgs e) Program.Settings.ThemeApplyingBehavior.SFC_on_restoring_StartupSound = CheckBox35_SFC.Checked; Program.Settings.Save(Settings.Mode.Registry); - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyToTM(TMx); ApplyToTM(Program.TM); TMx.Sounds.Apply(); @@ -559,9 +559,9 @@ private void Button259_Click(object sender, EventArgs e) public void GetFromClassicThemeFile(string File, Theme.Structures.Sounds _DefaultSounds) { - using (var _ini = new INI(File)) + using (INI _ini = new(File)) { - var snd = new Theme.Structures.Sounds(); + Theme.Structures.Sounds snd = new(); string Scope_Win = @"AppEvents\Schemes\Apps\.Default\{0}\.Current"; snd.Snd_Win_Default = _ini.Read(string.Format(Scope_Win, ".Default"), "DefaultValue", _DefaultSounds.Snd_Win_Default).PhrasePath(); @@ -617,10 +617,7 @@ public void GetFromClassicThemeFile(string File, Theme.Structures.Sounds _Defaul snd.Snd_Win_SystemExclamation = _ini.Read(string.Format(Scope_Win, "SystemExclamation"), "DefaultValue", _DefaultSounds.Snd_Win_SystemExclamation).PhrasePath(); snd.Snd_Win_SystemExit = _ini.Read(string.Format(Scope_Win, "SystemExit"), "DefaultValue", _DefaultSounds.Snd_Win_SystemExit).PhrasePath(); snd.Snd_Win_SystemStart = _ini.Read(string.Format(Scope_Win, "SystemStart"), "DefaultValue", _DefaultSounds.Snd_Win_SystemStart).PhrasePath(); - if (System.IO.File.Exists(snd.Snd_Win_SystemStart)) - snd.Snd_Imageres_SystemStart = snd.Snd_Win_SystemStart; - else - snd.Snd_Imageres_SystemStart = "Current"; + snd.Snd_Imageres_SystemStart = System.IO.File.Exists(snd.Snd_Win_SystemStart) ? snd.Snd_Win_SystemStart : "Current"; snd.Snd_Win_SystemHand = _ini.Read(string.Format(Scope_Win, "SystemHand"), "DefaultValue", _DefaultSounds.Snd_Win_SystemHand).PhrasePath(); snd.Snd_Win_SystemNotification = _ini.Read(string.Format(Scope_Win, "SystemNotification"), "DefaultValue", _DefaultSounds.Snd_Win_SystemNotification).PhrasePath(); snd.Snd_Win_SystemQuestion = _ini.Read(string.Format(Scope_Win, "SystemQuestion"), "DefaultValue", _DefaultSounds.Snd_Win_SystemQuestion).PhrasePath(); diff --git a/WinPaletter/Extras/Wallpaper_Editor.Designer.cs b/WinPaletter/Extras/Wallpaper_Editor.Designer.cs index 9fbe9990..7434eab8 100644 --- a/WinPaletter/Extras/Wallpaper_Editor.Designer.cs +++ b/WinPaletter/Extras/Wallpaper_Editor.Designer.cs @@ -828,7 +828,7 @@ private void InitializeComponent() // this.color_pick.AllowDrop = true; this.color_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.color_pick.DefaultColor = System.Drawing.Color.Black; + this.color_pick.DefaultBackColor = System.Drawing.Color.Black; this.color_pick.DontShowInfo = false; this.color_pick.Location = new System.Drawing.Point(107, 73); this.color_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); diff --git a/WinPaletter/Extras/Wallpaper_Editor.cs b/WinPaletter/Extras/Wallpaper_Editor.cs index 59f0036f..e6a5647a 100644 --- a/WinPaletter/Extras/Wallpaper_Editor.cs +++ b/WinPaletter/Extras/Wallpaper_Editor.cs @@ -19,13 +19,13 @@ namespace WinPaletter public partial class Wallpaper_Editor { - public Theme.Structures.WallpaperTone WT = new Theme.Structures.WallpaperTone(); + public Theme.Structures.WallpaperTone WT = new(); private Bitmap img, img_filled, img_tile; private Bitmap img_untouched_forTint, img_tinted, img_tinted_filled, img_tinted_tile; private int index = 0; - private List ImgLs1 = new List(); - private List ImgLs2 = new List(); + private List ImgLs1 = new(); + private List ImgLs2 = new(); public Wallpaper_Editor() { @@ -272,7 +272,7 @@ public void ApplyToTM(Theme.Manager TM) public void ApplyWT() { - WT = new Theme.Structures.WallpaperTone() + WT = new() { Enabled = source_wallpapertone.Checked, Image = TextBox3.Text, @@ -332,7 +332,7 @@ private void Button11_Click(object sender, EventArgs e) { if (OpenFileDialog1.ShowDialog() == DialogResult.OK) { - var TMx = new Theme.Manager(Theme.Manager.Source.File, OpenFileDialog1.FileName); + Theme.Manager TMx = new(Theme.Manager.Source.File, OpenFileDialog1.FileName); ApplyFromTM(TMx); TMx.Dispose(); } @@ -340,7 +340,7 @@ private void Button11_Click(object sender, EventArgs e) private void Button9_Click(object sender, EventArgs e) { - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyFromTM(TMx); TMx.Dispose(); } @@ -364,7 +364,7 @@ private void Button8_Click(object sender, EventArgs e) private void Button10_Click(object sender, EventArgs e) { Cursor = Cursors.WaitCursor; - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyToTM(TMx); ApplyToTM(Program.TM); ApplyWT(); @@ -425,9 +425,8 @@ private void Button4_Click(object sender, EventArgs e) { if (!OS.WXP) { - var dlg = new Ookii.Dialogs.WinForms.VistaFolderBrowserDialog(); - if (dlg.ShowDialog() == DialogResult.OK) - TextBox2.Text = dlg.SelectedPath; + Ookii.Dialogs.WinForms.VistaFolderBrowserDialog dlg = new(); + if (dlg.ShowDialog() == DialogResult.OK) TextBox2.Text = dlg.SelectedPath; dlg.Dispose(); } else if (FolderBrowserDialog1.ShowDialog() == DialogResult.OK) @@ -458,7 +457,7 @@ private void Button17_Click(object sender, EventArgs e) { if (ListBox1.SelectedItem is not null) { - var items = new ArrayList(ListBox1.SelectedItems); + ArrayList items = new(ListBox1.SelectedItems); foreach (var item in items) ListBox1.Items.Remove(item); } @@ -523,7 +522,7 @@ public Bitmap GetWall(string file) { try { - using (var bmp = new Bitmap(Bitmap_Mgr.Load(file))) + using (Bitmap bmp = new(Bitmap_Mgr.Load(file))) { float ScaleW = 1f; @@ -762,8 +761,8 @@ private void Color_pick_Click(object sender, EventArgs e) return; } - var CList = new List() { pnl_preview }; - var C = Forms.ColorPickerDlg.Pick(CList); + List CList = new() { pnl_preview }; + Color C = Forms.ColorPickerDlg.Pick(CList); ((UI.Controllers.ColorItem)sender).BackColor = Color.FromArgb(255, C); CList.Clear(); @@ -838,7 +837,7 @@ public void ApplyHSLPreview() { if (source_wallpapertone.Enabled && img_untouched_forTint is not null) { - using (var ImgF = new ImageProcessor.ImageFactory()) + using (ImageProcessor.ImageFactory ImgF = new()) { ImgF.Load(img_untouched_forTint); ImgF.Hue(HBar.Value, true); @@ -858,7 +857,7 @@ private void ColorBar1_Scroll(object sender) { HB.Text = ((UI.WP.ColorBar)sender).Value.ToString(); - var HSL_ = new ColorsExtensions.HSL_Structure(); + ColorsExtensions.HSL_Structure HSL_ = new(); HSL_ = Color.FromArgb(0, 255, 240).ToHSL(); HSL_.H = Conversions.ToInteger(((UI.WP.ColorBar)sender).Value); HSL_.S = 1f; @@ -897,7 +896,7 @@ private void Button20_Click(object sender, EventArgs e) { if (File.Exists(TextBox3.Text) && SaveFileDialog2.ShowDialog() == DialogResult.OK) { - using (var ImgF = new ImageProcessor.ImageFactory()) + using (ImageProcessor.ImageFactory ImgF = new()) { ImgF.Load(TextBox3.Text); ImgF.Hue(HBar.Value, true); diff --git a/WinPaletter/Extras/WinEffecter.cs b/WinPaletter/Extras/WinEffecter.cs index e6cd3a82..67be5e5e 100644 --- a/WinPaletter/Extras/WinEffecter.cs +++ b/WinPaletter/Extras/WinEffecter.cs @@ -249,7 +249,7 @@ private void Button11_Click(object sender, EventArgs e) { if (OpenFileDialog1.ShowDialog() == DialogResult.OK) { - var TMx = new Theme.Manager(Theme.Manager.Source.File, OpenFileDialog1.FileName); + Theme.Manager TMx = new(Theme.Manager.Source.File, OpenFileDialog1.FileName); ApplyFromTM(TMx); TMx.Dispose(); } @@ -257,7 +257,7 @@ private void Button11_Click(object sender, EventArgs e) private void Button9_Click(object sender, EventArgs e) { - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyFromTM(TMx); TMx.Dispose(); } @@ -278,7 +278,7 @@ private void Button7_Click(object sender, EventArgs e) private void Button10_Click(object sender, EventArgs e) { Cursor = Cursors.WaitCursor; - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyToTM(TMx); ApplyToTM(Program.TM); Forms.MainFrm.ApplyColorsToElements(TMx); diff --git a/WinPaletter/Form1.Designer.cs b/WinPaletter/Form1.Designer.cs deleted file mode 100644 index 7575d5b6..00000000 --- a/WinPaletter/Form1.Designer.cs +++ /dev/null @@ -1,157 +0,0 @@ -namespace WinPaletter -{ - partial class Form1 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); - this.colorDialog1 = new System.Windows.Forms.ColorDialog(); - this.colorDialog2 = new System.Windows.Forms.ColorDialog(); - this.ImageList1 = new System.Windows.Forms.ImageList(this.components); - this.button1 = new WinPaletter.UI.WP.Button(); - this.button17 = new WinPaletter.UI.WP.Button(); - this.toggle1 = new WinPaletter.UI.WP.Toggle(); - this.toggle2 = new WinPaletter.UI.WP.Toggle(); - this.toggle3 = new WinPaletter.UI.WP.Toggle(); - this.SuspendLayout(); - // - // ImageList1 - // - this.ImageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("ImageList1.ImageStream"))); - this.ImageList1.TransparentColor = System.Drawing.Color.Transparent; - this.ImageList1.Images.SetKeyName(0, "Updates"); - this.ImageList1.Images.SetKeyName(1, "Language"); - this.ImageList1.Images.SetKeyName(2, "Appearance"); - this.ImageList1.Images.SetKeyName(3, "ThemeFileManagement"); - this.ImageList1.Images.SetKeyName(4, "ThemeApplyingBehavior"); - this.ImageList1.Images.SetKeyName(5, "Store"); - this.ImageList1.Images.SetKeyName(6, "Log"); - this.ImageList1.Images.SetKeyName(7, "Terminals"); - this.ImageList1.Images.SetKeyName(8, "ExplorerPatcher"); - this.ImageList1.Images.SetKeyName(9, "ColorItemInfo"); - this.ImageList1.Images.SetKeyName(10, "Users"); - this.ImageList1.Images.SetKeyName(11, "Miscellaneous"); - // - // button1 - // - this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.button1.CustomColor = System.Drawing.Color.Empty; - this.button1.Flag = WinPaletter.UI.WP.Button.Flags.None; - this.button1.Font = new System.Drawing.Font("Segoe UI", 9F); - this.button1.Image = null; - this.button1.Location = new System.Drawing.Point(347, 322); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(184, 52); - this.button1.TabIndex = 22; - this.button1.Text = "Open main form"; - this.button1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - this.button1.UseVisualStyleBackColor = false; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // button17 - // - this.button17.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.button17.CustomColor = System.Drawing.Color.Empty; - this.button17.Flag = WinPaletter.UI.WP.Button.Flags.TintedOnHover; - this.button17.Font = new System.Drawing.Font("Segoe UI", 9F); - this.button17.Image = global::WinPaletter.Properties.Resources.add_win8; - this.button17.Location = new System.Drawing.Point(537, 322); - this.button17.Name = "button17"; - this.button17.Size = new System.Drawing.Size(184, 52); - this.button17.TabIndex = 21; - this.button17.Text = "Switch dark mode"; - this.button17.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - this.button17.UseVisualStyleBackColor = false; - this.button17.Click += new System.EventHandler(this.button17_Click); - // - // toggle1 - // - this.toggle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41))))); - this.toggle1.Checked = false; - this.toggle1.DarkLight_Toggler = false; - this.toggle1.Location = new System.Drawing.Point(351, 102); - this.toggle1.Name = "toggle1"; - this.toggle1.Size = new System.Drawing.Size(40, 20); - this.toggle1.TabIndex = 23; - this.toggle1.Text = "toggle1"; - // - // toggle2 - // - this.toggle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41))))); - this.toggle2.Checked = true; - this.toggle2.DarkLight_Toggler = false; - this.toggle2.Location = new System.Drawing.Point(351, 128); - this.toggle2.Name = "toggle2"; - this.toggle2.Size = new System.Drawing.Size(40, 20); - this.toggle2.TabIndex = 24; - this.toggle2.Text = "toggle2"; - // - // toggle3 - // - this.toggle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41))))); - this.toggle3.Checked = false; - this.toggle3.DarkLight_Toggler = false; - this.toggle3.Location = new System.Drawing.Point(351, 154); - this.toggle3.Name = "toggle3"; - this.toggle3.Size = new System.Drawing.Size(40, 20); - this.toggle3.TabIndex = 25; - this.toggle3.Text = "toggle3"; - // - // Form1 - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.ClientSize = new System.Drawing.Size(733, 386); - this.Controls.Add(this.toggle3); - this.Controls.Add(this.toggle2); - this.Controls.Add(this.toggle1); - this.Controls.Add(this.button1); - this.Controls.Add(this.button17); - this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ForeColor = System.Drawing.Color.White; - this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.Name = "Form1"; - this.Text = "Form1"; - this.Load += new System.EventHandler(this.Form1_Load); - this.ResumeLayout(false); - - } - - #endregion - - private UI.WP.Button button17; - private UI.WP.Button button1; - private System.Windows.Forms.ColorDialog colorDialog1; - private System.Windows.Forms.ColorDialog colorDialog2; - internal System.Windows.Forms.ImageList ImageList1; - private UI.WP.Toggle toggle1; - private UI.WP.Toggle toggle2; - private UI.WP.Toggle toggle3; - } -} diff --git a/WinPaletter/Form1.cs b/WinPaletter/Form1.cs deleted file mode 100644 index d3f70af0..00000000 --- a/WinPaletter/Form1.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Windows.Forms; - -namespace WinPaletter -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - - private void Form1_Load(object sender, EventArgs e) - { - ApplyStyle(this); - //BackColor = Color.Black; - //this.DropEffect(); - } - - private void button17_Click(object sender, EventArgs e) - { - Visible = false; - - Program.Settings.Appearance.AutoDarkMode = false; - Program.Settings.Appearance.DarkMode = !Program.Settings.Appearance.DarkMode; - Program.Settings.Appearance.Save(); - - Program.Style = new(DefaultColors.PrimaryColor, DefaultColors.SecondaryColor, DefaultColors.TertiaryColor, DefaultColors.DisabledColor, DefaultColors.BackColorDark, DefaultColors.DisabledBackColor, Program.Settings.Appearance.DarkMode, true); - - GetRoundedCorners(); - GetDarkMode(); - ApplyStyle(this); - - //BackColor = Color.Black; - //this.DropEffect(); - - Visible = true; - } - - private void button1_Click(object sender, EventArgs e) - { - Forms.MainFrm.Show(); - } - - } -} \ No newline at end of file diff --git a/WinPaletter/Form1.resx b/WinPaletter/Form1.resx deleted file mode 100644 index ba42aa1d..00000000 --- a/WinPaletter/Form1.resx +++ /dev/null @@ -1,441 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - 17, 17 - - - 138, 17 - - - 407, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABc - RwAAAk1TRnQBSQFMAgEBDAEAAbgBBgG4AQYBFAEAARQBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFQ - AwABUAMAAQEBAAEgBgABZP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A - /wD/AP8A/wD/ALEABAIDGAEhAxgBIQNAAW8DSgGJA0oBiQMxAU0DGAEhAxgBIQMYASEDGAEhAzEBTQNK - AYkDSgGJAkABPwFuAxgBIQMYASEEAgwAAxoBJAJAAT8BbgJEAUMBdwJEAUMBdwJEAUMBdwJEAUMBdwJE - AUMBdwJEAUMBdwJEAUMBdwJEAUMBdwJEAUMBdwJEAUMBdwJEAUMBdwJEAUMBdwJAAT8BbgIaARkBIxwA - AwIBAwMNAREDDQERAw0BEQMNAREDDQERAw0BEQMNAREDDQERAwQBBWgAAVwCYQHZAS4BxgH+Af8BLgHG - Af4B/wG0AYIBLAH/Ac0BdAEBAf8BzAFzAQEB/wF9AZwBgAH/AS4BxgH+Af8BLgHGAf4B/wEuAcYB/gH/ - AS4BxgH+Af8BegGbAYAB/wHDAW4BAQH/AcIBbQEBAf8BqQF8ASwB/wEuAcYB/gH/AS4BxgH+Af8BXgJi - AdcIAAMlATcCYwFIAfYB3gGCAQgB/wHeAYIBCAH/Ad4BgQEHAf8B3QGBAQcB/wHdAYABBgH/Ad0BgAEG - Af8B3AF/AQUB/wHcAX8BBQH/AdwBfwEFAf8B3AF+AQQB/wHbAX4BBAH/AdsBfQEDAf8B2wF9AQMB/wHb - AXwBAgH/AmMBSAH2AyQBNRgAA0kBiAHfAZQBFQH/Ad4BkgETAf8B3QGPAREB/wHcAYwBDwH/AdsBigEN - Af8B2gGHAQsB/wHZAYUBCgH/AdkBhQEKAf8CTAFLAY9oAAFZAmcB7wEzAccB/gH/ATMBxwH+Af8BtgGD - ASwB/wHPAXUBAQH/Ac0BdAEBAf8BfwGdAYAB/wEzAccB/gH/ATMBxwH+Af8BMwHHAf4B/wEzAccB/gH/ - AXwBmwGAAf8BxAFuAQEB/wHDAW4BAQH/AaoBfQEsAf8BMwHHAf4B/wEzAccB/gH/AVkCZwHvCAADUwGn - AeABhQELAf8B4AGEAQoB/wHfAYQBCgH/Ad8BhAEKAf8B3wGDAQkB/wHfAYMBCQH/Ad4BggEIAf8B3gGC - AQgB/wHeAYEBBwH/Ad0BgQEHAf8B3QGBAQcB/wHdAYABBgH/Ad0BgAEGAf8B3AF/AQUB/wHcAX8BBQH/ - AdwBfgEEAf8CUwFSAaUYAANOAZQB4wGeARwB/wHiAZsBGgH/AeEBmAEYAf8B4AGWARYB/wHfAZMBFAH/ - Ad0BkAESAf8B3AGNARAB/wHbAYsBDgH/A04BlGgAAVkCZwHvATgByQH+Af8BOAHJAf4B/wG3AYQBLAH/ - AdABdQEBAf8BzwF1AQEB/wGTAZcBZwH/AV8BtwHBAf8BXwG3AcEB/wFfAbcBwQH/AV8BtwHBAf8BjwGW - AWcB/wHGAW8BAQH/AcQBbgEBAf8BqwF9ASwB/wE4AckB/gH/ATgByQH+Af8BWQJnAe8IAANaAb8B4gGH - AQ0B/wHhAYcBDQH/AeEBhgEMAf8B4QGGAQwB/wHgAYYBDAH/AeABhQELAf8B4AGFAQsB/wHgAYQBCgH/ - Ad8BhAEKAf8B3wGDAQkB/wHfAYMBCQH/Ad8BgwEJAf8B3gGCAQgB/wHeAYIBCAH/Ad4BgQEHAf8B3QGB - AQcB/wNaAb8EAAFnAlkB7wGTAVUBFAH/AZEBVQEUAf8BjwFUARUB/wGOAVMBFQH/Ab8BgwEeAf8B5wGn - ASIB/wHmAaQBIQH/AeUBogEfAf8B4wGfAR0B/wHiAZwBGwH/AeEBmQEZAf8B4AGXARcB/wHfAZQBFQH/ - AbwBdwEUAf8BkAFUARUB/wGOAVMBFQH/AYwBUgEWAf8BjAFSARYB/wFjAVMBSAH2VAABWQJnAe8BPQHK - Af4B/wE9AcoB/gH/AbgBhAEsAf8B0QF2AQEB/wHSAXoBBAH/AdgBigEPAf8B2AGMARAB/wHYAYwBEAH/ - AdgBjAEQAf8B2AGMARAB/wHXAYoBDwH/AcoBdgEEAf8BxgFvAQEB/wGtAX0BLAH/AT0BygH+Af8BPQHK - Af4B/wFZAmcB7wgAA1oBvwHjAYoBEAH/AeMBiQEPAf8B4wGJAQ8B/wHiAYgBDgH/AeIBiAEOAf8B4gGI - AQ4B/wHhAYcBDQH/AeEBhwENAf8B4QGGAQwB/wHhAYYBDAH/AeABhQELAf8B4AGFAQsB/wHgAYUBCwH/ - AeABhAEKAf8B3wGEAQoB/wHfAYMBCQH/A1oBvwQAAZkBWQESAf8BmAFYARIB/wGWAVcBEwH/AZUBVwET - Af8BkwFWARQB/wGpAW0BGgH/AekBrwEpAf8B6QGuAScB/wHoAasBJQH/AecBqAEjAf8B5gGmASEB/wHl - AaMBHwH/AeQBoAEdAf8B4gGcARwB/wGpAWgBFAH/AZUBVwETAf8BkwFWARQB/wGSAVUBFAH/AZABVAEV - Af8BjwFTARUB/1QAAVkCZwHvAUIBzAH+Af8BQgHMAf4B/wG5AYQBLAH/AdMBewEFAf8B2gGMARAB/wHa - AY0BEQH/AdoBjQERAf8B2gGNAREB/wHaAY0BEQH/AdoBjQERAf8B2gGNAREB/wHZAYwBEAH/AcwBdwEF - Af8BsAF+ASwB/wFCAcwB/gH/AUIBzAH+Af8BWQJnAe8IAANaAb8B5QGMARIB/wHkAYwBEgH/AeQBiwER - Af8B5AGLAREB/wHkAYoBEAH/AeMBigEQAf8B4wGKARAB/wHjAYkBDwH/AeIBiQEPAf8B4gGIAQ4B/wHi - AYgBDgH/AeIBhwENAf8B4QGHAQ0B/wHhAYcBDQH/AeEBhgEMAf8B4QGGAQwB/wNaAb8EAAFvAV0BUQH3 - AZ0BWwERAf8BnAFaAREB/wGaAVkBEgH/AZkBWQESAf8BlwFYARMB/wGyAXcBHAH/An4BKwH8AdwBswE5 - Af8BTwGlAa4B/wFPAaQBrQH/AdsBqwEyAf8CfgErAfwBtAFyARcB/wGcAVoBEQH/AZoBWQESAf8BmQFZ - ARIB/wGXAVgBEwH/AZYBVwETAf8BYwFgAUgB9lQAAVkCZwHvAUcBzQH+Af8BRwHNAf4B/wG5AY4BNwH/ - AdwBjQERAf8B3AGOAREB/wHcAY4BEQH/AdwBjgERAf8B3AGOAREB/wHcAY4BEQH/AdwBjgERAf8B3AGO - AREB/wHcAY4BEQH/AdsBjQERAf8BswGLATgB/wFHAc0B/gH/AUcBzQH+Af8BWQJnAe8IAANaAb8B5gGP - ARUB/wHmAY4BFAH/AeYBjgEUAf8B5QGNARMB/wHlAY0BEwH/AeUBjAESAf8B5QGMARIB/wHkAYwBEgH/ - AeQBiwERAf8B5AGLAREB/wHjAYoBEAH/AeMBigEQAf8B4wGJAQ8B/wHjAYkBDwH/AeIBiQEPAf8B4gGI - AQ4B/wNaAb8EAAJIAUcBgwGjAV4BDwH/AaEBXQEPAf8BkAFlASgB/wGRAWIBJAH/AZwBWgERAf8DgAH+ - A0ABbwNIAYMBIQGsAeQB/wEhAawB5QH/A0cBgQJCAUEBcgGjAV4BDwH/AaEBXQEPAf8BkwFjASQB/wGP - AWMBJwH/AZ0BWwERAf8BmwFaAREB/wJHAUYBgAgAAwIBAwNGAX4CUQFQAZwDFQEcCAADCgENA0wBkAJM - AUsBjwMKAQ0IAAMWAR0CUQFQAZ0DRgF9AwIBAwwAAVkCZwHvAUsBzwL/AUsBzwL/AVcBygHrAf8BfgG1 - AaYB/wF+AbUBpgH/AX4BtQGmAf8BfgG1AaYB/wF+AbQBpgH/AX0BtAGmAf8BfQG0AaYB/wF9AbQBpgH/ - AX0BtAGmAf8BfAG0AaYB/wFVAckB7AH/AUsBzwL/AUsBzwL/AVkCZwHvCAADWgG/AegBkQEXAf8B6AGR - ARcB/wHnAZABFgH/AecBkAEWAf8B5wGPARUB/wHmAY8BFQH/AeYBjgEUAf8B5gGOARQB/wHmAY4BFAH/ - AeUBjQETAf8B5QGNARMB/wHlAYwBEgH/AeQBjAESAf8B5AGLAREB/wHkAYsBEQH/AeQBiwERAf8DWgG/ - CAADNAFTAlwBWQHGASYBnwHQAf8DgAH+A1kBuwIuAS0BRgMXAR8BXgJqAe0BMgG9AfUB/wEyAb0B9QH/ - AWECbAHrAxUBHAMuAUgCWQFXAbwDgAH+A4AB/gJdAVsBxQMzAVEMAAM5AV8B6gGyASoB/wHoAawBJgH/ - AlcBVgGyCAACSwFKAYoB6gGxASkB/wHoAasBJQH/A0kBiAgAAlcBVQG0AeoBsAEoAf8B5wGqASQB/wI5 - ATgBXQwAAVkCZwHvAVAB0AL/AVAB0AL/AVAB0AL/AVAB0AL/AVAB0AL/AVAB0AL/AVAB0AL/AVAB0AL/ - AVAB0AL/AVAB0AL/AVAB0AL/AVAB0AL/AVAB0AL/AVAB0AL/AVAB0AL/AVAB0AL/AVkCZwHvCAADWgG/ - AekBkwEZAf8B6QGTARkB/wHpAZMBGQH/AekBkgEYAf8B6AGSARgB/wHoAZEBFwH/AegBkQEXAf8B5wGQ - ARYB/wHnAZABFgH/AecBkAEWAf8B5wGPARUB/wHmAY8BFQH/AeYBjgEUAf8B5gGOARQB/wHlAY0BEwH/ - AeUBjQETAf8DWgG/DAADSAGEASgBtwHxAf8BJwG2AfEB/wE7AjwBZAQAA0IBdAE6AcEB9wH/AUQBxgH6 - Af8BRAHGAfoB/wE5AcEB9wH/AUACQQFwBAADPQFoAScBtgHxAf8BKAG3AfEB/wFGAkcBgBAAAzkBXgHt - AbcBLgH/AeoBsgEqAf8CVwFVAbEIAANKAYkB7AG2AS0B/wHqAbEBKQH/A0kBhwgAAlgBVgGzAewBtQEs - Af8B6gGwASgB/wM4AVwMAAFZAmcB7wFVAdIC/wFVAdIC/wFVAdIC/wFVAdIC/wFVAdIC/wFVAdIC/wFV - AdIC/wFVAdIC/wFVAdIC/wFVAdIC/wFVAdIC/wFVAdIC/wFVAdIC/wFVAdIC/wFVAdIC/wFVAdIC/wFZ - AmcB7wgAA1oBvwHrAZYBHAH/AesBlQEbAf8B6gGVARsB/wHqAZUBGwH/AeoBlAEaAf8B6gGUARoB/wHp - AZMBGQH/AekBkwEZAf8B6QGSARgB/wHoAZIBGAH/AegBkgEYAf8B6AGRARcB/wHoAZEBFwH/AecBkAEW - Af8B5wGQARYB/wHnAY8BFQH/A1oBvwgAAxYBHgEyAb0B9QH/AUABxAH5Af8BPwHEAfkB/wFcAnwB+AMJ - AQwDSAGEAUEBxAH5Af8BTwHMAf4B/wFPAcwB/gH/AUABxAH5Af8DRwGCAwsBDgFNAn0B+gE/AcQB+QH/ - AUABxAH5Af8DgAH+AxQBGwwAAwIBAwNGAX4CUQFQAZwDFQEcCAADCgENA0wBkAJMAUsBjwMKAQ0IAAMW - AR0CUQFQAZ0DRgF9AwIBAwwAAVkCZwHvAVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/ - AVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/ - AVkCZwHvCAADWgG/AewBmAEeAf8B7AGYAR4B/wHsAZcBHQH/AewBlwEdAf8B6wGXAR0B/wHrAZYBHAH/ - AesBlgEcAf8B6wGVARsB/wHqAZUBGwH/AeoBlAEaAf8B6gGUARoB/wHpAZQBGgH/AekBkwEZAf8B6QGT - ARkB/wHpAZIBGAH/AegBkgEYAf8DWgG/CAADJwE6AT0BwwH4Af8BTwHMAf0B/wFOAcsB/QH/ATsBwgH3 - Af8DGgEkA1IBowE9AcMB+AH/AUoBygH8Af8BSgHKAfwB/wE9AcMB+AH/AVICUwGlAxsBJgE8AcIB9wH/ - AU4BywH9Af8BTgHMAf0B/wE9AcMB+AH/AyYBOFgAAVsCYwHkAUwBxAHzAf8BTAHEAfMB/wFMAcQB8wH/ - AUwBxAHzAf8BTAHEAfMB/wFMAcQB8wH/AVAByAH1Af8BXwHVAv8BXwHVAv8BXwHVAv8BXwHVAv8BXwHV - Av8BXwHVAv8BXwHVAv8BXwHVAv8BXwHVAv8BWQJnAe8IAANaAb8B7gGbASEB/wHuAZoBIAH/Ae0BmgEg - Af8B7QGZAR8B/wHtAZkBHwH/Ae0BmQEfAf8B7AGYAR4B/wHsAZgBHgH/AewBlwEdAf8B7AGXAR0B/wHr - AZYBHAH/AesBlgEcAf8B6wGWARwB/wHqAZUBGwH/AeoBlQEbAf8B6gGUARoB/wNaAb8IAAM9AWgBOQG+ - AfUB/wFJAckB/AH/AUgByAH7Af8BNAGzAe4B/wMuAUgBWQJcAcMBKAGhAeQB/wErAZgB3wH/ASsBlgHe - Af8BKAGdAeIB/wFXAloBwgMyAU8BNgG5AfIB/wFIAcgB+wH/AUkByQH8Af8BOAG8AfQB/wM8AWZYAANa - Ab8BAAGKAcsB/wEAAYoBywH/AQABigHLAf8BAAGKAcsB/wEAAYoBywH/AQABigHLAf8BAAGKAcsB/wEx - AbAB5AH/AWQB1wL/AWQB1wL/AWQB1wL/AWQB1wL/AWQB1wL/AWQB1wL/AWQB1wL/AWQB1wL/AV0CZwHq - CAADWgG/AfABnQEjAf8B7wGdASMB/wHvAZwBIgH/Ae8BnAEiAf8B7gGbASEB/wHuAZsBIQH/Ae4BmwEh - Af8B7gGaASAB/wHtAZoBIAH/Ae0BmQEfAf8B7QGZAR8B/wHtAZgBHgH/AewBmAEeAf8B7AGYAR4B/wHs - AZcBHQH/AesBlwEdAf8DWgG/CAADMwFQAUECagH5ASABfgHPAf8BIAF8Ac8B/wFaAWkBbgH1AyUBNgMj - ATICXAF8AfgBFQFmAcIB/wEVAWMBwAH/ASsBXAF+AfwDIgExAyUBNwFaAm4B9QEgAX4B0AH/AR8BewHP - Af8BQQJqAfkDMQFOWAADWgG/AQABlAHXAf8BAAGUAdcB/wEAAZQB1wH/AQABlAHXAf8BAAGUAdcB/wEA - AZQB1wH/AQABlAHXAf8BTQJ9AfoBVgJXAbUBVgJZAbYBVgJZAbYBVgJZAbYBVgJZAbYBVgJZAbYBVgJZ - AbYBVgJXAbUDLgFGCAACVAFTAaYB8QGgASYB/wHxAZ8BJQH/AfEBnwElAf8B8AGeASQB/wHwAZ4BJAH/ - AfABnQEjAf8B8AGdASMB/wHvAZ0BIwH/Ae8BnAEiAf8B7wGcASIB/wHuAZsBIQH/Ae4BmwEhAf8B7gGa - ASAB/wHuAZoBIAH/Ae0BmgEgAf8B7QGZAR8B/wJSAVEBpAwAA00BkgOAAf4BFQFiAb8B/wFXAlkBuQgA - AwwBDwFLAkwBjwFTAlQBqQNGAX0IAANEAXgDgAH+ARUBYwHAAf8BWwJeAc1cAAFQAlEBnAEAAZ8B4wH/ - AQABnwHjAf8BAAGfAeMB/wEAAZ8B4wH/AQABnwHjAf8BAAGfAeMB/wFaAm4B9QM0AVMsAAMlATcCYwFI - AfYB8gGiASgB/wHyAaEBJwH/AfIBoQEnAf8B8gGgASYB/wHxAaABJgH/AfEBnwElAf8B8QGfASUB/wHx - AZ8BJQH/AfABngEkAf8B8AGeASQB/wHwAZ0BIwH/Ae8BnQEjAf8B7wGcASIB/wHvAZwBIgH/AmMBSAH2 - AyQBNRQAAw0BEQMIAQooAAMMAQ8DCQEMXAAEAQMYASEDGQEiAxkBIgMZASIDGQEiAxkBIgMJAQw0AAMa - ASQCQgFBAXIDSQGIA0kBiANJAYgDSQGIA0kBiANJAYgDSQGIA0kBiANJAYgDSQGIA0kBiANJAYgCQgFB - AXIDGgEj/wD/AP8A/wDAAAMCAQMDBwQJAQsDCQELAwkBCwMJAQsDCQELAwkBCwMJAQsDCQELAwkBCwMJ - AQsDCQELAwkBCwMJAQsDCQELAwgBCgMDAQQQAAMPARMDLQFEAjEBMAFMAjwBOwFlAy0BRAMtAUQDLQFE - Ay0BRAMtAUQDLQFEAy0BRAMtAUQDJwE6BAFcAAI4ATkEXQHMA10BzANdAcwCXQFhAdQCWgFrAfICXAF8 - AfgCWwFjAeQCWQFcAb4BTwFOAU8BlwMqAUAEAiQAAxkBIgNLAYsDUgGgA1IBoANSAaADUgGgA1IBoANS - AaADUgGgA1IBoANSAaADUgGgA1IBoANSAaADUgGgA1IBoANNAZMDKAE7AwIBAwwAA1EBngGpAV4BCQH/ - AakBXQEJAf8BuQFqAQkB/wHZAYQBCQH/AdkBhAEJAf8B2QGEAQkB/wHZAYQBCQH/AdkBhAEJAf8B2QGE - AQkB/wHZAYQBCQH/AdkBhAEJAf8B2QGEAQkB/wJMAUsBjwMRARZsAAMMARACXAFfAcgBUwFIAfIB/wFS - AUUB8QH/AVABQwHwAf8BTgFBAe8B/wJbAV8B2AMoATwcAAQBAyoBQANnAe8DgAH+A4AB/gOAAf4DgAH+ - A4AB/gOAAf4DgAH+A4AB/gOAAf4DgAH+A4AB/gOAAf4DgAH+A4AB/gNuAfUDPgFqAwQBBQgAAwcBCQNa - Ab8BpQFrASsB/wGlAV0BDQH/AbwBbAEKAf8B2gGHAQsB/wHaAYcBCwH/AdoBhwELAf8B2gGHAQsB/wHa - AYcBCwH/AdoBhwELAf8B2gGHAQsB/wHaAYcBCwH/AdoBhwELAf8BWAG5AQMB/wNEAXoMAAMzAVEDVAGq - A1QBqgNTAaoDUwGqA1MBqgNTAaoDUwGqA1MBqgNTAaoDUwGqA1MBqgNTAaoDUwGqA1MBqgNTAaoDUwGq - AzMBUBwAAxIBFwJaAWsB8gFQAUMB8AH/AU4BQQHvAf8BTAE/Ae8B/wFKAT0B7gH/AUgBQQFqAfkDKQE+ - GAAEAQMsAUMDaAH0A/MB/wPyAf8D8gH/AfEC8AH/Ad8B2gHcAf8BxgHAAcoB/wG8AbkBzwH/Ac8BzgHe - Af8BtwG2AdEB/wG/Ab4B1QH/AeIB4QHoAf8D7gH/A+wB/wPsAf8DagH5A0ABbwMFAQYIAAM4AVwDgAH+ - AbsBuQG3Af8BpAFyATkB/wG+AW8BCQH/AdsBigENAf8B2wGKAQ0B/wHbAYoBDQH/AdsBigENAf8B2wGK - AQ0B/wHbAYoBDQH/AdsBigENAf8B2wGKAQ0B/wHbAYoBDQH/AVgBugEDAf8BRgFHAUYBgAwAA1kBvgNX - Af8DVgH/A1UB/wNVAf8DVAH/A1MB/wNSAf8DUgH/A1EB/wNQAf8DTwH/A04B/wNOAf8DTQH/A00B/wNN - Af8DWQG+IAACUQFSAaQBTgFBAe8B/wFMAT8B7wH/AUoBPQHuAf8BRwE6Ae0B/wFEATYB7AH/Al0BYQHP - GAAEAQMsAUMDaAH0A/UB/wPzAf8D8wH/AesB6AHmAf8BoAGIAYUB/wFOATABSgH/AScBFwFeAf8BZQFi - AaEB/wEFAQABdgH/AR0BFQGTAf8BqAGlAdEB/wPvAf8D7QH/A+0B/wNqAfkDQAFvAwUBBgwAA1UBrQGo - AV4BBwH/Aa4BYQEHAf8BwAFxAQoB/wHcAY0BDwH/AdwBjQEPAf8B3AGNAQ8B/wHcAY0BDwH/AdwBjQEP - Af8B3AGNAQ8B/wHcAYwBDwH/AdwBjAEPAf8B3AGMAQ8B/wFYAboBBAH/AUYBRwFGAYAMAANaAb8DWgH/ - A1kB/wNYAf8DVwH/A1cB/wNWAf8DVQH/A1QB/wNTAf8DUwH/A1IB/wNRAf8DUAH/A1AB/wNPAf8DTgH/ - A1oBvyAAA0YBfgFMAT8B7wH/AUoBPQHuAf8BRwE6Ae0B/wFEATYB7AH/AUABMgHrAf8DgAH+AwUBBhQA - BAEDLAFDA2gB9AP2Af8D9QH/A/QB/wHtAeoB5wH/Aa8BkgF/Af8BZgFAAT8B/wE/ASYBVAH/AW0BZgGj - Af8BCgECAYYB/wElARYBrAH/AasBpgHZAf8D8AH/A+4B/wPtAf8DagH5A0ABbwMFAQYMAAJVAVMBqgG1 - AWUBBwH/AbUBZQEHAf8BwwFzAQsB/wHdAY8BEQH/Ad0BjwERAf8B3QGPAREB/wHdAY8BEQH/Ad0BjwER - Af8B3QGPAREB/wHdAY8BEQH/Ad0BjwERAf8B3QGPAREB/wFYAbsBBAH/AUYBRwFGAYAMAANaAb8DXAH/ - A1sB/wNbAf8DWgH/A1kB/wNlAf8DbwH/A1YB/wNkAf8DVQH/A1MB/wN5Af8DUgH/A1IB/wNRAf8DUQH/ - A1oBvyAAAzsBYgFKAT0B7gH/AUcBOgHtAf8BRAE2AewB/wFAATIB6wH/AT0BLwHqAf8BOgErAegB/wMK - AQ0UAAQBAywBQwNoAfQD9wH/A/YB/wP2Af8B8QHuAeoB/wHIAa4BkwH/AZUBcQFeAf8BdwFdAW4B/wGX - AY0BugH/AUkBPgGoAf8BVQFKAbkB/wG9AbkB3gH/A/EB/wPwAf8D7wH/A2oB+QNAAW8DBQEGDAACVQFT - AaoBuAFnAQYB/wG4AWcBBgH/AcUBdgEKAf8B3gGSARMB/wHeAZIBEwH/Ad4BkgETAf8B3gGSARMB/wHe - AZIBEwH/Ad4BkgETAf8B3gGSARMB/wHeAZIBEwH/Ad4BkgETAf8BPAGtAaMB/wFSAlMBpQwAA1oBvwNf - Af8DXgH/A10B/wNdAf8DjgH/A80B/wOjAf8DhQH/A5IB/wNXAf8DZwH/A6YB/wNWAf8DVQH/A1QB/wNT - Af8DWgG/IAADEgEYAUgBQQFqAfkBRAE2AewB/wFAATIB6wH/AT0BLwHqAf8BOgErAegB/wJcAWEB1hgA - BAEDLAFDA2gB9AP4Af8D9wH/A/cB/wHzAe4B6QH/AcwBqQF8Af8BlQFlAUQB/wF0AVABTgH/AZMBgwGb - Af8BMQEkAXIB/wEsAScBhwH/Aa4BrQHQAf8D8wH/A/EB/wPwAf8DagH5A0ABbwMFAQYMAANVAawBtgFl - AQUB/wG5AWcBBQH/AccBdwEKAf8B3wGVARUB/wHfAZUBFQH/Ad8BlQEVAf8B3wGVARUB/wHfAZUBFQH/ - Ad8BlQEVAf8B3wGVARUB/wHfAZUBFQH/Ad8BlQEVAf8BOAGwAb8B/wNOAZUMAANaAb8DYQH/A2EB/wNg - Af8DXgH/A9cB/wNjAf8DXQH/A1sB/wNaAf8DWgH/A6oB/wNqAf8DWAH/A1cB/wNXAf8DVgH/A1oBvyQA - A0YBfQFAATIB6wH/AT0BLwHqAf8BQwE0AeQB/wNoAfADaAH0AyQBNBQABAEDLAFDA2gB9AP5Af8D+AH/ - A/gB/wHzAe8B6gH/AbcBmgGbAf8BbQFLAZAB/wFuAUgBYQH/AZcBgwGLAf8BNAEgAVgB/wEkAR0BdQH/ - AakBqAHMAf8D8wH/A/IB/wPxAf8DagH5A0ABbwMFAQYIAAMwAUsDZwHvAbgBqAGVAf8BrgF0AS0B/wHK - AXkBCwH/AeABlwEXAf8B7AHHAYYB/wH0AeUBzAH/AfQB5QHMAf8B9AHlAcwB/wH0AeUBzAH/AfQB5QHM - Af8B6gHAAXUB/wHgAZcBFwH/ATgBtwHBAf8BRgJHAYAMAANaAb8DZAH/A2MB/wNiAf8DYQH/A9gB/wNk - Af8DXwH/A10B/wOrAf8DXAH/A7kB/wNaAf8DWwH/A1oB/wNZAf8DWAH/A1oBvygAAyYBOANIAYMDYwH2 - Ab4BtAGsAf8BugGwAacB/wNfAdMDBQEGEAAEAQMsAUMDaAH0A/oB/wP5Af8D+QH/AfUB8gHwAf8BvAGu - AdkB/wF7AW4B6wH/AYgBcwG+Af8BtgGnAa0B/wF2AWMBfgH/AWoBYQGUAf8BwwHCAdgB/wP0Af8D8gH/ - A/IB/wNqAfkDQAFvAwUBBggAAxUBHANhAdQBtAGKAVUB/wG1AWwBEgH/AcwBewELAf8B4QGaARkB/wHh - AZoBGQH/AeEBmgEZAf8B4QGaARkB/wHhAZoBGQH/AeEBmgEZAf8B4QGaARkB/wHhAZoBGQH/AeEBmgEZ - Af8BOAG+AcIB/wFGAkcBgAwAA1oBvwNnAf8DZgH/A2UB/wNkAf8DlAH/A8wB/wOWAf8DggH/A10B/wOO - Af8DigH/A14B/wNdAf8DXQH/A1wB/wNbAf8DWgG/LAADCQEMA2gB9AHDAbkBsAH/Ab4BtAGsAf8BugGw - AacB/wNDAXYQAAQBAywBQwNoAfQD+gH/A/oB/wP6Af8D+QH/A/kB/wP4Af8D+AH/A/gB/wP3Af8D9wH/ - A/YB/wP1Af8D8wH/A/MB/wNqAfkDQAFvAwUBBgwAAlUBUwGqAcMBbgEDAf8BxAFuAQMB/wHPAX0BCwH/ - AeMBnQEbAf8B7QHIAYMB/wH0AeEBvgH/AfQB4QG+Af8B9AHhAb4B/wH0AeEBvgH/AfQB4QG+Af8B7AHD - AXYB/wHjAZ0BGwH/AUMBowHAAf8DSQGFDAADWgG/A2kB/wNoAf8DaAH/A2cB/wNmAf8DdAH/A4gB/wNt - Af8DYgH/A5wB/wNfAf8DYQH/A2AB/wNfAf8DXgH/A14B/wNaAb8wAANSAaMByAG9AbQB/wHDAbkBsAH/ - Ab4BtAGsAf8DaAH0AxgBIAwABAEDLAFDA2gB9AP8Af8D+wH/A/sB/wP6Af8D+gH/A/kB/wP5Af8D+AH/ - A/cB/wP3Af8D9gH/A/UB/wP1Af8D9AH/A2oB+QNAAW8DBQEGDAACVQFTAaoBxwFwAQMB/wHGAXABAwH/ - AdABgAEMAf8B5AGgAR0B/wHmAaYBKwH/AecBqwE6Af8B5wGrAToB/wHnAasBOgH/AecBqwE6Af8B5wGr - AToB/wHlAaQBKQH/AeQBnwEdAf8BZAFIAbUB/wFVAlcBtAwAA1oBvwNsAf8DawH/A2oB/wNqAf8DaQH/ - A2gB/wNnAf8DZgH/A2YB/wNlAf8DZAH/A2MB/wNjAf8DYgH/A2EB/wNgAf8DWgG/MAADLgFGAc0BwgG4 - Af8ByAG9AbQB/wHDAbkBsAH/Ab4BtAGsAf8DWQG5DAAEAQMsAUMCUwFoAfQBUgFOAZkB/wFYAVIBkQH/ - AYEBewGkAf8B6AHnAekB/wGaAZEBoAH/AXEBYAFyAf8BeAFkAW0B/wF+AWgBZgH/AYQBawFgAf8BngGK - AXwB/wHgAdsB2AH/Ab4BpwGLAf8BoAF7AUcB/wGgAXsBRwH/AmoBSwH5A0ABbgMFAQYMAAJVAVMBqgHJ - AXIBAgH/AckBcgECAf8B0gGCAQsB/wHlAaIBHwH/AeUBogEfAf8B5QGiAR8B/wHlAaIBHwH/AeUBogEf - Af8B5QGiAR8B/wHlAaIBHwH/AeUBogEfAf8B5QGiAR8B/wFqAU8BuAH/AkYBRwGADAADXwHJA24B/wNu - Af8DbQH/A2wB/wNrAf8DawH/A2oB/wNpAf8DaAH/A2cB/wNnAf8DZgH/A2UB/wNkAf8DZAH/A2MB/wNf - AckwAAQCA2UB4wHNAcIBuAH/AcgBvQG0Af8DaAHwAmQBYAHbAjwBOwFkCAAEAQMlATYDXgHSAmABZgHg - AmABZgHgAWMBWgFjAekDvgH9A2UB7ANiAeEDYgHhA2IB4QNiAeEBaQFmAWAB6AN9AfoDagHtAWYCYAHg - AWMCXQHfAWICXgHXAzgBWwMCAQMMAANVAa0BwgFtAQEB/wHIAXEBAQH/AdUBhAEMAf8B5gGlASEB/wHm - AaUBIQH/AeYBpQEhAf8B5gGlASEB/wHmAaUBIQH/AeYBpQEhAf8B5gGlASEB/wHmAaUBIQH/AeYBpQEg - Af8BcQFWAboB/wFHAUYBRwGADAADYgHcA5QB/wOUAf8DlAH/A5QB/wOUAf8DkwH/A5MB/wOTAf8DkgH/ - A5IB/wORAf8DkQH/A5AB/wOQAf8DjwH/A48B/wNiAdw0AANMAY8DcAHxA2cB7wHcAYoBGwH/Ad8BhAEL - Af8CZwFZAe8DEwEZFAADAgEDAzEBTANjAekDSwGLAysBQgMqAT8DKgE/AyoBQANCAXIDYgHcAz8BbAMD - AQQIARAAAzkBXgHHAcQBwQH/AbwBugG5Af8BuQF/ATQB/wHXAYYBDQH/AecBqAEjAf8B5wGoASMB/wHn - AagBIwH/AecBqAEjAf8B5wGoASMB/wHnAagBIwH/AecBqAEjAf8B5wGoASIB/wHnAacBIgH/AXUBWwG9 - Af8BRwFGAUcBgAwAA1wBvgPMAf8DzAH/A8wB/wPMAf8DzAH/A8wB/wPMAf8DzAH/A8wB/wPMAf8DzAH/ - A8wB/wPMAf8DyAH/A7UB/wOyAf8DXAG+NAADJAE1AegBmAEiAf8B6wGWARwB/wHnAZABFgH/AeQBiwER - Af8B4AGFAQsB/wNVAa0UAAQBAxEBFgNRAZ8DZgHlA2kB6ANpAegDaQHoA2kB6ANlAecDVwG0AyIBMQQB - GAADBwEJAlwBWgHEAb4BfwEuAf8ByQF0AQQB/wHZAYgBDAH/AegBqgElAf8B6AGqASUB/wHoAaoBJQH/ - AegBqgElAf8B6AGqASUB/wHoAaoBJQH/AegBqgEkAf8B6AGqASQB/wHoAaoBJAH/AXkBYgG+Af8DRAF6 - DAADMwFRA1oBugNZAbsDWQG7A1kBuwNZAbsDWQG7A1kBuwNZAbsDWQG7A1kBuwNZAbsDWQG7A1kBuwNZ - AbsDWQG7A1oBugMzAVA4AAJdAVsBxQNiAe4DYgHuA2IB7gNiAe4DYgHuAy4BSBQABAIDGQEiAzwBZgNC - AXQDQgF0A0IBdANCAXQDPwFsAyMBMwMFAQYgAANRAZ4B0gF3AQAB/wHSAXcBAAH/AdoBiQENAf8B6QGt - AScB/wHpAa0BJwH/AekBrQEnAf8B6QGtAScB/wHpAa0BJwH/AekBrQEmAf8B6QGtASYB/wHpAa0BJgH/ - AekBrQEmAf8DTwGZAxEBFsAABAIDBAQFAQYDBQEGAwUBBgMFAQYDBQEGBAIkAAMPARMDMwFSAzkBXgNE - AXsDNQFVAzUBVQM1AVUDNQFVAzUBVQM1AVUDNQFVAzUBVQMrAUEEAf8A/wACAAMMAQ8DOQFfkAADBwEJ - Aw8BFAMQARUDEAEVAxABFQMQARUDEAEVAxABFQMQARUDEAEVAxABFQMQARUDEAEVAwsBDnAAAx4BKwG8 - AVsBGQH/AkEBQAFxjAADMQFMA1EBnQNSAaQDUgGkA1IBpANSAaQDUgGkA1IBpANSAaQDUgGkA1IBpANS - AaQDUgGkA0IBchgAAwoBDQMaASMQAAM3AVoDRAF6A0QBegMOARIwAAMeASsBuwFbARkB/wG7AVsBGQH/ - AkIBQQFyMAADBwEJAz8BbANEAXcDRAF3A0QBdwNEAXcDRAF3A0QBdwNPAZcDTQGTAwQBBSwAA0QBdwNo - AfQD+gH/A/oB/wP6Af8D+gH/A/oB/wP6Af8D+gH/A/oB/wP6Af8D+gH/A/oB/wNXAbIUAAMLAQ4CXQFa - AccCcAFlAfECJwEmATkMAAJhAV0B1AHKAXcBAAH/AccBdgECAf8CfAFcAfgCWQFXAbkDBQEGKAADHgEr - AbsBWwEaAf8BuwFbARkB/wG7AVsBGQH/AkIBQQFzLAADMQFOAdwB2QHWAf8B2QHWAdMB/wHWAdMBzwH/ - AdMB0AHLAf8B0AHMAcgB/wHNAckBxAH/AcwByAHCAf8BpwGgAZcB/wGnAaABlwH/A1YBsCwAA0QBdwNo - AfQD+gH/A/oB/wP6Af8D+gH/A/oB/wP6Af8D+gH/A/oB/wP6Af8D+gH/A/oB/wNXAbIQAAMLAQ4CXQFa - AccB6QGtASYB/wHpAa0BJgH/AnABZQHxAicBJgE5CAACXQFaAccBygF3AQAB/wHFAXIBAAH/Ab4BbAEA - Af8B2gGbAR4B/wJnAV0B6gMIAQoUAAMYASECWgFXAcIDXQHMA10BzAFjAl8B1QG6AVsBGgH/AboBWwEa - Af8BuwFbARoB/wG7AVsBGQH/AWECXQHRA10BzANTAacDXQHMA10BzANdAcwDXQHMAlwBWQHBAxgBIAgA - AzQBUwHfAd0B2gH/AdwB2gHWAf8B2QHWAdMB/wHWAdMBzwH/AdMB0AHMAf8B0AHNAcgB/wHNAckBxAH/ - AcABuwG0Af8BwAG7AbQB/wGDAXwBcwH/AVUBUwFVAaooAANEAXcDaAH0AfgB9QHvAf8B5wHKAZ0B/wHj - AcIBnQH/AeABvAGfAf8B4gHAAaYB/wHqAdUBxQH/AeABuwGfAf8B4AG7AZ8B/wHgAbsBnwH/Ae8B4QHW - Af8D+gH/A1cBsgwAAwYBCANdAcwB6QGvASgB/wHpAa8BJwH/AekBrgEnAf8B6QGuAScB/wJoAVMB9AMk - ATUIAAMKAQ0DMAFKA14B0gG/AXABBgH/Ae4BuQEvAf8CXQFaAccUAAM1AVUBuAFaARsB/wG5AVoBGgH/ - AbkBWgEaAf8BuQFaARoB/wG6AVoBGgH/AboBWwEaAf8BugFbARoB/wG7AVsBGgH/AbsBWwEaAf8BbwFc - AVEB9wJoAV4B8AHsAaQBQgH/AewBpAFCAf8B7AGkAUIB/wHsAaQBQgH/AewBpAFCAf8DNQFVCAADPwFt - AeIB4AHeAf8B3wHdAdoB/wHcAdoB1gH/AdkB1gHTAf8B1gHTAc8B/wHTAdABzAH/AdABzQHIAf8BzQHJ - AcQB/wHMAcgBwgH/A4AB/gE0ASUB2AH/A0ABbyQAA0QBdwNoAfQB8gHmAccB/wHYAZwBKgH/AdABjAEv - Af8ByAF8ATMB/wHIAX8BRQH/AdkBqwGIAf8BwwFzATYB/wG1AWkBQgH/AYYBSwFnAf8BzgGqAaIB/wP6 - Af8DVwGyDAADAgEDAyoBQAI5ATgBXQHqAbABKAH/AeoBsAEoAf8CWAFWAbMDLQFEAxEBFhAAAwkBDANd - AcwB6AGwASoB/wHrAbYBLgH/AyMBMxAAAzUBVQG4AVoBGwH/AbgBWgEbAf8BuQFaARsB/wG5AVoBGgH/ - AbkBWgEaAf8BuQFaARoB/wG6AVoBGgH/AboBWwEaAf8BugFbARoB/wJdAVsBxQHtAaQBQgH/Ae0BpAFC - Af8B7QGkAUIB/wHsAaQBQgH/AewBpAFCAf8B7AGkAUIB/wM1AVUIAAM2AVgDgAH+AcYBngFVAf8BxAGa - AVIB/wHDAZcBUAH/AcEBlAFNAf8BvwGRAUsB/wHAAZABSwH/AcABkQFLAf8DgAH+AboBSAF2Af8BQQEe - AdIB/wOAAf4DOwFjIAADRAF3A2gB9AH1AeoBxgH/AeABqwEnAf8B2AGbASsB/wHPAYsBMAH/AcwBhgFE - Af8B2QGrAYgB/wHDAXMBNgH/AZ0BWQFVAf8BSgEiAZoB/wHCAaIBrAH/A/oB/wNXAbIUAAMdASgB6gGx - ASkB/wHqAbEBKQH/AlQBUwGpHAADJgE4AeMBqAEmAf8B7QG3AS4B/wJVAVMBqhAAAzUBVQG3AVoBGwH/ - AbgBWgEbAf8BvAFjASgB/wG4AVsBHAH/AbkBWgEbAf8BvAFgASMB/wG6AV0BHgH/AboBWgEaAf8BugFb - ARoB/wJdAVsBygHsAaQBQQH/Ae0BpAFCAf8B7QGkAUIB/wHsAaMBQQH/Ae0BpAFCAf8B7AGkAUIB/wM1 - AVUIAAM0AVMB4wGfARwB/wHiAZsBGgH/AeABlwEXAf8B3wGTARQB/wHdAZABEgH/AdwBjAEPAf8B2gGI - AQwB/wHZAYUBCgH/AdkBhQEKAf8B1wE4AWQB/wF+AR8BsgH/ATABIAHlAf8CQAG+Af0DOQFfHAADRAF3 - A2gB9AH3Ae4BxQH/AegBuwEjAf8B3wGqAScB/wHXAZoBLAH/AdIBkwFAAf8B1gGqAYsB/wGkAV4BUAH/ - AYEBRwFsAf8BLwEQAbAB/wG8AZ4BsQH/A/oB/wNXAbIUAAMdASgB6wGyASoB/wHrAbIBKgH/AlQBUwGp - IAACXwEnAfsB7AG2AS0B/wJjAV8B1RAAAzUBVQG3AVoBGwH/AbcBWgEbAf8B5gHFAa8B/wHWAZ8BegH/ - AcoBgwFUAf8B7gHXAcgB/wHEAXQBPgH/AbkBWgEaAf8BbAJhAesCfQFNAfoBrgFkASMB/wHOAYIBMgH/ - AdoBkAE4Af8BoQFTARoB/wHmAZwBPgH/Ae0BpAFCAf8DNQFVCAADNAFTAeUBogEfAf8B4wGfARwB/wHi - AZsBGgH/AeABlwEXAf8B3wGTARQB/wHdAZABEgH/AdwBjAEPAf8B2gGIAQwB/wHZAYUBCgH/AdcBOAFk - Af8BuwEfAZoB/wEvASAB4QH/ATABIAHlAf8BMQEhAV8B+wM0AVQYAANEAXcDaAH0AfkB8wHSAf8B8QHU - AVYB/wHrAcgBWQH/AeUBuwFdAf8B4QG2AWwB/wG+AagBwwH/AWoBUAG8Af8BZQFMAcAB/wFVAUIBzQH/ - AbsBqgHQAf8D+gH/A1cBshQAAx0BKAHrAbQBKwH/AesBswErAf8CVAFTAakgAAJ8AVwB+AHsAbUBLAH/ - AmUBYAHjEAADNQFVAbYBWgEbAf8BtwFaARsB/wHOAY4BYwH/AfEB3wHTAf8B4wG+AaYB/wH1AecB3QH/ - AbgBWgEbAf8BuQFaARsB/wJbAVkBwAHvAaMBQgH/AeUBnAE9Af8BmwFPARgB/wGZAUwBFgH/Ad8BlAE6 - Af8B7QGkAUIB/wHtAaQBQgH/AzUBVQgAAzQBUwHmAaYBIgH/AeUBogEfAf8B4wGfARwB/wHiAZsBGgH/ - AeABlwEXAf8B3wGTARQB/wHdAZABEgH/AdwBjAEPAf8B2gGIAQwB/wHXATgBZAH/AeQBIAGMAf8BRwEh - AdIB/wExASEB5QH/ATABIAHlAf8CTQF9AfoDMwFQFAADRAF3A2gB9AH5AfQB1gH/AfYB3wFZAf8B8gHV - AVUB/wHrAckBWQH/AecBwgFoAf8B6QHNAaEB/wHZAaQBYwH/AdMBmQFmAf8B0QGVAWcB/wHlAcYBrgH/ - A/oB/wNXAbIUAAMdASgB7AG1ASwB/wHsAbUBLAH/AlQBUwGpIAACfAFcAfgB6wGzASsB/wJlAWAB4xAA - AzUBVQG2AVoBHAH/AbYBWgEcAf8BugFgASMB/wHxAd4B0QH/AdEBlgFtAf8B2gGqAYkB/wG4AVoBGwH/ - AbgBWgEbAf8CYgFeAdcB7wGjAUIB/wHhAZUBOwH/AZ0BUgEaAf8BnQFPARgB/wHbAY8BNwH/Ae4BpAFC - Af8B7QGkAUIB/wM1AVUIAAM0AVMB6AGqASQB/wHmAaYBIgH/AeUBogEfAf8B4wGfARwB/wHiAZsBGgH/ - AeABlwEXAf8B3wGTARQB/wHdAZABEgH/AdwBjAEPAf8B1wE5AWQB/wHlASABjAH/AYIBIgG0Af8BNwEo - AecB/wE2ASYB5wH/ATUBJQHnAf8BNQElAV8B+wMfASwQAANEAXcDaAH0AfkB8wHPAf8B7gHVATwB/wHm - AcgBMAH/AdcBsgE2Af8B5AG5ATcB/wHnAcYBggH/AdUBlQEtAf8BzAGFATIB/wHGAXgBNgH/Ad4BtQGW - Af8D+gH/A1cBshQAAwoBDQHsAbUBLQH/AewBtgEtAf8CVwFVAbQgAAJ8AVwB+AHrAbIBKgH/AmUBYAHj - EAADNQFVAbUBWgEcAf8BtgFaARwB/wG2AVoBHAH/AeQBwwGsAf8B9AHlAdsB/wHBAXEBOgH/AbcBWgEb - Af8BYgJdAdwB8AGjAUIB/wHlAZoBPgH/AdQBiAE1Af8ByAF8AS8B/wG6AW0BJwH/AZ4BUAEYAf8B3QGR - ATkB/wHuAaQBQgH/AzUBVQgAAzQBUwHpAa0BJwH/AegBqgEkAf8B5gGmASIB/wHlAaIBHwH/AeMBnwEc - Af8B4gGbARoB/wHgAZcBFwH/Ad8BkwEUAf8B3QGQARIB/wHYAToBZQH/AeUBIAGMAf8BvwEiAZoB/wE7 - AS0B5QH/ATsBLAHpAf8BOgErAekB/wJgAWkB6AMTARkQAANEAXcDaAH0AfkB9AHVAf8BrgGcAYYB/wG2 - AaEBcgH/AZsBggF+Af8BxwGnAVkB/wHrAc8BfwH/AdwBpAEpAf8B1AGTAS4B/wHLAYMBMgH/AeABuAGV - Af8D+gH/A1cBshgAAmoBQQH5Ae0BtwEuAf8CZgFgAeAgAAJ8AVwB+AHqAbEBKQH/AmUBYAHjEAADNQFV - AbUBWQEcAf8BtQFZARwB/wG2AVoBHAH/AcsBiwFfAf8B7QHXAcgB/wG2AVoBGwH/AbcBWgEbAf8CWwFZ - AcAB8AGjAUIB/wHeAZEBOQH/AboBbgEoAf8BrwFiASIB/wGiAVMBGgH/AbEBYwEiAf8BywF+ATAB/wHu - AaQBQgH/AzUBVQgAAzQBUwHrAbEBKgH/AekBrQEnAf8B6AGqASQB/wHmAaYBIgH/AeUBogEfAf8B4wGf - ARwB/wHiAZsBGgH/AeABlwEXAf8B3wGTARQB/wHZAT8BagH/AeYBIgGOAf8B5AEgAYwB/wFRATAB1wH/ - AUEBMwHrAf8CYAFpAegDIAEuFAADRAF3A2gB9AH4AfYB3QH/AW4BXwHQAf8BcAFgAcQB/wGJAXYBmAH/ - AXwBagGwAf8B7wHXAX0B/wHkAbMBJQH/AdsBogEqAf8B0wGSAS8B/wHjAb8BlAH/A/oB/wNXAbIYAAJc - AVkBwQHtAbgBLwH/AdABjAEXAf8DPgFrFAADHQEoAyMBMwJoAVMB9AHqAbABKAH/AmMBXQHfAyMBMwMX - AR8IAAM1AVUBtAFZARwB/wG1AVkBHAH/AbUBWQEcAf8BtQFaARwB/wG2AVoBHAH/AbYBWgEcAf8BtgJA - Af0CZgFfAeUB8AGjAUIB/wHwAaMBQgH/AfABowFCAf8B5wGbAT4B/wHcAZABOAH/Ae8BowFCAf8B7wGj - AUIB/wHvAaMBQgH/AzUBVQgAAzQBUwHsAbUBLAH/AesBsQEqAf8B6QGtAScB/wHoAaoBJAH/AeYBpgEi - Af8B5QGiAR8B/wHjAZ8BHAH/AeIBmwEaAf8B4AGXARcB/wHbAUQBbQH/AecBJwGTAf8B5gEjAZAB/wGN - ASsBtQH/Al4BZQHiAxsBJhgAA0QBdwNoAfQB+gH5AfQB/wHGAcEB8gH/AbwBtwH3Af8BzwHJAd4B/wHF - AcAB6wH/AfcB8AHOAf8B9AHkAa8B/wHxAd4BsAH/Ae4B2AGyAf8B9AHqAdwB/wP6Af8DVwGyGAADFwEf - Ab4BsQFAAf0B3AGeASEB/wOAAf4DTAGQAx0BKQMIAQoIAANOAZUB6QGuAScB/wHpAa4BJwH/AekBrgEn - Af8B6QGvAScB/wHpAa8BKAH/Az4BaggAAzUBVQG0AVkBHQH/AbQBWQEcAf8BtQFZARwB/wG1AVkBHAH/ - AbUBWQEcAf8BtQFaARwB/wJeAVsBzQHxAaMBQgH/AfEBowFCAf8B8AGjAUIB/wHwAaMBQgH/AfABowFC - Af8B8AGjAUIB/wHvAaMBQgH/Ae8BowFCAf8B7wGjAUIB/wM1AVUIAAMvAUkB7gG4AS8B/wHsAbUBLAH/ - AesBsQEqAf8B6QGtAScB/wHoAaoBJAH/AeYBpgEiAf8B5QGiAR8B/wHjAZ8BHAH/AeIBmwEaAf8B3AFD - AXYB/wHpASwBmAH/AecBKAGWAf8DYgHuAxoBIxwAA0QBdwNoAfQD+gH/A/oB/wP6Af8D+gH/A/oB/wP6 - Af8D+gH/AekC6gH/AdIB0wHUAf8B1AHVAdYB/wHUAdUB1gH/A1UBqhwAAjsBOgFiA4AB/gHGAXgBCgH/ - AcEBbgEAAf8BxwF0AQAB/wHLAXgBAAH/AzkBXwQAAwMBBAJUAVMBqQHoAa0BJgH/AekBrQEmAf8B6QGt - ASYB/wNGAX4MAAM0AVMBswFZAR0B/wG0AVkBHQH/AbQBWQEdAf8BtAFZARwB/wG1AVkBHAH/AbUBWQEc - Af8CXQFbAcUB8QGjAUIB/wHxAaMBQgH/AfEBowFCAf8B8QGjAUIB/wHwAaMBQgH/AfABowFCAf8B8AGj - AUIB/wHwAaMBQgH/Ae8BowFCAf8DNAFTCAADBQEGAjwBOwFkAkQBQwF3A0UBfAF9AXUBaQH6AeIBcQFn - Af8B4AFtAWUB/wHfAWoBYwH/Ad4BaAFfAf8B3QFbAWgB/wHNATUBpQH/AZsBOQG8Af8BYwFdAWMB3wMW - AR0gAANEAXcDaAH0A/oB/wP6Af8D+gH/A/oB/wP6Af8D+gH/A/oB/wLrAewB/wLrAewB/wN+AfwDXAHE - AxYBHSAAAywBQwNiAeEBzQGDAQ0B/wHHAXQBAAH/AcsBeAEAAf8DPgFrCAADAwEEAlQBUwGpAegBrAEl - Af8DRgF+EAADEAEVAlQBUgGoA1kBuwNZAbsDWQG7A1kBuwJZAVcBuQJXAVUBtANZAbsDWQG7A1kBuwNZ - AbsDWQG7A1kBuwNZAbsDWQG7AlQBUgGoAw8BFBgAAVMBUQFTAaIB8QFHAbQB/wOAAf4BXwFcAV8ByAFC - AUEBQgFyAzkBXgJcAXwB+AJbAV0BygMOARIkAANEAXcDaAH0A/oB/wP6Af8D+gH/A/oB/wP6Af8D+gH/ - A/oB/wLrAewB/wN9AfoDVgGwAxQBGywAAyoBPwNHAYICRwFGAYADHQEoDAAEAgMgAS10AAMWAR0DPwFs - AxgBIAwAAxMBGQMEAQUoAANEAXcDaAH0A/oB/wP6Af8D+gH/A/oB/wP6Af8D+gH/A/oB/wN9AfoDVAGp - AxwBJ/8AEQADKQE+A0cBgANJAYYDSQGGA0kBhgNJAYYDSQGGA0kBhgNJAYYDQQFwAxsBJQQC/wBVAAFC - AU0BPgcAAT4DAAEoAwABUAMAAVADAAEBAQABAQUAAcABAxYAA//xAAr/AgAK/wIAAYABAAEcAQABAwH4 - AQED/wIAAYABAAEYAQABAQH4AQED/wIAAYABAAEYAQABAQH4AQED/wIAAYABAAEYAQABAQIAAQ8C/wIA - AYABAAEYAQABAQIAAQ8C/wIAAYABAAEYAQABAQIAAQ8C/wIAAYABAAEYAQABAQIAAQwBMAHDAgABgAEA - ARgBAAEBAYABAAEcATABwwIAAYABAAEYAQABAQHCAQQBPAEwAcMCAAGAAQABGAEAAQEBgAEAARwBMAHD - AgABgAEAARgBAAEBAYABAAEfAv8CAAGAAQABGAEAAQEBgAEAAR8C/wIAAYABAAEYAQABAQGAAQABHwL/ - AgABgAEAARgBAAEBAcMBDAE/Av8CAAGAAT8B+AEAAQEB8wH/AT8C/wIAAYABfwH8AQABAwX/AgAK/wIA - Cv8CAAr/AgAC/wH4AQABAQHgAQABfwL/AwABDwH4AgAB4AEAAT8C/wIAAfgBBwHwAgABwAEAATgBAAEB - AgAB/AEDAfACAAHAAQABOAEAAQECAAH+AQMB8AIAAeABAAE4AQABAQIAAf4BAQHwAgAB4AEAATgBAAEB - AgAB/gEBAfACAAHgAQABOAEAAQECAAH+AQMB8AIAAeABAAE4AQABAQIAAf8BAQHwAgABwAEAATgBAAEB - AgAB/wGAAfACAAHAAQABOAEAAQECAAH/AcAB8AIAAeABAAE4AQABAQIAAf8B4AFwAgAB4AEAATgBAAEB - AgAB/wHgAXACAAHgAQABOAEAAQECAAH/AeABMAIAAeABAAE4AQABAQIAAf8B8AEfAQABAwHAAQABOAEA - AQECAAH/AfABHwEAAQ8BwAEAATgBAAEBAgAB/wH4AQ8BgAEfAeABAAE/Av8CAAP/AcABPwHgAQABfwL/ - AgAK/wIAA/8BnwP/Af4BAAEHAgAD/wGPA/8B/gEAAQcCAAHnAYcB/wGHAf8BgAEPAf4BAAEHAgABwwGB - Af8BgwH/AYABDwH+AQABBwIAAYEBgAH4AQABAQGAAQcB/gEAAQcDAAHAAfgBAAEBAYABAwH+AQABBwMA - AfABeAEAAQEBgAEBAf4BAAEHAgABwwH4AXgBAAEBAYABAAH+AQABBwIAAcMB/AF4AQABAQGAAQABfgEA - AQcCAAHDAfwBeAEAAQEBgAEAAT4BAAEHAgABwwH8AXgBAAEBAYABAAEeAQABBwIAAcMB/AF4AQABAQGA - AQABHgEAAQcCAAHjAfwBeAEAAQEBgAEAAT4BAAEHAgAB4QHwARgBAAEBAYABAAF+AQABBwIAAeABMAEY - AQABAQGAAQAB/gEAAQcCAAHwARABOAEAAQEBgAEBAf4BAAEHAgAB+AEYAXgBAAEBAfgBAwH+AQABDwIA - Af4BHAP/AfgB5wH+AQABHwIAB/8B/gEAAR8CAAr/AgAL - - - \ No newline at end of file diff --git a/WinPaletter/Forms.cs b/WinPaletter/Forms.cs index 1b60f5da..a8d8d943 100644 --- a/WinPaletter/Forms.cs +++ b/WinPaletter/Forms.cs @@ -1225,7 +1225,7 @@ public static MainFrm MainFrm } else { - m_FormBeingCreated = new Hashtable(); + m_FormBeingCreated = new(); } m_FormBeingCreated.Add(typeof(T), null); try diff --git a/WinPaletter/GUI/Elements/AdvancedControls/ColorItem.cs b/WinPaletter/GUI/Elements/AdvancedControls/ColorItem.cs index a15b4999..ea4e1084 100644 --- a/WinPaletter/GUI/Elements/AdvancedControls/ColorItem.cs +++ b/WinPaletter/GUI/Elements/AdvancedControls/ColorItem.cs @@ -9,32 +9,33 @@ namespace WinPaletter.UI.Controllers { - [DefaultEvent("Click")] public class ColorItem : Panel { public ColorItem() { - Rect = new Rectangle(0, 0, Width - 1, Height - 1); - RectInner = new Rectangle(1, 1, Width - 3, Height - 3); - Rect_DefColor = new Rectangle(0, 0, Height, Height); - Timer1 = new Timer() { Enabled = false, Interval = 1 }; - Timer2 = new Timer() { Enabled = false, Interval = 1 }; - SetStyle(ControlStyles.AllPaintingInWmPaint | ControlStyles.UserPaint | ControlStyles.ResizeRedraw, true); + SetStyle(ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor | ControlStyles.ResizeRedraw, true); DoubleBuffered = true; + BackColor = Color.Transparent; + + Rect = new(0, 0, Width - 1, Height - 1); + RectInner = new(1, 1, Width - 3, Height - 3); + Rect_DefColor = new(0, 0, Height, Height); + Timer2 = new() { Enabled = false, Interval = 1 }; + + alpha = 0; + Timer2_factor = 0; + Text = string.Empty; ColorsHistory.Clear(); - MouseEnter += ColorItem_MouseEnter; - MouseLeave += ColorItem_MouseLeave; - HandleCreated += ColorItem_HandleCreated; - Timer1.Tick += Timer1_Tick; Timer2.Tick += Timer2_Tick; } #region Variables + private bool CanAnimate => !DesignMode && Program.Style.Animations && this != null && Visible && Parent != null && Parent.Visible && FindForm() != null && FindForm().Visible; public bool ColorPickerOpened = false; - public List ColorsHistory = new List(); + public List ColorsHistory = new(); private Color LineColor; public bool PauseColorsHistory = false; @@ -53,8 +54,8 @@ public enum MouseState #endregion - #region Properties - public Color DefaultColor { get; set; } = Color.Black; + #region Properties + public Color DefaultBackColor { get; set; } = Color.Black; public bool DontShowInfo { get; set; } = false; [Browsable(true)] @@ -65,6 +66,23 @@ public enum MouseState [DefaultValue("")] public override string Text { get; set; } = string.Empty; + protected override CreateParams CreateParams + { + get + { + CreateParams cpar = base.CreateParams; + if (!DesignMode) + { + cpar.ExStyle |= 0x20; + return cpar; + } + else + { + return cpar; + } + } + } + #endregion #region Drag and drop @@ -129,14 +147,14 @@ protected override void OnDragDrop(DragEventArgs e) } else { - BackColor = ((ColorItem)e.Data.GetData(GetType().FullName)).DefaultColor; + BackColor = ((ColorItem)e.Data.GetData(GetType().FullName)).DefaultBackColor; } } else { e.Effect = DragDropEffects.Link; - var Color_From = ((ColorItem)e.Data.GetData(GetType().FullName)).BackColor; + Color Color_From = ((ColorItem)e.Data.GetData(GetType().FullName)).BackColor; Color Color_To; switch (AfterDropEffect) @@ -342,7 +360,7 @@ protected override void OnDragEnter(DragEventArgs e) } else { - DraggedColor = ((ColorItem)e.Data.GetData(GetType().FullName)).DefaultColor; + DraggedColor = ((ColorItem)e.Data.GetData(GetType().FullName)).DefaultBackColor; } switch (AfterDropEffect) @@ -418,7 +436,7 @@ protected override void OnDragEnter(DragEventArgs e) if (Program.Settings.NerdStats.DragAndDropColorsGuide) { - Forms.ColorInfoDragDrop.Location = new Point(e.X + 15, e.Y + 15); + Forms.ColorInfoDragDrop.Location = new(e.X + 15, e.Y + 15); Forms.ColorInfoDragDrop.Visible = true; } } @@ -450,7 +468,7 @@ protected override void OnDragOver(DragEventArgs e) DragDropMouseHovering = true; Refresh(); base.OnDragOver(e); - Forms.ColorInfoDragDrop.Location = new Point(e.X + 15, e.Y + 15); + Forms.ColorInfoDragDrop.Location = new(e.X + 15, e.Y + 15); } else { @@ -487,16 +505,25 @@ public Size GetMiniColorItemSize() public bool CanRaiseEventsForDefColorDot() { - return Program.Settings.NerdStats.DotDefaultChangedIndicator && Rect_DefColor.Contains(PointToClient(MousePosition)) && BackColor != DefaultColor; + return Program.Settings.NerdStats.DotDefaultChangedIndicator && Rect_DefColor.Contains(PointToClient(MousePosition)) && BackColor != DefaultBackColor; } #endregion #region Events + protected override void OnSizeChanged(EventArgs e) + { + Rect = new(0, 0, Width - 1, Height - 1); + RectInner = new(1, 1, Width - 3, Height - 3); + Rect_DefColor = new(0, 0, Height, Height); + + base.OnSizeChanged(e); + } protected override void OnBackColorChanged(EventArgs e) { UpdateColorsHistory(); + base.OnBackColorChanged(e); } @@ -505,9 +532,10 @@ protected override void OnMouseDown(MouseEventArgs e) mousePosition_beforeDrag = MousePosition; InitializeDrag = Program.Settings.NerdStats.DragAndDrop; State = MouseState.Down; - Timer1.Enabled = true; - Timer1.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } + base.OnMouseDown(e); } @@ -515,100 +543,50 @@ protected override void OnMouseUp(MouseEventArgs e) { InitializeDrag = false; State = MouseState.Over; - Timer1.Enabled = true; - Timer1.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } base.OnMouseUp(e); } - private void ColorItem_MouseEnter(object sender, EventArgs e) + protected override void OnMouseEnter(EventArgs e) { State = MouseState.Over; - Timer1.Enabled = true; - Timer1.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } + + base.OnMouseEnter(e); } - private void ColorItem_MouseLeave(object sender, EventArgs e) + protected override void OnMouseLeave(EventArgs e) { InitializeDrag = false; HoverOverDefColorDot = false; State = MouseState.None; - Timer1.Enabled = true; - Timer1.Start(); - Invalidate(); - } - private void ColorItem_HandleCreated(object sender, EventArgs e) - { - alpha = 0; - Timer2_factor = 0; - } + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } - protected override void OnSizeChanged(EventArgs e) - { - Rect = new Rectangle(0, 0, Width - 1, Height - 1); - RectInner = new Rectangle(1, 1, Width - 3, Height - 3); - Rect_DefColor = new Rectangle(0, 0, Height, Height); - base.OnSizeChanged(e); + base.OnMouseLeave(e); } #endregion - #region Animators - private int alpha; - private readonly int Factor = 15; - private Timer Timer1, Timer2; - private int Timer2_factor = 0; + #region Animator + private int _alpha = 0; - private void Timer1_Tick(object sender, EventArgs e) + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)] + public int alpha { - if (!DesignMode) - { - - if (State == MouseState.Over) - { - if (alpha + Factor <= 255) - { - alpha += Factor; - } - else if (alpha + Factor > 255) - { - alpha = 255; - Timer1.Enabled = false; - Timer1.Stop(); - } - - if (!Timer2.Enabled) - { - System.Threading.Thread.Sleep(1); - Refresh(); - } - } - - if (!(State == MouseState.Over)) - { - if (alpha - Factor >= 0) - { - alpha -= Factor; - } - else if (alpha - Factor < 0) - { - alpha = 0; - Timer1.Enabled = false; - Timer1.Stop(); - } - - if (!Timer2.Enabled) - { - System.Threading.Thread.Sleep(1); - Refresh(); - } - } - } + get => _alpha; + set { _alpha = value; Refresh(); } } + private Timer Timer2; + private int Timer2_factor = 0; + private void Timer2_Tick(object sender, EventArgs e) { if (!DesignMode && MakeAfterDropEffect) @@ -630,180 +608,160 @@ private void Timer2_Tick(object sender, EventArgs e) protected override void OnPaint(PaintEventArgs e) { - base.OnPaint(e); - var G = e.Graphics; + if (this == null) return; + + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; DoubleBuffered = true; - int R = 5; + //Makes background drawn properly, and transparent + InvokePaintBackground(this, e); G.Clear(this.GetParentColor()); - switch (State) + if (Enabled) { - case MouseState.None: + using (Config.Colors_Collection colors = new(BackColor, default, BackColor.IsDark())) + { + switch (State) { - LineColor = base.BackColor.IsDark() ? base.BackColor.CB(0.05f) : base.BackColor.CB((float)-0.05d); - break; - } + case MouseState.None: + { + LineColor = Color.FromArgb(255, colors.Accent); + break; + } - case MouseState.Over: - { - LineColor = base.BackColor.IsDark() ? base.BackColor.CB(0.15f) : base.BackColor.CB((float)-0.15d); - break; - } + case MouseState.Over: + { + LineColor = Color.FromArgb(255, colors.Line_Checked_Hover); + break; + } - case MouseState.Down: - { - LineColor = base.BackColor.IsDark() ? base.BackColor.CB(0.1f) : base.BackColor.CB((float)-0.1d); - break; + case MouseState.Down: + { + LineColor = Color.FromArgb(255, colors.Line_Checked); + break; + } } - - } - - LineColor = Color.FromArgb(255, LineColor); - - if (BackColor.A < 255) - { - using (var br = new TextureBrush(Properties.Resources.BackgroundOpacity)) - { - G.FillRoundedRect(br, RectInner, R); - } - using (var br = new TextureBrush(Properties.Resources.BackgroundOpacity.Fade(alpha / 255d))) - { - G.FillRoundedRect(br, Rect, R); } - } - if (!DesignMode && MakeAfterDropEffect && Program.Settings.NerdStats.DragAndDropRippleEffect) - { - // Make ripple effect on dropping a color - - using (SolidBrush br = new(BeforeDropColor)) + if (BackColor.A < 255) { - G.FillRoundedRect(br, RectInner, R); + using (TextureBrush br = new(Properties.Resources.BackgroundOpacity)) { G.FillRoundedRect(br, RectInner); } + + using (TextureBrush br = new(Properties.Resources.BackgroundOpacity.Fade(alpha / 255d))) { G.FillRoundedRect(br, Rect); } } - GraphicsPath path = Program.Style.RoundedCorners ? RectInner.Round(R) : new GraphicsPath(); - if (!Program.Style.RoundedCorners) { path.AddRectangle(RectInner); } + if (!DesignMode && MakeAfterDropEffect && Program.Settings.NerdStats.DragAndDropRippleEffect) { - var reg = new Region(path); - G.Clip = reg; - int i = Math.Max(Width, Height) + Timer2_factor; - var px = BeforeDropMousePosition; - var MouseCircle = new Rectangle((int)Math.Round(px.X - 0.5d * i), (int)Math.Round(px.Y - 0.5d * i), i, i); - var gp = new GraphicsPath(); - gp.AddEllipse(MouseCircle); - var pgb = new PathGradientBrush(gp) + // Make ripple effect on dropping a color + + using (SolidBrush br = new(BeforeDropColor)) + { + G.FillRoundedRect(br, RectInner); + } + + GraphicsPath path = Program.Style.RoundedCorners ? RectInner.Round(Program.Style.Radius) : new GraphicsPath(); + if (!Program.Style.RoundedCorners) { path.AddRectangle(RectInner); } { - CenterPoint = px, - CenterColor = BackColor, - SurroundColors = new Color[] { Color.Transparent } - }; - G.FillEllipse(pgb, MouseCircle); + Region reg = new(path); + G.Clip = reg; + int i = Math.Max(Width, Height) + Timer2_factor; + Point px = BeforeDropMousePosition; + Rectangle MouseCircle = new((int)Math.Round(px.X - 0.5d * i), (int)Math.Round(px.Y - 0.5d * i), i, i); + GraphicsPath gp = new(); + gp.AddEllipse(MouseCircle); + PathGradientBrush pgb = new(gp) + { + CenterPoint = px, + CenterColor = BackColor, + SurroundColors = new Color[] { Color.Transparent } + }; + G.FillEllipse(pgb, MouseCircle); - G.ResetClip(); + G.ResetClip(); - if (i / 2d > Width * Height) + if (i / 2d > Width * Height) + { + Timer2.Enabled = false; + Timer2.Stop(); + Timer2_factor = 0; + MakeAfterDropEffect = false; + Invalidate(); + } + } + path.Dispose(); + + using (Pen P = new(LineColor)) { - Timer2.Enabled = false; - Timer2.Stop(); - Timer2_factor = 0; - MakeAfterDropEffect = false; - Invalidate(); + G.DrawRoundedRect_LikeW11(P, RectInner); } } - path.Dispose(); - using (Pen P = new(LineColor)) + else if (!DesignMode && DragDropMouseHovering && Program.Settings.NerdStats.DragAndDropRippleEffect) { - G.DrawRoundedRect_LikeW11(P, RectInner, R); - } - } + // Make circle hover effect on dragging over a color - else if (!DesignMode && DragDropMouseHovering && Program.Settings.NerdStats.DragAndDropRippleEffect) - { - // Make circle hover effect on dragging over a color + using (SolidBrush br = new(BackColor)) { G.FillRoundedRect(br, Rect); } - using (SolidBrush br = new(BackColor)) - { - G.FillRoundedRect(br, Rect, R); - } - - using (var path = Rect.Round(R)) - { - var reg = new Region(path); - G.Clip = reg; - int i = Math.Max(Width, Height); - var px = PointToClient(MousePosition); - var MouseCircle = new Rectangle((int)Math.Round(px.X - 0.5d * i), (int)Math.Round(px.Y - 0.5d * i), i, i); - var gp = new GraphicsPath(); - gp.AddEllipse(MouseCircle); - var pgb = new PathGradientBrush(gp) + using (GraphicsPath path = Rect.Round(Program.Style.Radius)) { - CenterPoint = px, - CenterColor = DraggedColor, - SurroundColors = new Color[] { Color.Transparent } - }; - G.FillEllipse(pgb, MouseCircle); - G.ResetClip(); + Region reg = new(path); + G.Clip = reg; + int i = Math.Max(Width, Height); + Point px = PointToClient(MousePosition); + Rectangle MouseCircle = new((int)Math.Round(px.X - 0.5d * i), (int)Math.Round(px.Y - 0.5d * i), i, i); + GraphicsPath gp = new(); + gp.AddEllipse(MouseCircle); + PathGradientBrush pgb = new(gp) + { + CenterPoint = px, + CenterColor = DraggedColor, + SurroundColors = new Color[] { Color.Transparent } + }; + G.FillEllipse(pgb, MouseCircle); + G.ResetClip(); + } + + using (Pen P = new(base.BackColor.IsDark() ? Color.White : Color.Black, 1.5f) { DashStyle = DashStyle.Dot }) { G.DrawRoundedRect_LikeW11(P, Rect); } } - using (Pen P = new(base.BackColor.IsDark() ? Color.White : Color.Black, 1.5f) { DashStyle = DashStyle.Dot }) + else { - G.DrawRoundedRect_LikeW11(P, Rect, R); - } - } + // Normal appearance - else - { - // Normal appearance + using (SolidBrush br = new(BackColor)) { G.FillRoundedRect(br, RectInner); } - using (SolidBrush br = new(BackColor)) - { - G.FillRoundedRect(br, RectInner, R); - } - using (SolidBrush br = new(Color.FromArgb((int)Math.Round(alpha / 255d * BackColor.A), BackColor))) - { - G.FillRoundedRect(br, Rect, R); - } + using (SolidBrush br = new(Color.FromArgb((int)Math.Round(alpha / 255d * BackColor.A), BackColor))) { G.FillRoundedRect(br, Rect); } - using (Pen P = new(Color.FromArgb(alpha, LineColor))) - { - G.DrawRoundedRect_LikeW11(P, Rect, R); - } - using (Pen P = new(Color.FromArgb(255 - alpha, LineColor))) - { - G.DrawRoundedRect_LikeW11(P, RectInner, R); + using (Pen P = new(Color.FromArgb((int)Math.Round((255 - alpha) / 255d * BackColor.A), LineColor))) { G.DrawRoundedRect_LikeW11(P, RectInner); } + + using (Pen P = new(Color.FromArgb((int)Math.Round(alpha / 255d * BackColor.A), LineColor))) { G.DrawRoundedRect_LikeW11(P, Rect); } } - } - try - { - if (!DesignMode && Program.Settings.NerdStats.DotDefaultChangedIndicator) + try { - using (SolidBrush br = new(DefaultColor)) + if (!DesignMode && Program.Settings.NerdStats.DotDefaultChangedIndicator) { + using (SolidBrush br = new(DefaultBackColor)) + { + int L = Math.Max(6, RectInner.Height - 10); + int Y = (int)Math.Round(RectInner.Y + (RectInner.Height - L) / 2d); + Rectangle DefDotRect; - int L = Math.Max(6, RectInner.Height - 10); - int Y = (int)Math.Round(RectInner.Y + (RectInner.Height - L) / 2d); - Rectangle DefDotRect; + if (!HoverOverDefColorDot) { DefDotRect = new(Y, Y, L, L); } + else { DefDotRect = new(Y - 1, Y - 1, L + 2, L + 2); } - if (!HoverOverDefColorDot) - { - DefDotRect = new Rectangle(Y, Y, L, L); - } - else - { - DefDotRect = new Rectangle(Y - 1, Y - 1, L + 2, L + 2); + G.FillEllipse(br, DefDotRect); } - - G.FillEllipse(new SolidBrush(DefaultColor), DefDotRect); } } + catch { } } - catch + + else { + G.FillRoundedRect(Program.Style.Schemes.Disabled.Brushes.Back, RectInner); } if (!DesignMode) @@ -812,17 +770,16 @@ protected override void OnPaint(PaintEventArgs e) { G.TextRenderingHint = DesignMode ? TextRenderingHint.ClearTypeGridFit : TextRenderingHint.SystemDefault; - var TargetColor = !HoverOverDefColorDot | !Program.Settings.NerdStats.DotDefaultChangedIndicator ? BackColor : DefaultColor; - var FC0 = TargetColor.IsDark() ? LineColor.LightLight() : LineColor.Dark(0.9f); - var FC1 = TargetColor.IsDark() ? LineColor.LightLight() : LineColor.Dark(0.9f); + Color TargetColor = Enabled ? (!HoverOverDefColorDot | !Program.Settings.NerdStats.DotDefaultChangedIndicator ? BackColor : DefaultBackColor) : Program.Style.Schemes.Disabled.Colors.Line; + Color FC0 = TargetColor.IsDark() ? LineColor.LightLight() : LineColor.Dark(0.9f); + Color FC1 = TargetColor.IsDark() ? LineColor.LightLight() : LineColor.Dark(0.9f); FC0 = Color.FromArgb(Program.Settings.NerdStats.MoreLabelTransparency ? 75 : 125, FC0); FC1 = Color.FromArgb(alpha, FC1); - var RectX = Rect; - RectX.Y += 1; + Rectangle RectX = Rect; RectX.Y += 1; - var CF = ColorsExtensions.ColorFormat.HEX; + ColorsExtensions.ColorFormat CF = ColorsExtensions.ColorFormat.HEX; if (Program.Settings.NerdStats.Type == Settings.Structures.NerdStats.Formats.HEX) CF = ColorsExtensions.ColorFormat.HEX; if (Program.Settings.NerdStats.Type == Settings.Structures.NerdStats.Formats.RGB) @@ -832,44 +789,25 @@ protected override void OnPaint(PaintEventArgs e) if (Program.Settings.NerdStats.Type == Settings.Structures.NerdStats.Formats.Dec) CF = ColorsExtensions.ColorFormat.Dec; - string S = TargetColor.ReturnFormat(CF, Program.Settings.NerdStats.ShowHexHash, !(TargetColor.A == 255)); + string S = Enabled ? TargetColor.ReturnFormat(CF, Program.Settings.NerdStats.ShowHexHash, !(TargetColor.A == 255)) : Program.Lang.Disabled; - Font F; - - if (!Program.Settings.NerdStats.UseWindowsMonospacedFont) - { - F = Fonts.Console; - } - else - { - F = new Font(FontFamily.GenericMonospace.Name, 8.5f, FontStyle.Regular); - } + Font F = Program.Settings.NerdStats.UseWindowsMonospacedFont ? new Font(FontFamily.GenericMonospace.Name, 8.5f, FontStyle.Regular) : Fonts.Console; - using (SolidBrush br = new(FC0)) + using (StringFormat sf = ContentAlignment.MiddleCenter.ToStringFormat()) { - G.DrawString(S, F, br, RectX, ContentAlignment.MiddleCenter.ToStringFormat()); - } - using (SolidBrush br = new(FC1)) - { - G.DrawString(S, F, br, RectX, ContentAlignment.MiddleCenter.ToStringFormat()); + using (SolidBrush br = new(FC0)) { G.DrawString(S, F, br, RectX, sf); } + using (SolidBrush br = new(FC1)) { G.DrawString(S, F, br, RectX, sf); } } - if (ColorPickerOpened) + using (StringFormat sf = ContentAlignment.MiddleRight.ToStringFormat()) { - using (SolidBrush br = new(FC0)) - { - G.DrawString("▼", F, br, new Rectangle(RectX.X, RectX.Y, RectX.Width - 5, RectX.Height), ContentAlignment.MiddleRight.ToStringFormat()); - } - using (SolidBrush br = new(FC1)) - { - G.DrawString("▼", F, br, new Rectangle(RectX.X, RectX.Y, RectX.Width - 5, RectX.Height), ContentAlignment.MiddleRight.ToStringFormat()); - } + using (SolidBrush br = new(FC0)) { G.DrawString(ColorPickerOpened ? "▼" : string.Empty, F, br, new Rectangle(RectX.X, RectX.Y, RectX.Width - 5, RectX.Height), sf); } + using (SolidBrush br = new(FC1)) { G.DrawString(ColorPickerOpened ? "▼" : string.Empty, F, br, new Rectangle(RectX.X, RectX.Y, RectX.Width - 5, RectX.Height), sf); } } } } + base.OnPaint(e); } - } - } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/AdvancedControls/CursorControl.cs b/WinPaletter/GUI/Elements/AdvancedControls/CursorControl.cs index ae70aa38..c8f0a8e5 100644 --- a/WinPaletter/GUI/Elements/AdvancedControls/CursorControl.cs +++ b/WinPaletter/GUI/Elements/AdvancedControls/CursorControl.cs @@ -1,4 +1,5 @@ using System; +using System.ComponentModel; using System.Drawing; using System.Drawing.Imaging; using System.IO; @@ -8,26 +9,20 @@ namespace WinPaletter.UI.Controllers { - public class CursorControl : ContainerControl { - public CursorControl() { - Timer = new Timer() { Enabled = false, Interval = 1 }; - MouseEnter += CursorControl_MouseEnter; - MouseLeave += CursorControl_MouseLeave; - Click += CursorControl_Click; - Timer.Tick += Timer_Tick; - + SetStyle(ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor | ControlStyles.ResizeRedraw, true); + DoubleBuffered = true; + BackColor = Color.Transparent; } #region Variables + private bool CanAnimate => !DesignMode && Program.Style.Animations && this != null && Visible && Parent != null && Parent.Visible && FindForm() != null && FindForm().Visible; - public bool _Focused = false; private Bitmap bmp; public float Angle = 180f; - private bool AnimateOnClick = false; public MouseState State = MouseState.None; @@ -41,6 +36,9 @@ public enum MouseState #endregion #region Properties + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)] + public new Color BackColor { get => Color.Transparent; set {; } } + public string Prop_File { get; set; } = string.Empty; public bool Prop_UseFromFile { get; set; } = false; public Paths.CursorType Prop_Cursor { get; set; } = Paths.CursorType.Arrow; @@ -83,118 +81,151 @@ public enum MouseState public float Prop_Scale { get; set; } = 1f; + + private bool _focused = false; + public bool Focused + { + get => _focused; + set + { + if (_focused != value) + { + _focused = value; + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha2), _focused ? 255 : 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha2 = _focused ? 255 : 0; } + } + } + } + + protected override CreateParams CreateParams + { + get + { + CreateParams cpar = base.CreateParams; + if (!DesignMode) + { + cpar.ExStyle |= 0x20; + return cpar; + } + else + { + return cpar; + } + } + } #endregion #region Events protected override void OnMouseDown(MouseEventArgs e) { - AnimateOnClick = true; - _Focused = true; + Focused = true; State = MouseState.Down; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } + base.OnMouseDown(e); } + protected override void OnSizeChanged(EventArgs e) + { + if (CanAnimate) Invalidate(); + + base.OnSizeChanged(e); + } + + protected override void OnLocationChanged(EventArgs e) + { + if (CanAnimate) Invalidate(); + + base.OnLocationChanged(e); + } + protected override void OnMouseUp(MouseEventArgs e) { State = MouseState.Over; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } + + base.OnMouseUp(e); } - private void CursorControl_MouseEnter(object sender, EventArgs e) + protected override void OnMouseEnter(EventArgs e) { State = MouseState.Over; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } + + base.OnMouseEnter(e); } - private void CursorControl_MouseLeave(object sender, EventArgs e) + protected override void OnMouseLeave(EventArgs e) { State = MouseState.None; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } + + base.OnMouseLeave(e); } - private void CursorControl_Click(object sender, EventArgs e) + protected override void OnClick(EventArgs e) { - foreach (CursorControl c in Parent.Controls.OfType()) { - if (c == sender) + if (c == this) { - c._Focused = true; + c.Focused = true; c.Invalidate(); } else { - c._Focused = false; + c.Focused = false; c.Invalidate(); } } + base.OnClick(e); } #endregion #region Animator - private int alpha; - private readonly int Factor = 25; - private Timer Timer; + private int _alpha = 0; - private void Timer_Tick(object sender, EventArgs e) + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)] + public int alpha { - if (!DesignMode) - { + get => _alpha; + set { _alpha = value; Refresh(); } + } - if (State == MouseState.Over) - { - if (alpha + Factor <= 255) - { - alpha += Factor; - } - else if (alpha + Factor > 255) - { - alpha = 255; - Timer.Enabled = false; - Timer.Stop(); - AnimateOnClick = false; - } - - System.Threading.Thread.Sleep(1); - Invalidate(); - } + private int _alpha2 = 0; - if (!(State == MouseState.Over)) - { - if (alpha - Factor >= 0) - { - alpha -= Factor; - } - else if (alpha - Factor < 0) - { - alpha = 0; - Timer.Enabled = false; - Timer.Stop(); - AnimateOnClick = false; - } - - System.Threading.Thread.Sleep(1); - Invalidate(); - } - } + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)] + public int alpha2 + { + get => _alpha2; + set { _alpha2 = value; Refresh(); } } #endregion protected override void OnPaint(PaintEventArgs e) { - var CurOptions = new CursorOptions() + if (this == null) return; + + Graphics G = e.Graphics; + + //Makes background drawn properly, and transparent + InvokePaintBackground(this, e); + + Config.Scheme scheme = Enabled ? Program.Style.Schemes.Main : Program.Style.Schemes.Disabled; + + CursorOptions CurOptions = new() { UseFromFile = Prop_UseFromFile, File = Prop_File, @@ -227,7 +258,7 @@ protected override void OnPaint(PaintEventArgs e) LoadingCircleHotNoiseOpacity = Prop_LoadingCircleHotNoiseOpacity, LineThickness = 1f, Scale = Prop_Scale, - _Angle = Angle, + Angle = Angle, Shadow_Enabled = Prop_Shadow_Enabled, Shadow_Blur = Prop_Shadow_Blur, Shadow_Color = Prop_Shadow_Color, @@ -236,47 +267,35 @@ protected override void OnPaint(PaintEventArgs e) Shadow_OffsetY = Prop_Shadow_OffsetY }; - bmp = new Bitmap((int)Math.Round(32f * Prop_Scale), (int)Math.Round(32f * Prop_Scale), PixelFormat.Format32bppPArgb); + bmp = new((int)Math.Round(32f * Prop_Scale), (int)Math.Round(32f * Prop_Scale), PixelFormat.Format32bppPArgb); bmp = Paths.Draw(CurOptions); DoubleBuffered = true; - var MainRect = new Rectangle(0, 0, Width - 1, Height - 1); - var MainRectInner = new Rectangle(1, 1, Width - 3, Height - 3); + Rectangle MainRect = new(0, 0, Width - 1, Height - 1); + Rectangle MainRectInner = new(1, 1, Width - 3, Height - 3); + Rectangle CenterRect = new((int)Math.Round(MainRect.X + (MainRect.Width - bmp.Width) / 2d), (int)Math.Round(MainRect.Y + (MainRect.Height - bmp.Height) / 2d), bmp.Width, bmp.Height); - var CenterRect = new Rectangle((int)Math.Round(MainRect.X + (MainRect.Width - bmp.Width) / 2d), (int)Math.Round(MainRect.Y + (MainRect.Height - bmp.Height) / 2d), bmp.Width, bmp.Height); + Color back = Color.FromArgb(alpha, scheme.Colors.Back_Checked_Hover); + Color line = Color.FromArgb(255 - alpha, Focused ? scheme.Colors.Line_Checked : State != MouseState.Over ? scheme.Colors.Line : scheme.Colors.Line_Checked_Hover); + Color line_hover = Color.FromArgb(alpha, scheme.Colors.Line_Checked_Hover); + using (SolidBrush br = new(Color.FromArgb(_alpha2, scheme.Colors.Back_Checked))) { G.FillRoundedRect(br, MainRect); } - var bkC = _Focused ? Program.Style.Schemes.Main.Colors.Back_Checked : Program.Style.Schemes.Main.Colors.Back; - var bkCC = Color.FromArgb(alpha, Program.Style.Schemes.Main.Colors.Back_Checked); + using (SolidBrush br = new(Color.FromArgb(255 - _alpha2, scheme.Colors.Back))) { G.FillRoundedRect(br, MainRectInner); } - using (SolidBrush br = new(bkC)) - { - e.Graphics.FillRoundedRect(br, MainRectInner); - } - using (SolidBrush br = new(bkCC)) - { - e.Graphics.FillRoundedRect(br, MainRect); - } + using (SolidBrush br = new(back)) { G.FillRoundedRect(br, MainRect); } - var lC = Color.FromArgb(255 - alpha, _Focused ? Program.Style.Schemes.Main.Colors.Line_Checked : Program.Style.Schemes.Main.Colors.Line); - var lCC = Color.FromArgb(alpha, Program.Style.Schemes.Main.Colors.Line_Checked_Hover); + using (Pen P = new(line)) { G.DrawRoundedRect_LikeW11(P, MainRectInner); } - using (Pen P = new(lC)) - { - e.Graphics.DrawRoundedRect_LikeW11(P, MainRectInner); - } - using (Pen P = new(lCC)) - { - e.Graphics.DrawRoundedRect_LikeW11(P, MainRect); - } + using (Pen P = new(line_hover)) { G.DrawRoundedRect_LikeW11(P, MainRect); } if (CurOptions.UseFromFile && System.IO.File.Exists(CurOptions.File) && System.IO.Path.GetExtension(CurOptions.File).ToUpper() == ".ANI") { float _Angle = 0; - if (CurOptions._Angle >= 180) { _Angle = CurOptions._Angle - 180f; } - else if (CurOptions._Angle < 180) { _Angle = CurOptions._Angle + 180f; } + if (CurOptions.Angle >= 180) { _Angle = CurOptions.Angle - 180f; } + else if (CurOptions.Angle < 180) { _Angle = CurOptions.Angle + 180f; } int frames = GetTotalFramesFromANI(CurOptions.File); @@ -287,16 +306,17 @@ protected override void OnPaint(PaintEventArgs e) IntPtr hCursor = User32.LoadCursorFromFile(CurOptions.File); - IntPtr hdc = e.Graphics.GetHdc(); + IntPtr hdc = G.GetHdc(); User32.DrawIconEx(hdc, location.X, location.Y, hCursor, size.Width, size.Height, AngleToFrame, IntPtr.Zero, (int)(User32.DrawIconExFlags.DI_NORMAL | User32.DrawIconExFlags.DI_COMPAT)); - e.Graphics.ReleaseHdc(hdc); + G.ReleaseHdc(hdc); User32.DestroyIcon(hCursor); } else { - e.Graphics.DrawImage(bmp, CenterRect); + G.DrawImage(bmp, CenterRect); } + base.OnPaint(e); } private static int GetTotalFramesFromANI(string filePath) diff --git a/WinPaletter/GUI/Elements/AdvancedControls/StoreItem.cs b/WinPaletter/GUI/Elements/AdvancedControls/StoreItem.cs index ac919711..c61d9dea 100644 --- a/WinPaletter/GUI/Elements/AdvancedControls/StoreItem.cs +++ b/WinPaletter/GUI/Elements/AdvancedControls/StoreItem.cs @@ -9,29 +9,26 @@ namespace WinPaletter.UI.Controllers { - [ToolboxItem(false)] [DefaultEvent("Click")] public class StoreItem : Panel { - public StoreItem() { - pattern = new TextureBrush(new Bitmap(Width, Height)); - Timer = new Timer() { Enabled = false, Interval = 1 }; - Font = new Font("Segoe UI", 9f); + SetStyle(ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor, true); DoubleBuffered = true; - MouseEnter += StoreItem_MouseEnter; - MouseLeave += StoreItem_MouseLeave; - Timer.Tick += Timer_Tick; + BackColor = Color.Transparent; + + pattern = new(new Bitmap(Width, Height)); + Font = new("Segoe UI", 9f); } #region Variables + private bool CanAnimate => !DesignMode && Program.Style.Animations && this != null && Visible && Parent != null && Parent.Visible && FindForm() != null && FindForm().Visible; - private TextureBrush Noise = new TextureBrush(Properties.Resources.GaussianBlur.Fade(0.65d)); - private List DesignedFor_Badges = new List(); + private TextureBrush Noise = new(Properties.Resources.GaussianBlur.Fade(0.65d)); + private List DesignedFor_Badges = new(); private TextureBrush pattern; - private bool AnimateOnClick = false; public MouseState State = MouseState.None; @@ -45,13 +42,13 @@ public enum MouseState #endregion #region Properties + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)] + public new Color BackColor { get => Color.Transparent; set {; } } + private Theme.Manager _TM; public Theme.Manager TM { - get - { - return _TM; - } + get => _TM; set { if (value is not null) @@ -70,6 +67,23 @@ public Theme.Manager TM public string URL_PackFile { get; set; } public string FileName { get; set; } public bool DoneByWinPaletter { get; set; } = false; + + protected override CreateParams CreateParams + { + get + { + CreateParams cpar = base.CreateParams; + if (!DesignMode) + { + cpar.ExStyle |= 0x20; + return cpar; + } + else + { + return cpar; + } + } + } #endregion #region Events @@ -80,38 +94,43 @@ public Theme.Manager TM protected override void OnMouseDown(MouseEventArgs e) { - AnimateOnClick = true; State = MouseState.Down; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } + base.OnMouseDown(e); } protected override void OnMouseUp(MouseEventArgs e) { State = MouseState.Over; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } + + base.OnMouseUp(e); } - private void StoreItem_MouseEnter(object sender, EventArgs e) + protected override void OnMouseEnter(EventArgs e) { State = MouseState.Over; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } + + base.OnMouseEnter(e); } - private void StoreItem_MouseLeave(object sender, EventArgs e) + protected override void OnMouseLeave(EventArgs e) { State = MouseState.None; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); - } + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } + + base.OnMouseLeave(e); + } #endregion #region Voids/Functions @@ -144,11 +163,7 @@ public void UpdatePattern(int val) { case 0: { - using (var x = new Bitmap(Width, Height)) - { - bmp = (Bitmap)x.Clone(); - } - + using (Bitmap x = new(Width, Height)) { bmp = (Bitmap)x.Clone(); } break; } @@ -205,11 +220,7 @@ public void UpdatePattern(int val) default: { - using (var x = new Bitmap(Width, Height)) - { - bmp = (Bitmap)x.Clone(); - } - + using (Bitmap x = new(Width, Height)) { bmp = (Bitmap)x.Clone(); } break; } @@ -217,14 +228,14 @@ public void UpdatePattern(int val) if (!Program.Style.DarkMode) { - using (var imgF = new ImageFactory()) + using (ImageFactory imgF = new()) { imgF.Load(bmp); imgF.Contrast(50); bmp = ((Bitmap)imgF.Image).Invert(); } } - pattern = new TextureBrush(bmp); + pattern = new(bmp); Refresh(); } @@ -232,59 +243,22 @@ public void UpdatePattern(int val) #endregion #region Animator - private int alpha; - private readonly int Factor = 40; - private Timer Timer; - - private void Timer_Tick(object sender, EventArgs e) + private int _alpha = 0; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)] + public int alpha { - if (!DesignMode) - { - - if (State == MouseState.Over) - { - if (alpha + Factor <= 255) - { - alpha += Factor; - } - else if (alpha + Factor > 255) - { - alpha = 255; - Timer.Enabled = false; - Timer.Stop(); - AnimateOnClick = false; - } - - System.Threading.Thread.Sleep(1); - Invalidate(); - } - - if (!(State == MouseState.Over)) - { - if (alpha - Factor >= 0) - { - alpha -= Factor; - } - else if (alpha - Factor < 0) - { - alpha = 0; - Timer.Enabled = false; - Timer.Stop(); - AnimateOnClick = false; - } - - System.Threading.Thread.Sleep(1); - Invalidate(); - } - } + get => _alpha; + set { _alpha = value; Refresh(); } } #endregion protected override void OnPaint(PaintEventArgs e) { - var G = e.Graphics; + if (this == null) return; + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.HighQuality; + DoubleBuffered = true; if (TM is not null) { @@ -295,14 +269,17 @@ protected override void OnPaint(PaintEventArgs e) G.TextRenderingHint = Program.Style.RenderingHint; } - DoubleBuffered = true; - G.Clear(this.GetParentColor()); - var rect_outer = new Rectangle(0, 0, Width - 1, Height - 1); - var rect_inner = new Rectangle(1, 1, Width - 3, Height - 3); + //Makes background drawn properly, and transparent + InvokePaintBackground(this, e); + + Config.Scheme scheme = Enabled ? Program.Style.Schemes.Main : Program.Style.Schemes.Disabled; - var bkC = Color.FromArgb(255 - alpha, Program.Style.Schemes.Main.Colors.Back); - var bkCC = bkC; + Rectangle rect_outer = new(0, 0, Width - 1, Height - 1); + Rectangle rect_inner = new(1, 1, Width - 3, Height - 3); + + Color bkC = Color.FromArgb(255 - alpha, scheme.Colors.Back); + Color bkCC = bkC; if (TM is not null) { @@ -316,27 +293,39 @@ protected override void OnPaint(PaintEventArgs e) } } - G.FillRoundedRect(new SolidBrush(bkC), rect_inner); - G.FillRoundedRect(new SolidBrush(bkCC), rect_outer); + using (SolidBrush br = new(bkC)) { G.FillRoundedRect(br, rect_inner); } + using (SolidBrush br = new(bkCC)) { G.FillRoundedRect(br, rect_outer); } - if (pattern is not null) - G.FillRoundedRect(pattern, rect_inner); + if (pattern is not null) G.FillRoundedRect(pattern, rect_inner); float factor_max = 20f; float factor1 = (float)((double)factor_max * (alpha / 255d)); float factor2 = (float)((double)factor_max * ((255 - alpha) / 255d)); int CircleR = (int)Math.Round(rect_inner.Height * 0.4d); - var Circle1 = new Rectangle((int)Math.Round(rect_inner.X + 10 + factor_max - factor1), (int)Math.Round(rect_inner.Y + (rect_inner.Height - CircleR) / 2d), CircleR, CircleR); - var Circle2 = new Rectangle((int)Math.Round(rect_inner.X + 10 + CircleR + CircleR * 0.4d - (double)factor2), (int)Math.Round(rect_inner.Y + (rect_inner.Height - CircleR) / 2d), CircleR, CircleR); + Rectangle Circle1 = new((int)Math.Round(rect_inner.X + 10 + factor_max - factor1), (int)Math.Round(rect_inner.Y + (rect_inner.Height - CircleR) / 2d), CircleR, CircleR); + Rectangle Circle2 = new((int)Math.Round(rect_inner.X + 10 + CircleR + CircleR * 0.4d - (double)factor2), (int)Math.Round(rect_inner.Y + (rect_inner.Height - CircleR) / 2d), CircleR, CircleR); if (TM is not null) { - G.FillEllipse(new SolidBrush(Color.FromArgb(125, TM.Info.Color2)), Circle2); - G.DrawEllipse(new Pen(TM.Info.Color2.CB(0.3f), 1.75f), Circle2); + using (SolidBrush br = new(Color.FromArgb(125, TM.Info.Color2))) + { + using (Pen P = new(TM.Info.Color2.CB(0.3f), 1.75f)) + { + G.FillEllipse(br, Circle2); + G.DrawEllipse(P, Circle2); + } + } + + using (SolidBrush br = new(Color.FromArgb(125, TM.Info.Color1))) + { + using (Pen P = new(TM.Info.Color1.CB(0.3f), 1.75f)) + { + G.FillEllipse(br, Circle1); + G.DrawEllipse(P, Circle1); + } + } - G.FillEllipse(new SolidBrush(Color.FromArgb(125, TM.Info.Color1)), Circle1); - G.DrawEllipse(new Pen(TM.Info.Color1.CB(0.3f), 1.75f), Circle1); } if (BackgroundImage is not null) @@ -354,31 +343,36 @@ protected override void OnPaint(PaintEventArgs e) G.DrawRoundImage(BackgroundImage, rect_inner); break; } - } } - if (State != MouseState.None) - G.FillRoundedRect(Noise, rect_inner); + if (State != MouseState.None) G.FillRoundedRect(Noise, rect_inner); - var lC = Color.FromArgb(255 - alpha, State != MouseState.None ? Program.Style.Schemes.Main.Colors.Line_Checked : Program.Style.Schemes.Main.Colors.Line); - var lCC = Color.FromArgb(alpha, Program.Style.Schemes.Main.Colors.Line_Checked_Hover); + Color lC = Color.FromArgb(255 - alpha, State != MouseState.None ? scheme.Colors.Line_Checked : scheme.Colors.Line); + Color lCC = Color.FromArgb(alpha, scheme.Colors.Line_Checked_Hover); - G.DrawRoundedRect_LikeW11(new Pen(lC), rect_inner); - G.DrawRoundedRect_LikeW11(new Pen(lCC), rect_outer); + using (Pen P = new(lC)) { G.DrawRoundedRect_LikeW11(P, rect_inner); } + using (Pen P = new(lCC)) { G.DrawRoundedRect_LikeW11(P, rect_outer); } - var ThemeName_Rect = new Rectangle(rect_inner.X, rect_inner.Y, rect_inner.Width - 10, 25); - var Author_Rect = new Rectangle(ThemeName_Rect.X, ThemeName_Rect.Bottom, ThemeName_Rect.Width - 20, 15); - var OS_Rect = new Rectangle(0, Author_Rect.Bottom + 7, 16, 16); - var Version_Rect = new Rectangle(ThemeName_Rect.X, OS_Rect.Bottom + 6, ThemeName_Rect.Width - 20, 15); + Rectangle ThemeName_Rect = new(rect_inner.X, rect_inner.Y, rect_inner.Width - 10, 25); + Rectangle Author_Rect = new(ThemeName_Rect.X, ThemeName_Rect.Bottom, ThemeName_Rect.Width - 20, 15); + Rectangle OS_Rect = new(0, Author_Rect.Bottom + 7, 16, 16); + Rectangle Version_Rect = new(ThemeName_Rect.X, OS_Rect.Bottom + 6, ThemeName_Rect.Width - 20, 15); if (TM is not null) { - var FC = Color.FromArgb(Math.Max(100, alpha), bkC.IsDark() ? Color.White : Color.Black); - G.DrawString(TM.Info.ThemeName, new Font(TM.MetricsFonts.CaptionFont.Name, 11f, FontStyle.Bold), new SolidBrush(FC), ThemeName_Rect, ContentAlignment.MiddleRight.ToStringFormat()); + Color FC = Color.FromArgb(Math.Max(100, alpha), bkC.IsDark() ? Color.White : Color.Black); - var BadgeRect = new Rectangle(Author_Rect.Right + 2, Author_Rect.Y, 16, 16); - var VerRect = new Rectangle(Version_Rect.Right + 2, Version_Rect.Y - 2, 18, 18); + using (StringFormat sf = ContentAlignment.MiddleRight.ToStringFormat()) + { + using (SolidBrush br = new(FC)) + { + G.DrawString(TM.Info.ThemeName, new Font(TM.MetricsFonts.CaptionFont.Name, 11f, FontStyle.Bold), br, ThemeName_Rect, sf); + } + } + + Rectangle BadgeRect = new(Author_Rect.Right + 2, Author_Rect.Y, 16, 16); + Rectangle VerRect = new(Version_Rect.Right + 2, Version_Rect.Y - 2, 18, 18); if (DoneByWinPaletter) { @@ -390,19 +384,22 @@ protected override void OnPaint(PaintEventArgs e) } string author = DoneByWinPaletter ? Application.ProductName : TM.Info.Author; - G.DrawString(Program.Lang.By + " " + author, new Font(TM.MetricsFonts.CaptionFont.Name, 9f, FontStyle.Regular), new SolidBrush(FC), Author_Rect, ContentAlignment.MiddleRight.ToStringFormat()); + using (StringFormat sf = ContentAlignment.MiddleRight.ToStringFormat()) + { + using (SolidBrush br = new(FC)) + { + G.DrawString($"{Program.Lang.By} {author}", new Font(TM.MetricsFonts.CaptionFont.Name, 9f, FontStyle.Regular), br, Author_Rect, sf); - G.DrawImage(Properties.Resources.Store_ThemeVersion, VerRect); - G.DrawString(TM.Info.ThemeVersion, Fonts.Console, new SolidBrush(FC), Version_Rect, ContentAlignment.MiddleRight.ToStringFormat()); + G.DrawImage(Properties.Resources.Store_ThemeVersion, VerRect); + G.DrawString(TM.Info.ThemeVersion, Fonts.Console, br, Version_Rect, sf); + } + } - for (int i = 0, loopTo = DesignedFor_Badges.Count - 1; i <= loopTo; i++) + for (int i = 0; i <= DesignedFor_Badges.Count - 1; i++) G.DrawImage(DesignedFor_Badges[i], new Rectangle(BadgeRect.Right - 16 - 18 * i, OS_Rect.Y, OS_Rect.Width, OS_Rect.Height)); - } - + base.OnPaint(e); } - } - } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/AdvancedControls/TextTranslationItem.cs b/WinPaletter/GUI/Elements/AdvancedControls/TextTranslationItem.cs index ee58fb54..20809084 100644 --- a/WinPaletter/GUI/Elements/AdvancedControls/TextTranslationItem.cs +++ b/WinPaletter/GUI/Elements/AdvancedControls/TextTranslationItem.cs @@ -6,18 +6,14 @@ namespace WinPaletter.UI.Controllers { - [ToolboxItem(false)] public class TextTranslationItem : ContainerControl { - public TextTranslationItem() { DoubleBuffered = true; SetStyle(ControlStyles.SupportsTransparentBackColor, true); BackColor = Color.Transparent; - LostFocus += TextTranslationItem_LostFocus; - GotFocus += TextTranslationItem_GotFocus; } #region Properties @@ -26,28 +22,28 @@ public TextTranslationItem() private ContentAlignment _TextAlign = ContentAlignment.MiddleCenter; public ContentAlignment TextAlign { - get - { - return _TextAlign; - } + get => _TextAlign; set { - _TextAlign = value; - Invalidate(); + if (value != _TextAlign) + { + _TextAlign = value; + Invalidate(); + } } } private ContentAlignment _ImageAlign = ContentAlignment.MiddleCenter; public ContentAlignment ImageAlign { - get - { - return _ImageAlign; - } + get => _ImageAlign; set { - _ImageAlign = value; - Invalidate(); + if (value != _ImageAlign) + { + _ImageAlign = value; + Invalidate(); + } } } @@ -59,14 +55,14 @@ public ContentAlignment ImageAlign [Bindable(true)] public override string Text { - get - { - return _Text; - } + get => _Text; set { - _Text = value; - Invalidate(); + if (value != _Text) + { + _Text = value; + Invalidate(); + } } } @@ -77,14 +73,14 @@ public override string Text private string _SearchHighlight; public string SearchHighlight { - get - { - return _SearchHighlight; - } + get => _SearchHighlight; set { - _SearchHighlight = value; - Refresh(); + if (value != _SearchHighlight) + { + _SearchHighlight = value; + Refresh(); + } } } @@ -92,9 +88,16 @@ protected override CreateParams CreateParams { get { - var cp = base.CreateParams; - cp.ExStyle = cp.ExStyle | 0x20; - return cp; + CreateParams cpar = base.CreateParams; + if (!DesignMode) + { + cpar.ExStyle |= 0x20; + return cpar; + } + else + { + return cpar; + } } } #endregion @@ -103,36 +106,42 @@ protected override CreateParams CreateParams protected override void OnMouseDown(MouseEventArgs e) { - base.OnMouseDown(e); Pressed = true; BringToFront(); Focus(); Invalidate(); + + base.OnMouseDown(e); } - private void TextTranslationItem_LostFocus(object sender, EventArgs e) + protected override void OnLostFocus(EventArgs e) { Pressed = false; Invalidate(); + + base.OnLostFocus(e); } - private void TextTranslationItem_GotFocus(object sender, EventArgs e) + protected override void OnGotFocus(EventArgs e) { Pressed = true; BringToFront(); Focus(); Invalidate(); - } + base.OnGotFocus(e); + } #endregion protected override void OnPaint(PaintEventArgs e) { - var G = e.Graphics; + if (this == null) return; + + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.HighQuality; G.TextRenderingHint = Program.Style.RenderingHint; DoubleBuffered = true; - var rect = new Rectangle(0, 0, Width - 1, Height - 1); + Rectangle rect = new(0, 0, Width - 1, Height - 1); if (_SearchHighlight is not null && !string.IsNullOrWhiteSpace(_SearchHighlight) && Text.ToLower().Trim().Contains(_SearchHighlight.ToLower().Trim())) { @@ -152,15 +161,15 @@ protected override void OnPaint(PaintEventArgs e) if (Pressed) { G.FillRectangle(Program.Style.Schemes.Main.Brushes.Back_Checked, rect); - G.DrawRectangle(new Pen(Program.Style.DarkMode ? Color.White : Color.Black, 2f) { DashStyle = DashStyle.Dot }, rect); + using (Pen P = new(Program.Style.DarkMode ? Color.White : Color.Black, 2f) { DashStyle = DashStyle.Dot }) { G.DrawRectangle(P, rect); } } else { - G.DrawRectangle(new Pen(Color.FromArgb(100, Program.Style.DarkMode ? Color.White : Color.Black), 1f), rect); + using (Pen P = new(Color.FromArgb(100, Program.Style.DarkMode ? Color.White : Color.Black), 1f)) { G.DrawRectangle(P, rect); } } #region Text and Image Render - using (var ButtonString = new StringFormat() { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }) + using (StringFormat ButtonString = new() { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }) { bool RTL = (int)RightToLeft == 1; if (RTL) @@ -204,9 +213,9 @@ protected override void OnPaint(PaintEventArgs e) try { using (SolidBrush br = new(ForeColor)) - using (var sf = TextAlign.ToStringFormat(RTL)) + using (StringFormat sf = TextAlign.ToStringFormat(RTL)) { - var r = new Rectangle(1, 0, Width, Height); + Rectangle r = new(1, 0, Width, Height); G.DrawString(Text, Font, br, r, sf); } } @@ -241,7 +250,7 @@ protected override void OnPaint(PaintEventArgs e) using (SolidBrush br = new(ForeColor)) { - var r = new Rectangle(0, alx + 9 + img.Height, Width, Height); + Rectangle r = new(0, alx + 9 + img.Height, Width, Height); G.DrawString(Text, Font, br, r, ButtonString); } } @@ -254,10 +263,10 @@ protected override void OnPaint(PaintEventArgs e) case ContentAlignment.MiddleLeft: { - var Rec = new Rectangle(imgY, imgY, img.Width, img.Height); + Rectangle Rec = new(imgY, imgY, img.Width, img.Height); int Bo = imgY + img.Width + imgY - 5; - var RecText = new Rectangle(Bo, imgY, (int)Math.Round(Text.Measure(Font).Width + 15f - imgY), img.Height); - var u = Rectangle.Union(Rec, RecText); + Rectangle RecText = new(Bo, imgY, (int)Math.Round(Text.Measure(Font).Width + 15f - imgY), img.Height); + Rectangle u = Rectangle.Union(Rec, RecText); u.X = (int)Math.Round((Width - u.Width) / 2d); int innerSpace = RecText.Left - Rec.Right; @@ -283,10 +292,10 @@ protected override void OnPaint(PaintEventArgs e) case ContentAlignment.MiddleRight: { - var Rec = new Rectangle(imgY, imgY, img.Width, img.Height); + Rectangle Rec = new(imgY, imgY, img.Width, img.Height); int Bo = imgY + img.Width + imgY - 5; - var RecText = new Rectangle(Bo, imgY, Width - Bo, img.Height); - var u = Rectangle.Union(Rec, RecText); + Rectangle RecText = new(Bo, imgY, Width - Bo, img.Height); + Rectangle u = Rectangle.Union(Rec, RecText); int innerSpace = RecText.Left - Rec.Right; if (!RTL) @@ -313,6 +322,7 @@ protected override void OnPaint(PaintEventArgs e) } #endregion + base.OnPaint(e); } } diff --git a/WinPaletter/GUI/Elements/Checkers/CheckBox.cs b/WinPaletter/GUI/Elements/Checkers/CheckBox.cs index 55275113..f3ca48a4 100644 --- a/WinPaletter/GUI/Elements/Checkers/CheckBox.cs +++ b/WinPaletter/GUI/Elements/Checkers/CheckBox.cs @@ -18,16 +18,14 @@ public CheckBox() DoubleBuffered = true; BackColor = Color.Transparent; - Font = new Font("Segoe UI", 9f); + Font = new("Segoe UI", 9f); ForeColor = Color.White; - _shown = false; - _alpha = 0; - _alpha2 = Checked ? 255 : 0; + alpha = 0; alpha2 = Checked ? 255 : 0; } #region Variables - private bool _shown = false; + private bool CanAnimate => !DesignMode && Program.Style.Animations && this != null && Visible && Parent != null && Parent.Visible && FindForm() != null && FindForm().Visible; public MouseState State = MouseState.None; @@ -48,22 +46,16 @@ public enum MouseState private bool _Checked; public bool Checked { - get { return _Checked; } + get => _Checked; set { - if (_Checked != value) + if (value != _Checked) { _Checked = value; CheckedChanged?.Invoke(this); - if (_shown) - { - FluentTransitions.Transition.With(this, nameof(alpha2), Checked ? 255 : 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); - } - else - { - alpha2 = Checked ? 255 : 0; - Refresh(); - } + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha2), Checked ? 255 : 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha2 = Checked ? 255 : 0; } } } } @@ -79,7 +71,7 @@ protected override CreateParams CreateParams { get { - var cpar = base.CreateParams; + CreateParams cpar = base.CreateParams; if (!DesignMode) { cpar.ExStyle |= 0x20; @@ -103,8 +95,9 @@ protected override CreateParams CreateParams protected override void OnMouseDown(MouseEventArgs e) { State = MouseState.Down; - FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } base.OnMouseDown(e); } @@ -112,7 +105,9 @@ protected override void OnMouseDown(MouseEventArgs e) protected override void OnMouseClick(MouseEventArgs e) { Checked = !Checked; - FluentTransitions.Transition.With(this, nameof(alpha2), Checked ? 255 : 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha2), Checked ? 255 : 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha2 = Checked ? 255 : 0; } base.OnMouseClick(e); } @@ -120,8 +115,9 @@ protected override void OnMouseClick(MouseEventArgs e) protected override void OnMouseUp(MouseEventArgs e) { State = MouseState.Over; - FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } base.OnMouseUp(e); } @@ -129,8 +125,9 @@ protected override void OnMouseUp(MouseEventArgs e) protected override void OnMouseEnter(EventArgs e) { State = MouseState.Over; - FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } base.OnMouseEnter(e); } @@ -138,37 +135,12 @@ protected override void OnMouseEnter(EventArgs e) protected override void OnMouseLeave(EventArgs e) { State = MouseState.None; - FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); - Invalidate(); - - base.OnMouseLeave(e); - } - - protected override void OnHandleCreated(EventArgs e) - { - try { if (!DesignMode) { FindForm().Shown += Showed; } } - catch { } - - try { alpha = 0; alpha2 = Checked ? 255 : 0; } - catch { } - base.OnHandleCreated(e); - } + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } - protected override void OnHandleDestroyed(EventArgs e) - { - try { if (!DesignMode) { FindForm().Shown -= Showed; } } - catch { } - - base.OnHandleDestroyed(e); - } - - public void Showed(object sender, EventArgs e) - { - _shown = true; - Invalidate(); + base.OnMouseLeave(e); } - #endregion #region Animator @@ -195,9 +167,7 @@ public int alpha2 protected override void OnPaint(PaintEventArgs e) { - base.OnPaint(e); - - if (Parent is null) return; + if (this == null) return; Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; @@ -211,9 +181,9 @@ protected override void OnPaint(PaintEventArgs e) bool RTL = (int)RightToLeft == 1; StringFormat format = ContentAlignment.MiddleLeft.ToStringFormat(RTL); - var OuterRect = new Rectangle(3, 4, Height - 8, Height - 8); - var InnerRect = new Rectangle(4, 5, Height - 10, Height - 10); - var TextRect = new Rectangle(Height - 1, 1, Width - InnerRect.Width, Height - 1); + Rectangle OuterRect = new(3, 4, Height - 8, Height - 8); + Rectangle InnerRect = new(4, 5, Height - 10, Height - 10); + Rectangle TextRect = new(Height - 1, 1, Width - InnerRect.Width, Height - 1); #region Colors System Config.Scheme scheme = Enabled ? Program.Style.Schemes.Main : Program.Style.Schemes.Disabled; @@ -232,7 +202,7 @@ protected override void OnPaint(PaintEventArgs e) if (RTL) { - format = new StringFormat(StringFormatFlags.DirectionRightToLeft); + format = new(StringFormatFlags.DirectionRightToLeft); OuterRect.X = Width - OuterRect.X - OuterRect.Width; InnerRect.X = Width - InnerRect.X - InnerRect.Width; TextRect.Width = Width - InnerRect.Width - 10; @@ -282,6 +252,8 @@ protected override void OnPaint(PaintEventArgs e) #endregion format.Dispose(); + + base.OnPaint(e); } } } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/Checkers/RadioButton.cs b/WinPaletter/GUI/Elements/Checkers/RadioButton.cs index 242d71f1..ed33cd70 100644 --- a/WinPaletter/GUI/Elements/Checkers/RadioButton.cs +++ b/WinPaletter/GUI/Elements/Checkers/RadioButton.cs @@ -18,16 +18,15 @@ public RadioButton() DoubleBuffered = true; BackColor = Color.Transparent; - Font = new Font("Segoe UI", 9f); + Font = new("Segoe UI", 9f); ForeColor = Color.White; - _shown = false; _alpha = 0; _alpha2 = Checked ? 255 : 0; } #region Variables - private bool _shown = false; + private bool CanAnimate => !DesignMode && Program.Style.Animations && this != null && Visible && Parent != null && Parent.Visible && FindForm() != null && FindForm().Visible; public MouseState State = MouseState.None; @@ -48,31 +47,21 @@ public enum MouseState private bool _Checked; public bool Checked { - get { return _Checked; } - + get => _Checked; set { - try + if (_Checked != value) { - if (_Checked != value) - { - _Checked = value; - if (_Checked) { UncheckOthersOnChecked(); } - CheckedChanged?.Invoke(this); - - if (_shown) - { - FluentTransitions.Transition.With(this, nameof(alpha2), Checked ? 255 : 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); - } - else - { - alpha2 = Checked ? 255 : 0; - Refresh(); - } + _Checked = value; + if (_Checked) { UncheckOthersOnChecked(); } + CheckedChanged?.Invoke(this); + if (CanAnimate) + { + FluentTransitions.Transition.With(this, nameof(alpha2), Checked ? 255 : 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha2 = Checked ? 255 : 0; } } - catch { } } } @@ -87,7 +76,7 @@ protected override CreateParams CreateParams { get { - var cpar = base.CreateParams; + CreateParams cpar = base.CreateParams; if (!DesignMode) { cpar.ExStyle |= 0x20; @@ -151,31 +140,6 @@ protected override void OnMouseLeave(EventArgs e) base.OnMouseLeave(e); } - protected override void OnHandleCreated(EventArgs e) - { - try { if (!DesignMode) { FindForm().Shown += Showed; } } - catch { } - - try { alpha = 0; alpha2 = Checked ? 255 : 0; } - catch { } - - base.OnHandleCreated(e); - } - - protected override void OnHandleDestroyed(EventArgs e) - { - try { if (!DesignMode) { FindForm().Shown -= Showed; } } - catch { } - - base.OnHandleDestroyed(e); - } - - public void Showed(object sender, EventArgs e) - { - _shown = true; - Invalidate(); - } - #endregion #region Voids/Functions @@ -220,8 +184,7 @@ public int alpha2 protected override void OnPaint(PaintEventArgs e) { - base.OnPaint(e); - if (Parent is null) return; + if (this == null) return; Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; @@ -242,7 +205,7 @@ protected override void OnPaint(PaintEventArgs e) if (RTL) { - format = new StringFormat(StringFormatFlags.DirectionRightToLeft); + format = new(StringFormatFlags.DirectionRightToLeft); OuterCircle.X = Width - OuterCircle.X - OuterCircle.Width; InnerCircle.X = Width - InnerCircle.X - InnerCircle.Width; CheckCircle.X = Width - CheckCircle.X - CheckCircle.Width; @@ -290,6 +253,8 @@ protected override void OnPaint(PaintEventArgs e) #endregion format.Dispose(); + + base.OnPaint(e); } } } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/Checkers/RadioImage.cs b/WinPaletter/GUI/Elements/Checkers/RadioImage.cs index faf0c652..57f5f58a 100644 --- a/WinPaletter/GUI/Elements/Checkers/RadioImage.cs +++ b/WinPaletter/GUI/Elements/Checkers/RadioImage.cs @@ -17,22 +17,16 @@ public RadioImage() DoubleBuffered = true; BackColor = Color.Transparent; - Timer = new Timer() { Enabled = false, Interval = 1 }; DoubleBuffered = true; - Font = new Font("Segoe UI", 9f); + Font = new("Segoe UI", 9f); ForeColor = Color.White; Text = string.Empty; - MouseEnter += RadioImage_MouseEnter; - MouseLeave += RadioImage_MouseLeave; - HandleCreated += RadioImage_HandleCreated; - HandleDestroyed += RadioImage_HandleDestroyed; - Timer.Tick += Timer_Tick; + _alpha = 0; _alpha2 = _Checked ? 255 : 0; } #region Variables - - private bool AnimateOnClick = false; + private bool CanAnimate => !DesignMode && Program.Style.Animations && this != null && Visible && Parent != null && Parent.Visible && FindForm() != null && FindForm().Visible; public MouseState State = MouseState.None; @@ -52,27 +46,21 @@ public enum MouseState private bool _Checked; public bool Checked { - get - { - return _Checked; - } + get => _Checked; set { - try + if (value != _Checked) { _Checked = value; + if (_Checked) { UncheckOthersOnChecked(); } - if (_Checked) + if (CanAnimate) { - UncheckOthersOnChecked(); + FluentTransitions.Transition.With(this, nameof(alpha2), _Checked ? 255 : 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha2 = Checked ? 255 : 0; } CheckedChanged?.Invoke(this); - - Invalidate(); - } - catch - { } } } @@ -81,15 +69,14 @@ public bool Checked private Image _image; public Image Image { - get - { - return _image; - } - + get => _image; set { - _image = value; - Invalidate(); + if (value != _image) + { + _image = value; + Invalidate(); + } } } @@ -109,7 +96,7 @@ protected override CreateParams CreateParams { get { - var cpar = base.CreateParams; + CreateParams cpar = base.CreateParams; if (!DesignMode) { cpar.ExStyle |= 0x20; @@ -141,98 +128,49 @@ protected override void OnDragOver(DragEventArgs e) { return; } + base.OnDragOver(e); } protected override void OnMouseDown(MouseEventArgs e) { - AnimateOnClick = true; Checked = true; State = MouseState.Down; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } + base.OnMouseDown(e); } protected override void OnMouseUp(MouseEventArgs e) { State = MouseState.Over; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); - } - private void RadioImage_MouseEnter(object sender, EventArgs e) - { - State = MouseState.Over; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); - } + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } - private void RadioImage_MouseLeave(object sender, EventArgs e) - { - State = MouseState.None; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + base.OnMouseUp(e); } - private void RadioImage_HandleCreated(object sender, EventArgs e) + protected override void OnMouseEnter(EventArgs e) { - try - { - if (!DesignMode) - { - FindForm().Shown += Showed; - Parent.BackColorChanged += RefreshColorPalette; - Parent.VisibleChanged += RefreshColorPalette; - Parent.EnabledChanged += RefreshColorPalette; - VisibleChanged += RefreshColorPalette; - EnabledChanged += RefreshColorPalette; - } - } - catch - { - } + State = MouseState.Over; - try - { - alpha = 0; - } - catch - { - } - } + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } - private void RadioImage_HandleDestroyed(object sender, EventArgs e) - { - try - { - if (!DesignMode) - { - FindForm().Shown -= Showed; - Parent.BackColorChanged -= RefreshColorPalette; - Parent.VisibleChanged -= RefreshColorPalette; - Parent.EnabledChanged -= RefreshColorPalette; - VisibleChanged -= RefreshColorPalette; - EnabledChanged -= RefreshColorPalette; - } - } - catch - { - } + base.OnMouseEnter(e); } - public void Showed(object sender, EventArgs e) + protected override void OnMouseLeave(EventArgs e) { - Invalidate(); - } + State = MouseState.None; - public void RefreshColorPalette(object sender, EventArgs e) - { - Invalidate(); + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } + + base.OnMouseLeave(e); } #endregion @@ -255,68 +193,36 @@ private void UncheckOthersOnChecked() #endregion #region Animator + private int _alpha = 0; - private int alpha; - private readonly int Factor = 25; - private Timer Timer; - - private void Timer_Tick(object sender, EventArgs e) + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)] + public int alpha { - if (!DesignMode) - { - - if (State == MouseState.Over) - { - if (alpha + Factor <= 255) - { - alpha += Factor; - } - else if (alpha + Factor > 255) - { - alpha = 255; - Timer.Enabled = false; - Timer.Stop(); - AnimateOnClick = false; - } - - System.Threading.Thread.Sleep(1); - Invalidate(); - } + get => _alpha; + set { _alpha = value; Refresh(); } + } - if (!(State == MouseState.Over)) - { - if (alpha - Factor >= 0) - { - alpha -= Factor; - } - else if (alpha - Factor < 0) - { - alpha = 0; - Timer.Enabled = false; - Timer.Stop(); - AnimateOnClick = false; - } + private int _alpha2 = 0; - System.Threading.Thread.Sleep(1); - Invalidate(); - } - } + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)] + public int alpha2 + { + get => _alpha2; + set { _alpha2 = value; Refresh(); } } - #endregion protected override void OnPaint(PaintEventArgs e) { - base.OnPaint(e); - if (Parent is null) return; + if (this == null) return; Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; G.TextRenderingHint = DesignMode ? TextRenderingHint.ClearTypeGridFit : TextRenderingHint.SystemDefault; DoubleBuffered = true; - var MainRect = new Rectangle(0, 0, Width - 1, Height - 1); - var MainRectInner = new Rectangle(1, 1, Width - 3, Height - 3); + Rectangle MainRect = new(0, 0, Width - 1, Height - 1); + Rectangle MainRectInner = new(1, 1, Width - 3, Height - 3); Rectangle PaddingRect = Rectangle.FromLTRB(Padding.Left, Padding.Top, Padding.Right, Padding.Bottom); Rectangle TextAndImageRect = new(3 + PaddingRect.X, 3 + PaddingRect.Y, Width - 7 - PaddingRect.Width * 2, Height - 7 - PaddingRect.Height * 2); @@ -326,10 +232,13 @@ protected override void OnPaint(PaintEventArgs e) Config.Scheme scheme = Enabled ? Program.Style.Schemes.Main : Program.Style.Schemes.Disabled; Color back = Color.FromArgb(alpha, scheme.Colors.Back_Checked_Hover); - Color line = Color.FromArgb(255 - alpha, _Checked ? scheme.Colors.Line_Checked : scheme.Colors.Line); + Color line = Color.FromArgb(255 - alpha, _Checked ? scheme.Colors.Line_Checked : State != MouseState.Over ? scheme.Colors.Line : scheme.Colors.Line_Checked_Hover); Color line_hover = Color.FromArgb(alpha, scheme.Colors.Line_Checked_Hover); - G.FillRoundedRect(_Checked ? scheme.Brushes.Back_Checked : scheme.Brushes.Back, MainRectInner); + using (SolidBrush br = new(Color.FromArgb(_alpha2, scheme.Colors.Back_Checked))) { G.FillRoundedRect(br, MainRect); } + + using (SolidBrush br = new(Color.FromArgb(255 - _alpha2, scheme.Colors.Back))) { G.FillRoundedRect(br, MainRectInner); } + using (SolidBrush br = new(back)) { G.FillRoundedRect(br, MainRect); } using (Pen P = new(line)) { G.DrawRoundedRect_LikeW11(P, MainRectInner); } @@ -473,6 +382,8 @@ protected override void OnPaint(PaintEventArgs e) } } #endregion + + base.OnPaint(e); } private Rectangle GetImageRectangle(Rectangle rect, Size size, ContentAlignment contentAlignment) diff --git a/WinPaletter/GUI/Elements/Checkers/Toggle.cs b/WinPaletter/GUI/Elements/Checkers/Toggle.cs index 1108934f..f7151f8f 100644 --- a/WinPaletter/GUI/Elements/Checkers/Toggle.cs +++ b/WinPaletter/GUI/Elements/Checkers/Toggle.cs @@ -12,28 +12,36 @@ public class Toggle : UserControl { public Toggle() { + SetStyle(ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor, true); DoubleBuffered = true; - Size = new Size(40, 20); + BackColor = Color.Transparent; + + Size = new(40, 20); Text = string.Empty; - Resize += Toggle_Resize; - HandleCreated += Toggle_HandleCreated; - HandleDestroyed += Toggle_HandleDestroyed; - MouseMove += Toggle_MouseMove; - MouseUp += Toggle_MouseUp; - MouseDown += Toggle_MouseDown; + + _checkerX = Checked ? Width - 17 : 4; + CheckC = new(CheckerX, 4, 11, 11); + + if (DarkLight_Toggler) + { + CheckC.Width = DarkLight_TogglerSize; + CheckC.Height = DarkLight_TogglerSize; + } } #region Variables - private Rectangle CheckC = new Rectangle(4, 4, 11, 11); - private Rectangle CheckedC; + private bool CanAnimate => !DesignMode && Program.Style.Animations && this != null && Visible && Parent != null && Parent.Visible && FindForm() != null && FindForm().Visible; + + private Rectangle CheckC = new(4, 4, 11, 11); private int MouseState = 0; private bool WasMoving = false; private readonly int DarkLight_TogglerSize = 13; - private bool _Shown = false; - private bool AnimateOnClick = false; #endregion #region Properties + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)] + public new Color BackColor { get => Color.Transparent; set {; } } + public bool DarkLight_Toggler { get; set; } = false; [Browsable(true)] @@ -46,102 +54,82 @@ public Toggle() private bool _checked; public bool Checked { - get - { - return _checked; - } + get => _checked; set { - if (!_checked.Equals(value)) + if (value != _checked) { _checked = value; OnCheckedChanged(); } } } - #endregion - - #region Events - public event CheckedChangedEventHandler CheckedChanged; - - public delegate void CheckedChangedEventHandler(object sender, EventArgs e); - protected virtual void OnCheckedChanged() + private int _checkerX = 4; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)] + public int CheckerX { - CheckedChanged?.Invoke(this, EventArgs.Empty); + get => _checkerX; + set { _checkerX = value; Refresh(); } + } - if (!DesignMode & _Shown & AnimateOnClick) + protected override CreateParams CreateParams + { + get { - if (Checked) + CreateParams cpar = base.CreateParams; + if (!DesignMode) { - - int s = (int)Math.Round((Width - 17) * 0.5d); - for (int i = CheckC.Left, loopTo = Width - 17; i <= loopTo; i += +5) - { - CheckC.X = i + s; - System.Threading.Thread.Sleep(1); - Refresh(); - if (i + s >= Width - 17) - break; - s -= 1; - if (s < 0) - s = 0; - } - CheckC.X = Width - 17; + cpar.ExStyle |= 0x20; + return cpar; } - else { - - int s = 10; - for (int i = CheckC.Left; i >= 4; i -= 5) - { - CheckC.X = i - s; - System.Threading.Thread.Sleep(1); - Refresh(); - if (i - s <= 4) - break; - s -= 1; - if (s < 0) - s = 0; - } - CheckC.X = 4; - + return cpar; } } + } + #endregion + + #region Events + public event CheckedChangedEventHandler CheckedChanged; - else if (Checked) + public delegate void CheckedChangedEventHandler(object sender, EventArgs e); + + protected virtual void OnCheckedChanged() + { + if (CanAnimate) { - CheckC.X = Width - 17; + FluentTransitions.Transition.With(this, nameof(CheckerX), Checked ? Width - 17 : 4).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration_Quick)); } else { - CheckC.X = 4; + _checkerX = Checked ? Width - 17 : 4; + Refresh(); } if (DarkLight_Toggler) { CheckC.Width = DarkLight_TogglerSize; CheckC.Height = DarkLight_TogglerSize; + Refresh(); } - Invalidate(); + CheckedChanged?.Invoke(this, EventArgs.Empty); } protected override void OnMouseClick(MouseEventArgs e) { - AnimateOnClick = true; Checked = !Checked; - AnimateOnClick = false; Invalidate(); + base.OnMouseClick(e); } - private void Toggle_Resize(object sender, EventArgs e) + protected override void OnResize(EventArgs e) { Height = 20; - if (Width < 40) - Width = 40; + if (Width < 40) Width = 40; if (DarkLight_Toggler) { @@ -150,103 +138,40 @@ private void Toggle_Resize(object sender, EventArgs e) } Refresh(); - } - - private void Toggle_HandleCreated(object sender, EventArgs e) - { - - if (Checked) - { - CheckC = new Rectangle(Width - 17, 4, 11, 11); - } - else - { - CheckC = new Rectangle(4, 4, 11, 11); - } - if (DarkLight_Toggler) - { - CheckC.Width = DarkLight_TogglerSize; - CheckC.Height = DarkLight_TogglerSize; - } - - if (!DesignMode) - { - try - { - FindForm().Load += Loaded; - FindForm().Shown += Showed; - Parent.BackColorChanged += RefreshColorPalette; - } - catch - { - } - } - } - - private void Toggle_HandleDestroyed(object sender, EventArgs e) - { - if (!DesignMode) - { - try - { - FindForm().Load -= Loaded; - FindForm().Shown -= Showed; - Parent.BackColorChanged -= RefreshColorPalette; - } - catch - { - } - } - } - - public void Loaded(object sender, EventArgs e) - { - _Shown = false; - } - - public void Showed(object sender, EventArgs e) - { - _Shown = true; - Invalidate(); + base.OnResize(e); } - public void RefreshColorPalette(object sender, EventArgs e) - { - if (_Shown) - { - Invalidate(); - } - } - - private void Toggle_MouseMove(object sender, MouseEventArgs e) + protected override void OnMouseMove(MouseEventArgs e) { if (e.Button == MouseButtons.Left) { - int i = (int)Math.Round(e.X - 0.5d * CheckC.Width); WasMoving = true; MouseState = 1; if (i <= 4) { - CheckC.X = 4; + _checkerX = 4; } else if (i >= Width - 17) { - CheckC.X = Width - 17; + _checkerX = Width - 17; } else { - CheckC.X = i; + _checkerX = i; } + CheckC.X = CheckerX; CheckC.Y = 4; Refresh(); } + + base.OnMouseMove(e); } - private void Toggle_MouseUp(object sender, MouseEventArgs e) + protected override void OnMouseUp(MouseEventArgs e) { MouseState = 0; CheckC.Width = 11; @@ -259,134 +184,118 @@ private void Toggle_MouseUp(object sender, MouseEventArgs e) if (WasMoving) { - if (e.X < Width * 0.5d) - Checked = false; - if (e.X >= Width * 0.5d) - Checked = true; + if (e.X < Width * 0.5d) Checked = false; + + if (e.X >= Width * 0.5d) Checked = true; + WasMoving = false; } Refresh(); + + base.OnMouseUp(e); } - private void Toggle_MouseDown(object sender, MouseEventArgs e) + protected override void OnMouseDown(MouseEventArgs e) { MouseState = 1; CheckC.Width = 13; Refresh(); + + base.OnMouseDown(e); } #endregion protected override void OnPaint(PaintEventArgs e) { - OnPaintBackground(e); - var G = e.Graphics; + if (this == null) return; + + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; DoubleBuffered = true; - if (Parent is null) - return; - - BackColor = Program.Style.Schemes.Main.Colors.Back; - - G.Clear(this.GetParentColor()); + //Makes background drawn properly, and transparent + InvokePaintBackground(this, e); // ################################################################################# Customizer - var MainRect = new Rectangle(0, 0, Width - 1, Height - 1); - Color BorderColor; + Rectangle MainRect = new(0, 0, Width - 1, Height - 1); - if (Program.Style.DarkMode) - BorderColor = base.BackColor.LightLight(); - else - BorderColor = base.BackColor.Dark(0.5f); + Config.Scheme scheme = Enabled ? Program.Style.Schemes.Main : Program.Style.Schemes.Disabled; - Color CheckColor; - if (MouseState == 0) - CheckColor = Program.Style.Schemes.Main.Colors.AccentAlt; - else - CheckColor = base.BackColor.CB((float)(Program.Style.DarkMode ? 0.3d : -0.5d)); + CheckC.X = CheckerX; - // ################################################################################# int min = 4; int max = Width - 17; decimal val = (decimal)(CheckC.X / (double)max); - if (val < 0m) - val = 0m; - if (val > 1m) - val = 1m; - if (CheckC.X <= min) - val = 0m; - if (CheckC.X >= max) - val = 1m; - - LinearGradientBrush lgbChecked, lgbNonChecked, lgborderChecked, lgborderNonChecked; + if (val < 0m) val = 0m; + if (val > 1m) val = 1m; + if (CheckC.X <= min) val = 0m; + if (CheckC.X >= max) val = 1m; - lgbChecked = new LinearGradientBrush(MainRect, Color.FromArgb((int)Math.Round(255m * val), Program.Style.Schemes.Main.Colors.Line_Checked_Hover), Color.FromArgb((int)Math.Round(255m * val), Program.Style.Schemes.Main.Colors.Back_Checked), LinearGradientMode.ForwardDiagonal); - lgborderChecked = new LinearGradientBrush(MainRect, Color.FromArgb((int)Math.Round(255m * val), Program.Style.Schemes.Main.Colors.Line_Checked), Color.FromArgb((int)Math.Round(255m * val), Program.Style.Schemes.Main.Colors.Back_Checked), LinearGradientMode.BackwardDiagonal); - lgbNonChecked = new LinearGradientBrush(MainRect, Color.FromArgb((int)Math.Round(255m * (1m - val)), Program.Style.Schemes.Main.Colors.Back_Checked), Color.FromArgb((int)Math.Round(255m * (1m - val)), Program.Style.Schemes.Main.Colors.Line_Checked_Hover), LinearGradientMode.BackwardDiagonal); - lgborderNonChecked = new LinearGradientBrush(MainRect, Color.FromArgb((int)Math.Round(255m * (1m - val)), Program.Style.Schemes.Main.Colors.Line_Checked), Color.FromArgb((int)Math.Round(255m * (1m - val)), Program.Style.Schemes.Main.Colors.Back_Checked), LinearGradientMode.ForwardDiagonal); + int alpha = (int)Math.Round(255m * val); + // ################################################################################# if (!DarkLight_Toggler) { + // Checked part + using (SolidBrush br = new(Color.FromArgb(alpha, scheme.Colors.AccentAlt))) { G.FillRoundedRect(br, MainRect, 9, true); } - using (SolidBrush br = new(Color.FromArgb((int)Math.Round(255m * val), Program.Style.Schemes.Main.Colors.Line_Checked_Hover))) - { - e.Graphics.FillRoundedRect(br, MainRect, 9, true); - } + using (Pen P = new(Color.FromArgb(alpha, scheme.Colors.AccentAlt))) { G.DrawRoundedRect_LikeW11(P, MainRect, 9, true); } - using (Pen P = new(Color.FromArgb((int)Math.Round(255m * val), Program.Style.Schemes.Main.Colors.Line_Checked))) - { - e.Graphics.DrawRoundedRect(P, MainRect, 9, true); - } + using (SolidBrush br = new(Color.FromArgb(alpha, scheme.Colors.ForeColor_Accent.IsDark() ? Color.White : Color.Black))) { G.FillEllipse(br, CheckC); } - using (Pen P = new(Color.FromArgb((int)Math.Round(255m * (1m - val)), BorderColor))) - { - e.Graphics.DrawRoundedRect(P, MainRect, 9, true); - } + // Non checked part + using (SolidBrush br = new(Color.FromArgb(255 - alpha, scheme.Colors.Back_Max))) { G.FillEllipse(br, CheckC); } - if (Checked) - { - using (SolidBrush br = new(Program.Style.DarkMode ? Color.Black : Color.White)) - { - G.FillEllipse(br, CheckC); - } - } - else - { - using (SolidBrush br = new(BorderColor)) - { - G.FillEllipse(br, CheckC); - } - } + using (Pen P = new(Color.FromArgb(255 - alpha, scheme.Colors.Line_Max))) { G.DrawRoundedRect(P, MainRect, 9, true); } } else { - - e.Graphics.FillRoundedRect(lgbChecked, MainRect, 9, true); - e.Graphics.FillRoundedRect(lgbNonChecked, MainRect, 9, true); + LinearGradientBrush lgbChecked = + new(MainRect, + Color.FromArgb(alpha, scheme.Colors.Accent), + Color.FromArgb(alpha, scheme.Colors.AccentAlt), + LinearGradientMode.ForwardDiagonal); + + LinearGradientBrush lgborderChecked = + new(MainRect, + Color.FromArgb(alpha, scheme.Colors.Accent), + Color.FromArgb(alpha, scheme.Colors.AccentAlt), + LinearGradientMode.BackwardDiagonal); + + LinearGradientBrush lgbNonChecked = + new(MainRect, Color.FromArgb(255 - alpha, scheme.Colors.AccentAlt), + Color.FromArgb(255 - alpha, scheme.Colors.Accent), + LinearGradientMode.BackwardDiagonal); + + LinearGradientBrush lgborderNonChecked = + new(MainRect, Color.FromArgb(255 - alpha, scheme.Colors.AccentAlt), + Color.FromArgb(255 - alpha, scheme.Colors.Accent), + LinearGradientMode.ForwardDiagonal); + + G.FillRoundedRect(lgbChecked, MainRect, 9, true); + G.FillRoundedRect(lgbNonChecked, MainRect, 9, true); if (Checked) { - G.DrawImage((BorderColor.IsDark() ? Properties.Resources.darkmode_dark : Properties.Resources.darkmode_light).Fade((double)val), CheckC); - G.DrawImage((BorderColor.IsDark() ? Properties.Resources.lightmode_dark : Properties.Resources.lightmode_light).Fade((double)(1m - val)), CheckC); + G.DrawImage((scheme.Colors.Line_Max.IsDark() ? Properties.Resources.darkmode_dark : Properties.Resources.darkmode_light).Fade((double)val), CheckC); + G.DrawImage((scheme.Colors.Line_Max.IsDark() ? Properties.Resources.lightmode_dark : Properties.Resources.lightmode_light).Fade((double)(1m - val)), CheckC); } else { - G.DrawImage((Program.Style.Schemes.Main.Colors.AccentAlt.IsDark() ? Properties.Resources.darkmode_dark : Properties.Resources.darkmode_light).Fade((double)val), CheckC); - G.DrawImage((Program.Style.Schemes.Main.Colors.AccentAlt.IsDark() ? Properties.Resources.lightmode_dark : Properties.Resources.lightmode_light).Fade((double)(1m - val)), CheckC); + G.DrawImage((scheme.Colors.AccentAlt.IsDark() ? Properties.Resources.darkmode_dark : Properties.Resources.darkmode_light).Fade((double)val), CheckC); + G.DrawImage((scheme.Colors.AccentAlt.IsDark() ? Properties.Resources.lightmode_dark : Properties.Resources.lightmode_light).Fade((double)(1m - val)), CheckC); } - using (Pen P = new(lgborderChecked)) - { - e.Graphics.DrawRoundedRect(P, MainRect, 9, true); - } - using (Pen P = new(lgborderNonChecked)) - { - e.Graphics.DrawRoundedRect(P, MainRect, 9, true); - } + using (Pen P = new(lgborderChecked)) { G.DrawRoundedRect_LikeW11(P, MainRect, 9, true); } + + using (Pen P = new(lgborderNonChecked)) { G.DrawRoundedRect_LikeW11(P, MainRect, 9, true); } + } + + base.OnPaint(e); } } } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/ContainersAndBoxes/AlertBox.cs b/WinPaletter/GUI/Elements/ContainersAndBoxes/AlertBox.cs index d60df87f..3368b74f 100644 --- a/WinPaletter/GUI/Elements/ContainersAndBoxes/AlertBox.cs +++ b/WinPaletter/GUI/Elements/ContainersAndBoxes/AlertBox.cs @@ -3,22 +3,19 @@ using System.Drawing.Drawing2D; using System.Drawing.Text; using System.Windows.Forms; -using static WinPaletter.UI.Style.Config; namespace WinPaletter.UI.WP { - [Description("AlertBox for WinPaletter UI")] public class AlertBox : ContainerControl { - public AlertBox() { TabStop = false; SetStyle(ControlStyles.AllPaintingInWmPaint | ControlStyles.UserPaint | ControlStyles.ResizeRedraw | ControlStyles.SupportsTransparentBackColor, true); DoubleBuffered = true; - Font = new Font("Segoe UI", 9f); - Size = new Size(200, 40); + Font = new("Segoe UI", 9f); + Size = new(200, 40); CenterText = false; CustomColor = Color.FromArgb(0, 81, 210); BackColor = Color.Transparent; @@ -53,14 +50,14 @@ public enum Close private Style _alertStyle; public Style AlertStyle { - get - { - return _alertStyle; - } + get => _alertStyle; set { - _alertStyle = value; - Invalidate(); + if (value != _alertStyle) + { + _alertStyle = value; + Invalidate(); + } } } @@ -79,7 +76,7 @@ protected override CreateParams CreateParams { get { - var cpar = base.CreateParams; + CreateParams cpar = base.CreateParams; if (!DesignMode) { cpar.ExStyle |= 0x20; @@ -95,8 +92,9 @@ protected override CreateParams CreateParams protected override void OnPaint(PaintEventArgs e) { - base.OnPaint(e); - var G = e.Graphics; + if (this == null) return; + + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; G.TextRenderingHint = TextRenderingHint.SystemDefault; DoubleBuffered = true; @@ -213,29 +211,52 @@ protected override void OnPaint(PaintEventArgs e) int TextX = 5; if (Image is not null) { G.DrawImage(Image, new Rectangle(!RTL ? 5 : Width - 5 - Image.Width, 5, Image.Width, Image.Height)); } - + if (!CenterText) { if (Image is null) { - using (SolidBrush br = new(textColor)) { G.DrawString(Text, Font, br, new Rectangle(TextX, 0, Width, Height), ContentAlignment.MiddleLeft.ToStringFormat(RTL)); } + using (StringFormat sf = ContentAlignment.MiddleLeft.ToStringFormat(RTL)) + { + using (SolidBrush br = new(textColor)) + { + G.DrawString(Text, Font, br, new Rectangle(TextX, 0, Width, Height), sf); + } + } } else if (!RTL) { - using (SolidBrush br = new(textColor)) { G.DrawString(Text, Font, br, new Rectangle(10 + Image.Width, 7, Width - (5 + Image.Width), Height - 10), ContentAlignment.TopLeft.ToStringFormat()); } + using (StringFormat sf = ContentAlignment.TopLeft.ToStringFormat()) + { + using (SolidBrush br = new(textColor)) + { + G.DrawString(Text, Font, br, new Rectangle(10 + Image.Width, 7, Width - (5 + Image.Width), Height - 10), sf); + } + } } else { - using (SolidBrush br = new(textColor)) + using (StringFormat sf = ContentAlignment.TopLeft.ToStringFormat(RTL)) { - G.DrawString(Text, Font, br, new Rectangle(0, 7, Width - (10 + Image.Width), Height - 10), ContentAlignment.TopLeft.ToStringFormat(RTL)); + using (SolidBrush br = new(textColor)) + { + G.DrawString(Text, Font, br, new Rectangle(0, 7, Width - (10 + Image.Width), Height - 10), sf); + } } } } else { - using (SolidBrush br = new(textColor)) { G.DrawString(Text, Font, br, new Rectangle(1, 0, Width, Height), ContentAlignment.MiddleCenter.ToStringFormat(RTL)); } + using (StringFormat sf = ContentAlignment.MiddleCenter.ToStringFormat(RTL)) + { + using (SolidBrush br = new(textColor)) + { + G.DrawString(Text, Font, br, new Rectangle(1, 0, Width, Height), sf); + } + } } + + base.OnPaint(e); } } } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/ContainersAndBoxes/AnimatedBox.cs b/WinPaletter/GUI/Elements/ContainersAndBoxes/AnimatedBox.cs index d5ed91d1..e8823ed3 100644 --- a/WinPaletter/GUI/Elements/ContainersAndBoxes/AnimatedBox.cs +++ b/WinPaletter/GUI/Elements/ContainersAndBoxes/AnimatedBox.cs @@ -6,7 +6,6 @@ namespace WinPaletter.UI.WP { - [Description("AnimatedBox with two colors for WinPaletter UI")] [DefaultEvent("Click")] public class AnimatedBox : ContainerControl @@ -18,10 +17,6 @@ public AnimatedBox() Text = string.Empty; BackColor = Color.Transparent; SetColors(); - HandleCreated += AnimatedBox_HandleCreated; - HandleDestroyed += AnimatedBox_HandleDestroyed; - Timer.Tick += Timer_Tick; - ControlAdded += AnimatedBox_ControlAdded; } #region Variables @@ -42,28 +37,28 @@ public enum Styles private Color _Color1 = Color.DodgerBlue; public Color Color1 { - get - { - return _Color1; - } + get => _Color1; set { - _Color1 = value; - SetColors(); + if (value != _Color1) + { + _Color1 = value; + SetColors(); + } } } private Color _Color2 = Color.Crimson; public Color Color2 { - get - { - return _Color2; - } + get => _Color2; set { - _Color2 = value; - SetColors(); + if (value != _Color2) + { + _Color2 = value; + SetColors(); + } } } @@ -87,8 +82,11 @@ public Color Color set { - _Color = value; - SetColors(); + if (value != _Color) + { + _Color = value; + SetColors(); + } } } @@ -111,7 +109,7 @@ protected override CreateParams CreateParams { get { - var cpar = base.CreateParams; + CreateParams cpar = base.CreateParams; if (!DesignMode) { cpar.ExStyle |= 0x20; @@ -161,10 +159,13 @@ private void Timer_Tick(object sender, EventArgs e) #endregion #region Events - private void AnimatedBox_HandleCreated(object sender, EventArgs e) + protected override void OnHandleCreated(EventArgs e) { if (!DesignMode) { + try { Timer.Tick += Timer_Tick; } + catch { } + try { FindForm().Activated += Form_GotFocus; } catch { } @@ -182,12 +183,17 @@ private void AnimatedBox_HandleCreated(object sender, EventArgs e) Timer.Enabled = false; Timer.Stop(); } + + base.OnHandleCreated(e); } - private void AnimatedBox_HandleDestroyed(object sender, EventArgs e) + protected override void OnHandleDestroyed(EventArgs e) { if (!DesignMode) { + try { Timer.Tick -= Timer_Tick; } + catch { } + try { FindForm().Activated -= Form_GotFocus; } catch { } @@ -197,6 +203,8 @@ private void AnimatedBox_HandleDestroyed(object sender, EventArgs e) try { FindForm().Deactivate -= Form_LostFocus; } catch { } } + + base.OnHandleDestroyed(e); } public void Form_GotFocus(object sender, EventArgs e) @@ -224,14 +232,18 @@ public void Form_LostFocus(object sender, EventArgs e) Invalidate(); } - private void AnimatedBox_ControlAdded(object sender, ControlEventArgs e) + protected override void OnControlAdded(ControlEventArgs e) { e.Control.DoubleBuffer(); + + base.OnControlAdded(e); } #endregion protected override void OnPaint(PaintEventArgs e) { + if (this == null) return; + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.HighSpeed; Rectangle Rect = new(0, 0, Width, Height); @@ -263,5 +275,4 @@ protected override void OnPaint(PaintEventArgs e) base.OnPaint(e); } } - } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/ContainersAndBoxes/GroupBox.cs b/WinPaletter/GUI/Elements/ContainersAndBoxes/GroupBox.cs index 446d601f..89e15de6 100644 --- a/WinPaletter/GUI/Elements/ContainersAndBoxes/GroupBox.cs +++ b/WinPaletter/GUI/Elements/ContainersAndBoxes/GroupBox.cs @@ -1,12 +1,10 @@ using System.ComponentModel; using System.Drawing; using System.Drawing.Drawing2D; -using System.IO; using System.Windows.Forms; namespace WinPaletter.UI.WP { - [Description("Themed GroupBox for WinPaletter UI")] [DefaultEvent("Click")] public class GroupBox : Panel @@ -31,7 +29,7 @@ protected override CreateParams CreateParams { get { - var cpar = base.CreateParams; + CreateParams cpar = base.CreateParams; if (!DesignMode) { cpar.ExStyle |= 0x20; @@ -47,8 +45,9 @@ protected override CreateParams CreateParams protected override void OnPaint(PaintEventArgs e) { - base.OnPaint(e); - var G = e.Graphics; + if (this == null) return; + + Graphics G = e.Graphics; DoubleBuffered = true; G.SmoothingMode = SmoothingMode.AntiAlias; @@ -56,7 +55,7 @@ protected override void OnPaint(PaintEventArgs e) if (!DesignMode) { - var ParentColor = this.GetParentColor(); + Color ParentColor = this.GetParentColor(); G.Clear(ParentColor); BackColor = ParentColor.CB((float)(ParentColor.IsDark() ? 0.04d : -0.05d)); @@ -69,6 +68,8 @@ protected override void OnPaint(PaintEventArgs e) { G.FillRectangle(Program.Style.Schemes.Main.Brushes.Back, Rect); } + + base.OnPaint(e); } } } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/Input/Button.cs b/WinPaletter/GUI/Elements/Input/Button.cs index fd9b7b1f..ce8836ef 100644 --- a/WinPaletter/GUI/Elements/Input/Button.cs +++ b/WinPaletter/GUI/Elements/Input/Button.cs @@ -19,35 +19,28 @@ public Button() _color = Colorize(); _lineColor = LineColor(_color); - hoverSize = Math.Max(Width, Height) + hoverFactor; - hoverFactor = hoverSize / 8; + _hoverSize = 0; - Font = new Font("Segoe UI", 9f); + Font = new("Segoe UI", 9f); Image = base.Image; if (Image is not null) { Flag = Flags.TintedOnHover; } - LostFocus += Button_LostFocus; - HandleCreated += Button_HandleCreated; - HandleDestroyed += Button_HandleDestroyed; - Timer.Tick += Timer_Tick; - Timer_Hover.Tick += Timer_Hover_Tick; - LocationChanged += Button_LocationChanged; + _alpha = 0; } #region Variables + private bool CanAnimate => !DesignMode && Program.Style.Animations && this != null && Visible && Parent != null && Parent.Visible && FindForm() != null && FindForm().Visible; + private Config.Scheme scheme1 = Program.Style.Schemes.Main; private Config.Scheme scheme2 = Program.Style.Schemes.Secondary; private Config.Scheme scheme3 = Program.Style.Schemes.Tertiary; private readonly TextureBrush Noise = new(Properties.Resources.GaussianBlur.Fade(0.6d)); - private bool _Shown = false; private Color imageColor; public MouseState State = MouseState.None; private Point hoverPosition; private Rectangle hoverRect; - private int hoverSize; - private int hoverFactor = 0; public enum MouseState { @@ -56,7 +49,7 @@ public enum MouseState Down } - private bool _ripple = true; + private bool _ripple = false; #endregion #region Properties @@ -67,10 +60,7 @@ public enum MouseState private Image _image; public new Image Image { - get - { - return _image; - } + get => _image; set { if (_image != value) @@ -91,17 +81,13 @@ public enum MouseState } } - private Color _color; + private Color _color; [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] [Browsable(false)] public Color Color { - get - { - return _color; - } - + get => _color; set { if (_color != value) @@ -117,11 +103,7 @@ public Color Color private Color _customColor; public Color CustomColor { - get - { - return _customColor; - } - + get => _customColor; set { if (_customColor != value) @@ -134,7 +116,6 @@ public Color CustomColor } } - private Color _lineColor; private Color _rippleColor; @@ -376,10 +357,7 @@ protected override CreateParams CreateParams private Flags _flag = Flags.None; public Flags Flag { - get - { - return _flag; - } + get => _flag; set { if (_flag != value) @@ -417,10 +395,19 @@ protected override void OnMouseEnter(EventArgs e) Animate(); - if (_Shown) + if (CanAnimate) { - Timer.Enabled = true; Timer.Start(); - Invalidate(); + FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); + + if (_ripple) + { + FluentTransitions.Transition.With(this, nameof(HoverSize), Math.Max(Width, Height)).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration_Quick)); + } + } + else + { + alpha = 255; + HoverSize = Math.Max(Width, Height); } base.OnMouseEnter(e); @@ -432,11 +419,19 @@ protected override void OnMouseLeave(EventArgs e) Animate(); - if (_Shown) + if (CanAnimate) { - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); + + if (_ripple) + { + FluentTransitions.Transition.With(this, nameof(HoverSize), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration_Quick)); + } + } + else + { + alpha = 0; + HoverSize = 0; } base.OnMouseLeave(e); @@ -448,11 +443,19 @@ protected override void OnMouseDown(MouseEventArgs e) Animate(); - if (_Shown) + if (CanAnimate) { - Timer.Enabled = true; Timer.Start(); - Timer_Hover.Enabled = true; Timer_Hover.Start(); - Invalidate(); + FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); + + if (_ripple) + { + FluentTransitions.Transition.With(this, nameof(HoverSize), Math.Max(Width, Height) * 5).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); + } + } + else + { + alpha = 0; + HoverSize = Math.Max(Width, Height) * 5; } base.OnMouseDown(e); @@ -462,18 +465,21 @@ protected override void OnMouseUp(MouseEventArgs e) { State = MouseState.Over; - hoverSize = Math.Max(Width, Height); - hoverRect = new((int)(hoverPosition.X - 0.5d * hoverSize), (int)(hoverPosition.Y - 0.5d * hoverSize), hoverSize, hoverSize); + if (CanAnimate) + { + FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); - if (_Shown) + if (_ripple) + { + FluentTransitions.Transition.With(this, nameof(HoverSize), Math.Max(Width, Height)).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration_Quick)); + } + } + else { - Timer.Enabled = true; Timer.Start(); - Invalidate(); + alpha = 255; + HoverSize = Math.Max(Width, Height); } - Animate(); - - base.OnMouseUp(e); } #endregion @@ -485,9 +491,20 @@ protected override void OnKeyDown(KeyEventArgs e) Animate(); - Timer_Hover.Enabled = true; Timer_Hover.Start(); + if (CanAnimate) + { + FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); - Invalidate(); + if (_ripple) + { + FluentTransitions.Transition.With(this, nameof(HoverSize), Math.Max(Width, Height) * 5).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); + } + } + else + { + alpha = 0; + HoverSize = Math.Max(Width, Height) * 5; + } base.OnKeyDown(e); } @@ -496,14 +513,11 @@ protected override void OnKeyUp(KeyEventArgs e) { State = MouseState.None; - hoverSize = Math.Max(Width, Height); - hoverRect = new((int)(hoverPosition.X - 0.5d * hoverSize), (int)(hoverPosition.Y - 0.5d * hoverSize), hoverSize, hoverSize); + _hoverSize = Math.Max(Width, Height); + hoverRect = new((int)(hoverPosition.X - 0.5d * _hoverSize), (int)(hoverPosition.Y - 0.5d * _hoverSize), _hoverSize, _hoverSize); - if (_Shown) { Timer.Enabled = true; Timer.Start(); } - - Animate(); - - Invalidate(); + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } base.OnKeyUp(e); } @@ -515,45 +529,61 @@ protected override void OnLeave(EventArgs e) Animate(); - if (_Shown) { Invalidate(); } + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } base.OnLeave(e); } protected override void OnMouseMove(MouseEventArgs mevent) { - if (_Shown && _ripple && State != MouseState.None) + if (CanAnimate && _ripple && State != MouseState.None) { hoverPosition = this.PointToClient(MousePosition); - hoverRect = new((int)(hoverPosition.X - 0.5d * hoverSize), (int)(hoverPosition.Y - 0.5d * hoverSize), hoverSize, hoverSize); + hoverRect.X = (int)(hoverPosition.X - 0.5d * _hoverSize); + hoverRect.Y = (int)(hoverPosition.Y - 0.5d * _hoverSize); Refresh(); } base.OnMouseMove(mevent); } - private void Button_LostFocus(object sender, EventArgs e) + protected override void OnLostFocus(EventArgs e) { State = MouseState.None; Animate(); - if (_Shown) { Invalidate(); } + if (CanAnimate) + { + FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); + + if (_ripple) + { + FluentTransitions.Transition.With(this, nameof(HoverSize), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration_Quick)); + } + } + else + { + alpha = 0; + HoverSize = 0; + } + + base.OnLostFocus(e); } - protected override void OnSizeChanged(EventArgs e) + protected override void OnEnabledChanged(EventArgs e) { - hoverSize = Math.Max(Width, Height); - hoverFactor = hoverSize / 8; - base.OnSizeChanged(e); + UpdateStyleSchemes(); + Refresh(); + + base.OnEnabledChanged(e); } public void UpdateStyleSchemes() { - Timer.Enabled = false; Timer.Stop(); - Timer_Hover.Enabled = false; Timer_Hover.Stop(); - alpha = 0; + HoverSize = 0; State = MouseState.None; scheme1 = Enabled ? Program.Style.Schemes.Main : Program.Style.Schemes.Disabled; @@ -566,178 +596,56 @@ public void UpdateStyleSchemes() Animate(); } - private void Button_HandleCreated(object sender, EventArgs e) - { - try - { - if (!DesignMode) - { - try - { - FindForm().Load += Loaded; - FindForm().Shown += Showed; - FindForm().FormClosed += Closed; - } - catch { } - } - alpha = 0; - } - catch { } - } - - private void Button_HandleDestroyed(object sender, EventArgs e) - { - try - { - if (!DesignMode) - { - try - { - FindForm().Load -= Loaded; - FindForm().Shown -= Showed; - FindForm().FormClosed -= Closed; - } - catch { } - } - } - catch { } - } - - private void Button_LocationChanged(object sender, EventArgs e) + protected override void OnLocationChanged(EventArgs e) { Refresh(); - } - - public void Loaded(object sender, EventArgs e) - { - _Shown = false; - Timer.Enabled = false; Timer.Stop(); - Timer_Hover.Enabled = false; Timer_Hover.Stop(); - } - - public void Showed(object sender, EventArgs e) - { - _Shown = true; - } - public void Closed(object sender, EventArgs e) - { - _Shown = false; - Timer.Enabled = false; Timer.Stop(); - Timer_Hover.Enabled = false; Timer_Hover.Stop(); + base.OnLocationChanged(e); } #endregion #region Animator private void Animate() { - if (!DesignMode & _Shown) + if (CanAnimate) { - if (State != MouseState.None) - { - hoverRect = new((int)(hoverPosition.X - 0.5d * hoverSize), (int)(hoverPosition.Y - 0.5d * hoverSize), hoverSize, hoverSize); - } + if (State != MouseState.None) { hoverRect = new((int)(hoverPosition.X - 0.5d * _hoverSize), (int)(hoverPosition.Y - 0.5d * _hoverSize), _hoverSize, _hoverSize); } FluentTransitions.Transition.With(this, nameof(Color), Colorize()).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } - } - - private int alpha; - private readonly int Factor = 15; - private readonly Timer Timer = new() { Enabled = false, Interval = 1 }; - private readonly Timer Timer_Hover = new() { Enabled = false, Interval = 1 }; - - private void Timer_Tick(object sender, EventArgs e) - { - try - { - if (!DesignMode) - { - - if (State == MouseState.Over) - { - if (alpha + Factor <= 255) - { - alpha += Factor; - } - else if (alpha + Factor > 255) - { - alpha = 255; - Timer.Enabled = false; - Timer.Stop(); - } - - if (_Shown) - { - System.Threading.Thread.Sleep(1); - Invalidate(); - } - } - - if (!(State == MouseState.Over)) - { - if (alpha - Factor >= 0) - { - alpha -= Factor; - } - else if (alpha - Factor < 0) - { - alpha = 0; - Timer.Enabled = false; - Timer.Stop(); - } - - if (_Shown) - { - System.Threading.Thread.Sleep(1); - Invalidate(); - } - - } - } - } - catch + else { + Color = Colorize(); } } - private void Timer_Hover_Tick(object sender, EventArgs e) - { - try - { - if (!DesignMode) - { - - if (State == MouseState.Down) - { - hoverSize += hoverFactor; - hoverRect = new((int)(hoverPosition.X - 0.5d * hoverSize), (int)(hoverPosition.Y - 0.5d * hoverSize), hoverSize, hoverSize); + private int _alpha = 0; - if (hoverSize > Math.Max(Width, Height) * 5) - { - hoverSize = Math.Max(Width, Height); - hoverRect = new((int)(hoverPosition.X - 0.5d * hoverSize), (int)(hoverPosition.Y - 0.5d * hoverSize), hoverSize, hoverSize); + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)] + public int alpha + { + get => _alpha; + set { _alpha = value; Refresh(); } + } - Timer_Hover.Enabled = false; - Timer_Hover.Stop(); - } + private int _hoverSize; - if (_Shown) - { - System.Threading.Thread.Sleep(1); - Refresh(); - } - } - } - } - catch + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)] + public int HoverSize + { + get => _hoverSize; + set { + _hoverSize = value; + hoverRect = new((int)(hoverPosition.X - 0.5d * _hoverSize), (int)(hoverPosition.Y - 0.5d * _hoverSize), _hoverSize, _hoverSize); } } #endregion protected override void OnPaint(PaintEventArgs e) { + if (this == null) return; + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; G.TextRenderingHint = TextRenderingHint.SystemDefault; @@ -761,7 +669,7 @@ protected override void OnPaint(PaintEventArgs e) if (!(State == MouseState.None)) { - if (_ripple) + if (_ripple && hoverRect.Width > 0 && hoverRect.Height > 0) { GraphicsPath path = Program.Style.RoundedCorners ? Rect.Round() : new GraphicsPath(); if (!Program.Style.RoundedCorners) { path.AddRectangle(Rect); } @@ -819,7 +727,7 @@ protected override void OnPaint(PaintEventArgs e) if (Height % Image.Height != 0) imageRect.Offset(0, 1); } - G.DrawImage(Image, imageRect); + G.DrawImage(Enabled ? _image : _image.Grayscale(), imageRect); } else @@ -842,7 +750,7 @@ protected override void OnPaint(PaintEventArgs e) if (Height % 2 != 0) TextAndImageRect.Offset(0, 1); } - G.DrawImage(Image, imageRect); + G.DrawImage(Enabled ? _image : _image.Grayscale(), imageRect); G.DrawString(Text, Font, fc, TextAndImageRect, sf); } else @@ -921,13 +829,16 @@ protected override void OnPaint(PaintEventArgs e) imageRect.Height = ImageSize.Height; } - G.DrawImage(Image, new Rectangle(imageRect.X, imageRect.Y, imageRect.Width + 1, imageRect.Height + 1)); + G.DrawImage(Enabled ? _image : _image.Grayscale(), new Rectangle(imageRect.X, imageRect.Y, imageRect.Width + 1, imageRect.Height + 1)); G.DrawString(Text, Font, fc, textRect, sf); } } } } #endregion + + // Never use base.OnPaint(e) for buttons, it will overwrite the previous graphics + // base.OnPaint(e); } private Rectangle GetImageRectangle(Rectangle rect, Size size, ContentAlignment contentAlignment) diff --git a/WinPaletter/GUI/Elements/Input/ComboBox.cs b/WinPaletter/GUI/Elements/Input/ComboBox.cs index 568664f3..e427275c 100644 --- a/WinPaletter/GUI/Elements/Input/ComboBox.cs +++ b/WinPaletter/GUI/Elements/Input/ComboBox.cs @@ -8,35 +8,24 @@ namespace WinPaletter.UI.WP { - [Description("Themed ComboBox for WinPaletter UI")] public class ComboBox : System.Windows.Forms.ComboBox { public ComboBox() { - Timer1 = new Timer() { Enabled = false, Interval = 1 }; - Timer2 = new Timer() { Enabled = false, Interval = 1 }; - SetStyle(ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor, true); DoubleBuffered = true; BackColor = Color.Transparent; - Size = new Size(190, 27); + Size = new(190, 27); DrawMode = DrawMode.OwnerDrawVariable; ItemHeight = 20; ForeColor = Color.White; DropDownStyle = ComboBoxStyle.DropDownList; - Font = new Font("Segoe UI", 9f); - - MouseWheel += ComboBox_MouseWheel; - MouseDown += ComboBox_MouseDown; - MouseUp += ComboBox_Click; - HandleCreated += ComboBox_HandleCreated; - DropDown += ComboBox_DropDown; - DropDownClosed += ComboBox_DropDownClosed; - Timer1.Tick += Timer1_Tick; - Timer2.Tick += Timer2_Tick; + Font = new("Segoe UI", 9f); + + _alpha = 0; _alpha2 = 0; } #region Properties @@ -47,7 +36,7 @@ protected override CreateParams CreateParams { get { - var cpar = base.CreateParams; + CreateParams cpar = base.CreateParams; if (!DesignMode) { cpar.ExStyle |= 0x20; @@ -62,12 +51,11 @@ protected override CreateParams CreateParams #endregion #region Variables + private bool CanAnimate => !DesignMode && Program.Style.Animations && this != null && Visible && Parent != null && Parent.Visible && FindForm() != null && FindForm().Visible; private readonly TextureBrush Noise = new(Properties.Resources.GaussianBlur.Fade(0.4d)); private readonly TextureBrush Noise2 = new(Properties.Resources.GaussianBlur.Fade(0.9d)); - private bool _Shown = false; - private MouseState State = MouseState.None; public enum MouseState @@ -82,7 +70,7 @@ public enum MouseState #region Voids protected void DrawTriangle(Color Clr, Point FirstPoint, Point SecondPoint, Point ThirdPoint, Graphics G) { - var points = new List() { FirstPoint, SecondPoint, ThirdPoint }; + List points = new() { FirstPoint, SecondPoint, ThirdPoint }; using (SolidBrush br = new(Clr)) { G.FillPolygon(br, points.ToArray()); @@ -91,34 +79,44 @@ protected void DrawTriangle(Color Clr, Point FirstPoint, Point SecondPoint, Poin #endregion #region Events - protected override void OnKeyDown(KeyEventArgs e) { if (e.KeyCode == Keys.Space) { this.DroppedDown = !this.DroppedDown; } + base.OnKeyDown(e); } protected override void OnMouseEnter(EventArgs e) { - base.OnMouseEnter(e); State = MouseState.Over; - _Shown = true; - Timer1.Enabled = true; - Timer1.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } + + base.OnMouseEnter(e); + } + + protected override void OnMouseDown(MouseEventArgs e) + { + State = MouseState.Down; + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } + + base.OnMouseDown(e); } protected override void OnMouseLeave(EventArgs e) { - base.OnMouseLeave(e); State = MouseState.None; - _Shown = true; - Timer1.Enabled = true; - Timer1.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } + + base.OnMouseLeave(e); } - private void ComboBox_MouseWheel(object sender, MouseEventArgs e) + protected override void OnMouseWheel(MouseEventArgs e) { try { @@ -137,148 +135,51 @@ private void ComboBox_MouseWheel(object sender, MouseEventArgs e) } } catch { } - } - private void ComboBox_MouseDown(object sender, MouseEventArgs e) - { - State = MouseState.Down; - _Shown = true; - Timer1.Enabled = true; - Timer1.Start(); - Invalidate(); + base.OnMouseWheel(e); } - private void ComboBox_Click(object sender, EventArgs e) + protected override void OnDropDown(EventArgs e) { - State = MouseState.Over; - _Shown = true; - Timer1.Enabled = true; - Timer1.Start(); - Invalidate(); - } + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha2), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha2 = 0; } - private void ComboBox_HandleCreated(object sender, EventArgs e) - { - alpha = 0; alpha2 = 0; + base.OnDropDown(e); } - private void ComboBox_DropDown(object sender, EventArgs e) + protected override void OnDropDownClosed(EventArgs e) { - if (_Shown) { Timer2.Enabled = true; Timer2.Start(); } - } + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha2), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha2 = 255; } - private void ComboBox_DropDownClosed(object sender, EventArgs e) - { - if (_Shown) { Timer2.Enabled = true; Timer2.Start(); } + base.OnDropDownClosed(e); } - #endregion #region Animator - private int alpha, alpha2; - private readonly int Factor = 20; - private Timer Timer1, Timer2; + private int _alpha = 0; + private int _alpha2 = 255; - private void Timer1_Tick(object sender, EventArgs e) + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)] + public int alpha { - if (!DesignMode) - { - - if (State == MouseState.Over) - { - if (alpha + Factor <= 255) - { - alpha += Factor; - } - else if (alpha + Factor > 255) - { - alpha = 255; - Timer1.Enabled = false; - Timer1.Stop(); - } - - if (_Shown) - { - System.Threading.Thread.Sleep(1); - Invalidate(); - } - } - - if (!(State == MouseState.Over)) - { - if (alpha - Factor >= 0) - { - alpha -= Factor; - } - else if (alpha - Factor < 0) - { - alpha = 0; - Timer1.Enabled = false; - Timer1.Stop(); - } - - if (_Shown) - { - System.Threading.Thread.Sleep(1); - Invalidate(); - } - } - } + get => _alpha; + set { _alpha = value; Refresh(); } } - private void Timer2_Tick(object sender, EventArgs e) - { - if (!DesignMode) - { - if (DroppedDown) - { - if (alpha2 + Factor <= 255) - { - alpha2 += Factor; - } - else if (alpha2 + Factor > 255) - { - alpha2 = 255; - Timer2.Enabled = false; - Timer2.Stop(); - } - - if (_Shown) - { - System.Threading.Thread.Sleep(1); - Invalidate(); - } - } - - if (!DroppedDown) - { - if (alpha2 - Factor >= 0) - { - alpha2 -= Factor; - } - else if (alpha2 - Factor < 0) - { - alpha2 = 0; - Timer2.Enabled = false; - Timer2.Stop(); - } - - if (_Shown) - { - System.Threading.Thread.Sleep(1); - Invalidate(); - } - } - } + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)] + public int alpha2 + { + get => _alpha2; + set { _alpha2 = value; Refresh(); } } - #endregion protected override void OnDrawItem(DrawItemEventArgs e) { - base.OnDrawItem(e); + if (this == null) return; Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; @@ -307,7 +208,7 @@ protected override void OnDrawItem(DrawItemEventArgs e) if (e.Index >= 0) { - var Rect = e.Bounds; Rect.X += 2; Rect.Y += 1; Rect.Width -= 2; + Rectangle Rect = e.Bounds; Rect.X += 2; Rect.Y += 1; Rect.Width -= 2; using (StringFormat sf = new() { LineAlignment = StringAlignment.Center, Alignment = StringAlignment.Near, FormatFlags = StringFormatFlags.NoWrap, Trimming = StringTrimming.EllipsisCharacter }) { @@ -318,10 +219,14 @@ protected override void OnDrawItem(DrawItemEventArgs e) } } } + + base.OnDrawItem(e); } protected override void OnPaint(PaintEventArgs e) { + if (this == null) return; + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; G.TextRenderingHint = DesignMode ? TextRenderingHint.ClearTypeGridFit : TextRenderingHint.SystemDefault; @@ -363,7 +268,7 @@ protected override void OnPaint(PaintEventArgs e) Point point_CenterTop = new(Width - 14, Arrow_Y_1); - if (Focused) { G.DrawRoundedRect(scheme.Pens.Line_Checked, OuterRect); } + if (Focused) { G.DrawRoundedRect(scheme.Pens.Line_Checked, InnerRect); } Color Triangle1 = Color.FromArgb(255 - alpha2, !Focused ? ForeColor : scheme.Colors.Line_Checked_Hover); using (Pen P = new(Triangle1, 2f)) @@ -381,9 +286,11 @@ protected override void OnPaint(PaintEventArgs e) { using (SolidBrush br = new(ForeColor)) { - G.DrawString((SelectedItem ?? "").ToString(), Font, br, TextRect, sf); + G.DrawString((SelectedItem ?? string.Empty).ToString(), Font, br, TextRect, sf); } } + + base.OnPaint(e); } } } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/Input/NumericUpDown.cs b/WinPaletter/GUI/Elements/Input/NumericUpDown.cs index cccd6374..44b0250e 100644 --- a/WinPaletter/GUI/Elements/Input/NumericUpDown.cs +++ b/WinPaletter/GUI/Elements/Input/NumericUpDown.cs @@ -7,7 +7,6 @@ namespace WinPaletter.UI.WP { - [Description("Themed NumericUpDown for WinPaletter UI")] public class NumericUpDown : Control { @@ -16,19 +15,12 @@ public NumericUpDown() SetStyle(ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor, true); DoubleBuffered = true; BackColor = Color.Transparent; - Timer = new Timer() { Enabled = false, Interval = 1 }; - - Enabled = true; - MouseDown += NumericUpDown_MouseDown; - HandleCreated += NumericUpDown_HandleCreated; - HandleDestroyed += NumericUpDown_HandleDestroyed; - Timer.Tick += Timer_Tick; } #region Variables + private bool CanAnimate => !DesignMode && Program.Style.Animations && this != null && Visible && Parent != null && Parent.Visible && FindForm() != null && FindForm().Visible; - private bool _Shown = false; - private Rectangle SideRect = new Rectangle(); + private Rectangle SideRect = new(); private MouseState State = MouseState.None; @@ -48,77 +40,47 @@ public enum MouseState private int _Value; public int Value { - get - { - return _Value; - } + get => _Value; set { - switch (value) + if (value != _Value) { - case var @case when @case > Maximum: - { - value = Maximum; - Invalidate(); - break; - } - - case var case1 when case1 < Minimum: - { - value = Minimum; - Invalidate(); - break; - } + if (value > Maximum) value = Maximum; + if (value > Minimum) value = Minimum; + _Value = value; + Invalidate(); + ValueChanged?.Invoke(this, EventArgs.Empty); } - _Value = value; - Invalidate(); - ValueChanged?.Invoke(this, EventArgs.Empty); } } - private int _Max = 100; public int Maximum { - get - { - return _Max; - } + get => _Max; set { - switch (value) + if (value != _Max) { - case var @case when @case < _Value: - { - _Value = value; - break; - } + _Max = value; + if (value < _Value) Value = value; + Invalidate(); } - _Max = value; - Invalidate(); } } - private int _Min; public int Minimum { - get - { - return _Min; - } + get => _Min; set { - switch (value) + if (value != _Min) { - case var @case when @case > _Value: - { - _Value = value; - break; - } + _Min = value; + if (value > _Value) Value = value; + Invalidate(); } - _Min = value; - Invalidate(); } } @@ -133,7 +95,7 @@ protected override CreateParams CreateParams { get { - var cpar = base.CreateParams; + CreateParams cpar = base.CreateParams; if (!DesignMode) { cpar.ExStyle |= 0x20; @@ -147,63 +109,7 @@ protected override CreateParams CreateParams } #endregion - #region Animator - - private int alpha; - private readonly int Factor = 20; - private Timer Timer; - - private void Timer_Tick(object sender, EventArgs e) - { - if (!DesignMode) - { - - if (State == MouseState.Over) - { - if (alpha + Factor <= 255) - { - alpha += Factor; - } - else if (alpha + Factor > 255) - { - alpha = 255; - Timer.Enabled = false; - Timer.Stop(); - } - - if (_Shown) - { - System.Threading.Thread.Sleep(1); - Invalidate(); - } - } - - if (!(State == MouseState.Over)) - { - if (alpha - Factor >= 0) - { - alpha -= Factor; - } - else if (alpha - Factor < 0) - { - alpha = 0; - Timer.Enabled = false; - Timer.Stop(); - } - - if (_Shown) - { - System.Threading.Thread.Sleep(1); - Invalidate(); - } - } - } - } - - #endregion - #region Events - public event ValueChangedEventHandler ValueChanged; public delegate void ValueChangedEventHandler(object sender, EventArgs e); @@ -212,55 +118,49 @@ protected override void OnMouseWheel(MouseEventArgs e) { if (e.Delta < 0) { - if (Value < Maximum) - { - if (e.Delta <= -240) - Value = Math.Max(Minimum, Value - UpDownStep * 2); - else - Value = Math.Max(Minimum, Value - UpDownStep); - } + if (e.Delta <= -240) + Value = Math.Max(Minimum, Value - UpDownStep * 2); + else + Value = Math.Max(Minimum, Value - UpDownStep); } else { - if (Value > Minimum) - { - if (e.Delta >= 240) - Value = Math.Min(Maximum, Value + UpDownStep * 2); - else - Value = Math.Min(Maximum, Value + UpDownStep); - } + if (e.Delta >= 240) + Value = Math.Min(Maximum, Value + UpDownStep * 2); + else + Value = Math.Min(Maximum, Value + UpDownStep); } + base.OnMouseWheel(e); } protected override void OnMouseEnter(EventArgs e) { - base.OnMouseEnter(e); State = MouseState.Over; - _Shown = true; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } + + base.OnMouseEnter(e); } protected override void OnMouseLeave(EventArgs e) { - base.OnMouseLeave(e); State = MouseState.None; - _Shown = true; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } + + base.OnMouseLeave(e); } protected override void OnMouseUp(MouseEventArgs e) { State = MouseState.Over; - _Shown = true; - Timer.Enabled = true; - Timer.Start(); - base.OnMouseUp(e); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } if (Enabled) { @@ -273,72 +173,46 @@ protected override void OnMouseUp(MouseEventArgs e) Value -= UpDownStep; } } + + base.OnMouseUp(e); } protected override void OnResize(EventArgs e) { Invalidate(); + + base.OnResize(e); } - private void NumericUpDown_MouseDown(object sender, MouseEventArgs e) + protected override void OnMouseDown(MouseEventArgs e) { State = MouseState.Down; - _Shown = true; if (Enabled & SideRect.Contains(e.Location)) { - Timer.Enabled = true; - Timer.Start(); + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } } - } - private void NumericUpDown_HandleCreated(object sender, EventArgs e) - { - alpha = 0; - - if (!DesignMode) - { - try - { - FindForm().Load += Loaded; - FindForm().Shown += Showed; - } - catch - { - } - } - } - - private void NumericUpDown_HandleDestroyed(object sender, EventArgs e) - { - if (!DesignMode) - { - try - { - FindForm().Load -= Loaded; - FindForm().Shown -= Showed; - } - catch - { - } - } - } - - public void Loaded(object sender, EventArgs e) - { - _Shown = false; + base.OnMouseDown(e); } + #endregion - public void Showed(object sender, EventArgs e) + #region Animator + private int _alpha = 0; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)] + public int alpha { - _Shown = true; - Invalidate(); + get => _alpha; + set { _alpha = value; Refresh(); } } #endregion protected override void OnPaint(PaintEventArgs e) { - var G = e.Graphics; + if (this == null) return; + + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; G.TextRenderingHint = DesignMode ? TextRenderingHint.ClearTypeGridFit : TextRenderingHint.SystemDefault; DoubleBuffered = true; @@ -350,9 +224,9 @@ protected override void OnPaint(PaintEventArgs e) Config.Scheme scheme = Enabled ? Program.Style.Schemes.Main : Program.Style.Schemes.Disabled; // ################################################################################# Customizer - var OuterRect = new Rectangle(0, 0, Width - 1, Height - 1); - var InnerRect = new Rectangle(1, 1, Width - 3, Height - 3); - SideRect = new Rectangle(Width - 18, 0, 17, Height); + Rectangle OuterRect = new(0, 0, Width - 1, Height - 1); + Rectangle InnerRect = new(1, 1, Width - 3, Height - 3); + SideRect = new(Width - 18, 0, 17, Height); if (RTL) { @@ -384,8 +258,15 @@ protected override void OnPaint(PaintEventArgs e) } } - using (SolidBrush TextColor = new(ForeColor)) { G.DrawString($"{Value}", Fonts.ConsoleMedium, TextColor, new Rectangle(0, 1, Width - SideRect.Width, Height), ContentAlignment.MiddleCenter.ToStringFormat()); } + using (StringFormat sf = ContentAlignment.MiddleCenter.ToStringFormat()) + { + using (SolidBrush TextColor = new(ForeColor)) + { + G.DrawString($"{Value}", Fonts.ConsoleMedium, TextColor, new Rectangle(0, 1, Width - SideRect.Width, Height), sf); + } + } + + base.OnPaint(e); } } - } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/Input/TextBox.cs b/WinPaletter/GUI/Elements/Input/TextBox.cs index b891175e..84334bf7 100644 --- a/WinPaletter/GUI/Elements/Input/TextBox.cs +++ b/WinPaletter/GUI/Elements/Input/TextBox.cs @@ -14,11 +14,9 @@ public class TextBox : Control { public TextBox() { - Timer = new Timer() { Enabled = false, Interval = 1 }; - - TB = new System.Windows.Forms.TextBox() + TB = new() { - Font = new Font("Segoe UI", 9f), + Font = new("Segoe UI", 9f), Text = Text, ForeColor = ForeColor, MaxLength = _MaxLength, @@ -26,7 +24,7 @@ public TextBox() ReadOnly = _ReadOnly, UseSystemPasswordChar = _UseSystemPasswordChar, BorderStyle = BorderStyle.None, - Location = new Point(1, 0), + Location = new(1, 0), Width = Width, Cursor = Cursors.IBeam, ScrollBars = Scrollbars, @@ -39,14 +37,10 @@ public TextBox() BackColor = Color.Transparent; DoubleBuffered = true; - - HandleCreated += TextBox_HandleCreated; - HandleDestroyed += TextBox_HandleDestroyed; - Timer.Tick += Timer_Tick; - ForeColorChanged += TextBox_ForeColorChanged; } #region Variables + private bool CanAnimate => !DesignMode && Program.Style.Animations && this != null && Visible && Parent != null && Parent.Visible && FindForm() != null && FindForm().Visible; public System.Windows.Forms.TextBox _TB; @@ -81,7 +75,6 @@ private System.Windows.Forms.TextBox TB } } } - private bool _Shown = false; private MouseState State = MouseState.None; @@ -104,16 +97,13 @@ public enum MouseState : byte [Category("Options")] public HorizontalAlignment TextAlign { - get - { - return _TextAlign; - } + get => _TextAlign; set { - _TextAlign = value; - if (TB is not null) + if (value != _TextAlign) { - TB.TextAlign = value; + _TextAlign = value; + if (TB is not null) { TB.TextAlign = value; } } } } @@ -123,16 +113,13 @@ public HorizontalAlignment TextAlign [Category("Options")] public int MaxLength { - get - { - return _MaxLength; - } + get => _MaxLength; set { - _MaxLength = value; - if (TB is not null) + if (value != _MaxLength) { - TB.MaxLength = value; + _MaxLength = value; + if (TB is not null) { TB.MaxLength = value; } } } } @@ -142,16 +129,13 @@ public int MaxLength [Category("Options")] public bool ReadOnly { - get - { - return _ReadOnly; - } + get => _ReadOnly; set { - _ReadOnly = value; - if (TB is not null) + if (value != _ReadOnly) { - TB.ReadOnly = value; + _ReadOnly = value; + if (TB is not null) { TB.ReadOnly = value; } } } } @@ -161,16 +145,13 @@ public bool ReadOnly [Category("Options")] public bool UseSystemPasswordChar { - get - { - return _UseSystemPasswordChar; - } + get => _UseSystemPasswordChar; set { - _UseSystemPasswordChar = value; - if (TB is not null) + if (value != _UseSystemPasswordChar) { - TB.UseSystemPasswordChar = value; + _UseSystemPasswordChar = value; + if (TB is not null) { TB.UseSystemPasswordChar = value; } } } } @@ -180,26 +161,25 @@ public bool UseSystemPasswordChar [Category("Options")] public bool Multiline { - get - { - return _Multiline; - } + get => _Multiline; set { - _Multiline = value; - if (TB is not null) + if (value != _Multiline) { - TB.Multiline = value; - - if (value) - { - TB.Height = Height - 8; - } - else + _Multiline = value; + if (TB is not null) { - Height = TB.Height + 8; + TB.Multiline = value; + + if (value) + { + TB.Height = Height - 8; + } + else + { + Height = TB.Height + 8; + } } - } } } @@ -212,16 +192,13 @@ public bool Multiline [Category("Options")] public override string Text { - get - { - return base.Text; - } + get => base.Text; set { - base.Text = value; - if (TB is not null) + if (value != base.Text) { - TB.Text = value; + base.Text = value; + if (TB is not null) { TB.Text = value; } } } } @@ -229,22 +206,22 @@ public override string Text [Category("Options")] public override Font Font { - get - { - return base.Font; - } + get => base.Font; set { - base.Font = value; - if (TB is not null) + if (value != base.Font) { - TB.Font = value; - TB.Location = new Point(3, 4); - TB.Width = Width; - - if (!_Multiline) + base.Font = value; + if (TB is not null) { - Height = TB.Height + 8; + TB.Font = value; + TB.Location = new(3, 4); + TB.Width = Width; + + if (!_Multiline) + { + Height = TB.Height + 8; + } } } } @@ -253,64 +230,55 @@ public override Font Font private ScrollBars _Scrollbars = ScrollBars.None; public ScrollBars Scrollbars { - get - { - return _Scrollbars; - } + get => _Scrollbars; set { - _Scrollbars = value; - TB.ScrollBars = value; + if (value != _Scrollbars) + { + _Scrollbars = value; + TB.ScrollBars = value; + } } } private bool _WordWrap = true; public bool WordWrap { - get - { - return _WordWrap; - } + get => _WordWrap; set { - _WordWrap = value; - TB.WordWrap = value; + if (value != _WordWrap) + { + _WordWrap = value; + TB.WordWrap = value; + } } } public int SelectionStart { - get - { - return TB.SelectionStart; - } + get => TB.SelectionStart; set { - TB.SelectionStart = value; + if (value != TB.SelectionStart) { TB.SelectionStart = value; } } } public int SelectionLength { - get - { - return TB.SelectionLength; - } + get => TB.SelectionLength; set { - TB.SelectionLength = value; + if (value != TB.SelectionLength) { TB.SelectionLength = value; } } } public string SelectedText { - get - { - return TB.SelectedText; - } + get => TB.SelectedText; set { - TB.SelectedText = value; + if (value != TB.SelectedText) { TB.SelectedText = value; } } } @@ -318,7 +286,7 @@ protected override CreateParams CreateParams { get { - var cpar = base.CreateParams; + CreateParams cpar = base.CreateParams; if (!DesignMode) { cpar.ExStyle |= 0x20; @@ -341,11 +309,12 @@ protected override CreateParams CreateParams protected override void OnCreateControl() { - base.OnCreateControl(); if (!Controls.Contains(TB)) { Controls.Add(TB); } + + base.OnCreateControl(); } private void OnBaseTextChanged(object s, EventArgs e) @@ -374,7 +343,7 @@ public void OnKeyPress(object s, KeyPressEventArgs e) protected override void OnResize(EventArgs e) { - TB.Location = new Point(4, 4); + TB.Location = new(4, 4); TB.Width = Width - TB.Location.X * 2; if (_Multiline) @@ -391,204 +360,140 @@ protected override void OnResize(EventArgs e) protected override void OnMouseDown(MouseEventArgs e) { - base.OnMouseDown(e); State = MouseState.Down; - _Shown = true; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } + + base.OnMouseDown(e); } protected override void OnMouseUp(MouseEventArgs e) { - base.OnMouseUp(e); State = MouseState.Over; - _Shown = true; - Timer.Enabled = true; - Timer.Start(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } + TB.Focus(); - Invalidate(); + + base.OnMouseUp(e); } protected override void OnMouseEnter(EventArgs e) { - base.OnMouseEnter(e); State = MouseState.Over; - _Shown = true; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } + + + base.OnMouseEnter(e); } protected override void OnMouseLeave(EventArgs e) { - base.OnMouseLeave(e); State = MouseState.None; - _Shown = true; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } + + + base.OnMouseLeave(e); } private void TB_MouseDown(object sender, MouseEventArgs e) { State = MouseState.Down; - _Shown = true; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } } private void TB_MouseEnter(object sender, EventArgs e) { State = MouseState.Over; - _Shown = true; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } } private void TB_MouseLeave(object sender, EventArgs e) { State = MouseState.None; - _Shown = true; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } } private void TB_LostFocus(object sender, EventArgs e) { State = MouseState.None; - Invalidate(); - } - protected override void OnHandleCreated(EventArgs e) - { - try - { - if (!DesignMode) - { - base.OnHandleCreated(e); - alpha = 0; - } - } - catch - { - } + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } } - private void TextBox_HandleCreated(object sender, EventArgs e) + protected override void OnHandleCreated(EventArgs e) { alpha = 0; + if (!DesignMode) { try { - FindForm().Load += Loaded; - FindForm().Shown += Showed; TB.TextChanged += OnBaseTextChanged; TB.KeyDown += OnBaseKeyDown; TB.KeyPress += OnKeyPress; } - catch - { - } + catch { } } + + base.OnHandleCreated(e); } - private void TextBox_HandleDestroyed(object sender, EventArgs e) + protected override void OnHandleDestroyed(EventArgs e) { if (!DesignMode) { try { - FindForm().Load -= Loaded; - FindForm().Shown -= Showed; TB.TextChanged -= OnBaseTextChanged; TB.KeyDown -= OnBaseKeyDown; TB.KeyPress -= OnKeyPress; } - catch - { - } + catch { } } + + base.OnHandleDestroyed(e); } - private void TextBox_ForeColorChanged(object sender, EventArgs e) + protected override void OnForeColorChanged(EventArgs e) { TB.ForeColor = ForeColor; Refresh(); - } - public void Loaded(object sender, EventArgs e) - { - _Shown = false; - } - - public void Showed(object sender, EventArgs e) - { - _Shown = true; + base.OnForeColorChanged(e); } #endregion #region Animator - private int alpha; - private readonly int Factor = 20; - private Timer Timer; - - private void Timer_Tick(object sender, EventArgs e) + private int _alpha = 0; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)] + public int alpha { - if (!DesignMode) - { - - if (State == MouseState.Over) - { - if (alpha + Factor <= 255) - { - alpha += Factor; - } - else if (alpha + Factor > 255) - { - alpha = 255; - Timer.Enabled = false; - Timer.Stop(); - } - - if (_Shown) - { - System.Threading.Thread.Sleep(1); - Invalidate(); - } - } - - if (!(State == MouseState.Over)) - { - if (alpha - Factor >= 0) - { - alpha -= Factor; - } - else if (alpha - Factor < 0) - { - alpha = 0; - Timer.Enabled = false; - Timer.Stop(); - } - - if (_Shown) - { - System.Threading.Thread.Sleep(1); - Invalidate(); - } - } - } + get => _alpha; + set { _alpha = value; Refresh(); } } - #endregion protected override void OnPaint(PaintEventArgs e) { + if (this == null) return; + Graphics G = e.Graphics; DoubleBuffered = true; @@ -600,8 +505,8 @@ protected override void OnPaint(PaintEventArgs e) G.SmoothingMode = SmoothingMode.AntiAlias; G.TextRenderingHint = TextRenderingHint.SystemDefault; - var OuterRect = new Rectangle(0, 0, Width - 1, Height - 1); - var InnerRect = new Rectangle(1, 1, Width - 3, Height - 3); + Rectangle OuterRect = new(0, 0, Width - 1, Height - 1); + Rectangle InnerRect = new(1, 1, Width - 3, Height - 3); Color Line = scheme.Colors.Line_Checked; Color LineHover = scheme.Colors.Back_Hover; @@ -612,7 +517,7 @@ protected override void OnPaint(PaintEventArgs e) { G.FillRoundedRect(scheme.Brushes.Back_Checked, OuterRect); - G.DrawRoundedRect_LikeW11(scheme.Pens.Line_Hover, OuterRect); + G.DrawRoundedRect_LikeW11(scheme.Pens.Line_Checked_Hover, OuterRect); _TB.BackColor = scheme.Colors.Back_Checked; } diff --git a/WinPaletter/GUI/Elements/Labels/LabelAlt.cs b/WinPaletter/GUI/Elements/Labels/LabelAlt.cs index d6c1447b..9b1210ef 100644 --- a/WinPaletter/GUI/Elements/Labels/LabelAlt.cs +++ b/WinPaletter/GUI/Elements/Labels/LabelAlt.cs @@ -1,5 +1,4 @@ -using System; -using System.ComponentModel; +using System.ComponentModel; using System.Drawing; using System.Drawing.Drawing2D; using System.Windows.Forms; @@ -18,13 +17,6 @@ public LabelAlt() BackColor = Color.Transparent; } - #region Variables - - private IntPtr _textHdc = IntPtr.Zero; - private IntPtr _dibSectionRef; - - #endregion - #region Properties public bool DrawOnGlass { get; set; } = false; @@ -33,8 +25,8 @@ protected override CreateParams CreateParams { get { - var cpar = base.CreateParams; - if (!DesignMode) + CreateParams cpar = base.CreateParams; + if (!DesignMode && DrawOnGlass) { cpar.ExStyle |= 0x20; return cpar; @@ -50,7 +42,7 @@ protected override CreateParams CreateParams #region Voids/Functions protected TextFormatFlags ReturnFormatFlags(string Text = "") { - var format = TextFormatFlags.Default; + TextFormatFlags format = TextFormatFlags.Default; if (TextAlign == ContentAlignment.BottomCenter) { @@ -121,8 +113,9 @@ protected TextFormatFlags ReturnFormatFlags(string Text = "") protected override void OnPaint(PaintEventArgs e) { - Graphics G = e.Graphics; + if (this == null) return; + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; G.TextRenderingHint = Program.Style.RenderingHint; @@ -135,7 +128,13 @@ protected override void OnPaint(PaintEventArgs e) { if (DesignMode || !DrawOnGlass) { - using (SolidBrush br = new(ForeColor)) { G.DrawString(Text, Font, br, new Rectangle(0, 0, Width, Height), base.TextAlign.ToStringFormat()); } + using (StringFormat sf = TextAlign.ToStringFormat()) + { + using (SolidBrush br = new(ForeColor)) + { + G.DrawString(Text, Font, br, new Rectangle(0, 0, Width, Height), sf); + } + } } else if (!DesignMode & DrawOnGlass) @@ -145,10 +144,17 @@ protected override void OnPaint(PaintEventArgs e) } catch { - using (SolidBrush br = new(ForeColor)) { G.DrawString(Text, Font, br, new Rectangle(0, 0, Width, Height), base.TextAlign.ToStringFormat()); } + using (StringFormat sf = TextAlign.ToStringFormat()) + { + using (SolidBrush br = new(ForeColor)) + { + G.DrawString(Text, Font, br, new Rectangle(0, 0, Width, Height), sf); + } + } } - } + // Don't use base.OnPaint(e) to avoid doubling graphics bug + //// base.OnPaint(e); + } } - } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/Labels/LinkLabel.cs b/WinPaletter/GUI/Elements/Labels/LinkLabel.cs index 61a6dd12..ae2cc39d 100644 --- a/WinPaletter/GUI/Elements/Labels/LinkLabel.cs +++ b/WinPaletter/GUI/Elements/Labels/LinkLabel.cs @@ -4,11 +4,9 @@ namespace WinPaletter.UI.WP { - [Description("LinkLabel but with a proper hand cursor")] public class LinkLabel : System.Windows.Forms.LinkLabel { - private const int WM_SETCURSOR = 32; private const int IDC_HAND = 32649; @@ -24,7 +22,5 @@ protected override void WndProc(ref Message m) base.WndProc(ref m); } - } - } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/Labels/ToolStripStatusLabel.cs b/WinPaletter/GUI/Elements/Labels/ToolStripStatusLabel.cs index 1dcbfb50..d71f3af9 100644 --- a/WinPaletter/GUI/Elements/Labels/ToolStripStatusLabel.cs +++ b/WinPaletter/GUI/Elements/Labels/ToolStripStatusLabel.cs @@ -4,23 +4,31 @@ namespace WinPaletter.UI.WP { - [Description("ToolStripStatusLabel fixed to respect dark/light mode")] public class ToolStripStatusLabel : System.Windows.Forms.ToolStripStatusLabel { protected override void OnPaint(PaintEventArgs e) { - e.Graphics.TextRenderingHint = Program.Style.RenderingHint; + if (this == null) return; + + Graphics G = e.Graphics; + + G.TextRenderingHint = Program.Style.RenderingHint; using (SolidBrush br = new(BackColor)) { - e.Graphics.FillRectangle(br, new Rectangle(0, 0, Width, Height)); + G.FillRectangle(br, new Rectangle(0, 0, Width, Height)); } - using (SolidBrush br = new(ForeColor)) + + using (StringFormat sf = base.TextAlign.ToStringFormat()) { - e.Graphics.DrawString(Text, Font, br, new Rectangle(0, 0, Width, Height), base.TextAlign.ToStringFormat()); + using (SolidBrush br = new(ForeColor)) + { + G.DrawString(Text, Font, br, new Rectangle(0, 0, Width, Height), sf); + } } + + base.OnPaint(e); } } - } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/Others/ProgressBar.cs b/WinPaletter/GUI/Elements/Others/ProgressBar.cs index b1d62b45..da9a33f9 100644 --- a/WinPaletter/GUI/Elements/Others/ProgressBar.cs +++ b/WinPaletter/GUI/Elements/Others/ProgressBar.cs @@ -19,12 +19,12 @@ public ProgressBar() DoubleBuffered = true; BackColor = Color.Transparent; taskbarList.HrInit(); - HandleCreated += ProgressBar_HandleCreated; - HandleDestroyed += ProgressBar_HandleDestroyed; StyleChanged += ProgressBar_StyleChanged; } #region Variables + private bool CanAnimate => !DesignMode && Program.Style.Animations && this != null && Visible && Parent != null && Parent.Visible && FindForm() != null && FindForm().Visible; + readonly Interfaces.ITaskbarList3 taskbarList = (Interfaces.ITaskbarList3)new Interfaces.CTaskbarList(); private IntPtr FormHwnd = IntPtr.Zero; private readonly TextureBrush Noise = new(Properties.Resources.GaussianBlur); @@ -34,15 +34,19 @@ public ProgressBar() public event EventHandler StyleChanged; public event EventHandler ValueChanged; - private void ProgressBar_HandleCreated(object sender, EventArgs e) + protected override void OnHandleCreated(EventArgs e) { if (!DesignMode) FormHwnd = FindForm().Handle; + + base.OnHandleCreated(e); } - private void ProgressBar_HandleDestroyed(object sender, EventArgs e) + protected override void OnHandleDestroyed(EventArgs e) { SetProgressValue(0); SetProgressState(TaskbarProgressBarState.NoProgress); + + base.OnHandleDestroyed(e); } protected virtual void OnStyleChanged(EventArgs e) @@ -59,13 +63,15 @@ protected virtual void OnStyleChanged(EventArgs e) DoMarqueeAnimation1(); Refresh(); StyleChanged?.Invoke(this, e); + + base.OnStyleChanged(e); } private void DoMarqueeAnimation1() { if (!DesignMode && Style == ProgressBarStyle.Marquee) { - var t1 = Transition.With(this, nameof(Value_Animation), Maximum).HookOnCompletionInUiThread(SynchronizationContext.Current, DoMarqueeAnimation2).Build(new FluentTransitions.Methods.ThrowAndCatch(TimeSpan.FromMilliseconds(AnimationDuration))); + Transition t1 = Transition.With(this, nameof(Value_Animation), Maximum).HookOnCompletionInUiThread(SynchronizationContext.Current, DoMarqueeAnimation2).Build(new FluentTransitions.Methods.ThrowAndCatch(TimeSpan.FromMilliseconds(AnimationDuration))); t1.Run(); } } @@ -74,7 +80,7 @@ private void DoMarqueeAnimation2() { if (!DesignMode && Style == ProgressBarStyle.Marquee) { - var t1 = Transition.With(this, nameof(Value_Animation), Minimum).HookOnCompletionInUiThread(SynchronizationContext.Current, DoMarqueeAnimation1).Build(new ThrowAndCatch(TimeSpan.FromMilliseconds(AnimationDuration))); + Transition t1 = Transition.With(this, nameof(Value_Animation), Minimum).HookOnCompletionInUiThread(SynchronizationContext.Current, DoMarqueeAnimation1).Build(new ThrowAndCatch(TimeSpan.FromMilliseconds(AnimationDuration))); t1.Run(); } } @@ -96,10 +102,7 @@ private void ProgressBar_StyleChanged(object sender, EventArgs e) private int _value = 0; public int Value { - get - { - return _value; - } + get => _value; set { if (_value != value) @@ -111,14 +114,11 @@ public int Value else { _value = value; } - if (!DesignMode && Style != ProgressBarStyle.Marquee) + if (CanAnimate && Style != ProgressBarStyle.Marquee) { FluentTransitions.Transition.With(this, nameof(Value_Animation), _value).CriticalDamp(TimeSpan.FromMilliseconds(AnimationDuration)); } - else - { - Value_Animation = Value; - } + else { Value_Animation = _value; } UpdateTaskbar(); @@ -131,54 +131,48 @@ public int Value private ProgressBarState _state = ProgressBarState.Normal; public ProgressBarState State { - get - { - return _state; - } + get => _state; set { - _state = value; + if (value != _state) + { + _state = value; - Color color = default; + Color color; - switch (value) - { - case ProgressBarState.Normal: - { - color = Program.Style.Schemes.Main.Colors.Line_Checked_Hover; - break; - } + switch (value) + { + case ProgressBarState.Normal: + { + color = Program.Style.Schemes.Main.Colors.Line_Checked_Hover; + break; + } - case ProgressBarState.Error: - { - color = Program.Style.Schemes.Tertiary.Colors.AccentAlt; - break; - } + case ProgressBarState.Error: + { + color = Program.Style.Schemes.Tertiary.Colors.AccentAlt; + break; + } - case ProgressBarState.Pause: - { - color = Program.Style.Schemes.Main.Colors.Back_Hover; - break; - } + case ProgressBarState.Pause: + { + color = Program.Style.Schemes.Main.Colors.Back_Hover; + break; + } - default: - { - color = Program.Style.Schemes.Main.Colors.Line_Checked_Hover; - break; - } - } + default: + { + color = Program.Style.Schemes.Main.Colors.Line_Checked_Hover; + break; + } + } - if (!DesignMode) - { - FluentTransitions.Transition.With(this, nameof(StateColor), color).Rubberband(TimeSpan.FromMilliseconds(AnimationDuration)); - } - else - { - StateColor = color; - } + if (!DesignMode) { FluentTransitions.Transition.With(this, nameof(StateColor), color).Rubberband(TimeSpan.FromMilliseconds(AnimationDuration)); } + else { StateColor = color; } - UpdateTaskbar(); - Refresh(); + UpdateTaskbar(); + Refresh(); + } } } @@ -186,14 +180,14 @@ public ProgressBarState State private ProgressBarAppearance _appearance = ProgressBarAppearance.Bar; public ProgressBarAppearance Appearance { - get - { - return _appearance; - } + get => _appearance; set { - _appearance = value; - Refresh(); + if (value != _appearance) + { + _appearance = value; + Refresh(); + } } } @@ -204,18 +198,21 @@ public ProgressBarAppearance Appearance private bool _TaskbarBroadcast = true; public bool TaskbarBroadcast { - get { return _TaskbarBroadcast; } + get => _TaskbarBroadcast; set { - _TaskbarBroadcast = value; - - if (Parent != null && value == true) + if (value != TaskbarBroadcast) { - foreach (ProgressBar PB in FindForm().GetAllControls().OfType()) { if (PB != this) PB.TaskbarBroadcast = false; } - } + _TaskbarBroadcast = value; + + if (Parent != null && value == true) + { + foreach (ProgressBar PB in FindForm().GetAllControls().OfType()) { if (PB != this) PB.TaskbarBroadcast = false; } + } - UpdateTaskbar(); + UpdateTaskbar(); + } } } @@ -223,10 +220,7 @@ public bool TaskbarBroadcast private ProgressBarStyle _style; public new ProgressBarStyle Style { - get - { - return _style; - } + get => _style; set { if (_style != value) @@ -234,7 +228,6 @@ public bool TaskbarBroadcast _style = value; OnStyleChanged(EventArgs.Empty); } - _style = value; } } @@ -242,7 +235,7 @@ protected override CreateParams CreateParams { get { - var cpar = base.CreateParams; + CreateParams cpar = base.CreateParams; if (!DesignMode) { cpar.ExStyle |= 0x20; @@ -262,14 +255,14 @@ protected override CreateParams CreateParams [Browsable(false)] public int Value_Animation { - get - { - return _animatedValue; - } + get => _animatedValue; set { - _animatedValue = value; - Refresh(); + if (value != _animatedValue) + { + _animatedValue = value; + Refresh(); + } } } @@ -281,14 +274,14 @@ public int Value_Animation [Browsable(false)] public Color StateColor { - get - { - return _StateColor; - } + get => _StateColor; set { - _StateColor = value; - Refresh(); + if (value != _StateColor) + { + _StateColor = value; + Refresh(); + } } } #endregion @@ -457,6 +450,8 @@ public enum ProgressBarStyle protected override void OnPaint(PaintEventArgs e) { + if (this == null) return; + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; diff --git a/WinPaletter/GUI/Elements/Others/StripRenderer.cs b/WinPaletter/GUI/Elements/Others/StripRenderer.cs index 85ccf920..b1a0a4c3 100644 --- a/WinPaletter/GUI/Elements/Others/StripRenderer.cs +++ b/WinPaletter/GUI/Elements/Others/StripRenderer.cs @@ -3,16 +3,11 @@ namespace WinPaletter.UI.WP { - [Description("StripRenderer fixed to respect dark/light mode")] public class StripRenderer : ToolStripSystemRenderer { - public StripRenderer() - { - } - protected override void OnRenderToolStripBorder(ToolStripRenderEventArgs e) - { - } - } + public StripRenderer() { } + protected override void OnRenderToolStripBorder(ToolStripRenderEventArgs e) { } + } } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/Others/ToolStripMenuItem.cs b/WinPaletter/GUI/Elements/Others/ToolStripMenuItem.cs index 7181364a..ccad93e3 100644 --- a/WinPaletter/GUI/Elements/Others/ToolStripMenuItem.cs +++ b/WinPaletter/GUI/Elements/Others/ToolStripMenuItem.cs @@ -9,13 +9,22 @@ public class ToolStripMenuItem : System.Windows.Forms.ToolStripMenuItem { protected override void OnPaint(PaintEventArgs e) { - base.OnPaint(e); - e.Graphics.TextRenderingHint = Program.Style.RenderingHint; - e.Graphics.Clear(BackColor); - using (SolidBrush br = new(ForeColor)) + if (this == null) return; + + Graphics G = e.Graphics; + + G.TextRenderingHint = Program.Style.RenderingHint; + G.Clear(BackColor); + + using (StringFormat sf = base.TextAlign.ToStringFormat()) { - e.Graphics.DrawString(Text, Font, br, new Rectangle(0, 0, Width, Height), base.TextAlign.ToStringFormat()); + using (SolidBrush br = new(ForeColor)) + { + G.DrawString(Text, Font, br, new Rectangle(0, 0, Width, Height), sf); + } } + + base.OnPaint(e); } } } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/Others/TransparentPictureBox.cs b/WinPaletter/GUI/Elements/Others/TransparentPictureBox.cs index b21d3aab..4d58a661 100644 --- a/WinPaletter/GUI/Elements/Others/TransparentPictureBox.cs +++ b/WinPaletter/GUI/Elements/Others/TransparentPictureBox.cs @@ -4,7 +4,6 @@ namespace WinPaletter.UI.WP { - [Description("PictureBox that supports transparent background")] public class TransparentPictureBox : PictureBox { @@ -12,27 +11,26 @@ protected override void OnPaintBackground(PaintEventArgs e) { base.OnPaintBackground(e); + if (this == null) return; + + Graphics G = e.Graphics; DoubleBuffered = true; - if (Parent is not null) - { - int index = Parent.Controls.GetChildIndex(this); + int index = Parent.Controls.GetChildIndex(this); - for (int i = Parent.Controls.Count - 1; i >= index + 1; i -= 1) + for (int i = Parent.Controls.Count - 1; i >= index + 1; i -= 1) + { + Control c = Parent.Controls[i]; + if (c.Bounds.IntersectsWith(Bounds) && c.Visible) { - var c = Parent.Controls[i]; - if (c.Bounds.IntersectsWith(Bounds) && c.Visible) - { - var bmp = new Bitmap(c.Width, c.Height, e.Graphics); - c.DrawToBitmap(bmp, c.ClientRectangle); - e.Graphics.TranslateTransform(c.Left - Left, c.Top - Top); - e.Graphics.DrawImageUnscaled(bmp, Point.Empty); - e.Graphics.TranslateTransform(Left - c.Left, Top - c.Top); - bmp.Dispose(); - } + Bitmap bmp = new(c.Width, c.Height, G); + c.DrawToBitmap(bmp, c.ClientRectangle); + G.TranslateTransform(c.Left - Left, c.Top - Top); + G.DrawImageUnscaled(bmp, Point.Empty); + G.TranslateTransform(Left - c.Left, Top - c.Top); + bmp.Dispose(); } } } } - } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/Others/TreeView.cs b/WinPaletter/GUI/Elements/Others/TreeView.cs index 9c8798be..9f4f4500 100644 --- a/WinPaletter/GUI/Elements/Others/TreeView.cs +++ b/WinPaletter/GUI/Elements/Others/TreeView.cs @@ -3,7 +3,6 @@ namespace WinPaletter.UI.WP { - [Description("TreeView fixed to respect dark/light mode")] public class TreeView : System.Windows.Forms.TreeView { @@ -11,11 +10,10 @@ protected override CreateParams CreateParams { get { - var parms = base.CreateParams; - parms.Style = parms.Style | 0x80; + CreateParams parms = base.CreateParams; + parms.Style |= 0x80; return parms; } } } - } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/Separators/SeparatorH.cs b/WinPaletter/GUI/Elements/Separators/SeparatorH.cs index 9452d632..e7d647a5 100644 --- a/WinPaletter/GUI/Elements/Separators/SeparatorH.cs +++ b/WinPaletter/GUI/Elements/Separators/SeparatorH.cs @@ -6,18 +6,15 @@ namespace WinPaletter.UI.WP { - [Description("Horizontal separator for WinPaletter UI")] public class SeparatorH : Control { - public SeparatorH() { SetStyle(ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor, true); DoubleBuffered = true; BackColor = Color.Transparent; TabStop = false; - DoubleBuffered = true; Text = string.Empty; } @@ -36,7 +33,7 @@ protected override CreateParams CreateParams { get { - var cpar = base.CreateParams; + CreateParams cpar = base.CreateParams; if (!DesignMode && !AlternativeLook) { cpar.ExStyle |= 0x20; @@ -54,15 +51,18 @@ protected override CreateParams CreateParams protected override void OnResize(EventArgs e) { + Size = new(Width, !AlternativeLook ? 1 : 2); + base.OnResize(e); - Size = new Size(Width, !AlternativeLook ? 1 : 2); } #endregion protected override void OnPaint(PaintEventArgs e) { - var G = e.Graphics; + if (this == null) return; + + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; DoubleBuffered = true; diff --git a/WinPaletter/GUI/Elements/Separators/SeparatorV.cs b/WinPaletter/GUI/Elements/Separators/SeparatorV.cs index 41b7ee18..b05cc879 100644 --- a/WinPaletter/GUI/Elements/Separators/SeparatorV.cs +++ b/WinPaletter/GUI/Elements/Separators/SeparatorV.cs @@ -17,7 +17,6 @@ public SeparatorV() DoubleBuffered = true; BackColor = Color.Transparent; TabStop = false; - DoubleBuffered = true; Text = string.Empty; } @@ -35,7 +34,7 @@ protected override CreateParams CreateParams { get { - var cpar = base.CreateParams; + CreateParams cpar = base.CreateParams; if (!DesignMode && !AlternativeLook) { cpar.ExStyle |= 0x20; @@ -54,15 +53,18 @@ protected override CreateParams CreateParams protected override void OnResize(EventArgs e) { + Size = new(!AlternativeLook ? 1 : 2, Height); + base.OnResize(e); - Size = new Size(!AlternativeLook ? 1 : 2, Height); } #endregion protected override void OnPaint(PaintEventArgs e) { - var G = e.Graphics; + if (this == null) return; + + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; DoubleBuffered = true; diff --git a/WinPaletter/GUI/Elements/Simulation/WinCMD.cs b/WinPaletter/GUI/Elements/Simulation/WinCMD.cs index 83d53d26..5d193717 100644 --- a/WinPaletter/GUI/Elements/Simulation/WinCMD.cs +++ b/WinPaletter/GUI/Elements/Simulation/WinCMD.cs @@ -7,12 +7,10 @@ namespace WinPaletter.UI.Simulation { - [Description("A simulated Windows Command Prompt/PS")] [DefaultEvent("Click")] public class WinCMD : ContainerControl { - public WinCMD() { Text = string.Empty; @@ -22,7 +20,7 @@ public WinCMD() #region Variables private readonly string S1 = "(c) Microsoft Corporation. All rights reserved."; - private readonly string S2 = PathsExt.System32 + ">"; + private readonly string S2 = $"{PathsExt.System32}>"; private readonly string CV = @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion"; public enum Raster_Sizes @@ -42,7 +40,6 @@ public enum Raster_Sizes #endregion #region Properties - public Color CMD_ColorTable00 { get; set; } public Color CMD_ColorTable01 { get; set; } public Color CMD_ColorTable02 { get; set; } @@ -72,13 +69,15 @@ public enum Raster_Sizes protected override void OnPaint(PaintEventArgs e) { - var G = e.Graphics; + if (this == null) return; + + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; G.TextRenderingHint = DesignMode ? TextRenderingHint.ClearTypeGridFit : TextRenderingHint.SystemDefault; DoubleBuffered = true; - var Rect = new Rectangle(0, 0, Width - 1, Height - 1); - var RectCMD = new Rectangle(Rect.X + 1, Rect.Y + 5, Rect.Width - 2, Rect.Height - 10); + Rectangle Rect = new(0, 0, Width - 1, Height - 1); + Rectangle RectCMD = new(Rect.X + 1, Rect.Y + 5, Rect.Width - 2, Rect.Height - 10); int pW0, pH0, pX0, pY0; pW0 = (int)Math.Round(240f * (Font.Size / 18f)); @@ -86,23 +85,23 @@ protected override void OnPaint(PaintEventArgs e) pX0 = (int)Math.Round(5f * (Font.Size / 18f)); pY0 = (int)Math.Round(10f * (Font.Size / 18f)); - var RectMiddle = new Rectangle((int)Math.Round(Rect.X + (Rect.Width - pW0) / 2d), (int)Math.Round(Rect.Y + (Rect.Height - pH0) / 2d), pW0, pH0); - var RectMiddleBorder = new Rectangle(RectMiddle.X + pX0, RectMiddle.Y + pY0, RectMiddle.Width - pX0 * 2, RectMiddle.Height - pY0 * 2); + Rectangle RectMiddle = new((int)Math.Round(Rect.X + (Rect.Width - pW0) / 2d), (int)Math.Round(Rect.Y + (Rect.Height - pH0) / 2d), pW0, pH0); + Rectangle RectMiddleBorder = new(RectMiddle.X + pX0, RectMiddle.Y + pY0, RectMiddle.Width - pX0 * 2, RectMiddle.Height - pY0 * 2); Color FC = default, BK = default, PCF = default, PCB = default; string S; - var F = Font; + Font F = Font; if (!Raster) { if (!PowerShell) { - F = new Font(Font.Name, (double)Font.SizeInPoints * 0.57d <= 0d ? 1f : (float)((double)Font.Size * 0.57d), Font.Style); + F = new(Font.Name, (double)Font.SizeInPoints * 0.57d <= 0d ? 1f : (float)((double)Font.Size * 0.57d), Font.Style); } else { - F = new Font(Font.Name, (double)Font.SizeInPoints * 0.57d <= 0d ? 1f : (float)((double)Font.Size * 0.57d), Font.Style); + F = new(Font.Name, (double)Font.SizeInPoints * 0.57d <= 0d ? 1f : (float)((double)Font.Size * 0.57d), Font.Style); } } @@ -460,27 +459,27 @@ protected override void OnPaint(PaintEventArgs e) string sx = System.Runtime.InteropServices.RuntimeInformation.OSDescription.Replace("Microsoft Windows ", string.Empty); sx = sx.Replace("S", string.Empty).Trim(); - string sy = "." + Microsoft.Win32.Registry.GetValue(CV, "UBR", 0).ToString(); + string sy = $".{(Microsoft.Win32.Registry.GetValue(CV, "UBR", 0))}"; if (sy == ".0") sy = string.Empty; - S = string.Format("Microsoft Windows [Version {0}{1}]", sx, sy) + "\r\n" + S1 + "\r\n" + "\r\n" + S2; + S = $"{($"Microsoft Windows [Version {sx}{sy}]")}\r\n{S1}\r\n\r\n{S2}"; } else { - S = "Windows PowerShell" + "\r\n" + S1 + "\r\n" + "\r\n" + "Install the latest PowerShell for new features and improvements! https://aka.ms/PSWindows" + "\r\n" + "\r\n" + "PS " + S2; + S = $"Windows PowerShell\r\n{S1}\r\n\r\nInstall the latest PowerShell for new features and improvements! https://aka.ms/PSWindows\r\n\r\nPS {S2}"; } } else { - S = Program.Lang.CMDSimulator_Alert0 + "\r\n" + "\r\n" + S2; + S = $"{Program.Lang.CMDSimulator_Alert0}\r\n\r\n{S2}"; } if (Raster) { - S += "\r\n" + "\r\n" + Program.Lang.CMDSimulator_Alert1; + S += $"\r\n\r\n{Program.Lang.CMDSimulator_Alert1}"; } if (!Raster) @@ -499,9 +498,12 @@ protected override void OnPaint(PaintEventArgs e) G.DrawRectangle(P, RectMiddleBorder); } - using (SolidBrush br = new(PCF)) + using (StringFormat sf = ContentAlignment.MiddleCenter.ToStringFormat()) { - G.DrawString(Program.Lang.CMDSimulator_ThisIsAPopUp, F, br, RectMiddleBorder, ContentAlignment.MiddleCenter.ToStringFormat()); + using (SolidBrush br = new(PCF)) + { + G.DrawString(Program.Lang.CMDSimulator_ThisIsAPopUp, F, br, RectMiddleBorder, sf); + } } } @@ -670,8 +672,8 @@ protected override void OnPaint(PaintEventArgs e) G.DrawImage(i0.ReplaceColor(Color.FromArgb(204, 204, 204), FC), new Point(0, 1)); - RectMiddle = new Rectangle((int)Math.Round(Rect.X + (Rect.Width - pW) / 2d), (int)Math.Round(Rect.Y + (Rect.Height - 36) / 2d), pW, pH); - RectMiddleBorder = new Rectangle(RectMiddle.X + pX, RectMiddle.Y + pY, RectMiddle.Width - pX * 2, RectMiddle.Height - pY * 2); + RectMiddle = new((int)Math.Round(Rect.X + (Rect.Width - pW) / 2d), (int)Math.Round(Rect.Y + (Rect.Height - 36) / 2d), pW, pH); + RectMiddleBorder = new(RectMiddle.X + pX, RectMiddle.Y + pY, RectMiddle.Width - pX * 2, RectMiddle.Height - pY * 2); using (SolidBrush br = new(PCB)) { @@ -686,8 +688,8 @@ protected override void OnPaint(PaintEventArgs e) G.DrawImage(i1.ReplaceColor(Color.FromArgb(204, 204, 204), PCF), new Point((int)Math.Round(RectMiddle.X + (RectMiddle.Width - i1.Width) / 2d), (int)Math.Round(RectMiddle.Y + (RectMiddle.Height - i1.Height) / 2d))); } - } + base.OnPaint(e); + } } - } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/Simulation/WinElement.cs b/WinPaletter/GUI/Elements/Simulation/WinElement.cs index 91b14b88..edde4d8a 100644 --- a/WinPaletter/GUI/Elements/Simulation/WinElement.cs +++ b/WinPaletter/GUI/Elements/Simulation/WinElement.cs @@ -1,4 +1,5 @@ -using System; +using ImageProcessor; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Drawing; @@ -19,15 +20,10 @@ public WinElement() SetStyle(ControlStyles.ResizeRedraw, true); SetStyle(ControlStyles.SupportsTransparentBackColor, true); BackColor = Color.Transparent; - this.MouseMove += WinElement_MouseMove; - this.MouseDown += WinElement_MouseMove; - this.MouseUp += WinElement_MouseMove; - this.MouseLeave += WinElement_MouseLeave; - this.HandleCreated += WinElement_HandleCreated; } #region Variables - private TextureBrush Noise = new TextureBrush(Properties.Resources.GaussianBlur.Fade(0.15d)); + private TextureBrush Noise = new(Properties.Resources.GaussianBlur.Fade(0.15d)); private Bitmap Noise7 = Properties.Resources.AeroGlass; private Bitmap Noise7Start = Properties.Resources.Start7Glass; private Bitmap adaptedBack; @@ -80,137 +76,110 @@ public enum Styles #region Properties public Styles Style { - get - { - return _Style; - } + get => _Style; set { - _Style = value; - ProcessBack(); - Refresh(); + if (value != _Style) + { + _Style = value; + ProcessBack(); + Refresh(); + } } } private int _BackColorAlpha = 130; public int BackColorAlpha { - get - { - return _BackColorAlpha; - } + get => _BackColorAlpha; set { - _BackColorAlpha = value; - if (!SuspendRefresh) - Refresh(); + if (value != _BackColorAlpha) + { + _BackColorAlpha = value; + if (!SuspendRefresh) Refresh(); + } } } private float _NoisePower = 0.15f; public float NoisePower { - get - { - return _NoisePower; - } + get => _NoisePower; set { - _NoisePower = value; - - if (Style == Styles.Taskbar7Aero) + if (value != _BackColorAlpha) { - try - { - Noise7 = Properties.Resources.AeroGlass.Fade(NoisePower / 100f); - } - catch - { - } - } + _NoisePower = value; - if (Style == Styles.Start7Aero) - { - try - { - Noise7Start = Properties.Resources.Start7Glass.Fade(NoisePower / 100f); - } - catch + if (Style == Styles.Taskbar7Aero) { try { Noise7 = Properties.Resources.AeroGlass.Fade(NoisePower / 100f); } catch { } } + + else if (Style == Styles.Start7Aero) { try { Noise7 = Properties.Resources.Start7Glass.Fade(NoisePower / 100f); } catch { } } + + if (!SuspendRefresh) { + NoiseBack(); + Refresh(); } } - - if (!SuspendRefresh) - NoiseBack(); - if (!SuspendRefresh) - Refresh(); } } private int _BlurPower = 8; public int BlurPower { - get - { - return _BlurPower; - } + get => _BlurPower; set { - _BlurPower = value; - BlurBack(); - if (!SuspendRefresh) - Refresh(); + if (value != _BlurPower) + { + _BlurPower = value; + BlurBack(); + if (!SuspendRefresh) Refresh(); + } } } private bool _Transparency = true; public bool Transparency { - get - { - return _Transparency; - } + get => _Transparency; set { - _Transparency = value; - ProcessBack(); - if (!SuspendRefresh) - Refresh(); + if (value != _Transparency) + { + _Transparency = value; + ProcessBack(); + if (!SuspendRefresh) Refresh(); + } } } private bool _DarkMode = true; public bool DarkMode { - get - { - return _DarkMode; - } + get => _DarkMode; set { - _DarkMode = value; - if (!SuspendRefresh) - Refresh(); + if (value != _DarkMode) + { + _DarkMode = value; + if (!SuspendRefresh) Refresh(); + } } } private Color _AppUnderline; public Color AppUnderline { - get - { - return _AppUnderline; - } + get => _AppUnderline; set { - _AppUnderline = value; - try - { - if (!SuspendRefresh) - Refresh(); - } - catch + if (value != _AppUnderline) { + _AppUnderline = value; + + if (!SuspendRefresh) Refresh(); } } } @@ -218,20 +187,14 @@ public Color AppUnderline private Color _AppBackground; public Color AppBackground { - get - { - return _AppBackground; - } + get => _AppBackground; set { - _AppBackground = value; - try - { - if (!SuspendRefresh) - Refresh(); - } - catch + if (value != _AppBackground) { + _AppBackground = value; + + if (!SuspendRefresh) Refresh(); } } } @@ -239,20 +202,14 @@ public Color AppBackground private Color _ActionCenterButton_Normal; public Color ActionCenterButton_Normal { - get - { - return _ActionCenterButton_Normal; - } + get => _ActionCenterButton_Normal; set { - _ActionCenterButton_Normal = value; - try - { - if (!SuspendRefresh) - Refresh(); - } - catch + if (value != _ActionCenterButton_Normal) { + _ActionCenterButton_Normal = value; + + if (!SuspendRefresh) Refresh(); } } } @@ -260,20 +217,14 @@ public Color ActionCenterButton_Normal private Color _ActionCenterButton_Hover; public Color ActionCenterButton_Hover { - get - { - return _ActionCenterButton_Hover; - } + get => _ActionCenterButton_Hover; set { - _ActionCenterButton_Hover = value; - try - { - if (!SuspendRefresh) - Refresh(); - } - catch + if (value != _ActionCenterButton_Hover) { + _ActionCenterButton_Hover = value; + + if (!SuspendRefresh) Refresh(); } } } @@ -281,20 +232,14 @@ public Color ActionCenterButton_Hover private Color _ActionCenterButton_Pressed; public Color ActionCenterButton_Pressed { - get - { - return _ActionCenterButton_Pressed; - } + get => _ActionCenterButton_Pressed; set { - _ActionCenterButton_Pressed = value; - try - { - if (!SuspendRefresh) - Refresh(); - } - catch + if (value != _ActionCenterButton_Pressed) { + _ActionCenterButton_Pressed = value; + + if (!SuspendRefresh) Refresh(); } } } @@ -302,90 +247,90 @@ public Color ActionCenterButton_Pressed private Color _StartColor; public Color StartColor { - get - { - return _StartColor; - } + get => _StartColor; set { - _StartColor = value; - if (!SuspendRefresh) - Refresh(); + if (value != _StartColor) + { + _StartColor = value; + + if (!SuspendRefresh) Refresh(); + } } } private Color _LinkColor; public Color LinkColor { - get - { - return _LinkColor; - } + get => _LinkColor; set { - _LinkColor = value; - if (!SuspendRefresh) - Refresh(); + if (value != _LinkColor) + { + _LinkColor = value; + + if (!SuspendRefresh) Refresh(); + } } } private Color _Background; public Color Background { - get - { - return _Background; - } + get => _Background; set { - _Background = value; - if (!SuspendRefresh) - Refresh(); + if (value != _Background) + { + _Background = value; + + if (!SuspendRefresh) Refresh(); + } } } private Color _Background2; public Color Background2 { - get - { - return _Background2; - } + get => _Background2; set { - _Background2 = value; - if (!SuspendRefresh) - Refresh(); + if (value != _Background2) + { + _Background2 = value; + + if (!SuspendRefresh) Refresh(); + } } } private int _Win7ColorBal = (int)Math.Round(0.15); public int Win7ColorBal { - get - { - return _Win7ColorBal; - } + get => _Win7ColorBal; set { - _Win7ColorBal = value; - if (!SuspendRefresh) - Refresh(); + if (value != _Win7ColorBal) + { + _Win7ColorBal = value; + + if (!SuspendRefresh) Refresh(); + } } } private int _Win7GlowBal = (int)Math.Round(0.15); public int Win7GlowBal { - get - { - return _Win7GlowBal; - } + get => _Win7GlowBal; set { - _Win7GlowBal = value; - if (!SuspendRefresh) - Refresh(); + if (value != _Win7GlowBal) + { + _Win7GlowBal = value; + + if (!SuspendRefresh) Refresh(); + } } } public bool UseWin11ORB_WithWin10 { get; set; } = false; @@ -397,9 +342,16 @@ protected override CreateParams CreateParams { get { - CreateParams cp = base.CreateParams; - cp.ExStyle = cp.ExStyle | 0x20; - return cp; + CreateParams cpar = base.CreateParams; + if (!DesignMode) + { + cpar.ExStyle |= 0x20; + return cpar; + } + else + { + return cpar; + } } } #endregion @@ -473,7 +425,7 @@ public void GetBack() { //if (Style == Styles.Start7Aero | Style == Styles.Taskbar7Aero | Style == Styles.StartVistaAero | Style == Styles.TaskbarVistaAero | Style == Styles.AltTab7Aero) //{ - // adaptedBackBlurred = new Bitmap(adaptedBack).Blur(1); + // adaptedBackBlurred = new(adaptedBack).Blur(1); //} } catch { } @@ -495,7 +447,7 @@ public void BlurBack() { if (b is not null) { - using (var ImgF = new ImageProcessor.ImageFactory()) + using (ImageFactory ImgF = new()) { ImgF.Load(b); ImgF.Saturation(60); @@ -536,13 +488,13 @@ public void NoiseBack() if (Style == Styles.ActionCenter11 | Style == Styles.Start11 | Style == Styles.Taskbar11 | Style == Styles.AltTab11) { if (Transparency) - Noise = new TextureBrush(Properties.Resources.GaussianBlur.Fade(NoisePower)); + Noise = new(Properties.Resources.GaussianBlur.Fade(NoisePower)); } else if (Style == Styles.ActionCenter10 | Style == Styles.Start10 | Style == Styles.Taskbar10) { if (Transparency) - Noise = new TextureBrush(Properties.Resources.GaussianBlur.Fade(NoisePower)); + Noise = new(Properties.Resources.GaussianBlur.Fade(NoisePower)); } else if (Style == Styles.Start7Aero | Style == Styles.Taskbar7Aero | Style == Styles.AltTab7Aero | Style == Styles.AltTab7Opaque) @@ -563,10 +515,8 @@ public void NoiseBack() } } } - #endregion - #region Events - private void WinElement_MouseMove(object sender, MouseEventArgs e) + private void OnMouseMove_Down_Up(MouseEventArgs e) { if (Style == Styles.ActionCenter11) { @@ -602,10 +552,33 @@ private void WinElement_MouseMove(object sender, MouseEventArgs e) if (!SuspendRefresh) Refresh(); } - } } - private void WinElement_MouseLeave(object sender, EventArgs e) + #endregion + + #region Events + protected override void OnMouseMove(MouseEventArgs e) + { + OnMouseMove_Down_Up(e); + + base.OnMouseMove(e); + } + + protected override void OnMouseDown(MouseEventArgs e) + { + OnMouseMove_Down_Up(e); + + base.OnMouseDown(e); + } + + protected override void OnMouseUp(MouseEventArgs e) + { + OnMouseMove_Down_Up(e); + + base.OnMouseUp(e); + } + + protected override void OnMouseLeave(EventArgs e) { if (Style == Styles.ActionCenter11) { @@ -614,50 +587,49 @@ private void WinElement_MouseLeave(object sender, EventArgs e) if (!SuspendRefresh) Refresh(); } + + base.OnMouseLeave(e); } - private void WinElement_HandleCreated(object sender, EventArgs e) + + protected override void OnHandleCreated(EventArgs e) { - if (!DesignMode) - { - try - { - Parent.BackgroundImageChanged += ProcessBack_EventHandler; - } - catch - { - } - try - { - SizeChanged += ProcessBack_EventHandler; - } - catch - { - } - try - { - LocationChanged += ProcessBack_EventHandler; - } - catch - { - } + if (!DesignMode) ProcessBack(); - ProcessBack(); - } + base.OnHandleCreated(e); } - public void ProcessBack_EventHandler(object sender, EventArgs e) + + protected override void OnBackgroundImageChanged(EventArgs e) { - ProcessBack(); + if (!DesignMode) ProcessBack(); + + base.OnBackgroundImageChanged(e); + } + + protected override void OnSizeChanged(EventArgs e) + { + if (!DesignMode) ProcessBack(); + + base.OnSizeChanged(e); + } + + protected override void OnLocationChanged(EventArgs e) + { + if (!DesignMode) ProcessBack(); + + base.OnLocationChanged(e); } #endregion protected override void OnPaint(PaintEventArgs e) { + if (this == null) return; + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; G.TextRenderingHint = Program.Style.RenderingHint; DoubleBuffered = true; - var Rect = new Rectangle(-1, -1, Width + 2, Height + 2); - var RRect = new Rectangle(0, 0, Width - 1, Height - 1); + Rectangle Rect = new(-1, -1, Width + 2, Height + 2); + Rectangle RRect = new(0, 0, Width - 1, Height - 1); int Radius = 5; switch (Style) @@ -689,7 +661,7 @@ protected override void OnPaint(PaintEventArgs e) } if (Transparency) G.FillRoundedRect(Noise, RRect, Radius, true); - var SearchRect = new Rectangle(8, 10, Width - 8 * 2, 15); + Rectangle SearchRect = new(8, 10, Width - 8 * 2, 15); G.DrawRoundImage(DarkMode ? Properties.Resources.Start11_Dark : Properties.Resources.Start11_Light, RRect, Radius, true); @@ -750,8 +722,8 @@ protected override void OnPaint(PaintEventArgs e) } if (Transparency) G.FillRoundedRect(Noise, RRect, Radius, true); - Button1 = new Rectangle(8, 8, 49, 20); - Button2 = new Rectangle(62, 8, 49, 20); + Button1 = new(8, 8, 49, 20); + Button2 = new(62, 8, 49, 20); G.DrawRoundImage(DarkMode ? Properties.Resources.AC_11_Dark : Properties.Resources.AC_11_Light, RRect, Radius, true); @@ -849,16 +821,16 @@ protected override void OnPaint(PaintEventArgs e) if (Transparency) G.FillRoundedRect(Noise, RRect, Radius, true); - var StartBtnRect = new Rectangle(8, 3, 36, 36); - var StartImgRect = new Rectangle(8, 3, 37, 37); + Rectangle StartBtnRect = new(8, 3, 36, 36); + Rectangle StartImgRect = new(8, 3, 37, 37); - var App2BtnRect = new Rectangle(StartBtnRect.Right + 5, 3, 36, 36); - var App2ImgRect = new Rectangle(StartBtnRect.Right + 5, 3, 37, 37); - var App2BtnRectUnderline = new Rectangle(App2BtnRect.X + (App2BtnRect.Width - 8) / 2, App2BtnRect.Y + App2BtnRect.Height - 3, 8, 3); + Rectangle App2BtnRect = new(StartBtnRect.Right + 5, 3, 36, 36); + Rectangle App2ImgRect = new(StartBtnRect.Right + 5, 3, 37, 37); + Rectangle App2BtnRectUnderline = new(App2BtnRect.X + (App2BtnRect.Width - 8) / 2, App2BtnRect.Y + App2BtnRect.Height - 3, 8, 3); - var AppBtnRect = new Rectangle(App2BtnRect.Right + 5, 3, 36, 36); - var AppImgRect = new Rectangle(App2BtnRect.Right + 5, 3, 37, 37); - var AppBtnRectUnderline = new Rectangle(AppBtnRect.X + (AppBtnRect.Width - 18) / 2, AppBtnRect.Y + AppBtnRect.Height - 3, 18, 3); + Rectangle AppBtnRect = new(App2BtnRect.Right + 5, 3, 36, 36); + Rectangle AppImgRect = new(App2BtnRect.Right + 5, 3, 37, 37); + Rectangle AppBtnRectUnderline = new(AppBtnRect.X + (AppBtnRect.Width - 18) / 2, AppBtnRect.Y + AppBtnRect.Height - 3, 18, 3); Color BackC; Color BorderC; @@ -968,7 +940,7 @@ protected override void OnPaint(PaintEventArgs e) int AllAppsWidthWithPadding = RRect.Width - 2 * _padding; int AppWidth = (AllAppsWidthWithPadding - (appsNumber - 1) * _padding) / appsNumber; - var Rects = new List(); + List Rects = new(); Rects.Clear(); for (int x = 0, loopTo = appsNumber - 1; x <= loopTo; x++) @@ -985,14 +957,14 @@ protected override void OnPaint(PaintEventArgs e) for (int x = 0, loopTo1 = Rects.Count - 1; x <= loopTo1; x++) { - var r = Rects[x]; + Rectangle r = Rects[x]; Color back = DarkMode ? Color.FromArgb(23, 23, 23) : Color.FromArgb(233, 234, 234); Color back2 = DarkMode ? Color.FromArgb(39, 39, 39) : Color.FromArgb(255, 255, 255); if (x == 0) { - var surround = new Rectangle(r.X - 5, r.Y - 5, r.Width + 10, r.Height + 10); + Rectangle surround = new(r.X - 5, r.Y - 5, r.Width + 10, r.Height + 10); using (Pen P = new(Color.FromArgb(75, 182, 237), 3)) { G.DrawRoundedRect(P, surround, Radius * 2 + 5 / 2, true); @@ -1081,9 +1053,9 @@ protected override void OnPaint(PaintEventArgs e) G.FillRectangle(br, Rect); } - var rect1 = new Rectangle(85, 6, 30, 3); - var rect2 = new Rectangle(5, 190, 30, 3); - var rect3 = new Rectangle(42, 201, 34, 24); + Rectangle rect1 = new(85, 6, 30, 3); + Rectangle rect2 = new(5, 190, 30, 3); + Rectangle rect3 = new(42, 201, 34, 24); using (SolidBrush br = new(ActionCenterButton_Normal)) { @@ -1123,24 +1095,24 @@ protected override void OnPaint(PaintEventArgs e) G.FillRectangle(br, Rect); } - var StartBtnRect = new Rectangle(-1, -1, 42, Height + 2); - var StartBtnImgRect = new Rectangle(); + Rectangle StartBtnRect = new(-1, -1, 42, Height + 2); + Rectangle StartBtnImgRect = new(); if (!UseWin11ORB_WithWin10) { - StartBtnImgRect = new Rectangle(StartBtnRect.X + (StartBtnRect.Width - Properties.Resources.StartBtn_10Dark.Width) / 2, StartBtnRect.Y + (StartBtnRect.Height - Properties.Resources.StartBtn_10Dark.Height) / 2, Properties.Resources.StartBtn_10Dark.Width, Properties.Resources.StartBtn_10Dark.Height); + StartBtnImgRect = new(StartBtnRect.X + (StartBtnRect.Width - Properties.Resources.StartBtn_10Dark.Width) / 2, StartBtnRect.Y + (StartBtnRect.Height - Properties.Resources.StartBtn_10Dark.Height) / 2, Properties.Resources.StartBtn_10Dark.Width, Properties.Resources.StartBtn_10Dark.Height); } else { - StartBtnImgRect = new Rectangle(StartBtnRect.X + (StartBtnRect.Width - Properties.Resources.StartBtn_11_EP.Width) / 2, StartBtnRect.Y + (StartBtnRect.Height - Properties.Resources.StartBtn_11_EP.Height) / 2, Properties.Resources.StartBtn_11_EP.Width, Properties.Resources.StartBtn_11_EP.Height); + StartBtnImgRect = new(StartBtnRect.X + (StartBtnRect.Width - Properties.Resources.StartBtn_11_EP.Width) / 2, StartBtnRect.Y + (StartBtnRect.Height - Properties.Resources.StartBtn_11_EP.Height) / 2, Properties.Resources.StartBtn_11_EP.Width, Properties.Resources.StartBtn_11_EP.Height); } - var AppBtnRect = new Rectangle(StartBtnRect.Right, -1, 40, Height + 2); - var AppBtnImgRect = new Rectangle(AppBtnRect.X + (AppBtnRect.Width - Properties.Resources.SampleApp_Active.Width) / 2, AppBtnRect.Y + (AppBtnRect.Height - Properties.Resources.SampleApp_Active.Height) / 2 - 1, Properties.Resources.SampleApp_Active.Width, Properties.Resources.SampleApp_Active.Height); - var AppBtnRectUnderline = new Rectangle(AppBtnRect.X, AppBtnRect.Y + AppBtnRect.Height - 3, AppBtnRect.Width, 2); - var App2BtnRect = new Rectangle(AppBtnRect.Right, -1, 40, Height + 2); - var App2BtnImgRect = new Rectangle(App2BtnRect.X + (App2BtnRect.Width - Properties.Resources.SampleApp_Inactive.Width) / 2, App2BtnRect.Y + (App2BtnRect.Height - Properties.Resources.SampleApp_Inactive.Height) / 2, Properties.Resources.SampleApp_Inactive.Width, Properties.Resources.SampleApp_Inactive.Height); - var App2BtnRectUnderline = new Rectangle(App2BtnRect.X + 14 / 2, App2BtnRect.Y + App2BtnRect.Height - 3, App2BtnRect.Width - 14, 2); + Rectangle AppBtnRect = new(StartBtnRect.Right, -1, 40, Height + 2); + Rectangle AppBtnImgRect = new(AppBtnRect.X + (AppBtnRect.Width - Properties.Resources.SampleApp_Active.Width) / 2, AppBtnRect.Y + (AppBtnRect.Height - Properties.Resources.SampleApp_Active.Height) / 2 - 1, Properties.Resources.SampleApp_Active.Width, Properties.Resources.SampleApp_Active.Height); + Rectangle AppBtnRectUnderline = new(AppBtnRect.X, AppBtnRect.Y + AppBtnRect.Height - 3, AppBtnRect.Width, 2); + Rectangle App2BtnRect = new(AppBtnRect.Right, -1, 40, Height + 2); + Rectangle App2BtnImgRect = new(App2BtnRect.X + (App2BtnRect.Width - Properties.Resources.SampleApp_Inactive.Width) / 2, App2BtnRect.Y + (App2BtnRect.Height - Properties.Resources.SampleApp_Inactive.Height) / 2, Properties.Resources.SampleApp_Inactive.Width, Properties.Resources.SampleApp_Inactive.Height); + Rectangle App2BtnRectUnderline = new(App2BtnRect.X + 14 / 2, App2BtnRect.Y + App2BtnRect.Height - 3, App2BtnRect.Width - 14, 2); Color StartColor = _StartColor; using (SolidBrush br = new(StartColor)) { @@ -1179,7 +1151,7 @@ protected override void OnPaint(PaintEventArgs e) case Styles.AltTab10: #region Alt+Tab 10 { - float a = Math.Max(Math.Min(255, (float)((float)BackColorAlpha / 100) * 255), 0); + float a = Math.Max(Math.Min(255, (float)BackColorAlpha / 100 * 255), 0); using (SolidBrush br = new(Color.FromArgb((int)a, 23, 23, 23))) { @@ -1193,7 +1165,7 @@ protected override void OnPaint(PaintEventArgs e) int AllAppsWidthWithPadding = RRect.Width - 2 * _padding; int AppWidth = (AllAppsWidthWithPadding - (appsNumber - 1) * _padding) / appsNumber; - var Rects = new List(); + List Rects = new(); Rects.Clear(); for (int x = 0, loopTo2 = appsNumber - 1; x <= loopTo2; x++) @@ -1210,13 +1182,13 @@ protected override void OnPaint(PaintEventArgs e) for (int x = 0, loopTo3 = Rects.Count - 1; x <= loopTo3; x++) { - var r = Rects[x]; + Rectangle r = Rects[x]; Color back = DarkMode ? Color.FromArgb(60, 60, 60) : Color.FromArgb(255, 255, 255); if (x == 0) { - var surround = new Rectangle(r.X - 5, r.Y - 5, r.Width + 10, r.Height + 10); + Rectangle surround = new(r.X - 5, r.Y - 5, r.Width + 10, r.Height + 10); using (Pen P = new(Color.White, 2)) { G.DrawRectangle(P, surround); @@ -1256,15 +1228,15 @@ protected override void OnPaint(PaintEventArgs e) G.FillRectangle(br, Rect); } - var StartORB = new Bitmap(Properties.Resources.Win8ORB); - var StartBtnRect = new Rectangle((35 - 27) / 2 + 2, (35 - 27) / 2 - 1, 27, 27); - var AppBtnRect = new Rectangle(StartBtnRect.Right + 8, 0, 45, Height - 1); - var AppBtnRectInner = new Rectangle(AppBtnRect.X + 1, AppBtnRect.Y + 1, AppBtnRect.Width - 2, AppBtnRect.Height - 2); + Bitmap StartORB = new(Properties.Resources.Win8ORB); + Rectangle StartBtnRect = new((35 - 27) / 2 + 2, (35 - 27) / 2 - 1, 27, 27); + Rectangle AppBtnRect = new(StartBtnRect.Right + 8, 0, 45, Height - 1); + Rectangle AppBtnRectInner = new(AppBtnRect.X + 1, AppBtnRect.Y + 1, AppBtnRect.Width - 2, AppBtnRect.Height - 2); - var AppBtnImgRect = new Rectangle(AppBtnRect.X + (AppBtnRect.Width - Properties.Resources.SampleApp_Active.Width) / 2, AppBtnRect.Y + (AppBtnRect.Height - Properties.Resources.SampleApp_Active.Height) / 2, Properties.Resources.SampleApp_Active.Width, Properties.Resources.SampleApp_Active.Height); - var App2BtnRect = new Rectangle(AppBtnRect.Right + 2, 0, 45, Height - 1); - var App2BtnRectInner = new Rectangle(App2BtnRect.X + 1, App2BtnRect.Y + 1, App2BtnRect.Width - 2, App2BtnRect.Height - 2); - var App2BtnImgRect = new Rectangle(App2BtnRect.X + (App2BtnRect.Width - Properties.Resources.SampleApp_Inactive.Width) / 2, App2BtnRect.Y + (App2BtnRect.Height - Properties.Resources.SampleApp_Inactive.Height) / 2, Properties.Resources.SampleApp_Inactive.Width, Properties.Resources.SampleApp_Inactive.Height); + Rectangle AppBtnImgRect = new(AppBtnRect.X + (AppBtnRect.Width - Properties.Resources.SampleApp_Active.Width) / 2, AppBtnRect.Y + (AppBtnRect.Height - Properties.Resources.SampleApp_Active.Height) / 2, Properties.Resources.SampleApp_Active.Width, Properties.Resources.SampleApp_Active.Height); + Rectangle App2BtnRect = new(AppBtnRect.Right + 2, 0, 45, Height - 1); + Rectangle App2BtnRectInner = new(App2BtnRect.X + 1, App2BtnRect.Y + 1, App2BtnRect.Width - 2, App2BtnRect.Height - 2); + Rectangle App2BtnImgRect = new(App2BtnRect.X + (App2BtnRect.Width - Properties.Resources.SampleApp_Inactive.Width) / 2, App2BtnRect.Y + (App2BtnRect.Height - Properties.Resources.SampleApp_Inactive.Height) / 2, Properties.Resources.SampleApp_Inactive.Width, Properties.Resources.SampleApp_Inactive.Height); G.DrawImage(StartORB, StartBtnRect); @@ -1321,15 +1293,15 @@ protected override void OnPaint(PaintEventArgs e) G.FillRectangle(br, Rect); } - var StartORB = new Bitmap(Properties.Resources.Win8ORB); - var StartBtnRect = new Rectangle((35 - 27) / 2 + 2, (35 - 27) / 2 - 1, 27, 27); - var AppBtnRect = new Rectangle(StartBtnRect.Right + 8, 0, 45, Height - 1); - var AppBtnRectInner = new Rectangle(AppBtnRect.X + 1, AppBtnRect.Y + 1, AppBtnRect.Width - 2, AppBtnRect.Height - 2); + Bitmap StartORB = new(Properties.Resources.Win8ORB); + Rectangle StartBtnRect = new((35 - 27) / 2 + 2, (35 - 27) / 2 - 1, 27, 27); + Rectangle AppBtnRect = new(StartBtnRect.Right + 8, 0, 45, Height - 1); + Rectangle AppBtnRectInner = new(AppBtnRect.X + 1, AppBtnRect.Y + 1, AppBtnRect.Width - 2, AppBtnRect.Height - 2); - var AppBtnImgRect = new Rectangle(AppBtnRect.X + (AppBtnRect.Width - Properties.Resources.SampleApp_Active.Width) / 2, AppBtnRect.Y + (AppBtnRect.Height - Properties.Resources.SampleApp_Active.Height) / 2, Properties.Resources.SampleApp_Active.Width, Properties.Resources.SampleApp_Active.Height); - var App2BtnRect = new Rectangle(AppBtnRect.Right + 2, 0, 45, Height - 1); - var App2BtnRectInner = new Rectangle(App2BtnRect.X + 1, App2BtnRect.Y + 1, App2BtnRect.Width - 2, App2BtnRect.Height - 2); - var App2BtnImgRect = new Rectangle(App2BtnRect.X + (App2BtnRect.Width - Properties.Resources.SampleApp_Inactive.Width) / 2, App2BtnRect.Y + (App2BtnRect.Height - Properties.Resources.SampleApp_Inactive.Height) / 2, Properties.Resources.SampleApp_Inactive.Width, Properties.Resources.SampleApp_Inactive.Height); + Rectangle AppBtnImgRect = new(AppBtnRect.X + (AppBtnRect.Width - Properties.Resources.SampleApp_Active.Width) / 2, AppBtnRect.Y + (AppBtnRect.Height - Properties.Resources.SampleApp_Active.Height) / 2, Properties.Resources.SampleApp_Active.Width, Properties.Resources.SampleApp_Active.Height); + Rectangle App2BtnRect = new(AppBtnRect.Right + 2, 0, 45, Height - 1); + Rectangle App2BtnRectInner = new(App2BtnRect.X + 1, App2BtnRect.Y + 1, App2BtnRect.Width - 2, App2BtnRect.Height - 2); + Rectangle App2BtnImgRect = new(App2BtnRect.X + (App2BtnRect.Width - Properties.Resources.SampleApp_Inactive.Width) / 2, App2BtnRect.Y + (App2BtnRect.Height - Properties.Resources.SampleApp_Inactive.Height) / 2, Properties.Resources.SampleApp_Inactive.Width, Properties.Resources.SampleApp_Inactive.Height); G.DrawImage(StartORB, StartBtnRect); @@ -1388,7 +1360,7 @@ protected override void OnPaint(PaintEventArgs e) int AllAppsWidthWithPadding = RRect.Width - 2 * _padding; int AppWidth = (AllAppsWidthWithPadding - (appsNumber - 1) * _padding) / appsNumber; - var Rects = new List(); + List Rects = new(); Rects.Clear(); for (int x = 0, loopTo4 = appsNumber - 1; x <= loopTo4; x++) @@ -1405,11 +1377,11 @@ protected override void OnPaint(PaintEventArgs e) for (int x = 0, loopTo5 = Rects.Count - 1; x <= loopTo5; x++) { - var r = Rects[x]; + Rectangle r = Rects[x]; if (x == 0) { - var surround = new Rectangle(r.X - 10, r.Y - 10, r.Width + 20, r.Height + 20); + Rectangle surround = new(r.X - 10, r.Y - 10, r.Width + 20, r.Height + 20); using (Pen P = new(Color.White, 2)) { G.DrawRectangle(P, surround); @@ -1418,12 +1390,15 @@ protected override void OnPaint(PaintEventArgs e) G.FillRectangle(Brushes.White, r); int icon_w = Properties.Resources.SampleApp_Active.Width; - var icon_rect = new Rectangle(r.X + r.Width - (int)(0.7 * icon_w), r.Y + r.Height - (int)(0.6 * icon_w), icon_w, icon_w); + Rectangle icon_rect = new(r.X + r.Width - (int)(0.7 * icon_w), r.Y + r.Height - (int)(0.6 * icon_w), icon_w, icon_w); G.DrawImage(Properties.Resources.SampleApp_Active, icon_rect); } - var TextRect = new Rectangle(RRect.X + _padding, RRect.Y, RRect.Width - 2 * _padding, AppHeight * 2 / 5); - G.DrawString("______", Font, Brushes.White, TextRect, ContentAlignment.MiddleCenter.ToStringFormat()); + Rectangle TextRect = new(RRect.X + _padding, RRect.Y, RRect.Width - 2 * _padding, AppHeight * 2 / 5); + using (StringFormat sf = ContentAlignment.MiddleCenter.ToStringFormat()) + { + G.DrawString("______", Font, Brushes.White, TextRect, sf); + } break; } #endregion @@ -1448,7 +1423,7 @@ protected override void OnPaint(PaintEventArgs e) int AllAppsWidthWithPadding = RRect.Width - 2 * _padding; int AppWidth = (AllAppsWidthWithPadding - (appsNumber - 1) * _padding) / appsNumber; - var Rects = new List(); + List Rects = new(); Rects.Clear(); for (int x = 0, loopTo6 = appsNumber - 1; x <= loopTo6; x++) @@ -1465,11 +1440,11 @@ protected override void OnPaint(PaintEventArgs e) for (int x = 0, loopTo7 = Rects.Count - 1; x <= loopTo7; x++) { - var r = Rects[x]; + Rectangle r = Rects[x]; if (x == 0) { - var surround = new Rectangle(r.X - 10, r.Y - 10, r.Width + 20, r.Height + 20); + Rectangle surround = new(r.X - 10, r.Y - 10, r.Width + 20, r.Height + 20); using (Pen P = new(Background2, 2)) { G.DrawRectangle(P, surround); @@ -1478,16 +1453,18 @@ protected override void OnPaint(PaintEventArgs e) G.FillRectangle(Brushes.White, r); int icon_w = Properties.Resources.SampleApp_Active.Width; - var icon_rect = new Rectangle(r.X + r.Width - (int)(0.7 * icon_w), r.Y + r.Height - (int)(0.6 * icon_w), icon_w, icon_w); + Rectangle icon_rect = new(r.X + r.Width - (int)(0.7 * icon_w), r.Y + r.Height - (int)(0.6 * icon_w), icon_w, icon_w); G.DrawImage(Properties.Resources.SampleApp_Active, icon_rect); } - var TextRect = new Rectangle(RRect.X + _padding, RRect.Y, RRect.Width - 2 * _padding, AppHeight * 2 / 5); - using (SolidBrush br = new(ForeColor)) + Rectangle TextRect = new(RRect.X + _padding, RRect.Y, RRect.Width - 2 * _padding, AppHeight * 2 / 5); + using (StringFormat sf = ContentAlignment.MiddleCenter.ToStringFormat()) { - G.DrawString("______", Font, br, TextRect, ContentAlignment.MiddleCenter.ToStringFormat()); + using (SolidBrush br = new(ForeColor)) + { + G.DrawString("______", Font, br, TextRect, sf); + } } - break; } #endregion @@ -1495,7 +1472,7 @@ protected override void OnPaint(PaintEventArgs e) case Styles.Start7Aero: #region Start 7 Aero { - var RestRect = new Rectangle(0, 14, Width - 5, Height - 10); + Rectangle RestRect = new(0, 14, Width - 5, Height - 10); if (!DesignMode && adaptedBackBlurred is not null) { @@ -1529,7 +1506,7 @@ protected override void OnPaint(PaintEventArgs e) case Styles.Start7Opaque: #region Start 7 Opaque { - var RestRect = new Rectangle(0, 14, Width - 5, Height - 10); + Rectangle RestRect = new(0, 14, Width - 5, Height - 10); using (SolidBrush br = new(Color.White)) { G.FillRoundedRect(br, RestRect, 5, true); @@ -1588,15 +1565,15 @@ protected override void OnPaint(PaintEventArgs e) G.DrawImage(Properties.Resources.AeroPeek, new Rectangle(Width - 10, 0, 10, Height)); - var StartORB = new Bitmap(Properties.Resources.Win7ORB); + Bitmap StartORB = new(Properties.Resources.Win7ORB); - var StartBtnRect = new Rectangle(3, -3, 39, 39); + Rectangle StartBtnRect = new(3, -3, 39, 39); - var AppBtnRect = new Rectangle(StartBtnRect.Right + 5, 0, 45, 35); - var AppBtnImgRect = new Rectangle(AppBtnRect.X + (AppBtnRect.Width - Properties.Resources.SampleApp_Active.Width) / 2, AppBtnRect.Y + (AppBtnRect.Height - Properties.Resources.SampleApp_Active.Height) / 2, Properties.Resources.SampleApp_Active.Width, Properties.Resources.SampleApp_Active.Height); + Rectangle AppBtnRect = new(StartBtnRect.Right + 5, 0, 45, 35); + Rectangle AppBtnImgRect = new(AppBtnRect.X + (AppBtnRect.Width - Properties.Resources.SampleApp_Active.Width) / 2, AppBtnRect.Y + (AppBtnRect.Height - Properties.Resources.SampleApp_Active.Height) / 2, Properties.Resources.SampleApp_Active.Width, Properties.Resources.SampleApp_Active.Height); - var App2BtnRect = new Rectangle(AppBtnRect.Right + 1, 0, 45, 35); - var App2BtnImgRect = new Rectangle(App2BtnRect.X + (App2BtnRect.Width - Properties.Resources.SampleApp_Inactive.Width) / 2, App2BtnRect.Y + (App2BtnRect.Height - Properties.Resources.SampleApp_Inactive.Height) / 2, Properties.Resources.SampleApp_Inactive.Width, Properties.Resources.SampleApp_Inactive.Height); + Rectangle App2BtnRect = new(AppBtnRect.Right + 1, 0, 45, 35); + Rectangle App2BtnImgRect = new(App2BtnRect.X + (App2BtnRect.Width - Properties.Resources.SampleApp_Inactive.Width) / 2, App2BtnRect.Y + (App2BtnRect.Height - Properties.Resources.SampleApp_Inactive.Height) / 2, Properties.Resources.SampleApp_Inactive.Width, Properties.Resources.SampleApp_Inactive.Height); G.DrawImage(StartORB, StartBtnRect); @@ -1643,15 +1620,15 @@ protected override void OnPaint(PaintEventArgs e) G.DrawImage(Properties.Resources.AeroPeek, new Rectangle(Width - 10, 0, 10, Height)); - var StartORB = new Bitmap(Properties.Resources.Win7ORB); + Bitmap StartORB = new(Properties.Resources.Win7ORB); - var StartBtnRect = new Rectangle(3, -3, 39, 39); + Rectangle StartBtnRect = new(3, -3, 39, 39); - var AppBtnRect = new Rectangle(StartBtnRect.Right + 5, 0, 45, 35); - var AppBtnImgRect = new Rectangle(AppBtnRect.X + (AppBtnRect.Width - Properties.Resources.SampleApp_Active.Width) / 2, AppBtnRect.Y + (AppBtnRect.Height - Properties.Resources.SampleApp_Active.Height) / 2, Properties.Resources.SampleApp_Active.Width, Properties.Resources.SampleApp_Active.Height); + Rectangle AppBtnRect = new(StartBtnRect.Right + 5, 0, 45, 35); + Rectangle AppBtnImgRect = new(AppBtnRect.X + (AppBtnRect.Width - Properties.Resources.SampleApp_Active.Width) / 2, AppBtnRect.Y + (AppBtnRect.Height - Properties.Resources.SampleApp_Active.Height) / 2, Properties.Resources.SampleApp_Active.Width, Properties.Resources.SampleApp_Active.Height); - var App2BtnRect = new Rectangle(AppBtnRect.Right + 1, 0, 45, 35); - var App2BtnImgRect = new Rectangle(App2BtnRect.X + (App2BtnRect.Width - Properties.Resources.SampleApp_Inactive.Width) / 2, App2BtnRect.Y + (App2BtnRect.Height - Properties.Resources.SampleApp_Inactive.Height) / 2, Properties.Resources.SampleApp_Inactive.Width, Properties.Resources.SampleApp_Inactive.Height); + Rectangle App2BtnRect = new(AppBtnRect.Right + 1, 0, 45, 35); + Rectangle App2BtnImgRect = new(App2BtnRect.X + (App2BtnRect.Width - Properties.Resources.SampleApp_Inactive.Width) / 2, App2BtnRect.Y + (App2BtnRect.Height - Properties.Resources.SampleApp_Inactive.Height) / 2, Properties.Resources.SampleApp_Inactive.Width, Properties.Resources.SampleApp_Inactive.Height); G.DrawImage(StartORB, StartBtnRect); @@ -1679,15 +1656,15 @@ protected override void OnPaint(PaintEventArgs e) G.DrawImage(Properties.Resources.AeroPeek, new Rectangle(Width - 10, 0, 10, Height)); - var StartORB = new Bitmap(Properties.Resources.Win7ORB); + Bitmap StartORB = new(Properties.Resources.Win7ORB); - var StartBtnRect = new Rectangle(3, -3, 39, 39); + Rectangle StartBtnRect = new(3, -3, 39, 39); - var AppBtnRect = new Rectangle(StartBtnRect.Right + 5, 0, 45, 35); - var AppBtnImgRect = new Rectangle(AppBtnRect.X + (AppBtnRect.Width - Properties.Resources.SampleApp_Active.Width) / 2, AppBtnRect.Y + (AppBtnRect.Height - Properties.Resources.SampleApp_Active.Height) / 2, Properties.Resources.SampleApp_Active.Width, Properties.Resources.SampleApp_Active.Height); + Rectangle AppBtnRect = new(StartBtnRect.Right + 5, 0, 45, 35); + Rectangle AppBtnImgRect = new(AppBtnRect.X + (AppBtnRect.Width - Properties.Resources.SampleApp_Active.Width) / 2, AppBtnRect.Y + (AppBtnRect.Height - Properties.Resources.SampleApp_Active.Height) / 2, Properties.Resources.SampleApp_Active.Width, Properties.Resources.SampleApp_Active.Height); - var App2BtnRect = new Rectangle(AppBtnRect.Right + 1, 0, 45, 35); - var App2BtnImgRect = new Rectangle(App2BtnRect.X + (App2BtnRect.Width - Properties.Resources.SampleApp_Inactive.Width) / 2, App2BtnRect.Y + (App2BtnRect.Height - Properties.Resources.SampleApp_Inactive.Height) / 2, Properties.Resources.SampleApp_Inactive.Width, Properties.Resources.SampleApp_Inactive.Height); + Rectangle App2BtnRect = new(AppBtnRect.Right + 1, 0, 45, 35); + Rectangle App2BtnImgRect = new(App2BtnRect.X + (App2BtnRect.Width - Properties.Resources.SampleApp_Inactive.Width) / 2, App2BtnRect.Y + (App2BtnRect.Height - Properties.Resources.SampleApp_Inactive.Height) / 2, Properties.Resources.SampleApp_Inactive.Width, Properties.Resources.SampleApp_Inactive.Height); G.DrawImage(StartORB, StartBtnRect); @@ -1714,7 +1691,7 @@ protected override void OnPaint(PaintEventArgs e) if (Shadow & !DesignMode) G.DrawGlow(RRect, Color.FromArgb(150, 0, 0, 0), 5, 15); - var inner = new Rectangle(RRect.X + 1, RRect.Y + 1, RRect.Width - 2, RRect.Height - 2); + Rectangle inner = new(RRect.X + 1, RRect.Y + 1, RRect.Width - 2, RRect.Height - 2); Color Color1 = Background; Color Color2 = Background2; @@ -1744,7 +1721,7 @@ protected override void OnPaint(PaintEventArgs e) int AllAppsWidthWithPadding = RRect.Width - 2 * _padding; int AppWidth = (AllAppsWidthWithPadding - (appsNumber - 1) * _padding) / appsNumber; - var Rects = new List(); + List Rects = new(); Rects.Clear(); for (int x = 0, loopTo8 = appsNumber - 1; x <= loopTo8; x++) @@ -1761,11 +1738,11 @@ protected override void OnPaint(PaintEventArgs e) for (int x = 0, loopTo9 = Rects.Count - 1; x <= loopTo9; x++) { - var r = Rects[x]; + Rectangle r = Rects[x]; if (x == 0) { - var surround = new Rectangle(r.X - 10, r.Y - 10, r.Width + 20, r.Height + 20); + Rectangle surround = new(r.X - 10, r.Y - 10, r.Width + 20, r.Height + 20); using (SolidBrush br = new(Color.FromArgb(75, 200, 200, 200))) { G.FillRoundedRect(br, surround, 1, true); @@ -1789,13 +1766,16 @@ protected override void OnPaint(PaintEventArgs e) int icon_w = Properties.Resources.SampleApp_Active.Width; - var icon_rect = new Rectangle(r.X + r.Width - (int)(0.7 * icon_w), r.Y + r.Height - (int)(0.6 * icon_w), icon_w, icon_w); + Rectangle icon_rect = new(r.X + r.Width - (int)(0.7 * icon_w), r.Y + r.Height - (int)(0.6 * icon_w), icon_w, icon_w); G.DrawImage(Properties.Resources.SampleApp_Active, icon_rect); } - var TextRect = new Rectangle(RRect.X + _padding, RRect.Y, RRect.Width - 2 * _padding, AppHeight * 2 / 5); - G.DrawGlowString(2, "______", Font, Color.Black, Color.FromArgb(185, 225, 225, 225), RRect, TextRect, ContentAlignment.MiddleCenter.ToStringFormat()); + Rectangle TextRect = new(RRect.X + _padding, RRect.Y, RRect.Width - 2 * _padding, AppHeight * 2 / 5); + using (StringFormat sf = ContentAlignment.MiddleCenter.ToStringFormat()) + { + G.DrawGlowString(2, "______", Font, Color.Black, Color.FromArgb(185, 225, 225, 225), RRect, TextRect, sf); + } break; } @@ -1808,7 +1788,7 @@ protected override void OnPaint(PaintEventArgs e) { G.DrawGlow(RRect, Color.FromArgb(150, 0, 0, 0), 5, 15); } - var inner = new Rectangle(RRect.X + 1, RRect.Y + 1, RRect.Width - 2, RRect.Height - 2); + Rectangle inner = new(RRect.X + 1, RRect.Y + 1, RRect.Width - 2, RRect.Height - 2); using (SolidBrush br = new(Color.White)) { @@ -1836,7 +1816,7 @@ protected override void OnPaint(PaintEventArgs e) int AllAppsWidthWithPadding = RRect.Width - 2 * _padding; int AppWidth = (AllAppsWidthWithPadding - (appsNumber - 1) * _padding) / appsNumber; - var Rects = new List(); + List Rects = new(); Rects.Clear(); for (int x = 0, loopTo10 = appsNumber - 1; x <= loopTo10; x++) @@ -1853,11 +1833,11 @@ protected override void OnPaint(PaintEventArgs e) for (int x = 0, loopTo11 = Rects.Count - 1; x <= loopTo11; x++) { - var r = Rects[x]; + Rectangle r = Rects[x]; if (x == 0) { - var surround = new Rectangle(r.X - 10, r.Y - 10, r.Width + 20, r.Height + 20); + Rectangle surround = new(r.X - 10, r.Y - 10, r.Width + 20, r.Height + 20); using (SolidBrush br = new(Color.FromArgb(75, 200, 200, 200))) { G.FillRoundedRect(br, surround, 1, true); @@ -1881,13 +1861,16 @@ protected override void OnPaint(PaintEventArgs e) int icon_w = Properties.Resources.SampleApp_Active.Width; - var icon_rect = new Rectangle(r.X + r.Width - (int)(0.7 * icon_w), r.Y + r.Height - (int)(0.6 * icon_w), icon_w, icon_w); + Rectangle icon_rect = new(r.X + r.Width - (int)(0.7 * icon_w), r.Y + r.Height - (int)(0.6 * icon_w), icon_w, icon_w); G.DrawImage(Properties.Resources.SampleApp_Active, icon_rect); } - var TextRect = new Rectangle(RRect.X + _padding, RRect.Y, RRect.Width - 2 * _padding, AppHeight * 2 / 5); - G.DrawGlowString(2, "______", Font, Color.Black, Color.FromArgb(185, 225, 225, 225), RRect, TextRect, ContentAlignment.MiddleCenter.ToStringFormat()); + Rectangle TextRect = new(RRect.X + _padding, RRect.Y, RRect.Width - 2 * _padding, AppHeight * 2 / 5); + using (StringFormat sf = ContentAlignment.MiddleCenter.ToStringFormat()) + { + G.DrawGlowString(2, "______", Font, Color.Black, Color.FromArgb(185, 225, 225, 225), RRect, TextRect, sf); + } break; } @@ -1902,10 +1885,10 @@ protected override void OnPaint(PaintEventArgs e) Color Titlebar_InnerBorder = Color.FromArgb(255, 255, 255); Color Titlebar_Turquoise = Color.FromArgb(40, 207, 228); Color OuterBorder = Color.FromArgb(0, 0, 0); - var UpperPart = new Rectangle(RRect.X, RRect.Y, RRect.Width + 1, 25); + Rectangle UpperPart = new(RRect.X, RRect.Y, RRect.Width + 1, 25); G.SetClip(UpperPart); - var pth_back = new LinearGradientBrush(UpperPart, Titlebar_Background1, Titlebar_BackColor2, LinearGradientMode.Vertical); - var pth_line = new LinearGradientBrush(UpperPart, Titlebar_InnerBorder, Titlebar_Turquoise, LinearGradientMode.Vertical); + LinearGradientBrush pth_back = new(UpperPart, Titlebar_Background1, Titlebar_BackColor2, LinearGradientMode.Vertical); + LinearGradientBrush pth_line = new(UpperPart, Titlebar_InnerBorder, Titlebar_Turquoise, LinearGradientMode.Vertical); // ### Render Titlebar G.FillRectangle(pth_back, RRect); using (Pen P = new(Titlebar_OuterBorder)) @@ -1955,7 +1938,7 @@ protected override void OnPaint(PaintEventArgs e) int _paddingOuter = (RRect.Width - AppWidth * appsNumber - _padding * (appsNumber - 1)) / 2; - var Rects = new List(); + List Rects = new(); Rects.Clear(); for (int x = 0, loopTo12 = appsNumber - 1; x <= loopTo12; x++) @@ -1972,17 +1955,20 @@ protected override void OnPaint(PaintEventArgs e) for (int x = 0, loopTo13 = Rects.Count - 1; x <= loopTo13; x++) { - var r = Rects[x]; + Rectangle r = Rects[x]; if (x == 0) G.DrawImage(Properties.Resources.Win7AltTabBasicButton, r); - var imgrect = new Rectangle(r.X + (r.Width - Properties.Resources.SampleApp_Active.Width) / 2, r.Y + (r.Height - Properties.Resources.SampleApp_Active.Height) / 2, Properties.Resources.SampleApp_Active.Width, Properties.Resources.SampleApp_Active.Height); + Rectangle imgrect = new(r.X + (r.Width - Properties.Resources.SampleApp_Active.Width) / 2, r.Y + (r.Height - Properties.Resources.SampleApp_Active.Height) / 2, Properties.Resources.SampleApp_Active.Width, Properties.Resources.SampleApp_Active.Height); G.DrawImage(Properties.Resources.SampleApp_Active, imgrect); } - var TextRect = new Rectangle(RRect.X + _padding, RRect.Y, RRect.Width - 2 * _padding, 30); - G.DrawString("______", Font, Brushes.Black, TextRect, ContentAlignment.MiddleCenter.ToStringFormat()); + Rectangle TextRect = new(RRect.X + _padding, RRect.Y, RRect.Width - 2 * _padding, 30); + using (StringFormat sf = ContentAlignment.MiddleCenter.ToStringFormat()) + { + G.DrawString("______", Font, Brushes.Black, TextRect, sf); + } break; } #endregion @@ -1990,7 +1976,7 @@ protected override void OnPaint(PaintEventArgs e) case Styles.StartVistaAero: #region Start Vista Aero { - var RestRect = new Rectangle(0, 14, Width - 6, Height - 14); + Rectangle RestRect = new(0, 14, Width - 6, Height - 14); // To dismiss upper part above start menu and make there is no blur bug G.SetClip(RestRect); @@ -2010,7 +1996,7 @@ protected override void OnPaint(PaintEventArgs e) case Styles.StartVistaOpaque: #region Start Vista Opaque { - var RestRect = new Rectangle(0, 14, Width - 6, Height - 14); + Rectangle RestRect = new(0, 14, Width - 6, Height - 14); G.FillRoundedRect(Brushes.White, RestRect, 4, true); using (SolidBrush br = new(Color.FromArgb(BackColorAlpha, Background))) { @@ -2042,12 +2028,12 @@ protected override void OnPaint(PaintEventArgs e) Bitmap orb = Properties.Resources.Vista_StartLowerORB; G.DrawImage(orb, new Rectangle(0, 0, orb.Width, Height)); - var apprect1 = new Rectangle(Rect.X + 60, 1, 140, Rect.Height - 4); - var apprect2 = new Rectangle(apprect1.Right + 2, 1, 140, Rect.Height - 4); - var appIcon1 = new Rectangle(apprect1.X + 4, apprect1.Y + (apprect1.Height - 20) / 2, 20, 20); - var appIcon2 = new Rectangle(apprect2.X + 4, apprect2.Y + (apprect2.Height - 20) / 2, 20, 20); - var appLabel1 = new Rectangle(apprect1.X + 25, apprect1.Y, apprect1.Width - 30, apprect1.Height); - var appLabel2 = new Rectangle(apprect2.X + 25, apprect2.Y, apprect2.Width - 30, apprect2.Height); + Rectangle apprect1 = new(Rect.X + 60, 1, 140, Rect.Height - 4); + Rectangle apprect2 = new(apprect1.Right + 2, 1, 140, Rect.Height - 4); + Rectangle appIcon1 = new(apprect1.X + 4, apprect1.Y + (apprect1.Height - 20) / 2, 20, 20); + Rectangle appIcon2 = new(apprect2.X + 4, apprect2.Y + (apprect2.Height - 20) / 2, 20, 20); + Rectangle appLabel1 = new(apprect1.X + 25, apprect1.Y, apprect1.Width - 30, apprect1.Height); + Rectangle appLabel2 = new(apprect2.X + 25, apprect2.Y, apprect2.Width - 30, apprect2.Height); G.DrawImage(Properties.Resources.Vista_ActiveApp, apprect1); G.DrawImage(Properties.Resources.Vista_InactiveApp, apprect2); @@ -2055,8 +2041,11 @@ protected override void OnPaint(PaintEventArgs e) G.DrawImage(Properties.Resources.SampleApp_Active, appIcon1); G.DrawImage(Properties.Resources.SampleApp_Inactive, appIcon2); - G.DrawString(Program.Lang.AppPreview, Font, Brushes.White, appLabel1, ContentAlignment.MiddleLeft.ToStringFormat()); - G.DrawString(Program.Lang.InactiveApp, Font, Brushes.White, appLabel2, ContentAlignment.MiddleLeft.ToStringFormat()); + using (StringFormat sf = ContentAlignment.MiddleLeft.ToStringFormat()) + { + G.DrawString(Program.Lang.AppPreview, Font, Brushes.White, appLabel1, sf); + G.DrawString(Program.Lang.InactiveApp, Font, Brushes.White, appLabel2, sf); + } break; } #endregion @@ -2073,12 +2062,12 @@ protected override void OnPaint(PaintEventArgs e) G.FillRectangle(new TextureBrush(Properties.Resources.Vista_Taskbar), Rect); G.DrawImage(orb, new Rectangle(0, 0, orb.Width, Height)); - var apprect1 = new Rectangle(Rect.X + 60, 1, 140, Rect.Height - 4); - var apprect2 = new Rectangle(apprect1.Right + 2, 1, 140, Rect.Height - 4); - var appIcon1 = new Rectangle(apprect1.X + 4, apprect1.Y + (apprect1.Height - 20) / 2, 20, 20); - var appIcon2 = new Rectangle(apprect2.X + 4, apprect2.Y + (apprect2.Height - 20) / 2, 20, 20); - var appLabel1 = new Rectangle(apprect1.X + 25, apprect1.Y, apprect1.Width - 30, apprect1.Height); - var appLabel2 = new Rectangle(apprect2.X + 25, apprect2.Y, apprect2.Width - 30, apprect2.Height); + Rectangle apprect1 = new(Rect.X + 60, 1, 140, Rect.Height - 4); + Rectangle apprect2 = new(apprect1.Right + 2, 1, 140, Rect.Height - 4); + Rectangle appIcon1 = new(apprect1.X + 4, apprect1.Y + (apprect1.Height - 20) / 2, 20, 20); + Rectangle appIcon2 = new(apprect2.X + 4, apprect2.Y + (apprect2.Height - 20) / 2, 20, 20); + Rectangle appLabel1 = new(apprect1.X + 25, apprect1.Y, apprect1.Width - 30, apprect1.Height); + Rectangle appLabel2 = new(apprect2.X + 25, apprect2.Y, apprect2.Width - 30, apprect2.Height); G.DrawImage(Properties.Resources.Vista_ActiveApp, apprect1); G.DrawImage(Properties.Resources.Vista_InactiveApp, apprect2); @@ -2086,8 +2075,11 @@ protected override void OnPaint(PaintEventArgs e) G.DrawImage(Properties.Resources.SampleApp_Active, appIcon1); G.DrawImage(Properties.Resources.SampleApp_Inactive, appIcon2); - G.DrawString(Program.Lang.AppPreview, Font, Brushes.White, appLabel1, ContentAlignment.MiddleLeft.ToStringFormat()); - G.DrawString(Program.Lang.InactiveApp, Font, Brushes.White, appLabel2, ContentAlignment.MiddleLeft.ToStringFormat()); + using (StringFormat sf = ContentAlignment.MiddleLeft.ToStringFormat()) + { + G.DrawString(Program.Lang.AppPreview, Font, Brushes.White, appLabel1, sf); + G.DrawString(Program.Lang.InactiveApp, Font, Brushes.White, appLabel2, sf); + } break; } #endregion @@ -2100,12 +2092,12 @@ protected override void OnPaint(PaintEventArgs e) G.FillRectangle(new TextureBrush(Properties.Resources.Vista_Taskbar), Rect); G.DrawImage(orb, new Rectangle(0, 0, orb.Width, Height)); - var apprect1 = new Rectangle(Rect.X + 60, 1, 140, Rect.Height - 4); - var apprect2 = new Rectangle(apprect1.Right + 2, 1, 140, Rect.Height - 4); - var appIcon1 = new Rectangle(apprect1.X + 4, apprect1.Y + (apprect1.Height - 20) / 2, 20, 20); - var appIcon2 = new Rectangle(apprect2.X + 4, apprect2.Y + (apprect2.Height - 20) / 2, 20, 20); - var appLabel1 = new Rectangle(apprect1.X + 25, apprect1.Y, apprect1.Width - 30, apprect1.Height); - var appLabel2 = new Rectangle(apprect2.X + 25, apprect2.Y, apprect2.Width - 30, apprect2.Height); + Rectangle apprect1 = new(Rect.X + 60, 1, 140, Rect.Height - 4); + Rectangle apprect2 = new(apprect1.Right + 2, 1, 140, Rect.Height - 4); + Rectangle appIcon1 = new(apprect1.X + 4, apprect1.Y + (apprect1.Height - 20) / 2, 20, 20); + Rectangle appIcon2 = new(apprect2.X + 4, apprect2.Y + (apprect2.Height - 20) / 2, 20, 20); + Rectangle appLabel1 = new(apprect1.X + 25, apprect1.Y, apprect1.Width - 30, apprect1.Height); + Rectangle appLabel2 = new(apprect2.X + 25, apprect2.Y, apprect2.Width - 30, apprect2.Height); G.DrawImage(Properties.Resources.Vista_ActiveApp, apprect1); G.DrawImage(Properties.Resources.Vista_InactiveApp, apprect2); @@ -2113,8 +2105,11 @@ protected override void OnPaint(PaintEventArgs e) G.DrawImage(Properties.Resources.SampleApp_Active, appIcon1); G.DrawImage(Properties.Resources.SampleApp_Inactive, appIcon2); - G.DrawString(Program.Lang.AppPreview, Font, Brushes.White, appLabel1, ContentAlignment.MiddleLeft.ToStringFormat()); - G.DrawString(Program.Lang.InactiveApp, Font, Brushes.White, appLabel2, ContentAlignment.MiddleLeft.ToStringFormat()); + using (StringFormat sf = ContentAlignment.MiddleLeft.ToStringFormat()) + { + G.DrawString(Program.Lang.AppPreview, Font, Brushes.White, appLabel1, sf); + G.DrawString(Program.Lang.InactiveApp, Font, Brushes.White, appLabel2, sf); + } break; } #endregion @@ -2136,6 +2131,8 @@ protected override void OnPaint(PaintEventArgs e) } #endregion } + + base.OnPaint(e); } } } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/Simulation/WinIcon.cs b/WinPaletter/GUI/Elements/Simulation/WinIcon.cs index 7d8dbbd2..64456645 100644 --- a/WinPaletter/GUI/Elements/Simulation/WinIcon.cs +++ b/WinPaletter/GUI/Elements/Simulation/WinIcon.cs @@ -6,18 +6,14 @@ namespace WinPaletter.UI.Simulation { - [Description("Simulated Windows desktop icons")] public class WinIcon : Panel { - public WinIcon() { + SetStyle(ControlStyles.SupportsTransparentBackColor | ControlStyles.AllPaintingInWmPaint | ControlStyles.UserPaint, true); DoubleBuffered = true; BackColor = Color.Transparent; - SetStyle(ControlStyles.SupportsTransparentBackColor, true); - SetStyle(ControlStyles.AllPaintingInWmPaint, true); - SetStyle(ControlStyles.UserPaint, true); } #region Properties @@ -29,18 +25,17 @@ public WinIcon() private int _IconSize = 32; public int IconSize { - get - { - return _IconSize; - } + get => _IconSize; set { - _IconSize = value; - Invalidate(); + if (value != _IconSize) + { + _IconSize = value; + Invalidate(); + } } } - [Browsable(true)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] [EditorBrowsable(EditorBrowsableState.Always)] @@ -52,9 +47,16 @@ protected override CreateParams CreateParams { get { - var cp = base.CreateParams; - cp.ExStyle = cp.ExStyle | 0x20; - return cp; + CreateParams cpar = base.CreateParams; + if (!DesignMode) + { + cpar.ExStyle |= 0x20; + return cpar; + } + else + { + return cpar; + } } } @@ -62,36 +64,41 @@ protected override CreateParams CreateParams protected override void OnPaint(PaintEventArgs e) { - var G = e.Graphics; + if (this == null) return; + + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.HighQuality; G.TextRenderingHint = Program.Style.RenderingHint; DoubleBuffered = true; - var IconRect = new Rectangle(0, 0, Width - 1, Height - 30); + Rectangle IconRect = new(0, 0, Width - 1, Height - 30); - var LabelRect = new Rectangle(0, Height - 35, Width - 1, 30); - var LabelRectShadow = new Rectangle(1, Height - 34, Width - 1, 30); + Rectangle LabelRect = new(0, Height - 35, Width - 1, 30); + Rectangle LabelRectShadow = new(1, Height - 34, Width - 1, 30); if (_IconSize < 16) _IconSize = 16; if (_IconSize > 256) _IconSize = 256; - var IconRectX = new Rectangle((int)Math.Round(IconRect.X + (IconRect.Width - _IconSize) / 2d), (int)Math.Round(IconRect.Y + (IconRect.Height - _IconSize) / 2d), _IconSize, _IconSize); + Rectangle IconRectX = new((int)Math.Round(IconRect.X + (IconRect.Width - _IconSize) / 2d), (int)Math.Round(IconRect.Y + (IconRect.Height - _IconSize) / 2d), _IconSize, _IconSize); if (Icon is not null) { - var ico = new Icon(Icon, _IconSize, _IconSize); + Icon ico = new(Icon, _IconSize, _IconSize); G.DrawIcon(ico, IconRectX); ico.Dispose(); } - if (ColorGlow.A > 0) - G.DrawString(Text, Font, Brushes.Black, LabelRectShadow, ContentAlignment.MiddleCenter.ToStringFormat()); + using (StringFormat sf = ContentAlignment.MiddleCenter.ToStringFormat()) + { + if (ColorGlow.A > 0) + G.DrawString(Text, Font, Brushes.Black, LabelRectShadow, sf); - G.DrawGlowString(1, Text, Font, ColorText, ColorGlow, new Rectangle(0, 0, Width - 1, Height - 1), LabelRect, ContentAlignment.MiddleCenter.ToStringFormat()); - } + G.DrawGlowString(1, Text, Font, ColorText, ColorGlow, new Rectangle(0, 0, Width - 1, Height - 1), LabelRect, sf); + } + base.OnPaint(e); + } } - } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/Simulation/WinTerminal.cs b/WinPaletter/GUI/Elements/Simulation/WinTerminal.cs index 5d21b478..450cfea5 100644 --- a/WinPaletter/GUI/Elements/Simulation/WinTerminal.cs +++ b/WinPaletter/GUI/Elements/Simulation/WinTerminal.cs @@ -13,19 +13,16 @@ namespace WinPaletter.UI.Simulation [DefaultEvent("Click")] public class WinTerminal : ContainerControl { - public WinTerminal() { Text = string.Empty; DoubleBuffered = true; - HandleCreated += WinTerminal_HandleCreated; - HandleDestroyed += WinTerminal_HandleDestroyed; - Timer.Tick += Timer_Tick; } #region Variables + Timer Timer = new() { Enabled = false, Interval = 500 }; - private TextureBrush Noise = new TextureBrush(Properties.Resources.GaussianBlur.Fade(0.15d)); + private TextureBrush Noise = new(Properties.Resources.GaussianBlur.Fade(0.15d)); private Bitmap adaptedBack; private Bitmap adaptedBackBlurred; private bool tick = false; @@ -48,14 +45,10 @@ public enum CursorShape_Enum private float _Opacity = 1f; public float Opacity { - get - { - return _Opacity; - } - + get => _Opacity; set { - if (!(value == _Opacity)) + if (value != _Opacity) { _Opacity = value; Invalidate(); @@ -66,14 +59,10 @@ public float Opacity private float _OpacityBackImage = 100f; public float OpacityBackImage { - get - { - return _OpacityBackImage; - } - + get => _OpacityBackImage; set { - if (!(value == _OpacityBackImage)) + if (value != _OpacityBackImage) { _OpacityBackImage = value; Invalidate(); @@ -84,11 +73,7 @@ public float OpacityBackImage private Image _BackImage; public Image BackImage { - get - { - return _BackImage; - } - + get => _BackImage; set { if (value != _BackImage) @@ -124,44 +109,38 @@ public Image BackImage #region Events - private void WinTerminal_HandleCreated(object sender, EventArgs e) + protected override void OnHandleCreated(EventArgs e) { if (!DesignMode) { - Timer.Enabled = true; - Timer.Start(); - - try - { - SizeChanged += ProcessBack_EventHandler; - } - catch - { - } ProcessBack(); + + try { Timer.Tick += Timer_Tick; } catch { } + + Timer.Enabled = true; Timer.Start(); } - else - { - Timer.Enabled = false; - Timer.Stop(); - } + else { Timer.Enabled = false; Timer.Stop(); } + + base.OnHandleCreated(e); } - private void WinTerminal_HandleDestroyed(object sender, EventArgs e) + protected override void OnHandleDestroyed(EventArgs e) { - if (!DesignMode) - { - try - { - SizeChanged -= ProcessBack_EventHandler; - } - catch - { - } - } + if (!DesignMode) { try { Timer.Tick -= Timer_Tick; } catch { } } + + Timer.Enabled = false; Timer.Stop(); + + base.OnHandleDestroyed(e); } - public void UpdateOpacityBackImageChanged() + protected override void OnSizeChanged(EventArgs e) + { + ProcessBack(); + + base.OnSizeChanged(e); + } + + private void UpdateOpacityBackImageChanged() { if (BackImage is not null) { @@ -170,12 +149,7 @@ public void UpdateOpacityBackImageChanged() } } - private void ProcessBack_EventHandler(object sender, EventArgs e) - { - ProcessBack(); - } - - public void ProcessBack() + private void ProcessBack() { GetBack(); NoiseBack(); @@ -185,19 +159,19 @@ public void ProcessBack() #region Voids/Functions - public GraphicsPath RR(Rectangle r, int radius) + private GraphicsPath RR(Rectangle r, int radius) { try { - var path = new GraphicsPath(); + GraphicsPath path = new(); int d = radius * 2; float f0 = 0.5f; float f1 = 2f - f0; - var R1 = new Rectangle((int)Math.Round(r.X + f0 * d), r.Y, d, d); - var R2 = new Rectangle((int)Math.Round(r.X + r.Width - f1 * d), r.Y, d, d); - var R3 = new Rectangle((int)Math.Round(r.X - f0 * d), (int)Math.Round(r.Y + r.Height - f0 * d), d, (int)Math.Round(f0 * d)); - var R4 = new Rectangle((int)Math.Round(r.X + r.Width - f0 * d), (int)Math.Round(r.Y + r.Height - f0 * d), d, (int)Math.Round(f0 * d)); + Rectangle R1 = new((int)Math.Round(r.X + f0 * d), r.Y, d, d); + Rectangle R2 = new((int)Math.Round(r.X + r.Width - f1 * d), r.Y, d, d); + Rectangle R3 = new((int)Math.Round(r.X - f0 * d), (int)Math.Round(r.Y + r.Height - f0 * d), d, (int)Math.Round(f0 * d)); + Rectangle R4 = new((int)Math.Round(r.X + r.Width - f0 * d), (int)Math.Round(r.Y + r.Height - f0 * d), d, (int)Math.Round(f0 * d)); path.AddArc(R4, 90f, 90f); path.AddLine(new Point(R4.X, R4.Y), new Point(R2.Right, R2.Bottom)); @@ -216,19 +190,19 @@ public GraphicsPath RR(Rectangle r, int radius) } } - public GraphicsPath RRNoLine(Rectangle r, int radius) + private GraphicsPath RRNoLine(Rectangle r, int radius) { try { - var path = new GraphicsPath(); + GraphicsPath path = new(); int d = radius * 2; float f0 = 0.5f; float f1 = 2f - f0; - var R1 = new Rectangle((int)Math.Round(r.X + f0 * d), r.Y, d, d); - var R2 = new Rectangle((int)Math.Round(r.X + r.Width - f1 * d), r.Y, d, d); - var R3 = new Rectangle((int)Math.Round(r.X - f0 * d), (int)Math.Round(r.Y + r.Height - f0 * d), d, (int)Math.Round(f0 * d)); - var R4 = new Rectangle((int)Math.Round(r.X + r.Width - f0 * d), (int)Math.Round(r.Y + r.Height - f0 * d), d, (int)Math.Round(f0 * d)); + Rectangle R1 = new((int)Math.Round(r.X + f0 * d), r.Y, d, d); + Rectangle R2 = new((int)Math.Round(r.X + r.Width - f1 * d), r.Y, d, d); + Rectangle R3 = new((int)Math.Round(r.X - f0 * d), (int)Math.Round(r.Y + r.Height - f0 * d), d, (int)Math.Round(f0 * d)); + Rectangle R4 = new((int)Math.Round(r.X + r.Width - f0 * d), (int)Math.Round(r.Y + r.Height - f0 * d), d, (int)Math.Round(f0 * d)); path.AddArc(R4, 90f, 90f); path.AddLine(new Point(R4.X, R4.Y), new Point(R2.Right, R2.Bottom)); @@ -247,7 +221,7 @@ public GraphicsPath RRNoLine(Rectangle r, int radius) } } - public void FillSemiRect(Graphics Graphics, Brush Brush, Rectangle Rectangle, int Radius = -1) + private void FillSemiRect(Graphics Graphics, Brush Brush, Rectangle Rectangle, int Radius = -1) { try { @@ -257,7 +231,7 @@ public void FillSemiRect(Graphics Graphics, Brush Brush, Rectangle Rectangle, in if (Graphics is null) throw new ArgumentNullException("graphics"); - using (var path = RoundedSemiRectangle(Rectangle, Radius)) + using (GraphicsPath path = RoundedSemiRectangle(Rectangle, Radius)) { Graphics.FillPath(Brush, path); } @@ -267,11 +241,11 @@ public void FillSemiRect(Graphics Graphics, Brush Brush, Rectangle Rectangle, in } } - public GraphicsPath RoundedSemiRectangle(Rectangle r, int radius) + private GraphicsPath RoundedSemiRectangle(Rectangle r, int radius) { try { - var path = new GraphicsPath(); + GraphicsPath path = new(); int d = radius * 2; path.AddLine(r.Left + d, r.Top, r.Right - d, r.Top); @@ -293,7 +267,7 @@ public GraphicsPath RoundedSemiRectangle(Rectangle r, int radius) } } - public void FillSemiImg(Graphics Graphics, Image Image, Rectangle Rectangle, int Radius = -1, bool ForcedRoundCorner = false) + private void FillSemiImg(Graphics Graphics, Image Image, Rectangle Rectangle, int Radius = -1, bool ForcedRoundCorner = false) { try { @@ -305,9 +279,9 @@ public void FillSemiImg(Graphics Graphics, Image Image, Rectangle Rectangle, int if ((Program.Style.RoundedCorners | ForcedRoundCorner) & Radius > 0) { - using (var path = RoundedSemiRectangle(Rectangle, Radius)) + using (GraphicsPath path = RoundedSemiRectangle(Rectangle, Radius)) { - var reg = new Region(path); + Region reg = new(path); Graphics.Clip = reg; Graphics.DrawImage(Image, Rectangle); Graphics.ResetClip(); @@ -323,45 +297,33 @@ public void FillSemiImg(Graphics Graphics, Image Image, Rectangle Rectangle, int } } - public void GetBack() + private void GetBack() { adaptedBack = Program.Wallpaper; adaptedBackBlurred = BitmapExtensions.Blur(new Bitmap(adaptedBack), 13); } - public void NoiseBack() + private void NoiseBack() { - Noise = new TextureBrush(Properties.Resources.GaussianBlur.Fade(0.5d)); + Noise = new(Properties.Resources.GaussianBlur.Fade(0.5d)); } #endregion #region Animator - Timer Timer = new Timer() { Enabled = false, Interval = 500 }; - private void Timer_Tick(object sender, EventArgs e) { - if (IsFocused) - { - if (tick) - { - tick = false; - } - else - { - tick = true; - } - - Refresh(); - } + if (IsFocused) { tick = !tick; Refresh(); } } #endregion protected override void OnPaint(PaintEventArgs e) { - var G = e.Graphics; + if (this == null) return; + + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; G.TextRenderingHint = DesignMode ? TextRenderingHint.ClearTypeGridFit : TextRenderingHint.SystemDefault; @@ -430,22 +392,22 @@ protected override void OnPaint(PaintEventArgs e) } - var Rect = new Rectangle(0, 0, Width - 1, Height - 1); - var Rect_Titlebar = new Rectangle(0, 0, Width - 1, 32); - var Rect_Console = new Rectangle(1, Rect_Titlebar.Bottom - 1, Width - 3, Height - Rect_Titlebar.Height); + Rectangle Rect = new(0, 0, Width - 1, Height - 1); + Rectangle Rect_Titlebar = new(0, 0, Width - 1, 32); + Rectangle Rect_Console = new(1, Rect_Titlebar.Bottom - 1, Width - 3, Height - Rect_Titlebar.Height); string s1 = Program.Lang.Terminal_ConsoleSample; string s2 = Program.Lang.Terminal_ThisIsASelection; - string s3 = PathsExt.System32 + ">"; + string s3 = $"{PathsExt.System32}>"; - var s1X = s1.Measure(Font) + new SizeF(5f, 0f); - var s2X = s2.Measure(Font) + new SizeF(2f, 0f); - var s3X = s3.Measure(Font) + new SizeF(2f, 0f); - var Rect_ConsoleText0 = new Rectangle(8, Rect_Titlebar.Bottom + 8, (int)Math.Round(s1X.Width), (int)Math.Round(s1X.Height)); - var Rect_ConsoleText1 = new Rectangle(8, Rect_ConsoleText0.Bottom + 3, (int)Math.Round(s2X.Width), (int)Math.Round(s2X.Height)); - var Rect_ConsoleText2 = new Rectangle(8, Rect_ConsoleText1.Bottom + Rect_ConsoleText1.Height + 3, (int)Math.Round(s3X.Width), (int)Math.Round(s3X.Height)); + SizeF s1X = s1.Measure(Font) + new SizeF(5f, 0f); + SizeF s2X = s2.Measure(Font) + new SizeF(2f, 0f); + SizeF s3X = s3.Measure(Font) + new SizeF(2f, 0f); + Rectangle Rect_ConsoleText0 = new(8, Rect_Titlebar.Bottom + 8, (int)Math.Round(s1X.Width), (int)Math.Round(s1X.Height)); + Rectangle Rect_ConsoleText1 = new(8, Rect_ConsoleText0.Bottom + 3, (int)Math.Round(s2X.Width), (int)Math.Round(s2X.Height)); + Rectangle Rect_ConsoleText2 = new(8, Rect_ConsoleText1.Bottom + Rect_ConsoleText1.Height + 3, (int)Math.Round(s3X.Width), (int)Math.Round(s3X.Height)); - var Rect_ConsoleCursor = new Rectangle(Rect_ConsoleText2.Right, Rect_ConsoleText2.Y, 50, Rect_ConsoleText2.Height - 1); + Rectangle Rect_ConsoleCursor = new(Rect_ConsoleText2.Right, Rect_ConsoleText2.Y, 50, Rect_ConsoleText2.Height - 1); if (UseAcrylic) { @@ -547,19 +509,19 @@ protected override void OnPaint(PaintEventArgs e) int Radius = 5; int TabHeight = 22; - var Rect_Tab0 = new Rectangle(10, Rect_Titlebar.Bottom - TabHeight, 150, TabHeight); - var Rect_Tab1 = Rect_Tab0; + Rectangle Rect_Tab0 = new(10, Rect_Titlebar.Bottom - TabHeight, 150, TabHeight); + Rectangle Rect_Tab1 = Rect_Tab0; Rect_Tab1.X = Rect_Tab0.X + Rect_Tab0.Width - Radius; - var IconRect0 = new Rectangle(Rect_Tab0.X + 10, Rect_Tab0.Y + 3, 16, 16); - var FC0 = TabFocusedFinalColor.IsDark() ? Color.White : Color.Black; - var RectText_Tab0 = new Rectangle(IconRect0.Right + 1, IconRect0.Y + 1, Rect_Tab0.Width - 35 - IconRect0.Width, IconRect0.Height); - var RectClose_Tab0 = new Rectangle(RectText_Tab0.Right + 2, RectText_Tab0.Y - 1, 15, RectText_Tab0.Height); + Rectangle IconRect0 = new(Rect_Tab0.X + 10, Rect_Tab0.Y + 3, 16, 16); + Color FC0 = TabFocusedFinalColor.IsDark() ? Color.White : Color.Black; + Rectangle RectText_Tab0 = new(IconRect0.Right + 1, IconRect0.Y + 1, Rect_Tab0.Width - 35 - IconRect0.Width, IconRect0.Height); + Rectangle RectClose_Tab0 = new(RectText_Tab0.Right + 2, RectText_Tab0.Y - 1, 15, RectText_Tab0.Height); - var IconRect1 = new Rectangle(Rect_Tab1.X + 10, Rect_Tab1.Y + 3, 16, 16); - var FC1 = Color_TabUnFocused.IsDark() ? Color.White : Color.Black; - var RectText_Tab1 = new Rectangle(IconRect1.Right + 1, IconRect1.Y + 1, Rect_Tab1.Width - 35 - IconRect1.Width, IconRect1.Height); - var RectClose_Tab1 = new Rectangle(RectText_Tab1.Right + 2, RectText_Tab1.Y - 1, 15, RectText_Tab1.Height); + Rectangle IconRect1 = new(Rect_Tab1.X + 10, Rect_Tab1.Y + 3, 16, 16); + Color FC1 = Color_TabUnFocused.IsDark() ? Color.White : Color.Black; + Rectangle RectText_Tab1 = new(IconRect1.Right + 1, IconRect1.Y + 1, Rect_Tab1.Width - 35 - IconRect1.Width, IconRect1.Height); + Rectangle RectClose_Tab1 = new(RectText_Tab1.Right + 2, RectText_Tab1.Y - 1, 15, RectText_Tab1.Height); if (IsFocused) { @@ -595,11 +557,11 @@ protected override void OnPaint(PaintEventArgs e) if (OS.W12 || OS.W11) { - fx = new Font("Segoe Fluent Icons", 12f); + fx = new("Segoe Fluent Icons", 12f); } else { - fx = new Font("Segoe MDL2 Assets", 12f); + fx = new("Segoe MDL2 Assets", 12f); } if (TabIcon is not null) @@ -608,50 +570,59 @@ protected override void OnPaint(PaintEventArgs e) } else { - using (SolidBrush br = new(FC0)) + using (StringFormat sf = ContentAlignment.TopCenter.ToStringFormat()) { - G.DrawString(TabIconButItIsString, fx, br, IconRect0, ContentAlignment.TopCenter.ToStringFormat()); + using (SolidBrush br = new(FC0)) + { + G.DrawString(TabIconButItIsString, fx, br, IconRect0, sf); + } } } - using (SolidBrush br = new(FC1)) + using (StringFormat sf = ContentAlignment.TopCenter.ToStringFormat()) { - G.DrawString(TabIconButItIsString, fx, br, IconRect1, ContentAlignment.TopCenter.ToStringFormat()); + using (SolidBrush br = new(FC1)) + { + G.DrawString(TabIconButItIsString, fx, br, IconRect1, sf); + } } - TextRenderer.DrawText(G, TabTitle, new Font("Segoe UI", 8f, FontStyle.Bold), RectText_Tab0, FC0, Color.Transparent, TextFormatFlags.WordEllipsis); TextRenderer.DrawText(G, Program.Lang.Terminal_Another, new Font("Segoe UI", 8f, FontStyle.Regular), RectText_Tab1, FC1, Color.Transparent, TextFormatFlags.WordEllipsis); - - using (SolidBrush br = new(FC0)) + using (StringFormat sf = ContentAlignment.MiddleCenter.ToStringFormat()) { - G.DrawString("", new Font("Segoe MDL2 Assets", 6f, FontStyle.Regular), br, RectClose_Tab0, ContentAlignment.MiddleCenter.ToStringFormat()); - } - using (SolidBrush br = new(FC1)) - { - G.DrawString("", new Font("Segoe MDL2 Assets", 6f, FontStyle.Regular), br, RectClose_Tab1, ContentAlignment.MiddleCenter.ToStringFormat()); + using (SolidBrush br = new(FC0)) + { + G.DrawString("", new Font("Segoe MDL2 Assets", 6f, FontStyle.Regular), br, RectClose_Tab0, sf); + } + using (SolidBrush br = new(FC1)) + { + G.DrawString("", new Font("Segoe MDL2 Assets", 6f, FontStyle.Regular), br, RectClose_Tab1, sf); + } } - using (SolidBrush br = new(Color_Foreground)) + using (StringFormat sf = ContentAlignment.TopLeft.ToStringFormat()) { - G.DrawString(s1, Font, br, Rect_ConsoleText0, ContentAlignment.TopLeft.ToStringFormat()); - } + using (SolidBrush br = new(Color_Foreground)) + { + G.DrawString(s1, Font, br, Rect_ConsoleText0, sf); + } - using (SolidBrush br = new(Color.FromArgb(125, Color_Selection))) - { - G.FillRectangle(br, Rect_ConsoleText1); - } + using (SolidBrush br = new(Color.FromArgb(125, Color_Selection))) + { + G.FillRectangle(br, Rect_ConsoleText1); + } - using (SolidBrush br = new(Color.FromArgb(255 - 125, Color_Foreground))) - { - G.DrawString(s2, Font, br, Rect_ConsoleText1, ContentAlignment.TopLeft.ToStringFormat()); - } + using (SolidBrush br = new(Color.FromArgb(255 - 125, Color_Foreground))) + { + G.DrawString(s2, Font, br, Rect_ConsoleText1, sf); + } - using (SolidBrush br = new(Color_Foreground)) - { - G.DrawString(s3, Font, br, Rect_ConsoleText2, ContentAlignment.TopLeft.ToStringFormat()); + using (SolidBrush br = new(Color_Foreground)) + { + G.DrawString(s3, Font, br, Rect_ConsoleText2, sf); + } } - if (tick & IsFocused) { G.SmoothingMode = SmoothingMode.HighSpeed; @@ -718,8 +689,8 @@ protected override void OnPaint(PaintEventArgs e) { G.DrawRoundedRect(P, Rect); } - } + base.OnPaint(e); + } } - } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/Simulation/Window.cs b/WinPaletter/GUI/Elements/Simulation/Window.cs index cd317dcd..a13456a0 100644 --- a/WinPaletter/GUI/Elements/Simulation/Window.cs +++ b/WinPaletter/GUI/Elements/Simulation/Window.cs @@ -1,4 +1,5 @@ -using System; +using ImageProcessor; +using System; using System.ComponentModel; using System.Drawing; using System.Drawing.Drawing2D; @@ -10,17 +11,13 @@ namespace WinPaletter.UI.Simulation [Description("A simulated window")] public class Window : Panel { - public Window() { AdjustPadding(); - Font = new Font("Segoe UI", 9f); + Font = new("Segoe UI", 9f); DoubleBuffered = true; SetStyle(ControlStyles.SupportsTransparentBackColor, true); BackColor = Color.Transparent; - HandleCreated += Window_HandleCreated; - HandleDestroyed += Window_HandleDestroyed; - FontChanged += Window_FontChanged; } #region Variables @@ -63,106 +60,98 @@ public enum Preview_Enum private bool _DarkMode = true; public bool DarkMode { - get - { - return _DarkMode; - } + get => _DarkMode; set { - _DarkMode = value; - if (!SuspendRefresh) - Refresh(); + if (value != _DarkMode) + { + _DarkMode = value; + + if (!SuspendRefresh) Refresh(); + } } } private bool _AccentColor_Enabled = true; public bool AccentColor_Enabled { - get - { - return _AccentColor_Enabled; - } + get => _AccentColor_Enabled; set { - _AccentColor_Enabled = value; - if (!SuspendRefresh) - Refresh(); + if (value != _AccentColor_Enabled) + { + _AccentColor_Enabled = value; + + if (!SuspendRefresh) Refresh(); + } } } private float _Win7Noise = 1f; public float Win7Noise { - get - { - return _Win7Noise; - } + get => _Win7Noise; set { - _Win7Noise = value; - if (Preview == Preview_Enum.W7Aero | Preview == Preview_Enum.W7Opaque | Preview == Preview_Enum.W7Basic) + if (value != _Win7Noise) { - try - { - Noise7 = Properties.Resources.AeroGlass.Fade((double)(Win7Noise / 100f)); - } - catch + _Win7Noise = value; + + if (Preview == Preview_Enum.W7Aero | Preview == Preview_Enum.W7Opaque | Preview == Preview_Enum.W7Basic) { + try { Noise7 = Properties.Resources.AeroGlass.Fade((double)(Win7Noise / 100f)); } catch { } } + + if (!SuspendRefresh) Refresh(); } - if (!SuspendRefresh) - Refresh(); } } private int _Metrics_CaptionHeight = 22; public int Metrics_CaptionHeight { - get - { - return _Metrics_CaptionHeight; - } + get => _Metrics_CaptionHeight; set { - _Metrics_CaptionHeight = value; - AdjustPadding(); - if (!SuspendRefresh) - Refresh(); - MetricsChanged?.Invoke(); + if (value != _Metrics_CaptionHeight) + { + _Metrics_CaptionHeight = value; + AdjustPadding(); + if (!SuspendRefresh) Refresh(); + MetricsChanged?.Invoke(); + } } } private int _Metrics_BorderWidth = 1; public int Metrics_BorderWidth { - get - { - return _Metrics_BorderWidth; - } + get => _Metrics_BorderWidth; set { - _Metrics_BorderWidth = value; - AdjustPadding(); - if (!SuspendRefresh) - Refresh(); - MetricsChanged?.Invoke(); + if (value != _Metrics_BorderWidth) + { + _Metrics_BorderWidth = value; + AdjustPadding(); + if (!SuspendRefresh) Refresh(); + MetricsChanged?.Invoke(); + } } } private int _Metrics_PaddedBorderWidth = 4; public int Metrics_PaddedBorderWidth { - get - { - return _Metrics_PaddedBorderWidth; - } + get => _Metrics_PaddedBorderWidth; set { - _Metrics_PaddedBorderWidth = value; - AdjustPadding(); - if (!SuspendRefresh) - Refresh(); - MetricsChanged?.Invoke(); + if (value != _Metrics_PaddedBorderWidth) + { + _Metrics_PaddedBorderWidth = value; + AdjustPadding(); + if (!SuspendRefresh) Refresh(); + MetricsChanged?.Invoke(); + } } } @@ -177,9 +166,16 @@ protected override CreateParams CreateParams { get { - var cp = base.CreateParams; - cp.ExStyle = cp.ExStyle | 0x20; - return cp; + CreateParams cpar = base.CreateParams; + if (!DesignMode) + { + cpar.ExStyle |= 0x20; + return cpar; + } + else + { + return cpar; + } } } @@ -191,75 +187,36 @@ protected override CreateParams CreateParams public delegate void MetricsChangedEventHandler(); - private void Window_HandleCreated(object sender, EventArgs e) + protected override void OnHandleCreated(EventArgs e) { - if (!DesignMode) - { - try - { - Parent.BackgroundImageChanged += ProcessBack_EventHandler; - } - catch - { - } - try - { - FontChanged += AdjustPadding_EventHandler; - } - catch - { - } - } + if (!DesignMode) ProcessBack(); - ProcessBack(); + base.OnHandleCreated(e); } - private void Window_HandleDestroyed(object sender, EventArgs e) + protected override void OnBackgroundImageChanged(EventArgs e) { - if (!DesignMode) - { - try - { - Parent.BackgroundImageChanged -= ProcessBack_EventHandler; - } - catch - { - } - try - { - FontChanged -= AdjustPadding_EventHandler; - } - catch - { - } - } - } + if (!DesignMode) ProcessBack(); - public void ProcessBack_EventHandler(object sender, EventArgs e) - { - ProcessBack(); + base.OnBackgroundImageChanged(e); } - public void AdjustPadding_EventHandler(object sender, EventArgs e) + protected override void OnFontChanged(EventArgs e) { + Title_x_Height = (int)Math.Round(TitleScheme.Measure(Font).Height); + Title_9_Height = (int)Math.Round(TitleScheme.Measure(new Font(Font.Name, 9f, Font.Style)).Height); + AdjustPadding(); + + base.OnFontChanged(e); } public void ProcessBack() { - Bitmap Wallpaper; - if (Parent.BackgroundImage is null) - Wallpaper = Program.Wallpaper; - else - Wallpaper = (Bitmap)Parent.BackgroundImage; - try - { - if (Wallpaper is not null) - AdaptedBack = Wallpaper.Clone(Bounds, Wallpaper.PixelFormat); - } - catch - { - } + Bitmap Wallpaper = Parent.BackgroundImage is null ? Program.Wallpaper : (Bitmap)Parent.BackgroundImage; + + try { if (Wallpaper is not null) { AdaptedBack = Wallpaper.Clone(Bounds, Wallpaper.PixelFormat); } } catch { } + try { if (Preview == Preview_Enum.W11) @@ -267,11 +224,12 @@ public void ProcessBack() if (AdaptedBack is not null) { Bitmap b = new Bitmap(AdaptedBack).Blur(15); + if (DarkMode) { if (b is not null) { - using (var ImgF = new ImageProcessor.ImageFactory()) + using (ImageFactory ImgF = new()) { ImgF.Load(b); ImgF.Saturation(15); @@ -281,25 +239,15 @@ public void ProcessBack() } } - else - { - AdaptedBackBlurred = b; - } + else { AdaptedBackBlurred = b; } } } - else if (AdaptedBack is not null) - AdaptedBackBlurred = new Bitmap(AdaptedBack).Blur(3); - } - catch - { - } - try - { - Noise7 = Properties.Resources.AeroGlass.Fade(Win7Noise / 100); - } - catch - { + + else if (AdaptedBack is not null) { AdaptedBackBlurred = new Bitmap(AdaptedBack).Blur(3); } } + catch { } + + try { Noise7 = Properties.Resources.AeroGlass.Fade(Win7Noise / 100); } catch { } } #endregion @@ -347,7 +295,7 @@ public void SetMetrics(Window Window) public void AdjustPadding() { - Padding = new Padding(ClientRect.Left + 1, ClientRect.Top + 1, ClientRect.Left + 1, ClientRect.Left + 1); + Padding = new(ClientRect.Left + 1, ClientRect.Top + 1, ClientRect.Left + 1, ClientRect.Left + 1); } public void FillSemiRect(Graphics Graphics, Brush Brush, Rectangle Rectangle, int Radius = -1) @@ -362,7 +310,7 @@ public void FillSemiRect(Graphics Graphics, Brush Brush, Rectangle Rectangle, in Graphics.SmoothingMode = SmoothingMode.AntiAlias; - using (var path = RoundedSemiRectangle(Rectangle, Radius)) + using (GraphicsPath path = RoundedSemiRectangle(Rectangle, Radius)) { Graphics.FillPath(Brush, path); } @@ -376,7 +324,7 @@ public GraphicsPath RoundedSemiRectangle(Rectangle r, int radius) { try { - var path = new GraphicsPath(); + GraphicsPath path = new(); int d = radius * 2; path.AddLine(r.Left + d, r.Top, r.Right - d, r.Top); @@ -470,27 +418,27 @@ private Rectangle LabelRect if (Preview == Preview_Enum.W8 || Preview == Preview_Enum.W8Lite) { - resultRect = new Rectangle(Rect.X, Rect.Y + 2, TitlebarRect.Width - 1, TitlebarRect.Height - 3); + resultRect = new(Rect.X, Rect.Y + 2, TitlebarRect.Width - 1, TitlebarRect.Height - 3); } else if (Preview == Preview_Enum.W7Aero || Preview == Preview_Enum.W7Opaque) { int offsetX = !ToolWindow ? IconRect.Right + 2 : IconRect.X - 2; - resultRect = new Rectangle(offsetX, TitlebarRect.Y, TitlebarRect.Width - (IconRect.Right + 4), TitlebarRect.Height); + resultRect = new(offsetX, TitlebarRect.Y, TitlebarRect.Width - (IconRect.Right + 4), TitlebarRect.Height); } else if (Preview == Preview_Enum.W7Basic) { int offsetX = !ToolWindow ? IconRect.Right + 3 : IconRect.X; - resultRect = new Rectangle(offsetX, CloseButtonRect.Y, TitlebarRect.Width - (IconRect.Right + 4), CloseButtonRect.Height); + resultRect = new(offsetX, CloseButtonRect.Y, TitlebarRect.Width - (IconRect.Right + 4), CloseButtonRect.Height); } else if (Preview == Preview_Enum.WXP) { int offsetX = Rect.X + SideSize + (ToolWindow ? 3 : 21); - resultRect = new Rectangle(offsetX, TitlebarRect.Bottom - 5 - CloseBtn_W, Rect.Width - CloseBtn_W - SideSize * 2, CloseBtn_W); + resultRect = new(offsetX, TitlebarRect.Bottom - 5 - CloseBtn_W, Rect.Width - CloseBtn_W - SideSize * 2, CloseBtn_W); } else { int offsetX = !ToolWindow ? IconRect.Right + 4 : IconRect.X; - resultRect = new Rectangle(offsetX, TitlebarRect.Y, TitlebarRect.Width - (IconRect.Right + 4), TitlebarRect.Height); + resultRect = new(offsetX, TitlebarRect.Y, TitlebarRect.Width - (IconRect.Right + 4), TitlebarRect.Height); } return resultRect; @@ -599,17 +547,13 @@ Bitmap CloseButtonImage } } } - - private void Window_FontChanged(object sender, EventArgs e) - { - Title_x_Height = (int)Math.Round(TitleScheme.Measure(Font).Height); - Title_9_Height = (int)Math.Round(TitleScheme.Measure(new Font(Font.Name, 9f, Font.Style)).Height); - } #endregion protected override void OnPaint(PaintEventArgs e) { - var G = e.Graphics; + if (this == null) return; + + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; G.TextRenderingHint = Program.Style.RenderingHint; DoubleBuffered = true; @@ -683,14 +627,14 @@ protected override void OnPaint(PaintEventArgs e) { using (Bitmap closeImg = new(CloseButtonImage)) { - CloseButtonRect = new Rectangle(TitlebarRect.Right - closeImg.Width * 2, TitlebarRect.Top + (TitlebarRect.Height - closeImg.Height) / 2, closeImg.Width, closeImg.Height); + CloseButtonRect = new(TitlebarRect.Right - closeImg.Width * 2, TitlebarRect.Top + (TitlebarRect.Height - closeImg.Height) / 2, closeImg.Width, closeImg.Height); G.DrawImage(closeImg, CloseButtonRect); } } else { - CloseButtonRect = new Rectangle(TitlebarRect.Right - 2 - (TitlebarRect.Height - 12), Rect.Y + 6, TitlebarRect.Height - 12, TitlebarRect.Height - 12); + CloseButtonRect = new(TitlebarRect.Right - 2 - (TitlebarRect.Height - 12), Rect.Y + 6, TitlebarRect.Height - 12, TitlebarRect.Height - 12); using (SolidBrush br = new(Color.FromArgb(199, 80, 80))) { @@ -710,14 +654,23 @@ protected override void OnPaint(PaintEventArgs e) CloseButtonRect.X += 1; } - using (SolidBrush br = new(Color.White)) + using (StringFormat sf = ContentAlignment.MiddleCenter.ToStringFormat()) { - G.DrawString("r", new Font("Marlett", 6.35f, FontStyle.Regular), br, new Rectangle(CloseButtonRect.X + 1, CloseButtonRect.Y + 1, CloseButtonRect.Width, CloseButtonRect.Height), ContentAlignment.MiddleCenter.ToStringFormat()); + using (SolidBrush br = new(Color.White)) + { + G.DrawString("r", new Font("Marlett", 6.35f, FontStyle.Regular), br, new Rectangle(CloseButtonRect.X + 1, CloseButtonRect.Y + 1, CloseButtonRect.Width, CloseButtonRect.Height), sf); + } } } //Window title - using (SolidBrush br = new(CaptionColor)) { G.DrawString(Text, Font, br, LabelRect, ContentAlignment.MiddleLeft.ToStringFormat()); } + using (StringFormat sf = ContentAlignment.MiddleLeft.ToStringFormat()) + { + using (SolidBrush br = new(CaptionColor)) + { + G.DrawString(Text, Font, br, LabelRect, sf); + } + } } } @@ -764,14 +717,14 @@ protected override void OnPaint(PaintEventArgs e) { using (Bitmap closeImg = new(CloseButtonImage)) { - CloseButtonRect = new Rectangle(TitlebarRect.Right - closeImg.Width * 2, TitlebarRect.Top + (TitlebarRect.Height - closeImg.Height) / 2, closeImg.Width, closeImg.Height); + CloseButtonRect = new(TitlebarRect.Right - closeImg.Width * 2, TitlebarRect.Top + (TitlebarRect.Height - closeImg.Height) / 2, closeImg.Width, closeImg.Height); G.DrawImage(closeImg, CloseButtonRect); } } else { - CloseButtonRect = new Rectangle(TitlebarRect.Right - 2 - (TitlebarRect.Height - 12), Rect.Y + 6, TitlebarRect.Height - 12, TitlebarRect.Height - 12); + CloseButtonRect = new(TitlebarRect.Right - 2 - (TitlebarRect.Height - 12), Rect.Y + 6, TitlebarRect.Height - 12, TitlebarRect.Height - 12); using (SolidBrush br = new(Color.FromArgb(199, 80, 80))) { @@ -791,14 +744,23 @@ protected override void OnPaint(PaintEventArgs e) CloseButtonRect.X += 1; } - using (SolidBrush br = new(Color.White)) + using (StringFormat sf = ContentAlignment.MiddleCenter.ToStringFormat()) { - G.DrawString("r", new Font("Marlett", 6.35f, FontStyle.Regular), br, new Rectangle(CloseButtonRect.X + 1, CloseButtonRect.Y + 1, CloseButtonRect.Width, CloseButtonRect.Height), ContentAlignment.MiddleCenter.ToStringFormat()); + using (SolidBrush br = new(Color.White)) + { + G.DrawString("r", new Font("Marlett", 6.35f, FontStyle.Regular), br, new Rectangle(CloseButtonRect.X + 1, CloseButtonRect.Y + 1, CloseButtonRect.Width, CloseButtonRect.Height), sf); + } } } //Window title - using (SolidBrush br = new(CaptionColor)) { G.DrawString(Text, Font, br, LabelRect, ContentAlignment.MiddleLeft.ToStringFormat()); } + using (StringFormat sf = ContentAlignment.MiddleLeft.ToStringFormat()) + { + using (SolidBrush br = new(CaptionColor)) + { + G.DrawString(Text, Font, br, LabelRect, sf); + } + } } } @@ -811,12 +773,12 @@ protected override void OnPaint(PaintEventArgs e) if (!ToolWindow) { - if (!(Preview == Preview_Enum.W8Lite)) { CloseButtonRect = new Rectangle(ClientRect.Right - CloseRectW + 1, Rect.Y + 1, CloseRectW, CloseRectH); } + if (!(Preview == Preview_Enum.W8Lite)) { CloseButtonRect = new(ClientRect.Right - CloseRectW + 1, Rect.Y + 1, CloseRectW, CloseRectH); } - else { CloseButtonRect = new Rectangle(ClientRect.Right - CloseRectW + 2, Rect.Y, CloseRectW, CloseRectH); } + else { CloseButtonRect = new(ClientRect.Right - CloseRectW + 2, Rect.Y, CloseRectW, CloseRectH); } } - else { CloseButtonRect = new Rectangle(ClientRect.Right - CloseRectW + 1, Rect.Y + 1, CloseRectW, CloseRectH); } + else { CloseButtonRect = new(ClientRect.Right - CloseRectW + 1, Rect.Y + 1, CloseRectW, CloseRectH); } Color BorderColor = Color.FromArgb(217, 217, 217); @@ -856,7 +818,13 @@ protected override void OnPaint(PaintEventArgs e) using (Pen P = new(Color.FromArgb((int)Math.Round(Win7ColorBal / 100d * 255d), Windows8Color.CB((float)-0.3d)))) { G.DrawRectangle(P, Rect); } //Window title - using (SolidBrush br = new(CaptionColor)) { G.DrawString(Text, Font, br, LabelRect, ContentAlignment.MiddleCenter.ToStringFormat()); } + using (StringFormat sf = ContentAlignment.MiddleCenter.ToStringFormat()) + { + using (SolidBrush br = new(CaptionColor)) + { + G.DrawString(Text, Font, br, LabelRect, sf); + } + } } else @@ -881,10 +849,16 @@ protected override void OnPaint(PaintEventArgs e) G.DrawImage(CloseBtn, new Rectangle((int)Math.Round(CloseButtonRect.X + (CloseButtonRect.Width - CloseBtn.Width) / 2d), (int)Math.Round(CloseButtonRect.Y + (CloseButtonRect.Height - CloseBtn.Height) / 2d), CloseBtn.Width, CloseBtn.Height)); - G.DrawRectangle(new Pen(Color.FromArgb(47, 48, 51)), Rect); + using (Pen P = new(Color.FromArgb(47, 48, 51))) { G.DrawRectangle(P, Rect); } //Window title - using (SolidBrush br = new(CaptionColor)) { G.DrawString(Text, Font, br, LabelRect, ContentAlignment.MiddleCenter.ToStringFormat()); } + using (StringFormat sf = ContentAlignment.MiddleCenter.ToStringFormat()) + { + using (SolidBrush br = new(CaptionColor)) + { + G.DrawString(Text, Font, br, LabelRect, sf); + } + } } } } @@ -902,14 +876,14 @@ protected override void OnPaint(PaintEventArgs e) //Background aero effect if (!(Preview == Preview_Enum.W7Opaque)) { - var bk = AdaptedBackBlurred; + Bitmap bk = AdaptedBackBlurred; decimal alpha = 1 - (decimal)Win7Alpha / 100; // ColorBlurBalance decimal ColBal = (decimal)Win7ColorBal / 100; // ColorBalance decimal GlowBal = (decimal)Win7GlowBal / 100; // AfterGlowBalance - var Color1 = Active ? AccentColor_Active : AccentColor_Inactive; - var Color2 = Active ? AccentColor2_Active : AccentColor2_Inactive; + Color Color1 = Active ? AccentColor_Active : AccentColor_Inactive; + Color Color2 = Active ? AccentColor2_Active : AccentColor2_Inactive; G.ExcludeClip(ClientBorderRect); G.DrawAeroEffect(Rect, bk, Color1, ColBal, Color2, GlowBal, alpha, Radius, !ToolWindow); G.ResetClip(); @@ -1006,7 +980,7 @@ protected override void OnPaint(PaintEventArgs e) int Btn_Height = Math.Max(10, _Metrics_CaptionHeight - 5); int Btn_Width = Btn_Height; - CloseButtonRect = new Rectangle(ClientBorderRect.Right - Btn_Width - 3, (int)Math.Round(Rect.Y + (TitlebarRect.Height - Btn_Height) / 2d), Btn_Width, Btn_Height); + CloseButtonRect = new(ClientBorderRect.Right - Btn_Width - 3, (int)Math.Round(Rect.Y + (TitlebarRect.Height - Btn_Height) / 2d), Btn_Width, Btn_Height); if (Active) { @@ -1016,18 +990,18 @@ protected override void OnPaint(PaintEventArgs e) float LH = CloseButtonRect.Height - UH; float Interlapping = UH / CloseButtonRect.Height * 10f; - var CloseRectUpperHalf = new Rectangle(CloseButtonRect.X, CloseButtonRect.Y, CloseButtonRect.Width, (int)Math.Round(UH + Interlapping)); - var CloseUpperPath = new LinearGradientBrush(CloseRectUpperHalf, Color.FromArgb(50, CloseUpperAccent1), CloseUpperAccent2, LinearGradientMode.Vertical); + Rectangle CloseRectUpperHalf = new(CloseButtonRect.X, CloseButtonRect.Y, CloseButtonRect.Width, (int)Math.Round(UH + Interlapping)); + LinearGradientBrush CloseUpperPath = new(CloseRectUpperHalf, Color.FromArgb(50, CloseUpperAccent1), CloseUpperAccent2, LinearGradientMode.Vertical); - var CloseRectLowerHalf = new Rectangle(CloseButtonRect.X, (int)Math.Round(CloseRectUpperHalf.Bottom - Interlapping), CloseButtonRect.Width, (int)Math.Round(LH)); - var CloseLowerPath = new LinearGradientBrush(CloseRectLowerHalf, CloseLowerAccent1, Color.FromArgb(50, CloseLowerAccent2), LinearGradientMode.Vertical); + Rectangle CloseRectLowerHalf = new(CloseButtonRect.X, (int)Math.Round(CloseRectUpperHalf.Bottom - Interlapping), CloseButtonRect.Width, (int)Math.Round(LH)); + LinearGradientBrush CloseLowerPath = new(CloseRectLowerHalf, CloseLowerAccent1, Color.FromArgb(50, CloseLowerAccent2), LinearGradientMode.Vertical); G.FillRoundedRect(CloseUpperPath, CloseRectUpperHalf, 1, true); G.FillRoundedRect(CloseLowerPath, CloseRectLowerHalf, 1, true); } else { - var ClosePath = new LinearGradientBrush(CloseButtonRect, Color.FromArgb(50, CloseUpperAccent1), Color.FromArgb(50, CloseLowerAccent2), LinearGradientMode.Vertical); + LinearGradientBrush ClosePath = new(CloseButtonRect, Color.FromArgb(50, CloseUpperAccent1), Color.FromArgb(50, CloseLowerAccent2), LinearGradientMode.Vertical); G.FillRectangle(ClosePath, CloseButtonRect); } @@ -1038,7 +1012,7 @@ protected override void OnPaint(PaintEventArgs e) int xW = CloseButtonRect.Width % 2 == 0 ? CloseBtn.Width + 1 : CloseBtn.Width; int xH = CloseButtonRect.Height % 2 == 0 ? CloseBtn.Height + 1 : CloseBtn.Height; - var closerenderrect = new Rectangle((int)Math.Round(CloseButtonRect.X + (CloseButtonRect.Width - xW) / 2d), (int)Math.Round(CloseButtonRect.Y + (CloseButtonRect.Height - xH) / 2d), xW, xH); + Rectangle closerenderrect = new((int)Math.Round(CloseButtonRect.X + (CloseButtonRect.Width - xW) / 2d), (int)Math.Round(CloseButtonRect.Y + (CloseButtonRect.Height - xH) / 2d), xW, xH); G.DrawImage(CloseBtn, closerenderrect); @@ -1050,7 +1024,10 @@ protected override void OnPaint(PaintEventArgs e) //Window title int alpha_caption = Active ? 120 : 75; - G.DrawGlowString(1, Text, Font, CaptionColor, Color.FromArgb(alpha_caption, Color.White), RectAll, LabelRect, ContentAlignment.MiddleLeft.ToStringFormat()); + using (StringFormat sf = ContentAlignment.MiddleLeft.ToStringFormat()) + { + G.DrawGlowString(1, Text, Font, CaptionColor, Color.FromArgb(alpha_caption, Color.White), RectAll, LabelRect, sf); + } #endregion } @@ -1062,8 +1039,8 @@ protected override void OnPaint(PaintEventArgs e) G.SetClip(UpperPart); - var pth_back = new LinearGradientBrush(UpperPart, Titlebar_Backcolor1, Titlebar_Backcolor2, LinearGradientMode.Vertical); - var pth_line = new LinearGradientBrush(UpperPart, Titlebar_InnerBorder, Titlebar_Turquoise, LinearGradientMode.Vertical); + LinearGradientBrush pth_back = new(UpperPart, Titlebar_Backcolor1, Titlebar_Backcolor2, LinearGradientMode.Vertical); + LinearGradientBrush pth_line = new(UpperPart, Titlebar_InnerBorder, Titlebar_Turquoise, LinearGradientMode.Vertical); // ### Render Titlebar if (!ToolWindow) @@ -1131,7 +1108,7 @@ protected override void OnPaint(PaintEventArgs e) else { - var ClosePath = new LinearGradientBrush(CloseRect, CloseUpperAccent1, CloseLowerAccent2, LinearGradientMode.Vertical); + LinearGradientBrush ClosePath = new(CloseRect, CloseUpperAccent1, CloseLowerAccent2, LinearGradientMode.Vertical); G.FillRectangle(ClosePath, CloseRect); } @@ -1153,7 +1130,13 @@ protected override void OnPaint(PaintEventArgs e) using (Pen P = new(CloseInnerBorder)) { G.DrawRoundedRect(P, new Rectangle(CloseRect.X + 1, CloseRect.Y + 1, CloseRect.Width - 2, CloseRect.Height - 2), 1, true); } //Window title - using (SolidBrush br = new(CaptionColor)) { G.DrawString(Text, Font, br, LabelRect, ContentAlignment.MiddleLeft.ToStringFormat()); } + using (StringFormat sf = ContentAlignment.MiddleLeft.ToStringFormat()) + { + using (SolidBrush br = new(CaptionColor)) + { + G.DrawString(Text, Font, br, LabelRect, sf); + } + } #endregion } } @@ -1162,14 +1145,14 @@ protected override void OnPaint(PaintEventArgs e) else if (Preview == Preview_Enum.WXP) { { - var sm = G.SmoothingMode; + SmoothingMode sm = G.SmoothingMode; G.SmoothingMode = SmoothingMode.HighSpeed; using (SolidBrush br = new(WindowsXPColor)) { G.FillRectangle(br, ClientBorderRect); } Program.resVS.Draw(G, TitlebarRect, VisualStylesRes.Element.Titlebar, Active, ToolWindow); - CloseButtonRect = new Rectangle(ClientRect.Right - CloseBtn_W - RightEdge_XP.Width + 3, Rect.Y + TitlebarRect.Height - 4 - CloseBtn_W, CloseBtn_W, CloseBtn_W); + CloseButtonRect = new(ClientRect.Right - CloseBtn_W - RightEdge_XP.Width + 3, Rect.Y + TitlebarRect.Height - 4 - CloseBtn_W, CloseBtn_W, CloseBtn_W); Program.resVS.Draw(G, LeftEdge_XP, VisualStylesRes.Element.LeftEdge, Active, ToolWindow); Program.resVS.Draw(G, RightEdge_XP, VisualStylesRes.Element.RightEdge, Active, ToolWindow); @@ -1179,18 +1162,23 @@ protected override void OnPaint(PaintEventArgs e) G.SmoothingMode = sm; //Window title - using (SolidBrush br = new(Color.Black)) + using (StringFormat sf = ContentAlignment.MiddleLeft.ToStringFormat()) { - G.DrawString(Text, Font, br, new Rectangle(LabelRect.X + 1, LabelRect.Y, LabelRect.Width, LabelRect.Height), ContentAlignment.MiddleLeft.ToStringFormat()); - } + using (SolidBrush br = new(Color.Black)) + { + G.DrawString(Text, Font, br, new Rectangle(LabelRect.X + 1, LabelRect.Y, LabelRect.Width, LabelRect.Height), sf); + } - using (SolidBrush br = new(CaptionColor)) { G.DrawString(Text, Font, br, LabelRect, ContentAlignment.MiddleLeft.ToStringFormat()); } + using (SolidBrush br = new(CaptionColor)) { G.DrawString(Text, Font, br, LabelRect, sf); } + } } } //Draw window icon if (!ToolWindow) G.DrawImage(Active ? Properties.Resources.SampleApp_Small_Active : Properties.Resources.SampleApp_Small_Inactive, IconRect); + + base.OnPaint(e); } } } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/TabControls/TabControl.cs b/WinPaletter/GUI/Elements/TabControls/TabControl.cs index 594b0c9b..d98bb7ec 100644 --- a/WinPaletter/GUI/Elements/TabControls/TabControl.cs +++ b/WinPaletter/GUI/Elements/TabControls/TabControl.cs @@ -16,10 +16,10 @@ public TabControl() DoubleBuffered = true; BackColor = Color.Transparent; - ItemSize = new Size(35, 140); + ItemSize = new(35, 140); DrawMode = TabDrawMode.OwnerDrawFixed; SizeMode = TabSizeMode.Fixed; - Font = new Font("Segoe UI", 9f); + Font = new("Segoe UI", 9f); } #region Variables @@ -31,7 +31,7 @@ protected override CreateParams CreateParams { get { - var cpar = base.CreateParams; + CreateParams cpar = base.CreateParams; if (!DesignMode) { cpar.ExStyle |= 0x20; @@ -70,8 +70,6 @@ protected override void OnDragOver(DragEventArgs e) protected override void CreateHandle() { - base.CreateHandle(); - int X1 = ItemSize.Width; int X2 = ItemSize.Height; @@ -79,26 +77,30 @@ protected override void CreateHandle() { if (X1 >= X2) { - ItemSize = new Size(X1, X2); + ItemSize = new(X1, X2); } else { - ItemSize = new Size(X2, X1); + ItemSize = new(X2, X1); } } else if (X2 >= X1) { - ItemSize = new Size(X1, X2); + ItemSize = new(X1, X2); } else { - ItemSize = new Size(X2, X1); + ItemSize = new(X2, X1); } + + base.CreateHandle(); } #endregion protected override void OnPaint(PaintEventArgs e) { + if (this == null) return; + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; G.TextRenderingHint = DesignMode ? TextRenderingHint.ClearTypeGridFit : Program.Style.RenderingHint; @@ -183,11 +185,23 @@ protected override void OnPaint(PaintEventArgs e) Rectangle tr = new(xPoint, TabRect.Y, TabRect.Width - Fixer, TabRect.Height); - using (SolidBrush br = new(TextColor)) { G.DrawString(TabPages[i].Text, Font, br, tr, ContentAlignment.MiddleLeft.ToStringFormat(RTL)); } + using (StringFormat sf = ContentAlignment.MiddleLeft.ToStringFormat(RTL)) + { + using (SolidBrush br = new(TextColor)) + { + G.DrawString(TabPages[i].Text, Font, br, tr, sf); + } + } } else { - using (SolidBrush br = new(TextColor)) { G.DrawString(TabPages[i].Text, Font, br, TabRect, ContentAlignment.MiddleCenter.ToStringFormat(RTL)); } + using (StringFormat sf = ContentAlignment.MiddleCenter.ToStringFormat(RTL)) + { + using (SolidBrush br = new(TextColor)) + { + G.DrawString(TabPages[i].Text, Font, br, TabRect, sf); + } + } } if (RTL) img.RotateFlip(RotateFlipType.Rotate180FlipY); @@ -198,24 +212,35 @@ protected override void OnPaint(PaintEventArgs e) { if (Alignment == TabAlignment.Right | Alignment == TabAlignment.Left) { - using (SolidBrush br = new(TextColor)) + using (StringFormat sf = ContentAlignment.MiddleLeft.ToStringFormat(RTL)) { - int LTFixer0 = !RTL ? SideTape.Width + 7 : 0; - int LTFixer1 = SideTape.Width + 7; + using (SolidBrush br = new(TextColor)) + { + int LTFixer0 = !RTL ? SideTape.Width + 7 : 0; + int LTFixer1 = SideTape.Width + 7; - int xPoint = TabRect.X + LTFixer0; + int xPoint = TabRect.X + LTFixer0; - Rectangle tr = new(xPoint, TabRect.Y + 1, TabRect.Width - LTFixer1, TabRect.Height); + Rectangle tr = new(xPoint, TabRect.Y + 1, TabRect.Width - LTFixer1, TabRect.Height); - G.DrawString(TabPages[i].Text, Font, br, tr, ContentAlignment.MiddleLeft.ToStringFormat(RTL)); + G.DrawString(TabPages[i].Text, Font, br, tr, sf); + } } } else { - using (SolidBrush br = new(TextColor)) { G.DrawString(TabPages[i].Text, Font, br, TabRect, ContentAlignment.MiddleCenter.ToStringFormat(RTL)); } + using (StringFormat sf = ContentAlignment.MiddleCenter.ToStringFormat(RTL)) + { + using (SolidBrush br = new(TextColor)) + { + G.DrawString(TabPages[i].Text, Font, br, TabRect, sf); + } + } } } } + + base.OnPaint(e); } } } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/TabControls/TabControlHelpers.cs b/WinPaletter/GUI/Elements/TabControls/TabControlHelpers.cs index 1049c5a5..bc88c7e3 100644 --- a/WinPaletter/GUI/Elements/TabControls/TabControlHelpers.cs +++ b/WinPaletter/GUI/Elements/TabControls/TabControlHelpers.cs @@ -1,10 +1,10 @@ using System; using System.Collections; -using System.ComponentModel.Design; using System.ComponentModel; -using System.Windows.Forms.Design; -using System.Windows.Forms; +using System.ComponentModel.Design; using System.Drawing; +using System.Windows.Forms; +using System.Windows.Forms.Design; namespace WinPaletter.UI.WP { @@ -27,7 +27,7 @@ protected override CreateParams CreateParams { get { - var cpar = base.CreateParams; + CreateParams cpar = base.CreateParams; if (!DesignMode) { cpar.ExStyle |= 0x20; @@ -42,6 +42,8 @@ protected override CreateParams CreateParams protected override void OnPaint(PaintEventArgs e) { + if (this == null) return; + if (!DesignMode) { //Makes background drawn properly, and transparent @@ -175,7 +177,7 @@ public override void InitializeNewComponent(IDictionary defaultValues) { base.InitializeNewComponent(defaultValues); - var newTab = new TransparentTabPage() { Text = "New tab" }; + TransparentTabPage newTab = new() { Text = "New tab" }; ((System.Windows.Forms.TabControl)Control).TabPages.Add(newTab); } diff --git a/WinPaletter/GUI/Elements/TabControls/TablessControl.cs b/WinPaletter/GUI/Elements/TabControls/TablessControl.cs index 0096965a..e002857b 100644 --- a/WinPaletter/GUI/Elements/TabControls/TablessControl.cs +++ b/WinPaletter/GUI/Elements/TabControls/TablessControl.cs @@ -3,7 +3,7 @@ using System.Windows.Forms; namespace WinPaletter.UI.WP -{ +{ [Designer(typeof(TransparentTabPagesHostDesigner))] [Description("TabControl but without tabs for WinPaletter UI")] public class TablessControl : System.Windows.Forms.TabControl diff --git a/WinPaletter/GUI/Elements/Trackbars/ColorBar.cs b/WinPaletter/GUI/Elements/Trackbars/ColorBar.cs index d670c173..b6743132 100644 --- a/WinPaletter/GUI/Elements/Trackbars/ColorBar.cs +++ b/WinPaletter/GUI/Elements/Trackbars/ColorBar.cs @@ -6,50 +6,40 @@ namespace WinPaletter.UI.WP { - [Description("Themed Trackbar for selecting colors (HSL) for WinPaletter UI")] [DefaultEvent("Scroll")] public class ColorBar : Control { - public ColorBar() { - cb_H = new ColorBlend() + cb_H = new() { Positions = new[] { 0f, 1f / 6.0f, 2f / 6.0f, 3f / 6.0f, 4f / 6.0f, 5f / 6.0f, 1f }, Colors = new[] { Color1, Color2, Color3, Color4, Color5, Color6, Color7 } }; - cb_L = new ColorBlend() { Positions = new[] { 0f, 1f / 2.0f, 1f }, Colors = new[] { Color.Black, _AccentColor, Color.White } }; - Timer = new Timer() { Enabled = false, Interval = 1 }; + cb_L = new() { Positions = new[] { 0f, 1f / 2.0f, 1f }, Colors = new[] { Color.Black, _AccentColor, Color.White } }; - SetStyle(ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor, true); - SetStyle((ControlStyles)139286, true); + SetStyle(ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor | (ControlStyles)139286, true); SetStyle(ControlStyles.Selectable, false); DoubleBuffered = true; BackColor = Color.Transparent; Height = 19; Text = string.Empty; - MouseUp += ColorBar_MouseUp; - MouseEnter += ColorBar_MouseEnter; - MouseLeave += ColorBar_MouseLeave; - MouseWheel += ColorBar_MouseWheel; - HandleCreated += ColorBar_HandleCreated; - HandleDestroyed += ColorBar_HandleDestroyed; - Timer.Tick += Timer_Tick; + + _alpha = 0; } #region Variables + private bool CanAnimate => !DesignMode && Program.Style.Animations && this != null && Visible && Parent != null && Parent.Visible && FindForm() != null && FindForm().Visible; private readonly int ButtonSize = 0; - private readonly int ThumbSize = 35; // 14 minimum private Rectangle LSA; private Rectangle RSA; private Rectangle Shaft; private Rectangle Thumb; private bool ThumbDown; private Rectangle Circle; - private bool _Shown = false; private int I1; private readonly Color Color1 = Color.FromArgb(255, 23, 0); @@ -85,109 +75,82 @@ public enum ModesList private Color _AccentColor = Program.Style.Schemes.Main.Colors.AccentAlt; public Color AccentColor { - get - { - return _AccentColor; - } + get { return _AccentColor; } set { - _AccentColor = value; - Refresh(); + if (value != _AccentColor) + { + _AccentColor = value; + Refresh(); + } } } - private int _H = 0; - public int H + private float _H = 0f; + public float H { - get - { - return _H; - } - set - { - _H = value; - Refresh(); - } + get => _H; + set { if (value != _H) { _H = value; Refresh(); } } } private float _S = 1f; public float S { - get - { - return _S; - } - set - { - _S = value; - Refresh(); - } + get => _S; + set { if (value != _S) { _S = value; Refresh(); } } } - private int _L = (int)Math.Round(0.5); + private float _L = 0.5f; public float L { - get - { - return _L; - } - set - { - _L = (int)Math.Round(value); - Refresh(); - } + get => _L; + set { if (value != _L) { _L = value; Refresh(); } } } private int _Minimum; public int Minimum { - get - { - return _Minimum; - } + get { return _Minimum; } set { - _Minimum = value; - if (value > _Value) - _Value = value; - if (value > _Maximum) - _Maximum = value; + if (value != _Minimum) + { + _Minimum = value; + + if (value > _Maximum) _Maximum = value; - InvalidateLayout(); + if (value > _Value) _Value = value; + + InvalidateLayout(); + } } } private int _Maximum = 100; public int Maximum { - get - { - return _Maximum; - } + get { return _Maximum; } set { - _Maximum = value; - if (value < _Value) - _Value = value; - if (value < _Minimum) - _Minimum = value; - InvalidateLayout(); + if (value != _Maximum) + { + _Maximum = value; + + if (value < _Value) _Value = value; + + if (value < _Minimum) _Minimum = value; + + InvalidateLayout(); + } } } private int _Value; public int Value { - get - { - - return _Value; - } + get { return _Value; } set { - if (value == _Value) - return; - if (value > _Maximum) { value = _Maximum; @@ -198,46 +161,43 @@ public int Value value = _Minimum; } - _Value = value; - InvalidatePosition(); - - Scroll?.Invoke(this); + if (_Value != value) + { + _Value = value; + InvalidateLayout(); + InvalidatePosition(); + Scroll?.Invoke(this); + } } } private int _SmallChange = 1; public int SmallChange { - get - { - return _SmallChange; - } + get { return _SmallChange; } set { - if (value < 1) + if (value < 1) value = 1; + + if (value != _SmallChange) { - throw new Exception("Property value is not valid."); + _SmallChange = value; } - - _SmallChange = value; } } private int _LargeChange = 10; public int LargeChange { - get - { - return _LargeChange; - } + get { return _LargeChange; } set { - if (value < 1) + if (value < 1) value = 1; + + if (value != _LargeChange) { - throw new Exception("Property value is not valid."); + _LargeChange = value; } - - _LargeChange = value; } } @@ -254,7 +214,7 @@ protected override CreateParams CreateParams { get { - var cpar = base.CreateParams; + CreateParams cpar = base.CreateParams; if (!DesignMode) { cpar.ExStyle |= 0x20; @@ -278,6 +238,8 @@ protected override void OnSizeChanged(EventArgs e) { Height = 19; InvalidateLayout(); + + base.OnSizeChanged(e); } protected override void OnMouseDown(MouseEventArgs e) @@ -285,8 +247,9 @@ protected override void OnMouseDown(MouseEventArgs e) if (e.Button == MouseButtons.Left) { State = MouseState.Down; - Timer.Enabled = true; - Timer.Start(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } if (Circle.Contains(e.Location)) { @@ -307,6 +270,8 @@ protected override void OnMouseDown(MouseEventArgs e) InvalidatePosition(); } + + base.OnMouseDown(e); } protected override void OnMouseMove(MouseEventArgs e) @@ -328,17 +293,22 @@ protected override void OnMouseMove(MouseEventArgs e) InvalidatePosition(); } - Timer.Enabled = true; - Timer.Start(); + if (CanAnimate) + { + FluentTransitions.Transition.With(this, nameof(alpha), Circle.Contains(this.PointToClient(MousePosition)) ? 255 : 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); + } + else { alpha = Circle.Contains(this.PointToClient(MousePosition)) ? 255 : 0; } + + base.OnMouseMove(e); } private void InvalidateLayout() { - LSA = new Rectangle(0, 0, ButtonSize, Height); - RSA = new Rectangle(Width - ButtonSize, 0, ButtonSize, Height); - Shaft = new Rectangle((int)Math.Round(LSA.Right + 1 + 0.5d * Height), 0, Width - Height - 1, Height); - Thumb = new Rectangle(0, 1, (int)Math.Round(Value / (double)Maximum * Shaft.Width), Height - 3); - Circle = new Rectangle((int)Math.Round(Value / (double)Maximum * Shaft.Width), 0, Height - 1, Height - 1); + LSA = new(0, 0, ButtonSize, Height); + RSA = new(Width - ButtonSize, 0, ButtonSize, Height); + Shaft = new((int)Math.Round(LSA.Right + 1 + 0.5d * Height), 0, Width - Height - 1, Height); + Thumb = new(0, 1, (int)Math.Round(Value / (double)Maximum * Shaft.Width), Height - 3); + Circle = new((int)Math.Round(Value / (double)Maximum * Shaft.Width), 0, Height - 1, Height - 1); Scroll?.Invoke(this); InvalidatePosition(); } @@ -349,35 +319,42 @@ private void InvalidatePosition() Refresh(); } - private void ColorBar_MouseUp(object sender, MouseEventArgs e) + protected override void OnMouseUp(MouseEventArgs e) { ThumbDown = false; State = MouseState.None; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } + + base.OnMouseUp(e); } - private void ColorBar_MouseEnter(object sender, EventArgs e) + protected override void OnMouseEnter(EventArgs e) { if (Thumb.Contains(MousePosition)) { State = MouseState.Over; - Invalidate(); - Timer.Enabled = true; - Timer.Start(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } + } + + base.OnMouseEnter(e); } - private void ColorBar_MouseLeave(object sender, EventArgs e) + protected override void OnMouseLeave(EventArgs e) { State = MouseState.None; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } + + base.OnMouseLeave(e); } - private void ColorBar_MouseWheel(object sender, MouseEventArgs e) + protected override void OnMouseWheel(MouseEventArgs e) { if (e.Delta < 0) { @@ -396,126 +373,27 @@ private void ColorBar_MouseWheel(object sender, MouseEventArgs e) else Value -= SmallChange; } - } - - private void ColorBar_HandleCreated(object sender, EventArgs e) - { - try - { - if (!DesignMode) - { - FindForm().Load += Loaded; - FindForm().Shown += Showed; - Parent.BackColorChanged += RefreshColorPalette; - Parent.VisibleChanged += RefreshColorPalette; - Parent.EnabledChanged += RefreshColorPalette; - VisibleChanged += RefreshColorPalette; - EnabledChanged += RefreshColorPalette; - } - } - catch - { - } - - try - { - alpha = 0; - } - catch - { - } - } - - private void ColorBar_HandleDestroyed(object sender, EventArgs e) - { - try - { - if (!DesignMode) - { - FindForm().Load -= Loaded; - FindForm().Shown -= Showed; - Parent.BackColorChanged -= RefreshColorPalette; - Parent.VisibleChanged -= RefreshColorPalette; - Parent.EnabledChanged -= RefreshColorPalette; - VisibleChanged -= RefreshColorPalette; - EnabledChanged -= RefreshColorPalette; - } - } - catch - { - } - } - - public void Loaded(object sender, EventArgs e) - { - _Shown = false; - } - - public void Showed(object sender, EventArgs e) - { - _Shown = true; - Invalidate(); - } - public void RefreshColorPalette(object sender, EventArgs e) - { - Invalidate(); + base.OnMouseWheel(e); } #endregion #region Animator - - private int alpha; - private readonly int Factor = 25; - private Timer Timer; - - private void Timer_Tick(object sender, EventArgs e) + private int _alpha = 0; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)] + public int alpha { - if (!DesignMode) - { - - if (State == MouseState.Over & _Shown) - { - if (alpha + Factor <= 255) - { - alpha += Factor; - } - else if (alpha + Factor > 255) - { - alpha = 255; - Timer.Enabled = false; - Timer.Stop(); - } - - System.Threading.Thread.Sleep(1); - Invalidate(); - } - - if (_Shown & (!(State == MouseState.Over) | State == MouseState.Down)) - { - if (alpha - Factor >= 0) - { - alpha -= Factor; - } - else if (alpha - Factor < 0) - { - alpha = 0; - Timer.Enabled = false; - Timer.Stop(); - } - - System.Threading.Thread.Sleep(1); - Invalidate(); - } - } + get => _alpha; + set { _alpha = value; Refresh(); } } - #endregion protected override void OnPaint(PaintEventArgs e) { - var G = e.Graphics; + if (this == null) return; + + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; //Makes background drawn properly, and transparent @@ -525,7 +403,7 @@ protected override void OnPaint(PaintEventArgs e) Color color; - var middleRect = new Rectangle(0, (int)Math.Round((Height - Height * 0.25d) / 2d), Width - 1, (int)Math.Round(Height * 0.25d)); + Rectangle middleRect = new(0, (int)Math.Round((Height - Height * 0.25d) / 2d), Width - 1, (int)Math.Round(Height * 0.25d)); LinearGradientBrush back; @@ -533,8 +411,8 @@ protected override void OnPaint(PaintEventArgs e) { case ModesList.Hue: { - back = new LinearGradientBrush(middleRect, Color.Black, Color.Black, 0f, false) { InterpolationColors = cb_H }; - var HSL_ = Color.FromArgb(0, 255, 240).ToHSL(); + back = new(middleRect, Color.Black, Color.Black, 0f, false) { InterpolationColors = cb_H }; + ColorsExtensions.HSL_Structure HSL_ = Color.FromArgb(0, 255, 240).ToHSL(); HSL_.H = (int)Math.Round(Value / (double)Maximum * 359d); color = HSL_.ToRGB(); break; @@ -542,12 +420,12 @@ protected override void OnPaint(PaintEventArgs e) case ModesList.Saturation: { - var HSL_x1 = _AccentColor.ToHSL(); - var HSL_x2 = _AccentColor.ToHSL(); + ColorsExtensions.HSL_Structure HSL_x1 = _AccentColor.ToHSL(); + ColorsExtensions.HSL_Structure HSL_x2 = _AccentColor.ToHSL(); HSL_x1.S = 0f; HSL_x2.S = 1f; - back = new LinearGradientBrush(middleRect, HSL_x1.ToRGB(), HSL_x2.ToRGB(), LinearGradientMode.Horizontal); - var HSL_ = _AccentColor.ToHSL(); + back = new(middleRect, HSL_x1.ToRGB(), HSL_x2.ToRGB(), LinearGradientMode.Horizontal); + ColorsExtensions.HSL_Structure HSL_ = _AccentColor.ToHSL(); HSL_.S = (float)(Value / (double)Maximum); color = HSL_.ToRGB(); break; @@ -555,9 +433,9 @@ protected override void OnPaint(PaintEventArgs e) case ModesList.Light: { - cb_L = new ColorBlend() { Positions = new[] { 0f, 1f / 2.0f, 1f }, Colors = new[] { Color.Black, _AccentColor, Color.White } }; - back = new LinearGradientBrush(middleRect, Color.Black, Color.Black, 0f, false) { InterpolationColors = cb_L }; - var HSL_ = _AccentColor.ToHSL(); + cb_L = new() { Positions = new[] { 0f, 1f / 2.0f, 1f }, Colors = new[] { Color.Black, _AccentColor, Color.White } }; + back = new(middleRect, Color.Black, Color.Black, 0f, false) { InterpolationColors = cb_L }; + ColorsExtensions.HSL_Structure HSL_ = _AccentColor.ToHSL(); HSL_.L = (float)(Value / (double)Maximum); color = HSL_.ToRGB(); break; @@ -566,7 +444,7 @@ protected override void OnPaint(PaintEventArgs e) default: { color = scheme.Colors.Back_Max; - back = new LinearGradientBrush(middleRect, color, color, (float)Paths.GradientMode.Horizontal); + back = new(middleRect, color, color, (float)Paths.GradientMode.Horizontal); break; } @@ -580,18 +458,18 @@ protected override void OnPaint(PaintEventArgs e) G.ResetClip(); - Circle = new Rectangle((int)Math.Round(Value / (double)Maximum * Shaft.Width), 0, Height - 1, Height - 1); + Circle = new((int)Math.Round(Value / (double)Maximum * Shaft.Width), 0, Height - 1, Height - 1); G.FillEllipse(Program.Style.Schemes.Main.Brushes.Line, Circle); - var smallC1 = new Rectangle(Circle.X + 5, Circle.Y + 5, Circle.Width - 10, Circle.Height - 10); - var smallC2 = new Rectangle(Circle.X + 4, Circle.Y + 4, Circle.Width - 8, Circle.Height - 8); + Rectangle smallC1 = new(Circle.X + 5, Circle.Y + 5, Circle.Width - 10, Circle.Height - 10); + Rectangle smallC2 = new(Circle.X + 4, Circle.Y + 4, Circle.Width - 8, Circle.Height - 8); using (SolidBrush br = new(color)) { G.FillEllipse(br, smallC1); } using (SolidBrush br = new(Color.FromArgb(alpha, color))) { G.FillEllipse(br, smallC2); } - } + base.OnPaint(e); + } } - } \ No newline at end of file diff --git a/WinPaletter/GUI/Elements/Trackbars/Trackbar.cs b/WinPaletter/GUI/Elements/Trackbars/Trackbar.cs index d10ab07b..fbe9fc95 100644 --- a/WinPaletter/GUI/Elements/Trackbars/Trackbar.cs +++ b/WinPaletter/GUI/Elements/Trackbars/Trackbar.cs @@ -6,14 +6,12 @@ namespace WinPaletter.UI.WP { - [Description("Themed TrackBar for WinPaletter UI")] [DefaultEvent("Scroll")] public class Trackbar : Control { public Trackbar() { - Timer = new Timer() { Enabled = false, Interval = 1 }; SetStyle(ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor | (ControlStyles)139286, true); SetStyle(ControlStyles.Selectable, false); @@ -21,17 +19,13 @@ public Trackbar() BackColor = Color.Transparent; Height = 19; Text = string.Empty; - MouseUp += Trackbar_MouseUp; - MouseEnter += Trackbar_MouseEnter; - MouseLeave += Trackbar_MouseLeave; - MouseWheel += Trackbar_MouseWheel; - Timer.Tick += Timer_Tick; - alpha = 0; + _alpha = 0; Invalidate(); } #region Variables + private bool CanAnimate => !DesignMode && Program.Style.Animations && this != null && Visible && Parent != null && Parent.Visible && FindForm() != null && FindForm().Visible; private readonly int ButtonSize = 0; private Rectangle LSA; @@ -39,7 +33,6 @@ public Trackbar() private Rectangle Thumb; private bool ThumbDown; private Rectangle Circle; - private bool _Shown = false; private int I1; public MouseState State = MouseState.None; @@ -58,53 +51,41 @@ public enum MouseState private int _Minimum; public int Minimum { - get - { - return _Minimum; - } + get { return _Minimum; } set { - if (value < 0) + if (value != _Minimum) { - throw new Exception("Property value is not valid."); - } + _Minimum = value; - _Minimum = value; - if (value > _Value) - _Value = value; - if (value > _Maximum) - _Maximum = value; + if (value > _Maximum) _Maximum = value; - InvalidateLayout(); + if (value > _Value) _Value = value; + + InvalidateLayout(); + } } } - private int _Maximum = 100; public int Maximum { - get - { - return _Maximum; - } + get { return _Maximum; } set { - if (value < 0) + if (value != _Maximum) { - throw new Exception("Property value is not valid."); - } + _Maximum = value; - _Maximum = value; - if (value < _Value) - _Value = value; - if (value < _Minimum) - _Minimum = value; + if (value < _Value) _Value = value; + + if (value < _Minimum) _Minimum = value; - InvalidateLayout(); + InvalidateLayout(); + } } } - private int _Value; public int Value { @@ -121,7 +102,7 @@ public int Value value = _Minimum; } - if (_Value != value) + if (_Value != value) { _Value = value; InvalidateLayout(); @@ -134,37 +115,30 @@ public int Value private int _SmallChange = 1; public int SmallChange { - get - { - return _SmallChange; - } + get { return _SmallChange; } set { - if (value < 1) + if (value < 1) value = 1; + + if (value != _SmallChange) { - throw new Exception("Property value is not valid."); + _SmallChange = value; } - - _SmallChange = value; } } - private int _LargeChange = 10; public int LargeChange { - get - { - return _LargeChange; - } + get { return _LargeChange; } set { - if (value < 1) + if (value < 1) value = 1; + + if (value != _LargeChange) { - throw new Exception("Property value is not valid."); + _LargeChange = value; } - - _LargeChange = value; } } @@ -179,7 +153,7 @@ protected override CreateParams CreateParams { get { - var cpar = base.CreateParams; + CreateParams cpar = base.CreateParams; if (!DesignMode) { cpar.ExStyle |= 0x20; @@ -203,22 +177,8 @@ protected override void OnSizeChanged(EventArgs e) { Height = 19; InvalidateLayout(); - } - - private void InvalidateLayout() - { - LSA = new Rectangle(0, 0, ButtonSize, Height); - Shaft = new Rectangle((int)Math.Round(LSA.Right + 1 + 0.5d * Height), 0, Width - Height - 1, Height); - Thumb = new Rectangle(0, 1, (int)Math.Round(Value / (double)Maximum * Shaft.Width), Height - 3); - Circle = new Rectangle((int)Math.Round(Value / (double)Maximum * Shaft.Width), 0, Height - 1, Height - 1); - Scroll?.Invoke(this); - InvalidatePosition(); - } - private void InvalidatePosition() - { - Thumb.Width = (int)Math.Round(Value / (double)Maximum * Width); - Refresh(); + base.OnSizeChanged(e); } protected override void OnMouseDown(MouseEventArgs e) @@ -226,8 +186,12 @@ protected override void OnMouseDown(MouseEventArgs e) if (e.Button == MouseButtons.Left) { State = MouseState.Down; - Timer.Enabled = true; - Timer.Start(); + + if (CanAnimate) + { + FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); + } + else { alpha = 0; } if (Circle.Contains(e.Location)) { @@ -248,6 +212,8 @@ protected override void OnMouseDown(MouseEventArgs e) InvalidatePosition(); } + + base.OnMouseDown(e); } protected override void OnMouseMove(MouseEventArgs e) @@ -261,7 +227,6 @@ protected override void OnMouseMove(MouseEventArgs e) else State = MouseState.None; - Invalidate(); if (ThumbDown) @@ -270,39 +235,50 @@ protected override void OnMouseMove(MouseEventArgs e) InvalidatePosition(); } - Timer.Enabled = true; - Timer.Start(); + if (CanAnimate) + { + FluentTransitions.Transition.With(this, nameof(alpha), Circle.Contains(this.PointToClient(MousePosition)) ? 255 : 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); + } + else { alpha = Circle.Contains(this.PointToClient(MousePosition)) ? 255 : 0; } + + base.OnMouseMove(e); } - private void Trackbar_MouseUp(object sender, MouseEventArgs e) + protected override void OnMouseUp(MouseEventArgs e) { ThumbDown = false; State = MouseState.None; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } + + base.OnMouseUp(e); } - private void Trackbar_MouseEnter(object sender, EventArgs e) + protected override void OnMouseEnter(EventArgs e) { - if (Thumb.Contains(MousePosition)) + if (Circle.Contains(this.PointToClient(MousePosition))) { State = MouseState.Over; - Invalidate(); - Timer.Enabled = true; - Timer.Start(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 255).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 255; } } + + base.OnMouseEnter(e); } - private void Trackbar_MouseLeave(object sender, EventArgs e) + protected override void OnMouseLeave(EventArgs e) { State = MouseState.None; - Timer.Enabled = true; - Timer.Start(); - Invalidate(); + + if (CanAnimate) { FluentTransitions.Transition.With(this, nameof(alpha), 0).CriticalDamp(TimeSpan.FromMilliseconds(Program.AnimationDuration)); } + else { alpha = 0; } + + base.OnMouseLeave(e); } - private void Trackbar_MouseWheel(object sender, MouseEventArgs e) + protected override void OnMouseWheel(MouseEventArgs e) { if (e.Delta < 0) { @@ -321,61 +297,45 @@ private void Trackbar_MouseWheel(object sender, MouseEventArgs e) else Value -= SmallChange; } + + base.OnMouseWheel(e); } #endregion - #region Animator - - private int alpha; - private readonly int Factor = 25; - private Timer Timer; + #region Voids + private void InvalidateLayout() + { + LSA = new(0, 0, ButtonSize, Height); + Shaft = new((int)Math.Round(LSA.Right + 1 + 0.5d * Height), 0, Width - Height - 1, Height); + Thumb = new(0, 1, (int)Math.Round(Value / (double)Maximum * Shaft.Width), Height - 3); + Circle = new((int)Math.Round(Value / (double)Maximum * Shaft.Width), 0, Height - 1, Height - 1); + Scroll?.Invoke(this); + InvalidatePosition(); + } - private void Timer_Tick(object sender, EventArgs e) + private void InvalidatePosition() { - if (!DesignMode) - { + Thumb.Width = (int)Math.Round(Value / (double)Maximum * Width); + Refresh(); + } - if (State == MouseState.Over & _Shown) - { - if (alpha + Factor <= 255) - { - alpha += Factor; - } - else if (alpha + Factor > 255) - { - alpha = 255; - Timer.Enabled = false; - Timer.Stop(); - } - - System.Threading.Thread.Sleep(1); - Invalidate(); - } + #endregion - if (_Shown & (!(State == MouseState.Over) | State == MouseState.Down)) - { - if (alpha - Factor >= 0) - { - alpha -= Factor; - } - else if (alpha - Factor < 0) - { - alpha = 0; - Timer.Enabled = false; - Timer.Stop(); - } - - System.Threading.Thread.Sleep(1); - Invalidate(); - } - } + #region Animator + private int _alpha = 0; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)] + public int alpha + { + get => _alpha; + set { _alpha = value; Refresh(); } } - #endregion protected override void OnPaint(PaintEventArgs e) { + if (this == null) return; + Graphics G = e.Graphics; G.SmoothingMode = SmoothingMode.AntiAlias; @@ -395,18 +355,19 @@ protected override void OnPaint(PaintEventArgs e) G.ResetClip(); - Circle = new Rectangle((int)Math.Round((Value / (double)Maximum) * Shaft.Width), 0, Height - 1, Height - 1); + Circle = new((int)Math.Round((Value / (double)Maximum) * Shaft.Width), 0, Height - 1, Height - 1); G.FillEllipse(scheme.Brushes.Line, Circle); - var smallC1 = new Rectangle(Circle.X + 5, Circle.Y + 5, Circle.Width - 10, Circle.Height - 10); - var smallC2 = new Rectangle(Circle.X + 4, Circle.Y + 4, Circle.Width - 8, Circle.Height - 8); + Rectangle smallC1 = new(Circle.X + 5, Circle.Y + 5, Circle.Width - 10, Circle.Height - 10); + Rectangle smallC2 = new(Circle.X + 4, Circle.Y + 4, Circle.Width - 8, Circle.Height - 8); G.FillEllipse(scheme.Brushes.AccentAlt, smallC1); using SolidBrush br = new(Color.FromArgb(alpha, scheme.Colors.AccentAlt)); G.FillEllipse(br, smallC2); + base.OnPaint(e); } } } \ No newline at end of file diff --git a/WinPaletter/GUI/RetroElements/Containers/PanelR.cs b/WinPaletter/GUI/RetroElements/Containers/PanelR.cs index 65b22c3b..9194d792 100644 --- a/WinPaletter/GUI/RetroElements/Containers/PanelR.cs +++ b/WinPaletter/GUI/RetroElements/Containers/PanelR.cs @@ -13,7 +13,7 @@ public class PanelR : Panel public PanelR() { DoubleBuffered = true; - Font = new Font("Microsoft Sans Serif", 8f); + Font = new("Microsoft Sans Serif", 8f); BackColor = Color.FromArgb(192, 192, 192); ForeColor = Color.Black; BorderStyle = BorderStyle.None; @@ -34,7 +34,7 @@ protected override void OnPaint(PaintEventArgs e) G.SmoothingMode = SmoothingMode.HighSpeed; G.TextRenderingHint = Program.Style.RenderingHint; DoubleBuffered = true; - var Rect = new Rectangle(0, 0, Width - 1, Height - 1); + Rectangle Rect = new(0, 0, Width - 1, Height - 1); G.Clear(BackColor); diff --git a/WinPaletter/GUI/RetroElements/Containers/PanelRaisedR.cs b/WinPaletter/GUI/RetroElements/Containers/PanelRaisedR.cs index 3ffe4aba..dc7cc4b2 100644 --- a/WinPaletter/GUI/RetroElements/Containers/PanelRaisedR.cs +++ b/WinPaletter/GUI/RetroElements/Containers/PanelRaisedR.cs @@ -13,7 +13,7 @@ public class PanelRaisedR : Panel public PanelRaisedR() { DoubleBuffered = true; - Font = new Font("Microsoft Sans Serif", 8f); + Font = new("Microsoft Sans Serif", 8f); BackColor = Color.FromArgb(192, 192, 192); ForeColor = Color.Black; BorderStyle = BorderStyle.None; @@ -37,7 +37,7 @@ protected override void OnPaint(PaintEventArgs e) G.SmoothingMode = SmoothingMode.HighSpeed; G.TextRenderingHint = Program.Style.RenderingHint; DoubleBuffered = true; - var Rect = new Rectangle(0, 0, Width - 1, Height - 1); + Rectangle Rect = new(0, 0, Width - 1, Height - 1); G.Clear(BackColor); diff --git a/WinPaletter/GUI/RetroElements/Input/ButtonR.cs b/WinPaletter/GUI/RetroElements/Input/ButtonR.cs index 132462dd..d1dc565d 100644 --- a/WinPaletter/GUI/RetroElements/Input/ButtonR.cs +++ b/WinPaletter/GUI/RetroElements/Input/ButtonR.cs @@ -14,7 +14,7 @@ public class ButtonR : Button public ButtonR() { - Font = new Font("Microsoft Sans Serif", 8f); + Font = new("Microsoft Sans Serif", 8f); ForeColor = Color.Black; BackColor = Color.FromArgb(192, 192, 192); Image = base.Image; @@ -118,16 +118,16 @@ protected override void OnMouseUp(MouseEventArgs e) protected override void OnPaint(PaintEventArgs e) { - var B = new Bitmap(Width, Height); - var G = Graphics.FromImage(B); + Bitmap B = new(Width, Height); + Graphics G = Graphics.FromImage(B); G.SmoothingMode = SmoothingMode.HighSpeed; G.TextRenderingHint = Program.Style.RenderingHint; DoubleBuffered = true; // ################################################################################# Customizer - var rect = new Rectangle(0, 0, Width - 1, Height - 1); - var rectinner = new Rectangle(1, 1, Width - 3, Height - 3); - var rectdash = new Rectangle(4, 4, Width - 9, Height - 9); + Rectangle rect = new(0, 0, Width - 1, Height - 1); + Rectangle rectinner = new(1, 1, Width - 3, Height - 3); + Rectangle rectdash = new(4, 4, Width - 9, Height - 9); // ################################################################################# G.Clear(BackColor); @@ -135,100 +135,145 @@ protected override void OnPaint(PaintEventArgs e) #region Button Render if (UseItAsScrollbar) { - G.DrawLine(new Pen(ButtonHilight), new Point(0, 0), new Point(Width - 1, 0)); - G.DrawLine(new Pen(ButtonHilight), new Point(0, 1), new Point(0, Height - 1)); - G.DrawLine(new Pen(ButtonDkShadow), new Point(0, Height - 1), new Point(Width - 1, Height - 1)); - G.DrawLine(new Pen(ButtonDkShadow), new Point(Width - 1, 0), new Point(Width - 1, Height - 1)); - G.DrawLine(new Pen(ButtonLight), new Point(1, 1), new Point(Width - 2, 1)); - G.DrawLine(new Pen(ButtonLight), new Point(1, 2), new Point(1, Height - 2)); - G.DrawLine(new Pen(ButtonShadow), new Point(1, Height - 2), new Point(Width - 2, Height - 2)); - G.DrawLine(new Pen(ButtonShadow), new Point(Width - 2, 1), new Point(Width - 2, Height - 2)); + using (Pen penButtonHilight = new(ButtonHilight)) + using (Pen penButtonDkShadow = new(ButtonDkShadow)) + using (Pen penButtonLight = new(ButtonLight)) + using (Pen penButtonShadow = new(ButtonShadow)) + { + G.DrawLine(penButtonHilight, new Point(0, 0), new Point(Width - 1, 0)); + G.DrawLine(penButtonHilight, new Point(0, 1), new Point(0, Height - 1)); + + G.DrawLine(penButtonDkShadow, new Point(0, Height - 1), new Point(Width - 1, Height - 1)); + G.DrawLine(penButtonDkShadow, new Point(Width - 1, 0), new Point(Width - 1, Height - 1)); + + G.DrawLine(penButtonLight, new Point(1, 1), new Point(Width - 2, 1)); + G.DrawLine(penButtonLight, new Point(1, 2), new Point(1, Height - 2)); + + G.DrawLine(penButtonShadow, new Point(1, Height - 2), new Point(Width - 2, Height - 2)); + G.DrawLine(penButtonShadow, new Point(Width - 2, 1), new Point(Width - 2, Height - 2)); + } + } else if (AppearsAsPressed) { G.Clear(ButtonHilight); - if (HatchBrush) + if (HatchBrush) { using (HatchBrush hb = new(HatchStyle.Percent50, ButtonHilight, BackColor)) { G.FillRectangle(hb, rect); } } + + using (Pen penButtonDkShadow = new(ButtonDkShadow)) + using (Pen penButtonShadow = new(ButtonShadow)) + using (Pen penButtonHilight = new(ButtonHilight)) + using (Pen penBackColor = new(BackColor)) { - var hb = new HatchBrush(HatchStyle.Percent50, ButtonHilight, BackColor); - G.FillRectangle(hb, rect); + G.DrawLine(penButtonDkShadow, new Point(0, 0), new Point(Width - 1, 0)); + G.DrawLine(penButtonDkShadow, new Point(0, 1), new Point(0, Height - 1)); + + G.DrawLine(penButtonShadow, new Point(1, 1), new Point(Width - 2, 1)); + G.DrawLine(penButtonShadow, new Point(1, 2), new Point(1, Height - 2)); + + G.DrawLine(penButtonHilight, new Point(0, Height - 1), new Point(Width - 1, Height - 1)); + G.DrawLine(penButtonHilight, new Point(Width - 1, 0), new Point(Width - 1, Height - 1)); + + G.DrawLine(penBackColor, new Point(1, Height - 2), new Point(Width - 2, Height - 2)); + G.DrawLine(penBackColor, new Point(Width - 2, 1), new Point(Width - 2, Height - 2)); } - G.DrawLine(new Pen(ButtonDkShadow), new Point(0, 0), new Point(Width - 1, 0)); - G.DrawLine(new Pen(ButtonDkShadow), new Point(0, 1), new Point(0, Height - 1)); - G.DrawLine(new Pen(ButtonShadow), new Point(1, 1), new Point(Width - 2, 1)); - G.DrawLine(new Pen(ButtonShadow), new Point(1, 2), new Point(1, Height - 2)); - G.DrawLine(new Pen(ButtonHilight), new Point(0, Height - 1), new Point(Width - 1, Height - 1)); - G.DrawLine(new Pen(ButtonHilight), new Point(Width - 1, 0), new Point(Width - 1, Height - 1)); - G.DrawLine(new Pen(BackColor), new Point(1, Height - 2), new Point(Width - 2, Height - 2)); - G.DrawLine(new Pen(BackColor), new Point(Width - 2, 1), new Point(Width - 2, Height - 2)); } else if (State == MouseState.Over | State == MouseState.None | !Enabled) { if (!Focused) { - G.DrawLine(new Pen(ButtonHilight), new Point(0, 0), new Point(Width - 1, 0)); - G.DrawLine(new Pen(ButtonHilight), new Point(0, 1), new Point(0, Height - 1)); - G.DrawLine(new Pen(ButtonDkShadow), new Point(0, Height - 1), new Point(Width - 1, Height - 1)); - G.DrawLine(new Pen(ButtonDkShadow), new Point(Width - 1, 0), new Point(Width - 1, Height - 1)); - G.DrawLine(new Pen(ButtonLight), new Point(1, 1), new Point(Width - 2, 1)); - G.DrawLine(new Pen(ButtonLight), new Point(1, 2), new Point(1, Height - 2)); - G.DrawLine(new Pen(ButtonShadow), new Point(1, Height - 2), new Point(Width - 2, Height - 2)); - G.DrawLine(new Pen(ButtonShadow), new Point(Width - 2, 1), new Point(Width - 2, Height - 2)); + using (Pen penButtonHilight = new(ButtonHilight)) + using (Pen penButtonDkShadow = new(ButtonDkShadow)) + using (Pen penButtonLight = new(ButtonLight)) + using (Pen penButtonShadow = new(ButtonShadow)) + { + G.DrawLine(penButtonHilight, new Point(0, 0), new Point(Width - 1, 0)); + G.DrawLine(penButtonHilight, new Point(0, 1), new Point(0, Height - 1)); + + G.DrawLine(penButtonDkShadow, new Point(0, Height - 1), new Point(Width - 1, Height - 1)); + G.DrawLine(penButtonDkShadow, new Point(Width - 1, 0), new Point(Width - 1, Height - 1)); + + G.DrawLine(penButtonLight, new Point(1, 1), new Point(Width - 2, 1)); + G.DrawLine(penButtonLight, new Point(1, 2), new Point(1, Height - 2)); + + G.DrawLine(penButtonShadow, new Point(1, Height - 2), new Point(Width - 2, Height - 2)); + G.DrawLine(penButtonShadow, new Point(Width - 2, 1), new Point(Width - 2, Height - 2)); + } } else { - G.DrawRectangle(new Pen(ButtonDkShadow), rect); - G.DrawLine(new Pen(ButtonHilight), new Point(1, 1), new Point(Width - 2, 1)); - G.DrawLine(new Pen(ButtonHilight), new Point(1, 2), new Point(1, Height - 2)); - G.DrawLine(new Pen(ButtonDkShadow), new Point(1, Height - 2), new Point(Width - 2, Height - 2)); - G.DrawLine(new Pen(ButtonDkShadow), new Point(Width - 2, 1), new Point(Width - 2, Height - 2)); - G.DrawLine(new Pen(ButtonLight), new Point(2, 2), new Point(Width - 3, 2)); - G.DrawLine(new Pen(ButtonLight), new Point(2, 3), new Point(2, Height - 3)); - G.DrawLine(new Pen(ButtonShadow), new Point(2, Height - 3), new Point(Width - 3, Height - 3)); - G.DrawLine(new Pen(ButtonShadow), new Point(Width - 3, 2), new Point(Width - 3, Height - 3)); - - if (Pressed & !(Font.FontFamily.Name.ToLower() == "marlett")) + using (Pen penButtonDkShadow = new(ButtonDkShadow)) + using (Pen penButtonHilight = new(ButtonHilight)) + using (Pen penButtonLight = new(ButtonLight)) + using (Pen penButtonShadow = new(ButtonShadow)) + using (Pen penBackColor = new(BackColor)) { - var ur = new Rectangle(rectdash.X, rectdash.Y, rectdash.Width, FocusRectHeight); - var dr = new Rectangle(ur.X, rectdash.Y + rectdash.Height - ur.Height, ur.Width, ur.Height); - var lr = new Rectangle(rectdash.X, rectdash.Y, FocusRectWidth, rectdash.Height); - var rr = new Rectangle(rectdash.X + rectdash.Width - lr.Width, rectdash.Y, FocusRectWidth, rectdash.Height); - var hb = new HatchBrush(HatchStyle.Percent50, Color.Black, BackColor); - G.FillRectangle(hb, ur); - G.FillRectangle(hb, dr); - G.FillRectangle(hb, lr); - G.FillRectangle(hb, rr); - G.DrawRectangle(new Pen(WindowFrame), rect); - } + G.DrawRectangle(penButtonDkShadow, rect); + G.DrawLine(penButtonHilight, new Point(1, 1), new Point(Width - 2, 1)); + G.DrawLine(penButtonHilight, new Point(1, 2), new Point(1, Height - 2)); + G.DrawLine(penButtonDkShadow, new Point(1, Height - 2), new Point(Width - 2, Height - 2)); + G.DrawLine(penButtonDkShadow, new Point(Width - 2, 1), new Point(Width - 2, Height - 2)); + G.DrawLine(penButtonLight, new Point(2, 2), new Point(Width - 3, 2)); + G.DrawLine(penButtonLight, new Point(2, 3), new Point(2, Height - 3)); + G.DrawLine(penButtonShadow, new Point(2, Height - 3), new Point(Width - 3, Height - 3)); + G.DrawLine(penButtonShadow, new Point(Width - 3, 2), new Point(Width - 3, Height - 3)); + + if (Pressed & !(Font.FontFamily.Name.ToLower() == "marlett")) + { + Rectangle ur = new(rectdash.X, rectdash.Y, rectdash.Width, FocusRectHeight); + Rectangle dr = new(ur.X, rectdash.Y + rectdash.Height - ur.Height, ur.Width, ur.Height); + Rectangle lr = new(rectdash.X, rectdash.Y, FocusRectWidth, rectdash.Height); + Rectangle rr = new(rectdash.X + rectdash.Width - lr.Width, rectdash.Y, FocusRectWidth, rectdash.Height); + using (HatchBrush hb = new(HatchStyle.Percent50, Color.Black, BackColor)) + { + G.FillRectangle(hb, ur); + G.FillRectangle(hb, dr); + G.FillRectangle(hb, lr); + G.FillRectangle(hb, rr); + } + + using (Pen penWindowFrame = new(WindowFrame)) + { + G.DrawRectangle(penWindowFrame, rect); + } + } + } } } else { - G.DrawRectangle(new Pen(WindowFrame), rect); - G.DrawRectangle(new Pen(ButtonShadow), rectinner); - - if (!(Font.FontFamily.Name.ToLower() == "marlett")) + using (Pen penWindowFrame = new(WindowFrame)) + using (Pen penButtonShadow = new(ButtonShadow)) { - var ur = new Rectangle(rectdash.X, rectdash.Y, rectdash.Width, FocusRectHeight); - var dr = new Rectangle(ur.X, rectdash.Y + rectdash.Height - ur.Height, ur.Width, ur.Height); - var lr = new Rectangle(rectdash.X, rectdash.Y, FocusRectWidth, rectdash.Height); - var rr = new Rectangle(rectdash.X + rectdash.Width - lr.Width, rectdash.Y, FocusRectWidth, rectdash.Height); - var hb = new HatchBrush(HatchStyle.Percent50, Color.Black, BackColor); - G.FillRectangle(hb, ur); - G.FillRectangle(hb, dr); - G.FillRectangle(hb, lr); - G.FillRectangle(hb, rr); - } + G.DrawRectangle(penWindowFrame, rect); + G.DrawRectangle(penButtonShadow, rectinner); + + if (!(Font.FontFamily.Name.ToLower() == "marlett")) + { + Rectangle ur = new(rectdash.X, rectdash.Y, rectdash.Width, FocusRectHeight); + Rectangle dr = new(ur.X, rectdash.Y + rectdash.Height - ur.Height, ur.Width, ur.Height); + Rectangle lr = new(rectdash.X, rectdash.Y, FocusRectWidth, rectdash.Height); + Rectangle rr = new(rectdash.X + rectdash.Width - lr.Width, rectdash.Y, FocusRectWidth, rectdash.Height); + using (HatchBrush hb = new(HatchStyle.Percent50, Color.Black, BackColor)) + { + G.FillRectangle(hb, ur); + G.FillRectangle(hb, dr); + G.FillRectangle(hb, lr); + G.FillRectangle(hb, rr); + } + } + } } + #endregion #region Text and Image Render - var ButtonString = new StringFormat() { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }; + StringFormat ButtonString = new() { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }; int imgX = default, imgY = default; try @@ -338,7 +383,7 @@ protected override void OnPaint(PaintEventArgs e) } - r = new Rectangle(x, y, w, h); + r = new(x, y, w, h); } if (!Enabled) diff --git a/WinPaletter/GUI/RetroElements/Input/TextBoxR.cs b/WinPaletter/GUI/RetroElements/Input/TextBoxR.cs index 0e635552..94e99784 100644 --- a/WinPaletter/GUI/RetroElements/Input/TextBoxR.cs +++ b/WinPaletter/GUI/RetroElements/Input/TextBoxR.cs @@ -20,12 +20,12 @@ public TextBoxR() DoubleBuffered = true; ForeColor = Color.Black; BackColor = Color.White; - Font = new Font("Microsoft Sans Serif", 8f); + Font = new("Microsoft Sans Serif", 8f); - TB = new TextBox() + TB = new() { Visible = true, - Font = new Font("Microsoft Sans Serif", 8f), + Font = new("Microsoft Sans Serif", 8f), Text = Text, ForeColor = Color.White, MaxLength = _MaxLength, @@ -33,7 +33,7 @@ public TextBoxR() ReadOnly = _ReadOnly, UseSystemPasswordChar = _UseSystemPasswordChar, BorderStyle = BorderStyle.None, - Location = new Point(1, 0), + Location = new(1, 0), Width = Width - 1 }; @@ -233,7 +233,7 @@ public override Font Font if (TB is not null) { TB.Font = value; - TB.Location = new Point(4, 4); + TB.Location = new(4, 4); TB.Width = Width - 8; if (!_Multiline) { @@ -311,7 +311,7 @@ private void OnBaseKeyDown(object s, KeyEventArgs e) protected override void OnResize(EventArgs e) { - TB.Location = new Point(4, 4); + TB.Location = new(4, 4); TB.Width = Width - 8; if (_Multiline) @@ -366,38 +366,47 @@ private void TextBoxR_BackColorChanged(object sender, EventArgs e) protected override void OnPaint(PaintEventArgs e) { - var B = new Bitmap(Width, Height); - var G = Graphics.FromImage(B); - G = Graphics.FromImage(B); + Bitmap B = new(Width, Height); + Graphics G = Graphics.FromImage(B); + DoubleBuffered = true; G.SmoothingMode = SmoothingMode.HighSpeed; G.TextRenderingHint = Program.Style.RenderingHint; - base.OnPaint(e); TB.ForeColor = ForeColor; // ################################################################################# Customizer - var CheckRect = new Rectangle(0, 0, Width - 1, Height - 1); + Rectangle CheckRect = new(0, 0, Width - 1, Height - 1); // ################################################################################# G.Clear(BackColor); - G.DrawLine(new Pen(ButtonShadow), new Point(CheckRect.X, CheckRect.Y), new Point(CheckRect.Width - 1, CheckRect.Y)); - G.DrawLine(new Pen(ButtonShadow), new Point(CheckRect.X, CheckRect.Y), new Point(CheckRect.X, CheckRect.Height - 1)); - G.DrawLine(new Pen(ButtonDkShadow), new Point(CheckRect.X, CheckRect.Y) + (Size)new Point(1, 1), new Point(CheckRect.Width - 2, CheckRect.Y + 1)); - G.DrawLine(new Pen(ButtonDkShadow), new Point(CheckRect.X, CheckRect.Y) + (Size)new Point(1, 1), new Point(CheckRect.X + 1, CheckRect.Height - 2)); - G.DrawLine(new Pen(ButtonLight), new Point(CheckRect.Width - 1, 1), new Point(CheckRect.Width - 1, CheckRect.Height - 1)); - G.DrawLine(new Pen(ButtonLight), new Point(1, CheckRect.Height - 1), new Point(CheckRect.Width - 1, CheckRect.Height - 1)); - G.DrawLine(new Pen(ButtonHilight), new Point(CheckRect.Width, CheckRect.X), new Point(CheckRect.Width, CheckRect.Height)); - G.DrawLine(new Pen(ButtonHilight), new Point(CheckRect.X, CheckRect.Height), new Point(CheckRect.Width, CheckRect.Height)); + using (Pen penButtonShadow = new(ButtonShadow)) + using (Pen penButtonDkShadow = new(ButtonDkShadow)) + using (Pen penButtonLight = new(ButtonLight)) + using (Pen penButtonHilight = new(ButtonHilight)) + using (SolidBrush br = new(ForeColor)) + { + G.DrawLine(penButtonShadow, new Point(CheckRect.X, CheckRect.Y), new Point(CheckRect.Width - 1, CheckRect.Y)); + G.DrawLine(penButtonShadow, new Point(CheckRect.X, CheckRect.Y), new Point(CheckRect.X, CheckRect.Height - 1)); + + G.DrawLine(penButtonDkShadow, new Point(CheckRect.X, CheckRect.Y) + (Size)new Point(1, 1), new Point(CheckRect.Width - 2, CheckRect.Y + 1)); + G.DrawLine(penButtonDkShadow, new Point(CheckRect.X, CheckRect.Y) + (Size)new Point(1, 1), new Point(CheckRect.X + 1, CheckRect.Height - 2)); + + G.DrawLine(penButtonLight, new Point(CheckRect.Width - 1, 1), new Point(CheckRect.Width - 1, CheckRect.Height - 1)); + G.DrawLine(penButtonLight, new Point(1, CheckRect.Height - 1), new Point(CheckRect.Width - 1, CheckRect.Height - 1)); - G.DrawString(TB.Text, Font, new SolidBrush(ForeColor), new Point(2, 4)); + G.DrawLine(penButtonHilight, new Point(CheckRect.Width, CheckRect.X), new Point(CheckRect.Width, CheckRect.Height)); + G.DrawLine(penButtonHilight, new Point(CheckRect.X, CheckRect.Height), new Point(CheckRect.Width, CheckRect.Height)); + + G.DrawString(TB.Text, Font, br, new Point(2, 4)); + } G.Dispose(); e.Graphics.DrawImageUnscaled(B, 0, 0); B.Dispose(); - } + base.OnPaint(e); + } } - } \ No newline at end of file diff --git a/WinPaletter/GUI/RetroElements/Others/ScrollBarR.cs b/WinPaletter/GUI/RetroElements/Others/ScrollBarR.cs index bf147e6e..fb5f5054 100644 --- a/WinPaletter/GUI/RetroElements/Others/ScrollBarR.cs +++ b/WinPaletter/GUI/RetroElements/Others/ScrollBarR.cs @@ -30,10 +30,10 @@ protected override void OnPaint(PaintEventArgs e) DoubleBuffered = true; // ################################################################################# Customizer - var Rect = new Rectangle(0, 0, Width - 1, Height - 1); + Rectangle Rect = new(0, 0, Width - 1, Height - 1); // ################################################################################# G.Clear(BackColor); - var b = new HatchBrush(HatchStyle.Percent50, ButtonHilight, BackColor); + HatchBrush b = new(HatchStyle.Percent50, ButtonHilight, BackColor); G.FillRectangle(b, Rect); } diff --git a/WinPaletter/GUI/RetroElements/Simulators/Preview3D.cs b/WinPaletter/GUI/RetroElements/Simulators/Preview3D.cs index f3de80e7..1c827528 100644 --- a/WinPaletter/GUI/RetroElements/Simulators/Preview3D.cs +++ b/WinPaletter/GUI/RetroElements/Simulators/Preview3D.cs @@ -24,35 +24,35 @@ public class Preview3D : Control protected override void OnPaint(PaintEventArgs e) { - var B = new Bitmap(Width, Height); - var G = Graphics.FromImage(B); + Bitmap B = new(Width, Height); + Graphics G = Graphics.FromImage(B); G.SmoothingMode = SmoothingMode.HighSpeed; G.TextRenderingHint = Program.Style.RenderingHint; DoubleBuffered = true; // ################################################################################# Customizer - var BrushDkShadow = new SolidBrush(ButtonDkShadow); - var BrushShadow = new SolidBrush(ButtonShadow); - var BrushHilight = new SolidBrush(ButtonHilight); - var BrushLight = new SolidBrush(ButtonLight); + SolidBrush BrushDkShadow = new(ButtonDkShadow); + SolidBrush BrushShadow = new(ButtonShadow); + SolidBrush BrushHilight = new(ButtonHilight); + SolidBrush BrushLight = new(ButtonLight); - var HilightTopRect = new Rectangle(LineSize, LineSize, Width - LineSize * 2, LineSize); - var HilightLeftRect = new Rectangle(LineSize, LineSize, LineSize, Height - LineSize * 2); + Rectangle HilightTopRect = new(LineSize, LineSize, Width - LineSize * 2, LineSize); + Rectangle HilightLeftRect = new(LineSize, LineSize, LineSize, Height - LineSize * 2); - var LightTopRect = new Rectangle(LineSize * 2, LineSize * 2, Width - LineSize * 4, LineSize); - var LightLeftRect = new Rectangle(LineSize * 2, LineSize * 2, LineSize, Height - LineSize * 4); + Rectangle LightTopRect = new(LineSize * 2, LineSize * 2, Width - LineSize * 4, LineSize); + Rectangle LightLeftRect = new(LineSize * 2, LineSize * 2, LineSize, Height - LineSize * 4); - var DkShadowRightRect = new Rectangle(Width - LineSize * 2, LineSize, LineSize, Height - LineSize * 2); - var DkShadowBottomRect = new Rectangle(LineSize, Height - LineSize * 2, Width - LineSize * 2, LineSize); + Rectangle DkShadowRightRect = new(Width - LineSize * 2, LineSize, LineSize, Height - LineSize * 2); + Rectangle DkShadowBottomRect = new(LineSize, Height - LineSize * 2, Width - LineSize * 2, LineSize); - var ShadowRightRect = new Rectangle(Width - LineSize * 3, LineSize * 2, LineSize, Height - LineSize * 4); - var ShadowBottomRect = new Rectangle(LineSize * 2, Height - LineSize * 3, Width - LineSize * 4, LineSize); + Rectangle ShadowRightRect = new(Width - LineSize * 3, LineSize * 2, LineSize, Height - LineSize * 4); + Rectangle ShadowBottomRect = new(LineSize * 2, Height - LineSize * 3, Width - LineSize * 4, LineSize); - var Filling = new Rectangle(LightLeftRect.Right, LightTopRect.Bottom, ShadowRightRect.Left - LightLeftRect.Right, ShadowBottomRect.Top - LightTopRect.Bottom); + Rectangle Filling = new(LightLeftRect.Right, LightTopRect.Bottom, ShadowRightRect.Left - LightLeftRect.Right, ShadowBottomRect.Top - LightTopRect.Bottom); int tw = (int)Math.Round(Filling.Width / 2d); int th = (int)Math.Round(LineSize * 1.75d); - var TextRect = new Rectangle((int)Math.Round(Filling.X + (Filling.Width - tw) / 2d), (int)Math.Round(Filling.Y + (Filling.Height - th) / 2d), tw, th); + Rectangle TextRect = new((int)Math.Round(Filling.X + (Filling.Width - tw) / 2d), (int)Math.Round(Filling.Y + (Filling.Height - th) / 2d), tw, th); // ################################################################################# diff --git a/WinPaletter/GUI/RetroElements/Simulators/WindowR.cs b/WinPaletter/GUI/RetroElements/Simulators/WindowR.cs index 2a0140c5..282a0c08 100644 --- a/WinPaletter/GUI/RetroElements/Simulators/WindowR.cs +++ b/WinPaletter/GUI/RetroElements/Simulators/WindowR.cs @@ -14,12 +14,12 @@ public class WindowR : Panel public WindowR() { - Font = new Font("Microsoft Sans Serif", 8f); + Font = new("Microsoft Sans Serif", 8f); TitleHeight = PreviewHelpers.GetTitlebarTextHeight(Font); - _CloseBtn = new ButtonR() { Name = "CloseBtn", Text = "r", Font = new Font("Marlett", 7.8f), Size = new Size(BtnWidth, BtnHeight), TextAlign = ContentAlignment.MiddleCenter }; - _MinBtn = new ButtonR() { Name = "MinBtn", Text = "1", Font = new Font("Marlett", 8f), Size = new Size(BtnWidth, BtnHeight), TextAlign = ContentAlignment.MiddleCenter }; - _MaxBtn = new ButtonR() { Name = "MaxBtn", Text = "0", Font = new Font("Marlett", 8f), Size = new Size(BtnWidth, BtnHeight), TextAlign = ContentAlignment.MiddleCenter }; + _CloseBtn = new() { Name = "CloseBtn", Text = "r", Font = new("Marlett", 7.8f), Size = new(BtnWidth, BtnHeight), TextAlign = ContentAlignment.MiddleCenter }; + _MinBtn = new() { Name = "MinBtn", Text = "1", Font = new("Marlett", 8f), Size = new(BtnWidth, BtnHeight), TextAlign = ContentAlignment.MiddleCenter }; + _MaxBtn = new() { Name = "MaxBtn", Text = "0", Font = new("Marlett", 8f), Size = new(BtnWidth, BtnHeight), TextAlign = ContentAlignment.MiddleCenter }; BtnHeight = Metrics_CaptionHeight + TitleHeight - 4; BtnWidth = Metrics_CaptionWidth - 2; DoubleBuffered = true; @@ -345,9 +345,9 @@ private void AdjustButtonSizes() BtnHeight = Conversions.ToInteger(Math.Max(_Metrics_CaptionHeight + PreviewHelpers.GetTitlebarTextHeight(Font) - 4, 5)); BtnWidth = Math.Max(_Metrics_CaptionWidth - 2, 5); - _CloseBtn.Size = new Size(BtnWidth, BtnHeight); - _MinBtn.Size = new Size(BtnWidth, BtnHeight); - _MaxBtn.Size = new Size(BtnWidth, BtnHeight); + _CloseBtn.Size = new(BtnWidth, BtnHeight); + _MinBtn.Size = new(BtnWidth, BtnHeight); + _MaxBtn.Size = new(BtnWidth, BtnHeight); Refresh(); } @@ -385,22 +385,19 @@ public void AdjustControlBoxFontsSizes() float i0, iFx; i0 = Math.Abs(Math.Min(_Metrics_CaptionHeight, _Metrics_CaptionWidth)); iFx = i0 / Math.Abs(Math.Min(17, 18)); - var f = new Font("Marlett", (float)(6.8d * (double)iFx)); + Font f = new("Marlett", (float)(6.8d * (double)iFx)); _CloseBtn.Font = f; _MinBtn.Font = f; _MaxBtn.Font = f; } - catch - { - - } + catch { } } public void AdjustPadding() { int iP = 3 + _Metrics_PaddedBorderWidth + _Metrics_BorderWidth; int iT = 4 + _Metrics_PaddedBorderWidth + _Metrics_BorderWidth + _Metrics_CaptionHeight + PreviewHelpers.GetTitlebarTextHeight(Font); - var _Padding = new Padding(iP, iT, iP, iP); + Padding _Padding = new(iP, iT, iP, iP); Padding = _Padding; } @@ -425,13 +422,13 @@ protected override void OnPaint(PaintEventArgs e) DoubleBuffered = true; // ################################################################################# Customizer - var Rect = new Rectangle(0, 0, Width - 1, Height - 1); + Rectangle Rect = new(0, 0, Width - 1, Height - 1); int CompinedPadding = _Metrics_BorderWidth + _Metrics_PaddedBorderWidth + 3; - var TRect = new Rectangle(CompinedPadding, CompinedPadding, Width - CompinedPadding * 2, _Metrics_CaptionHeight + TitleHeight); + Rectangle TRect = new(CompinedPadding, CompinedPadding, Width - CompinedPadding * 2, _Metrics_CaptionHeight + TitleHeight); - var ARect = new Rectangle(2, 2, Width - 5, Height - 5); + Rectangle ARect = new(2, 2, Width - 5, Height - 5); // ################################################################################# G.Clear(BackColor); @@ -464,7 +461,7 @@ protected override void OnPaint(PaintEventArgs e) { if (G.TextRenderingHint == TextRenderingHint.SingleBitPerPixelGridFit) { - F = new Font("Microsoft Sans Serif", 8f, FontStyle.Bold); + F = new("Microsoft Sans Serif", 8f, FontStyle.Bold); } else { @@ -475,12 +472,12 @@ protected override void OnPaint(PaintEventArgs e) try { - var gr = new LinearGradientBrush(TRect, RTL ? Color2 : Color1, RTL ? Color1 : Color2, LinearGradientMode.Horizontal); + LinearGradientBrush gr = new(TRect, RTL ? Color2 : Color1, RTL ? Color1 : Color2, LinearGradientMode.Horizontal); if (ColorGradient) { G.FillRectangle(gr, TRect); - var TRectFixer = new Rectangle(TRect.X, TRect.Y, 1, TRect.Height); + Rectangle TRectFixer = new(TRect.X, TRect.Y, 1, TRect.Height); G.FillRectangle(new SolidBrush(RTL ? Color2 : Color1), TRectFixer); } diff --git a/WinPaletter/GUI/Style/Config.cs b/WinPaletter/GUI/Style/Config.cs index 9202962a..852d6b2a 100644 --- a/WinPaletter/GUI/Style/Config.cs +++ b/WinPaletter/GUI/Style/Config.cs @@ -5,16 +5,33 @@ namespace WinPaletter.UI.Style { public partial class Config { - public Config(Color Accent, Color Secondary, Color Tertiary, Color Disabled, Color BackColor, Color DisabledBackColor, bool Dark, bool Rounded) + public Config(Color Accent, Color Secondary, Color Tertiary, Color Disabled, Color BackColor, Color DisabledBackColor, bool Dark, bool Rounded, bool EnableAnimations) { DarkMode = Dark; RoundedCorners = Rounded; Radius = 5; + Animations = EnableAnimations; Schemes.Main = new(Accent, BackColor, Dark); Schemes.Secondary = new(Secondary, BackColor, Dark); Schemes.Tertiary = new(Tertiary, BackColor, Dark); Schemes.Disabled = new(Disabled, DisabledBackColor, Dark); + + if (Program.Animator != null) + { + if (Animations) + { + Program.Animator.AnimationType = AnimatorNS.AnimationType.Transparent; + Program.Animator.Interval = 1; + Program.Animator.TimeStep = 0.07f; + } + else + { + Program.Animator.AnimationType = AnimatorNS.AnimationType.Custom; + Program.Animator.Interval = 2; + Program.Animator.TimeStep = 1f; + } + } } /// @@ -29,5 +46,7 @@ public Config(Color Accent, Color Secondary, Color Tertiary, Color Disabled, Col public readonly int Radius = 5; public Schemes_Collection Schemes = new(); + + public bool Animations = false; } } \ No newline at end of file diff --git a/WinPaletter/GUI/Style/DefaultColors.cs b/WinPaletter/GUI/Style/DefaultColors.cs index 66edf0dc..85e5b883 100644 --- a/WinPaletter/GUI/Style/DefaultColors.cs +++ b/WinPaletter/GUI/Style/DefaultColors.cs @@ -7,9 +7,11 @@ internal class DefaultColors public readonly static Color PrimaryColor = Color.FromArgb(0, 81, 210); public readonly static Color SecondaryColor = Color.FromArgb(137, 0, 36); public readonly static Color TertiaryColor = Color.FromArgb(0, 61, 26); - public readonly static Color DisabledColor = Color.FromArgb(100, 100, 100); + public readonly static Color DisabledColor_Dark = Color.FromArgb(100, 100, 100); + public readonly static Color DisabledColor_Light = Color.FromArgb(150, 150, 150); public readonly static Color BackColorDark = Color.FromArgb(25, 25, 25); public readonly static Color BackColorLight = Color.FromArgb(230, 230, 230); - public readonly static Color DisabledBackColor = Color.FromArgb(60, 60, 60); + public readonly static Color DisabledBackColor_Dark = Color.FromArgb(60, 60, 60); + public readonly static Color DisabledBackColor_Light = Color.FromArgb(130, 130, 130); } } \ No newline at end of file diff --git a/WinPaletter/GUI/Style/Dialogs/InputBox.cs b/WinPaletter/GUI/Style/Dialogs/InputBox.cs index a0de8f60..2c6bcc59 100644 --- a/WinPaletter/GUI/Style/Dialogs/InputBox.cs +++ b/WinPaletter/GUI/Style/Dialogs/InputBox.cs @@ -12,7 +12,7 @@ public static string InputBox(string Instruction, string Value = "", string Noti { if (!OS.WXP) { - var ib = new InputDialog() + InputDialog ib = new() { MainInstruction = Instruction, Input = Value, diff --git a/WinPaletter/GUI/Style/Dialogs/MsgBox.cs b/WinPaletter/GUI/Style/Dialogs/MsgBox.cs index 82171ca9..857e4b79 100644 --- a/WinPaletter/GUI/Style/Dialogs/MsgBox.cs +++ b/WinPaletter/GUI/Style/Dialogs/MsgBox.cs @@ -56,7 +56,7 @@ public static string ConvertToLink(string String) if (String == null) return String; - var c = new List(); + List c = new(); foreach (string x in String.Split(' ')) { if (Uri.IsWellFormedUriString(x, UriKind.Absolute)) @@ -115,13 +115,13 @@ public static DialogResult MsgBox(object Message, MessageBoxButtons Buttons = Me else TD.CustomFooterIcon = FooterCustomIcon; - var okButton = new TaskDialogButton(ButtonType.Custom) { Text = Program.Lang.OK, ElevationRequired = RequireElevation }; - var yesButton = new TaskDialogButton(ButtonType.Custom) { Text = Program.Lang.Yes, ElevationRequired = RequireElevation }; - var noButton = new TaskDialogButton(ButtonType.Custom) { Text = Program.Lang.No }; - var cancelButton = new TaskDialogButton(ButtonType.Custom) { Text = Program.Lang.Cancel }; - var retryButton = new TaskDialogButton(ButtonType.Custom) { Text = Program.Lang.Retry, ElevationRequired = RequireElevation }; - var closeButton = new TaskDialogButton(ButtonType.Custom) { Text = Program.Lang.Close }; - var customButton = new TaskDialogButton(ButtonType.Custom); + TaskDialogButton okButton = new(ButtonType.Custom) { Text = Program.Lang.OK, ElevationRequired = RequireElevation }; + TaskDialogButton yesButton = new(ButtonType.Custom) { Text = Program.Lang.Yes, ElevationRequired = RequireElevation }; + TaskDialogButton noButton = new(ButtonType.Custom) { Text = Program.Lang.No }; + TaskDialogButton cancelButton = new(ButtonType.Custom) { Text = Program.Lang.Cancel }; + TaskDialogButton retryButton = new(ButtonType.Custom) { Text = Program.Lang.Retry, ElevationRequired = RequireElevation }; + TaskDialogButton closeButton = new(ButtonType.Custom) { Text = Program.Lang.Close }; + TaskDialogButton customButton = new(ButtonType.Custom); TaskDialogIcon icon; if (Buttons == MessageBoxButtons.YesNoCancel) diff --git a/WinPaletter/GUI/Style/Helpers.cs b/WinPaletter/GUI/Style/Helpers.cs index 0156a9df..15d34341 100644 --- a/WinPaletter/GUI/Style/Helpers.cs +++ b/WinPaletter/GUI/Style/Helpers.cs @@ -107,7 +107,7 @@ public static void GetDarkMode() // Check if appearance is managed by theme and custom colors are enabled if (Program.Settings.Appearance.ManagedByTheme && Program.Settings.Appearance.CustomColors) { - Program.Style.DarkMode = Program.Settings.Appearance.CustomTheme; + Program.Style.DarkMode = Program.Settings.Appearance.CustomTheme_DarkMode; } else { @@ -145,6 +145,8 @@ public static void ApplyStyle(Form Form = null, bool IgnoreTitleBar = false) { bool DarkMode; bool RoundedCorners; + bool Animations = true; + Color AccentColor; Color Secondary; Color Tertiary; @@ -157,37 +159,41 @@ public static void ApplyStyle(Form Form = null, bool IgnoreTitleBar = false) // Check if appearance is managed by theme and custom colors are enabled if (Form == Forms.ApplicationThemer || (Program.Settings.Appearance.ManagedByTheme && Program.Settings.Appearance.CustomColors)) { + DarkMode = Program.Settings.Appearance.CustomTheme_DarkMode; + RoundedCorners = Program.Settings.Appearance.RoundedCorners; + //Animations = Program.Settings.Appearance.Animations; + Animations = Program.Style.Animations; + BackColor = Program.Settings.Appearance.BackColor; AccentColor = Program.Settings.Appearance.AccentColor; //Secondary = Program.Settings.Appearance.SecondaryColor; //Tertiary = Program.Settings.Appearance.TertiaryColor; //Disabled = Program.Settings.Appearance.DisabledColor; //Disabled_Background = Program.Settings.Appearance.DisabledBackColor; - Secondary = DefaultColors.SecondaryColor; Tertiary = DefaultColors.TertiaryColor; - Disabled = DefaultColors.DisabledColor; - Disabled_Background = DefaultColors.DisabledBackColor; + Disabled = DarkMode ? DefaultColors.DisabledColor_Dark : DefaultColors.DisabledColor_Light; + Disabled_Background = DarkMode ? DefaultColors.DisabledBackColor_Dark : DefaultColors.DisabledBackColor_Light; - DarkMode = Program.Settings.Appearance.CustomTheme; - RoundedCorners = Program.Settings.Appearance.RoundedCorners; CustomR = !OS.WXP && !OS.WVista && !OS.W7 && !OS.W8 && !OS.W81 && !OS.W10; } else { - // Use default values if custom colors are not enabled - DarkMode = Program.Style.DarkMode; // Must be before BackColor + DarkMode = Program.Style.DarkMode; RoundedCorners = Program.Style.RoundedCorners; + Animations = Program.Style.Animations; + BackColor = DarkMode ? DefaultColors.BackColorDark : DefaultColors.BackColorLight; AccentColor = DefaultColors.PrimaryColor; Secondary = DefaultColors.SecondaryColor; Tertiary = DefaultColors.TertiaryColor; - Disabled = DefaultColors.DisabledColor; - Disabled_Background = DefaultColors.DisabledBackColor; + Disabled = DarkMode ? DefaultColors.DisabledColor_Dark : DefaultColors.DisabledColor_Light; + Disabled_Background = DarkMode ? DefaultColors.DisabledBackColor_Dark : DefaultColors.DisabledBackColor_Light; + CustomR = false; } - Program.Style = new Config(AccentColor, Secondary, Tertiary, Disabled, BackColor, Disabled_Background, DarkMode, RoundedCorners); + Program.Style = new(AccentColor, Secondary, Tertiary, Disabled, BackColor, Disabled_Background, DarkMode, RoundedCorners, Animations); // Apply the style to the specified form or all open forms if (Form is null) diff --git a/WinPaletter/GUI/Style/Structures.cs b/WinPaletter/GUI/Style/Structures.cs index ce929580..9997f8b7 100644 --- a/WinPaletter/GUI/Style/Structures.cs +++ b/WinPaletter/GUI/Style/Structures.cs @@ -29,7 +29,7 @@ public Schemes_Collection() Scheme Tertiary = new(DefaultColors.TertiaryColor, DefaultColors.BackColorDark, true); - Scheme Disabled = new(DefaultColors.DisabledColor, DefaultColors.DisabledBackColor, true); + Scheme Disabled = new(DefaultColors.DisabledColor_Dark, DefaultColors.DisabledBackColor_Dark, true); } public Scheme Main; @@ -76,9 +76,9 @@ public Colors_Collection(Color accent, Color backcolor, bool isDark) { AccentAlt = accent.Light(0.65f); //<---------------- - Button = backcolor.CB(0.07f); - Button_Over = backcolor.CB(0.1f); - Button_Down = backcolor.CB(0.07f); + Button = backcolor.CB(0.07f); + Button_Over = backcolor.CB(0.1f); + Button_Down = backcolor.CB(0.07f); Back = backcolor.CB(0.07f); Line = backcolor.CB(0.08f); @@ -103,27 +103,27 @@ public Colors_Collection(Color accent, Color backcolor, bool isDark) { AccentAlt = accent.Light(0.5f); //<---------------- - Button = backcolor.CB(-0.04f); - Button_Over = backcolor.CB(-0.1f); + Button = backcolor.CB(-0.04f); + Button_Over = backcolor.CB(-0.1f); Button_Down = backcolor.CB(-0.04f); - Back = backcolor.CB(-0.05f); - Line = backcolor.CB(-0.09f); + Back = backcolor.CB(-0.15f); + Line = backcolor.CB(-0.18f); Back_Hover = backcolor.CB(-0.03f); Line_Hover = backcolor.CB(-0.15f); - Back_Max = backcolor.CB(-0.3f); //<---------------- - Line_Max = backcolor.CB(-0.35); //<---------------- + Back_Max = backcolor.CB(-0.45f); //<---------------- + Line_Max = backcolor.CB(-0.5f); //<---------------- - Back_Checked = accent.CB(0.45f); - Line_Checked = accent.CB(0.45f); + Back_Checked = accent.CB(0.65f); + Line_Checked = accent.CB(0.62f); - Back_Checked_Hover = accent.CB(0.3f); - Line_Checked_Hover = accent.CB(0.25f); + Back_Checked_Hover = accent.CB(0.45f); + Line_Checked_Hover = accent.CB(0.4f); - ForeColor = backcolor.Dark(0.3f); - ForeColor_Accent = accent.Dark(0.3f); + ForeColor = backcolor.Dark(0.4f); + ForeColor_Accent = accent.Dark(0.5f); } } @@ -207,7 +207,7 @@ public Pens_Collection(Scheme scheme) Back_Checked_Hover = new(scheme.Colors.Back_Checked_Hover); Line_Checked_Hover = new(scheme.Colors.Line_Checked_Hover); - + ForeColor = new(scheme.Colors.ForeColor); ForeColor_Accent = new(scheme.Colors.ForeColor_Accent); } diff --git a/WinPaletter/GUI/Style/TestControl.cs b/WinPaletter/GUI/Style/TestControl.cs index 0b748ab3..0783d1d8 100644 --- a/WinPaletter/GUI/Style/TestControl.cs +++ b/WinPaletter/GUI/Style/TestControl.cs @@ -14,7 +14,7 @@ public TestControl() DoubleBuffered = true; BackColor = Color.Transparent; DoubleBuffered = true; - Font = new Font("Segoe UI", 9f); + Font = new("Segoe UI", 9f); Text = string.Empty; } @@ -67,7 +67,7 @@ protected override void OnPaint(PaintEventArgs e) //Makes background drawn properly, and transparent InvokePaintBackground(this, e); - var MainRect = new Rectangle(0, 0, Width - 1, Height - 1); + Rectangle MainRect = new(0, 0, Width - 1, Height - 1); Color bkC = default; Color lC = default; diff --git a/WinPaletter/GUI/Style/VisualStylesRes.cs b/WinPaletter/GUI/Style/VisualStylesRes.cs index a08a7829..75ab2b33 100644 --- a/WinPaletter/GUI/Style/VisualStylesRes.cs +++ b/WinPaletter/GUI/Style/VisualStylesRes.cs @@ -7,7 +7,7 @@ public class VisualStylesRes { public VisualStylesRes(string themeFile) { - _VisualStyleFile = new VisualStyleFile(themeFile); + _VisualStyleFile = new(themeFile); try { Colors = _VisualStyleFile.Metrics.Colors; @@ -27,8 +27,8 @@ public VisualStylesRes(string themeFile) } private VisualStyleFile _VisualStyleFile; - public VisualStyleMetricColors Colors { get; set; } = new VisualStyleMetricColors(); - public VisualStyleMetricSizes Metrics { get; set; } = new VisualStyleMetricSizes(); + public VisualStyleMetricColors Colors { get; set; } = new(); + public VisualStyleMetricSizes Metrics { get; set; } = new(); public enum Element { @@ -145,7 +145,7 @@ public void Draw(Graphics G, Rectangle Rectangle, Element element, bool Active, try { - var renderer = new VisualStyleRenderer(el); + VisualStyleRenderer renderer = new(el); renderer.DrawBackground(G, Rectangle); } catch diff --git a/WinPaletter/Languages/Lang_Add_Snippet.Designer.cs b/WinPaletter/Languages/Lang_Add_Snippet.Designer.cs index e1a688b3..ff4b215e 100644 --- a/WinPaletter/Languages/Lang_Add_Snippet.Designer.cs +++ b/WinPaletter/Languages/Lang_Add_Snippet.Designer.cs @@ -60,7 +60,7 @@ private void InitializeComponent() // Button3.Anchor = AnchorStyles.Top | AnchorStyles.Right; Button3.BackColor = Color.FromArgb(34, 34, 34); - Button3.Font = new Font("Segoe UI", 9.0f); + Button3.Font = new("Segoe UI", 9.0f); Button3.ForeColor = Color.White; Button3.Image = null; Button3.Location = new Point(416, 83); @@ -74,7 +74,7 @@ private void InitializeComponent() // Button2.Anchor = AnchorStyles.Top | AnchorStyles.Right; Button2.BackColor = Color.FromArgb(34, 34, 34); - Button2.Font = new Font("Segoe UI", 9.0f); + Button2.Font = new("Segoe UI", 9.0f); Button2.ForeColor = Color.White; Button2.Image = null; Button2.Location = new Point(335, 83); @@ -90,7 +90,7 @@ private void InitializeComponent() ComboBox2.DrawMode = DrawMode.OwnerDrawVariable; ComboBox2.DropDownHeight = 250; ComboBox2.DropDownStyle = ComboBoxStyle.DropDownList; - ComboBox2.Font = new Font("Segoe UI", 9.0f); + ComboBox2.Font = new("Segoe UI", 9.0f); ComboBox2.ForeColor = Color.White; ComboBox2.FormattingEnabled = true; ComboBox2.IntegralHeight = false; @@ -104,7 +104,7 @@ private void InitializeComponent() // Button1.Anchor = AnchorStyles.Top | AnchorStyles.Right; Button1.BackColor = Color.FromArgb(34, 34, 34); - Button1.Font = new Font("Segoe UI", 9.0f); + Button1.Font = new("Segoe UI", 9.0f); Button1.ForeColor = Color.White; Button1.Image = null; Button1.Location = new Point(416, 13); @@ -120,7 +120,7 @@ private void InitializeComponent() ComboBox1.DrawMode = DrawMode.OwnerDrawVariable; ComboBox1.DropDownHeight = 250; ComboBox1.DropDownStyle = ComboBoxStyle.DropDownList; - ComboBox1.Font = new Font("Segoe UI", 9.0f); + ComboBox1.Font = new("Segoe UI", 9.0f); ComboBox1.ForeColor = Color.White; ComboBox1.FormattingEnabled = true; ComboBox1.IntegralHeight = false; @@ -142,7 +142,7 @@ private void InitializeComponent() // // Label2 // - Label2.Font = new Font("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); + Label2.Font = new("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); Label2.Location = new Point(42, 12); Label2.Name = "Label2"; Label2.Size = new Size(48, 24); @@ -152,7 +152,7 @@ private void InitializeComponent() // // Label1 // - Label1.Font = new Font("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); + Label1.Font = new("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); Label1.Location = new Point(42, 82); Label1.Name = "Label1"; Label1.Size = new Size(48, 24); @@ -177,7 +177,7 @@ private void InitializeComponent() AlertBox7.BackColor = Color.FromArgb(70, 91, 94); AlertBox7.CenterText = true; AlertBox7.CustomColor = Color.FromArgb(0, 81, 210); - AlertBox7.Font = new Font("Segoe UI", 9.0f); + AlertBox7.Font = new("Segoe UI", 9.0f); AlertBox7.Image = null; AlertBox7.Location = new Point(12, 182); AlertBox7.Name = "AlertBox7"; @@ -188,7 +188,7 @@ private void InitializeComponent() // // Label3 // - Label3.Font = new Font("Segoe UI", 9.0f, FontStyle.Italic, GraphicsUnit.Point, 0); + Label3.Font = new("Segoe UI", 9.0f, FontStyle.Italic, GraphicsUnit.Point, 0); Label3.Location = new Point(45, 41); Label3.Name = "Label3"; Label3.Size = new Size(446, 24); @@ -198,7 +198,7 @@ private void InitializeComponent() // // Label4 // - Label4.Font = new Font("Segoe UI", 9.0f, FontStyle.Italic, GraphicsUnit.Point, 0); + Label4.Font = new("Segoe UI", 9.0f, FontStyle.Italic, GraphicsUnit.Point, 0); Label4.Location = new Point(45, 113); Label4.Name = "Label4"; Label4.Size = new Size(446, 56); @@ -213,7 +213,7 @@ private void InitializeComponent() AlertBox1.BackColor = Color.FromArgb(70, 91, 94); AlertBox1.CenterText = true; AlertBox1.CustomColor = Color.FromArgb(0, 81, 210); - AlertBox1.Font = new Font("Segoe UI", 9.0f); + AlertBox1.Font = new("Segoe UI", 9.0f); AlertBox1.Image = null; AlertBox1.Location = new Point(12, 210); AlertBox1.Name = "AlertBox1"; @@ -241,10 +241,10 @@ private void InitializeComponent() Controls.Add(ComboBox2); Controls.Add(Button1); Controls.Add(ComboBox1); - Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); ForeColor = Color.White; FormBorderStyle = FormBorderStyle.FixedSingle; - Margin = new Padding(4, 3, 4, 3); + Margin = new(4, 3, 4, 3); MaximizeBox = false; MinimizeBox = false; Name = "Lang_Add_Snippet"; diff --git a/WinPaletter/Languages/Lang_Dashboard.Designer.cs b/WinPaletter/Languages/Lang_Dashboard.Designer.cs index ce3be2a0..a9305b3a 100644 --- a/WinPaletter/Languages/Lang_Dashboard.Designer.cs +++ b/WinPaletter/Languages/Lang_Dashboard.Designer.cs @@ -85,7 +85,7 @@ private void InitializeComponent() Button1.Anchor = AnchorStyles.Top | AnchorStyles.Right; Button1.BackColor = Color.FromArgb(43, 43, 43); - Button1.Font = new Font("Segoe UI", 9.0f); + Button1.Font = new("Segoe UI", 9.0f); Button1.ForeColor = Color.White; Button1.Image = null; Button1.Location = new Point(521, 20); @@ -98,7 +98,7 @@ private void InitializeComponent() // Label2 // Label2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - Label2.Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Label2.Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); Label2.Location = new Point(75, 25); Label2.Name = "Label2"; Label2.Size = new Size(440, 35); @@ -109,7 +109,7 @@ private void InitializeComponent() // Label1 // Label1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - Label1.Font = new Font("Segoe UI", 9.75f, FontStyle.Bold, GraphicsUnit.Point, 0); + Label1.Font = new("Segoe UI", 9.75f, FontStyle.Bold, GraphicsUnit.Point, 0); Label1.Location = new Point(65, 5); Label1.Name = "Label1"; Label1.Size = new Size(413, 19); @@ -145,7 +145,7 @@ private void InitializeComponent() Button2.Anchor = AnchorStyles.Top | AnchorStyles.Right; Button2.BackColor = Color.FromArgb(43, 43, 43); - Button2.Font = new Font("Segoe UI", 9.0f); + Button2.Font = new("Segoe UI", 9.0f); Button2.ForeColor = Color.White; Button2.Image = null; Button2.Location = new Point(521, 20); @@ -158,7 +158,7 @@ private void InitializeComponent() // Label3 // Label3.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - Label3.Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Label3.Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); Label3.Location = new Point(75, 25); Label3.Name = "Label3"; Label3.Size = new Size(440, 35); @@ -169,7 +169,7 @@ private void InitializeComponent() // Label4 // Label4.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - Label4.Font = new Font("Segoe UI", 9.75f, FontStyle.Bold, GraphicsUnit.Point, 0); + Label4.Font = new("Segoe UI", 9.75f, FontStyle.Bold, GraphicsUnit.Point, 0); Label4.Location = new Point(65, 5); Label4.Name = "Label4"; Label4.Size = new Size(413, 19); @@ -192,7 +192,7 @@ private void InitializeComponent() Button7.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; Button7.BackColor = Color.FromArgb(34, 34, 34); - Button7.Font = new Font("Segoe UI", 9.0f); + Button7.Font = new("Segoe UI", 9.0f); Button7.ForeColor = Color.White; Button7.Image = null; Button7.Location = new Point(542, 305); @@ -221,7 +221,7 @@ private void InitializeComponent() Button3.Anchor = AnchorStyles.Top | AnchorStyles.Right; Button3.BackColor = Color.FromArgb(43, 43, 43); - Button3.Font = new Font("Segoe UI", 9.0f); + Button3.Font = new("Segoe UI", 9.0f); Button3.ForeColor = Color.White; Button3.Image = null; Button3.Location = new Point(521, 20); @@ -234,7 +234,7 @@ private void InitializeComponent() // Label5 // Label5.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - Label5.Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Label5.Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); Label5.Location = new Point(75, 25); Label5.Name = "Label5"; Label5.Size = new Size(440, 35); @@ -245,7 +245,7 @@ private void InitializeComponent() // Label6 // Label6.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - Label6.Font = new Font("Segoe UI", 9.75f, FontStyle.Bold, GraphicsUnit.Point, 0); + Label6.Font = new("Segoe UI", 9.75f, FontStyle.Bold, GraphicsUnit.Point, 0); Label6.Location = new Point(65, 5); Label6.Name = "Label6"; Label6.Size = new Size(230, 19); @@ -279,7 +279,7 @@ private void InitializeComponent() AlertBox1.BackColor = Color.FromArgb(60, 85, 79); AlertBox1.CenterText = true; AlertBox1.CustomColor = Color.FromArgb(0, 81, 210); - AlertBox1.Font = new Font("Segoe UI", 9.0f); + AlertBox1.Font = new("Segoe UI", 9.0f); AlertBox1.Image = null; AlertBox1.Location = new Point(302, 5); AlertBox1.Name = "AlertBox1"; @@ -295,7 +295,7 @@ private void InitializeComponent() AlertBox2.BackColor = Color.FromArgb(125, 20, 30); AlertBox2.CenterText = false; AlertBox2.CustomColor = Color.FromArgb(0, 81, 210); - AlertBox2.Font = new Font("Segoe UI", 9.0f); + AlertBox2.Font = new("Segoe UI", 9.0f); AlertBox2.Image = null; AlertBox2.Location = new Point(12, 229); AlertBox2.Name = "AlertBox2"; @@ -316,11 +316,11 @@ private void InitializeComponent() Controls.Add(Button7); Controls.Add(GroupBox2); Controls.Add(GroupBox1); - Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); ForeColor = Color.White; FormBorderStyle = FormBorderStyle.FixedSingle; HelpButton = true; - Margin = new Padding(4, 3, 4, 3); + Margin = new(4, 3, 4, 3); MaximizeBox = false; MinimizeBox = false; Name = "Lang_Dashboard"; diff --git a/WinPaletter/Languages/Lang_JSON_GUI.cs b/WinPaletter/Languages/Lang_JSON_GUI.cs index 60889050..507c1e1c 100644 --- a/WinPaletter/Languages/Lang_JSON_GUI.cs +++ b/WinPaletter/Languages/Lang_JSON_GUI.cs @@ -18,10 +18,10 @@ public partial class Lang_JSON_GUI public static event EventHandler ControlSelection; private Control _SelectedItem; - private List FormsList = new List(); + private List FormsList = new(); private string LangFile; - private Localizer Lang = new Localizer(); + private Localizer Lang = new(); private bool EditingTag = true; private bool AllowEditing = false; @@ -43,7 +43,7 @@ public Lang_JSON_GUI() #region Helpers Voids/functions public void OpenFile() { - Lang = new Localizer(); + Lang = new(); Lang.Load(LangFile); Label9.Text = LangFile; @@ -71,7 +71,7 @@ public void LoadGlobalStrings() data.Columns[2].DefaultCellStyle.WrapMode = DataGridViewTriState.True; int row_index = 0; - var rows = new List(); + List rows = new(); rows.Clear(); JObject JObject = (JObject)JToken.Parse(System.IO.File.ReadAllText(LangFile))["Global Strings"]; @@ -82,7 +82,7 @@ public void LoadGlobalStrings() if (!string.IsNullOrWhiteSpace(property.GetValue(Program.Lang).ToString()) & !((property.Name.ToLower() ?? string.Empty) == ("Name".ToLower() ?? string.Empty)) & !((property.Name.ToLower() ?? string.Empty) == ("TranslationVersion".ToLower() ?? string.Empty)) & !((property.Name.ToLower() ?? string.Empty) == ("Lang".ToLower() ?? string.Empty)) & !((property.Name.ToLower() ?? string.Empty) == ("LangCode".ToLower() ?? string.Empty)) & !((property.Name.ToLower() ?? string.Empty) == ("AppVer".ToLower() ?? string.Empty)) & !((property.Name.ToLower() ?? string.Empty) == ("RightToLeft".ToLower() ?? string.Empty))) { - var row = new DataGridViewRow(); + DataGridViewRow row = new(); row.CreateCells(data); row.Cells[0].Value = property.Name.ToLower(); @@ -147,7 +147,7 @@ public void LoadAllMiniFormsIntoList() if (Th is not null && Th.IsAlive) Th.Abort(); - Th = new Thread(LoadAllMiniFormsIntoList_Thread) { Priority = ThreadPriority.Highest, IsBackground = true }; + Th = new(LoadAllMiniFormsIntoList_Thread) { Priority = ThreadPriority.Highest, IsBackground = true }; Th.Start(); } @@ -203,7 +203,7 @@ public void LoadAllMiniFormsIntoList_Thread() public Form CreateMiniForm(Form Form, Form OriginalForm) { - Form Child = new Form() + Form Child = new() { Name = Form.Name, Text = Form.Text, @@ -227,7 +227,7 @@ public Form CreateMiniForm(Form Form, Form OriginalForm) }; if (Form.FormBorderStyle == FormBorderStyle.None) - Child.Size += new Size(4 * 4 + 2, 24 * 2 - 6); + Child.Size += new Size (4 * 4 + 2, 24 * 2 - 6); PopulateSubControls(Form, Child, OriginalForm); @@ -251,7 +251,7 @@ public void PopulateSubControls(Control From, Control To, Form OriginalForm) if (ctrl is TabControl) { - var tabs = new TabControl() + TabControl tabs = new() { Name = ctrl.Name, Text = ctrl.Text, @@ -266,9 +266,9 @@ public void PopulateSubControls(Control From, Control To, Form OriginalForm) Alignment = ((TabControl)ctrl).Alignment }; - for (int i = 0, loopTo = ((TabControl)ctrl).TabPages.Count - 1; i <= loopTo; i++) + for (int i = 0; i <= ((TabControl)ctrl).TabPages.Count - 1; i++) { - var TP = new TabPage() + TabPage TP = new() { Name = ((TabControl)ctrl).TabPages[i].Name, Text = ((TabControl)ctrl).TabPages[i].Text, @@ -296,7 +296,7 @@ public void PopulateSubControls(Control From, Control To, Form OriginalForm) else if (ctrl is UI.Simulation.Window) { - var c = new UI.Controllers.TextTranslationItem() + UI.Controllers.TextTranslationItem c = new() { Name = ctrl.Name, Text = ctrl.Text, @@ -321,7 +321,7 @@ public void PopulateSubControls(Control From, Control To, Form OriginalForm) else { - var pnl = new Panel() + Panel pnl = new() { Name = ctrl.Name, Text = ctrl.Text, @@ -354,7 +354,7 @@ public void PopulateSubControls(Control From, Control To, Form OriginalForm) if (Condition0 | Condition1 && Condition2) { - var c = new UI.Controllers.TextTranslationItem() + UI.Controllers.TextTranslationItem c = new() { Name = ctrl.Name, Text = ctrl.Text, @@ -374,7 +374,7 @@ public void PopulateSubControls(Control From, Control To, Form OriginalForm) if (ctrl is Label) { { - var temp = (Label)ctrl; + Label temp = (Label)ctrl; c.TextAlign = temp.TextAlign; c.ImageAlign = temp.ImageAlign; } @@ -383,7 +383,7 @@ public void PopulateSubControls(Control From, Control To, Form OriginalForm) else if (ctrl is UI.WP.Button) { { - var temp1 = (UI.WP.Button)ctrl; + UI.WP.Button temp1 = (UI.WP.Button)ctrl; c.TextAlign = temp1.TextAlign; c.ImageAlign = temp1.ImageAlign; c.Image = temp1.Image; @@ -393,7 +393,7 @@ public void PopulateSubControls(Control From, Control To, Form OriginalForm) else if (ctrl is Button) { { - var temp2 = (Button)ctrl; + Button temp2 = (Button)ctrl; c.TextAlign = temp2.TextAlign; c.ImageAlign = temp2.ImageAlign; c.Image = temp2.Image; @@ -403,7 +403,7 @@ public void PopulateSubControls(Control From, Control To, Form OriginalForm) else if (ctrl is UI.WP.RadioImage) { { - var temp3 = (UI.WP.RadioImage)ctrl; + UI.WP.RadioImage temp3 = (UI.WP.RadioImage)ctrl; c.Text = !string.IsNullOrWhiteSpace(temp3.Text) ? temp3.Text : string.Empty; c.Image = temp3.Image; } @@ -417,7 +417,7 @@ public void PopulateSubControls(Control From, Control To, Form OriginalForm) else if (ctrl is UI.WP.AlertBox) { { - var temp4 = (UI.WP.AlertBox)ctrl; + UI.WP.AlertBox temp4 = (UI.WP.AlertBox)ctrl; c.Image = null; c.TextAlign = ContentAlignment.MiddleLeft; } @@ -433,7 +433,7 @@ public void PopulateSubControls(Control From, Control To, Form OriginalForm) else if (Condition3) { - var c = new PictureBox() + PictureBox c = new() { Name = ctrl.Name, Text = ctrl.Text, @@ -621,7 +621,7 @@ private void data_CellPainting(object sender, DataGridViewCellPaintingEventArgs SolidBrush br = new(e.CellStyle.ForeColor); - var textMetricSize = new SizeF(0f, 0f); + SizeF textMetricSize = new(0f, 0f); if (keyPos >= 1) { string textMetric = text.Substring(0, keyPos); @@ -630,9 +630,9 @@ private void data_CellPainting(object sender, DataGridViewCellPaintingEventArgs var keySize = e.Graphics.MeasureString(text.Substring(keyPos, SearchText.Length), Font, e.CellBounds.Width, sf); float left = e.CellBounds.Left + (keyPos <= 0 ? 0f : textMetricSize.Width); // + 2 - var keyRect = new RectangleF(left, e.CellBounds.Top + 1, keySize.Width, keySize.Height); + RectangleF keyRect = new(left, e.CellBounds.Top + 1, keySize.Width, keySize.Height); - var fillBrush = new SolidBrush(Program.Style.Schemes.Tertiary.Colors.Line_Hover); + SolidBrush fillBrush = new(Program.Style.Schemes.Tertiary.Colors.Line_Hover); e.Graphics.FillRectangle(fillBrush, keyRect); fillBrush.Dispose(); @@ -836,7 +836,7 @@ private void Button4_Click(object sender, EventArgs e) AlertBox1.Visible = false; TabControl1.Visible = false; Cursor = Cursors.WaitCursor; - using (var LangX = new Localizer()) + using (Localizer LangX = new()) { LangX.ExportJSON(SaveJSONDlg.FileName); } @@ -852,7 +852,7 @@ private void Button5_Click(object sender, EventArgs e) if (SaveJSONDlg.ShowDialog() == DialogResult.OK) { Cursor = Cursors.WaitCursor; - using (var LangX = new Localizer()) + using (Localizer LangX = new()) { LangX.ExportJSON(SaveJSONDlg.FileName); } @@ -873,9 +873,9 @@ private void Button2_Click(object sender, EventArgs e) JObject JObj = (JObject)JToken.Parse(System.IO.File.ReadAllText(LangFile)); - var j_info = new JObject() { { "Name".ToLower(), TextBox5.Text ?? string.Empty }, { "TranslationVersion".ToLower(), TextBox6.Text ?? string.Empty }, { "Lang".ToLower(), TextBox3.Text ?? string.Empty }, { "LangCode".ToLower(), TextBox4.Text ?? string.Empty }, { "AppVer".ToLower(), TextBox7.Text ?? string.Empty }, { "RightToLeft".ToLower(), RadioButton2.Checked } }; + JObject j_info = new() { { "Name".ToLower(), TextBox5.Text ?? string.Empty }, { "TranslationVersion".ToLower(), TextBox6.Text ?? string.Empty }, { "Lang".ToLower(), TextBox3.Text ?? string.Empty }, { "LangCode".ToLower(), TextBox4.Text ?? string.Empty }, { "AppVer".ToLower(), TextBox7.Text ?? string.Empty }, { "RightToLeft".ToLower(), RadioButton2.Checked } }; - var j_globalstrings = new JObject(); + JObject j_globalstrings = new(); for (int r = 0, loopTo = data.Rows.Count - 1; r <= loopTo; r++) j_globalstrings[data[0, r].Value.ToString().ToLower()] = (data[1, r].Value ?? string.Empty).ToString(); diff --git a/WinPaletter/Languages/Lang_JSON_Manage.cs b/WinPaletter/Languages/Lang_JSON_Manage.cs index 8f6ddd5f..4e06bea9 100644 --- a/WinPaletter/Languages/Lang_JSON_Manage.cs +++ b/WinPaletter/Languages/Lang_JSON_Manage.cs @@ -163,7 +163,7 @@ private void Button4_Click(object sender, EventArgs e) if (SaveJSONDlg.ShowDialog() == DialogResult.OK) { Cursor = Cursors.WaitCursor; - var Lang = new Localizer(); + Localizer Lang = new(); Lang.ExportJSON(SaveJSONDlg.FileName); Lang.Dispose(); TreeView1.FromJSON(SaveJSONDlg.FileName, Path.GetFileName(SaveJSONDlg.FileName)); @@ -176,7 +176,7 @@ private void Button5_Click(object sender, EventArgs e) if (SaveJSONDlg.ShowDialog() == DialogResult.OK) { Cursor = Cursors.WaitCursor; - var Lang = new Localizer(); + Localizer Lang = new(); Lang.ExportJSON(SaveJSONDlg.FileName); Lang.Dispose(); Cursor = Cursors.Default; diff --git a/WinPaletter/Languages/Lang_JSON_Update.cs b/WinPaletter/Languages/Lang_JSON_Update.cs index 839249e5..3de0553a 100644 --- a/WinPaletter/Languages/Lang_JSON_Update.cs +++ b/WinPaletter/Languages/Lang_JSON_Update.cs @@ -42,7 +42,7 @@ private void Button5_Click(object sender, EventArgs e) if (SaveJSONDlg.ShowDialog() == DialogResult.OK) { Cursor = Cursors.WaitCursor; - var Lang = new Localizer(); + Localizer Lang = new(); Lang.ExportJSON(SaveJSONDlg.FileName); Lang.Dispose(); TextBox2.Text = SaveJSONDlg.FileName; @@ -59,19 +59,19 @@ private void Button3_Click(object sender, EventArgs e) string _output = SaveJSONDlg.FileName; - var _Old_File = new StreamReader(TextBox1.Text); + StreamReader _Old_File = new(TextBox1.Text); JObject J_Old = JObject.Parse(_Old_File.ReadToEnd()); _Old_File.Close(); - var _New_File = new StreamReader(TextBox2.Text); + StreamReader _New_File = new(TextBox2.Text); JObject J_New = JObject.Parse(_New_File.ReadToEnd()); _New_File.Close(); // Add information from the New File - var J_Output = new JObject() { { "Information", J_New["Information"] } }; + JObject J_Output = new() { { "Information", J_New["Information"] } }; // Manage Global Strings - var J_GlobalStrings = new JObject(); + JObject J_GlobalStrings = new(); JObject x_old = (JObject)J_Old["Global Strings"]; JObject x_new = (JObject)J_New["Global Strings"]; foreach (var j in x_new.Properties()) @@ -96,7 +96,7 @@ private void Button3_Click(object sender, EventArgs e) J_Output.Add("Global Strings", J_GlobalStrings); // Manage Forms - var J_Forms = new JObject(); + JObject J_Forms = new(); x_old = (JObject)J_Old["Forms Strings"]; x_new = (JObject)J_New["Forms Strings"]; @@ -112,7 +112,7 @@ private void Button3_Click(object sender, EventArgs e) { JObject c_old = (JObject)x_old[j.Name]["Controls"]; JObject c_new = (JObject)x_new[j.Name]["Controls"]; - var c = new JObject(); + JObject c = new(); foreach (var jj in c_new.Properties()) { diff --git a/WinPaletter/Languages/Lang_ReplaceText.Designer.cs b/WinPaletter/Languages/Lang_ReplaceText.Designer.cs index 56276eac..a41f721a 100644 --- a/WinPaletter/Languages/Lang_ReplaceText.Designer.cs +++ b/WinPaletter/Languages/Lang_ReplaceText.Designer.cs @@ -64,7 +64,7 @@ private void InitializeComponent() // // Label20 // - Label20.Font = new Font("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); + Label20.Font = new("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); Label20.Location = new Point(42, 12); Label20.Name = "Label20"; Label20.Size = new Size(109, 24); @@ -84,7 +84,7 @@ private void InitializeComponent() // // Label18 // - Label18.Font = new Font("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); + Label18.Font = new("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); Label18.Location = new Point(42, 42); Label18.Name = "Label18"; Label18.Size = new Size(109, 24); @@ -135,7 +135,7 @@ private void InitializeComponent() Button7.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; Button7.BackColor = Color.FromArgb(34, 34, 34); - Button7.Font = new Font("Segoe UI", 9.0f); + Button7.Font = new("Segoe UI", 9.0f); Button7.ForeColor = Color.White; Button7.Image = null; Button7.Location = new Point(266, 175); @@ -150,7 +150,7 @@ private void InitializeComponent() Button2.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; Button2.BackColor = Color.FromArgb(34, 34, 34); - Button2.Font = new Font("Segoe UI", 9.0f); + Button2.Font = new("Segoe UI", 9.0f); Button2.ForeColor = Color.White; Button2.Image = null; Button2.ImageAlign = ContentAlignment.MiddleLeft; @@ -165,7 +165,7 @@ private void InitializeComponent() // CheckBox1.BackColor = Color.FromArgb(25, 25, 25); CheckBox1.Checked = false; - CheckBox1.Font = new Font("Segoe UI", 9.0f); + CheckBox1.Font = new("Segoe UI", 9.0f); CheckBox1.ForeColor = Color.White; CheckBox1.Location = new Point(157, 72); CheckBox1.Name = "CheckBox1"; @@ -177,7 +177,7 @@ private void InitializeComponent() // CheckBox2.BackColor = Color.FromArgb(25, 25, 25); CheckBox2.Checked = false; - CheckBox2.Font = new Font("Segoe UI", 9.0f); + CheckBox2.Font = new("Segoe UI", 9.0f); CheckBox2.ForeColor = Color.White; CheckBox2.Location = new Point(157, 101); CheckBox2.Name = "CheckBox2"; @@ -201,9 +201,9 @@ private void InitializeComponent() Controls.Add(Label18); Controls.Add(TextBox3); Controls.Add(TextBox4); - Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); ForeColor = Color.White; - Margin = new Padding(4, 3, 4, 3); + Margin = new(4, 3, 4, 3); MaximizeBox = false; MinimizeBox = false; Name = "Lang_ReplaceText"; diff --git a/WinPaletter/Languages/Localizer/Localizer.cs b/WinPaletter/Languages/Localizer/Localizer.cs index 22feb4cf..9380054c 100644 --- a/WinPaletter/Languages/Localizer/Localizer.cs +++ b/WinPaletter/Languages/Localizer/Localizer.cs @@ -69,9 +69,9 @@ public void Load(string File, Form _Form = null) St.Close(); } - J_Information = new JObject(); - J_GlobalStrings = new JObject(); - J_Forms = new JObject(); + J_Information= new(); + J_GlobalStrings= new(); + J_Forms= new(); bool Valid = JObj.ContainsKey("Information") & JObj.ContainsKey("Global Strings") & JObj.ContainsKey("Forms Strings"); @@ -131,7 +131,7 @@ public void DeserializeFormsJSONIntoTreeList(JObject JSON_Forms) // Get one form node // There is only one specific property "Text" - var J_Specific_Form = new JObject(); + JObject J_Specific_Form = new(); J_Specific_Form = (JObject)JSON_Forms[F.Key]; FormName = F.Key.ToString(); ControlName = string.Empty; @@ -153,7 +153,7 @@ public void DeserializeFormsJSONIntoTreeList(JObject JSON_Forms) { // JObj nodes of all child controls - var J_Controls = new JObject(); + JObject J_Controls = new(); if (J_Specific_Form.ContainsKey("Controls")) J_Controls = (JObject)J_Specific_Form["Controls"]; if (J_Specific_Form.ContainsKey("controls")) @@ -300,10 +300,10 @@ public void Populate(List> PopCtrlList, Fo public void ExportJSON(string File, Form[] Forms = null) { - var JSON_Overall = new JObject(); - var newL = new Localizer(); + JObject JSON_Overall= new(); + Localizer newL = new(); - var j_info = new JObject(); + JObject j_info = new(); j_info.RemoveAll(); j_info.Add("Name".ToLower(), newL.Name); j_info.Add("TranslationVersion".ToLower(), newL.TranslationVersion); @@ -312,7 +312,7 @@ public void ExportJSON(string File, Form[] Forms = null) j_info.Add("AppVer".ToLower(), Program.Version); j_info.Add("RightToLeft".ToLower(), newL.RightToLeft); - var j_globalstrings = new JObject(); + JObject j_globalstrings = new(); var type1 = newL.GetType(); PropertyInfo[] properties1 = type1.GetProperties(); @@ -325,7 +325,7 @@ public void ExportJSON(string File, Form[] Forms = null) } } - var j_Forms = new JObject(); + JObject j_Forms = new(); if (Forms is null) { @@ -336,7 +336,7 @@ public void ExportJSON(string File, Form[] Forms = null) if ((ins.Name.ToLower() ?? string.Empty) != (WinPaletter.Forms.BK.Name.ToLower() ?? string.Empty)) { - JObject j_ctrl = new JObject(), j_child = new JObject(); + JObject j_ctrl= new(), j_child= new(); j_ctrl.RemoveAll(); j_child.RemoveAll(); @@ -399,7 +399,7 @@ public void ExportJSON(string File, Form[] Forms = null) { if ((f.Name.ToLower() ?? string.Empty) != (WinPaletter.Forms.BK.Name.ToLower() ?? string.Empty)) { - JObject j_ctrl = new JObject(), j_child = new JObject(); + JObject j_ctrl= new(), j_child= new(); j_ctrl.RemoveAll(); j_child.RemoveAll(); diff --git a/WinPaletter/Languages/Localizer/Strings/General/General.cs b/WinPaletter/Languages/Localizer/Strings/General/General.cs index a6315559..d109492e 100644 --- a/WinPaletter/Languages/Localizer/Strings/General/General.cs +++ b/WinPaletter/Languages/Localizer/Strings/General/General.cs @@ -39,6 +39,7 @@ public partial class Localizer public string AndBelow { get; set; } = "and below"; public string AppPreview { get; set; } = "App preview"; public string InactiveApp { get; set; } = "Inactive app"; + public string Disabled { get; set; } = "Disabled"; public string Scaling { get; set; } = "Scaling"; public string Default { get; set; } = "Default"; public string Untitled { get; set; } = "Untitled"; diff --git a/WinPaletter/LogonUI/LogonUI.cs b/WinPaletter/LogonUI/LogonUI.cs index 6fcb8688..fd3689b0 100644 --- a/WinPaletter/LogonUI/LogonUI.cs +++ b/WinPaletter/LogonUI/LogonUI.cs @@ -43,7 +43,7 @@ private void Button11_Click(object sender, EventArgs e) { if (OpenFileDialog1.ShowDialog() == DialogResult.OK) { - var TMx = new Theme.Manager(Theme.Manager.Source.File, OpenFileDialog1.FileName); + Theme.Manager TMx = new(Theme.Manager.Source.File, OpenFileDialog1.FileName); ApplyFromTM(TMx); TMx.Dispose(); } @@ -51,7 +51,7 @@ private void Button11_Click(object sender, EventArgs e) private void Button9_Click(object sender, EventArgs e) { - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyFromTM(TMx); TMx.Dispose(); } diff --git a/WinPaletter/LogonUI/LogonUI7.Designer.cs b/WinPaletter/LogonUI/LogonUI7.Designer.cs index e8c9a0e9..a0814b76 100644 --- a/WinPaletter/LogonUI/LogonUI7.Designer.cs +++ b/WinPaletter/LogonUI/LogonUI7.Designer.cs @@ -574,7 +574,7 @@ private void InitializeComponent() this.color_pick.AllowDrop = true; this.color_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.color_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.color_pick.DefaultColor = System.Drawing.Color.Black; + this.color_pick.DefaultBackColor = System.Drawing.Color.Black; this.color_pick.DontShowInfo = false; this.color_pick.Location = new System.Drawing.Point(219, 93); this.color_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); diff --git a/WinPaletter/LogonUI/LogonUI7.cs b/WinPaletter/LogonUI/LogonUI7.cs index 6694405b..9ea6a304 100644 --- a/WinPaletter/LogonUI/LogonUI7.cs +++ b/WinPaletter/LogonUI/LogonUI7.cs @@ -470,12 +470,12 @@ private void Color_pick_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender, pnl_preview }; + List CList = new() { (Control)sender, pnl_preview }; if (RadioButton3.Checked) pnl_preview.BackgroundImage = null; - var C = Forms.ColorPickerDlg.Pick(CList); + Color C = Forms.ColorPickerDlg.Pick(CList); ((UI.Controllers.ColorItem)sender).BackColor = Color.FromArgb(255, C); @@ -515,7 +515,7 @@ private void Button11_Click(object sender, EventArgs e) { if (OpenFileDialog1.ShowDialog() == DialogResult.OK) { - var TMx = new Theme.Manager(Theme.Manager.Source.File, OpenFileDialog1.FileName); + Theme.Manager TMx = new(Theme.Manager.Source.File, OpenFileDialog1.FileName); LoadFromTM(TMx); TMx.Dispose(); } @@ -523,7 +523,7 @@ private void Button11_Click(object sender, EventArgs e) private void Button9_Click(object sender, EventArgs e) { - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); LoadFromTM(TMx); TMx.Dispose(); } diff --git a/WinPaletter/LogonUI/LogonUIXP.Designer.cs b/WinPaletter/LogonUI/LogonUIXP.Designer.cs index 1ccc2750..84d968b4 100644 --- a/WinPaletter/LogonUI/LogonUIXP.Designer.cs +++ b/WinPaletter/LogonUI/LogonUIXP.Designer.cs @@ -142,7 +142,7 @@ private void InitializeComponent() // this.color_pick.AllowDrop = true; this.color_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.color_pick.DefaultColor = System.Drawing.Color.Black; + this.color_pick.DefaultBackColor = System.Drawing.Color.Black; this.color_pick.DontShowInfo = false; this.color_pick.Location = new System.Drawing.Point(195, 42); this.color_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); diff --git a/WinPaletter/LogonUI/LogonUIXP.cs b/WinPaletter/LogonUI/LogonUIXP.cs index 71a703d8..3c6a08a6 100644 --- a/WinPaletter/LogonUI/LogonUIXP.cs +++ b/WinPaletter/LogonUI/LogonUIXP.cs @@ -107,7 +107,7 @@ private void Button11_Click(object sender, EventArgs e) { if (OpenFileDialog1.ShowDialog() == DialogResult.OK) { - var TMx = new Theme.Manager(Theme.Manager.Source.File, OpenFileDialog1.FileName); + Theme.Manager TMx = new(Theme.Manager.Source.File, OpenFileDialog1.FileName); ApplyFromTM(TMx); TMx.Dispose(); } @@ -115,7 +115,7 @@ private void Button11_Click(object sender, EventArgs e) private void Button9_Click(object sender, EventArgs e) { - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyFromTM(TMx); TMx.Dispose(); } @@ -136,7 +136,7 @@ private void Button7_Click(object sender, EventArgs e) private void Button10_Click(object sender, EventArgs e) { Cursor = Cursors.WaitCursor; - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyToTM(TMx); ApplyToTM(Program.TM); TMx.LogonUIXP.Apply(); diff --git a/WinPaletter/MainFrm.Designer.cs b/WinPaletter/MainFrm.Designer.cs index 552cad50..2c90daf4 100644 --- a/WinPaletter/MainFrm.Designer.cs +++ b/WinPaletter/MainFrm.Designer.cs @@ -1440,7 +1440,7 @@ private void InitializeComponent() this.W11_Color_Index7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W11_Color_Index7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W11_Color_Index7.DefaultColor = System.Drawing.Color.Black; + this.W11_Color_Index7.DefaultBackColor = System.Drawing.Color.Black; this.W11_Color_Index7.DontShowInfo = false; this.W11_Color_Index7.Location = new System.Drawing.Point(420, 4); this.W11_Color_Index7.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1509,7 +1509,7 @@ private void InitializeComponent() this.W11_Color_Index6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W11_Color_Index6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W11_Color_Index6.DefaultColor = System.Drawing.Color.Black; + this.W11_Color_Index6.DefaultBackColor = System.Drawing.Color.Black; this.W11_Color_Index6.DontShowInfo = false; this.W11_Color_Index6.Location = new System.Drawing.Point(420, 4); this.W11_Color_Index6.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1578,7 +1578,7 @@ private void InitializeComponent() this.W11_Color_Index5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W11_Color_Index5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W11_Color_Index5.DefaultColor = System.Drawing.Color.Black; + this.W11_Color_Index5.DefaultBackColor = System.Drawing.Color.Black; this.W11_Color_Index5.DontShowInfo = false; this.W11_Color_Index5.Location = new System.Drawing.Point(420, 4); this.W11_Color_Index5.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1647,7 +1647,7 @@ private void InitializeComponent() this.W11_Color_Index2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W11_Color_Index2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W11_Color_Index2.DefaultColor = System.Drawing.Color.Black; + this.W11_Color_Index2.DefaultBackColor = System.Drawing.Color.Black; this.W11_Color_Index2.DontShowInfo = false; this.W11_Color_Index2.Location = new System.Drawing.Point(420, 4); this.W11_Color_Index2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1727,7 +1727,7 @@ private void InitializeComponent() this.W11_Color_Index4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W11_Color_Index4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W11_Color_Index4.DefaultColor = System.Drawing.Color.Black; + this.W11_Color_Index4.DefaultBackColor = System.Drawing.Color.Black; this.W11_Color_Index4.DontShowInfo = false; this.W11_Color_Index4.Location = new System.Drawing.Point(420, 4); this.W11_Color_Index4.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1782,7 +1782,7 @@ private void InitializeComponent() this.W11_TaskbarFrontAndFoldersOnStart_pick.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W11_TaskbarFrontAndFoldersOnStart_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W11_TaskbarFrontAndFoldersOnStart_pick.DefaultColor = System.Drawing.Color.Black; + this.W11_TaskbarFrontAndFoldersOnStart_pick.DefaultBackColor = System.Drawing.Color.Black; this.W11_TaskbarFrontAndFoldersOnStart_pick.DontShowInfo = false; this.W11_TaskbarFrontAndFoldersOnStart_pick.Location = new System.Drawing.Point(420, 4); this.W11_TaskbarFrontAndFoldersOnStart_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1851,7 +1851,7 @@ private void InitializeComponent() this.W11_Color_Index1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W11_Color_Index1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W11_Color_Index1.DefaultColor = System.Drawing.Color.Black; + this.W11_Color_Index1.DefaultBackColor = System.Drawing.Color.Black; this.W11_Color_Index1.DontShowInfo = false; this.W11_Color_Index1.Location = new System.Drawing.Point(420, 4); this.W11_Color_Index1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1923,7 +1923,7 @@ private void InitializeComponent() this.W11_Color_Index0.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W11_Color_Index0.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W11_Color_Index0.DefaultColor = System.Drawing.Color.Black; + this.W11_Color_Index0.DefaultBackColor = System.Drawing.Color.Black; this.W11_Color_Index0.DontShowInfo = false; this.W11_Color_Index0.Location = new System.Drawing.Point(420, 4); this.W11_Color_Index0.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -2016,7 +2016,7 @@ private void InitializeComponent() this.W11_Color_Index3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W11_Color_Index3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W11_Color_Index3.DefaultColor = System.Drawing.Color.Black; + this.W11_Color_Index3.DefaultBackColor = System.Drawing.Color.Black; this.W11_Color_Index3.DontShowInfo = false; this.W11_Color_Index3.Location = new System.Drawing.Point(420, 4); this.W11_Color_Index3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -2397,7 +2397,7 @@ private void InitializeComponent() this.W11_InactiveTitlebar_pick.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W11_InactiveTitlebar_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W11_InactiveTitlebar_pick.DefaultColor = System.Drawing.Color.Black; + this.W11_InactiveTitlebar_pick.DefaultBackColor = System.Drawing.Color.Black; this.W11_InactiveTitlebar_pick.DontShowInfo = false; this.W11_InactiveTitlebar_pick.Location = new System.Drawing.Point(162, 4); this.W11_InactiveTitlebar_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -2475,7 +2475,7 @@ private void InitializeComponent() this.W11_ActiveTitlebar_pick.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W11_ActiveTitlebar_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W11_ActiveTitlebar_pick.DefaultColor = System.Drawing.Color.Black; + this.W11_ActiveTitlebar_pick.DefaultBackColor = System.Drawing.Color.Black; this.W11_ActiveTitlebar_pick.DontShowInfo = false; this.W11_ActiveTitlebar_pick.Location = new System.Drawing.Point(162, 4); this.W11_ActiveTitlebar_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -2607,7 +2607,7 @@ private void InitializeComponent() this.W10_Color_Index7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W10_Color_Index7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W10_Color_Index7.DefaultColor = System.Drawing.Color.Black; + this.W10_Color_Index7.DefaultBackColor = System.Drawing.Color.Black; this.W10_Color_Index7.DontShowInfo = false; this.W10_Color_Index7.Location = new System.Drawing.Point(420, 4); this.W10_Color_Index7.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -2676,7 +2676,7 @@ private void InitializeComponent() this.W10_Color_Index6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W10_Color_Index6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W10_Color_Index6.DefaultColor = System.Drawing.Color.Black; + this.W10_Color_Index6.DefaultBackColor = System.Drawing.Color.Black; this.W10_Color_Index6.DontShowInfo = false; this.W10_Color_Index6.Location = new System.Drawing.Point(420, 4); this.W10_Color_Index6.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -2745,7 +2745,7 @@ private void InitializeComponent() this.W10_Color_Index5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W10_Color_Index5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W10_Color_Index5.DefaultColor = System.Drawing.Color.Black; + this.W10_Color_Index5.DefaultBackColor = System.Drawing.Color.Black; this.W10_Color_Index5.DontShowInfo = false; this.W10_Color_Index5.Location = new System.Drawing.Point(420, 4); this.W10_Color_Index5.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -2814,7 +2814,7 @@ private void InitializeComponent() this.W10_Color_Index2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W10_Color_Index2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W10_Color_Index2.DefaultColor = System.Drawing.Color.Black; + this.W10_Color_Index2.DefaultBackColor = System.Drawing.Color.Black; this.W10_Color_Index2.DontShowInfo = false; this.W10_Color_Index2.Location = new System.Drawing.Point(420, 4); this.W10_Color_Index2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -2894,7 +2894,7 @@ private void InitializeComponent() this.W10_Color_Index4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W10_Color_Index4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W10_Color_Index4.DefaultColor = System.Drawing.Color.Black; + this.W10_Color_Index4.DefaultBackColor = System.Drawing.Color.Black; this.W10_Color_Index4.DontShowInfo = false; this.W10_Color_Index4.Location = new System.Drawing.Point(420, 4); this.W10_Color_Index4.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -2949,7 +2949,7 @@ private void InitializeComponent() this.W10_TaskbarFrontAndFoldersOnStart_pick.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W10_TaskbarFrontAndFoldersOnStart_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W10_TaskbarFrontAndFoldersOnStart_pick.DefaultColor = System.Drawing.Color.Black; + this.W10_TaskbarFrontAndFoldersOnStart_pick.DefaultBackColor = System.Drawing.Color.Black; this.W10_TaskbarFrontAndFoldersOnStart_pick.DontShowInfo = false; this.W10_TaskbarFrontAndFoldersOnStart_pick.Location = new System.Drawing.Point(420, 4); this.W10_TaskbarFrontAndFoldersOnStart_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -3018,7 +3018,7 @@ private void InitializeComponent() this.W10_Color_Index1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W10_Color_Index1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W10_Color_Index1.DefaultColor = System.Drawing.Color.Black; + this.W10_Color_Index1.DefaultBackColor = System.Drawing.Color.Black; this.W10_Color_Index1.DontShowInfo = false; this.W10_Color_Index1.Location = new System.Drawing.Point(420, 4); this.W10_Color_Index1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -3090,7 +3090,7 @@ private void InitializeComponent() this.W10_Color_Index0.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W10_Color_Index0.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W10_Color_Index0.DefaultColor = System.Drawing.Color.Black; + this.W10_Color_Index0.DefaultBackColor = System.Drawing.Color.Black; this.W10_Color_Index0.DontShowInfo = false; this.W10_Color_Index0.Location = new System.Drawing.Point(420, 4); this.W10_Color_Index0.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -3183,7 +3183,7 @@ private void InitializeComponent() this.W10_Color_Index3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W10_Color_Index3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W10_Color_Index3.DefaultColor = System.Drawing.Color.Black; + this.W10_Color_Index3.DefaultBackColor = System.Drawing.Color.Black; this.W10_Color_Index3.DontShowInfo = false; this.W10_Color_Index3.Location = new System.Drawing.Point(420, 4); this.W10_Color_Index3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -3645,7 +3645,7 @@ private void InitializeComponent() this.W10_InactiveTitlebar_pick.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W10_InactiveTitlebar_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W10_InactiveTitlebar_pick.DefaultColor = System.Drawing.Color.Black; + this.W10_InactiveTitlebar_pick.DefaultBackColor = System.Drawing.Color.Black; this.W10_InactiveTitlebar_pick.DontShowInfo = false; this.W10_InactiveTitlebar_pick.Location = new System.Drawing.Point(162, 4); this.W10_InactiveTitlebar_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -3723,7 +3723,7 @@ private void InitializeComponent() this.W10_ActiveTitlebar_pick.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.W10_ActiveTitlebar_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W10_ActiveTitlebar_pick.DefaultColor = System.Drawing.Color.Black; + this.W10_ActiveTitlebar_pick.DefaultBackColor = System.Drawing.Color.Black; this.W10_ActiveTitlebar_pick.DontShowInfo = false; this.W10_ActiveTitlebar_pick.Location = new System.Drawing.Point(162, 4); this.W10_ActiveTitlebar_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -3962,7 +3962,7 @@ private void InitializeComponent() this.W81_personalcolor_accent_pick.AllowDrop = true; this.W81_personalcolor_accent_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.W81_personalcolor_accent_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W81_personalcolor_accent_pick.DefaultColor = System.Drawing.Color.Black; + this.W81_personalcolor_accent_pick.DefaultBackColor = System.Drawing.Color.Black; this.W81_personalcolor_accent_pick.DontShowInfo = false; this.W81_personalcolor_accent_pick.Location = new System.Drawing.Point(401, 4); this.W81_personalcolor_accent_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -4016,7 +4016,7 @@ private void InitializeComponent() this.W81_personalcls_background_pick.AllowDrop = true; this.W81_personalcls_background_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.W81_personalcls_background_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W81_personalcls_background_pick.DefaultColor = System.Drawing.Color.Black; + this.W81_personalcls_background_pick.DefaultBackColor = System.Drawing.Color.Black; this.W81_personalcls_background_pick.DontShowInfo = false; this.W81_personalcls_background_pick.Location = new System.Drawing.Point(401, 4); this.W81_personalcls_background_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -4070,7 +4070,7 @@ private void InitializeComponent() this.W81_start_pick.AllowDrop = true; this.W81_start_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.W81_start_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W81_start_pick.DefaultColor = System.Drawing.Color.Black; + this.W81_start_pick.DefaultBackColor = System.Drawing.Color.Black; this.W81_start_pick.DontShowInfo = false; this.W81_start_pick.Location = new System.Drawing.Point(401, 4); this.W81_start_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -4157,7 +4157,7 @@ private void InitializeComponent() this.W81_ColorizationColor_pick.AllowDrop = true; this.W81_ColorizationColor_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.W81_ColorizationColor_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W81_ColorizationColor_pick.DefaultColor = System.Drawing.Color.Black; + this.W81_ColorizationColor_pick.DefaultBackColor = System.Drawing.Color.Black; this.W81_ColorizationColor_pick.DontShowInfo = false; this.W81_ColorizationColor_pick.Location = new System.Drawing.Point(401, 4); this.W81_ColorizationColor_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -4211,7 +4211,7 @@ private void InitializeComponent() this.W81_accent_pick.AllowDrop = true; this.W81_accent_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.W81_accent_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W81_accent_pick.DefaultColor = System.Drawing.Color.Black; + this.W81_accent_pick.DefaultBackColor = System.Drawing.Color.Black; this.W81_accent_pick.DontShowInfo = false; this.W81_accent_pick.Location = new System.Drawing.Point(401, 4); this.W81_accent_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -4801,7 +4801,7 @@ private void InitializeComponent() this.W7_ColorizationColor_pick.AllowDrop = true; this.W7_ColorizationColor_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.W7_ColorizationColor_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W7_ColorizationColor_pick.DefaultColor = System.Drawing.Color.Black; + this.W7_ColorizationColor_pick.DefaultBackColor = System.Drawing.Color.Black; this.W7_ColorizationColor_pick.DontShowInfo = false; this.W7_ColorizationColor_pick.Location = new System.Drawing.Point(401, 3); this.W7_ColorizationColor_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -4875,7 +4875,7 @@ private void InitializeComponent() this.W7_ColorizationAfterglow_pick.AllowDrop = true; this.W7_ColorizationAfterglow_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.W7_ColorizationAfterglow_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.W7_ColorizationAfterglow_pick.DefaultColor = System.Drawing.Color.Black; + this.W7_ColorizationAfterglow_pick.DefaultBackColor = System.Drawing.Color.Black; this.W7_ColorizationAfterglow_pick.DontShowInfo = false; this.W7_ColorizationAfterglow_pick.Location = new System.Drawing.Point(401, 4); this.W7_ColorizationAfterglow_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -5006,7 +5006,7 @@ private void InitializeComponent() this.WVista_ColorizationColor_pick.AllowDrop = true; this.WVista_ColorizationColor_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.WVista_ColorizationColor_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.WVista_ColorizationColor_pick.DefaultColor = System.Drawing.Color.Black; + this.WVista_ColorizationColor_pick.DefaultBackColor = System.Drawing.Color.Black; this.WVista_ColorizationColor_pick.DontShowInfo = false; this.WVista_ColorizationColor_pick.Location = new System.Drawing.Point(404, 38); this.WVista_ColorizationColor_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); diff --git a/WinPaletter/MainFrm.cs b/WinPaletter/MainFrm.cs index cdd25295..0fb0b131 100644 --- a/WinPaletter/MainFrm.cs +++ b/WinPaletter/MainFrm.cs @@ -14,7 +14,6 @@ namespace WinPaletter { - public partial class MainFrm { private bool _Shown = false; @@ -87,7 +86,7 @@ public void LoadFromTM(Theme.Manager TM) Appearance.CustomColors = TM.AppTheme.Enabled; Appearance.BackColor = TM.AppTheme.BackColor; Appearance.AccentColor = TM.AppTheme.AccentColor; - Appearance.CustomTheme = TM.AppTheme.DarkMode; + Appearance.CustomTheme_DarkMode = TM.AppTheme.DarkMode; Appearance.RoundedCorners = TM.AppTheme.RoundCorners; ApplyStyle(this); @@ -302,40 +301,40 @@ public void ApplyDefaultTMValues() { using (Theme.Manager DefTM = Theme.Default.Get()) { - W11_ActiveTitlebar_pick.DefaultColor = DefTM.Windows11.Titlebar_Active; - W11_InactiveTitlebar_pick.DefaultColor = DefTM.Windows11.Titlebar_Inactive; - W11_Color_Index5.DefaultColor = DefTM.Windows11.StartMenu_Accent; - W11_Color_Index4.DefaultColor = DefTM.Windows11.Color_Index2; - W11_Color_Index6.DefaultColor = DefTM.Windows11.Color_Index6; - W11_Color_Index1.DefaultColor = DefTM.Windows11.Color_Index1; - W11_Color_Index2.DefaultColor = DefTM.Windows11.Color_Index4; - W11_TaskbarFrontAndFoldersOnStart_pick.DefaultColor = DefTM.Windows11.Color_Index5; - W11_Color_Index0.DefaultColor = DefTM.Windows11.Color_Index0; - W11_Color_Index3.DefaultColor = DefTM.Windows11.Color_Index3; - W11_Color_Index7.DefaultColor = DefTM.Windows11.Color_Index7; - - W10_ActiveTitlebar_pick.DefaultColor = DefTM.Windows10.Titlebar_Active; - W10_InactiveTitlebar_pick.DefaultColor = DefTM.Windows10.Titlebar_Inactive; - W10_Color_Index5.DefaultColor = DefTM.Windows10.StartMenu_Accent; - W10_Color_Index4.DefaultColor = DefTM.Windows10.Color_Index2; - W10_Color_Index6.DefaultColor = DefTM.Windows10.Color_Index6; - W10_Color_Index1.DefaultColor = DefTM.Windows10.Color_Index1; - W10_Color_Index2.DefaultColor = DefTM.Windows10.Color_Index4; - W10_TaskbarFrontAndFoldersOnStart_pick.DefaultColor = DefTM.Windows10.Color_Index5; - W10_Color_Index0.DefaultColor = DefTM.Windows10.Color_Index0; - W10_Color_Index3.DefaultColor = DefTM.Windows10.Color_Index3; - W10_Color_Index7.DefaultColor = DefTM.Windows10.Color_Index7; - - W81_ColorizationColor_pick.DefaultColor = DefTM.Windows7.ColorizationColor; - W81_start_pick.DefaultColor = DefTM.Windows81.StartColor; - W81_accent_pick.DefaultColor = DefTM.Windows81.AccentColor; - W81_personalcls_background_pick.DefaultColor = DefTM.Windows81.PersonalColors_Background; - W81_personalcolor_accent_pick.DefaultColor = DefTM.Windows81.PersonalColors_Accent; - - W7_ColorizationColor_pick.DefaultColor = DefTM.Windows7.ColorizationColor; - W7_ColorizationAfterglow_pick.DefaultColor = DefTM.Windows7.ColorizationAfterglow; - - WVista_ColorizationColor_pick.DefaultColor = DefTM.WindowsVista.ColorizationColor; + W11_ActiveTitlebar_pick.DefaultBackColor = DefTM.Windows11.Titlebar_Active; + W11_InactiveTitlebar_pick.DefaultBackColor = DefTM.Windows11.Titlebar_Inactive; + W11_Color_Index5.DefaultBackColor = DefTM.Windows11.StartMenu_Accent; + W11_Color_Index4.DefaultBackColor = DefTM.Windows11.Color_Index2; + W11_Color_Index6.DefaultBackColor = DefTM.Windows11.Color_Index6; + W11_Color_Index1.DefaultBackColor = DefTM.Windows11.Color_Index1; + W11_Color_Index2.DefaultBackColor = DefTM.Windows11.Color_Index4; + W11_TaskbarFrontAndFoldersOnStart_pick.DefaultBackColor = DefTM.Windows11.Color_Index5; + W11_Color_Index0.DefaultBackColor = DefTM.Windows11.Color_Index0; + W11_Color_Index3.DefaultBackColor = DefTM.Windows11.Color_Index3; + W11_Color_Index7.DefaultBackColor = DefTM.Windows11.Color_Index7; + + W10_ActiveTitlebar_pick.DefaultBackColor = DefTM.Windows10.Titlebar_Active; + W10_InactiveTitlebar_pick.DefaultBackColor = DefTM.Windows10.Titlebar_Inactive; + W10_Color_Index5.DefaultBackColor = DefTM.Windows10.StartMenu_Accent; + W10_Color_Index4.DefaultBackColor = DefTM.Windows10.Color_Index2; + W10_Color_Index6.DefaultBackColor = DefTM.Windows10.Color_Index6; + W10_Color_Index1.DefaultBackColor = DefTM.Windows10.Color_Index1; + W10_Color_Index2.DefaultBackColor = DefTM.Windows10.Color_Index4; + W10_TaskbarFrontAndFoldersOnStart_pick.DefaultBackColor = DefTM.Windows10.Color_Index5; + W10_Color_Index0.DefaultBackColor = DefTM.Windows10.Color_Index0; + W10_Color_Index3.DefaultBackColor = DefTM.Windows10.Color_Index3; + W10_Color_Index7.DefaultBackColor = DefTM.Windows10.Color_Index7; + + W81_ColorizationColor_pick.DefaultBackColor = DefTM.Windows7.ColorizationColor; + W81_start_pick.DefaultBackColor = DefTM.Windows81.StartColor; + W81_accent_pick.DefaultBackColor = DefTM.Windows81.AccentColor; + W81_personalcls_background_pick.DefaultBackColor = DefTM.Windows81.PersonalColors_Background; + W81_personalcolor_accent_pick.DefaultBackColor = DefTM.Windows81.PersonalColors_Accent; + + W7_ColorizationColor_pick.DefaultBackColor = DefTM.Windows7.ColorizationColor; + W7_ColorizationAfterglow_pick.DefaultBackColor = DefTM.Windows7.ColorizationAfterglow; + + WVista_ColorizationColor_pick.DefaultBackColor = DefTM.WindowsVista.ColorizationColor; } } @@ -451,7 +450,7 @@ private void BackgroundWorker1_DoWork(object sender, DoWorkEventArgs e) { try { - var WebCL = new WebClient(); + WebClient WebCL = new(); RaiseUpdate = false; ver = string.Empty; @@ -531,7 +530,7 @@ private void MainFrm_Load(object sender, EventArgs e) NotifyUpdates.Icon = Icon; - Size = new Size(Conversions.ToInteger(Program.Settings.General.MainFormWidth), Conversions.ToInteger(Program.Settings.General.MainFormHeight)); + Size = new(Conversions.ToInteger(Program.Settings.General.MainFormWidth), Conversions.ToInteger(Program.Settings.General.MainFormHeight)); WindowState = (FormWindowState)Conversions.ToInteger(Program.Settings.General.MainFormStatus); Select_W11.Image = Properties.Resources.Native11; @@ -599,7 +598,7 @@ private void MainFrm_Load(object sender, EventArgs e) LoadData(); WXP_Alert2.Size = WXP_Alert2.Parent.Size - new Size(40, 40); - WXP_Alert2.Location = new Point(20, 20); + WXP_Alert2.Location = new(20, 20); Visible = true; @@ -692,13 +691,13 @@ private void MainFrm_FormClosed(object sender, FormClosedEventArgs e) } Program.Settings.General.Save(); - var old = new Settings(Settings.Mode.Registry); + Settings old = new(Settings.Mode.Registry); { ref Settings.Structures.Appearance Appearance = ref Program.Settings.Appearance; Appearance.CustomColors = old.Appearance.CustomColors; Appearance.BackColor = old.Appearance.BackColor; Appearance.AccentColor = old.Appearance.AccentColor; - Appearance.CustomTheme = old.Appearance.CustomTheme; + Appearance.CustomTheme_DarkMode = old.Appearance.CustomTheme_DarkMode; Appearance.RoundedCorners = old.Appearance.RoundedCorners; Appearance.Save(); } @@ -846,9 +845,9 @@ private void W11_ActiveTitlebar_pick_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender, Window1 }; + List CList = new() { (Control)sender, Window1 }; - var C = Forms.ColorPickerDlg.Pick(CList); + Color C = Forms.ColorPickerDlg.Pick(CList); Program.TM.Windows11.Titlebar_Active = Color.FromArgb(255, C); if (Program.PreviewStyle == WindowStyle.W11) ApplyColorsToElements(Program.TM); @@ -874,10 +873,10 @@ private void W11_InactiveTitlebar_pick_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender, Window2 }; + List CList = new() { (Control)sender, Window2 }; - var _Conditions = new Conditions() { Window_InactiveTitlebar = true }; - var C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Conditions _conditions = new(){ Window_InactiveTitlebar = true }; + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions); Program.TM.Windows11.Titlebar_Inactive = Color.FromArgb(255, C); @@ -989,7 +988,7 @@ private void W11_Color_Index1_Click(object sender, EventArgs e) return; } - var CList = new List(); + List CList = new(); Color C; CList.Add((Control)sender); @@ -1000,13 +999,13 @@ private void W11_Color_Index1_Click(object sender, EventArgs e) if (!Program.TM.Windows11.WinMode_Light) { CList.Add(ActionCenter); - var _Conditions = new Conditions() { AppUnderlineOnly = true, ActionCenterBtn = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Conditions _conditions = new(){ AppUnderlineOnly = true, ActionCenterBtn = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); } else { - var _Conditions = new Conditions() { AppUnderlineWithTaskbar = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Conditions _conditions = new(){ AppUnderlineWithTaskbar = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); } } else if (!Program.TM.Windows11.WinMode_Light) @@ -1014,8 +1013,8 @@ private void W11_Color_Index1_Click(object sender, EventArgs e) CList.Add(ActionCenter); CList.Add(taskbar); - var _Conditions = new Conditions() { AppUnderlineOnly = true, ActionCenterBtn = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Conditions _conditions = new(){ AppUnderlineOnly = true, ActionCenterBtn = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); } else { @@ -1046,7 +1045,7 @@ private void W11_TaskbarFrontAndFoldersOnStart_pick_Click(object sender, EventAr return; } - var CList = new List() { (Control)sender }; + List CList = new() { (Control)sender }; if (ExplorerPatcher.IsAllowed()) { @@ -1077,7 +1076,7 @@ private void W11_TaskbarFrontAndFoldersOnStart_pick_Click(object sender, EventAr CList.Add(lnk_preview); } - var C = Forms.ColorPickerDlg.Pick(CList); + Color C = Forms.ColorPickerDlg.Pick(CList); Program.TM.Windows11.Color_Index5 = Color.FromArgb(255, C); if (Program.PreviewStyle == WindowStyle.W11) ApplyColorsToElements(Program.TM); @@ -1102,7 +1101,7 @@ private void W11_Color_Index0_Click(object sender, EventArgs e) return; } - var CList = new List(); + List CList = new(); Color C; CList.Add((Control)sender); @@ -1116,8 +1115,8 @@ private void W11_Color_Index0_Click(object sender, EventArgs e) else { CList.Add(lnk_preview); - var _Conditions = new Conditions() { AppUnderlineOnly = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Conditions _conditions = new(){ AppUnderlineOnly = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); } Program.TM.Windows11.Color_Index0 = Color.FromArgb(255, C); @@ -1145,15 +1144,15 @@ private void W11_Color_Index3_Click(object sender, EventArgs e) return; } - var CList = new List(); + List CList = new(); Color C; CList.Add((Control)sender); CList.Add(taskbar); CList.Add(setting_icon_preview); - var _Conditions = new Conditions() { AppUnderlineOnly = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Conditions _conditions = new(){ AppUnderlineOnly = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); Program.TM.Windows11.Color_Index3 = Color.FromArgb(255, C); if (Program.PreviewStyle == WindowStyle.W11) @@ -1179,19 +1178,19 @@ private void W11_Color_Index6_Click(object sender, EventArgs e) return; } - var CList = new List(); + List CList = new(); Color C; CList.Add((Control)sender); - var _Conditions = new Conditions(); + Conditions _conditions = new(); if (!ExplorerPatcher.IsAllowed()) { CList.Add(taskbar); - _Conditions = new Conditions() { AppBackgroundOnly = true }; + _conditions = new() { AppBackgroundOnly = true }; } - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + C = Forms.ColorPickerDlg.Pick(CList, _conditions); Program.TM.Windows11.Color_Index6 = Color.FromArgb(255, C); if (Program.PreviewStyle == WindowStyle.W11) @@ -1218,9 +1217,9 @@ private void W11_Color_Index5_Click(object sender, EventArgs e) } - var CList = new List() { (Control)sender }; + List CList = new() { (Control)sender }; - var C = Forms.ColorPickerDlg.Pick(CList); + Color C = Forms.ColorPickerDlg.Pick(CList); Program.TM.Windows11.StartMenu_Accent = Color.FromArgb(255, C); if (Program.PreviewStyle == WindowStyle.W11) ApplyColorsToElements(Program.TM); @@ -1247,9 +1246,9 @@ private void W11_Color_Index4_pick_Click(object sender, EventArgs e) } - var CList = new List() { (Control)sender }; + List CList = new() { (Control)sender }; - var C = Forms.ColorPickerDlg.Pick(CList); + Color C = Forms.ColorPickerDlg.Pick(CList); Program.TM.Windows11.Color_Index2 = Color.FromArgb(255, C); if (Program.PreviewStyle == WindowStyle.W11) ApplyColorsToElements(Program.TM); @@ -1275,7 +1274,7 @@ private void W11_Color_Index2_Click(object sender, EventArgs e) } - var CList = new List() { (Control)sender }; + List CList = new() { (Control)sender }; Color C; @@ -1291,15 +1290,15 @@ private void W11_Color_Index2_Click(object sender, EventArgs e) { CList.Add(ActionCenter); - var _Conditions = new Conditions() { ActionCenterBtn = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Conditions _conditions = new(){ ActionCenterBtn = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); } else { CList.Add(start); - var _Conditions = new Conditions() { StartColorOnly = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Conditions _conditions = new(){ StartColorOnly = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); } } @@ -1308,16 +1307,16 @@ private void W11_Color_Index2_Click(object sender, EventArgs e) CList.Add(ActionCenter); CList.Add(taskbar); - var _Conditions = new Conditions() { AppUnderlineOnly = true, ActionCenterBtn = true }; + Conditions _conditions = new(){ AppUnderlineOnly = true, ActionCenterBtn = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + C = Forms.ColorPickerDlg.Pick(CList, _conditions); } else { CList.Add(start); - var _Conditions = new Conditions() { StartColorOnly = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Conditions _conditions = new(){ StartColorOnly = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); } @@ -1340,8 +1339,8 @@ private void W11_Color_Index7_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender }; - var C = Forms.ColorPickerDlg.Pick(CList); + List CList = new() { (Control)sender }; + Color C = Forms.ColorPickerDlg.Pick(CList); Program.TM.Windows11.Color_Index7 = Color.FromArgb(255, C); @@ -1401,10 +1400,10 @@ private void W10_ActiveTitlebar_pick_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender, Window1 }; + List CList = new() { (Control)sender, Window1 }; - var _Conditions = new Conditions() { Window_ActiveTitlebar = true }; - var C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Conditions _conditions = new(){ Window_ActiveTitlebar = true }; + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions); Program.TM.Windows10.Titlebar_Active = Color.FromArgb(255, C); if (Program.PreviewStyle == WindowStyle.W10) @@ -1430,10 +1429,10 @@ private void W10_InactiveTitlebar_pick_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender, Window2 }; + List CList = new() { (Control)sender, Window2 }; - var _Conditions = new Conditions() { Window_InactiveTitlebar = true }; - var C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Conditions _conditions = new(){ Window_InactiveTitlebar = true }; + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions); Program.TM.Windows10.Titlebar_Inactive = Color.FromArgb(255, C); @@ -1555,18 +1554,18 @@ private void W10_Color_Index1_Click(object sender, EventArgs e) return; } - var CList = new List(); + List CList = new(); Color C; CList.Add((Control)sender); - var _Conditions = new Conditions(); + Conditions _conditions = new(); switch (!Program.TM.Windows10.WinMode_Light) { case true: { CList.Add(taskbar); // 'AppUnderline - _Conditions.AppUnderlineOnly = true; + _conditions.AppUnderlineOnly = true; break; } case false: @@ -1574,14 +1573,14 @@ private void W10_Color_Index1_Click(object sender, EventArgs e) if (Program.TM.Windows10.ApplyAccentOnTaskbar != Theme.Structures.Windows10x.AccentTaskbarLevels.None) { CList.Add(taskbar); // 'AppUnderline - _Conditions.AppUnderlineOnly = true; + _conditions.AppUnderlineOnly = true; } break; } } - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + C = Forms.ColorPickerDlg.Pick(CList, _conditions); Program.TM.Windows10.Color_Index1 = Color.FromArgb(255, C); if (Program.PreviewStyle == WindowStyle.W10) @@ -1607,7 +1606,7 @@ private void W10_TaskbarFrontAndFoldersOnStart_pick_Click(object sender, EventAr return; } - var CList = new List() { (Control)sender }; + List CList = new() { (Control)sender }; if (Program.TM.Windows10.Transparency) { @@ -1618,7 +1617,7 @@ private void W10_TaskbarFrontAndFoldersOnStart_pick_Click(object sender, EventAr CList.Add(taskbar); } - var C = Forms.ColorPickerDlg.Pick(CList); + Color C = Forms.ColorPickerDlg.Pick(CList); Program.TM.Windows10.Color_Index5 = Color.FromArgb(255, C); if (Program.PreviewStyle == WindowStyle.W10) ApplyColorsToElements(Program.TM); @@ -1644,20 +1643,20 @@ private void W10_Color_Index0_Click(object sender, EventArgs e) return; } - var CList = new List(); + List CList = new(); Color C; CList.Add((Control)sender); - var _Conditions = new Conditions(); + Conditions _conditions = new(); switch (!Program.TM.Windows10.WinMode_Light) { case true: { CList.Add(ActionCenter); // 'Link - _Conditions.ActionCenterLink = true; + _conditions.ActionCenterLink = true; break; } @@ -1666,14 +1665,14 @@ private void W10_Color_Index0_Click(object sender, EventArgs e) if (Program.TM.Windows10.ApplyAccentOnTaskbar == Theme.Structures.Windows10x.AccentTaskbarLevels.Taskbar_Start_AC) { CList.Add(ActionCenter); // 'Link - _Conditions.ActionCenterLink = true; + _conditions.ActionCenterLink = true; } break; } } - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + C = Forms.ColorPickerDlg.Pick(CList, _conditions); Program.TM.Windows10.Color_Index0 = Color.FromArgb(255, C); if (Program.PreviewStyle == WindowStyle.W10) @@ -1700,12 +1699,12 @@ private void W10_Color_Index3_Click(object sender, EventArgs e) return; } - var CList = new List(); + List CList = new(); Color C; CList.Add((Control)sender); - var _Conditions = new Conditions(); + Conditions _conditions = new(); switch (!Program.TM.Windows10.WinMode_Light) { @@ -1715,12 +1714,12 @@ private void W10_Color_Index3_Click(object sender, EventArgs e) { CList.Add(setting_icon_preview); CList.Add(ActionCenter); - _Conditions.ActionCenterBtn = true; + _conditions.ActionCenterBtn = true; CList.Add(lnk_preview); if (Program.TM.Windows10.ApplyAccentOnTaskbar != Theme.Structures.Windows10x.AccentTaskbarLevels.None) { CList.Add(taskbar); // 'AppBackground - _Conditions.AppBackgroundOnly = true; + _conditions.AppBackgroundOnly = true; } } @@ -1728,7 +1727,7 @@ private void W10_Color_Index3_Click(object sender, EventArgs e) { CList.Add(setting_icon_preview); CList.Add(ActionCenter); - _Conditions.ActionCenterBtn = true; + _conditions.ActionCenterBtn = true; CList.Add(lnk_preview); } @@ -1738,21 +1737,21 @@ private void W10_Color_Index3_Click(object sender, EventArgs e) { CList.Add(setting_icon_preview); CList.Add(ActionCenter); - _Conditions.ActionCenterBtn = true; + _conditions.ActionCenterBtn = true; CList.Add(lnk_preview); if (Program.TM.Windows10.ApplyAccentOnTaskbar == Theme.Structures.Windows10x.AccentTaskbarLevels.None) { CList.Add(taskbar); // 'AppBackground - _Conditions.AppBackgroundOnly = true; - _Conditions.AppUnderlineOnly = true; + _conditions.AppBackgroundOnly = true; + _conditions.AppUnderlineOnly = true; } break; } } - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + C = Forms.ColorPickerDlg.Pick(CList, _conditions); Program.TM.Windows10.Color_Index3 = Color.FromArgb(255, C); if (Program.PreviewStyle == WindowStyle.W10) @@ -1778,12 +1777,12 @@ private void W10_Color_Index6_Click(object sender, EventArgs e) return; } - var CList = new List(); + List CList = new(); Color C; CList.Add((Control)sender); - var _Conditions = new Conditions(); + Conditions _conditions = new(); switch (!Program.TM.Windows10.WinMode_Light) { @@ -1808,14 +1807,14 @@ private void W10_Color_Index6_Click(object sender, EventArgs e) if (Program.TM.Windows10.ApplyAccentOnTaskbar != Theme.Structures.Windows10x.AccentTaskbarLevels.Taskbar_Start_AC) { CList.Add(ActionCenter); // 'ActionCenterLinks - _Conditions.ActionCenterLink = true; + _conditions.ActionCenterLink = true; } } else if (Program.TM.Windows10.ApplyAccentOnTaskbar != Theme.Structures.Windows10x.AccentTaskbarLevels.Taskbar_Start_AC) { CList.Add(ActionCenter); // 'ActionCenterLinks - _Conditions.ActionCenterLink = true; + _conditions.ActionCenterLink = true; } @@ -1823,7 +1822,7 @@ private void W10_Color_Index6_Click(object sender, EventArgs e) } } - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + C = Forms.ColorPickerDlg.Pick(CList, _conditions); Program.TM.Windows10.Color_Index6 = Color.FromArgb(255, C); if (Program.PreviewStyle == WindowStyle.W10) @@ -1850,10 +1849,10 @@ private void W10_Color_Index5_Click(object sender, EventArgs e) } - var CList = new List() { (Control)sender }; + List CList = new() { (Control)sender }; - var C = Forms.ColorPickerDlg.Pick(CList); + Color C = Forms.ColorPickerDlg.Pick(CList); Program.TM.Windows10.StartMenu_Accent = Color.FromArgb(255, C); if (Program.PreviewStyle == WindowStyle.W10) ApplyColorsToElements(Program.TM); @@ -1880,14 +1879,14 @@ private void W10_Color_Index4_pick_Click(object sender, EventArgs e) } - var CList = new List() { (Control)sender }; + List CList = new() { (Control)sender }; if (Program.PreviewStyle == WindowStyle.W10) { // ColorControls_List.Add(taskbar) 'Start Icon Hover } - var C = Forms.ColorPickerDlg.Pick(CList); + Color C = Forms.ColorPickerDlg.Pick(CList); Program.TM.Windows10.Color_Index2 = Color.FromArgb(255, C); if (Program.PreviewStyle == WindowStyle.W10) ApplyColorsToElements(Program.TM); @@ -1914,12 +1913,12 @@ private void W10_Color_Index2_Click(object sender, EventArgs e) } - var CList = new List() { (Control)sender }; + List CList = new() { (Control)sender }; Color C; - var _Conditions = new Conditions(); + Conditions _conditions = new(); switch (!Program.TM.Windows10.WinMode_Light) { @@ -1936,7 +1935,7 @@ private void W10_Color_Index2_Click(object sender, EventArgs e) CList.Add(start); CList.Add(ActionCenter); CList.Add(taskbar); // AppBackground - _Conditions.AppBackgroundOnly = true; + _conditions.AppBackgroundOnly = true; } break; @@ -1959,21 +1958,21 @@ private void W10_Color_Index2_Click(object sender, EventArgs e) CList.Add(start); CList.Add(ActionCenter); CList.Add(taskbar); // Start ButtonR Hover - _Conditions.StartColorOnly = true; + _conditions.StartColorOnly = true; } else { CList.Add(start); CList.Add(ActionCenter); CList.Add(taskbar); // AppBackground - _Conditions.AppBackgroundOnly = true; + _conditions.AppBackgroundOnly = true; } break; } } - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + C = Forms.ColorPickerDlg.Pick(CList, _conditions); Program.TM.Windows10.Color_Index4 = Color.FromArgb(255, C); if (Program.PreviewStyle == WindowStyle.W10) @@ -1993,8 +1992,8 @@ private void W10_Color_Index7_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender }; - var C = Forms.ColorPickerDlg.Pick(CList); + List CList = new() { (Control)sender }; + Color C = Forms.ColorPickerDlg.Pick(CList); Program.TM.Windows10.Color_Index7 = Color.FromArgb(255, C); @@ -2064,11 +2063,11 @@ private void W8_ColorizationColor_pick_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender, start, taskbar, Window1, Window2 }; + List CList = new() { (Control)sender, start, taskbar, Window1, Window2 }; - var _Conditions = new Conditions() { Window_ActiveTitlebar = true, Window_InactiveTitlebar = true, LivePreview_Colorization = true }; + Conditions _conditions = new(){ Window_ActiveTitlebar = true, Window_InactiveTitlebar = true, LivePreview_Colorization = true }; - var C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions); Program.TM.Windows81.ColorizationColor = Color.FromArgb(255, C); @@ -2106,9 +2105,9 @@ private void W8_start_pick_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender }; + List CList = new() { (Control)sender }; - var C = Forms.ColorPickerDlg.Pick(CList); + Color C = Forms.ColorPickerDlg.Pick(CList); Program.TM.Windows81.StartColor = Color.FromArgb(255, C); @@ -2135,9 +2134,9 @@ private void W8_accent_pick_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender }; + List CList = new() { (Control)sender }; - var C = Forms.ColorPickerDlg.Pick(CList); + Color C = Forms.ColorPickerDlg.Pick(CList); Program.TM.Windows81.AccentColor = Color.FromArgb(255, C); @@ -2164,9 +2163,9 @@ private void W8_personalcls_background_pick_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender }; + List CList = new() { (Control)sender }; - var C = Forms.ColorPickerDlg.Pick(CList); + Color C = Forms.ColorPickerDlg.Pick(CList); Program.TM.Windows81.PersonalColors_Background = Color.FromArgb(255, C); @@ -2193,9 +2192,9 @@ private void W8_personalcolor_accent_pick_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender }; + List CList = new() { (Control)sender }; - var C = Forms.ColorPickerDlg.Pick(CList); + Color C = Forms.ColorPickerDlg.Pick(CList); Program.TM.Windows81.PersonalColors_Accent = Color.FromArgb(255, C); @@ -2275,11 +2274,11 @@ private void W7_ColorizationColor_pick_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender, start, taskbar, Window1, Window2 }; + List CList = new() { (Control)sender, start, taskbar, Window1, Window2 }; - var _Conditions = new Conditions() { Win7 = true, Color1 = true, Background = true, LivePreview_Colorization = true }; + Conditions _conditions = new(){ Win7 = true, Color1 = true, Background = true, LivePreview_Colorization = true }; - var C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions); Program.TM.Windows7.ColorizationColor = Color.FromArgb(255, C); @@ -2305,11 +2304,11 @@ private void W7_ColorizationAfterglow_pick_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender, start, taskbar, Window1, Window2 }; + List CList = new() { (Control)sender, start, taskbar, Window1, Window2 }; - var _Conditions = new Conditions() { Win7 = true, Color2 = true, Background2 = true, LivePreview_AfterGlow = true }; + Conditions _conditions = new(){ Win7 = true, Color2 = true, Background2 = true, LivePreview_AfterGlow = true }; - var C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions); Program.TM.Windows7.ColorizationAfterglow = Color.FromArgb(255, C); @@ -2484,11 +2483,11 @@ private void WVista_ColorizationColor_pick_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender, start, taskbar, Window1, Window2 }; + List CList = new() { (Control)sender, start, taskbar, Window1, Window2 }; - var _Conditions = new Conditions() { Win7 = true, Color1 = true, Background = true, LivePreview_Colorization = true, LivePreview_AfterGlow = true }; + Conditions _conditions = new(){ Win7 = true, Color1 = true, Background = true, LivePreview_Colorization = true, LivePreview_AfterGlow = true }; - var C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions); Program.TM.WindowsVista.ColorizationColor = Color.FromArgb(255, C); @@ -2652,7 +2651,7 @@ private void TextBox1_TextChanged(object sender, EventArgs e) if ((System.IO.File.Exists(WXP_VS_textbox.Text) && System.IO.File.Exists(theme)) & !string.IsNullOrEmpty(theme)) { - var vs = new VisualStyleFile(theme); + VisualStyleFile vs = new(theme); WXP_VS_ColorsList.Items.Clear(); @@ -2751,7 +2750,7 @@ private void Button2_Click(object sender, EventArgs e) Forms.ComplexSave.GetResponse(SaveFileDialog1, () => Forms.ThemeLog.Apply_Theme(), () => Forms.ThemeLog.Apply_Theme(Program.TM_FirstTime), () => Forms.ThemeLog.Apply_Theme(Theme.Default.Get())); SaveFileDialog1.FileName = OpenFileDialog1.FileName; - Program.TM = new Theme.Manager(Theme.Manager.Source.File, OpenFileDialog1.FileName); + Program.TM = new(Theme.Manager.Source.File, OpenFileDialog1.FileName); Program.TM_Original = (Theme.Manager)Program.TM.Clone(); ApplyStylesToElements(Program.TM, false); @@ -2773,7 +2772,7 @@ private void Button3_Click(object sender, EventArgs e) Forms.ComplexSave.GetResponse(SaveFileDialog1, () => Forms.ThemeLog.Apply_Theme(), () => Forms.ThemeLog.Apply_Theme(Program.TM_FirstTime), () => Forms.ThemeLog.Apply_Theme(Theme.Default.Get())); - Program.TM = new Theme.Manager(Theme.Manager.Source.Registry); + Program.TM = new(Theme.Manager.Source.Registry); Program.TM_Original = (Theme.Manager)Program.TM.Clone(); SaveFileDialog1.FileName = null; ApplyStylesToElements(Program.TM, false); diff --git a/WinPaletter/Metrics_Fonts/Metrics_Fonts.cs b/WinPaletter/Metrics_Fonts/Metrics_Fonts.cs index 3bb4bc58..290b4532 100644 --- a/WinPaletter/Metrics_Fonts/Metrics_Fonts.cs +++ b/WinPaletter/Metrics_Fonts/Metrics_Fonts.cs @@ -130,7 +130,7 @@ private void EditFonts_Load(object sender, EventArgs e) AlertBox11.Text = Forms.MainFrm.WXP_Alert2.Text; AlertBox11.Visible = Forms.MainFrm.WXP_Alert2.Visible; AlertBox11.Size = AlertBox11.Parent.Size - new Size(40, 40); - AlertBox11.Location = new Point(20, 20); + AlertBox11.Location = new(20, 20); AlertBox12.Text = AlertBox11.Text; AlertBox12.Visible = AlertBox11.Visible; @@ -449,7 +449,7 @@ private void Button7_Click(object sender, EventArgs e) private void Button10_Click(object sender, EventArgs e) { Cursor = Cursors.WaitCursor; - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyToTM(TMx); ApplyToTM(Program.TM); SetModernWindowMetrics(TMx, Forms.MainFrm.Window1); @@ -632,7 +632,7 @@ private void Button11_Click(object sender, EventArgs e) { if (OpenFileDialog1.ShowDialog() == DialogResult.OK) { - var TMx = new Theme.Manager(Theme.Manager.Source.File, OpenFileDialog1.FileName); + Theme.Manager TMx = new(Theme.Manager.Source.File, OpenFileDialog1.FileName); ApplyFromTM(TMx); TMx.Dispose(); } @@ -640,7 +640,7 @@ private void Button11_Click(object sender, EventArgs e) private void Button9_Click(object sender, EventArgs e) { - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyFromTM(TMx); TMx.Dispose(); } @@ -775,7 +775,7 @@ private void Metrics_Fonts_FormClosed(object sender, FormClosedEventArgs e) private void Button14_Click_1(object sender, EventArgs e) { - var F = new Font(TextBox1.Text, 9f, FontStyle.Regular); + Font F = new(TextBox1.Text, 9f, FontStyle.Regular); FontDialog2.Font = F; if (FontDialog2.ShowDialog() == DialogResult.OK) { @@ -785,7 +785,7 @@ private void Button14_Click_1(object sender, EventArgs e) private void Button15_Click_1(object sender, EventArgs e) { - var F = new Font(TextBox2.Text, 9f, FontStyle.Regular); + Font F = new(TextBox2.Text, 9f, FontStyle.Regular); FontDialog2.Font = F; if (FontDialog2.ShowDialog() == DialogResult.OK) { @@ -795,7 +795,7 @@ private void Button15_Click_1(object sender, EventArgs e) private void Button17_Click(object sender, EventArgs e) { - var F = new Font(TextBox3.Text, 9f, FontStyle.Regular); + Font F = new(TextBox3.Text, 9f, FontStyle.Regular); FontDialog2.Font = F; if (FontDialog2.ShowDialog() == DialogResult.OK) { @@ -823,11 +823,11 @@ private void TextBox1_TextChanged(object sender, EventArgs e) if (Theme.Manager.IsFontInstalled(((UI.WP.TextBox)sender).Text.ToString(), FontStyle.Regular)) { - ((UI.WP.TextBox)sender).Font = new Font(((UI.WP.TextBox)sender).Text.ToString(), 9f, FontStyle.Regular); + ((UI.WP.TextBox)sender).Font = new(((UI.WP.TextBox)sender).Text.ToString(), 9f, FontStyle.Regular); } else { - ((UI.WP.TextBox)sender).Font = new Font("Microsoft Sans Serif", 9f, FontStyle.Regular); + ((UI.WP.TextBox)sender).Font = new("Microsoft Sans Serif", 9f, FontStyle.Regular); } } @@ -837,11 +837,11 @@ private void TextBox2_TextChanged(object sender, EventArgs e) if (Theme.Manager.IsFontInstalled(((UI.WP.TextBox)sender).Text.ToString(), FontStyle.Regular)) { - ((UI.WP.TextBox)sender).Font = new Font(((UI.WP.TextBox)sender).Text.ToString(), 9f, FontStyle.Regular); + ((UI.WP.TextBox)sender).Font = new(((UI.WP.TextBox)sender).Text.ToString(), 9f, FontStyle.Regular); } else { - ((UI.WP.TextBox)sender).Font = new Font("Tahoma", 9f, FontStyle.Regular); + ((UI.WP.TextBox)sender).Font = new("Tahoma", 9f, FontStyle.Regular); } } @@ -851,11 +851,11 @@ private void TextBox3_TextChanged(object sender, EventArgs e) if (Theme.Manager.IsFontInstalled(((UI.WP.TextBox)sender).Text.ToString(), FontStyle.Regular)) { - ((UI.WP.TextBox)sender).Font = new Font(((UI.WP.TextBox)sender).Text.ToString(), 9f, FontStyle.Regular); + ((UI.WP.TextBox)sender).Font = new(((UI.WP.TextBox)sender).Text.ToString(), 9f, FontStyle.Regular); } else { - ((UI.WP.TextBox)sender).Font = new Font("Segoe UI", 9f, FontStyle.Regular); + ((UI.WP.TextBox)sender).Font = new("Segoe UI", 9f, FontStyle.Regular); } } diff --git a/WinPaletter/Metrics_Fonts/VS2Metrics.cs b/WinPaletter/Metrics_Fonts/VS2Metrics.cs index ee46ed2b..b83a7d2d 100644 --- a/WinPaletter/Metrics_Fonts/VS2Metrics.cs +++ b/WinPaletter/Metrics_Fonts/VS2Metrics.cs @@ -45,7 +45,7 @@ private void Button8_Click(object sender, EventArgs e) if ((File.Exists(TextBox1.Text) && File.Exists(theme)) & !string.IsNullOrEmpty(theme)) { - var vs = new VisualStyleFile(theme); + VisualStyleFile vs = new(theme); LoadColors(vs.Metrics); Forms.Win32UI.ApplyRetroPreview(); Close(); diff --git a/WinPaletter/PaletteGenerator/PaletteGenerateDashboard.cs b/WinPaletter/PaletteGenerator/PaletteGenerateDashboard.cs index d076581d..d51886cf 100644 --- a/WinPaletter/PaletteGenerator/PaletteGenerateDashboard.cs +++ b/WinPaletter/PaletteGenerator/PaletteGenerateDashboard.cs @@ -15,11 +15,11 @@ protected override CreateParams CreateParams { get { - var cp = base.CreateParams; + CreateParams cp = base.CreateParams; if (!DWMAPI.IsCompositionEnabled()) { - cp.ClassStyle = cp.ClassStyle | DWMAPI.CS_DROPSHADOW; - cp.ExStyle = cp.ExStyle | 33554432; + cp.ClassStyle |= DWMAPI.CS_DROPSHADOW; + cp.ExStyle |= 33554432; return cp; } else diff --git a/WinPaletter/PaletteGenerator/PaletteGenerateFromColor.Designer.cs b/WinPaletter/PaletteGenerator/PaletteGenerateFromColor.Designer.cs index ac88634e..272e6d9f 100644 --- a/WinPaletter/PaletteGenerator/PaletteGenerateFromColor.Designer.cs +++ b/WinPaletter/PaletteGenerator/PaletteGenerateFromColor.Designer.cs @@ -231,7 +231,7 @@ private void InitializeComponent() // this.SelectedColor.AllowDrop = true; this.SelectedColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(38)))), ((int)(((byte)(53))))); - this.SelectedColor.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(38)))), ((int)(((byte)(53))))); + this.SelectedColor.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(38)))), ((int)(((byte)(53))))); this.SelectedColor.DontShowInfo = false; this.SelectedColor.Location = new System.Drawing.Point(106, 3); this.SelectedColor.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); diff --git a/WinPaletter/PaletteGenerator/PaletteGenerateFromColor.cs b/WinPaletter/PaletteGenerator/PaletteGenerateFromColor.cs index 82a30148..c3612faf 100644 --- a/WinPaletter/PaletteGenerator/PaletteGenerateFromColor.cs +++ b/WinPaletter/PaletteGenerator/PaletteGenerateFromColor.cs @@ -11,7 +11,7 @@ namespace WinPaletter public partial class PaletteGenerateFromColor { - private List Colors_List = new List(); + private List Colors_List = new(); private Theme.Manager TM_Backup; private bool PickerOpened = false; @@ -26,7 +26,7 @@ private void PaletteGenerateFromImage_Load(object sender, EventArgs e) this.LoadLanguage(); ApplyStyle(this); Icon = Forms.PaletteGenerateFromImage.Icon; - TM_Backup = new Theme.Manager(Theme.Manager.Source.Registry); + TM_Backup = new(Theme.Manager.Source.Registry); } private void SelectedColor_DragDrop(object sender, DragEventArgs e) { @@ -146,12 +146,12 @@ public void GetColors() foreach (Color c in Colors_List) { - UI.Controllers.ColorItem MiniColorItem = new UI.Controllers.ColorItem(); + UI.Controllers.ColorItem MiniColorItem = new(); MiniColorItem.Size = MiniColorItem.GetMiniColorItemSize(); MiniColorItem.AllowDrop = false; MiniColorItem.PauseColorsHistory = true; MiniColorItem.BackColor = c; - MiniColorItem.DefaultColor = MiniColorItem.BackColor; + MiniColorItem.DefaultBackColor = MiniColorItem.BackColor; ImgPaletteContainer.Controls.Add(MiniColorItem); } diff --git a/WinPaletter/PaletteGenerator/PaletteGenerateFromImage.cs b/WinPaletter/PaletteGenerator/PaletteGenerateFromImage.cs index 91ee45c7..e68c5c56 100644 --- a/WinPaletter/PaletteGenerator/PaletteGenerateFromImage.cs +++ b/WinPaletter/PaletteGenerator/PaletteGenerateFromImage.cs @@ -11,7 +11,7 @@ namespace WinPaletter public partial class PaletteGenerateFromImage { - private List Colors_List = new List(); + private List Colors_List = new(); private Theme.Manager TM_Backup; public PaletteGenerateFromImage() @@ -23,7 +23,7 @@ private void PaletteGenerateFromImage_Load(object sender, EventArgs e) { this.LoadLanguage(); ApplyStyle(this); - TM_Backup = new Theme.Manager(Theme.Manager.Source.Registry); + TM_Backup = new(Theme.Manager.Source.Registry); TextBox1.Text = Program.TM.Wallpaper.ImageFile; } @@ -131,8 +131,8 @@ public void GetColors(Bitmap Source) { Source = (Bitmap)Source.GetThumbnailImage(Forms.MainFrm.pnl_preview.Width, Forms.MainFrm.pnl_preview.Height, null, IntPtr.Zero); Colors_List.Clear(); - var ColorThiefX = new ColorThiefDotNet.ColorThief(); - var Colors = ColorThiefX.GetPalette(Source, Math.Max(13, Trackbar1.Value), Trackbar2.Value, CheckBox1.Checked); + ColorThiefDotNet.ColorThief ColorThiefX = new(); + List Colors = ColorThiefX.GetPalette(Source, Math.Max(13, Trackbar1.Value), Trackbar2.Value, CheckBox1.Checked); foreach (ColorThiefDotNet.QuantizedColor C in Colors) { @@ -172,12 +172,12 @@ public void GetColors(Bitmap Source) foreach (Color c in Colors_List) { - UI.Controllers.ColorItem MiniColorItem = new UI.Controllers.ColorItem(); + UI.Controllers.ColorItem MiniColorItem = new(); MiniColorItem.Size = MiniColorItem.GetMiniColorItemSize(); MiniColorItem.AllowDrop = false; MiniColorItem.PauseColorsHistory = true; MiniColorItem.BackColor = c; - MiniColorItem.DefaultColor = MiniColorItem.BackColor; + MiniColorItem.DefaultBackColor = MiniColorItem.BackColor; ImgPaletteContainer.Controls.Add(MiniColorItem); } @@ -268,7 +268,7 @@ private void Button1_Click(object sender, EventArgs e) Forms.MainFrm.ApplyColorsToElements(Program.TM); } - private static Random StaticRandom = new Random(); + private static Random StaticRandom = new(); public static List GetUniqueRandomNumbers(int Start, int Count) { diff --git a/WinPaletter/Program/Arguments.cs b/WinPaletter/Program/Arguments.cs index 4d256a4d..4a14ed90 100644 --- a/WinPaletter/Program/Arguments.cs +++ b/WinPaletter/Program/Arguments.cs @@ -56,7 +56,7 @@ private static void ExecuteArgs() } else { - var TMx = new Theme.Manager(Theme.Manager.Source.File, arg); + Theme.Manager TMx = new(Theme.Manager.Source.File, arg); TMx.Save(Theme.Manager.Source.Registry, arg); if (Settings.ThemeApplyingBehavior.AutoRestartExplorer) RestartExplorer(); @@ -81,7 +81,7 @@ private static void ExecuteArgs() File = File.Replace("\"", string.Empty); if (System.IO.File.Exists(File)) { - var TMx = new Theme.Manager(Theme.Manager.Source.File, File); + Theme.Manager TMx = new(Theme.Manager.Source.File, File); TMx.Save(Theme.Manager.Source.Registry); if (Settings.ThemeApplyingBehavior.AutoRestartExplorer) RestartExplorer(); @@ -139,7 +139,7 @@ private static void ExecuteArgs_ProgramStarted(string[] args) { Forms.ComplexSave.GetResponse(Forms.MainFrm.SaveFileDialog1, () => Forms.ThemeLog.Apply_Theme(), () => Forms.ThemeLog.Apply_Theme(TM_FirstTime), () => Forms.ThemeLog.Apply_Theme(Theme.Default.Get())); - TM = new Theme.Manager(Theme.Manager.Source.File, arg); + TM = new(Theme.Manager.Source.File, arg); TM_Original = (Theme.Manager)TM.Clone(); Forms.MainFrm.OpenFileDialog1.FileName = arg; Forms.MainFrm.SaveFileDialog1.FileName = arg; @@ -168,7 +168,7 @@ private static void ExecuteArgs_ProgramStarted(string[] args) File = File.Replace("\"", string.Empty); if (System.IO.File.Exists(File)) { - var TMx = new Theme.Manager(Theme.Manager.Source.File, File); + Theme.Manager TMx = new(Theme.Manager.Source.File, File); TMx.Save(Theme.Manager.Source.Registry); if (Settings.ThemeApplyingBehavior.AutoRestartExplorer) RestartExplorer(); @@ -182,7 +182,7 @@ private static void ExecuteArgs_ProgramStarted(string[] args) Forms.ComplexSave.GetResponse(Forms.MainFrm.SaveFileDialog1, () => Forms.ThemeLog.Apply_Theme(), () => Forms.ThemeLog.Apply_Theme(TM_FirstTime), () => Forms.ThemeLog.Apply_Theme(Theme.Default.Get())); - TM = new Theme.Manager(Theme.Manager.Source.File, File); + TM = new(Theme.Manager.Source.File, File); TM_Original = (Theme.Manager)TM.Clone(); Forms.MainFrm.OpenFileDialog1.FileName = File; Forms.MainFrm.SaveFileDialog1.FileName = File; diff --git a/WinPaletter/Program/Assemblies/AnimatedCursors/BitmapOps.cs b/WinPaletter/Program/Assemblies/AnimatedCursors/BitmapOps.cs index 6a63c7b5..a25cb0ba 100644 --- a/WinPaletter/Program/Assemblies/AnimatedCursors/BitmapOps.cs +++ b/WinPaletter/Program/Assemblies/AnimatedCursors/BitmapOps.cs @@ -12,7 +12,7 @@ internal static class BitmapOps { public static void AddToAlpha(Bitmap bm, int amount) { - Rectangle r = new Rectangle(0, 0, bm.Width, bm.Height); + Rectangle r = new(0, 0, bm.Width, bm.Height); BitmapData bd = bm.LockBits(r, ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); unsafe { @@ -44,7 +44,7 @@ private static uint ComputeSize(uint w, uint h, uint bpp, bool PaddedTo32) public static bool Get32BitPixelData(Bitmap bm, uint[] output) { - Rectangle r = new Rectangle(0, 0, bm.Width, bm.Height); + Rectangle r = new(0, 0, bm.Width, bm.Height); int pxlCount = bm.Width * bm.Height; // The simple case is if it's already 32-bit @@ -101,7 +101,7 @@ public static unsafe int CountTransparentColumnsFromLeft(Bitmap bm) int x = 0; int w = bm.Width; int h = bm.Height; - Rectangle rect = new Rectangle(0, 0, bm.Width, bm.Height); + Rectangle rect = new(0, 0, bm.Width, bm.Height); BitmapData bd = bm.LockBits(rect, ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); uint* endimg = &((uint*)bd.Scan0.ToPointer())[w * h]; for (x = 0; x < w; x++) // Loop through columns @@ -128,7 +128,7 @@ public static unsafe int CountTransparentColumnsFromRight(Bitmap bm) int x = 0; int w = bm.Width; int h = bm.Height; - Rectangle rect = new Rectangle(0, 0, bm.Width, bm.Height); + Rectangle rect = new(0, 0, bm.Width, bm.Height); BitmapData bd = bm.LockBits(rect, ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); uint* endimg = &((uint*)bd.Scan0.ToPointer())[w * h]; for (x = w - 1; x >= 0; x--) // Loop through columns @@ -157,7 +157,7 @@ public static unsafe int CountTransparentRowsFromBottom(Bitmap bm) int y = 0; int w = bm.Width; int h = bm.Height; - Rectangle rect = new Rectangle(0, 0, bm.Width, bm.Height); + Rectangle rect = new(0, 0, bm.Width, bm.Height); BitmapData bd = bm.LockBits(rect, ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); unsafe { @@ -189,7 +189,7 @@ public static unsafe int CountTransparentRowsFromTop(Bitmap bm) int y = 0; int w = bm.Width; int h = bm.Height; - Rectangle rect = new Rectangle(0, 0, bm.Width, bm.Height); + Rectangle rect = new(0, 0, bm.Width, bm.Height); BitmapData bd = bm.LockBits(rect, ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); unsafe { @@ -240,7 +240,7 @@ public static Bitmap CropTransparentBorders(Bitmap bm) int h = bm.Height - (y1 + y2) + 1; // Allocate the new bitmap - Bitmap bm2 = new Bitmap(w, h, PixelFormat.Format32bppArgb); + Bitmap bm2 = new(w, h, PixelFormat.Format32bppArgb); // Get the graphics object and render the subsection System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(bm2); @@ -267,7 +267,7 @@ public static Bitmap CropTransparentSideBorders(Bitmap bm) int w = bm.Width - (x1 + x2) + 1; // Allocate the new bitmap - Bitmap bm2 = new Bitmap(w, bm.Height, PixelFormat.Format32bppArgb); + Bitmap bm2 = new(w, bm.Height, PixelFormat.Format32bppArgb); // Get the graphics object and render the subsection System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(bm2); @@ -285,7 +285,7 @@ public static unsafe void FillRawBits32(Bitmap bm, uint* bits, int w, int h) // Fills the "bits" array with 32-bit image data from the bitmap int PixelCount = w * h; - Rectangle rect = new Rectangle(0, 0, w, h); + Rectangle rect = new(0, 0, w, h); BitmapData bd = bm.LockBits(rect, ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); uint* ui = (uint*)bd.Scan0.ToPointer(); int i = 0; @@ -329,7 +329,7 @@ public static unsafe Bitmap FromBitsNative(void* bits, int w, int h, int bpp) uint imgsize = ComputeSize((uint)w, (uint)h, (uint)bpp, true); PixelFormat pf = FormatFrombpp(bpp); - Bitmap bm = new Bitmap(w, h); + Bitmap bm = new(w, h); BitmapData bd = bm.LockBits(new Rectangle(0, 0, w, h), ImageLockMode.ReadWrite, pf); byte* BMbits = (byte*)bd.Scan0.ToPointer(); @@ -347,8 +347,8 @@ public static unsafe Bitmap FromRawBits24(void* bits, int w, int h, bool PaddedTo32Bit) { // Makes a 32-bit bitmap from the 24-bit data - Bitmap bm = new Bitmap(w, h); - Rectangle rect = new Rectangle(0, 0, w, h); + Bitmap bm = new(w, h); + Rectangle rect = new(0, 0, w, h); BitmapData bd = bm.LockBits(rect, ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); // Compute the source row size @@ -394,8 +394,8 @@ public static unsafe Bitmap FromRawBits24(void* bits, int w, int h, public static unsafe Bitmap FromRawBits32(uint* bits, int w, int h) { int PixelCount = w * h; - Bitmap bm = new Bitmap(w, h); - Rectangle rect = new Rectangle(0, 0, w, h); + Bitmap bm = new(w, h); + Rectangle rect = new(0, 0, w, h); BitmapData bd = bm.LockBits(rect, ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); uint* ui = (uint*)bd.Scan0.ToPointer(); int i = 0; @@ -412,8 +412,8 @@ public static unsafe Bitmap FromRawBits4(void* bits, uint* Palette, int w, int h bool PaddedTo32Bit) { // Makes a 32-bit bitmap from the indices and palette data - Bitmap bm = new Bitmap(w, h); - Rectangle rect = new Rectangle(0, 0, w, h); + Bitmap bm = new(w, h); + Rectangle rect = new(0, 0, w, h); BitmapData bd = bm.LockBits(rect, ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); // Compute the source row size @@ -453,8 +453,8 @@ public static unsafe Bitmap FromRawBits8(void* bits, uint* Palette, int w, int h bool PaddedTo32Bit) { // Makes a 32-bit bitmap from the indices and palette data - Bitmap bm = new Bitmap(w, h); - Rectangle rect = new Rectangle(0, 0, w, h); + Bitmap bm = new(w, h); + Rectangle rect = new(0, 0, w, h); BitmapData bd = bm.LockBits(rect, ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); // Compute the source row size @@ -486,8 +486,8 @@ public static unsafe Bitmap FromRawBits8(void* bits, uint* Palette, int w, int h public static unsafe Bitmap FromRawBitsBinary(void* bits, int w, int h, bool PaddedTo32Bit) { // Makes a 32-bit bitmap from the indices and palette data - Bitmap bm = new Bitmap(w, h); - Rectangle rect = new Rectangle(0, 0, w, h); + Bitmap bm = new(w, h); + Rectangle rect = new(0, 0, w, h); BitmapData bd = bm.LockBits(rect, ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); // Compute the source row size @@ -573,7 +573,7 @@ public static void MakeOpaque(Bitmap bm) int w = bm.Width; int h = bm.Height; int PixelCount = w * h; - Rectangle rect = new Rectangle(0, 0, w, h); + Rectangle rect = new(0, 0, w, h); BitmapData bd = bm.LockBits(rect, System.Drawing.Imaging.ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb); @@ -595,7 +595,7 @@ public static void MakeSolidColor(Bitmap bm, uint IntColor) int w = bm.Width; int h = bm.Height; int PixelCount = w * h; - Rectangle rect = new Rectangle(0, 0, w, h); + Rectangle rect = new(0, 0, w, h); BitmapData bd = bm.LockBits(rect, System.Drawing.Imaging.ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb); @@ -623,7 +623,7 @@ public static unsafe bool MaskToAlpha(Bitmap srcBM, Bitmap BWMask) // Gather information about the images and lock them int h = srcBM.Height; int w = srcBM.Width; - Rectangle Rect = new Rectangle(0, 0, w, h); + Rectangle Rect = new(0, 0, w, h); uint* MaskBits = null; uint* NewBits = null; BitmapData MaskBD = null; @@ -674,12 +674,12 @@ public static unsafe Bitmap ResizeCropPad(Bitmap bm, int NewWidth, int NewHeight // Gather information about the original image and lock it int OldHeight = bm.Height; int OldWidth = bm.Width; - Rectangle OldRect = new Rectangle(0, 0, OldWidth, OldHeight); + Rectangle OldRect = new(0, 0, OldWidth, OldHeight); BitmapData OldBD = bm.LockBits(OldRect, ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb); uint* OldBits = (uint*)OldBD.Scan0.ToPointer(); - Bitmap NewBM = new Bitmap(NewWidth, NewHeight); - Rectangle NewRect = new Rectangle(0, 0, NewWidth, NewHeight); + Bitmap NewBM = new(NewWidth, NewHeight); + Rectangle NewRect = new(0, 0, NewWidth, NewHeight); BitmapData NewBD = NewBM.LockBits(NewRect, ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); uint* NewBits = (uint*)NewBD.Scan0.ToPointer(); diff --git a/WinPaletter/Program/Assemblies/AnimatedCursors/EOIcoCurLoader.cs b/WinPaletter/Program/Assemblies/AnimatedCursors/EOIcoCurLoader.cs index ba2b1964..c4253166 100644 --- a/WinPaletter/Program/Assemblies/AnimatedCursors/EOIcoCurLoader.cs +++ b/WinPaletter/Program/Assemblies/AnimatedCursors/EOIcoCurLoader.cs @@ -227,7 +227,7 @@ public unsafe Bitmap GetImage(uint ImageIndex) // Pull out hotspot data, even though it may not be valid if this // resource is an icon and not a cursor. - HotSpot = new Point(idEntries[ImageIndex].Planes_XHotspot, + HotSpot = new(idEntries[ImageIndex].Planes_XHotspot, idEntries[ImageIndex].BitCount_YHotspot); // Make sure the image offset is within the length of the stream @@ -254,7 +254,7 @@ public unsafe Bitmap GetImage(uint ImageIndex) try { - bm = new Bitmap(os); + bm = new(os); bm.RotateFlip(RotateFlipType.RotateNoneFlipY); } catch (ArgumentException) @@ -364,11 +364,11 @@ public bool GetImageDimensions(uint ImageIndex, ref uint out_Width, ref uint out m_reader.BaseStream.Seek(-4, SeekOrigin.Current); // Create an offset stream so .NET can load - var os = new EOFC.OffsetStream(m_reader.BaseStream); + EOFC.OffsetStream os = new(m_reader.BaseStream); try { - using (Bitmap bm = new Bitmap(os)) + using (Bitmap bm = new(os)) { out_Width = (uint)bm.Width; out_Height = (uint)bm.Height; @@ -384,7 +384,7 @@ public bool GetImageDimensions(uint ImageIndex, ref uint out_Width, ref uint out m_reader.BaseStream.Seek(-4, SeekOrigin.Current); // Load BITMAPINFOHEADER structure - BITMAPINFOHEADER bih = new BITMAPINFOHEADER(); + BITMAPINFOHEADER bih = new(); bih.ReadFromStream(m_reader); // Get bits per pixel diff --git a/WinPaletter/Program/Assemblies/AnimatedCursors/EOIcoCurWriter.cs b/WinPaletter/Program/Assemblies/AnimatedCursors/EOIcoCurWriter.cs index 2d28b37a..7b9a55f7 100644 --- a/WinPaletter/Program/Assemblies/AnimatedCursors/EOIcoCurWriter.cs +++ b/WinPaletter/Program/Assemblies/AnimatedCursors/EOIcoCurWriter.cs @@ -164,7 +164,7 @@ public EOIcoCurWriter(Stream outputStream, int imageCount, IcoCurType type) m_type = type; // Prepare and write the header - IcoHeader hdr = new IcoHeader(type); + IcoHeader hdr = new(type); hdr.Count = (ushort)imageCount; hdr.WriteToStream(m_writer); @@ -180,7 +180,7 @@ private unsafe void MakeMask(Bitmap AlphaImg, ref byte[] maskdata, int MaskRowSi int BitsPerMaskRow = MaskRowSize * 8; int w = AlphaImg.Width; int h = AlphaImg.Height; - Rectangle rect = new Rectangle(0, 0, w, h); + Rectangle rect = new(0, 0, w, h); BitmapData bd = AlphaImg.LockBits(rect, ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); for (int y = 0; y < h; y++) { @@ -258,7 +258,7 @@ public bool WriteBitmap(Bitmap img, Bitmap AlphaImgMask, Point hotSpot) MemoryStream pngStream = null; if (img.Width >= 256 || img.Height >= 256) { - pngStream = new MemoryStream(); + pngStream = new(); img.Save(pngStream, ImageFormat.Png); } @@ -317,7 +317,7 @@ public bool WriteBitmap(Bitmap img, Bitmap AlphaImgMask, Point hotSpot) else { // Create and write the bitmap info header - BITMAPINFOHEADER bih = new BITMAPINFOHEADER(w, h * 2, bpp); + BITMAPINFOHEADER bih = new(w, h * 2, bpp); bih.WriteToStream(m_writer); // Write palette data if need be @@ -334,7 +334,7 @@ public bool WriteBitmap(Bitmap img, Bitmap AlphaImgMask, Point hotSpot) // Write bitmap data img.RotateFlip(RotateFlipType.RotateNoneFlipY); - Rectangle rect = new Rectangle(0, 0, w, h); + Rectangle rect = new(0, 0, w, h); BitmapData bd = img.LockBits(rect, ImageLockMode.ReadOnly, img.PixelFormat); unsafe { diff --git a/WinPaletter/Program/AssemblyLoader.cs b/WinPaletter/Program/AssemblyLoader.cs index b927eea8..6c7c36cd 100644 --- a/WinPaletter/Program/AssemblyLoader.cs +++ b/WinPaletter/Program/AssemblyLoader.cs @@ -21,13 +21,13 @@ public static Assembly GetAssemblyFromZIP(string Name) byte[] b = null; - using (var ms = new System.IO.MemoryStream(Properties.Resources.Assemblies)) + using (System.IO.MemoryStream ms = new(Properties.Resources.Assemblies)) { - using (var zip = new ZipArchive(ms)) + using (ZipArchive zip = new(ms)) { if (zip.Entries.Any(entry => entry.Name.EndsWith(Name + ".dll", StringComparison.OrdinalIgnoreCase))) { - using (var _as = new System.IO.MemoryStream()) + using (System.IO.MemoryStream _as = new()) { zip.GetEntry(Name + ".dll").Open().CopyTo(_as); _as.Seek(0L, System.IO.SeekOrigin.Begin); diff --git a/WinPaletter/Program/Classes/DWM.cs b/WinPaletter/Program/Classes/DWM.cs index fb0cbecc..d8a5a030 100644 --- a/WinPaletter/Program/Classes/DWM.cs +++ b/WinPaletter/Program/Classes/DWM.cs @@ -18,7 +18,7 @@ public static void DropEffect(IntPtr Handle, Padding Margins = default, bool Bor { if (Margins == default || Margins == null || Margins == Padding.Empty || Margins == new Padding(0)) { - Margins = new Padding(-1, -1, -1, -1); + Margins = new(-1, -1, -1, -1); } bool CompositionEnabled = DWMAPI.IsCompositionEnabled(); @@ -118,7 +118,7 @@ public static void DrawMica(IntPtr Handle, Padding Margins, MicaStyle Style = Mi { if (Margins == default || Margins == null || Margins == Padding.Empty || Margins == new Padding(0)) { - Margins = new Padding(-1, -1, -1, -1); + Margins = new(-1, -1, -1, -1); } FormStyle FS = FormStyle.Mica; @@ -126,7 +126,7 @@ public static void DrawMica(IntPtr Handle, Padding Margins, MicaStyle Style = Mi if (Style == MicaStyle.Tabbed && (OS.W11_22523 || OS.W12)) FS = FormStyle.Tabbed; - var DWM_Margins = new DWMAPI.MARGINS() { leftWidth = Margins.Left, rightWidth = Margins.Right, topHeight = Margins.Top, bottomHeight = Margins.Bottom }; + DWMAPI.MARGINS DWM_Margins = new() { leftWidth = Margins.Left, rightWidth = Margins.Right, topHeight = Margins.Top, bottomHeight = Margins.Bottom }; int argpvAttribute = (int)FS; DLLFunc.DarkTitlebar(Handle, Program.Style.DarkMode); @@ -166,7 +166,7 @@ public static void DrawAero(IntPtr Handle, Padding Margins) { if (Margins == default || Margins == null || Margins == Padding.Empty || Margins == new Padding(0)) { - Margins = new Padding(-1, -1, -1, -1); + Margins = new(-1, -1, -1, -1); } DWMAPI.MARGINS DWM_Margins = new() { leftWidth = Margins.Left, rightWidth = Margins.Right, topHeight = Margins.Top, bottomHeight = Margins.Bottom }; diff --git a/WinPaletter/Program/Classes/MemoryFonts.cs b/WinPaletter/Program/Classes/MemoryFonts.cs index e829c276..80510410 100644 --- a/WinPaletter/Program/Classes/MemoryFonts.cs +++ b/WinPaletter/Program/Classes/MemoryFonts.cs @@ -13,7 +13,7 @@ public static class MemoryFonts static MemoryFonts() { if (Pfc is null) - Pfc = new PrivateFontCollection(); + Pfc = new(); } public static void AddMemoryFont(byte[] fontResource) diff --git a/WinPaletter/Program/Classes/PE.cs b/WinPaletter/Program/Classes/PE.cs index 315416e5..53da824a 100644 --- a/WinPaletter/Program/Classes/PE.cs +++ b/WinPaletter/Program/Classes/PE.cs @@ -11,14 +11,14 @@ namespace WinPaletter public static class PE { - private readonly static SecurityIdentifier identifier = new SecurityIdentifier(WellKnownSidType.BuiltinAdministratorsSid, null); + private readonly static SecurityIdentifier identifier = new(WellKnownSidType.BuiltinAdministratorsSid, null); private readonly static NTAccount AdminAccount = (NTAccount)identifier.Translate(typeof(NTAccount)); - private readonly static FileSystemAccessRule AccessRule = new FileSystemAccessRule(AdminAccount, FileSystemRights.FullControl, AccessControlType.Allow); + private readonly static FileSystemAccessRule AccessRule = new(AdminAccount, FileSystemRights.FullControl, AccessControlType.Allow); public static byte[] GetResource(string SourceFile, string ResourceType, int ID, ushort LangID = 1033) { - var PE_File = new PortableExecutable(SourceFile); - return PE_File.GetResource(new ResourceIdentifier(Ressy.ResourceType.FromString(ResourceType), ResourceName.FromCode(ID), new Language(LangID))).Data; + PortableExecutable PE_File = new(SourceFile); + return PE_File.GetResource(new(Ressy.ResourceType.FromString(ResourceType), ResourceName.FromCode(ID), new Language(LangID))).Data; } public static void ReplaceResource(TreeView TreeView, string SourceFile, string ResourceType, int ID, byte[] NewRes, ushort LangID = 1033) @@ -58,8 +58,8 @@ public static void ReplaceResource(string SourceFile, string ResourceType, int I if (TreeView is not null) Theme.Manager.AddNode(TreeView, string.Format(Program.Lang.Verbose_PE_PatchingPE, System.IO.Path.GetFileName(SourceFile)), "pe_patch"); - var PE_File = new PortableExecutable(SourceFile); - PE_File.SetResource(new ResourceIdentifier(Ressy.ResourceType.FromString(ResourceType), ResourceName.FromCode(ID), new Language(LangID)), NewRes); + PortableExecutable PE_File = new(SourceFile); + PE_File.SetResource(new(Ressy.ResourceType.FromString(ResourceType), ResourceName.FromCode(ID), new Language(LangID)), NewRes); if (TreeView is not null) Theme.Manager.AddNode(TreeView, string.Format(Program.Lang.Verbose_PE_RestoringPermissions, System.IO.Path.GetFileName(SourceFile)), "pe_restore"); @@ -76,8 +76,8 @@ public static void ReplaceResource(string SourceFile, string ResourceType, int I // It isn't in system directory and can be modified without changing rights/permissions. if (TreeView is not null) Theme.Manager.AddNode(TreeView, string.Format("Replacing '{0}' resources", System.IO.Path.GetFileName(SourceFile)), "pe_patch"); - var PE_File = new PortableExecutable(SourceFile); - PE_File.SetResource(new ResourceIdentifier(Ressy.ResourceType.FromString(ResourceType), ResourceName.FromCode(ID), new Language(LangID)), NewRes); + PortableExecutable PE_File = new(SourceFile); + PE_File.SetResource(new(Ressy.ResourceType.FromString(ResourceType), ResourceName.FromCode(ID), new Language(LangID)), NewRes); } } @@ -161,7 +161,7 @@ public static Bitmap GetPNGFromDLL(string File, int ResourceID, string ResourceT { if (System.IO.File.Exists(File)) { - using (var ms = new System.IO.MemoryStream(PE.GetResource(File, ResourceType, ResourceID))) + using (System.IO.MemoryStream ms = new(PE.GetResource(File, ResourceType, ResourceID))) { return (Bitmap)Image.FromStream(ms); } diff --git a/WinPaletter/Program/Classes/Reg_IO.cs b/WinPaletter/Program/Classes/Reg_IO.cs index c7e385d6..bd34e1db 100644 --- a/WinPaletter/Program/Classes/Reg_IO.cs +++ b/WinPaletter/Program/Classes/Reg_IO.cs @@ -670,9 +670,9 @@ public static void SFC(string File = "", bool IfNotExist_DoScannow = false, bool IntPtr intPtr = IntPtr.Zero; Kernel32.Wow64DisableWow64FsRedirection(ref intPtr); - using (var process = new Process() + using (Process process = new() { - StartInfo = new ProcessStartInfo() + StartInfo = new() { FileName = PathsExt.System32 + "\\cmd.exe", Verb = "runas", diff --git a/WinPaletter/Program/GlobalVariables/Exceptions.cs b/WinPaletter/Program/GlobalVariables/Exceptions.cs index a5ae5e9b..6d0c619e 100644 --- a/WinPaletter/Program/GlobalVariables/Exceptions.cs +++ b/WinPaletter/Program/GlobalVariables/Exceptions.cs @@ -8,11 +8,11 @@ public static class Exceptions /// /// List of exceptions thrown during theme applying /// - public static List> ThemeApply = new List>(); + public static List> ThemeApply = new(); /// /// List of exceptions thrown during theme loading /// - public static List> ThemeLoad = new List>(); + public static List> ThemeLoad = new(); } } diff --git a/WinPaletter/Program/GlobalVariables/Fonts.cs b/WinPaletter/Program/GlobalVariables/Fonts.cs index e7565d3a..4152efaa 100644 --- a/WinPaletter/Program/GlobalVariables/Fonts.cs +++ b/WinPaletter/Program/GlobalVariables/Fonts.cs @@ -4,8 +4,8 @@ namespace WinPaletter.GlobalVariables { public static class Fonts { - public static Font Console = new Font("Lucida Console", 7.5f); - public static Font ConsoleMedium = new Font("Lucida Console", 9f); - public static Font ConsoleLarge = new Font("Lucida Console", 10f); + public static Font Console = new("Lucida Console", 7.5f); + public static Font ConsoleMedium = new("Lucida Console", 9f); + public static Font ConsoleLarge = new("Lucida Console", 10f); } } diff --git a/WinPaletter/Program/GlobalVariables/ImageLists.cs b/WinPaletter/Program/GlobalVariables/ImageLists.cs index 3e0dfdcf..62c5c238 100644 --- a/WinPaletter/Program/GlobalVariables/ImageLists.cs +++ b/WinPaletter/Program/GlobalVariables/ImageLists.cs @@ -8,11 +8,11 @@ public static class ImageLists /// /// ImageList for theme log mini-icons (Loaded at application startup) /// - public static ImageList ThemeLog = new ImageList() { ImageSize = new Size(20, 20), ColorDepth = ColorDepth.Depth32Bit }; + public static ImageList ThemeLog = new() { ImageSize = new(20, 20), ColorDepth = ColorDepth.Depth32Bit }; /// /// ImageList for Languages Nodes (Loaded at application startup) /// - public static ImageList Language = new ImageList() { ImageSize = new Size(16, 16), ColorDepth = ColorDepth.Depth32Bit }; + public static ImageList Language = new() { ImageSize = new(16, 16), ColorDepth = ColorDepth.Depth32Bit }; } } diff --git a/WinPaletter/Program/GlobalVariables/Variables.cs b/WinPaletter/Program/GlobalVariables/Variables.cs index be656edd..a4037bf7 100644 --- a/WinPaletter/Program/GlobalVariables/Variables.cs +++ b/WinPaletter/Program/GlobalVariables/Variables.cs @@ -51,7 +51,7 @@ internal partial class Program /// /// Class represents colors for WinPaletter Controls (Styles) /// - public static Config Style = new(DefaultColors.PrimaryColor, DefaultColors.SecondaryColor, DefaultColors.TertiaryColor, DefaultColors.DisabledColor, DefaultColors.BackColorDark, DefaultColors.DisabledBackColor, true, true); + public static Config Style = new(DefaultColors.PrimaryColor, DefaultColors.SecondaryColor, DefaultColors.TertiaryColor, DefaultColors.DisabledColor_Dark, DefaultColors.BackColorDark, DefaultColors.DisabledBackColor_Dark, true, true, true); /// /// A class that represents WinPaletter's Settings @@ -83,7 +83,7 @@ internal partial class Program /// public static readonly Process ExplorerKiller = new() { - StartInfo = new ProcessStartInfo() + StartInfo = new() { FileName = PathsExt.System32 + @"\taskkill.exe", Verb = !OS.WXP ? "runas" : string.Empty, @@ -98,7 +98,7 @@ internal partial class Program /// public static readonly Process Explorer_exe = new() { - StartInfo = new ProcessStartInfo() + StartInfo = new() { FileName = PathsExt.explorer, WindowStyle = ProcessWindowStyle.Normal, diff --git a/WinPaletter/Program/Helpers.cs b/WinPaletter/Program/Helpers.cs index 6f798595..f03b9306 100644 --- a/WinPaletter/Program/Helpers.cs +++ b/WinPaletter/Program/Helpers.cs @@ -18,9 +18,9 @@ internal partial class Program { public static void SendCommand(string command, bool Wait = true) { - using (var process = new Process() + using (Process process = new() { - StartInfo = new ProcessStartInfo() + StartInfo = new() { FileName = command.Split(' ')[0], Verb = OS.WXP ? string.Empty : "runas", @@ -82,11 +82,11 @@ private static void LoadThemeManager() // Load Manager if (!ExternalLink) { - TM = new Theme.Manager(Theme.Manager.Source.Registry); + TM = new(Theme.Manager.Source.Registry); } else { - TM = new Theme.Manager(Theme.Manager.Source.File, ExternalLink_File); + TM = new(Theme.Manager.Source.File, ExternalLink_File); Forms.MainFrm.OpenFileDialog1.FileName = ExternalLink_File; Forms.MainFrm.SaveFileDialog1.FileName = ExternalLink_File; ExternalLink = false; @@ -122,9 +122,9 @@ private static void GetMemoryFonts() } catch { - Fonts.Console = new Font("Lucida Console", 7.5f); - Fonts.ConsoleMedium = new Font("Lucida Console", 9f); - Fonts.ConsoleLarge = new Font("Lucida Console", 10f); + Fonts.Console = new("Lucida Console", 7.5f); + Fonts.ConsoleMedium = new("Lucida Console", 9f); + Fonts.ConsoleLarge = new("Lucida Console", 10f); } } @@ -142,7 +142,7 @@ public static void CMD_Convert(string arg, bool KillProcessAfterConvert) if (arr.Count() == 4) OldWPTH = arr[3]; - var _Convert = new Converter(); + Converter _Convert = new(); if (System.IO.File.Exists(Source) && !(_Convert.GetFormat(Source) == Converter_CP.WP_Format.Error)) { @@ -171,7 +171,7 @@ public static void CMD_Convert_List(string arg, bool KillProcessAfterConvert) try { string source = arg.Remove(0, "/convert-list:".Count()); - var _Convert = new Converter(); + Converter _Convert = new(); if (System.IO.File.Exists(source)) { @@ -197,7 +197,7 @@ public static void CMD_Convert_List(string arg, bool KillProcessAfterConvert) compress = arr[2]; } - var FI = new System.IO.FileInfo(f); + System.IO.FileInfo FI = new(f); string Name = System.IO.Path.GetFileNameWithoutExtension(FI.Name); string Dir = FI.FullName.Replace(FI.FullName.Split('\\').Last(), "WinPaletterConversion"); string SaveAs = Dir + @"\" + Name + ".wpth"; @@ -360,7 +360,7 @@ private static void ExtractLuna() using (System.IO.FileStream s = new(PathsExt.MSTheme_ZIP, System.IO.FileMode.Open, System.IO.FileAccess.Read)) { - using (var z = new System.IO.Compression.ZipArchive(s, System.IO.Compression.ZipArchiveMode.Read)) + using (System.IO.Compression.ZipArchive z = new(s, System.IO.Compression.ZipArchiveMode.Read)) { foreach (System.IO.Compression.ZipArchiveEntry entry in z.Entries) { @@ -432,7 +432,7 @@ public static void CheckWhatsNew() // ### Pop up WhatsNew ShowWhatsNew = true; - var ver = new List(); + List ver = new(); ver.Clear(); ver.Add(Version); @@ -507,7 +507,7 @@ public static void RestartExplorer(TreeView TreeView = null) { if (TreeView is not null) Theme.Manager.AddNode(TreeView, string.Format("{0}: {1}", DateTime.Now.ToLongTimeString(), Program.Lang.KillingExplorer), "info"); - var sw = new Stopwatch(); + Stopwatch sw = new(); sw.Reset(); sw.Start(); diff --git a/WinPaletter/Program/Invoker.cs b/WinPaletter/Program/Invoker.cs index 3840016d..35ed0b53 100644 --- a/WinPaletter/Program/Invoker.cs +++ b/WinPaletter/Program/Invoker.cs @@ -47,7 +47,7 @@ static object Invoke(Delegate method, object[] args) lock (_invokeLocker) { object objectToGet = null; - var invoker = new SendOrPostCallback((data) => Microsoft.VisualBasic.CompilerServices.Operators.ConditionalCompareObjectEqual(objectToGet, method.DynamicInvoke(args), false)); + SendOrPostCallback invoker = new((data) => Microsoft.VisualBasic.CompilerServices.Operators.ConditionalCompareObjectEqual(objectToGet, method.DynamicInvoke(args), false)); _currentContext.Send(invoker, method.Target); return objectToGet; } diff --git a/WinPaletter/Program/NativeMethods/NativeMethods.cs b/WinPaletter/Program/NativeMethods/NativeMethods.cs index 10c16dfe..374350c1 100644 --- a/WinPaletter/Program/NativeMethods/NativeMethods.cs +++ b/WinPaletter/Program/NativeMethods/NativeMethods.cs @@ -75,7 +75,7 @@ public static Icon GetSystemIcon(Shell32.SHSTOCKICONID _Icon, Shell32.SHGSI _Typ try { // Initialize a SHSTOCKICONINFO structure. - var sii = new Shell32.SHSTOCKICONINFO() { cbSize = (uint)Marshal.SizeOf(typeof(Shell32.SHSTOCKICONINFO)) }; + Shell32.SHSTOCKICONINFO sii = new() { cbSize = (uint)Marshal.SizeOf(typeof(Shell32.SHSTOCKICONINFO)) }; // Call SHGetStockIconInfo to get system icon information. Shell32.SHGetStockIconInfo(_Icon, _Type, ref sii); @@ -130,7 +130,7 @@ public static void DarkTitlebar(IntPtr hWnd, bool darkMode) public static void RemoveFormTitlebarTextAndIcon(IntPtr handle) { // Set the non-client rendering options to remove the titlebar text and icon - var options = new UxTheme.WTA_OPTIONS() + UxTheme.WTA_OPTIONS options = new() { Flags = UxTheme.WTNCA_NODRAWCAPTION | UxTheme.WTNCA_NODRAWICON, Mask = UxTheme.WTNCA_NODRAWCAPTION | UxTheme.WTNCA_NODRAWICON diff --git a/WinPaletter/Program/NativeMethods/User32.cs b/WinPaletter/Program/NativeMethods/User32.cs index 23b67e31..475f471a 100644 --- a/WinPaletter/Program/NativeMethods/User32.cs +++ b/WinPaletter/Program/NativeMethods/User32.cs @@ -121,7 +121,6 @@ public partial class User32 [DllImport("user32.dll")] private static extern bool EnumChildWindows(IntPtr hWndParent, EnumChildProc lpEnumFunc, IntPtr lParam); - /// /// Creates an icon or cursor from an ICONINFO structure. /// diff --git a/WinPaletter/Program/NativeMethods/advapi.cs b/WinPaletter/Program/NativeMethods/advapi.cs index 05222db0..d528ff63 100644 --- a/WinPaletter/Program/NativeMethods/advapi.cs +++ b/WinPaletter/Program/NativeMethods/advapi.cs @@ -112,8 +112,8 @@ public struct TokPriv1Luid public static bool EnablePrivilege(string privilege, bool disable) { long value = Process.GetCurrentProcess().Handle.ToInt32(); - var h = new IntPtr(value); - var phtok = IntPtr.Zero; + IntPtr h = new(value); + IntPtr phtok = IntPtr.Zero; bool flag = OpenProcessToken(h, 40, ref phtok); TokPriv1Luid newst = default; newst.Count = 1; diff --git a/WinPaletter/Program/PreferencesMonitor.cs b/WinPaletter/Program/PreferencesMonitor.cs index 83ff5e3f..4d46754b 100644 --- a/WinPaletter/Program/PreferencesMonitor.cs +++ b/WinPaletter/Program/PreferencesMonitor.cs @@ -40,7 +40,7 @@ private static MethodInvoker UpdateWallpaperInvoker() private static void UpdateWallpaperForPreview() { - using (var wall_New = new Bitmap((Bitmap)GetWallpaperFromRegistry().Clone())) + using (Bitmap wall_New = new((Bitmap)GetWallpaperFromRegistry().Clone())) { Wallpaper_Unscaled = (Bitmap)wall_New.Clone(); @@ -248,7 +248,7 @@ public static Bitmap GetWallpaperFromRegistry() public static void WallpaperType_Changed(object sender, EventArrivedEventArgs e) { int WallpaperType = Convert.ToInt32(GetReg(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Wallpapers", "BackgroundType", 0)); - var S = new Stopwatch(); + Stopwatch S = new(); if (WallpaperType != 1) { S.Reset(); @@ -273,14 +273,14 @@ public static void Monitor() KeyPath = @"Control Panel\Desktop"; valueName = "Wallpaper"; Base = string.Format(@"SELECT * FROM RegistryValueChangeEvent WHERE Hive='HKEY_USERS' AND KeyPath='{0}\\{1}' AND ValueName='{2}'", currentUser.User.Value, KeyPath.Replace(@"\", @"\\"), valueName); - var query1 = new WqlEventQuery(Base); - WallMon_Watcher1 = new ManagementEventWatcher(query1); + WqlEventQuery query1 = new(Base); + WallMon_Watcher1 = new(query1); KeyPath = @"Control Panel\Colors"; valueName = "Background"; Base = string.Format(@"SELECT * FROM RegistryValueChangeEvent WHERE Hive='HKEY_USERS' AND KeyPath='{0}\\{1}' AND ValueName='{2}'", currentUser.User.Value, KeyPath.Replace(@"\", @"\\"), valueName); - var query2 = new WqlEventQuery(Base); - WallMon_Watcher2 = new ManagementEventWatcher(query2); + WqlEventQuery query2 = new(Base); + WallMon_Watcher2 = new(query2); WallMon_Watcher1.EventArrived += Wallpaper_Changed_EventHandler; WallMon_Watcher1.Start(); @@ -293,14 +293,14 @@ public static void Monitor() KeyPath = @"Software\Microsoft\Windows\CurrentVersion\Explorer\Wallpapers"; valueName = "BackgroundType"; Base = string.Format(@"SELECT * FROM RegistryValueChangeEvent WHERE Hive='HKEY_USERS' AND KeyPath='{0}\\{1}' AND ValueName='{2}'", currentUser.User.Value, KeyPath.Replace(@"\", @"\\"), valueName); - var query3 = new WqlEventQuery(Base); - WallMon_Watcher3 = new ManagementEventWatcher(query3); + WqlEventQuery query3 = new(Base); + WallMon_Watcher3 = new(query3); KeyPath = @"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize"; valueName = "AppsUseLightTheme"; Base = string.Format(@"SELECT * FROM RegistryValueChangeEvent WHERE Hive='HKEY_USERS' AND KeyPath='{0}\\{1}' AND ValueName='{2}'", currentUser.User.Value, KeyPath.Replace(@"\", @"\\"), valueName); - var query4 = new WqlEventQuery(Base); - WallMon_Watcher4 = new ManagementEventWatcher(query4); + WqlEventQuery query4 = new(Base); + WallMon_Watcher4 = new(query4); WallMon_Watcher3.EventArrived += WallpaperType_Changed; WallMon_Watcher3.Start(); diff --git a/WinPaletter/Program/Program.cs b/WinPaletter/Program/Program.cs index c4e69978..b7c0f847 100644 --- a/WinPaletter/Program/Program.cs +++ b/WinPaletter/Program/Program.cs @@ -34,16 +34,14 @@ static void Main(string[] args) InitializeApplication(true); - Application.Run(new Form1()); - - //SingleInstanceApplication.Run(Forms.MainFrm, StartupNextInstanceEventHandler); + SingleInstanceApplication.Run(Forms.MainFrm, StartupNextInstanceEventHandler); } public static void InitializeApplication(bool ShowLoginDialog) { using (WindowsImpersonationContext wic = User.Identity.Impersonate()) { - Animator = new AnimatorNS.Animator() { Interval = 1, TimeStep = 0.07f, DefaultAnimation = AnimatorNS.Animation.Transparent, AnimationType = AnimatorNS.AnimationType.Transparent }; + Animator = new() { Interval = 1, TimeStep = 0.07f, DefaultAnimation = AnimatorNS.Animation.Transparent, AnimationType = AnimatorNS.AnimationType.Transparent }; if (!System.IO.Directory.Exists(PathsExt.ProgramFilesData)) { System.IO.Directory.CreateDirectory(PathsExt.ProgramFilesData); } diff --git a/WinPaletter/Program/TypesExtensions/Bitmaps.cs b/WinPaletter/Program/TypesExtensions/Bitmaps.cs index 969df0af..3b6ee855 100644 --- a/WinPaletter/Program/TypesExtensions/Bitmaps.cs +++ b/WinPaletter/Program/TypesExtensions/Bitmaps.cs @@ -81,8 +81,8 @@ public static Bitmap Blur(this Bitmap bitmap, int BlurForce = 2) { G.SmoothingMode = SmoothingMode.AntiAlias; - var att = new ImageAttributes(); - var m = new ColorMatrix() { Matrix33 = 0.4f }; + ImageAttributes att = new(); + ColorMatrix m = new() { Matrix33 = 0.4f }; att.SetColorMatrix(m); for (double x = -BlurForce, loopTo = BlurForce; x <= loopTo; x += 0.5d) @@ -105,22 +105,22 @@ public static Bitmap Noise(this Bitmap bmp, NoiseMode NoiseMode, float opacity) { try { - var g = Graphics.FromImage(bmp); + Graphics G = Graphics.FromImage(bmp); if (NoiseMode == NoiseMode.Acrylic) { TextureBrush br; - br = new TextureBrush(Properties.Resources.GaussianBlur.Fade((double)opacity)); - g.FillRectangle(br, new Rectangle(0, 0, bmp.Width, bmp.Height)); + br = new(Properties.Resources.GaussianBlur.Fade((double)opacity)); + G.FillRectangle(br, new Rectangle(0, 0, bmp.Width, bmp.Height)); } else if (NoiseMode == NoiseMode.Aero) { - g.DrawImage(Properties.Resources.AeroGlass.Fade((double)opacity), new Rectangle(0, 0, bmp.Width, bmp.Height)); + G.DrawImage(Properties.Resources.AeroGlass.Fade((double)opacity), new Rectangle(0, 0, bmp.Width, bmp.Height)); } - g.Save(); + G.Save(); return bmp; - g.Dispose(); + G.Dispose(); bmp.Dispose(); } catch @@ -139,9 +139,8 @@ public enum NoiseMode /// public static Bitmap ReplaceColor(this Bitmap inputImage, Color oldColor, Color NewColor) { - var outputImage = new Bitmap(inputImage.Width, inputImage.Height); - var G = Graphics.FromImage(outputImage); - + Bitmap outputImage = new(inputImage.Width, inputImage.Height); + Graphics G = Graphics.FromImage(outputImage); for (int y = 0, loopTo = inputImage.Height - 1; y <= loopTo; y++) { @@ -166,7 +165,6 @@ public static Bitmap ReplaceColor(this Bitmap inputImage, Color oldColor, Color G.Dispose(); return outputImage; outputImage.Dispose(); - } /// @@ -208,7 +206,7 @@ public static Bitmap FillScale(Bitmap Bitmap, Size Size) int destWidth = (int)Math.Round(sourceWidth * nPercent); int destHeight = (int)Math.Round(sourceHeight * nPercent); - var bmPhoto = new Bitmap(Size.Width, Size.Height, PixelFormat.Format32bppArgb); + Bitmap bmPhoto = new(Size.Width, Size.Height, PixelFormat.Format32bppArgb); bmPhoto.SetResolution(Bitmap.HorizontalResolution, Bitmap.VerticalResolution); var grPhoto = Graphics.FromImage(bmPhoto); grPhoto.InterpolationMode = InterpolationMode.HighQualityBicubic; @@ -262,9 +260,9 @@ public static Bitmap Resize(this Bitmap bmSource, int TargetWidth, int TargetHei if (bmSource is null) return null; - using (var B = new Bitmap(TargetWidth, TargetHeight, PixelFormat.Format32bppArgb)) + using (Bitmap B = new(TargetWidth, TargetHeight, PixelFormat.Format32bppArgb)) { - using (var G = Graphics.FromImage(B)) + using (Graphics G = Graphics.FromImage(B)) { G.Clear(Color.Transparent); G.CompositingQuality = CompositingQuality.HighQuality; @@ -353,8 +351,8 @@ public static Bitmap Tint(this Bitmap sourceBitmap, Color Color) k += 4; } - var resultBitmap = new Bitmap(sourceBitmap.Width, sourceBitmap.Height); - var resultData = resultBitmap.LockBits(new Rectangle(0, 0, resultBitmap.Width, resultBitmap.Height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb); + Bitmap resultBitmap = new(sourceBitmap.Width, sourceBitmap.Height); + BitmapData resultData = resultBitmap.LockBits(new Rectangle(0, 0, resultBitmap.Width, resultBitmap.Height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb); Marshal.Copy(pixelBuffer, 0, resultData.Scan0, pixelBuffer.Length); resultBitmap.UnlockBits(resultData); return resultBitmap; @@ -370,8 +368,8 @@ public static Bitmap Fade(this Bitmap originalBitmap, double opacity) { using (var gfx = Graphics.FromImage(bmp)) { - var matrix = new ColorMatrix() { Matrix33 = (float)opacity }; - var attributes = new ImageAttributes(); + ColorMatrix matrix = new() { Matrix33 = (float)opacity }; + ImageAttributes attributes = new(); attributes.SetColorMatrix(matrix, ColorMatrixFlag.Default, ColorAdjustType.Bitmap); gfx.DrawImage(originalBitmap, new Rectangle(0, 0, bmp.Width, bmp.Height), 0, 0, originalBitmap.Width, originalBitmap.Height, GraphicsUnit.Pixel, attributes); } @@ -400,16 +398,16 @@ public static Bitmap Grayscale(this Image original) /// public static Bitmap Grayscale(this Bitmap original) { - var newBitmap = new Bitmap(original.Width, original.Height); + Bitmap newBitmap = new(original.Width, original.Height); - using (var g = Graphics.FromImage(newBitmap)) + using (Graphics G = Graphics.FromImage(newBitmap)) { - var colorMatrix = new ColorMatrix(new float[][] { new float[] { 0.3f, 0.3f, 0.3f, 0f, 0f }, new float[] { 0.59f, 0.59f, 0.59f, 0f, 0f }, new float[] { 0.11f, 0.11f, 0.11f, 0f, 0f }, new float[] { 0f, 0f, 0f, 1f, 0f }, new float[] { 0f, 0f, 0f, 0f, 1f } }); + ColorMatrix colorMatrix = new(new float[][] { new float[] { 0.3f, 0.3f, 0.3f, 0f, 0f }, new float[] { 0.59f, 0.59f, 0.59f, 0f, 0f }, new float[] { 0.11f, 0.11f, 0.11f, 0f, 0f }, new float[] { 0f, 0f, 0f, 1f, 0f }, new float[] { 0f, 0f, 0f, 0f, 1f } }); - using (var attributes = new ImageAttributes()) + using (ImageAttributes attributes = new()) { attributes.SetColorMatrix(colorMatrix); - g.DrawImage(original, new Rectangle(0, 0, original.Width, original.Height), 0, 0, original.Width, original.Height, GraphicsUnit.Pixel, attributes); + G.DrawImage(original, new Rectangle(0, 0, original.Width, original.Height), 0, 0, original.Width, original.Height, GraphicsUnit.Pixel, attributes); } } @@ -423,9 +421,9 @@ public static Bitmap Invert(this Bitmap bmp) { Bitmap bmpDest = null; - using (var bmpSource = new Bitmap(bmp)) + using (Bitmap bmpSource = new(bmp)) { - bmpDest = new Bitmap(bmpSource.Width, bmpSource.Height); + bmpDest = new(bmpSource.Width, bmpSource.Height); for (int x = 0, loopTo = bmpSource.Width - 1; x <= loopTo; x++) { @@ -447,11 +445,11 @@ public static Bitmap Invert(this Bitmap bmp) /// public static Bitmap Tile(this Bitmap bmp, Size Size) { - using (var B = new Bitmap(Size.Width, Size.Height)) + using (Bitmap B = new(Size.Width, Size.Height)) { - var G = Graphics.FromImage(B); + Graphics G = Graphics.FromImage(B); G.SmoothingMode = SmoothingMode.HighSpeed; - var tb = new TextureBrush(bmp); + TextureBrush tb = new(bmp); G.FillRectangle(tb, new Rectangle(0, 0, Size.Width, Size.Height)); G.Save(); return (Bitmap)B.Clone(); diff --git a/WinPaletter/Program/TypesExtensions/Colors.cs b/WinPaletter/Program/TypesExtensions/Colors.cs index b3454525..800743b9 100644 --- a/WinPaletter/Program/TypesExtensions/Colors.cs +++ b/WinPaletter/Program/TypesExtensions/Colors.cs @@ -48,7 +48,7 @@ public static string HEX(this Color Color, bool Alpha = true, bool Hash = false) /// public static HSL_Structure ToHSL(this Color Color) { - var _hsl = new HSL_Structure(); + HSL_Structure _hsl = new(); float r = Color.R / 255.0f; float g = Color.G / 255.0f; @@ -274,12 +274,12 @@ public enum ColorFormat /// public static Bitmap ToBitmap(this Color Color, Size Size) { - var b = new Bitmap(Size.Width, Size.Height); - var g = Graphics.FromImage(b); - g.Clear(Color); - g.Save(); + Bitmap b = new(Size.Width, Size.Height); + Graphics G = Graphics.FromImage(b); + G.Clear(Color); + G.Save(); return b; - g.Dispose(); + G.Dispose(); b.Dispose(); } diff --git a/WinPaletter/Program/TypesExtensions/Graphics.cs b/WinPaletter/Program/TypesExtensions/Graphics.cs index 533deaf9..a96111a2 100644 --- a/WinPaletter/Program/TypesExtensions/Graphics.cs +++ b/WinPaletter/Program/TypesExtensions/Graphics.cs @@ -14,36 +14,26 @@ public static void DrawGlowString(this Graphics G, int GlowSize, string Text, Fo if (Text is null | string.IsNullOrWhiteSpace(Text)) Text = string.Empty; - using (var b = new Bitmap(w, h)) + using (Bitmap b = new(w, h)) + using (GraphicsPath gp = new()) + using (Graphics gx = Graphics.FromImage(b)) + using (Matrix m = new(1.0f / 5f, 0f, 0f, 1.0f / 5f, -(1.0f / 5f), -(1.0f / 5f))) + using (SolidBrush br = new(ForeColor)) + using (Pen P = new(GlowColor, GlowSize)) { - using (var gp = new GraphicsPath()) - { - gp.AddString(Text, Font.FontFamily, (int)Font.Style, emSize, Rect, FormatX); + gp.AddString(Text, Font.FontFamily, (int)Font.Style, emSize, Rect, FormatX); - using (var gx = Graphics.FromImage(b)) - { - using (var m = new Matrix(1.0f / 5f, 0f, 0f, 1.0f / 5f, -(1.0f / 5f), -(1.0f / 5f))) - { - gx.SmoothingMode = SmoothingMode.AntiAlias; - gx.Transform = m; - using (var pn = new Pen(GlowColor, GlowSize)) - { - gx.DrawPath(pn, gp); - gx.FillPath(pn.Brush, gp); - } - } - } + gx.SmoothingMode = SmoothingMode.AntiAlias; + gx.Transform = m; - G.InterpolationMode = InterpolationMode.HighQualityBicubic; - G.DrawImage(b, ClientRect, 0, 0, b.Width, b.Height, GraphicsUnit.Pixel); + gx.DrawPath(P, gp); + gx.FillPath(P.Brush, gp); - G.SmoothingMode = SmoothingMode.AntiAlias; - using (SolidBrush br = new(ForeColor)) - { - G.DrawString(Text, Font, br, Rect, FormatX); - } + G.InterpolationMode = InterpolationMode.HighQualityBicubic; + G.DrawImage(b, ClientRect, 0, 0, b.Width, b.Height, GraphicsUnit.Pixel); - } + G.SmoothingMode = SmoothingMode.AntiAlias; + G.DrawString(Text, Font, br, Rect, FormatX); } } @@ -51,20 +41,16 @@ public static void DrawGlow(this Graphics G, Rectangle R, Color GlowColor, int G { try { - if (GlowSize <= 0) - GlowSize = 1; + if (GlowSize <= 0) GlowSize = 1; + if (GlowFade <= 0) GlowFade = 1; - if (GlowFade <= 0) - GlowFade = 1; + Rectangle Rect = new(R.X - GlowSize - 2, R.Y - GlowSize - 2, R.Width + GlowSize * 2 + 3, R.Height + GlowSize * 2 + 3); - Rectangle Rect; - Rect = new Rectangle(R.X - GlowSize - 2, R.Y - GlowSize - 2, R.Width + GlowSize * 2 + 3, R.Height + GlowSize * 2 + 3); - - using (var bm = new Bitmap((int)Math.Round(Rect.Width / (double)GlowFade), (int)Math.Round(Rect.Height / (double)GlowFade))) + using (Bitmap bm = new((int)Math.Round(Rect.Width / (double)GlowFade), (int)Math.Round(Rect.Height / (double)GlowFade))) { using (var G2 = Graphics.FromImage(bm)) { - var Rect2 = new Rectangle(1, 1, bm.Width, bm.Height); + Rectangle Rect2 = new(1, 1, bm.Width, bm.Height); using (SolidBrush br = new(GlowColor)) { @@ -177,7 +163,7 @@ public static void DrawRoundImage(this Graphics Graphics, Image Image, Rectangle { using (var path = Rectangle.Round(Radius)) { - var reg = new Region(path); + Region reg = new(path); Graphics.Clip = reg; Graphics.DrawImage(Image, Rectangle); Graphics.ResetClip(); @@ -268,155 +254,153 @@ public static void DrawRoundedRect_LikeW11(this Graphics Graphics, Pen PenX, Rec Graphics.SmoothingMode = SmoothingMode.AntiAlias; - using (var Pen = new Pen(PenX.Color, PenX.Width) { DashStyle = PenX.DashStyle, DashOffset = PenX.DashOffset }) + using (Pen Pen = new(PenX.Color, PenX.Width) { DashStyle = PenX.DashStyle, DashOffset = PenX.DashOffset }) + using (Pen Pen2 = new(PenX.Color, PenX.Width) { DashStyle = PenX.DashStyle, DashOffset = PenX.DashOffset }) { - using (var Pen2 = new Pen(PenX.Color, PenX.Width) { DashStyle = PenX.DashStyle, DashOffset = PenX.DashOffset }) + Pen SidePen = new(PenX.Color, PenX.Width) { DashStyle = PenX.DashStyle, DashOffset = PenX.DashOffset }; + + if (Dark) { - var SidePen = new Pen(PenX.Color, PenX.Width) { DashStyle = PenX.DashStyle, DashOffset = PenX.DashOffset }; + Pen.Color = PenX.Color.CB(0.06f); + Pen2.Color = PenX.Color; + } + else + { + Pen.Color = PenX.Color; + Pen2.Color = PenX.Color.CB(-0.12f); + } - if (Dark) + LinearGradientBrush G; + var CColor = Pen2.Color.CB((float)(Dark ? 0.03d : -0.05d)); + + if (Dark) + { + G = new(Rectangle, CColor, Pen.Color, 180f); + ColorBlend cblend = new(5) { - Pen.Color = PenX.Color.CB(0.06f); - Pen2.Color = PenX.Color; - } - else + Colors = new Color[5] { CColor, Pen.Color, Pen.Color, Pen.Color, CColor }, + Positions = Rounded ? + new float[5] { 0f, 0.1f, 0.5f, 0.9f, 1.0f } : + new float[5] { 0f, 0.1f, 0.5f, 0.9f, 1.0f } + }; + G.InterpolationColors = cblend; + } + else + { + G = new(Rectangle, Pen.Color, CColor, 180f); + ColorBlend cblend = new(5) { - Pen.Color = PenX.Color; - Pen2.Color = PenX.Color.CB(-0.12f); - } + Colors = new Color[5] { Pen.Color, CColor, CColor, CColor, Pen.Color }, + Positions = new float[5] { 0f, 0.1f, 0.5f, 0.9f, 1.0f } + }; + G.InterpolationColors = cblend; + } + + using (Pen PenG = new(G, PenX.Width) { DashStyle = PenX.DashStyle, DashOffset = PenX.DashOffset }) + { + + Point P_T1 = new((int)Math.Round(Rectangle.X + Radius / 2d), Rectangle.Y); + Point P_T2 = new((int)Math.Round(Rectangle.X + Rectangle.Width - Radius / 2d), Rectangle.Y); + + Point P_B1 = new((int)Math.Round(Rectangle.X + Radius / 2d), Rectangle.Y + Rectangle.Height); + Point P_B2 = new((int)Math.Round(Rectangle.X + Rectangle.Width - Radius / 2d), Rectangle.Y + Rectangle.Height); + + Point P_LB = new(Rectangle.X, Rectangle.Y + Rectangle.Height); + Point P_RB = new(Rectangle.X + Rectangle.Width, Rectangle.Y + Rectangle.Height); + + Point P_LT = new(Rectangle.X, Rectangle.Y); + Point P_RT = new(Rectangle.X + Rectangle.Width, Rectangle.Y); + + Point P_L1 = new(Rectangle.X, (int)Math.Round(Rectangle.Y + Radius / 2d)); + Point P_L2 = new(Rectangle.X, (int)Math.Round(Rectangle.Y + Rectangle.Height - Radius / 2.5d)); - LinearGradientBrush G; - var CColor = Pen2.Color.CB((float)(Dark ? 0.03d : -0.05d)); + Point P_R1 = new(Rectangle.X + Rectangle.Width, (int)Math.Round(Rectangle.Y + Radius / 2d)); + Point P_R2 = new(Rectangle.X + Rectangle.Width, (int)Math.Round(Rectangle.Y + Rectangle.Height - Radius / 2.5d)); if (Dark) { - G = new LinearGradientBrush(Rectangle, CColor, Pen.Color, 180f); - var cblend = new ColorBlend(5) + Graphics.DrawLine(Pen2, P_B1, P_B2); + + if (Rounded) { - Colors = new Color[5] { CColor, Pen.Color, Pen.Color, Pen.Color, CColor }, - Positions = Rounded ? - new float[5] { 0f, 0.1f, 0.5f, 0.9f, 1.0f } : - new float[5] { 0f, 0.1f, 0.5f, 0.9f, 1.0f } - }; - G.InterpolationColors = cblend; - } - else - { - G = new LinearGradientBrush(Rectangle, Pen.Color, CColor, 180f); - var cblend = new ColorBlend(5) + Graphics.DrawArc(Pen2, Rectangle.X, Rectangle.Y + Rectangle.Height - Radius, Radius, Radius, 90, 90); + Graphics.DrawArc(Pen2, Rectangle.X + Rectangle.Width - Radius, Rectangle.Y + Rectangle.Height - Radius, Radius, Radius, 0, 90); + } + else { - Colors = new Color[5] { Pen.Color, CColor, CColor, CColor, Pen.Color }, - Positions = new float[5] { 0f, 0.1f, 0.5f, 0.9f, 1.0f } - }; - G.InterpolationColors = cblend; - } + Graphics.DrawLine(Pen2, P_B1, P_LB); + Graphics.DrawLine(Pen2, P_LB, P_L1); - using (var PenG = new Pen(G, PenX.Width) { DashStyle = PenX.DashStyle, DashOffset = PenX.DashOffset }) - { + Graphics.DrawLine(Pen2, P_B2, P_RB); + Graphics.DrawLine(Pen2, P_RB, P_R1); + } - Point P_T1 = new((int)Math.Round(Rectangle.X + Radius / 2d), Rectangle.Y); - Point P_T2 = new((int)Math.Round(Rectangle.X + Rectangle.Width - Radius / 2d), Rectangle.Y); + SidePen = Pen2; - Point P_B1 = new((int)Math.Round(Rectangle.X + Radius / 2d), Rectangle.Y + Rectangle.Height); - Point P_B2 = new((int)Math.Round(Rectangle.X + Rectangle.Width - Radius / 2d), Rectangle.Y + Rectangle.Height); + Graphics.DrawLine(SidePen, P_L1, P_L2); - Point P_LB = new(Rectangle.X, Rectangle.Y + Rectangle.Height); - Point P_RB = new(Rectangle.X + Rectangle.Width, Rectangle.Y + Rectangle.Height); + Graphics.DrawLine(SidePen, P_R1, P_R2); - Point P_LT = new(Rectangle.X, Rectangle.Y); - Point P_RT = new(Rectangle.X + Rectangle.Width, Rectangle.Y); + if (Rounded) + { + Graphics.DrawArc(PenG, Rectangle.X, Rectangle.Y, Radius, Radius, 180, 90); + Graphics.DrawArc(PenG, Rectangle.X + Rectangle.Width - Radius, Rectangle.Y, Radius, Radius, 270, 90); + } + else + { + Graphics.DrawLine(Pen, P_T1, P_LT); + Graphics.DrawLine(SidePen, P_LT, P_L1); - Point P_L1 = new(Rectangle.X, (int)Math.Round(Rectangle.Y + Radius / 2d)); - Point P_L2 = new(Rectangle.X, (int)Math.Round(Rectangle.Y + Rectangle.Height - Radius / 2.5d)); + Graphics.DrawLine(Pen, P_T2, P_RT); + Graphics.DrawLine(SidePen, P_RT, P_R1); + } - Point P_R1 = new(Rectangle.X + Rectangle.Width, (int)Math.Round(Rectangle.Y + Radius / 2d)); - Point P_R2 = new(Rectangle.X + Rectangle.Width, (int)Math.Round(Rectangle.Y + Rectangle.Height - Radius / 2.5d)); + Graphics.DrawLine(PenG, P_T1, P_T2); + } - if (Dark) + else + { + Graphics.DrawLine(Pen2, P_B1, P_B2); + + if (Rounded) + { + Graphics.DrawArc(PenG, Rectangle.X, Rectangle.Y + Rectangle.Height - Radius, Radius, Radius, 90, 90); + Graphics.DrawArc(PenG, Rectangle.X + Rectangle.Width - Radius, Rectangle.Y + Rectangle.Height - Radius, Radius, Radius, 0, 90); + } + else { - Graphics.DrawLine(Pen2, P_B1, P_B2); - - if (Rounded) - { - Graphics.DrawArc(Pen2, Rectangle.X, Rectangle.Y + Rectangle.Height - Radius, Radius, Radius, 90, 90); - Graphics.DrawArc(Pen2, Rectangle.X + Rectangle.Width - Radius, Rectangle.Y + Rectangle.Height - Radius, Radius, Radius, 0, 90); - } - else - { - Graphics.DrawLine(Pen2, P_B1, P_LB); - Graphics.DrawLine(Pen2, P_LB, P_L1); - - Graphics.DrawLine(Pen2, P_B2, P_RB); - Graphics.DrawLine(Pen2, P_RB, P_R1); - } - - SidePen = Pen2; - - Graphics.DrawLine(SidePen, P_L1, P_L2); - - Graphics.DrawLine(SidePen, P_R1, P_R2); - - if (Rounded) - { - Graphics.DrawArc(PenG, Rectangle.X, Rectangle.Y, Radius, Radius, 180, 90); - Graphics.DrawArc(PenG, Rectangle.X + Rectangle.Width - Radius, Rectangle.Y, Radius, Radius, 270, 90); - } - else - { - Graphics.DrawLine(Pen, P_T1, P_LT); - Graphics.DrawLine(SidePen, P_LT, P_L1); - - Graphics.DrawLine(Pen, P_T2, P_RT); - Graphics.DrawLine(SidePen, P_RT, P_R1); - } - - Graphics.DrawLine(PenG, P_T1, P_T2); + Graphics.DrawLine(Pen2, P_B1, P_LB); + Graphics.DrawLine(SidePen, P_LB, P_L1); + + Graphics.DrawLine(Pen2, P_B2, P_RB); + Graphics.DrawLine(SidePen, P_RB, P_R1); } + SidePen = Pen; + + Graphics.DrawLine(SidePen, P_L1, P_L2); + + Graphics.DrawLine(SidePen, P_R1, P_R2); + + if (Rounded) + { + Graphics.DrawArc(Pen, Rectangle.X, Rectangle.Y, Radius, Radius, 180, 90); + Graphics.DrawArc(Pen, Rectangle.X + Rectangle.Width - Radius, Rectangle.Y, Radius, Radius, 270, 90); + } else { - Graphics.DrawLine(Pen2, P_B1, P_B2); - - if (Rounded) - { - Graphics.DrawArc(PenG, Rectangle.X, Rectangle.Y + Rectangle.Height - Radius, Radius, Radius, 90, 90); - Graphics.DrawArc(PenG, Rectangle.X + Rectangle.Width - Radius, Rectangle.Y + Rectangle.Height - Radius, Radius, Radius, 0, 90); - } - else - { - Graphics.DrawLine(Pen2, P_B1, P_LB); - Graphics.DrawLine(SidePen, P_LB, P_L1); - - Graphics.DrawLine(Pen2, P_B2, P_RB); - Graphics.DrawLine(SidePen, P_RB, P_R1); - } - - SidePen = Pen; - - Graphics.DrawLine(SidePen, P_L1, P_L2); - - Graphics.DrawLine(SidePen, P_R1, P_R2); - - if (Rounded) - { - Graphics.DrawArc(Pen, Rectangle.X, Rectangle.Y, Radius, Radius, 180, 90); - Graphics.DrawArc(Pen, Rectangle.X + Rectangle.Width - Radius, Rectangle.Y, Radius, Radius, 270, 90); - } - else - { - Graphics.DrawLine(Pen, P_T1, P_LT); - Graphics.DrawLine(Pen, P_LT, P_L1); - - Graphics.DrawLine(Pen, P_T2, P_RT); - Graphics.DrawLine(Pen, P_RT, P_R1); - } - - Graphics.DrawLine(Pen, P_T1, P_T2); + Graphics.DrawLine(Pen, P_T1, P_LT); + Graphics.DrawLine(Pen, P_LT, P_L1); + + Graphics.DrawLine(Pen, P_T2, P_RT); + Graphics.DrawLine(Pen, P_RT, P_R1); } - } - SidePen.Dispose(); + Graphics.DrawLine(Pen, P_T1, P_T2); + } } + + SidePen.Dispose(); } } catch diff --git a/WinPaletter/Program/TypesExtensions/Icons.cs b/WinPaletter/Program/TypesExtensions/Icons.cs index 8a7fb872..ea23241f 100644 --- a/WinPaletter/Program/TypesExtensions/Icons.cs +++ b/WinPaletter/Program/TypesExtensions/Icons.cs @@ -8,7 +8,7 @@ public static class IconsExtensions public static byte[] ToByteArray(this Icon icon) { - using (var ms = new MemoryStream()) + using (MemoryStream ms = new()) { icon.Save(ms); byte[] b = ms.ToArray(); @@ -19,7 +19,7 @@ public static byte[] ToByteArray(this Icon icon) public static Icon ToIcon(this byte[] bytes) { - using (var ms = new MemoryStream(bytes)) + using (MemoryStream ms = new(bytes)) { return new Icon(ms); } diff --git a/WinPaletter/Program/TypesExtensions/StringFormats.cs b/WinPaletter/Program/TypesExtensions/StringFormats.cs index 01f9e0d3..f7769465 100644 --- a/WinPaletter/Program/TypesExtensions/StringFormats.cs +++ b/WinPaletter/Program/TypesExtensions/StringFormats.cs @@ -6,7 +6,7 @@ public static class StringFormatExtensions { public static StringFormat ToStringFormat(this ContentAlignment TextAlign, bool RightToLeft = false) { - var SF = new StringFormat(); + StringFormat SF = new(); switch (TextAlign) { case ContentAlignment.TopLeft: diff --git a/WinPaletter/Program/TypesExtensions/StringLists.cs b/WinPaletter/Program/TypesExtensions/StringLists.cs index faf49a66..6f157fbe 100644 --- a/WinPaletter/Program/TypesExtensions/StringLists.cs +++ b/WinPaletter/Program/TypesExtensions/StringLists.cs @@ -9,7 +9,7 @@ public static class StringListsExtensions /// public static List DeDuplicate(this List List) { - var Result = new List(); + List Result = new(); bool Exist; diff --git a/WinPaletter/Program/TypesExtensions/Strings.cs b/WinPaletter/Program/TypesExtensions/Strings.cs index 95ee9bdf..7253cd09 100644 --- a/WinPaletter/Program/TypesExtensions/Strings.cs +++ b/WinPaletter/Program/TypesExtensions/Strings.cs @@ -79,9 +79,9 @@ public static Color FromWin32RegToColor(this string String) /// public static List CList(this string String) { - var List = new List(); + List List = new(); List.Clear(); - using (var Reader = new StringReader(String)) + using (StringReader Reader = new(String)) { while (Reader.Peek() >= 0) List.Add(Reader.ReadLine()); @@ -99,16 +99,13 @@ public static SizeF Measure(this string text, Font font) try { - var TextBitmap = new Bitmap(1, 1); - var TextGraphics = Graphics.FromImage(TextBitmap); + Bitmap TextBitmap = new(1, 1); + Graphics TextGraphics = Graphics.FromImage(TextBitmap); return TextGraphics.MeasureString(text, font); } - catch - { - } + catch { } return default; - } @@ -139,11 +136,11 @@ public static string Compress(this string uncompressedString) { byte[] compressedBytes; - using (var uncompressedStream = new MemoryStream(Encoding.UTF8.GetBytes(uncompressedString))) + using (MemoryStream uncompressedStream = new(Encoding.UTF8.GetBytes(uncompressedString))) { - using (var compressedStream = new MemoryStream()) + using (MemoryStream compressedStream = new()) { - using (var compressorStream = new DeflateStream(compressedStream, CompressionLevel.Fastest, true)) + using (DeflateStream compressorStream = new(compressedStream, CompressionLevel.Fastest, true)) { uncompressedStream.CopyTo(compressorStream); } @@ -158,11 +155,11 @@ public static string Compress(this string uncompressedString) public static string Decompress(this string compressedString) { byte[] decompressedBytes; - var compressedStream = new MemoryStream(Convert.FromBase64String(compressedString)); + MemoryStream compressedStream = new(Convert.FromBase64String(compressedString)); - using (var decompressorStream = new DeflateStream(compressedStream, CompressionMode.Decompress)) + using (DeflateStream decompressorStream = new(compressedStream, CompressionMode.Decompress)) { - using (var decompressedStream = new MemoryStream()) + using (MemoryStream decompressedStream = new()) { decompressorStream.CopyTo(decompressedStream); decompressedBytes = decompressedStream.ToArray(); @@ -177,7 +174,7 @@ public static string Replace(this string s, string word, string by, StringCompar { s += " "; int wordSt; - var sb = new StringBuilder(); + StringBuilder sb = new(); while (s.IndexOf(word, stringComparison) > -1) { wordSt = s.IndexOf(word, stringComparison); diff --git a/WinPaletter/Program/TypesExtensions/Structures.cs b/WinPaletter/Program/TypesExtensions/Structures.cs index 72adf7b5..bdcd3b6c 100644 --- a/WinPaletter/Program/TypesExtensions/Structures.cs +++ b/WinPaletter/Program/TypesExtensions/Structures.cs @@ -1,9 +1,5 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Reflection; -using System.Text; -using System.Threading.Tasks; namespace WinPaletter.TypesExtensions { diff --git a/WinPaletter/Program/TypesExtensions/TreeViews.cs b/WinPaletter/Program/TypesExtensions/TreeViews.cs index dcd7b505..44165b60 100644 --- a/WinPaletter/Program/TypesExtensions/TreeViews.cs +++ b/WinPaletter/Program/TypesExtensions/TreeViews.cs @@ -12,9 +12,9 @@ public static class TreeViewExtensions /// public static void FromJSON(this TreeView TreeView, string JSON_File, string rootName) { - var reader = new StreamReader(JSON_File); - var jsonReader = new JsonTextReader(reader); - var root = JToken.Load(jsonReader); + StreamReader reader = new(JSON_File); + JsonTextReader jsonReader = new(reader); + JToken root = JToken.Load(jsonReader); reader.Close(); TreeView.BeginUpdate(); @@ -85,13 +85,13 @@ private static void AddNode(JToken token, TreeNode inTreeNode) /// public static string ToJSON(this TreeNode TreeNode) { - var J_All = new JObject(); + JObject J_All = new(); J_All.RemoveAll(); foreach (TreeNode N in TreeNode.Nodes) { - var J = new JObject(); + JObject J = new(); J.RemoveAll(); LoopThroughNodes(N, N, J); diff --git a/WinPaletter/Program/Users/User.cs b/WinPaletter/Program/Users/User.cs index 757a0556..9737b1b8 100644 --- a/WinPaletter/Program/Users/User.cs +++ b/WinPaletter/Program/Users/User.cs @@ -251,7 +251,7 @@ public static bool UpdateToken(string Password, bool ignoreError = false) if (result) { Token = token; - Identity = new WindowsIdentity(Token); + Identity = new(Token); EditReg("HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Lsa", "LimitBlankPasswordUse", OldValue); return true; } @@ -528,11 +528,11 @@ public static void UpdatePathsFromSID(string SID = null) /// true if user is an Administrator, false otherwise. public static bool IsAdmin(string SID) { - var AdminGroupSID = new SecurityIdentifier("S-1-5-32-544"); + SecurityIdentifier AdminGroupSID = new("S-1-5-32-544"); - var pContext = new PrincipalContext(ContextType.Machine); - var pUser = new UserPrincipal(pContext); - var pSearcher = new PrincipalSearcher(pUser); + PrincipalContext pContext = new(ContextType.Machine); + UserPrincipal pUser = new(pContext); + PrincipalSearcher pSearcher = new(pUser); Principal User = (from u in pSearcher.FindAll() where u.Sid.ToString().Equals(SID, StringComparison.OrdinalIgnoreCase) select u).FirstOrDefault(); diff --git a/WinPaletter/Properties/Resources.Designer.cs b/WinPaletter/Properties/Resources.Designer.cs index 3a454033..7ea7973a 100644 --- a/WinPaletter/Properties/Resources.Designer.cs +++ b/WinPaletter/Properties/Resources.Designer.cs @@ -1,4 +1,4 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.42000 @@ -2136,84 +2136,5 @@ internal static System.Drawing.Bitmap WP_Admin { return ((System.Drawing.Bitmap)(obj)); } } - - /// - /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-16"?> - ///<Task version="1.4" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task"> - /// <RegistrationInfo> - /// <Author>WinPaletter</Author> - /// <Description>Play Windows logoff sound forcibly on Windows 8 and higher</Description> - /// <URI>\WinPaletter\Logoff</URI> - /// </RegistrationInfo> - /// <Triggers> - /// <EventTrigger> - /// <Enabled>true</Enabled> - /// <Subscription>&lt;QueryList&gt;&lt;Query Id="0" Path="Security"&gt;&lt;Select Path="Security"&gt;*[System[Even [rest of string was truncated]";. - /// - internal static string XML_Logoff { - get { - return ResourceManager.GetString("XML_Logoff", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-16"?> - ///<Task version="1.4" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task"> - /// <RegistrationInfo> - /// <Author>WinPaletter</Author> - /// <Description>Play Windows logon sound forcibly on Windows 8 and higher</Description> - /// <URI>\WinPaletter\Play logon sound</URI> - /// </RegistrationInfo> - /// <Triggers> - /// <LogonTrigger> - /// <Enabled>true</Enabled> - /// </LogonTrigger> - /// <SessionStateChangeTrigger> - /// <Enabled>true</Enabled> - /// <StateChange>Con [rest of string was truncated]";. - /// - internal static string XML_Logon { - get { - return ResourceManager.GetString("XML_Logon", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-16"?> - ///<Task version="1.4" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task"> - /// <RegistrationInfo> - /// <Author>WinPaletter</Author> - /// <Description>Play Windows shutdown sound forcibly on Windows 8 and higher</Description> - /// <URI>\WinPaletter\Play shutdown sound</URI> - /// </RegistrationInfo> - /// <Triggers> - /// <EventTrigger> - /// <Enabled>true</Enabled> - /// <Subscription>&lt;QueryList&gt;&lt;Query Id="0" Path="System"&gt;&lt;Select Path="System"&gt;*[ [rest of string was truncated]";. - /// - internal static string XML_Shutdown { - get { - return ResourceManager.GetString("XML_Shutdown", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-16"?> - ///<Task version="1.2" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task"> - /// <RegistrationInfo> - /// <Author>WinPaletter, MuscularPukyy</Author> - /// <Description>Play Windows account unlock sound forcibly on Windows 8 and higher</Description> - /// <URI>\WinPaletter\Unlock</URI> - /// </RegistrationInfo> - /// <Triggers> - /// <EventTrigger> - /// <Enabled>true</Enabled> - /// <Subscription>&lt;QueryList&gt;&lt;Query Id="0" Path="Security"&gt;&lt;Select Path="Sec [rest of string was truncated]";. - /// - internal static string XML_Unlock { - get { - return ResourceManager.GetString("XML_Unlock", resourceCulture); - } - } } } diff --git a/WinPaletter/Properties/Resources.resx b/WinPaletter/Properties/Resources.resx index 58953e80..867b72ad 100644 --- a/WinPaletter/Properties/Resources.resx +++ b/WinPaletter/Properties/Resources.resx @@ -235,7 +235,7 @@ iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAA6hJREFUSEu1lV9MU2cYxksmSA+MtgpFaCpmGDWZf9jFvHKLGWIGyKhWQVFh2dQL + vgAADr4B6kKxwAAAA6hJREFUSEu1lV9MU2cYxksmSA+MtgpFaCpmGDWZf9jFvHKLGWIGyKhWQVFh2dQL TRSYJjOL0SHGbJI4TWRkrOjAEYgQlSim6oWJ0SnEROQCyAoKR6GOc3qs0F2s7Xl8v9JWz7EqOH2SX5q8 OXl+fft9J9VkZGS8FxSJ9MC7QBE24Hk+ShCEfGLb63A4HOvVZa9CETYYHR3NpBK8ic7OTrS3t19WF0ZC ETagAou6MBJMYrPZmOgvdakaRdiACqYkCYpuqYtfRBE2oIIpS4Ki2+ryEIqwARVMStLV1YW6ujqFyG63 @@ -17595,7 +17595,7 @@ iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAYAAAA8AXHiAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAALK5JREFUeF7tnAd0Hdd555/kKM462SS7cexzvImTTXHiHHt3EzsusSVZki3bUlSs + wAAADsABataJCQAALK5JREFUeF7tnAd0Hdd555/kKM462SS7cexzvImTTXHiHHt3EzsusSVZki3bUlSs SlWKvYsEO9gAEARA9N4r0QgQvZEAAbAD7CBIgAQIogNE7/U9AMR//9+8N+AAfKRESkpEZr5zfufOmxnM 3Ln3P9/33TszMOimm2666aabbrrppptuuummm2666aabbrrppptuuummm2666aabbrrppptuuummm266 6aabbrrppptuuummm2666aabbrrppptuuummm2666aabbrrppptuuummm2666aabbrrp9lDY4yuN+OPN @@ -17997,7 +17997,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAA7tJREFUSEvtlMtvG1UYxe+MPU/37wGBoJSUVCFNQx+gRiW8hMSCxQiVPZZQd0hg + vwAADr8BOAVTJAAAA7tJREFUSEvtlMtvG1UYxe+MPU/37wGBoJSUVCFNQx+gRiW8hMSCxQiVPZZQd0hg QYughLqhpKENCqVQUHmIBTsMRE0fCXGTOk4cO3Wc2M4kUTKeezg3HijIigX7ftLRnbE8v3Pm3JkR9+d/ jfmT/Nn6Eb9a3yFjfoNM/DI1KjPxi2HGOC+vxwfkK9oGXtd8OU5ltDpVCzNaVWbECpR+F8u4FOFax/xB btnfA/ZV6mvAvCRhjErER6jzQGxAvqlvyvfEOqCtAfoqf6txrfJ85W/lI1zrWFfhb8O/BayvCFcGnxN+ @@ -28317,16 +28317,4 @@ sgAAAABJRU5ErkJggg== - - ..\Resources\XML_Logoff.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16 - - - ..\Resources\XML_Logon.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16 - - - ..\Resources\XML_Shutdown.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16 - - - ..\Resources\XML_Unlock.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16 - \ No newline at end of file diff --git a/WinPaletter/Resources/RetroThemesDB.wpdb b/WinPaletter/Resources/RetroThemesDB.wpdb index ee7e3175..e4e820a2 100644 --- a/WinPaletter/Resources/RetroThemesDB.wpdb +++ b/WinPaletter/Resources/RetroThemesDB.wpdb @@ -46,6 +46,23 @@ Plus! - The Golden Era|ActiveTitle=128 128 128|GradientActiveTitle=16 132 208|Gr Plus! - Travel|ActiveTitle=0 128 128|GradientActiveTitle=16 132 208|GradientInactiveTitle=181 181 181|Background=0 0 0|Hilight=128 128 128|HilightText=192 192 192|TitleText=192 192 192|Window=192 192 192|WindowText=0 0 0|Scrollbar=200 192 184|InactiveTitle=96 88 72|Menu=144 128 112|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=144 128 112|InactiveBorder=144 128 112|AppWorkspace=95 84 73|ButtonFace=144 128 112|ButtonShadow=96 88 72|GrayText=96 88 72|ButtonText=0 0 0|InactiveTitleText=144 128 112|ButtonHilight=200 192 184|ButtonDkShadow=0 0 0|ButtonLight=144 128 112|InfoText=0 128 128|InfoWindow=255 255 255 Plus! - Underwater|ActiveTitle=0 0 0|GradientActiveTitle=16 132 208|GradientInactiveTitle=181 181 181|Background=40 72 128|Hilight=255 255 0|HilightText=0 0 0|TitleText=255 255 0|Window=255 255 255|WindowText=0 0 0|Scrollbar=152 176 224|InactiveTitle=40 72 128|Menu=56 104 200|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=56 104 200|InactiveBorder=56 104 200|AppWorkspace=37 68 131|ButtonFace=56 104 200|ButtonShadow=40 72 128|GrayText=40 72 128|ButtonText=0 0 0|InactiveTitleText=192 192 192|ButtonHilight=152 176 224|ButtonDkShadow=0 0 0|ButtonLight=56 104 200|InfoText=128 0 128|InfoWindow=255 255 255 Plus! - Windows 98 (256 color)|ActiveTitle=0 128 128|GradientActiveTitle=16 132 208|GradientInactiveTitle=181 181 181|Background=192 192 192|Hilight=0 128 128|HilightText=255 255 255|TitleText=255 255 255|Window=255 255 255|WindowText=0 0 0|Scrollbar=216 224 240|InactiveTitle=88 124 176|Menu=184 196 224|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=180 195 220|InactiveBorder=180 195 220|AppWorkspace=192 192 192|ButtonFace=184 196 224|ButtonShadow=88 124 176|GrayText=88 124 176|ButtonText=0 0 0|InactiveTitleText=0 0 128|ButtonHilight=216 224 240|ButtonDkShadow=0 0 0|ButtonLight=184 196 224|InfoText=0 0 0|InfoWindow=255 255 225 +Plus! 98 CD - Architecture|ActiveTitle=104 56 0|Background=165 165 169|Hilight=184 112 0|HilightText=255 255 255|TitleText=255 255 255|Window=255 255 255|WindowText=0 0 0|Scrollbar=192 192 192|InactiveTitle=0 72 0|Menu=192 192 192|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=192 192 192|InactiveBorder=192 192 192|AppWorkspace=205 162 82|ButtonFace=192 192 192|ButtonShadow=128 128 128|GrayText=128 128 128|ButtonText=0 0 0|InactiveTitleText=255 255 255|ButtonHilight=255 255 255|ButtonDkShadow=0 0 0|ButtonLight=224 224 224|InfoText=0 0 0|InfoWindow=255 255 225|GradientActiveTitle=224 160 96|GradientInactiveTitle=136 176 144 +Plus! 98 CD - Cathy|ActiveTitle=128 0 128|Background=166 202 240|Hilight=128 0 128|HilightText=255 255 255|TitleText=255 255 255|Window=255 248 240|WindowText=0 0 0|Scrollbar=192 192 192|InactiveTitle=0 0 0|Menu=192 192 192|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=128 0 128|InactiveBorder=0 0 0|AppWorkspace=192 192 192|ButtonFace=192 192 192|ButtonShadow=128 128 128|GrayText=128 128 128|ButtonText=0 0 0|InactiveTitleText=160 160 168|ButtonHilight=255 255 255|ButtonDkShadow=0 0 0|ButtonLight=224 224 224|InfoText=0 0 0|InfoWindow=255 255 225 +Plus! 98 CD - Cityscape|ActiveTitle=0 0 152|Background=78 80 154|Hilight=88 120 240|HilightText=255 255 255|TitleText=255 255 255|Window=255 255 255|WindowText=0 0 0|Scrollbar=192 192 192|InactiveTitle=16 0 72|Menu=192 192 192|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=192 192 192|InactiveBorder=192 192 192|AppWorkspace=205 162 82|ButtonFace=192 192 192|ButtonShadow=128 128 128|GrayText=128 128 128|ButtonText=0 0 0|InactiveTitleText=255 255 255|ButtonHilight=255 255 255|ButtonDkShadow=0 0 0|ButtonLight=224 224 224|InfoText=0 0 0|InfoWindow=255 255 225|GradientActiveTitle=144 168 255|GradientInactiveTitle=152 168 216 +Plus! 98 CD - Corbis Photography|ActiveTitle=0 0 0|Background=0 0 0|Hilight=0 0 0|HilightText=255 255 255|TitleText=255 255 255|Window=255 255 255|WindowText=0 0 0|Scrollbar=192 192 192|InactiveTitle=128 128 128|Menu=192 192 192|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=192 192 192|InactiveBorder=192 192 192|AppWorkspace=128 128 128|ButtonFace=192 192 192|ButtonShadow=128 128 128|GrayText=128 128 128|ButtonText=0 0 0|InactiveTitleText=192 192 192|ButtonHilight=255 255 255|ButtonDkShadow=0 0 0|ButtonLight=192 192 192|InfoText=0 0 0|InfoWindow=255 255 225 +Plus! 98 CD - Doonesbury|ActiveTitle=255 255 0|Background=0 0 128|Hilight=0 0 0|HilightText=255 255 255|TitleText=128 0 0|Window=255 255 255|WindowText=128 0 0|Scrollbar=200 208 208|InactiveTitle=128 0 0|Menu=144 152 160|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=128 128 128|InactiveBorder=96 104 112|AppWorkspace=144 152 160|ButtonFace=144 152 160|ButtonShadow=96 104 112|GrayText=96 104 112|ButtonText=0 0 0|InactiveTitleText=255 255 0|ButtonHilight=200 208 208|ButtonDkShadow=0 0 0|ButtonLight=144 152 160|InfoText=255 255 255|InfoWindow=0 0 128 +Plus! 98 CD - Falling Leaves|ActiveTitle=152 40 32|Background=230 170 98|Hilight=152 40 32|HilightText=255 255 255|TitleText=255 255 255|Window=255 255 255|WindowText=0 0 0|Scrollbar=192 192 192|InactiveTitle=232 104 0|Menu=192 192 192|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=192 192 192|InactiveBorder=192 192 192|AppWorkspace=205 162 82|ButtonFace=192 192 192|ButtonShadow=128 128 128|GrayText=128 128 128|ButtonText=0 0 0|InactiveTitleText=255 255 255|ButtonHilight=255 255 255|ButtonDkShadow=0 0 0|ButtonLight=224 224 224|InfoText=0 0 0|InfoWindow=255 255 225|GradientActiveTitle=240 104 64|GradientInactiveTitle=255 192 72 +Plus! 98 CD - Fashion|ActiveTitle=112 48 48|Background=205 186 169|Hilight=200 168 152|HilightText=255 255 255|TitleText=255 255 255|Window=255 255 255|WindowText=0 0 0|Scrollbar=192 192 192|InactiveTitle=80 80 120|Menu=192 192 192|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=192 192 192|InactiveBorder=192 192 192|AppWorkspace=205 162 82|ButtonFace=192 192 192|ButtonShadow=128 128 128|GrayText=128 128 128|ButtonText=0 0 0|InactiveTitleText=255 255 255|ButtonHilight=255 255 255|ButtonDkShadow=0 0 0|ButtonLight=224 224 224|InfoText=0 0 0|InfoWindow=255 255 225|GradientActiveTitle=184 104 104|GradientInactiveTitle=152 160 192 +Plus! 98 CD - FoxTrot|ActiveTitle=255 255 0|Background=0 0 128|Hilight=0 0 128|HilightText=255 255 0|TitleText=0 0 128|Window=255 255 255|WindowText=0 0 0|Scrollbar=200 208 208|InactiveTitle=0 0 0|Menu=144 152 160|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=128 128 128|InactiveBorder=96 104 112|AppWorkspace=144 152 160|ButtonFace=144 152 160|ButtonShadow=96 104 112|GrayText=96 104 112|ButtonText=0 0 0|InactiveTitleText=200 208 208|ButtonHilight=200 208 208|ButtonDkShadow=0 0 0|ButtonLight=144 152 160|InfoText=255 255 255|InfoWindow=0 0 128 +Plus! 98 CD - Garfield|ActiveTitle=255 153 0|Background=255 251 240|Hilight=168 200 240|HilightText=255 255 255|TitleText=255 255 255|Window=255 255 255|WindowText=0 0 0|Scrollbar=192 192 192|InactiveTitle=255 208 128|Menu=192 192 192|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=255 153 0|InactiveBorder=192 192 192|AppWorkspace=192 192 192|ButtonFace=192 192 192|ButtonShadow=128 128 128|GrayText=128 128 128|ButtonText=0 0 0|InactiveTitleText=192 192 192|ButtonHilight=255 255 255|ButtonDkShadow=0 0 0|ButtonLight=224 224 224|InfoText=0 0 0|InfoWindow=255 255 225 +Plus! 98 CD - Geometry|ActiveTitle=0 0 104|Background=0 0 94|Hilight=208 184 24|HilightText=255 255 255|TitleText=255 255 255|Window=255 255 255|WindowText=0 0 0|Scrollbar=192 192 192|InactiveTitle=0 0 0|Menu=192 192 192|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=192 192 192|InactiveBorder=192 192 192|AppWorkspace=205 162 82|ButtonFace=192 192 192|ButtonShadow=128 128 128|GrayText=128 128 128|ButtonText=0 0 0|InactiveTitleText=255 255 255|ButtonHilight=255 255 255|ButtonDkShadow=0 0 0|ButtonLight=224 224 224|InfoText=0 0 0|InfoWindow=255 255 225|GradientActiveTitle=0 0 208|GradientInactiveTitle=128 128 128 +Plus! 98 CD - Horror Channel|ActiveTitle=72 16 112|Background=11 45 49|Hilight=80 80 64|HilightText=255 255 255|TitleText=255 255 255|Window=255 255 255|WindowText=0 0 0|Scrollbar=192 192 192|InactiveTitle=80 76 56|Menu=152 168 112|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=0 0 128|InactiveBorder=0 0 128|AppWorkspace=128 128 128|ButtonFace=152 168 112|ButtonShadow=128 128 128|GrayText=128 128 128|ButtonText=0 0 0|InactiveTitleText=128 128 128|ButtonHilight=255 255 255|ButtonDkShadow=0 0 0|ButtonLight=224 224 224|InfoText=0 0 0|InfoWindow=255 255 225|GradientActiveTitle=72 16 112|GradientInactiveTitle=80 76 56 +Plus! 98 CD - Jazz|ActiveTitle=128 0 0|Background=0 0 0|Hilight=128 136 160|HilightText=255 255 255|TitleText=255 255 255|Window=255 255 255|WindowText=0 0 0|Scrollbar=192 192 192|InactiveTitle=48 48 48|Menu=192 192 192|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=192 192 192|InactiveBorder=192 192 192|AppWorkspace=205 162 82|ButtonFace=192 192 192|ButtonShadow=128 128 128|GrayText=128 128 128|ButtonText=0 0 0|InactiveTitleText=255 255 255|ButtonHilight=255 255 255|ButtonDkShadow=0 0 0|ButtonLight=224 224 224|InfoText=0 0 0|InfoWindow=255 255 225|GradientActiveTitle=208 0 0|GradientInactiveTitle=128 128 128 +Plus! 98 CD - Peanuts|ActiveTitle=0 128 0|Background=0 255 0|Hilight=255 248 240|HilightText=0 0 0|TitleText=0 255 0|Window=192 224 192|WindowText=0 0 0|Scrollbar=192 192 192|InactiveTitle=160 160 168|Menu=255 255 0|WindowFrame=0 0 0|MenuText=255 0 0|ActiveBorder=192 192 192|InactiveBorder=192 192 192|AppWorkspace=128 128 128|ButtonFace=192 192 192|ButtonShadow=128 128 128|GrayText=128 128 128|ButtonText=0 0 128|InactiveTitleText=192 224 192|ButtonHilight=255 255 255|ButtonDkShadow=0 0 0|ButtonLight=224 224 224|InfoText=0 0 0|InfoWindow=255 255 225|GradientActiveTitle=0 128 0|GradientInactiveTitle=160 160 168 +Plus! 98 CD - PhotoDisc|ActiveTitle=200 167 123|Background=0 0 0|Hilight=200 167 123|HilightText=255 255 255|TitleText=255 255 255|Window=255 255 255|WindowText=0 0 0|Scrollbar=218 210 199|InactiveTitle=129 112 86|Menu=180 165 143|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=180 165 143|InactiveBorder=180 165 143|AppWorkspace=129 112 86|ButtonFace=180 165 143|ButtonShadow=129 112 86|GrayText=129 112 86|ButtonText=0 0 0|InactiveTitleText=0 0 0|ButtonHilight=218 210 199|ButtonDkShadow=0 0 0|ButtonLight=180 165 143|InfoText=0 0 0|InfoWindow=255 255 225|GradientActiveTitle=122 106 95|GradientInactiveTitle=82 80 67 +Plus! 98 CD - Rock-n-Roll|ActiveTitle=0 0 128|Background=241 141 41|Hilight=176 16 112|HilightText=255 255 255|TitleText=255 255 255|Window=255 255 255|WindowText=0 0 0|Scrollbar=192 192 192|InactiveTitle=208 0 0|Menu=192 192 192|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=192 192 192|InactiveBorder=192 192 192|AppWorkspace=205 162 82|ButtonFace=192 192 192|ButtonShadow=128 128 128|GrayText=128 128 128|ButtonText=0 0 0|InactiveTitleText=255 255 255|ButtonHilight=255 255 255|ButtonDkShadow=0 0 0|ButtonLight=224 224 224|InfoText=0 0 0|InfoWindow=255 255 225|GradientActiveTitle=192 0 96|GradientInactiveTitle=248 152 0 +Plus! 98 CD - Science Fiction|ActiveTitle=224 72 0|Background=128 0 64|Hilight=240 184 40|HilightText=255 255 255|TitleText=255 255 255|Window=255 255 255|WindowText=0 0 0|Scrollbar=192 192 192|InactiveTitle=120 0 64|Menu=192 192 192|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=192 192 192|InactiveBorder=192 192 192|AppWorkspace=205 162 82|ButtonFace=192 192 192|ButtonShadow=128 128 128|GrayText=128 128 128|ButtonText=0 0 0|InactiveTitleText=255 255 255|ButtonHilight=255 255 255|ButtonDkShadow=0 0 0|ButtonLight=224 224 224|InfoText=0 0 0|InfoWindow=255 255 225|GradientActiveTitle=232 176 0|GradientInactiveTitle=232 40 56 +Plus! 98 CD - Windows 98 (high color)|ActiveTitle=16 72 112|Background=33 146 220|Hilight=224 128 24|HilightText=255 255 255|TitleText=255 255 255|Window=255 255 255|WindowText=0 0 0|Scrollbar=192 192 192|InactiveTitle=0 64 0|Menu=192 192 192|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=192 192 192|InactiveBorder=192 192 192|AppWorkspace=205 162 82|ButtonFace=192 192 192|ButtonShadow=128 128 128|GrayText=128 128 128|ButtonText=0 0 0|InactiveTitleText=255 255 255|ButtonHilight=255 255 255|ButtonDkShadow=0 0 0|ButtonLight=224 224 224|InfoText=0 0 0|InfoWindow=255 255 225|GradientActiveTitle=32 144 216|GradientInactiveTitle=0 144 0 Windows 3.1 - Arizona|ActiveTitle=64 128 128|Background=0 64 128|Hilight=0 128 128|HilightText=255 255 255|TitleText=255 255 255|Window=255 255 255|WindowText=0 0 0|Scrollbar=192 192 192|InactiveTitle=192 192 192|Menu=255 255 255|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=255 128 64|InactiveBorder=192 192 192|AppWorkspace=255 255 255|ButtonFace=192 192 192|ButtonShadow=128 128 128|GrayText=128 128 128|ButtonText=0 0 0|InactiveTitleText=0 0 0|ButtonHilight=0 0 0|ButtonDkShadow=0 0 0|ButtonLight=255 255 255|InfoText=0 0 0|InfoWindow=255 255 255|GradientActiveTitle=64 128 128|GradientInactiveTitle=192 192 192|ButtonAlternateFace=181 181 181|HotTrackingColor=0 0 255|MenuHilight=0 128 128|MenuBar=255 255 255|Desktop=0 0 0 Windows 3.1 - Black Leather Jacket|ActiveTitle=64 0 128|Background=0 0 0|Hilight=0 0 0|HilightText=255 255 255|TitleText=255 255 255|Window=255 255 255|WindowText=0 0 0|Scrollbar=224 224 224|InactiveTitle=128 128 128|Menu=192 192 192|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=128 128 128|InactiveBorder=128 128 128|AppWorkspace=192 192 192|ButtonFace=192 192 192|ButtonShadow=128 128 128|GrayText=128 128 128|ButtonText=0 0 0|InactiveTitleText=0 0 0|ButtonHilight=0 0 0|ButtonDkShadow=0 0 0|ButtonLight=255 255 255|InfoText=0 0 0|InfoWindow=255 255 255|GradientActiveTitle=64 0 128|GradientInactiveTitle=128 128 128|ButtonAlternateFace=181 181 181|HotTrackingColor=0 0 255|MenuHilight=0 0 0|MenuBar=192 192 192|Desktop=0 0 0 Windows 3.1 - Bordeaux|ActiveTitle=128 0 128|Background=128 0 64|Hilight=128 0 128|HilightText=255 255 255|TitleText=255 255 255|Window=255 255 255|WindowText=0 0 0|Scrollbar=192 192 192|InactiveTitle=192 192 192|Menu=255 255 255|WindowFrame=0 0 0|MenuText=0 0 0|ActiveBorder=128 0 255|InactiveBorder=192 192 192|AppWorkspace=192 192 192|ButtonFace=192 192 192|ButtonShadow=128 128 128|GrayText=128 128 128|ButtonText=0 0 0|InactiveTitleText=0 0 0|ButtonHilight=0 0 0|ButtonDkShadow=0 0 0|ButtonLight=255 255 255|InfoText=0 0 0|InfoWindow=255 255 255|GradientActiveTitle=128 0 128|GradientInactiveTitle=192 192 192|ButtonAlternateFace=181 181 181|HotTrackingColor=0 0 255|MenuHilight=128 0 128|MenuBar=255 255 255|Desktop=0 0 0 diff --git a/WinPaletter/Settings/Settings.cs b/WinPaletter/Settings/Settings.cs index ba985678..75b2fb9f 100644 --- a/WinPaletter/Settings/Settings.cs +++ b/WinPaletter/Settings/Settings.cs @@ -146,15 +146,15 @@ public void Load() { AutoRestartExplorer = Conversions.ToBoolean(GetReg(REG_ThemeApplyingBehavior, "AutoRestartExplorer", true)); ShowSaveConfirmation = Conversions.ToBoolean(GetReg(REG_ThemeApplyingBehavior, "ShowSaveConfirmation", true)); - ClassicColors_HKU_DEFAULT_Prefs = (OverwriteOptions)Conversions.ToInteger(GetReg(REG_ThemeApplyingBehavior, "ClassicColors_HKU_DEFAULT_Prefs", OverwriteOptions.Overwrite)); - ClassicColors_HKLM_Prefs = (OverwriteOptions)Conversions.ToInteger(GetReg(REG_ThemeApplyingBehavior, "ClassicColors_HKLM_Prefs", OverwriteOptions.Erase)); + ClassicColors_HKU_DEFAULT_Prefs = (OverwriteOptions)Convert.ToInt32(GetReg(REG_ThemeApplyingBehavior, "ClassicColors_HKU_DEFAULT_Prefs", OverwriteOptions.Overwrite)); + ClassicColors_HKLM_Prefs = (OverwriteOptions)Convert.ToInt32(GetReg(REG_ThemeApplyingBehavior, "ClassicColors_HKLM_Prefs", OverwriteOptions.Erase)); UPM_HKU_DEFAULT = Conversions.ToBoolean(GetReg(REG_ThemeApplyingBehavior, "UPM_HKU_DEFAULT", true)); - Metrics_HKU_DEFAULT_Prefs = (OverwriteOptions)Conversions.ToInteger(GetReg(REG_ThemeApplyingBehavior, "Metrics_HKU_DEFAULT_Prefs", OverwriteOptions.DontChange)); - Cursors_HKU_DEFAULT_Prefs = (OverwriteOptions)Conversions.ToInteger(GetReg(REG_ThemeApplyingBehavior, "Cursors_HKU_DEFAULT_Prefs", OverwriteOptions.DontChange)); - CMD_HKU_DEFAULT_Prefs = (OverwriteOptions)Conversions.ToInteger(GetReg(REG_ThemeApplyingBehavior, "CMD_HKU_DEFAULT_Prefs", OverwriteOptions.DontChange)); - PS86_HKU_DEFAULT_Prefs = (OverwriteOptions)Conversions.ToInteger(GetReg(REG_ThemeApplyingBehavior, "PS86_HKU_DEFAULT_Prefs", OverwriteOptions.DontChange)); - PS64_HKU_DEFAULT_Prefs = (OverwriteOptions)Conversions.ToInteger(GetReg(REG_ThemeApplyingBehavior, "PS64_HKU_DEFAULT_Prefs", OverwriteOptions.DontChange)); - Desktop_HKU_DEFAULT = (OverwriteOptions)Conversions.ToInteger(GetReg(REG_ThemeApplyingBehavior, "Desktop_HKU_DEFAULT", OverwriteOptions.DontChange)); + Metrics_HKU_DEFAULT_Prefs = (OverwriteOptions)Convert.ToInt32(GetReg(REG_ThemeApplyingBehavior, "Metrics_HKU_DEFAULT_Prefs", OverwriteOptions.DontChange)); + Cursors_HKU_DEFAULT_Prefs = (OverwriteOptions)Convert.ToInt32(GetReg(REG_ThemeApplyingBehavior, "Cursors_HKU_DEFAULT_Prefs", OverwriteOptions.DontChange)); + CMD_HKU_DEFAULT_Prefs = (OverwriteOptions)Convert.ToInt32(GetReg(REG_ThemeApplyingBehavior, "CMD_HKU_DEFAULT_Prefs", OverwriteOptions.DontChange)); + PS86_HKU_DEFAULT_Prefs = (OverwriteOptions)Convert.ToInt32(GetReg(REG_ThemeApplyingBehavior, "PS86_HKU_DEFAULT_Prefs", OverwriteOptions.DontChange)); + PS64_HKU_DEFAULT_Prefs = (OverwriteOptions)Convert.ToInt32(GetReg(REG_ThemeApplyingBehavior, "PS64_HKU_DEFAULT_Prefs", OverwriteOptions.DontChange)); + Desktop_HKU_DEFAULT = (OverwriteOptions)Convert.ToInt32(GetReg(REG_ThemeApplyingBehavior, "Desktop_HKU_DEFAULT", OverwriteOptions.DontChange)); CMD_OverrideUserPreferences = Conversions.ToBoolean(GetReg(REG_ThemeApplyingBehavior, "CMD_OverrideUserPreferences", true)); AutoApplyCursors = Conversions.ToBoolean(GetReg(REG_ThemeApplyingBehavior, "AutoApplyCursors", true)); ResetCursorsToAero = Conversions.ToBoolean(GetReg(REG_ThemeApplyingBehavior, "ResetCursorsToAero", OS.WXP)); @@ -193,13 +193,13 @@ public struct Appearance public bool DarkMode; public bool AutoDarkMode; public bool CustomColors; - public bool CustomTheme; + public bool CustomTheme_DarkMode; public Color AccentColor; - public Color SecondaryColor; - public Color TertiaryColor; - public Color DisabledColor; + //public Color SecondaryColor; + //public Color TertiaryColor; + //public Color DisabledColor; public Color BackColor; - public Color DisabledBackColor; + //public Color DisabledBackColor; public bool RoundedCorners; public bool ManagedByTheme; @@ -208,13 +208,13 @@ public void Load() DarkMode = Conversions.ToBoolean(GetReg(REG_Appearance, "DarkMode", true)); AutoDarkMode = Conversions.ToBoolean(GetReg(REG_Appearance, "AutoDarkMode", true)); CustomColors = Conversions.ToBoolean(GetReg(REG_Appearance, "CustomColors", false)); - CustomTheme = Conversions.ToBoolean(GetReg(REG_Appearance, "CustomTheme", true)); - AccentColor = Color.FromArgb(Conversions.ToInteger(GetReg(REG_Appearance, "AccentColor", DefaultColors.PrimaryColor.ToArgb()))); - BackColor = Color.FromArgb(Conversions.ToInteger(GetReg(REG_Appearance, "BackColor", DefaultColors.BackColorDark.ToArgb()))); - //SecondaryColor = Color.FromArgb(Conversions.ToInteger(GetReg(REG_Appearance, "SecondaryColor", DefaultColors.Secondary.ToArgb()))); - //TertiaryColor = Color.FromArgb(Conversions.ToInteger(GetReg(REG_Appearance, "TertiaryColor", DefaultColors.Tertiary.ToArgb()))); - //DisabledColor = Color.FromArgb(Conversions.ToInteger(GetReg(REG_Appearance, "DisabledColor", DefaultColors.Disabled.ToArgb()))); - DisabledBackColor = Color.FromArgb(Conversions.ToInteger(GetReg(REG_Appearance, "DisabledBackColor", DefaultColors.DisabledBackColor.ToArgb()))); + CustomTheme_DarkMode = Conversions.ToBoolean(GetReg(REG_Appearance, "CustomTheme", true)); + AccentColor = Color.FromArgb(Convert.ToInt32(GetReg(REG_Appearance, "AccentColor", DefaultColors.PrimaryColor.ToArgb()))); + BackColor = Color.FromArgb(Convert.ToInt32(GetReg(REG_Appearance, "BackColor", DefaultColors.BackColorDark.ToArgb()))); + //SecondaryColor = Color.FromArgb(Convert.ToInt32(GetReg(REG_Appearance, "SecondaryColor", DefaultColors.Secondary.ToArgb()))); + //TertiaryColor = Color.FromArgb(Convert.ToInt32(GetReg(REG_Appearance, "TertiaryColor", DefaultColors.Tertiary.ToArgb()))); + //DisabledColor = Color.FromArgb(Convert.ToInt32(GetReg(REG_Appearance, "DisabledColor", DefaultColors.Disabled.ToArgb()))); + //DisabledBackColor = Color.FromArgb(Convert.ToInt32(GetReg(REG_Appearance, "DisabledBackColor", DefaultColors.DisabledBackColor.ToArgb()))); RoundedCorners = Conversions.ToBoolean(GetReg(REG_Appearance, "RoundedCorners", true)); ManagedByTheme = Conversions.ToBoolean(GetReg(REG_Appearance, "ManagedByTheme", true)); } @@ -224,13 +224,13 @@ public void Save() EditReg(REG_Appearance, "DarkMode", DarkMode, RegistryValueKind.DWord); EditReg(REG_Appearance, "AutoDarkMode", AutoDarkMode, RegistryValueKind.DWord); EditReg(REG_Appearance, "CustomColors", CustomColors, RegistryValueKind.DWord); - EditReg(REG_Appearance, "CustomTheme", CustomTheme, RegistryValueKind.DWord); + EditReg(REG_Appearance, "CustomTheme", CustomTheme_DarkMode, RegistryValueKind.DWord); EditReg(REG_Appearance, "AccentColor", AccentColor.ToArgb(), RegistryValueKind.DWord); EditReg(REG_Appearance, "BackColor", BackColor.ToArgb(), RegistryValueKind.DWord); - EditReg(REG_Appearance, "SecondaryColor", SecondaryColor.ToArgb(), RegistryValueKind.DWord); - EditReg(REG_Appearance, "TertiaryColor", TertiaryColor.ToArgb(), RegistryValueKind.DWord); - EditReg(REG_Appearance, "DisabledColor", DisabledColor.ToArgb(), RegistryValueKind.DWord); - EditReg(REG_Appearance, "DisabledBackColor", DisabledBackColor.ToArgb(), RegistryValueKind.DWord); + //EditReg(REG_Appearance, "SecondaryColor", SecondaryColor.ToArgb(), RegistryValueKind.DWord); + //EditReg(REG_Appearance, "TertiaryColor", TertiaryColor.ToArgb(), RegistryValueKind.DWord); + //EditReg(REG_Appearance, "DisabledColor", DisabledColor.ToArgb(), RegistryValueKind.DWord); + //EditReg(REG_Appearance, "DisabledBackColor", DisabledBackColor.ToArgb(), RegistryValueKind.DWord); EditReg(REG_Appearance, "RoundedCorners", RoundedCorners, RegistryValueKind.DWord); EditReg(REG_Appearance, "ManagedByTheme", ManagedByTheme, RegistryValueKind.DWord); } @@ -271,7 +271,7 @@ public void Load() UseStart10 = Conversions.ToBoolean(GetReg(REG_EP, "UseStart10", false)); UseTaskbar10 = Conversions.ToBoolean(GetReg(REG_EP, "UseTaskbar10", false)); TaskbarButton10 = Conversions.ToBoolean(GetReg(REG_EP, "TaskbarButton10", false)); - StartStyle = (ExplorerPatcher.StartStyles)Conversions.ToInteger(GetReg(REG_EP, "StartStyle", WinPaletter.ExplorerPatcher.StartStyles.NotRounded)); + StartStyle = (ExplorerPatcher.StartStyles)Convert.ToInt32(GetReg(REG_EP, "StartStyle", WinPaletter.ExplorerPatcher.StartStyles.NotRounded)); } public void Save() @@ -306,10 +306,10 @@ public bool Enabled() public void Load() { - VerboseLevel = (VerboseLevels)Conversions.ToInteger(GetReg(REG_ThemeLog, "VerboseLevel", VerboseLevels.Basic)); + VerboseLevel = (VerboseLevels)Convert.ToInt32(GetReg(REG_ThemeLog, "VerboseLevel", VerboseLevels.Basic)); ShowSkippedItemsOnDetailedVerbose = Conversions.ToBoolean(GetReg(REG_ThemeLog, "ShowSkippedItemsOnDetailedVerbose", false)); CountDown = Conversions.ToBoolean(GetReg(REG_ThemeLog, "CountDown", true)); - CountDown_Seconds = Conversions.ToInteger(GetReg(REG_ThemeLog, "CountDown_Seconds", 20)); + CountDown_Seconds = Convert.ToInt32(GetReg(REG_ThemeLog, "CountDown_Seconds", 20)); } public void Save() @@ -436,7 +436,7 @@ public void Load() { Enabled = Conversions.ToBoolean(GetReg(REG_NerdStats, string.Empty, true)); ShowHexHash = Conversions.ToBoolean(GetReg(REG_NerdStats, "ShowHexHash", true)); - Type = (Formats)Conversions.ToInteger(GetReg(REG_NerdStats, "Type", Formats.HEX)); + Type = (Formats)Convert.ToInt32(GetReg(REG_NerdStats, "Type", Formats.HEX)); UseWindowsMonospacedFont = Conversions.ToBoolean(GetReg(REG_NerdStats, "UseWindowsMonospacedFont", false)); MoreLabelTransparency = Conversions.ToBoolean(GetReg(REG_NerdStats, "MoreLabelTransparency", false)); DotDefaultChangedIndicator = Conversions.ToBoolean(GetReg(REG_NerdStats, "DotDefaultChangedIndicator", true)); @@ -495,7 +495,7 @@ public void Save() } } - public Structures.General General = new Structures.General() + public Structures.General General = new() { LicenseAccepted = false, ComplexSaveResult = "2.1", @@ -505,20 +505,20 @@ public void Save() WhatsNewRecord = new[] { string.Empty } }; - public Structures.Updates Updates = new Structures.Updates() + public Structures.Updates Updates = new() { AutoCheck = true, Channel = Program.IsBeta ? Structures.Updates.Channels.Beta : Structures.Updates.Channels.Stable }; - public Structures.FileTypeMgr FileTypeManagement = new Structures.FileTypeMgr() + public Structures.FileTypeMgr FileTypeManagement = new() { AutoAddExt = true, OpeningPreviewInApp_or_AppliesIt = true, CompressThemeFile = true }; - public Structures.ThemeApplyingBehavior ThemeApplyingBehavior = new Structures.ThemeApplyingBehavior() + public Structures.ThemeApplyingBehavior ThemeApplyingBehavior = new() { AutoRestartExplorer = true, ShowSaveConfirmation = true, @@ -540,29 +540,29 @@ public void Save() PE_ModifyByDefault = true }; - public Structures.Appearance Appearance = new Structures.Appearance() + public Structures.Appearance Appearance = new() { DarkMode = true, AutoDarkMode = true, CustomColors = false, - CustomTheme = true, + CustomTheme_DarkMode = true, AccentColor = DefaultColors.PrimaryColor, BackColor = DefaultColors.BackColorDark, //SecondaryColor = DefaultColors.Secondary, //TertiaryColor = DefaultColors.Tertiary, //DisabledColor = DefaultColors.Disabled, - DisabledBackColor = DefaultColors.DisabledBackColor, + //DisabledBackColor = DefaultColors.DisabledBackColor, RoundedCorners = true, ManagedByTheme = true }; - public Structures.Language Language = new Structures.Language() + public Structures.Language Language = new() { Enabled = false, File = null }; - public Structures.EP ExplorerPatcher = new Structures.EP() + public Structures.EP ExplorerPatcher = new() { Enabled = true, Enabled_Force = false, @@ -572,7 +572,7 @@ public void Save() StartStyle = WinPaletter.ExplorerPatcher.StartStyles.NotRounded }; - public Structures.ThemeLog ThemeLog = new Structures.ThemeLog() + public Structures.ThemeLog ThemeLog = new() { VerboseLevel = Structures.ThemeLog.VerboseLevels.Basic, ShowSkippedItemsOnDetailedVerbose = false, @@ -580,7 +580,7 @@ public void Save() CountDown_Seconds = 20 }; - public Structures.WindowsTerminal WindowsTerminals = new Structures.WindowsTerminal() + public Structures.WindowsTerminal WindowsTerminals = new() { Bypass = false, ListAllFonts = false, @@ -589,7 +589,7 @@ public void Save() Terminal_Preview_Path = PathsExt.TerminalPreviewJSON }; - public Structures.Store Store = new Structures.Store() + public Structures.Store Store = new() { Search_ThemeNames = true, Search_AuthorsNames = true, @@ -601,7 +601,7 @@ public void Save() ShowTips = true }; - public Structures.NerdStats NerdStats = new Structures.NerdStats() + public Structures.NerdStats NerdStats = new() { Enabled = true, Type = Structures.NerdStats.Formats.HEX, @@ -620,7 +620,7 @@ public void Save() ShowSysEventsSoundsInstaller = true, }; - public Structures.Miscellaneous Miscellaneous = new Structures.Miscellaneous() + public Structures.Miscellaneous Miscellaneous = new() { Win7LivePreview = true, }; @@ -670,8 +670,8 @@ public Settings(Mode LoadFrom, string File = null) foreach (FieldInfo field in GetType().GetFields(bindingFlags)) { - var type = field.FieldType; - var JSet = new JsonSerializerSettings(); + Type type = field.FieldType; + JsonSerializerSettings JSet = new(); if (J[field.Name] is not null) { @@ -759,14 +759,14 @@ public void Save(Mode SaveTo, string File = null) public override string ToString() { - var JSON_Overall = new JObject(); + JObject JSON_Overall = new(); JSON_Overall.RemoveAll(); foreach (FieldInfo field in GetType().GetFields(bindingFlags)) { if (field.Name.Trim().ToUpper() != "GENERAL") { - var type = field.FieldType; + Type type = field.FieldType; if (IsStructure(type)) { @@ -784,7 +784,7 @@ public override string ToString() private JObject DeserializeProps(Type StructureType, object Structure) { - var j = new JObject(); + JObject j = new(); j.RemoveAll(); diff --git a/WinPaletter/Settings/SettingsX.Designer.cs b/WinPaletter/Settings/SettingsX.Designer.cs index 0e7206e9..6cc2a107 100644 --- a/WinPaletter/Settings/SettingsX.Designer.cs +++ b/WinPaletter/Settings/SettingsX.Designer.cs @@ -673,7 +673,6 @@ private void InitializeComponent() // this.CheckBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox5.Checked = true; this.CheckBox5.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox5.ForeColor = System.Drawing.Color.White; @@ -750,10 +749,10 @@ private void InitializeComponent() this.Button11.ForeColor = System.Drawing.Color.White; this.Button11.Image = ((System.Drawing.Image)(resources.GetObject("Button11.Image"))); this.Button11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.Button11.Location = new System.Drawing.Point(509, 190); + this.Button11.Location = new System.Drawing.Point(509, 195); this.Button11.Name = "Button11"; this.Button11.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.Button11.Size = new System.Drawing.Size(308, 24); + this.Button11.Size = new System.Drawing.Size(308, 29); this.Button11.TabIndex = 40; this.Button11.Text = "Language development tools"; this.Button11.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -792,9 +791,9 @@ private void InitializeComponent() this.Button10.Location = new System.Drawing.Point(509, 160); this.Button10.Name = "Button10"; this.Button10.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.Button10.Size = new System.Drawing.Size(308, 24); + this.Button10.Size = new System.Drawing.Size(308, 29); this.Button10.TabIndex = 32; - this.Button10.Text = "Download language"; + this.Button10.Text = "Download a language file"; this.Button10.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.Button10.UseVisualStyleBackColor = false; this.Button10.Click += new System.EventHandler(this.Button10_Click); @@ -808,12 +807,12 @@ private void InitializeComponent() this.Button8.ForeColor = System.Drawing.Color.White; this.Button8.Image = ((System.Drawing.Image)(resources.GetObject("Button8.Image"))); this.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.Button8.Location = new System.Drawing.Point(509, 220); + this.Button8.Location = new System.Drawing.Point(509, 230); this.Button8.Name = "Button8"; this.Button8.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.Button8.Size = new System.Drawing.Size(308, 24); + this.Button8.Size = new System.Drawing.Size(308, 29); this.Button8.TabIndex = 31; - this.Button8.Text = "See how to contribute in language development"; + this.Button8.Text = "See how to contribute in language file creation"; this.Button8.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.Button8.UseVisualStyleBackColor = false; this.Button8.Click += new System.EventHandler(this.Button8_Click); @@ -867,10 +866,11 @@ private void InitializeComponent() // this.Label14.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.Label14.BackColor = System.Drawing.Color.Transparent; this.Label14.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label14.Location = new System.Drawing.Point(182, 123); this.Label14.Name = "Label14"; - this.Label14.Size = new System.Drawing.Size(215, 24); + this.Label14.Size = new System.Drawing.Size(221, 24); this.Label14.TabIndex = 35; this.Label14.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -878,16 +878,18 @@ private void InitializeComponent() // this.Label22.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.Label22.BackColor = System.Drawing.Color.Transparent; this.Label22.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label22.Location = new System.Drawing.Point(33, 153); this.Label22.Name = "Label22"; - this.Label22.Size = new System.Drawing.Size(364, 24); + this.Label22.Size = new System.Drawing.Size(370, 24); this.Label22.TabIndex = 43; this.Label22.Text = "It has left to right layout"; this.Label22.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // Label15 // + this.Label15.BackColor = System.Drawing.Color.Transparent; this.Label15.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label15.Location = new System.Drawing.Point(33, 123); this.Label15.Name = "Label15"; @@ -898,6 +900,7 @@ private void InitializeComponent() // // PictureBox26 // + this.PictureBox26.BackColor = System.Drawing.Color.Transparent; this.PictureBox26.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox26.Image"))); this.PictureBox26.Location = new System.Drawing.Point(3, 153); this.PictureBox26.Name = "PictureBox26"; @@ -908,6 +911,7 @@ private void InitializeComponent() // // PictureBox23 // + this.PictureBox23.BackColor = System.Drawing.Color.Transparent; this.PictureBox23.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox23.Image"))); this.PictureBox23.Location = new System.Drawing.Point(3, 123); this.PictureBox23.Name = "PictureBox23"; @@ -920,10 +924,11 @@ private void InitializeComponent() // this.Label16.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.Label16.BackColor = System.Drawing.Color.Transparent; this.Label16.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label16.Location = new System.Drawing.Point(182, 33); this.Label16.Name = "Label16"; - this.Label16.Size = new System.Drawing.Size(215, 24); + this.Label16.Size = new System.Drawing.Size(221, 24); this.Label16.TabIndex = 41; this.Label16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -931,15 +936,17 @@ private void InitializeComponent() // this.Label12.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.Label12.BackColor = System.Drawing.Color.Transparent; this.Label12.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label12.Location = new System.Drawing.Point(182, 93); this.Label12.Name = "Label12"; - this.Label12.Size = new System.Drawing.Size(215, 24); + this.Label12.Size = new System.Drawing.Size(221, 24); this.Label12.TabIndex = 32; this.Label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // Label18 // + this.Label18.BackColor = System.Drawing.Color.Transparent; this.Label18.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label18.Location = new System.Drawing.Point(33, 33); this.Label18.Name = "Label18"; @@ -950,6 +957,7 @@ private void InitializeComponent() // // Label13 // + this.Label13.BackColor = System.Drawing.Color.Transparent; this.Label13.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label13.Location = new System.Drawing.Point(33, 93); this.Label13.Name = "Label13"; @@ -960,6 +968,7 @@ private void InitializeComponent() // // PictureBox24 // + this.PictureBox24.BackColor = System.Drawing.Color.Transparent; this.PictureBox24.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox24.Image"))); this.PictureBox24.Location = new System.Drawing.Point(3, 33); this.PictureBox24.Name = "PictureBox24"; @@ -970,6 +979,7 @@ private void InitializeComponent() // // PictureBox22 // + this.PictureBox22.BackColor = System.Drawing.Color.Transparent; this.PictureBox22.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox22.Image"))); this.PictureBox22.Location = new System.Drawing.Point(3, 93); this.PictureBox22.Name = "PictureBox22"; @@ -982,10 +992,11 @@ private void InitializeComponent() // this.Label19.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.Label19.BackColor = System.Drawing.Color.Transparent; this.Label19.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label19.Location = new System.Drawing.Point(182, 3); this.Label19.Name = "Label19"; - this.Label19.Size = new System.Drawing.Size(215, 24); + this.Label19.Size = new System.Drawing.Size(221, 24); this.Label19.TabIndex = 38; this.Label19.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -993,15 +1004,17 @@ private void InitializeComponent() // this.Label11.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.Label11.BackColor = System.Drawing.Color.Transparent; this.Label11.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label11.Location = new System.Drawing.Point(182, 63); this.Label11.Name = "Label11"; - this.Label11.Size = new System.Drawing.Size(215, 24); + this.Label11.Size = new System.Drawing.Size(221, 24); this.Label11.TabIndex = 29; this.Label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // Label20 // + this.Label20.BackColor = System.Drawing.Color.Transparent; this.Label20.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label20.Location = new System.Drawing.Point(33, 3); this.Label20.Name = "Label20"; @@ -1012,6 +1025,7 @@ private void InitializeComponent() // // Label10 // + this.Label10.BackColor = System.Drawing.Color.Transparent; this.Label10.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label10.Location = new System.Drawing.Point(33, 63); this.Label10.Name = "Label10"; @@ -1022,6 +1036,7 @@ private void InitializeComponent() // // PictureBox25 // + this.PictureBox25.BackColor = System.Drawing.Color.Transparent; this.PictureBox25.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox25.Image"))); this.PictureBox25.Location = new System.Drawing.Point(3, 3); this.PictureBox25.Name = "PictureBox25"; @@ -1032,6 +1047,7 @@ private void InitializeComponent() // // PictureBox21 // + this.PictureBox21.BackColor = System.Drawing.Color.Transparent; this.PictureBox21.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox21.Image"))); this.PictureBox21.Location = new System.Drawing.Point(3, 63); this.PictureBox21.Name = "PictureBox21"; @@ -1091,7 +1107,6 @@ private void InitializeComponent() // this.CheckBox8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox8.Checked = false; this.CheckBox8.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox8.ForeColor = System.Drawing.Color.White; @@ -1160,7 +1175,6 @@ private void InitializeComponent() // this.CheckBox30.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox30.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox30.Checked = true; this.CheckBox30.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox30.ForeColor = System.Drawing.Color.White; @@ -1249,7 +1263,6 @@ private void InitializeComponent() // this.CheckBox6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox6.Checked = true; this.CheckBox6.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox6.ForeColor = System.Drawing.Color.White; @@ -1263,7 +1276,6 @@ private void InitializeComponent() // this.RadioButton3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.RadioButton3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton3.Checked = true; this.RadioButton3.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton3.ForeColor = System.Drawing.Color.White; @@ -1277,7 +1289,6 @@ private void InitializeComponent() // this.RadioButton4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.RadioButton4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton4.Checked = false; this.RadioButton4.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton4.ForeColor = System.Drawing.Color.White; @@ -1330,7 +1341,6 @@ private void InitializeComponent() // // CheckBox33 // - this.CheckBox33.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox33.Checked = true; this.CheckBox33.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox33.ForeColor = System.Drawing.Color.White; @@ -1396,7 +1406,6 @@ private void InitializeComponent() // // CheckBox1 // - this.CheckBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox1.Checked = true; this.CheckBox1.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox1.ForeColor = System.Drawing.Color.White; @@ -1434,7 +1443,6 @@ private void InitializeComponent() // // RadioButton2 // - this.RadioButton2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton2.Checked = false; this.RadioButton2.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton2.ForeColor = System.Drawing.Color.White; @@ -1447,7 +1455,6 @@ private void InitializeComponent() // // RadioButton1 // - this.RadioButton1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton1.Checked = true; this.RadioButton1.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton1.ForeColor = System.Drawing.Color.White; @@ -1570,7 +1577,6 @@ private void InitializeComponent() // // RadioButton23 // - this.RadioButton23.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton23.Checked = false; this.RadioButton23.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton23.ForeColor = System.Drawing.Color.White; @@ -1582,7 +1588,6 @@ private void InitializeComponent() // // RadioButton21 // - this.RadioButton21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton21.Checked = true; this.RadioButton21.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton21.ForeColor = System.Drawing.Color.White; @@ -1594,7 +1599,6 @@ private void InitializeComponent() // // RadioButton22 // - this.RadioButton22.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton22.Checked = false; this.RadioButton22.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton22.ForeColor = System.Drawing.Color.White; @@ -1648,7 +1652,6 @@ private void InitializeComponent() // this.CheckBox25.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox25.Checked = false; this.CheckBox25.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox25.ForeColor = System.Drawing.Color.White; @@ -1663,7 +1666,6 @@ private void InitializeComponent() // this.CheckBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox2.Checked = false; this.CheckBox2.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox2.ForeColor = System.Drawing.Color.White; @@ -1723,7 +1725,6 @@ private void InitializeComponent() // this.CheckBox17.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox17.Checked = true; this.CheckBox17.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox17.ForeColor = System.Drawing.Color.White; @@ -1817,7 +1818,6 @@ private void InitializeComponent() // // RadioButton10 // - this.RadioButton10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton10.Checked = false; this.RadioButton10.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton10.ForeColor = System.Drawing.Color.White; @@ -1829,7 +1829,6 @@ private void InitializeComponent() // // RadioButton9 // - this.RadioButton9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton9.Checked = false; this.RadioButton9.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton9.ForeColor = System.Drawing.Color.White; @@ -1841,7 +1840,6 @@ private void InitializeComponent() // // RadioButton7 // - this.RadioButton7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton7.Checked = true; this.RadioButton7.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton7.ForeColor = System.Drawing.Color.White; @@ -1853,7 +1851,6 @@ private void InitializeComponent() // // RadioButton8 // - this.RadioButton8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton8.Checked = false; this.RadioButton8.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton8.ForeColor = System.Drawing.Color.White; @@ -1886,7 +1883,6 @@ private void InitializeComponent() // // RadioButton6 // - this.RadioButton6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton6.Checked = false; this.RadioButton6.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton6.ForeColor = System.Drawing.Color.White; @@ -1898,7 +1894,6 @@ private void InitializeComponent() // // RadioButton5 // - this.RadioButton5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton5.Checked = true; this.RadioButton5.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton5.ForeColor = System.Drawing.Color.White; @@ -1990,7 +1985,6 @@ private void InitializeComponent() // // RadioButton11 // - this.RadioButton11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton11.Checked = true; this.RadioButton11.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton11.ForeColor = System.Drawing.Color.White; @@ -2002,7 +1996,6 @@ private void InitializeComponent() // // RadioButton12 // - this.RadioButton12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton12.Checked = false; this.RadioButton12.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton12.ForeColor = System.Drawing.Color.White; @@ -2038,7 +2031,6 @@ private void InitializeComponent() // this.CheckBox22.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox22.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox22.Checked = false; this.CheckBox22.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox22.ForeColor = System.Drawing.Color.White; @@ -2099,7 +2091,6 @@ private void InitializeComponent() // this.CheckBox16.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox16.Checked = false; this.CheckBox16.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox16.ForeColor = System.Drawing.Color.White; @@ -2145,7 +2136,6 @@ private void InitializeComponent() // // RadioButton13 // - this.RadioButton13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton13.Checked = true; this.RadioButton13.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton13.ForeColor = System.Drawing.Color.White; @@ -2157,7 +2147,6 @@ private void InitializeComponent() // // RadioButton14 // - this.RadioButton14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton14.Checked = false; this.RadioButton14.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton14.ForeColor = System.Drawing.Color.White; @@ -2193,7 +2182,6 @@ private void InitializeComponent() // this.CheckBox7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox7.Checked = true; this.CheckBox7.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox7.ForeColor = System.Drawing.Color.White; @@ -2242,7 +2230,6 @@ private void InitializeComponent() // this.CheckBox15.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox15.Checked = false; this.CheckBox15.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox15.ForeColor = System.Drawing.Color.White; @@ -2306,7 +2293,6 @@ private void InitializeComponent() // // RadioButton19 // - this.RadioButton19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton19.Checked = true; this.RadioButton19.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton19.ForeColor = System.Drawing.Color.White; @@ -2318,7 +2304,6 @@ private void InitializeComponent() // // RadioButton20 // - this.RadioButton20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton20.Checked = false; this.RadioButton20.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton20.ForeColor = System.Drawing.Color.White; @@ -2376,7 +2361,6 @@ private void InitializeComponent() // // RadioButton17 // - this.RadioButton17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton17.Checked = true; this.RadioButton17.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton17.ForeColor = System.Drawing.Color.White; @@ -2388,7 +2372,6 @@ private void InitializeComponent() // // RadioButton18 // - this.RadioButton18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton18.Checked = false; this.RadioButton18.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton18.ForeColor = System.Drawing.Color.White; @@ -2445,7 +2428,6 @@ private void InitializeComponent() // // RadioButton15 // - this.RadioButton15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton15.Checked = true; this.RadioButton15.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton15.ForeColor = System.Drawing.Color.White; @@ -2457,7 +2439,6 @@ private void InitializeComponent() // // RadioButton16 // - this.RadioButton16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.RadioButton16.Checked = false; this.RadioButton16.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton16.ForeColor = System.Drawing.Color.White; @@ -2525,7 +2506,6 @@ private void InitializeComponent() // // RadioButton24 // - this.RadioButton24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(24)))), ((int)(((byte)(24)))), ((int)(((byte)(24))))); this.RadioButton24.Checked = false; this.RadioButton24.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton24.ForeColor = System.Drawing.Color.White; @@ -2537,7 +2517,6 @@ private void InitializeComponent() // // RadioButton25 // - this.RadioButton25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(24)))), ((int)(((byte)(24)))), ((int)(((byte)(24))))); this.RadioButton25.Checked = true; this.RadioButton25.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioButton25.ForeColor = System.Drawing.Color.White; @@ -2551,7 +2530,6 @@ private void InitializeComponent() // this.CheckBox36.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox36.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(24)))), ((int)(((byte)(24)))), ((int)(((byte)(24))))); this.CheckBox36.Checked = false; this.CheckBox36.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox36.ForeColor = System.Drawing.Color.White; @@ -2576,7 +2554,6 @@ private void InitializeComponent() // this.CheckBox35_SFC.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox35_SFC.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(24)))), ((int)(((byte)(24)))), ((int)(((byte)(24))))); this.CheckBox35_SFC.Checked = false; this.CheckBox35_SFC.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox35_SFC.ForeColor = System.Drawing.Color.White; @@ -2737,7 +2714,6 @@ private void InitializeComponent() // this.CheckBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox4.Checked = true; this.CheckBox4.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox4.ForeColor = System.Drawing.Color.White; @@ -2761,7 +2737,6 @@ private void InitializeComponent() // this.CheckBox29.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox29.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox29.Checked = true; this.CheckBox29.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox29.ForeColor = System.Drawing.Color.White; @@ -2841,11 +2816,13 @@ private void InitializeComponent() this.RadioImage1.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioImage1.ForeColor = System.Drawing.Color.White; this.RadioImage1.Image = ((System.Drawing.Image)(resources.GetObject("RadioImage1.Image"))); + this.RadioImage1.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter; this.RadioImage1.Location = new System.Drawing.Point(41, 40); this.RadioImage1.Name = "RadioImage1"; this.RadioImage1.Size = new System.Drawing.Size(64, 64); this.RadioImage1.TabIndex = 49; this.RadioImage1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.RadioImage1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; // // ListBox2 // @@ -2867,11 +2844,13 @@ private void InitializeComponent() this.RadioImage2.Font = new System.Drawing.Font("Segoe UI", 9F); this.RadioImage2.ForeColor = System.Drawing.Color.White; this.RadioImage2.Image = ((System.Drawing.Image)(resources.GetObject("RadioImage2.Image"))); + this.RadioImage2.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter; this.RadioImage2.Location = new System.Drawing.Point(41, 152); this.RadioImage2.Name = "RadioImage2"; this.RadioImage2.Size = new System.Drawing.Size(64, 64); this.RadioImage2.TabIndex = 50; this.RadioImage2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.RadioImage2.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; // // Button15 // @@ -3096,7 +3075,6 @@ private void InitializeComponent() // this.CheckBox26.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox26.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox26.Checked = true; this.CheckBox26.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox26.ForeColor = System.Drawing.Color.White; @@ -3120,7 +3098,6 @@ private void InitializeComponent() // this.CheckBox27.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox27.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox27.Checked = true; this.CheckBox27.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox27.ForeColor = System.Drawing.Color.White; @@ -3146,7 +3123,6 @@ private void InitializeComponent() // this.CheckBox28.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox28.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox28.Checked = true; this.CheckBox28.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox28.ForeColor = System.Drawing.Color.White; @@ -3193,7 +3169,6 @@ private void InitializeComponent() // // CheckBox19_ShowSkippedItemsOnDetailedVerbose // - this.CheckBox19_ShowSkippedItemsOnDetailedVerbose.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox19_ShowSkippedItemsOnDetailedVerbose.Checked = false; this.CheckBox19_ShowSkippedItemsOnDetailedVerbose.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox19_ShowSkippedItemsOnDetailedVerbose.ForeColor = System.Drawing.Color.White; @@ -3210,6 +3185,7 @@ private void InitializeComponent() this.VL2.Font = new System.Drawing.Font("Segoe UI", 9F); this.VL2.ForeColor = System.Drawing.Color.White; this.VL2.Image = null; + this.VL2.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter; this.VL2.Location = new System.Drawing.Point(53, 142); this.VL2.Name = "VL2"; this.VL2.Size = new System.Drawing.Size(515, 24); @@ -3217,6 +3193,7 @@ private void InitializeComponent() this.VL2.Text = "Advanced details; shows all registry keys modified (applying operation will take " + "longer time)"; this.VL2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.VL2.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; // // VL1 // @@ -3224,12 +3201,14 @@ private void InitializeComponent() this.VL1.Font = new System.Drawing.Font("Segoe UI", 9F); this.VL1.ForeColor = System.Drawing.Color.White; this.VL1.Image = null; + this.VL1.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter; this.VL1.Location = new System.Drawing.Point(53, 112); this.VL1.Name = "VL1"; this.VL1.Size = new System.Drawing.Size(515, 24); this.VL1.TabIndex = 51; this.VL1.Text = "Basic details; shows if applying, skipping Windows aspects or errors happened"; this.VL1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.VL1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; // // VL0 // @@ -3237,12 +3216,14 @@ private void InitializeComponent() this.VL0.Font = new System.Drawing.Font("Segoe UI", 9F); this.VL0.ForeColor = System.Drawing.Color.White; this.VL0.Image = null; + this.VL0.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter; this.VL0.Location = new System.Drawing.Point(53, 82); this.VL0.Name = "VL0"; this.VL0.Size = new System.Drawing.Size(515, 24); this.VL0.TabIndex = 50; this.VL0.Text = "None"; this.VL0.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.VL0.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; // // Label25 // @@ -3304,7 +3285,6 @@ private void InitializeComponent() // this.CheckBox18.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox18.Checked = true; this.CheckBox18.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox18.ForeColor = System.Drawing.Color.White; @@ -3545,7 +3525,6 @@ private void InitializeComponent() // this.CheckBox14.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox14.Checked = false; this.CheckBox14.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox14.ForeColor = System.Drawing.Color.White; @@ -3604,7 +3583,6 @@ private void InitializeComponent() // this.CheckBox13.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox13.Checked = false; this.CheckBox13.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox13.ForeColor = System.Drawing.Color.White; @@ -3646,7 +3624,6 @@ private void InitializeComponent() // this.CheckBox12.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox12.Checked = false; this.CheckBox12.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox12.ForeColor = System.Drawing.Color.White; @@ -3743,11 +3720,13 @@ private void InitializeComponent() this.EP_ORB_11.Font = new System.Drawing.Font("Segoe UI", 9F); this.EP_ORB_11.ForeColor = System.Drawing.Color.White; this.EP_ORB_11.Image = null; + this.EP_ORB_11.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter; this.EP_ORB_11.Location = new System.Drawing.Point(3, 3); this.EP_ORB_11.Name = "EP_ORB_11"; this.EP_ORB_11.Size = new System.Drawing.Size(30, 30); this.EP_ORB_11.TabIndex = 45; this.EP_ORB_11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.EP_ORB_11.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; // // EP_ORB_10 // @@ -3755,11 +3734,13 @@ private void InitializeComponent() this.EP_ORB_10.Font = new System.Drawing.Font("Segoe UI", 9F); this.EP_ORB_10.ForeColor = System.Drawing.Color.White; this.EP_ORB_10.Image = null; + this.EP_ORB_10.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter; this.EP_ORB_10.Location = new System.Drawing.Point(39, 3); this.EP_ORB_10.Name = "EP_ORB_10"; this.EP_ORB_10.Size = new System.Drawing.Size(30, 30); this.EP_ORB_10.TabIndex = 46; this.EP_ORB_10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.EP_ORB_10.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; // // Panel2 // @@ -3777,11 +3758,13 @@ private void InitializeComponent() this.EP_Taskbar_11.Font = new System.Drawing.Font("Segoe UI", 9F); this.EP_Taskbar_11.ForeColor = System.Drawing.Color.White; this.EP_Taskbar_11.Image = null; + this.EP_Taskbar_11.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter; this.EP_Taskbar_11.Location = new System.Drawing.Point(3, 3); this.EP_Taskbar_11.Name = "EP_Taskbar_11"; this.EP_Taskbar_11.Size = new System.Drawing.Size(30, 30); this.EP_Taskbar_11.TabIndex = 42; this.EP_Taskbar_11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.EP_Taskbar_11.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; // // EP_Taskbar_10 // @@ -3789,11 +3772,13 @@ private void InitializeComponent() this.EP_Taskbar_10.Font = new System.Drawing.Font("Segoe UI", 9F); this.EP_Taskbar_10.ForeColor = System.Drawing.Color.White; this.EP_Taskbar_10.Image = null; + this.EP_Taskbar_10.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter; this.EP_Taskbar_10.Location = new System.Drawing.Point(39, 3); this.EP_Taskbar_10.Name = "EP_Taskbar_10"; this.EP_Taskbar_10.Size = new System.Drawing.Size(30, 30); this.EP_Taskbar_10.TabIndex = 43; this.EP_Taskbar_10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.EP_Taskbar_10.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; // // Panel1 // @@ -3811,11 +3796,13 @@ private void InitializeComponent() this.EP_Start_11.Font = new System.Drawing.Font("Segoe UI", 9F); this.EP_Start_11.ForeColor = System.Drawing.Color.White; this.EP_Start_11.Image = null; + this.EP_Start_11.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter; this.EP_Start_11.Location = new System.Drawing.Point(3, 3); this.EP_Start_11.Name = "EP_Start_11"; this.EP_Start_11.Size = new System.Drawing.Size(30, 30); this.EP_Start_11.TabIndex = 39; this.EP_Start_11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.EP_Start_11.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; // // EP_Start_10 // @@ -3823,11 +3810,13 @@ private void InitializeComponent() this.EP_Start_10.Font = new System.Drawing.Font("Segoe UI", 9F); this.EP_Start_10.ForeColor = System.Drawing.Color.White; this.EP_Start_10.Image = null; + this.EP_Start_10.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter; this.EP_Start_10.Location = new System.Drawing.Point(39, 3); this.EP_Start_10.Name = "EP_Start_10"; this.EP_Start_10.Size = new System.Drawing.Size(30, 30); this.EP_Start_10.TabIndex = 40; this.EP_Start_10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.EP_Start_10.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; // // EP_Start_10_Type // @@ -3848,6 +3837,7 @@ private void InitializeComponent() // // Label34 // + this.Label34.BackColor = System.Drawing.Color.Transparent; this.Label34.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label34.Location = new System.Drawing.Point(45, 102); this.Label34.Name = "Label34"; @@ -3858,6 +3848,7 @@ private void InitializeComponent() // // Label32 // + this.Label32.BackColor = System.Drawing.Color.Transparent; this.Label32.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label32.Location = new System.Drawing.Point(45, 30); this.Label32.Name = "Label32"; @@ -3870,6 +3861,7 @@ private void InitializeComponent() // this.Label31.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.Label31.BackColor = System.Drawing.Color.Transparent; this.Label31.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label31.Location = new System.Drawing.Point(5, 4); this.Label31.Name = "Label31"; @@ -3880,6 +3872,7 @@ private void InitializeComponent() // // Label33 // + this.Label33.BackColor = System.Drawing.Color.Transparent; this.Label33.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label33.Location = new System.Drawing.Point(45, 66); this.Label33.Name = "Label33"; @@ -3902,7 +3895,6 @@ private void InitializeComponent() // this.CheckBox21.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox21.Checked = false; this.CheckBox21.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox21.ForeColor = System.Drawing.Color.White; @@ -3927,7 +3919,6 @@ private void InitializeComponent() // this.CheckBox20.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox20.Checked = true; this.CheckBox20.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox20.ForeColor = System.Drawing.Color.White; @@ -4017,7 +4008,6 @@ private void InitializeComponent() // this.CheckBox38.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox38.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox38.Checked = false; this.CheckBox38.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox38.ForeColor = System.Drawing.Color.White; @@ -4041,7 +4031,6 @@ private void InitializeComponent() // this.CheckBox37.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox37.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox37.Checked = false; this.CheckBox37.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox37.ForeColor = System.Drawing.Color.White; @@ -4065,7 +4054,6 @@ private void InitializeComponent() // this.CheckBox35.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox35.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox35.Checked = false; this.CheckBox35.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox35.ForeColor = System.Drawing.Color.White; @@ -4139,7 +4127,6 @@ private void InitializeComponent() // this.CheckBox32.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox32.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox32.Checked = false; this.CheckBox32.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox32.ForeColor = System.Drawing.Color.White; @@ -4188,7 +4175,6 @@ private void InitializeComponent() // this.CheckBox34.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox34.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox34.Checked = false; this.CheckBox34.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox34.ForeColor = System.Drawing.Color.White; @@ -4203,7 +4189,6 @@ private void InitializeComponent() // this.CheckBox11.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox11.Checked = false; this.CheckBox11.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox11.ForeColor = System.Drawing.Color.White; @@ -4217,7 +4202,6 @@ private void InitializeComponent() // this.CheckBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox3.Checked = false; this.CheckBox3.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox3.ForeColor = System.Drawing.Color.White; @@ -4231,7 +4215,6 @@ private void InitializeComponent() // this.CheckBox31.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox31.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox31.Checked = false; this.CheckBox31.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox31.ForeColor = System.Drawing.Color.White; @@ -4265,7 +4248,6 @@ private void InitializeComponent() // this.CheckBox10.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox10.Checked = false; this.CheckBox10.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox10.ForeColor = System.Drawing.Color.White; @@ -4468,7 +4450,6 @@ private void InitializeComponent() // this.CheckBox9.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.CheckBox9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.CheckBox9.Checked = false; this.CheckBox9.Font = new System.Drawing.Font("Segoe UI", 9F); this.CheckBox9.ForeColor = System.Drawing.Color.White; diff --git a/WinPaletter/Settings/SettingsX.cs b/WinPaletter/Settings/SettingsX.cs index 574ff4b5..fb7e04a3 100644 --- a/WinPaletter/Settings/SettingsX.cs +++ b/WinPaletter/Settings/SettingsX.cs @@ -19,6 +19,7 @@ public SettingsX() { InitializeComponent(); } + public void LoadSettings() { Settings sets; @@ -26,7 +27,7 @@ public void LoadSettings() if (!_External) sets = Program.Settings; else - sets = new Settings(Settings.Mode.File, _File); + sets = new(Settings.Mode.File, _File); Read(sets); { @@ -310,27 +311,27 @@ public void SaveSettings() if (File.Exists(TerDir)) { - Program.TM.Terminal = new WinTerminal(TerDir, WinTerminal.Mode.JSONFile); + Program.TM.Terminal = new(TerDir, WinTerminal.Mode.JSONFile); } else { - Program.TM.Terminal = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); + Program.TM.Terminal = new(string.Empty, WinTerminal.Mode.Empty); } if (File.Exists(TerPreDir)) { - Program.TM.TerminalPreview = new WinTerminal(TerPreDir, WinTerminal.Mode.JSONFile, WinTerminal.Version.Preview); + Program.TM.TerminalPreview = new(TerPreDir, WinTerminal.Mode.JSONFile, WinTerminal.Version.Preview); } else { - Program.TM.TerminalPreview = new WinTerminal(string.Empty, WinTerminal.Mode.Empty, WinTerminal.Version.Preview); + Program.TM.TerminalPreview = new(string.Empty, WinTerminal.Mode.Empty, WinTerminal.Version.Preview); } } else { - Program.TM.Terminal = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); - Program.TM.TerminalPreview = new WinTerminal(string.Empty, WinTerminal.Mode.Empty, WinTerminal.Version.Preview); + Program.TM.Terminal = new(string.Empty, WinTerminal.Mode.Empty); + Program.TM.TerminalPreview = new(string.Empty, WinTerminal.Mode.Empty, WinTerminal.Version.Preview); } } @@ -338,7 +339,7 @@ public void SaveSettings() { if (CheckBox8.Checked) { - Program.Lang = new Localizer(); + Program.Lang = new(); Program.Lang.Load(Program.Settings.Language.File); foreach (Form f in Application.OpenForms) f.LoadLanguage(); @@ -352,7 +353,7 @@ public void SaveSettings() if (ch_EP) { - Program.EP = new ExplorerPatcher(); + Program.EP = new(); Forms.MainFrm.ApplyColorsToElements(Program.TM); Forms.MainFrm.LoadFromTM(Program.TM); Forms.MainFrm.ApplyStylesToElements(Program.TM, false); @@ -497,7 +498,7 @@ public void Write(Settings Sets, Settings.Mode Mode, string File = "") } protected override void OnFormClosing(FormClosingEventArgs e) { - Settings NewSets = new Settings(Settings.Mode.Empty); + Settings NewSets = new(Settings.Mode.Empty); Changed = false; @@ -788,7 +789,7 @@ private void Button3_Click(object sender, EventArgs e) if (SaveFileDialog1.ShowDialog() == DialogResult.OK) { - var sets = new Settings(Settings.Mode.Empty); + Settings sets = new(Settings.Mode.Empty); Write(sets, Settings.Mode.File, SaveFileDialog1.FileName); } @@ -798,7 +799,7 @@ private void Button4_Click(object sender, EventArgs e) { if (OpenFileDialog1.ShowDialog() == DialogResult.OK) { - var sets = new Settings(Settings.Mode.File, OpenFileDialog1.FileName); + Settings sets = new(Settings.Mode.File, OpenFileDialog1.FileName); Read(sets); } } @@ -821,7 +822,7 @@ private void MainFrm_DragDrop(object sender, DragEventArgs e) { string[] files = (string[])e.Data.GetData(DataFormats.FileDrop); - var sets = new Settings(Settings.Mode.File, files[0]); + Settings sets = new(Settings.Mode.File, files[0]); Read(sets); OpenFileDialog1.FileName = files[0]; @@ -853,7 +854,7 @@ private void Button7_Click(object sender, EventArgs e) try { - var _File = new StreamReader(TextBox3.Text); + StreamReader _File = new(TextBox3.Text); JObject J = JObject.Parse(_File.ReadToEnd()); _File.Close(); @@ -940,7 +941,7 @@ private void Button18_Click(object sender, EventArgs e) if (!OS.WXP) { - var dlg = new Ookii.Dialogs.WinForms.VistaFolderBrowserDialog(); + Ookii.Dialogs.WinForms.VistaFolderBrowserDialog dlg = new(); if (dlg.ShowDialog() == DialogResult.OK) { if (!ListBox2.Items.Contains(dlg.SelectedPath)) diff --git a/WinPaletter/Settings/SettingsX.resx b/WinPaletter/Settings/SettingsX.resx index 582d430d..09b6045c 100644 --- a/WinPaletter/Settings/SettingsX.resx +++ b/WinPaletter/Settings/SettingsX.resx @@ -130,8 +130,8 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACg - RwAAAk1TRnQBSQFMAgEBDAEAATgBAQE4AQEBFAEAARQBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFQ + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACc + RwAAAk1TRnQBSQFMAgEBDAEAAUABAQFAAQEBFAEAARQBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFQ AwABUAMAAQEBAAEgBgABZP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/ALEABAIDGAEhAxgBIQNAAW8DSgGJA0oBiQMxAU0DGAEhAxgBIQMYASEDGAEhAzEBTQNK AYkDSgGJAkABPwFuAxgBIQMYASEEAgwAAxoBJAJAAT8BbgJEAUMBdwJEAUMBdwJEAUMBdwJEAUMBdwJE @@ -139,9 +139,9 @@ AwIBAwMNAREDDQERAw0BEQMNAREDDQERAw0BEQMNAREDDQERAwQBBWgAAVwCYQHZAS4BxgH+Af8BLgHG Af4B/wG0AYIBLAH/Ac0BdAEBAf8BzAFzAQEB/wF9AZwBgAH/AS4BxgH+Af8BLgHGAf4B/wEuAcYB/gH/ AS4BxgH+Af8BegGbAYAB/wHDAW4BAQH/AcIBbQEBAf8BqQF8ASwB/wEuAcYB/gH/AS4BxgH+Af8BXgJi - AdcIAAMlATcBdAFjAUgB9gHeAYIBCAH/Ad4BggEIAf8B3gGBAQcB/wHdAYEBBwH/Ad0BgAEGAf8B3QGA + AdcIAAMlATcBcwFjAUgB9gHeAYIBCAH/Ad4BggEIAf8B3gGBAQcB/wHdAYEBBwH/Ad0BgAEGAf8B3QGA AQYB/wHcAX8BBQH/AdwBfwEFAf8B3AF/AQUB/wHcAX4BBAH/AdsBfgEEAf8B2wF9AQMB/wHbAX0BAwH/ - AdsBfAECAf8BcwFjAUgB9gMkATUYAANJAYgB3wGUARUB/wHeAZIBEwH/Ad0BjwERAf8B3AGMAQ8B/wHb + AdsBfAECAf8BcgFjAUgB9gMkATUYAANJAYgB3wGUARUB/wHeAZIBEwH/Ad0BjwERAf8B3AGMAQ8B/wHb AYoBDQH/AdoBhwELAf8B2QGFAQoB/wHZAYUBCgH/AkwBSwGPaAABWQJnAe8BMwHHAf4B/wEzAccB/gH/ AbYBgwEsAf8BzwF1AQEB/wHNAXQBAQH/AX8BnQGAAf8BMwHHAf4B/wEzAccB/gH/ATMBxwH+Af8BMwHH Af4B/wF8AZsBgAH/AcQBbgEBAf8BwwFuAQEB/wGqAX0BLAH/ATMBxwH+Af8BMwHHAf4B/wFZAmcB7wgA @@ -153,9 +153,9 @@ AY8BlgFnAf8BxgFvAQEB/wHEAW4BAQH/AasBfQEsAf8BOAHJAf4B/wE4AckB/gH/AVkCZwHvCAADWgG/ AeIBhwENAf8B4QGHAQ0B/wHhAYYBDAH/AeEBhgEMAf8B4AGGAQwB/wHgAYUBCwH/AeABhQELAf8B4AGE AQoB/wHfAYQBCgH/Ad8BgwEJAf8B3wGDAQkB/wHfAYMBCQH/Ad4BggEIAf8B3gGCAQgB/wHeAYEBBwH/ - Ad0BgQEHAf8DWgG/BAABdQFZAUEB7wGTAVUBFAH/AZEBVQEUAf8BjwFUARUB/wGOAVMBFQH/Ab8BgwEe + Ad0BgQEHAf8DWgG/BAABcwFZAUUB7wGTAVUBFAH/AZEBVQEUAf8BjwFUARUB/wGOAVMBFQH/Ab8BgwEe Af8B5wGnASIB/wHmAaQBIQH/AeUBogEfAf8B4wGfAR0B/wHiAZwBGwH/AeEBmQEZAf8B4AGXARcB/wHf - AZQBFQH/AbwBdwEUAf8BkAFUARUB/wGOAVMBFQH/AYwBUgEWAf8BjAFSARYB/wF5AVMBMQH2VAABWQJn + AZQBFQH/AbwBdwEUAf8BkAFUARUB/wGOAVMBFQH/AYwBUgEWAf8BjAFSARYB/wF4AVMBMwH2VAABWQJn Ae8BPQHKAf4B/wE9AcoB/gH/AbgBhAEsAf8B0QF2AQEB/wHSAXoBBAH/AdgBigEPAf8B2AGMARAB/wHY AYwBEAH/AdgBjAEQAf8B2AGMARAB/wHXAYoBDwH/AcoBdgEEAf8BxgFvAQEB/wGtAX0BLAH/AT0BygH+ Af8BPQHKAf4B/wFZAmcB7wgAA1oBvwHjAYoBEAH/AeMBiQEPAf8B4wGJAQ8B/wHiAYgBDgH/AeIBiAEO @@ -167,276 +167,276 @@ ARAB/wHaAY0BEQH/AdoBjQERAf8B2gGNAREB/wHaAY0BEQH/AdoBjQERAf8B2gGNAREB/wHZAYwBEAH/ AcwBdwEFAf8BsAF+ASwB/wFCAcwB/gH/AUIBzAH+Af8BWQJnAe8IAANaAb8B5QGMARIB/wHkAYwBEgH/ AeQBiwERAf8B5AGLAREB/wHkAYoBEAH/AeMBigEQAf8B4wGKARAB/wHjAYkBDwH/AeIBiQEPAf8B4gGI - AQ4B/wHiAYgBDgH/AeIBhwENAf8B4QGHAQ0B/wHhAYcBDQH/AeEBhgEMAf8B4QGGAQwB/wNaAb8EAAGK - AV0BLwH3AZ0BWwERAf8BnAFaAREB/wGaAVkBEgH/AZkBWQESAf8BlwFYARMB/wGyAXcBHAH/AcwBmgEr - AfwB3AGzATkB/wFPAaUBrgH/AU8BpAGtAf8B2wGrATIB/wHLAY0BKwH8AbQBcgEXAf8BnAFaAREB/wGa - AVkBEgH/AZkBWQESAf8BlwFYARMB/wGWAVcBEwH/AX0BXQEvAfZUAAFZAmcB7wFHAc0B/gH/AUcBzQH+ + AQ4B/wHiAYgBDgH/AeIBhwENAf8B4QGHAQ0B/wHhAYcBDQH/AeEBhgEMAf8B4QGGAQwB/wNaAb8EAAGJ + AV0BMwH3AZ0BWwERAf8BnAFaAREB/wGaAVkBEgH/AZkBWQESAf8BlwFYARMB/wGyAXcBHAH/AcoBlwEr + AfwB3AGzATkB/wFPAaUBrgH/AU8BpAGtAf8B2wGrATIB/wHJAYoBKwH8AbQBcgEXAf8BnAFaAREB/wGa + AVkBEgH/AZkBWQESAf8BlwFYARMB/wGWAVcBEwH/AXsBXgExAfZUAAFZAmcB7wFHAc0B/gH/AUcBzQH+ Af8BuQGOATcB/wHcAY0BEQH/AdwBjgERAf8B3AGOAREB/wHcAY4BEQH/AdwBjgERAf8B3AGOAREB/wHc AY4BEQH/AdwBjgERAf8B3AGOAREB/wHbAY0BEQH/AbMBiwE4Af8BRwHNAf4B/wFHAc0B/gH/AVkCZwHv CAADWgG/AeYBjwEVAf8B5gGOARQB/wHmAY4BFAH/AeUBjQETAf8B5QGNARMB/wHlAYwBEgH/AeUBjAES Af8B5AGMARIB/wHkAYsBEQH/AeQBiwERAf8B4wGKARAB/wHjAYoBEAH/AeMBiQEPAf8B4wGJAQ8B/wHi AYkBDwH/AeIBiAEOAf8DWgG/BAACSAFHAYMBowFeAQ8B/wGhAV0BDwH/AZABZQEoAf8BkQFiASQB/wGc - AVoBEQH/AY4BYQEYAf4DQAFvA0gBgwEhAawB5AH/ASEBrAHlAf8DRwGBAkIBQQFyAaMBXgEPAf8BoQFd + AVoBEQH/AYwBYgEZAf4DQAFvA0gBgwEhAawB5AH/ASEBrAHlAf8DRwGBAkIBQQFyAaMBXgEPAf8BoQFd AQ8B/wGTAWMBJAH/AY8BYwEnAf8BnQFbAREB/wGbAVoBEQH/AkcBRgGACAADAgEDA0YBfgJRAVABnAMV ARwIAAMKAQ0DTAGQAkwBSwGPAwoBDQgAAxYBHQJRAVABnQNGAX0DAgEDDAABWQJnAe8BSwHPAv8BSwHP Av8BVwHKAesB/wF+AbUBpgH/AX4BtQGmAf8BfgG1AaYB/wF+AbUBpgH/AX4BtAGmAf8BfQG0AaYB/wF9 AbQBpgH/AX0BtAGmAf8BfQG0AaYB/wF8AbQBpgH/AVUByQHsAf8BSwHPAv8BSwHPAv8BWQJnAe8IAANa Ab8B6AGRARcB/wHoAZEBFwH/AecBkAEWAf8B5wGQARYB/wHnAY8BFQH/AeYBjwEVAf8B5gGOARQB/wHm AY4BFAH/AeYBjgEUAf8B5QGNARMB/wHlAY0BEwH/AeUBjAESAf8B5AGMARIB/wHkAYsBEQH/AeQBiwER - Af8B5AGLAREB/wNaAb8IAAM0AVMBXgFcAVkBxgEmAZ8B0AH/ATABkAG7Af4CWQFYAbsCLgEtAUYDFwEf - AU8BggGWAe0BMgG9AfUB/wEyAb0B9QH/AVMBfwGQAesDFQEcAy4BSAJZAVcBvAExAZEBvAH+AS0BkwHE - Af4CXQFaAcUDMwFRDAADOQFfAeoBsgEqAf8B6AGsASYB/wJXAVYBsggAAksBSgGKAeoBsQEpAf8B6AGr - ASUB/wNJAYgIAAJXAVUBtAHqAbABKAH/AecBqgEkAf8COQE4AV0MAAFZAmcB7wFQAdAC/wFQAdAC/wFQ - AdAC/wFQAdAC/wFQAdAC/wFQAdAC/wFQAdAC/wFQAdAC/wFQAdAC/wFQAdAC/wFQAdAC/wFQAdAC/wFQ - AdAC/wFQAdAC/wFQAdAC/wFQAdAC/wFZAmcB7wgAA1oBvwHpAZMBGQH/AekBkwEZAf8B6QGTARkB/wHp - AZIBGAH/AegBkgEYAf8B6AGRARcB/wHoAZEBFwH/AecBkAEWAf8B5wGQARYB/wHnAZABFgH/AecBjwEV - Af8B5gGPARUB/wHmAY4BFAH/AeYBjgEUAf8B5QGNARMB/wHlAY0BEwH/A1oBvwwAA0gBhAEoAbcB8QH/ - AScBtgHxAf8BOwI8AWQEAANCAXQBOgHBAfcB/wFEAcYB+gH/AUQBxgH6Af8BOQHBAfcB/wFAAkEBcAQA - Az0BaAEnAbYB8QH/ASgBtwHxAf8BRgJHAYAQAAM5AV4B7QG3AS4B/wHqAbIBKgH/AlcBVQGxCAADSgGJ - AewBtgEtAf8B6gGxASkB/wNJAYcIAAJYAVYBswHsAbUBLAH/AeoBsAEoAf8DOAFcDAABWQJnAe8BVQHS - Av8BVQHSAv8BVQHSAv8BVQHSAv8BVQHSAv8BVQHSAv8BVQHSAv8BVQHSAv8BVQHSAv8BVQHSAv8BVQHS - Av8BVQHSAv8BVQHSAv8BVQHSAv8BVQHSAv8BVQHSAv8BWQJnAe8IAANaAb8B6wGWARwB/wHrAZUBGwH/ - AeoBlQEbAf8B6gGVARsB/wHqAZQBGgH/AeoBlAEaAf8B6QGTARkB/wHpAZMBGQH/AekBkgEYAf8B6AGS - ARgB/wHoAZIBGAH/AegBkQEXAf8B6AGRARcB/wHnAZABFgH/AecBkAEWAf8B5wGPARUB/wNaAb8IAAMW - AR4BMgG9AfUB/wFAAcQB+QH/AT8BxAH5Af8BPQGeAcUB+AMJAQwDSAGEAUEBxAH5Af8BTwHMAf4B/wFP - AcwB/gH/AUABxAH5Af8DRwGCAwsBDgE+AacB0QH6AT8BxAH5Af8BQAHEAfkB/wE5AbAB6AH+AxQBGwwA - AwIBAwNGAX4CUQFQAZwDFQEcCAADCgENA0wBkAJMAUsBjwMKAQ0IAAMWAR0CUQFQAZ0DRgF9AwIBAwwA - AVkCZwHvAVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/ - AVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/AVoB0wL/AVkCZwHvCAADWgG/AewBmAEe - Af8B7AGYAR4B/wHsAZcBHQH/AewBlwEdAf8B6wGXAR0B/wHrAZYBHAH/AesBlgEcAf8B6wGVARsB/wHq - AZUBGwH/AeoBlAEaAf8B6gGUARoB/wHpAZQBGgH/AekBkwEZAf8B6QGTARkB/wHpAZIBGAH/AegBkgEY - Af8DWgG/CAADJwE6AT0BwwH4Af8BTwHMAf0B/wFOAcsB/QH/ATsBwgH3Af8DGgEkA1IBowE9AcMB+AH/ - AUoBygH8Af8BSgHKAfwB/wE9AcMB+AH/AVICUwGlAxsBJgE8AcIB9wH/AU4BywH9Af8BTgHMAf0B/wE9 - AcMB+AH/AyYBOFgAAVsCYwHkAUwBxAHzAf8BTAHEAfMB/wFMAcQB8wH/AUwBxAHzAf8BTAHEAfMB/wFM - AcQB8wH/AVAByAH1Af8BXwHVAv8BXwHVAv8BXwHVAv8BXwHVAv8BXwHVAv8BXwHVAv8BXwHVAv8BXwHV - Av8BXwHVAv8BWQJnAe8IAANaAb8B7gGbASEB/wHuAZoBIAH/Ae0BmgEgAf8B7QGZAR8B/wHtAZkBHwH/ - Ae0BmQEfAf8B7AGYAR4B/wHsAZgBHgH/AewBlwEdAf8B7AGXAR0B/wHrAZYBHAH/AesBlgEcAf8B6wGW - ARwB/wHqAZUBGwH/AeoBlQEbAf8B6gGUARoB/wNaAb8IAAM9AWgBOQG+AfUB/wFJAckB/AH/AUgByAH7 - Af8BNAGzAe4B/wMuAUgBWQFcAV4BwwEoAaEB5AH/ASsBmAHfAf8BKwGWAd4B/wEoAZ0B4gH/AVcBWgFd - AcIDMgFPATYBuQHyAf8BSAHIAfsB/wFJAckB/AH/ATgBvAH0Af8DPAFmWAADWgG/AQABigHLAf8BAAGK - AcsB/wEAAYoBywH/AQABigHLAf8BAAGKAcsB/wEAAYoBywH/AQABigHLAf8BMQGwAeQB/wFkAdcC/wFk - AdcC/wFkAdcC/wFkAdcC/wFkAdcC/wFkAdcC/wFkAdcC/wFkAdcC/wFdAmcB6ggAA1oBvwHwAZ0BIwH/ - Ae8BnQEjAf8B7wGcASIB/wHvAZwBIgH/Ae4BmwEhAf8B7gGbASEB/wHuAZsBIQH/Ae4BmgEgAf8B7QGa - ASAB/wHtAZkBHwH/Ae0BmQEfAf8B7QGYAR4B/wHsAZgBHgH/AewBmAEeAf8B7AGXAR0B/wHrAZcBHQH/ - A1oBvwgAAzMBUAEsAXMBsgH5ASABfgHPAf8BIAF8Ac8B/wE2AWkBmwH1AyUBNgMjATIBLgFkAaQB+AEV - AWYBwgH/ARUBYwHAAf8BJAFcAa4B/AMiATEDJQE3ATgBbgGfAfUBIAF+AdAB/wEfAXsBzwH/ASsBagGv - AfkDMQFOWAADWgG/AQABlAHXAf8BAAGUAdcB/wEAAZQB1wH/AQABlAHXAf8BAAGUAdcB/wEAAZQB1wH/ - AQABlAHXAf8BTQJ9AfoBVgJXAbUBVgJZAbYBVgJZAbYBVgJZAbYBVgJZAbYBVgJZAbYBVgJZAbYBVgJX - AbUDLgFGCAACVAFTAaYB8QGgASYB/wHxAZ8BJQH/AfEBnwElAf8B8AGeASQB/wHwAZ4BJAH/AfABnQEj - Af8B8AGdASMB/wHvAZ0BIwH/Ae8BnAEiAf8B7wGcASIB/wHuAZsBIQH/Ae4BmwEhAf8B7gGaASAB/wHu - AZoBIAH/Ae0BmgEgAf8B7QGZAR8B/wJSAVEBpAwAA00BkgEcAWsBtAH+ARUBYgG/Af8BVwJZAbkIAAMM - AQ8BSwJMAY8BUwJUAakDRgF9CAADRAF4ARwBbAG0Af4BFQFjAcAB/wFaAV4BYQHNXAABUAJRAZwBAAGf - AeMB/wEAAZ8B4wH/AQABnwHjAf8BAAGfAeMB/wEAAZ8B4wH/AQABnwHjAf8BWgJuAfUDNAFTLAADJQE3 - AXYBZQFIAfYB8gGiASgB/wHyAaEBJwH/AfIBoQEnAf8B8gGgASYB/wHxAaABJgH/AfEBnwElAf8B8QGf - ASUB/wHxAZ8BJQH/AfABngEkAf8B8AGeASQB/wHwAZ0BIwH/Ae8BnQEjAf8B7wGcASIB/wHvAZwBIgH/ - AXUBYwFIAfYDJAE1FAADDQERAwgBCigAAwwBDwMJAQxcAAQBAxgBIQMZASIDGQEiAxkBIgMZASIDGQEi - AwkBDDQAAxoBJAJCAUEBcgNJAYgDSQGIA0kBiANJAYgDSQGIA0kBiANJAYgDSQGIA0kBiANJAYgDSQGI - A0kBiAJCAUEBcgMaASP/AP8A/wD/AMAAAwIBAwMHBAkBCwMJAQsDCQELAwkBCwMJAQsDCQELAwkBCwMJ - AQsDCQELAwkBCwMJAQsDCQELAwkBCwMJAQsDCAEKAwMBBBAAAw8BEwMtAUQCMQEwAUwCPAE7AWUDLQFE - Ay0BRAMtAUQDLQFEAy0BRAMtAUQDLQFEAy0BRAMnAToEAVwAAjgBOQRdAcwDXQHMA10BzAJdAWEB1AJa - AWsB8gJcAXwB+AJbAWMB5AJZAVwBvgFPAU4BTwGXAyoBQAQCJAADGQEiA0sBiwNSAaADUgGgA1IBoANS - AaADUgGgA1IBoANSAaADUgGgA1IBoANSAaADUgGgA1IBoANSAaADUgGgA00BkwMoATsDAgEDDAADUQGe - AakBXgEJAf8BqQFdAQkB/wG5AWoBCQH/AdkBhAEJAf8B2QGEAQkB/wHZAYQBCQH/AdkBhAEJAf8B2QGE - AQkB/wHZAYQBCQH/AdkBhAEJAf8B2QGEAQkB/wHZAYQBCQH/AkwBSwGPAxEBFmwAAwwBEAJcAV8ByAFT - AUgB8gH/AVIBRQHxAf8BUAFDAfAB/wFOAUEB7wH/AlsBXwHYAygBPBwABAEDKgFAA2cB7wOkAf4DowH+ - A6IB/gOhAf4DoQH+A6EB/gOhAf4DoAH+A58B/gOeAf4DngH+A50B/gOdAf4DnAH+A24B9QM+AWoDBAEF - CAADBwEJA1oBvwGlAWsBKwH/AaUBXQENAf8BvAFsAQoB/wHaAYcBCwH/AdoBhwELAf8B2gGHAQsB/wHa - AYcBCwH/AdoBhwELAf8B2gGHAQsB/wHaAYcBCwH/AdoBhwELAf8B2gGHAQsB/wFYAbkBAwH/A0QBegwA - AzMBUQNUAaoDVAGqA1MBqgNTAaoDUwGqA1MBqgNTAaoDUwGqA1MBqgNTAaoDUwGqA1MBqgNTAaoDUwGq - A1MBqgNTAaoDMwFQHAADEgEXAloBawHyAVABQwHwAf8BTgFBAe8B/wFMAT8B7wH/AUoBPQHuAf8BSAFB - AWoB+QMpAT4YAAQBAywBQwNoAfQD8wH/A/IB/wPyAf8B8QLwAf8B3wHaAdwB/wHGAcABygH/AbwBuQHP - Af8BzwHOAd4B/wG3AbYB0QH/Ab8BvgHVAf8B4gHhAegB/wPuAf8D7AH/A+wB/wN/AfkDQAFvAwUBBggA - AzgBXAOAAf4BuwG5AbcB/wGkAXIBOQH/Ab4BbwEJAf8B2wGKAQ0B/wHbAYoBDQH/AdsBigENAf8B2wGK - AQ0B/wHbAYoBDQH/AdsBigENAf8B2wGKAQ0B/wHbAYoBDQH/AdsBigENAf8BWAG6AQMB/wFGAUcBRgGA - DAADWQG+A1cB/wNWAf8DVQH/A1UB/wNUAf8DUwH/A1IB/wNSAf8DUQH/A1AB/wNPAf8DTgH/A04B/wNN - Af8DTQH/A00B/wNZAb4gAAJRAVIBpAFOAUEB7wH/AUwBPwHvAf8BSgE9Ae4B/wFHAToB7QH/AUQBNgHs - Af8CXQFhAc8YAAQBAywBQwNoAfQD9QH/A/MB/wPzAf8B6wHoAeYB/wGgAYgBhQH/AU4BMAFKAf8BJwEX - AV4B/wFlAWIBoQH/AQUBAAF2Af8BHQEVAZMB/wGoAaUB0QH/A+8B/wPtAf8D7QH/A4AB+QNAAW8DBQEG - DAADVQGtAagBXgEHAf8BrgFhAQcB/wHAAXEBCgH/AdwBjQEPAf8B3AGNAQ8B/wHcAY0BDwH/AdwBjQEP - Af8B3AGNAQ8B/wHcAY0BDwH/AdwBjAEPAf8B3AGMAQ8B/wHcAYwBDwH/AVgBugEEAf8BRgFHAUYBgAwA - A1oBvwNaAf8DWQH/A1gB/wNXAf8DVwH/A1YB/wNVAf8DVAH/A1MB/wNTAf8DUgH/A1EB/wNQAf8DUAH/ - A08B/wNOAf8DWgG/IAADRgF+AUwBPwHvAf8BSgE9Ae4B/wFHAToB7QH/AUQBNgHsAf8BQAEyAesB/wOA - Af4DBQEGFAAEAQMsAUMDaAH0A/YB/wP1Af8D9AH/Ae0B6gHnAf8BrwGSAX8B/wFmAUABPwH/AT8BJgFU - Af8BbQFmAaMB/wEKAQIBhgH/ASUBFgGsAf8BqwGmAdkB/wPwAf8D7gH/A+0B/wOAAfkDQAFvAwUBBgwA - AlUBUwGqAbUBZQEHAf8BtQFlAQcB/wHDAXMBCwH/Ad0BjwERAf8B3QGPAREB/wHdAY8BEQH/Ad0BjwER - Af8B3QGPAREB/wHdAY8BEQH/Ad0BjwERAf8B3QGPAREB/wHdAY8BEQH/AVgBuwEEAf8BRgFHAUYBgAwA - A1oBvwNcAf8DWwH/A1sB/wNaAf8DWQH/A2UB/wNvAf8DVgH/A2QB/wNVAf8DUwH/A3kB/wNSAf8DUgH/ - A1EB/wNRAf8DWgG/IAADOwFiAUoBPQHuAf8BRwE6Ae0B/wFEATYB7AH/AUABMgHrAf8BPQEvAeoB/wE6 - ASsB6AH/AwoBDRQABAEDLAFDA2gB9AP3Af8D9gH/A/YB/wHxAe4B6gH/AcgBrgGTAf8BlQFxAV4B/wF3 - AV0BbgH/AZcBjQG6Af8BSQE+AagB/wFVAUoBuQH/Ab0BuQHeAf8D8QH/A/AB/wPvAf8DgAH5A0ABbwMF - AQYMAAJVAVMBqgG4AWcBBgH/AbgBZwEGAf8BxQF2AQoB/wHeAZIBEwH/Ad4BkgETAf8B3gGSARMB/wHe - AZIBEwH/Ad4BkgETAf8B3gGSARMB/wHeAZIBEwH/Ad4BkgETAf8B3gGSARMB/wE8Aa0BowH/AVICUwGl - DAADWgG/A18B/wNeAf8DXQH/A10B/wOOAf8DzQH/A6MB/wOFAf8DkgH/A1cB/wNnAf8DpgH/A1YB/wNV - Af8DVAH/A1MB/wNaAb8gAAMSARgBSAFBAWoB+QFEATYB7AH/AUABMgHrAf8BPQEvAeoB/wE6ASsB6AH/ - AlwBYQHWGAAEAQMsAUMDaAH0A/gB/wP3Af8D9wH/AfMB7gHpAf8BzAGpAXwB/wGVAWUBRAH/AXQBUAFO - Af8BkwGDAZsB/wExASQBcgH/ASwBJwGHAf8BrgGtAdAB/wPzAf8D8QH/A/AB/wOAAfkDQAFvAwUBBgwA - A1UBrAG2AWUBBQH/AbkBZwEFAf8BxwF3AQoB/wHfAZUBFQH/Ad8BlQEVAf8B3wGVARUB/wHfAZUBFQH/ - Ad8BlQEVAf8B3wGVARUB/wHfAZUBFQH/Ad8BlQEVAf8B3wGVARUB/wE4AbABvwH/A04BlQwAA1oBvwNh - Af8DYQH/A2AB/wNeAf8D1wH/A2MB/wNdAf8DWwH/A1oB/wNaAf8DqgH/A2oB/wNYAf8DVwH/A1cB/wNW - Af8DWgG/JAADRgF9AUABMgHrAf8BPQEvAeoB/wFDATQB5AH/A2gB8ANoAfQDJAE0FAAEAQMsAUMDaAH0 - A/kB/wP4Af8D+AH/AfMB7wHqAf8BtwGaAZsB/wFtAUsBkAH/AW4BSAFhAf8BlwGDAYsB/wE0ASABWAH/ - ASQBHQF1Af8BqQGoAcwB/wPzAf8D8gH/A/EB/wOAAfkDQAFvAwUBBggAAzABSwNnAe8BuAGoAZUB/wGu - AXQBLQH/AcoBeQELAf8B4AGXARcB/wHsAccBhgH/AfQB5QHMAf8B9AHlAcwB/wH0AeUBzAH/AfQB5QHM - Af8B9AHlAcwB/wHqAcABdQH/AeABlwEXAf8BOAG3AcEB/wFGAkcBgAwAA1oBvwNkAf8DYwH/A2IB/wNh - Af8D2AH/A2QB/wNfAf8DXQH/A6sB/wNcAf8DuQH/A1oB/wNbAf8DWgH/A1kB/wNYAf8DWgG/KAADJgE4 - A0gBgwNjAfYBvgG0AawB/wG6AbABpwH/A18B0wMFAQYQAAQBAywBQwNoAfQD+gH/A/kB/wP5Af8B9QHy - AfAB/wG8Aa4B2QH/AXsBbgHrAf8BiAFzAb4B/wG2AacBrQH/AXYBYwF+Af8BagFhAZQB/wHDAcIB2AH/ - A/QB/wPyAf8D8gH/A4AB+QNAAW8DBQEGCAADFQEcA2EB1AG0AYoBVQH/AbUBbAESAf8BzAF7AQsB/wHh - AZoBGQH/AeEBmgEZAf8B4QGaARkB/wHhAZoBGQH/AeEBmgEZAf8B4QGaARkB/wHhAZoBGQH/AeEBmgEZ - Af8B4QGaARkB/wE4Ab4BwgH/AUYCRwGADAADWgG/A2cB/wNmAf8DZQH/A2QB/wOUAf8DzAH/A5YB/wOC - Af8DXQH/A44B/wOKAf8DXgH/A10B/wNdAf8DXAH/A1sB/wNaAb8sAAMJAQwDaAH0AcMBuQGwAf8BvgG0 - AawB/wG6AbABpwH/A0MBdhAABAEDLAFDA2gB9AP6Af8D+gH/A/oB/wP5Af8D+QH/A/gB/wP4Af8D+AH/ - A/cB/wP3Af8D9gH/A/UB/wPzAf8D8wH/A4AB+QNAAW8DBQEGDAACVQFTAaoBwwFuAQMB/wHEAW4BAwH/ - Ac8BfQELAf8B4wGdARsB/wHtAcgBgwH/AfQB4QG+Af8B9AHhAb4B/wH0AeEBvgH/AfQB4QG+Af8B9AHh - Ab4B/wHsAcMBdgH/AeMBnQEbAf8BQwGjAcAB/wNJAYUMAANaAb8DaQH/A2gB/wNoAf8DZwH/A2YB/wN0 - Af8DiAH/A20B/wNiAf8DnAH/A18B/wNhAf8DYAH/A18B/wNeAf8DXgH/A1oBvzAAA1IBowHIAb0BtAH/ - AcMBuQGwAf8BvgG0AawB/wNoAfQDGAEgDAAEAQMsAUMDaAH0A/wB/wP7Af8D+wH/A/oB/wP6Af8D+QH/ - A/kB/wP4Af8D9wH/A/cB/wP2Af8D9QH/A/UB/wP0Af8DgQH5A0ABbwMFAQYMAAJVAVMBqgHHAXABAwH/ - AcYBcAEDAf8B0AGAAQwB/wHkAaABHQH/AeYBpgErAf8B5wGrAToB/wHnAasBOgH/AecBqwE6Af8B5wGr - AToB/wHnAasBOgH/AeUBpAEpAf8B5AGfAR0B/wFkAUgBtQH/AVUCVwG0DAADWgG/A2wB/wNrAf8DagH/ - A2oB/wNpAf8DaAH/A2cB/wNmAf8DZgH/A2UB/wNkAf8DYwH/A2MB/wNiAf8DYQH/A2AB/wNaAb8wAAMu - AUYBzQHCAbgB/wHIAb0BtAH/AcMBuQGwAf8BvgG0AawB/wNZAbkMAAQBAywBQwJTAWgB9AFSAU4BmQH/ - AVgBUgGRAf8BgQF7AaQB/wHoAecB6QH/AZoBkQGgAf8BcQFgAXIB/wF4AWQBbQH/AX4BaAFmAf8BhAFr - AWAB/wGeAYoBfAH/AeAB2wHYAf8BvgGnAYsB/wGgAXsBRwH/AaABewFHAf8CagFLAfkDQAFuAwUBBgwA - AlUBUwGqAckBcgECAf8ByQFyAQIB/wHSAYIBCwH/AeUBogEfAf8B5QGiAR8B/wHlAaIBHwH/AeUBogEf - Af8B5QGiAR8B/wHlAaIBHwH/AeUBogEfAf8B5QGiAR8B/wHlAaIBHwH/AWoBTwG4Af8CRgFHAYAMAANf - AckDbgH/A24B/wNtAf8DbAH/A2sB/wNrAf8DagH/A2kB/wNoAf8DZwH/A2cB/wNmAf8DZQH/A2QB/wNk - Af8DYwH/A18ByTAABAIDZQHjAc0BwgG4Af8ByAG9AbQB/wNoAfACZAFgAdsCPAE7AWQIAAQBAyUBNgNe - AdICYAFmAeACYAFmAeABYwFaAWMB6QO+Af0DZQHsA2IB4QNiAeEDYgHhA2IB4QFpAWYBYAHoA30B+gNq - Ae0BZgJgAeABYwJdAd8BYgJeAdcDOAFbAwIBAwwAA1UBrQHCAW0BAQH/AcgBcQEBAf8B1QGEAQwB/wHm - AaUBIQH/AeYBpQEhAf8B5gGlASEB/wHmAaUBIQH/AeYBpQEhAf8B5gGlASEB/wHmAaUBIQH/AeYBpQEh - Af8B5gGlASAB/wFxAVYBugH/AUcBRgFHAYAMAANiAdwDlAH/A5QB/wOUAf8DlAH/A5QB/wOTAf8DkwH/ - A5MB/wOSAf8DkgH/A5EB/wORAf8DkAH/A5AB/wOPAf8DjwH/A2IB3DQAA0wBjwNwAfEDZwHvAdwBigEb - Af8B3wGEAQsB/wJnAVkB7wMTARkUAAMCAQMDMQFMA2MB6QNLAYsDKwFCAyoBPwMqAT8DKgFAA0IBcgNi - AdwDPwFsAwMBBAgBEAADOQFeAccBxAHBAf8BvAG6AbkB/wG5AX8BNAH/AdcBhgENAf8B5wGoASMB/wHn - AagBIwH/AecBqAEjAf8B5wGoASMB/wHnAagBIwH/AecBqAEjAf8B5wGoASMB/wHnAagBIgH/AecBpwEi - Af8BdQFbAb0B/wFHAUYBRwGADAADXAG+A8wB/wPMAf8DzAH/A8wB/wPMAf8DzAH/A8wB/wPMAf8DzAH/ - A8wB/wPMAf8DzAH/A8wB/wPIAf8DtQH/A7IB/wNcAb40AAMkATUB6AGYASIB/wHrAZYBHAH/AecBkAEW - Af8B5AGLAREB/wHgAYUBCwH/A1UBrRQABAEDEQEWA1EBnwNmAeUDaQHoA2kB6ANpAegDaQHoA2UB5wNX - AbQDIgExBAEYAAMHAQkCXAFaAcQBvgF/AS4B/wHJAXQBBAH/AdkBiAEMAf8B6AGqASUB/wHoAaoBJQH/ - AegBqgElAf8B6AGqASUB/wHoAaoBJQH/AegBqgElAf8B6AGqASQB/wHoAaoBJAH/AegBqgEkAf8BeQFi - Ab4B/wNEAXoMAAMzAVEDWgG6A1kBuwNZAbsDWQG7A1kBuwNZAbsDWQG7A1kBuwNZAbsDWQG7A1kBuwNZ - AbsDWQG7A1kBuwNZAbsDWgG6AzMBUDgAAl0BWwHFA2IB7gNiAe4DYgHuA2IB7gNiAe4DLgFIFAAEAgMZ - ASIDPAFmA0IBdANCAXQDQgF0A0IBdAM/AWwDIwEzAwUBBiAAA1EBngHSAXcBAAH/AdIBdwEAAf8B2gGJ - AQ0B/wHpAa0BJwH/AekBrQEnAf8B6QGtAScB/wHpAa0BJwH/AekBrQEnAf8B6QGtASYB/wHpAa0BJgH/ - AekBrQEmAf8B6QGtASYB/wNPAZkDEQEWwAAEAgMEBAUBBgMFAQYDBQEGAwUBBgMFAQYEAiQAAw8BEwMz - AVIDOQFeA0QBewM1AVUDNQFVAzUBVQM1AVUDNQFVAzUBVQM1AVUDNQFVAysBQQQB/wD/AAIAAwwBDwM5 - AV+QAAMHAQkDDwEUAxABFQMQARUDEAEVAxABFQMQARUDEAEVAxABFQMQARUDEAEVAxABFQMQARUDCwEO - cAADHgErAbwBWwEZAf8CQQFAAXGMAAMxAUwDUQGdA1IBpANSAaQDUgGkA1IBpANSAaQDUgGkA1IBpANS - AaQDUgGkA1IBpANSAaQDQgFyGAADCgENAxoBIxAAAzcBWgNEAXoDRAF6Aw4BEjAAAx4BKwG7AVsBGQH/ - AbsBWwEZAf8CQgFBAXIwAAMHAQkDPwFsA0QBdwNEAXcDRAF3A0QBdwNEAXcDRAF3A08BlwNNAZMDBAEF - LAADRAF3A2gB9AP6Af8D+gH/A/oB/wP6Af8D+gH/A/oB/wP6Af8D+gH/A/oB/wP6Af8D+gH/A1cBshQA - AwsBDgJdAVoBxwJwAWUB8QInASYBOQwAAmEBXQHUAcoBdwEAAf8BxwF2AQIB/wJ8AVwB+AJZAVcBuQMF - AQYoAAMeASsBuwFbARoB/wG7AVsBGQH/AbsBWwEZAf8CQgFBAXMsAAMxAU4B3AHZAdYB/wHZAdYB0wH/ - AdYB0wHPAf8B0wHQAcsB/wHQAcwByAH/Ac0ByQHEAf8BzAHIAcIB/wGnAaABlwH/AacBoAGXAf8DVgGw - LAADRAF3A2gB9AP6Af8D+gH/A/oB/wP6Af8D+gH/A/oB/wP6Af8D+gH/A/oB/wP6Af8D+gH/A1cBshAA - AwsBDgJdAVoBxwHpAa0BJgH/AekBrQEmAf8CcAFlAfECJwEmATkIAAJdAVoBxwHKAXcBAAH/AcUBcgEA - Af8BvgFsAQAB/wHaAZsBHgH/AmcBXQHqAwgBChQAAxgBIQJaAVcBwgNdAcwDXQHMAWMCXwHVAboBWwEa - Af8BugFbARoB/wG7AVsBGgH/AbsBWwEZAf8BYQJdAdEDXQHMA1MBpwNdAcwDXQHMA10BzANdAcwCXAFZ - AcEDGAEgCAADNAFTAd8B3QHaAf8B3AHaAdYB/wHZAdYB0wH/AdYB0wHPAf8B0wHQAcwB/wHQAc0ByAH/ - Ac0ByQHEAf8BwAG7AbQB/wHAAbsBtAH/AYMBfAFzAf8BVQFTAVUBqigAA0QBdwNoAfQB+AH1Ae8B/wHn - AcoBnQH/AeMBwgGdAf8B4AG8AZ8B/wHiAcABpgH/AeoB1QHFAf8B4AG7AZ8B/wHgAbsBnwH/AeABuwGf - Af8B7wHhAdYB/wP6Af8DVwGyDAADBgEIA10BzAHpAa8BKAH/AekBrwEnAf8B6QGuAScB/wHpAa4BJwH/ - AmgBUwH0AyQBNQgAAwoBDQMwAUoDXgHSAb8BcAEGAf8B7gG5AS8B/wJdAVoBxxQAAzUBVQG4AVoBGwH/ - AbkBWgEaAf8BuQFaARoB/wG5AVoBGgH/AboBWgEaAf8BugFbARoB/wG6AVsBGgH/AbsBWwEaAf8BuwFb - ARoB/wFvAVwBUQH3AmgBXgHwAewBpAFCAf8B7AGkAUIB/wHsAaQBQgH/AewBpAFCAf8B7AGkAUIB/wM1 - AVUIAAM/AW0B4gHgAd4B/wHfAd0B2gH/AdwB2gHWAf8B2QHWAdMB/wHWAdMBzwH/AdMB0AHMAf8B0AHN - AcgB/wHNAckBxAH/AcwByAHCAf8DgAH+ATQBJQHYAf8DQAFvJAADRAF3A2gB9AHyAeYBxwH/AdgBnAEq - Af8B0AGMAS8B/wHIAXwBMwH/AcgBfwFFAf8B2QGrAYgB/wHDAXMBNgH/AbUBaQFCAf8BhgFLAWcB/wHO - AaoBogH/A/oB/wNXAbIMAAMCAQMDKgFAAjkBOAFdAeoBsAEoAf8B6gGwASgB/wJYAVYBswMtAUQDEQEW - EAADCQEMA10BzAHoAbABKgH/AesBtgEuAf8DIwEzEAADNQFVAbgBWgEbAf8BuAFaARsB/wG5AVoBGwH/ - AbkBWgEaAf8BuQFaARoB/wG5AVoBGgH/AboBWgEaAf8BugFbARoB/wG6AVsBGgH/Al0BWwHFAe0BpAFC - Af8B7QGkAUIB/wHtAaQBQgH/AewBpAFCAf8B7AGkAUIB/wHsAaQBQgH/AzUBVQgAAzYBWAOAAf4BxgGe - AVUB/wHEAZoBUgH/AcMBlwFQAf8BwQGUAU0B/wG/AZEBSwH/AcABkAFLAf8BwAGRAUsB/wOAAf4BugFI - AXYB/wFBAR4B0gH/A4AB/gM7AWMgAANEAXcDaAH0AfUB6gHGAf8B4AGrAScB/wHYAZsBKwH/Ac8BiwEw - Af8BzAGGAUQB/wHZAasBiAH/AcMBcwE2Af8BnQFZAVUB/wFKASIBmgH/AcIBogGsAf8D+gH/A1cBshQA - Ax0BKAHqAbEBKQH/AeoBsQEpAf8CVAFTAakcAAMmATgB4wGoASYB/wHtAbcBLgH/AlUBUwGqEAADNQFV - AbcBWgEbAf8BuAFaARsB/wG8AWMBKAH/AbgBWwEcAf8BuQFaARsB/wG8AWABIwH/AboBXQEeAf8BugFa - ARoB/wG6AVsBGgH/Al0BWwHKAewBpAFBAf8B7QGkAUIB/wHtAaQBQgH/AewBowFBAf8B7QGkAUIB/wHs - AaQBQgH/AzUBVQgAAzQBUwHjAZ8BHAH/AeIBmwEaAf8B4AGXARcB/wHfAZMBFAH/Ad0BkAESAf8B3AGM - AQ8B/wHaAYgBDAH/AdkBhQEKAf8B2QGFAQoB/wHXATgBZAH/AX4BHwGyAf8BMAEgAeUB/wJAAb4B/QM5 - AV8cAANEAXcDaAH0AfcB7gHFAf8B6AG7ASMB/wHfAaoBJwH/AdcBmgEsAf8B0gGTAUAB/wHWAaoBiwH/ - AaQBXgFQAf8BgQFHAWwB/wEvARABsAH/AbwBngGxAf8D+gH/A1cBshQAAx0BKAHrAbIBKgH/AesBsgEq - Af8CVAFTAakgAAJfAScB+wHsAbYBLQH/AmMBXwHVEAADNQFVAbcBWgEbAf8BtwFaARsB/wHmAcUBrwH/ - AdYBnwF6Af8BygGDAVQB/wHuAdcByAH/AcQBdAE+Af8BuQFaARoB/wFsAmEB6wJ9AU0B+gGuAWQBIwH/ - Ac4BggEyAf8B2gGQATgB/wGhAVMBGgH/AeYBnAE+Af8B7QGkAUIB/wM1AVUIAAM0AVMB5QGiAR8B/wHj - AZ8BHAH/AeIBmwEaAf8B4AGXARcB/wHfAZMBFAH/Ad0BkAESAf8B3AGMAQ8B/wHaAYgBDAH/AdkBhQEK - Af8B1wE4AWQB/wG7AR8BmgH/AS8BIAHhAf8BMAEgAeUB/wExASEBXwH7AzQBVBgAA0QBdwNoAfQB+QHz - AdIB/wHxAdQBVgH/AesByAFZAf8B5QG7AV0B/wHhAbYBbAH/Ab4BqAHDAf8BagFQAbwB/wFlAUwBwAH/ - AVUBQgHNAf8BuwGqAdAB/wP6Af8DVwGyFAADHQEoAesBtAErAf8B6wGzASsB/wJUAVMBqSAAAnwBXAH4 - AewBtQEsAf8CZQFgAeMQAAM1AVUBtgFaARsB/wG3AVoBGwH/Ac4BjgFjAf8B8QHfAdMB/wHjAb4BpgH/ - AfUB5wHdAf8BuAFaARsB/wG5AVoBGwH/AlsBWQHAAe8BowFCAf8B5QGcAT0B/wGbAU8BGAH/AZkBTAEW - Af8B3wGUAToB/wHtAaQBQgH/Ae0BpAFCAf8DNQFVCAADNAFTAeYBpgEiAf8B5QGiAR8B/wHjAZ8BHAH/ - AeIBmwEaAf8B4AGXARcB/wHfAZMBFAH/Ad0BkAESAf8B3AGMAQ8B/wHaAYgBDAH/AdcBOAFkAf8B5AEg - AYwB/wFHASEB0gH/ATEBIQHlAf8BMAEgAeUB/wJNAX0B+gMzAVAUAANEAXcDaAH0AfkB9AHWAf8B9gHf - AVkB/wHyAdUBVQH/AesByQFZAf8B5wHCAWgB/wHpAc0BoQH/AdkBpAFjAf8B0wGZAWYB/wHRAZUBZwH/ - AeUBxgGuAf8D+gH/A1cBshQAAx0BKAHsAbUBLAH/AewBtQEsAf8CVAFTAakgAAJ8AVwB+AHrAbMBKwH/ - AmUBYAHjEAADNQFVAbYBWgEcAf8BtgFaARwB/wG6AWABIwH/AfEB3gHRAf8B0QGWAW0B/wHaAaoBiQH/ - AbgBWgEbAf8BuAFaARsB/wJiAV4B1wHvAaMBQgH/AeEBlQE7Af8BnQFSARoB/wGdAU8BGAH/AdsBjwE3 - Af8B7gGkAUIB/wHtAaQBQgH/AzUBVQgAAzQBUwHoAaoBJAH/AeYBpgEiAf8B5QGiAR8B/wHjAZ8BHAH/ - AeIBmwEaAf8B4AGXARcB/wHfAZMBFAH/Ad0BkAESAf8B3AGMAQ8B/wHXATkBZAH/AeUBIAGMAf8BggEi - AbQB/wE3ASgB5wH/ATYBJgHnAf8BNQElAecB/wE1ASUBXwH7Ax8BLBAAA0QBdwNoAfQB+QHzAc8B/wHu - AdUBPAH/AeYByAEwAf8B1wGyATYB/wHkAbkBNwH/AecBxgGCAf8B1QGVAS0B/wHMAYUBMgH/AcYBeAE2 - Af8B3gG1AZYB/wP6Af8DVwGyFAADCgENAewBtQEtAf8B7AG2AS0B/wJXAVUBtCAAAnwBXAH4AesBsgEq - Af8CZQFgAeMQAAM1AVUBtQFaARwB/wG2AVoBHAH/AbYBWgEcAf8B5AHDAawB/wH0AeUB2wH/AcEBcQE6 - Af8BtwFaARsB/wFiAl0B3AHwAaMBQgH/AeUBmgE+Af8B1AGIATUB/wHIAXwBLwH/AboBbQEnAf8BngFQ - ARgB/wHdAZEBOQH/Ae4BpAFCAf8DNQFVCAADNAFTAekBrQEnAf8B6AGqASQB/wHmAaYBIgH/AeUBogEf - Af8B4wGfARwB/wHiAZsBGgH/AeABlwEXAf8B3wGTARQB/wHdAZABEgH/AdgBOgFlAf8B5QEgAYwB/wG/ - ASIBmgH/ATsBLQHlAf8BOwEsAekB/wE6ASsB6QH/AmABaQHoAxMBGRAAA0QBdwNoAfQB+QH0AdUB/wGu - AZwBhgH/AbYBoQFyAf8BmwGCAX4B/wHHAacBWQH/AesBzwF/Af8B3AGkASkB/wHUAZMBLgH/AcsBgwEy - Af8B4AG4AZUB/wP6Af8DVwGyGAACagFBAfkB7QG3AS4B/wJmAWAB4CAAAnwBXAH4AeoBsQEpAf8CZQFg - AeMQAAM1AVUBtQFZARwB/wG1AVkBHAH/AbYBWgEcAf8BywGLAV8B/wHtAdcByAH/AbYBWgEbAf8BtwFa - ARsB/wJbAVkBwAHwAaMBQgH/Ad4BkQE5Af8BugFuASgB/wGvAWIBIgH/AaIBUwEaAf8BsQFjASIB/wHL - AX4BMAH/Ae4BpAFCAf8DNQFVCAADNAFTAesBsQEqAf8B6QGtAScB/wHoAaoBJAH/AeYBpgEiAf8B5QGi - AR8B/wHjAZ8BHAH/AeIBmwEaAf8B4AGXARcB/wHfAZMBFAH/AdkBPwFqAf8B5gEiAY4B/wHkASABjAH/ - AVEBMAHXAf8BQQEzAesB/wJgAWkB6AMgAS4UAANEAXcDaAH0AfgB9gHdAf8BbgFfAdAB/wFwAWABxAH/ - AYkBdgGYAf8BfAFqAbAB/wHvAdcBfQH/AeQBswElAf8B2wGiASoB/wHTAZIBLwH/AeMBvwGUAf8D+gH/ - A1cBshgAAlwBWQHBAe0BuAEvAf8B0AGMARcB/wM+AWsUAAMdASgDIwEzAmgBUwH0AeoBsAEoAf8CYwFd - Ad8DIwEzAxcBHwgAAzUBVQG0AVkBHAH/AbUBWQEcAf8BtQFZARwB/wG1AVoBHAH/AbYBWgEcAf8BtgFa - ARwB/wG2AkAB/QJmAV8B5QHwAaMBQgH/AfABowFCAf8B8AGjAUIB/wHnAZsBPgH/AdwBkAE4Af8B7wGj - AUIB/wHvAaMBQgH/Ae8BowFCAf8DNQFVCAADNAFTAewBtQEsAf8B6wGxASoB/wHpAa0BJwH/AegBqgEk - Af8B5gGmASIB/wHlAaIBHwH/AeMBnwEcAf8B4gGbARoB/wHgAZcBFwH/AdsBRAFtAf8B5wEnAZMB/wHm - ASMBkAH/AY0BKwG1Af8CXgFlAeIDGwEmGAADRAF3A2gB9AH6AfkB9AH/AcYBwQHyAf8BvAG3AfcB/wHP - AckB3gH/AcUBwAHrAf8B9wHwAc4B/wH0AeQBrwH/AfEB3gGwAf8B7gHYAbIB/wH0AeoB3AH/A/oB/wNX - AbIYAAMXAR8BvgGxAUAB/QHcAZ4BIQH/A4AB/gNMAZADHQEpAwgBCggAA04BlQHpAa4BJwH/AekBrgEn - Af8B6QGuAScB/wHpAa8BJwH/AekBrwEoAf8DPgFqCAADNQFVAbQBWQEdAf8BtAFZARwB/wG1AVkBHAH/ - AbUBWQEcAf8BtQFZARwB/wG1AVoBHAH/Al4BWwHNAfEBowFCAf8B8QGjAUIB/wHwAaMBQgH/AfABowFC - Af8B8AGjAUIB/wHwAaMBQgH/Ae8BowFCAf8B7wGjAUIB/wHvAaMBQgH/AzUBVQgAAy8BSQHuAbgBLwH/ - AewBtQEsAf8B6wGxASoB/wHpAa0BJwH/AegBqgEkAf8B5gGmASIB/wHlAaIBHwH/AeMBnwEcAf8B4gGb - ARoB/wHcAUMBdgH/AekBLAGYAf8B5wEoAZYB/wNiAe4DGgEjHAADRAF3A2gB9AP6Af8D+gH/A/oB/wP6 - Af8D+gH/A/oB/wP6Af8B6QLqAf8B0gHTAdQB/wHUAdUB1gH/AdQB1QHWAf8DVQGqHAACOwE6AWIDgAH+ - AcYBeAEKAf8BwQFuAQAB/wHHAXQBAAH/AcsBeAEAAf8DOQFfBAADAwEEAlQBUwGpAegBrQEmAf8B6QGt - ASYB/wHpAa0BJgH/A0YBfgwAAzQBUwGzAVkBHQH/AbQBWQEdAf8BtAFZAR0B/wG0AVkBHAH/AbUBWQEc - Af8BtQFZARwB/wJdAVsBxQHxAaMBQgH/AfEBowFCAf8B8QGjAUIB/wHxAaMBQgH/AfABowFCAf8B8AGj - AUIB/wHwAaMBQgH/AfABowFCAf8B7wGjAUIB/wM0AVMIAAMFAQYCPAE7AWQCRAFDAXcDRQF8AX0BdQFp - AfoB4gFxAWcB/wHgAW0BZQH/Ad8BagFjAf8B3gFoAV8B/wHdAVsBaAH/Ac0BNQGlAf8BmwE5AbwB/wFj - AV0BYwHfAxYBHSAAA0QBdwNoAfQD+gH/A/oB/wP6Af8D+gH/A/oB/wP6Af8D+gH/AusB7AH/AusB7AH/ - A34B/ANcAcQDFgEdIAADLAFDA2IB4QHNAYMBDQH/AccBdAEAAf8BywF4AQAB/wM+AWsIAAMDAQQCVAFT - AakB6AGsASUB/wNGAX4QAAMQARUCVAFSAagDWQG7A1kBuwNZAbsDWQG7AlkBVwG5AlcBVQG0A1kBuwNZ - AbsDWQG7A1kBuwNZAbsDWQG7A1kBuwNZAbsCVAFSAagDDwEUGAABUwFRAVMBogHxAUcBtAH/A4AB/gFf - AVwBXwHIAUIBQQFCAXIDOQFeAlwBfAH4AlsBXQHKAw4BEiQAA0QBdwNoAfQD+gH/A/oB/wP6Af8D+gH/ - A/oB/wP6Af8D+gH/AusB7AH/A30B+gNWAbADFAEbLAADKgE/A0cBggJHAUYBgAMdASgMAAQCAyABLXQA - AxYBHQM/AWwDGAEgDAADEwEZAwQBBSgAA0QBdwNoAfQD+gH/A/oB/wP6Af8D+gH/A/oB/wP6Af8D+gH/ - A30B+gNUAakDHAEn/wARAAMpAT4DRwGAA0kBhgNJAYYDSQGGA0kBhgNJAYYDSQGGA0kBhgNBAXADGwEl - BAL/AFUAAUIBTQE+BwABPgMAASgDAAFQAwABUAMAAQEBAAEBBQABwAEDFgAD//EACv8CAAr/AgABgAEA - ARwBAAEDAfgBAQP/AgABgAEAARgBAAEBAfgBAQP/AgABgAEAARgBAAEBAfgBAQP/AgABgAEAARgBAAEB - AgABDwL/AgABgAEAARgBAAEBAgABDwL/AgABgAEAARgBAAEBAgABDwL/AgABgAEAARgBAAEBAgABDAEw - AcMCAAGAAQABGAEAAQEBgAEAARwBMAHDAgABgAEAARgBAAEBAcIBBAE8ATABwwIAAYABAAEYAQABAQGA - AQABHAEwAcMCAAGAAQABGAEAAQEBgAEAAR8C/wIAAYABAAEYAQABAQGAAQABHwL/AgABgAEAARgBAAEB - AYABAAEfAv8CAAGAAQABGAEAAQEBwwEMAT8C/wIAAYABPwH4AQABAQHzAf8BPwL/AgABgAF/AfwBAAED - Bf8CAAr/AgAK/wIACv8CAAL/AfgBAAEBAeABAAF/Av8DAAEPAfgCAAHgAQABPwL/AgAB+AEHAfACAAHA - AQABOAEAAQECAAH8AQMB8AIAAcABAAE4AQABAQIAAf4BAwHwAgAB4AEAATgBAAEBAgAB/gEBAfACAAHg - AQABOAEAAQECAAH+AQEB8AIAAeABAAE4AQABAQIAAf4BAwHwAgAB4AEAATgBAAEBAgAB/wEBAfACAAHA - AQABOAEAAQECAAH/AYAB8AIAAcABAAE4AQABAQIAAf8BwAHwAgAB4AEAATgBAAEBAgAB/wHgAXACAAHg - AQABOAEAAQECAAH/AeABcAIAAeABAAE4AQABAQIAAf8B4AEwAgAB4AEAATgBAAEBAgAB/wHwAR8BAAED - AcABAAE4AQABAQIAAf8B8AEfAQABDwHAAQABOAEAAQECAAH/AfgBDwGAAR8B4AEAAT8C/wIAA/8BwAE/ - AeABAAF/Av8CAAr/AgAD/wGfA/8B/gEAAQcCAAP/AY8D/wH+AQABBwIAAecBhwH/AYcB/wGAAQ8B/gEA - AQcCAAHDAYEB/wGDAf8BgAEPAf4BAAEHAgABgQGAAfgBAAEBAYABBwH+AQABBwMAAcAB+AEAAQEBgAED - Af4BAAEHAwAB8AF4AQABAQGAAQEB/gEAAQcCAAHDAfgBeAEAAQEBgAEAAf4BAAEHAgABwwH8AXgBAAEB - AYABAAF+AQABBwIAAcMB/AF4AQABAQGAAQABPgEAAQcCAAHDAfwBeAEAAQEBgAEAAR4BAAEHAgABwwH8 - AXgBAAEBAYABAAEeAQABBwIAAeMB/AF4AQABAQGAAQABPgEAAQcCAAHhAfABGAEAAQEBgAEAAX4BAAEH - AgAB4AEwARgBAAEBAYABAAH+AQABBwIAAfABEAE4AQABAQGAAQEB/gEAAQcCAAH4ARgBeAEAAQEB+AED - Af4BAAEPAgAB/gEcA/8B+AHnAf4BAAEfAgAH/wH+AQABHwIACv8CAAs= + Af8B5AGLAREB/wNaAb8IAAM0AVMBXQFcAVkBxgEmAZ8B0AH/ATEBjgG5Af4DWQG7Ai4BLQFGAxcBHwFR + AX4BjgHtATIBvQH1Af8BMgG9AfUB/wFWAXsBigHrAxUBHAMuAUgCWQFXAbwBMgGPAboB/gEuAZEBwgH+ + Al0BWwHFAzMBUQwAAzkBXwHqAbIBKgH/AegBrAEmAf8CVwFWAbIIAAJLAUoBigHqAbEBKQH/AegBqwEl + Af8DSQGICAACVwFVAbQB6gGwASgB/wHnAaoBJAH/AjkBOAFdDAABWQJnAe8BUAHQAv8BUAHQAv8BUAHQ + Av8BUAHQAv8BUAHQAv8BUAHQAv8BUAHQAv8BUAHQAv8BUAHQAv8BUAHQAv8BUAHQAv8BUAHQAv8BUAHQ + Av8BUAHQAv8BUAHQAv8BUAHQAv8BWQJnAe8IAANaAb8B6QGTARkB/wHpAZMBGQH/AekBkwEZAf8B6QGS + ARgB/wHoAZIBGAH/AegBkQEXAf8B6AGRARcB/wHnAZABFgH/AecBkAEWAf8B5wGQARYB/wHnAY8BFQH/ + AeYBjwEVAf8B5gGOARQB/wHmAY4BFAH/AeUBjQETAf8B5QGNARMB/wNaAb8MAANIAYQBKAG3AfEB/wEn + AbYB8QH/ATsCPAFkBAADQgF0AToBwQH3Af8BRAHGAfoB/wFEAcYB+gH/ATkBwQH3Af8BQAJBAXAEAAM9 + AWgBJwG2AfEB/wEoAbcB8QH/AUYCRwGAEAADOQFeAe0BtwEuAf8B6gGyASoB/wJXAVUBsQgAA0oBiQHs + AbYBLQH/AeoBsQEpAf8DSQGHCAACWAFWAbMB7AG1ASwB/wHqAbABKAH/AzgBXAwAAVkCZwHvAVUB0gL/ + AVUB0gL/AVUB0gL/AVUB0gL/AVUB0gL/AVUB0gL/AVUB0gL/AVUB0gL/AVUB0gL/AVUB0gL/AVUB0gL/ + AVUB0gL/AVUB0gL/AVUB0gL/AVUB0gL/AVUB0gL/AVkCZwHvCAADWgG/AesBlgEcAf8B6wGVARsB/wHq + AZUBGwH/AeoBlQEbAf8B6gGUARoB/wHqAZQBGgH/AekBkwEZAf8B6QGTARkB/wHpAZIBGAH/AegBkgEY + Af8B6AGSARgB/wHoAZEBFwH/AegBkQEXAf8B5wGQARYB/wHnAZABFgH/AecBjwEVAf8DWgG/CAADFgEe + ATIBvQH1Af8BQAHEAfkB/wE/AcQB+QH/AT4BnAHBAfgDCQEMA0gBhAFBAcQB+QH/AU8BzAH+Af8BTwHM + Af4B/wFAAcQB+QH/A0cBggMLAQ4BQAGlAc0B+gE/AcQB+QH/AUABxAH5Af8BOgGuAeYB/gMUARsMAAMC + AQMDRgF+AlEBUAGcAxUBHAgAAwoBDQNMAZACTAFLAY8DCgENCAADFgEdAlEBUAGdA0YBfQMCAQMMAAFZ + AmcB7wFaAdMC/wFaAdMC/wFaAdMC/wFaAdMC/wFaAdMC/wFaAdMC/wFaAdMC/wFaAdMC/wFaAdMC/wFa + AdMC/wFaAdMC/wFaAdMC/wFaAdMC/wFaAdMC/wFaAdMC/wFaAdMC/wFZAmcB7wgAA1oBvwHsAZgBHgH/ + AewBmAEeAf8B7AGXAR0B/wHsAZcBHQH/AesBlwEdAf8B6wGWARwB/wHrAZYBHAH/AesBlQEbAf8B6gGV + ARsB/wHqAZQBGgH/AeoBlAEaAf8B6QGUARoB/wHpAZMBGQH/AekBkwEZAf8B6QGSARgB/wHoAZIBGAH/ + A1oBvwgAAycBOgE9AcMB+AH/AU8BzAH9Af8BTgHLAf0B/wE7AcIB9wH/AxoBJANSAaMBPQHDAfgB/wFK + AcoB/AH/AUoBygH8Af8BPQHDAfgB/wFSAlMBpQMbASYBPAHCAfcB/wFOAcsB/QH/AU4BzAH9Af8BPQHD + AfgB/wMmAThYAAFbAmMB5AFMAcQB8wH/AUwBxAHzAf8BTAHEAfMB/wFMAcQB8wH/AUwBxAHzAf8BTAHE + AfMB/wFQAcgB9QH/AV8B1QL/AV8B1QL/AV8B1QL/AV8B1QL/AV8B1QL/AV8B1QL/AV8B1QL/AV8B1QL/ + AV8B1QL/AVkCZwHvCAADWgG/Ae4BmwEhAf8B7gGaASAB/wHtAZoBIAH/Ae0BmQEfAf8B7QGZAR8B/wHt + AZkBHwH/AewBmAEeAf8B7AGYAR4B/wHsAZcBHQH/AewBlwEdAf8B6wGWARwB/wHrAZYBHAH/AesBlgEc + Af8B6gGVARsB/wHqAZUBGwH/AeoBlAEaAf8DWgG/CAADPQFoATkBvgH1Af8BSQHJAfwB/wFIAcgB+wH/ + ATQBswHuAf8DLgFIAVkBXAFdAcMBKAGhAeQB/wErAZgB3wH/ASsBlgHeAf8BKAGdAeIB/wFXAVoBXAHC + AzIBTwE2AbkB8gH/AUgByAH7Af8BSQHJAfwB/wE4AbwB9AH/AzwBZlgAA1oBvwEAAYoBywH/AQABigHL + Af8BAAGKAcsB/wEAAYoBywH/AQABigHLAf8BAAGKAcsB/wEAAYoBywH/ATEBsAHkAf8BZAHXAv8BZAHX + Av8BZAHXAv8BZAHXAv8BZAHXAv8BZAHXAv8BZAHXAv8BZAHXAv8BXQJnAeoIAANaAb8B8AGdASMB/wHv + AZ0BIwH/Ae8BnAEiAf8B7wGcASIB/wHuAZsBIQH/Ae4BmwEhAf8B7gGbASEB/wHuAZoBIAH/Ae0BmgEg + Af8B7QGZAR8B/wHtAZkBHwH/Ae0BmAEeAf8B7AGYAR4B/wHsAZgBHgH/AewBlwEdAf8B6wGXAR0B/wNa + Ab8IAAMzAVABLwFxAa8B+QEgAX4BzwH/ASABfAHPAf8BOgFpAZcB9QMlATYDIwIyAWMBoAH4ARUBZgHC + Af8BFQFjAcAB/wEmAVwBrAH8AyIBMQMlATcBPAFuAZsB9QEgAX4B0AH/AR8BewHPAf8BLgFqAawB+QMx + AU5YAANaAb8BAAGUAdcB/wEAAZQB1wH/AQABlAHXAf8BAAGUAdcB/wEAAZQB1wH/AQABlAHXAf8BAAGU + AdcB/wFNAn0B+gFWAlcBtQFWAlkBtgFWAlkBtgFWAlkBtgFWAlkBtgFWAlkBtgFWAlkBtgFWAlcBtQMu + AUYIAAJUAVMBpgHxAaABJgH/AfEBnwElAf8B8QGfASUB/wHwAZ4BJAH/AfABngEkAf8B8AGdASMB/wHw + AZ0BIwH/Ae8BnQEjAf8B7wGcASIB/wHvAZwBIgH/Ae4BmwEhAf8B7gGbASEB/wHuAZoBIAH/Ae4BmgEg + Af8B7QGaASAB/wHtAZkBHwH/AlIBUQGkDAADTQGSAR0BbAGyAf4BFQFiAb8B/wFXAlkBuQgAAwwBDwFL + AkwBjwFTAlQBqQNGAX0IAANEAXgBHQFtAbIB/gEVAWMBwAH/AVsBXgFgAc1cAAFQAlEBnAEAAZ8B4wH/ + AQABnwHjAf8BAAGfAeMB/wEAAZ8B4wH/AQABnwHjAf8BAAGfAeMB/wFaAm4B9QM0AVMsAAMlATcBdQFj + AUgB9gHyAaIBKAH/AfIBoQEnAf8B8gGhAScB/wHyAaABJgH/AfEBoAEmAf8B8QGfASUB/wHxAZ8BJQH/ + AfEBnwElAf8B8AGeASQB/wHwAZ4BJAH/AfABnQEjAf8B7wGdASMB/wHvAZwBIgH/Ae8BnAEiAf8BdAFj + AUgB9gMkATUUAAMNAREDCAEKKAADDAEPAwkBDFwABAEDGAEhAxkBIgMZASIDGQEiAxkBIgMZASIDCQEM + NAADGgEkAkIBQQFyA0kBiANJAYgDSQGIA0kBiANJAYgDSQGIA0kBiANJAYgDSQGIA0kBiANJAYgDSQGI + AkIBQQFyAxoBI/8A/wD/AP8AwAADAgEDAwcECQELAwkBCwMJAQsDCQELAwkBCwMJAQsDCQELAwkBCwMJ + AQsDCQELAwkBCwMJAQsDCQELAwkBCwMIAQoDAwEEEAADDwETAy0BRAIxATABTAI8ATsBZQMtAUQDLQFE + Ay0BRAMtAUQDLQFEAy0BRAMtAUQDLQFEAycBOgQBXAACOAE5BF0BzANdAcwDXQHMAl0BYQHUAloBawHy + AlwBfAH4AlsBYwHkAlkBXAG+AU8BTgFPAZcDKgFABAIkAAMZASIDSwGLA1IBoANSAaADUgGgA1IBoANS + AaADUgGgA1IBoANSAaADUgGgA1IBoANSAaADUgGgA1IBoANSAaADTQGTAygBOwMCAQMMAANRAZ4BqQFe + AQkB/wGpAV0BCQH/AbkBagEJAf8B2QGEAQkB/wHZAYQBCQH/AdkBhAEJAf8B2QGEAQkB/wHZAYQBCQH/ + AdkBhAEJAf8B2QGEAQkB/wHZAYQBCQH/AdkBhAEJAf8CTAFLAY8DEQEWbAADDAEQAlwBXwHIAVMBSAHy + Af8BUgFFAfEB/wFQAUMB8AH/AU4BQQHvAf8CWwFfAdgDKAE8HAAEAQMqAUADZwHvA6IB/gOhAf4DoAH+ + A58B/gOfAf4DnwH+A58B/gOeAf4DnQH+A5wB/gOcAf4DmwH+A5sB/gOaAf4DbgH1Az4BagMEAQUIAAMH + AQkDWgG/AaUBawErAf8BpQFdAQ0B/wG8AWwBCgH/AdoBhwELAf8B2gGHAQsB/wHaAYcBCwH/AdoBhwEL + Af8B2gGHAQsB/wHaAYcBCwH/AdoBhwELAf8B2gGHAQsB/wHaAYcBCwH/AVgBuQEDAf8DRAF6DAADMwFR + A1QBqgNUAaoDUwGqA1MBqgNTAaoDUwGqA1MBqgNTAaoDUwGqA1MBqgNTAaoDUwGqA1MBqgNTAaoDUwGq + A1MBqgMzAVAcAAMSARcCWgFrAfIBUAFDAfAB/wFOAUEB7wH/AUwBPwHvAf8BSgE9Ae4B/wFIAUEBagH5 + AykBPhgABAEDLAFDA2gB9APzAf8D8gH/A/IB/wHxAvAB/wHfAdoB3AH/AcYBwAHKAf8BvAG5Ac8B/wHP + Ac4B3gH/AbcBtgHRAf8BvwG+AdUB/wHiAeEB6AH/A+4B/wPsAf8D7AH/A30B+QNAAW8DBQEGCAADOAFc + A4AB/gG7AbkBtwH/AaQBcgE5Af8BvgFvAQkB/wHbAYoBDQH/AdsBigENAf8B2wGKAQ0B/wHbAYoBDQH/ + AdsBigENAf8B2wGKAQ0B/wHbAYoBDQH/AdsBigENAf8B2wGKAQ0B/wFYAboBAwH/AUYBRwFGAYAMAANZ + Ab4DVwH/A1YB/wNVAf8DVQH/A1QB/wNTAf8DUgH/A1IB/wNRAf8DUAH/A08B/wNOAf8DTgH/A00B/wNN + Af8DTQH/A1kBviAAAlEBUgGkAU4BQQHvAf8BTAE/Ae8B/wFKAT0B7gH/AUcBOgHtAf8BRAE2AewB/wJd + AWEBzxgABAEDLAFDA2gB9AP1Af8D8wH/A/MB/wHrAegB5gH/AaABiAGFAf8BTgEwAUoB/wEnARcBXgH/ + AWUBYgGhAf8BBQEAAXYB/wEdARUBkwH/AagBpQHRAf8D7wH/A+0B/wPtAf8DfwH5A0ABbwMFAQYMAANV + Aa0BqAFeAQcB/wGuAWEBBwH/AcABcQEKAf8B3AGNAQ8B/wHcAY0BDwH/AdwBjQEPAf8B3AGNAQ8B/wHc + AY0BDwH/AdwBjQEPAf8B3AGMAQ8B/wHcAYwBDwH/AdwBjAEPAf8BWAG6AQQB/wFGAUcBRgGADAADWgG/ + A1oB/wNZAf8DWAH/A1cB/wNXAf8DVgH/A1UB/wNUAf8DUwH/A1MB/wNSAf8DUQH/A1AB/wNQAf8DTwH/ + A04B/wNaAb8gAANGAX4BTAE/Ae8B/wFKAT0B7gH/AUcBOgHtAf8BRAE2AewB/wFAATIB6wH/A4AB/gMF + AQYUAAQBAywBQwNoAfQD9gH/A/UB/wP0Af8B7QHqAecB/wGvAZIBfwH/AWYBQAE/Af8BPwEmAVQB/wFt + AWYBowH/AQoBAgGGAf8BJQEWAawB/wGrAaYB2QH/A/AB/wPuAf8D7QH/A38B+QNAAW8DBQEGDAACVQFT + AaoBtQFlAQcB/wG1AWUBBwH/AcMBcwELAf8B3QGPAREB/wHdAY8BEQH/Ad0BjwERAf8B3QGPAREB/wHd + AY8BEQH/Ad0BjwERAf8B3QGPAREB/wHdAY8BEQH/Ad0BjwERAf8BWAG7AQQB/wFGAUcBRgGADAADWgG/ + A1wB/wNbAf8DWwH/A1oB/wNZAf8DZQH/A28B/wNWAf8DZAH/A1UB/wNTAf8DeQH/A1IB/wNSAf8DUQH/ + A1EB/wNaAb8gAAM7AWIBSgE9Ae4B/wFHAToB7QH/AUQBNgHsAf8BQAEyAesB/wE9AS8B6gH/AToBKwHo + Af8DCgENFAAEAQMsAUMDaAH0A/cB/wP2Af8D9gH/AfEB7gHqAf8ByAGuAZMB/wGVAXEBXgH/AXcBXQFu + Af8BlwGNAboB/wFJAT4BqAH/AVUBSgG5Af8BvQG5Ad4B/wPxAf8D8AH/A+8B/wN/AfkDQAFvAwUBBgwA + AlUBUwGqAbgBZwEGAf8BuAFnAQYB/wHFAXYBCgH/Ad4BkgETAf8B3gGSARMB/wHeAZIBEwH/Ad4BkgET + Af8B3gGSARMB/wHeAZIBEwH/Ad4BkgETAf8B3gGSARMB/wHeAZIBEwH/ATwBrQGjAf8BUgJTAaUMAANa + Ab8DXwH/A14B/wNdAf8DXQH/A44B/wPNAf8DowH/A4UB/wOSAf8DVwH/A2cB/wOmAf8DVgH/A1UB/wNU + Af8DUwH/A1oBvyAAAxIBGAFIAUEBagH5AUQBNgHsAf8BQAEyAesB/wE9AS8B6gH/AToBKwHoAf8CXAFh + AdYYAAQBAywBQwNoAfQD+AH/A/cB/wP3Af8B8wHuAekB/wHMAakBfAH/AZUBZQFEAf8BdAFQAU4B/wGT + AYMBmwH/ATEBJAFyAf8BLAEnAYcB/wGuAa0B0AH/A/MB/wPxAf8D8AH/A38B+QNAAW8DBQEGDAADVQGs + AbYBZQEFAf8BuQFnAQUB/wHHAXcBCgH/Ad8BlQEVAf8B3wGVARUB/wHfAZUBFQH/Ad8BlQEVAf8B3wGV + ARUB/wHfAZUBFQH/Ad8BlQEVAf8B3wGVARUB/wHfAZUBFQH/ATgBsAG/Af8DTgGVDAADWgG/A2EB/wNh + Af8DYAH/A14B/wPXAf8DYwH/A10B/wNbAf8DWgH/A1oB/wOqAf8DagH/A1gB/wNXAf8DVwH/A1YB/wNa + Ab8kAANGAX0BQAEyAesB/wE9AS8B6gH/AUMBNAHkAf8DaAHwA2gB9AMkATQUAAQBAywBQwNoAfQD+QH/ + A/gB/wP4Af8B8wHvAeoB/wG3AZoBmwH/AW0BSwGQAf8BbgFIAWEB/wGXAYMBiwH/ATQBIAFYAf8BJAEd + AXUB/wGpAagBzAH/A/MB/wPyAf8D8QH/A38B+QNAAW8DBQEGCAADMAFLA2cB7wG4AagBlQH/Aa4BdAEt + Af8BygF5AQsB/wHgAZcBFwH/AewBxwGGAf8B9AHlAcwB/wH0AeUBzAH/AfQB5QHMAf8B9AHlAcwB/wH0 + AeUBzAH/AeoBwAF1Af8B4AGXARcB/wE4AbcBwQH/AUYCRwGADAADWgG/A2QB/wNjAf8DYgH/A2EB/wPY + Af8DZAH/A18B/wNdAf8DqwH/A1wB/wO5Af8DWgH/A1sB/wNaAf8DWQH/A1gB/wNaAb8oAAMmATgDSAGD + A2MB9gG+AbQBrAH/AboBsAGnAf8DXwHTAwUBBhAABAEDLAFDA2gB9AP6Af8D+QH/A/kB/wH1AfIB8AH/ + AbwBrgHZAf8BewFuAesB/wGIAXMBvgH/AbYBpwGtAf8BdgFjAX4B/wFqAWEBlAH/AcMBwgHYAf8D9AH/ + A/IB/wPyAf8DfwH5A0ABbwMFAQYIAAMVARwDYQHUAbQBigFVAf8BtQFsARIB/wHMAXsBCwH/AeEBmgEZ + Af8B4QGaARkB/wHhAZoBGQH/AeEBmgEZAf8B4QGaARkB/wHhAZoBGQH/AeEBmgEZAf8B4QGaARkB/wHh + AZoBGQH/ATgBvgHCAf8BRgJHAYAMAANaAb8DZwH/A2YB/wNlAf8DZAH/A5QB/wPMAf8DlgH/A4IB/wNd + Af8DjgH/A4oB/wNeAf8DXQH/A10B/wNcAf8DWwH/A1oBvywAAwkBDANoAfQBwwG5AbAB/wG+AbQBrAH/ + AboBsAGnAf8DQwF2EAAEAQMsAUMDaAH0A/oB/wP6Af8D+gH/A/kB/wP5Af8D+AH/A/gB/wP4Af8D9wH/ + A/cB/wP2Af8D9QH/A/MB/wPzAf8DfwH5A0ABbwMFAQYMAAJVAVMBqgHDAW4BAwH/AcQBbgEDAf8BzwF9 + AQsB/wHjAZ0BGwH/Ae0ByAGDAf8B9AHhAb4B/wH0AeEBvgH/AfQB4QG+Af8B9AHhAb4B/wH0AeEBvgH/ + AewBwwF2Af8B4wGdARsB/wFDAaMBwAH/A0kBhQwAA1oBvwNpAf8DaAH/A2gB/wNnAf8DZgH/A3QB/wOI + Af8DbQH/A2IB/wOcAf8DXwH/A2EB/wNgAf8DXwH/A14B/wNeAf8DWgG/MAADUgGjAcgBvQG0Af8BwwG5 + AbAB/wG+AbQBrAH/A2gB9AMYASAMAAQBAywBQwNoAfQD/AH/A/sB/wP7Af8D+gH/A/oB/wP5Af8D+QH/ + A/gB/wP3Af8D9wH/A/YB/wP1Af8D9QH/A/QB/wOAAfkDQAFvAwUBBgwAAlUBUwGqAccBcAEDAf8BxgFw + AQMB/wHQAYABDAH/AeQBoAEdAf8B5gGmASsB/wHnAasBOgH/AecBqwE6Af8B5wGrAToB/wHnAasBOgH/ + AecBqwE6Af8B5QGkASkB/wHkAZ8BHQH/AWQBSAG1Af8BVQJXAbQMAANaAb8DbAH/A2sB/wNqAf8DagH/ + A2kB/wNoAf8DZwH/A2YB/wNmAf8DZQH/A2QB/wNjAf8DYwH/A2IB/wNhAf8DYAH/A1oBvzAAAy4BRgHN + AcIBuAH/AcgBvQG0Af8BwwG5AbAB/wG+AbQBrAH/A1kBuQwABAEDLAFDAlMBaAH0AVIBTgGZAf8BWAFS + AZEB/wGBAXsBpAH/AegB5wHpAf8BmgGRAaAB/wFxAWABcgH/AXgBZAFtAf8BfgFoAWYB/wGEAWsBYAH/ + AZ4BigF8Af8B4AHbAdgB/wG+AacBiwH/AaABewFHAf8BoAF7AUcB/wJqAUsB+QNAAW4DBQEGDAACVQFT + AaoByQFyAQIB/wHJAXIBAgH/AdIBggELAf8B5QGiAR8B/wHlAaIBHwH/AeUBogEfAf8B5QGiAR8B/wHl + AaIBHwH/AeUBogEfAf8B5QGiAR8B/wHlAaIBHwH/AeUBogEfAf8BagFPAbgB/wJGAUcBgAwAA18ByQNu + Af8DbgH/A20B/wNsAf8DawH/A2sB/wNqAf8DaQH/A2gB/wNnAf8DZwH/A2YB/wNlAf8DZAH/A2QB/wNj + Af8DXwHJMAAEAgNlAeMBzQHCAbgB/wHIAb0BtAH/A2gB8AJkAWAB2wI8ATsBZAgABAEDJQE2A14B0gJg + AWYB4AJgAWYB4AFjAVoBYwHpA74B/QNlAewDYgHhA2IB4QNiAeEDYgHhAWkBZgFgAegDfQH6A2oB7QFm + AmAB4AFjAl0B3wFiAl4B1wM4AVsDAgEDDAADVQGtAcIBbQEBAf8ByAFxAQEB/wHVAYQBDAH/AeYBpQEh + Af8B5gGlASEB/wHmAaUBIQH/AeYBpQEhAf8B5gGlASEB/wHmAaUBIQH/AeYBpQEhAf8B5gGlASEB/wHm + AaUBIAH/AXEBVgG6Af8BRwFGAUcBgAwAA2IB3AOUAf8DlAH/A5QB/wOUAf8DlAH/A5MB/wOTAf8DkwH/ + A5IB/wOSAf8DkQH/A5EB/wOQAf8DkAH/A48B/wOPAf8DYgHcNAADTAGPA3AB8QNnAe8B3AGKARsB/wHf + AYQBCwH/AmcBWQHvAxMBGRQAAwIBAwMxAUwDYwHpA0sBiwMrAUIDKgE/AyoBPwMqAUADQgFyA2IB3AM/ + AWwDAwEECAEQAAM5AV4BxwHEAcEB/wG8AboBuQH/AbkBfwE0Af8B1wGGAQ0B/wHnAagBIwH/AecBqAEj + Af8B5wGoASMB/wHnAagBIwH/AecBqAEjAf8B5wGoASMB/wHnAagBIwH/AecBqAEiAf8B5wGnASIB/wF1 + AVsBvQH/AUcBRgFHAYAMAANcAb4DzAH/A8wB/wPMAf8DzAH/A8wB/wPMAf8DzAH/A8wB/wPMAf8DzAH/ + A8wB/wPMAf8DzAH/A8gB/wO1Af8DsgH/A1wBvjQAAyQBNQHoAZgBIgH/AesBlgEcAf8B5wGQARYB/wHk + AYsBEQH/AeABhQELAf8DVQGtFAAEAQMRARYDUQGfA2YB5QNpAegDaQHoA2kB6ANpAegDZQHnA1cBtAMi + ATEEARgAAwcBCQJcAVoBxAG+AX8BLgH/AckBdAEEAf8B2QGIAQwB/wHoAaoBJQH/AegBqgElAf8B6AGq + ASUB/wHoAaoBJQH/AegBqgElAf8B6AGqASUB/wHoAaoBJAH/AegBqgEkAf8B6AGqASQB/wF5AWIBvgH/ + A0QBegwAAzMBUQNaAboDWQG7A1kBuwNZAbsDWQG7A1kBuwNZAbsDWQG7A1kBuwNZAbsDWQG7A1kBuwNZ + AbsDWQG7A1kBuwNaAboDMwFQOAACXQFbAcUDYgHuA2IB7gNiAe4DYgHuA2IB7gMuAUgUAAQCAxkBIgM8 + AWYDQgF0A0IBdANCAXQDQgF0Az8BbAMjATMDBQEGIAADUQGeAdIBdwEAAf8B0gF3AQAB/wHaAYkBDQH/ + AekBrQEnAf8B6QGtAScB/wHpAa0BJwH/AekBrQEnAf8B6QGtAScB/wHpAa0BJgH/AekBrQEmAf8B6QGt + ASYB/wHpAa0BJgH/A08BmQMRARbAAAQCAwQEBQEGAwUBBgMFAQYDBQEGAwUBBgQCJAADDwETAzMBUgM5 + AV4DRAF7AzUBVQM1AVUDNQFVAzUBVQM1AVUDNQFVAzUBVQM1AVUDKwFBBAH/AP8AAgADDAEPAzkBX5AA + AwcBCQMPARQDEAEVAxABFQMQARUDEAEVAxABFQMQARUDEAEVAxABFQMQARUDEAEVAxABFQMLAQ5wAAMe + ASsBvAFbARkB/wJBAUABcYwAAzEBTANRAZ0DUgGkA1IBpANSAaQDUgGkA1IBpANSAaQDUgGkA1IBpANS + AaQDUgGkA1IBpANCAXIYAAMKAQ0DGgEjEAADNwFaA0QBegNEAXoDDgESMAADHgErAbsBWwEZAf8BuwFb + ARkB/wJCAUEBcjAAAwcBCQM/AWwDRAF3A0QBdwNEAXcDRAF3A0QBdwNEAXcDTwGXA00BkwMEAQUsAANE + AXcDaAH0A/oB/wP6Af8D+gH/A/oB/wP6Af8D+gH/A/oB/wP6Af8D+gH/A/oB/wP6Af8DVwGyFAADCwEO + Al0BWgHHAnABZQHxAicBJgE5DAACYQFdAdQBygF3AQAB/wHHAXYBAgH/AnwBXAH4AlkBVwG5AwUBBigA + Ax4BKwG7AVsBGgH/AbsBWwEZAf8BuwFbARkB/wJCAUEBcywAAzEBTgHcAdkB1gH/AdkB1gHTAf8B1gHT + Ac8B/wHTAdABywH/AdABzAHIAf8BzQHJAcQB/wHMAcgBwgH/AacBoAGXAf8BpwGgAZcB/wNWAbAsAANE + AXcDaAH0A/oB/wP6Af8D+gH/A/oB/wP6Af8D+gH/A/oB/wP6Af8D+gH/A/oB/wP6Af8DVwGyEAADCwEO + Al0BWgHHAekBrQEmAf8B6QGtASYB/wJwAWUB8QInASYBOQgAAl0BWgHHAcoBdwEAAf8BxQFyAQAB/wG+ + AWwBAAH/AdoBmwEeAf8CZwFdAeoDCAEKFAADGAEhAloBVwHCA10BzANdAcwBYwJfAdUBugFbARoB/wG6 + AVsBGgH/AbsBWwEaAf8BuwFbARkB/wFhAl0B0QNdAcwDUwGnA10BzANdAcwDXQHMA10BzAJcAVkBwQMY + ASAIAAM0AVMB3wHdAdoB/wHcAdoB1gH/AdkB1gHTAf8B1gHTAc8B/wHTAdABzAH/AdABzQHIAf8BzQHJ + AcQB/wHAAbsBtAH/AcABuwG0Af8BgwF8AXMB/wFVAVMBVQGqKAADRAF3A2gB9AH4AfUB7wH/AecBygGd + Af8B4wHCAZ0B/wHgAbwBnwH/AeIBwAGmAf8B6gHVAcUB/wHgAbsBnwH/AeABuwGfAf8B4AG7AZ8B/wHv + AeEB1gH/A/oB/wNXAbIMAAMGAQgDXQHMAekBrwEoAf8B6QGvAScB/wHpAa4BJwH/AekBrgEnAf8CaAFT + AfQDJAE1CAADCgENAzABSgNeAdIBvwFwAQYB/wHuAbkBLwH/Al0BWgHHFAADNQFVAbgBWgEbAf8BuQFa + ARoB/wG5AVoBGgH/AbkBWgEaAf8BugFaARoB/wG6AVsBGgH/AboBWwEaAf8BuwFbARoB/wG7AVsBGgH/ + AW8BXAFRAfcCaAFeAfAB7AGkAUIB/wHsAaQBQgH/AewBpAFCAf8B7AGkAUIB/wHsAaQBQgH/AzUBVQgA + Az8BbQHiAeAB3gH/Ad8B3QHaAf8B3AHaAdYB/wHZAdYB0wH/AdYB0wHPAf8B0wHQAcwB/wHQAc0ByAH/ + Ac0ByQHEAf8BzAHIAcIB/wOAAf4BNAElAdgB/wNAAW8kAANEAXcDaAH0AfIB5gHHAf8B2AGcASoB/wHQ + AYwBLwH/AcgBfAEzAf8ByAF/AUUB/wHZAasBiAH/AcMBcwE2Af8BtQFpAUIB/wGGAUsBZwH/Ac4BqgGi + Af8D+gH/A1cBsgwAAwIBAwMqAUACOQE4AV0B6gGwASgB/wHqAbABKAH/AlgBVgGzAy0BRAMRARYQAAMJ + AQwDXQHMAegBsAEqAf8B6wG2AS4B/wMjATMQAAM1AVUBuAFaARsB/wG4AVoBGwH/AbkBWgEbAf8BuQFa + ARoB/wG5AVoBGgH/AbkBWgEaAf8BugFaARoB/wG6AVsBGgH/AboBWwEaAf8CXQFbAcUB7QGkAUIB/wHt + AaQBQgH/Ae0BpAFCAf8B7AGkAUIB/wHsAaQBQgH/AewBpAFCAf8DNQFVCAADNgFYA4AB/gHGAZ4BVQH/ + AcQBmgFSAf8BwwGXAVAB/wHBAZQBTQH/Ab8BkQFLAf8BwAGQAUsB/wHAAZEBSwH/A4AB/gG6AUgBdgH/ + AUEBHgHSAf8DgAH+AzsBYyAAA0QBdwNoAfQB9QHqAcYB/wHgAasBJwH/AdgBmwErAf8BzwGLATAB/wHM + AYYBRAH/AdkBqwGIAf8BwwFzATYB/wGdAVkBVQH/AUoBIgGaAf8BwgGiAawB/wP6Af8DVwGyFAADHQEo + AeoBsQEpAf8B6gGxASkB/wJUAVMBqRwAAyYBOAHjAagBJgH/Ae0BtwEuAf8CVQFTAaoQAAM1AVUBtwFa + ARsB/wG4AVoBGwH/AbwBYwEoAf8BuAFbARwB/wG5AVoBGwH/AbwBYAEjAf8BugFdAR4B/wG6AVoBGgH/ + AboBWwEaAf8CXQFbAcoB7AGkAUEB/wHtAaQBQgH/Ae0BpAFCAf8B7AGjAUEB/wHtAaQBQgH/AewBpAFC + Af8DNQFVCAADNAFTAeMBnwEcAf8B4gGbARoB/wHgAZcBFwH/Ad8BkwEUAf8B3QGQARIB/wHcAYwBDwH/ + AdoBiAEMAf8B2QGFAQoB/wHZAYUBCgH/AdcBOAFkAf8BfgEfAbIB/wEwASAB5QH/AkABvgH9AzkBXxwA + A0QBdwNoAfQB9wHuAcUB/wHoAbsBIwH/Ad8BqgEnAf8B1wGaASwB/wHSAZMBQAH/AdYBqgGLAf8BpAFe + AVAB/wGBAUcBbAH/AS8BEAGwAf8BvAGeAbEB/wP6Af8DVwGyFAADHQEoAesBsgEqAf8B6wGyASoB/wJU + AVMBqSAAAl8BJwH7AewBtgEtAf8CYwFfAdUQAAM1AVUBtwFaARsB/wG3AVoBGwH/AeYBxQGvAf8B1gGf + AXoB/wHKAYMBVAH/Ae4B1wHIAf8BxAF0AT4B/wG5AVoBGgH/AWwCYQHrAn0BTQH6Aa4BZAEjAf8BzgGC + ATIB/wHaAZABOAH/AaEBUwEaAf8B5gGcAT4B/wHtAaQBQgH/AzUBVQgAAzQBUwHlAaIBHwH/AeMBnwEc + Af8B4gGbARoB/wHgAZcBFwH/Ad8BkwEUAf8B3QGQARIB/wHcAYwBDwH/AdoBiAEMAf8B2QGFAQoB/wHX + ATgBZAH/AbsBHwGaAf8BLwEgAeEB/wEwASAB5QH/ATEBIQFfAfsDNAFUGAADRAF3A2gB9AH5AfMB0gH/ + AfEB1AFWAf8B6wHIAVkB/wHlAbsBXQH/AeEBtgFsAf8BvgGoAcMB/wFqAVABvAH/AWUBTAHAAf8BVQFC + Ac0B/wG7AaoB0AH/A/oB/wNXAbIUAAMdASgB6wG0ASsB/wHrAbMBKwH/AlQBUwGpIAACfAFcAfgB7AG1 + ASwB/wJlAWAB4xAAAzUBVQG2AVoBGwH/AbcBWgEbAf8BzgGOAWMB/wHxAd8B0wH/AeMBvgGmAf8B9QHn + Ad0B/wG4AVoBGwH/AbkBWgEbAf8CWwFZAcAB7wGjAUIB/wHlAZwBPQH/AZsBTwEYAf8BmQFMARYB/wHf + AZQBOgH/Ae0BpAFCAf8B7QGkAUIB/wM1AVUIAAM0AVMB5gGmASIB/wHlAaIBHwH/AeMBnwEcAf8B4gGb + ARoB/wHgAZcBFwH/Ad8BkwEUAf8B3QGQARIB/wHcAYwBDwH/AdoBiAEMAf8B1wE4AWQB/wHkASABjAH/ + AUcBIQHSAf8BMQEhAeUB/wEwASAB5QH/Ak0BfQH6AzMBUBQAA0QBdwNoAfQB+QH0AdYB/wH2Ad8BWQH/ + AfIB1QFVAf8B6wHJAVkB/wHnAcIBaAH/AekBzQGhAf8B2QGkAWMB/wHTAZkBZgH/AdEBlQFnAf8B5QHG + Aa4B/wP6Af8DVwGyFAADHQEoAewBtQEsAf8B7AG1ASwB/wJUAVMBqSAAAnwBXAH4AesBswErAf8CZQFg + AeMQAAM1AVUBtgFaARwB/wG2AVoBHAH/AboBYAEjAf8B8QHeAdEB/wHRAZYBbQH/AdoBqgGJAf8BuAFa + ARsB/wG4AVoBGwH/AmIBXgHXAe8BowFCAf8B4QGVATsB/wGdAVIBGgH/AZ0BTwEYAf8B2wGPATcB/wHu + AaQBQgH/Ae0BpAFCAf8DNQFVCAADNAFTAegBqgEkAf8B5gGmASIB/wHlAaIBHwH/AeMBnwEcAf8B4gGb + ARoB/wHgAZcBFwH/Ad8BkwEUAf8B3QGQARIB/wHcAYwBDwH/AdcBOQFkAf8B5QEgAYwB/wGCASIBtAH/ + ATcBKAHnAf8BNgEmAecB/wE1ASUB5wH/ATUBJQFfAfsDHwEsEAADRAF3A2gB9AH5AfMBzwH/Ae4B1QE8 + Af8B5gHIATAB/wHXAbIBNgH/AeQBuQE3Af8B5wHGAYIB/wHVAZUBLQH/AcwBhQEyAf8BxgF4ATYB/wHe + AbUBlgH/A/oB/wNXAbIUAAMKAQ0B7AG1AS0B/wHsAbYBLQH/AlcBVQG0IAACfAFcAfgB6wGyASoB/wJl + AWAB4xAAAzUBVQG1AVoBHAH/AbYBWgEcAf8BtgFaARwB/wHkAcMBrAH/AfQB5QHbAf8BwQFxAToB/wG3 + AVoBGwH/AWICXQHcAfABowFCAf8B5QGaAT4B/wHUAYgBNQH/AcgBfAEvAf8BugFtAScB/wGeAVABGAH/ + Ad0BkQE5Af8B7gGkAUIB/wM1AVUIAAM0AVMB6QGtAScB/wHoAaoBJAH/AeYBpgEiAf8B5QGiAR8B/wHj + AZ8BHAH/AeIBmwEaAf8B4AGXARcB/wHfAZMBFAH/Ad0BkAESAf8B2AE6AWUB/wHlASABjAH/Ab8BIgGa + Af8BOwEtAeUB/wE7ASwB6QH/AToBKwHpAf8CYAFpAegDEwEZEAADRAF3A2gB9AH5AfQB1QH/Aa4BnAGG + Af8BtgGhAXIB/wGbAYIBfgH/AccBpwFZAf8B6wHPAX8B/wHcAaQBKQH/AdQBkwEuAf8BywGDATIB/wHg + AbgBlQH/A/oB/wNXAbIYAAJqAUEB+QHtAbcBLgH/AmYBYAHgIAACfAFcAfgB6gGxASkB/wJlAWAB4xAA + AzUBVQG1AVkBHAH/AbUBWQEcAf8BtgFaARwB/wHLAYsBXwH/Ae0B1wHIAf8BtgFaARsB/wG3AVoBGwH/ + AlsBWQHAAfABowFCAf8B3gGRATkB/wG6AW4BKAH/Aa8BYgEiAf8BogFTARoB/wGxAWMBIgH/AcsBfgEw + Af8B7gGkAUIB/wM1AVUIAAM0AVMB6wGxASoB/wHpAa0BJwH/AegBqgEkAf8B5gGmASIB/wHlAaIBHwH/ + AeMBnwEcAf8B4gGbARoB/wHgAZcBFwH/Ad8BkwEUAf8B2QE/AWoB/wHmASIBjgH/AeQBIAGMAf8BUQEw + AdcB/wFBATMB6wH/AmABaQHoAyABLhQAA0QBdwNoAfQB+AH2Ad0B/wFuAV8B0AH/AXABYAHEAf8BiQF2 + AZgB/wF8AWoBsAH/Ae8B1wF9Af8B5AGzASUB/wHbAaIBKgH/AdMBkgEvAf8B4wG/AZQB/wP6Af8DVwGy + GAACXAFZAcEB7QG4AS8B/wHQAYwBFwH/Az4BaxQAAx0BKAMjATMCaAFTAfQB6gGwASgB/wJjAV0B3wMj + ATMDFwEfCAADNQFVAbQBWQEcAf8BtQFZARwB/wG1AVkBHAH/AbUBWgEcAf8BtgFaARwB/wG2AVoBHAH/ + AbYCQAH9AmYBXwHlAfABowFCAf8B8AGjAUIB/wHwAaMBQgH/AecBmwE+Af8B3AGQATgB/wHvAaMBQgH/ + Ae8BowFCAf8B7wGjAUIB/wM1AVUIAAM0AVMB7AG1ASwB/wHrAbEBKgH/AekBrQEnAf8B6AGqASQB/wHm + AaYBIgH/AeUBogEfAf8B4wGfARwB/wHiAZsBGgH/AeABlwEXAf8B2wFEAW0B/wHnAScBkwH/AeYBIwGQ + Af8BjQErAbUB/wJeAWUB4gMbASYYAANEAXcDaAH0AfoB+QH0Af8BxgHBAfIB/wG8AbcB9wH/Ac8ByQHe + Af8BxQHAAesB/wH3AfABzgH/AfQB5AGvAf8B8QHeAbAB/wHuAdgBsgH/AfQB6gHcAf8D+gH/A1cBshgA + AxcBHwG+AbEBQAH9AdwBngEhAf8DgAH+A0wBkAMdASkDCAEKCAADTgGVAekBrgEnAf8B6QGuAScB/wHp + Aa4BJwH/AekBrwEnAf8B6QGvASgB/wM+AWoIAAM1AVUBtAFZAR0B/wG0AVkBHAH/AbUBWQEcAf8BtQFZ + ARwB/wG1AVkBHAH/AbUBWgEcAf8CXgFbAc0B8QGjAUIB/wHxAaMBQgH/AfABowFCAf8B8AGjAUIB/wHw + AaMBQgH/AfABowFCAf8B7wGjAUIB/wHvAaMBQgH/Ae8BowFCAf8DNQFVCAADLwFJAe4BuAEvAf8B7AG1 + ASwB/wHrAbEBKgH/AekBrQEnAf8B6AGqASQB/wHmAaYBIgH/AeUBogEfAf8B4wGfARwB/wHiAZsBGgH/ + AdwBQwF2Af8B6QEsAZgB/wHnASgBlgH/A2IB7gMaASMcAANEAXcDaAH0A/oB/wP6Af8D+gH/A/oB/wP6 + Af8D+gH/A/oB/wHpAuoB/wHSAdMB1AH/AdQB1QHWAf8B1AHVAdYB/wNVAaocAAI7AToBYgOAAf4BxgF4 + AQoB/wHBAW4BAAH/AccBdAEAAf8BywF4AQAB/wM5AV8EAAMDAQQCVAFTAakB6AGtASYB/wHpAa0BJgH/ + AekBrQEmAf8DRgF+DAADNAFTAbMBWQEdAf8BtAFZAR0B/wG0AVkBHQH/AbQBWQEcAf8BtQFZARwB/wG1 + AVkBHAH/Al0BWwHFAfEBowFCAf8B8QGjAUIB/wHxAaMBQgH/AfEBowFCAf8B8AGjAUIB/wHwAaMBQgH/ + AfABowFCAf8B8AGjAUIB/wHvAaMBQgH/AzQBUwgAAwUBBgI8ATsBZAJEAUMBdwNFAXwBfQF1AWkB+gHi + AXEBZwH/AeABbQFlAf8B3wFqAWMB/wHeAWgBXwH/Ad0BWwFoAf8BzQE1AaUB/wGbATkBvAH/AWMBXQFj + Ad8DFgEdIAADRAF3A2gB9AP6Af8D+gH/A/oB/wP6Af8D+gH/A/oB/wP6Af8C6wHsAf8C6wHsAf8DfgH8 + A1wBxAMWAR0gAAMsAUMDYgHhAc0BgwENAf8BxwF0AQAB/wHLAXgBAAH/Az4BawgAAwMBBAJUAVMBqQHo + AawBJQH/A0YBfhAAAxABFQJUAVIBqANZAbsDWQG7A1kBuwNZAbsCWQFXAbkCVwFVAbQDWQG7A1kBuwNZ + AbsDWQG7A1kBuwNZAbsDWQG7A1kBuwJUAVIBqAMPARQYAAFTAVEBUwGiAfEBRwG0Af8DgAH+AV8BXAFf + AcgBQgFBAUIBcgM5AV4CXAF8AfgCWwFdAcoDDgESJAADRAF3A2gB9AP6Af8D+gH/A/oB/wP6Af8D+gH/ + A/oB/wP6Af8C6wHsAf8DfQH6A1YBsAMUARssAAMqAT8DRwGCAkcBRgGAAx0BKAwABAIDIAEtdAADFgEd + Az8BbAMYASAMAAMTARkDBAEFKAADRAF3A2gB9AP6Af8D+gH/A/oB/wP6Af8D+gH/A/oB/wP6Af8DfQH6 + A1QBqQMcASf/ABEAAykBPgNHAYADSQGGA0kBhgNJAYYDSQGGA0kBhgNJAYYDSQGGA0EBcAMbASUEAv8A + VQABQgFNAT4HAAE+AwABKAMAAVADAAFQAwABAQEAAQEFAAHAAQMWAAP/8QAK/wIACv8CAAGAAQABHAEA + AQMB+AEBA/8CAAGAAQABGAEAAQEB+AEBA/8CAAGAAQABGAEAAQEB+AEBA/8CAAGAAQABGAEAAQECAAEP + Av8CAAGAAQABGAEAAQECAAEPAv8CAAGAAQABGAEAAQECAAEPAv8CAAGAAQABGAEAAQECAAEMATABwwIA + AYABAAEYAQABAQGAAQABHAEwAcMCAAGAAQABGAEAAQEBwgEEATwBMAHDAgABgAEAARgBAAEBAYABAAEc + ATABwwIAAYABAAEYAQABAQGAAQABHwL/AgABgAEAARgBAAEBAYABAAEfAv8CAAGAAQABGAEAAQEBgAEA + AR8C/wIAAYABAAEYAQABAQHDAQwBPwL/AgABgAE/AfgBAAEBAfMB/wE/Av8CAAGAAX8B/AEAAQMF/wIA + Cv8CAAr/AgAK/wIAAv8B+AEAAQEB4AEAAX8C/wMAAQ8B+AIAAeABAAE/Av8CAAH4AQcB8AIAAcABAAE4 + AQABAQIAAfwBAwHwAgABwAEAATgBAAEBAgAB/gEDAfACAAHgAQABOAEAAQECAAH+AQEB8AIAAeABAAE4 + AQABAQIAAf4BAQHwAgAB4AEAATgBAAEBAgAB/gEDAfACAAHgAQABOAEAAQECAAH/AQEB8AIAAcABAAE4 + AQABAQIAAf8BgAHwAgABwAEAATgBAAEBAgAB/wHAAfACAAHgAQABOAEAAQECAAH/AeABcAIAAeABAAE4 + AQABAQIAAf8B4AFwAgAB4AEAATgBAAEBAgAB/wHgATACAAHgAQABOAEAAQECAAH/AfABHwEAAQMBwAEA + ATgBAAEBAgAB/wHwAR8BAAEPAcABAAE4AQABAQIAAf8B+AEPAYABHwHgAQABPwL/AgAD/wHAAT8B4AEA + AX8C/wIACv8CAAP/AZ8D/wH+AQABBwIAA/8BjwP/Af4BAAEHAgAB5wGHAf8BhwH/AYABDwH+AQABBwIA + AcMBgQH/AYMB/wGAAQ8B/gEAAQcCAAGBAYAB+AEAAQEBgAEHAf4BAAEHAwABwAH4AQABAQGAAQMB/gEA + AQcDAAHwAXgBAAEBAYABAQH+AQABBwIAAcMB+AF4AQABAQGAAQAB/gEAAQcCAAHDAfwBeAEAAQEBgAEA + AX4BAAEHAgABwwH8AXgBAAEBAYABAAE+AQABBwIAAcMB/AF4AQABAQGAAQABHgEAAQcCAAHDAfwBeAEA + AQEBgAEAAR4BAAEHAgAB4wH8AXgBAAEBAYABAAE+AQABBwIAAeEB8AEYAQABAQGAAQABfgEAAQcCAAHg + ATABGAEAAQEBgAEAAf4BAAEHAgAB8AEQATgBAAEBAYABAQH+AQABBwIAAfgBGAF4AQABAQH4AQMB/gEA + AQ8CAAH+ARwD/wH4AecB/gEAAR8CAAf/Af4BAAEfAgAK/wIACw== diff --git a/WinPaletter/Settings/Uninstall.cs b/WinPaletter/Settings/Uninstall.cs index 32b39013..65a799bd 100644 --- a/WinPaletter/Settings/Uninstall.cs +++ b/WinPaletter/Settings/Uninstall.cs @@ -92,7 +92,7 @@ private void Button6_Click(object sender, EventArgs e) { if (OpenFileDialog1.ShowDialog() == DialogResult.OK) { - var TMx = new Theme.Manager(Theme.Manager.Source.File, OpenFileDialog1.FileName); + Theme.Manager TMx = new(Theme.Manager.Source.File, OpenFileDialog1.FileName); TMx.Save(Theme.Manager.Source.Registry); if (Program.Settings.ThemeApplyingBehavior.AutoRestartExplorer) diff --git a/WinPaletter/Store/Store.cs b/WinPaletter/Store/Store.cs index d1fa53fe..28e45eba 100644 --- a/WinPaletter/Store/Store.cs +++ b/WinPaletter/Store/Store.cs @@ -30,18 +30,18 @@ public partial class Store public UI.Controllers.StoreItem selectedItem; private bool _Shown = false; - private readonly List AnimateList = new List(); + private readonly List AnimateList = new(); private float Angle = 180f; private readonly float Increment = 5f; private int Cycles = 0; private WebClient WebCL; - private readonly Converter _Converter = new Converter(); + private readonly Converter _Converter = new(); private bool ApplyOrEditToggle = true; public Store() { - WebCL = new WebClient(); + WebCL = new(); InitializeComponent(); } #endregion @@ -67,12 +67,12 @@ private void Menu_Window_SizeChanged(object sender, EventArgs e) RetroShadow1.Size = Menu_Window.Size; RetroShadow1.Location = Menu_Window.Location + (Size)new Point(6, 5); - var b = new Bitmap(RetroShadow1.Width, RetroShadow1.Height); - var g = Graphics.FromImage(b); - g.DrawGlow(new Rectangle(5, 5, b.Width - 10 - 1, b.Height - 10 - 1), Color.FromArgb(128, 0, 0, 0)); - g.Save(); + Bitmap b = new(RetroShadow1.Width, RetroShadow1.Height); + Graphics G = Graphics.FromImage(b); + G.DrawGlow(new Rectangle(5, 5, b.Width - 10 - 1, b.Height - 10 - 1), Color.FromArgb(128, 0, 0, 0)); + G.Save(); RetroShadow1.Image = b; - g.Dispose(); + G.Dispose(); RetroShadow1.BringToFront(); Menu_Window.BringToFront(); @@ -87,7 +87,7 @@ public void SetClassicMetrics(Theme.Manager TM) { if (System.IO.File.Exists(PathsExt.MSTheme) & !string.IsNullOrEmpty(PathsExt.MSTheme)) { - using (var vs = new VisualStyleFile(PathsExt.MSTheme)) + using (VisualStyleFile vs = new(PathsExt.MSTheme)) { TM.MetricsFonts.Overwrite_Metrics(vs.Metrics); } @@ -95,7 +95,7 @@ public void SetClassicMetrics(Theme.Manager TM) if (System.IO.File.Exists(PathsExt.MSTheme) & !string.IsNullOrEmpty(PathsExt.MSTheme)) { - using (var vs = new VisualStyleFile(PathsExt.MSTheme)) + using (VisualStyleFile vs = new(PathsExt.MSTheme)) { TM.MetricsFonts.Overwrite_Fonts(vs.Metrics); } @@ -132,7 +132,7 @@ public void SetClassicMetrics(Theme.Manager TM) int iP = 3 + TM.MetricsFonts.PaddedBorderWidth + TM.MetricsFonts.BorderWidth; int iT = 4 + TM.MetricsFonts.PaddedBorderWidth + TM.MetricsFonts.BorderWidth + TM.MetricsFonts.CaptionHeight + GetTitlebarTextHeight(TM.MetricsFonts.CaptionFont); - var _Padding = new System.Windows.Forms.Padding(iP, iT, iP, iP); + System.Windows.Forms.Padding _Padding = new(iP, iT, iP, iP); foreach (UI.Retro.WindowR WindowR in ClassicColorsPreview.GetAllControls().OfType()) { @@ -172,7 +172,7 @@ public void ApplyRetroPreview(Theme.Manager TM) { if (System.IO.File.Exists(PathsExt.MSTheme) & !string.IsNullOrEmpty(PathsExt.MSTheme)) { - using (var vs = new VisualStyleFile(PathsExt.MSTheme)) + using (VisualStyleFile vs = new(PathsExt.MSTheme)) { TM.Win32.Load(Theme.Structures.Win32UI.Sources.VisualStyles, vs.Metrics); } @@ -361,7 +361,7 @@ public void ApplyCMDPreview(UI.Simulation.WinCMD CMD, Theme.Structures.Console C { { var temp = Font.FromLogFont(new NativeMethods.GDI32.LogFont() { lfFaceName = Console.FaceName, lfWeight = Console.FontWeight }); - CMD.Font = new Font(temp.FontFamily, (int)Math.Round(Console.FontSize / 65536d), temp.Style); + CMD.Font = new(temp.FontFamily, (int)Math.Round(Console.FontSize / 65536d), temp.Style); } } @@ -537,7 +537,7 @@ private void Store_Load(object sender, EventArgs e) WXP_Alert2.Text = Forms.MainFrm.WXP_Alert2.Text; WXP_Alert2.Size = WXP_Alert2.Parent.Size - new Size(40, 40); - WXP_Alert2.Location = new Point(20, 20); + WXP_Alert2.Location = new(20, 20); pnl_preview.BackgroundImage = Forms.MainFrm.pnl_preview.BackgroundImage; pnl_preview_classic.BackgroundImage = pnl_preview.BackgroundImage; @@ -563,7 +563,7 @@ private void Store_Shown(object sender, EventArgs e) private void Store_FormClosing(object sender, FormClosingEventArgs e) { // To prevent effect of a store theme on the other forms - Program.Settings = new Settings(Settings.Mode.Registry); + Program.Settings = new(Settings.Mode.Registry); Program.Style.RenderingHint = Program.TM.MetricsFonts.Fonts_SingleBitPP ? System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit : System.Drawing.Text.TextRenderingHint.ClearTypeGridFit; ApplyStyle(this); @@ -589,11 +589,11 @@ public void OnlineMode() { Dnsapi.DnsFlushResolverCache(); - var response = new List(); + List response = new(); response.Clear(); - var repos_list = new List(); + List repos_list = new(); repos_list.Clear(); - var items = new List(); + List items = new(); items.Clear(); // Check by Ping if repos DB URL is accessible or not @@ -737,17 +737,17 @@ public void OnlineMode() { Status_lbl.SetText(string.Format(Program.Lang.Store_LoadingTheme, FileName)); - using (var TM = new Theme.Manager(Theme.Manager.Source.File, Dir + @"\" + FileName, true)) + using (Theme.Manager TM = new(Theme.Manager.Source.File, Dir + @"\" + FileName, true)) { - var ctrl = new UI.Controllers.StoreItem() + UI.Controllers.StoreItem ctrl = new() { FileName = Dir + @"\" + FileName, TM = TM, MD5_ThemeFile = MD5_ThemeFile, MD5_PackFile = MD5_PackFile, DoneByWinPaletter = (DB.ToUpper() ?? string.Empty) == (Properties.Resources.Link_StoreMainDB.ToUpper() ?? string.Empty), - Size = new Size(w, h), + Size = new(w, h), URL_ThemeFile = URL_ThemeFile, URL_PackFile = URL_PackFile }; @@ -830,7 +830,7 @@ public void OfflineMode() Status_lbl.SetText("Enumerating themes: \"" + file + "\""); - using (var TMx = new Theme.Manager(Theme.Manager.Source.File, file, true)) + using (Theme.Manager TMx = new(Theme.Manager.Source.File, file, true)) { TMList.Add(file, TMx); } @@ -853,13 +853,13 @@ public void OfflineMode() { Status_lbl.SetText("Loading theme \"" + StoreItem.Value.Info.ThemeName + "\""); - var ctrl = new UI.Controllers.StoreItem() + UI.Controllers.StoreItem ctrl = new() { FileName = StoreItem.Key, TM = StoreItem.Value, MD5_ThemeFile = CalculateMD5(StoreItem.Key), DoneByWinPaletter = false, - Size = new Size(w, h), + Size = new(w, h), URL_ThemeFile = new System.IO.FileInfo(StoreItem.Key).FullName }; @@ -992,17 +992,17 @@ public void StoreItem_Clicked(object sender, EventArgs e) Titlebar_lbl.Text = StoreItem.TM.Info.ThemeName + " - " + Program.Lang.By + " " + StoreItem.TM.Info.Author; if (Theme.Manager.IsFontInstalled(StoreItem.TM.MetricsFonts.CaptionFont.Name)) { - Titlebar_lbl.Font = new Font(StoreItem.TM.MetricsFonts.CaptionFont.Name, Titlebar_lbl.Font.Size, Titlebar_lbl.Font.Style); + Titlebar_lbl.Font = new(StoreItem.TM.MetricsFonts.CaptionFont.Name, Titlebar_lbl.Font.Size, Titlebar_lbl.Font.Style); } else { - Titlebar_lbl.Font = new Font("Segoe UI", Titlebar_lbl.Font.Size, Titlebar_lbl.Font.Style); + Titlebar_lbl.Font = new("Segoe UI", Titlebar_lbl.Font.Size, Titlebar_lbl.Font.Style); } if (StoreItem.TM.AppTheme.Enabled) { Program.Settings.Appearance.CustomColors = StoreItem.TM.AppTheme.Enabled; - Program.Settings.Appearance.CustomTheme = StoreItem.TM.AppTheme.DarkMode; + Program.Settings.Appearance.CustomTheme_DarkMode = StoreItem.TM.AppTheme.DarkMode; Program.Settings.Appearance.RoundedCorners = StoreItem.TM.AppTheme.RoundCorners; Program.Settings.Appearance.BackColor = StoreItem.TM.AppTheme.BackColor; Program.Settings.Appearance.AccentColor = StoreItem.TM.AppTheme.AccentColor; @@ -1066,7 +1066,7 @@ public void StoreItem_Clicked(object sender, EventArgs e) VersionAlert_lbl.Text = string.Format(Program.Lang.Store_LowAppVersionAlert, StoreItem.TM.Info.AppVersion, Program.Version); } - var os_list = new List(); + List os_list = new(); os_list.Clear(); if (StoreItem.TM.Info.DesignedFor_Win11) @@ -1170,11 +1170,11 @@ public void Apply_Theme() Appearance.CustomColors = selectedItem.TM.AppTheme.Enabled; Appearance.BackColor = selectedItem.TM.AppTheme.BackColor; Appearance.AccentColor = selectedItem.TM.AppTheme.AccentColor; - Appearance.CustomTheme = selectedItem.TM.AppTheme.DarkMode; + Appearance.CustomTheme_DarkMode = selectedItem.TM.AppTheme.DarkMode; Appearance.RoundedCorners = selectedItem.TM.AppTheme.RoundCorners; ApplyStyle(null, true); - using (var TMx = new Theme.Manager(Theme.Manager.Source.File, selectedItem.FileName)) + using (Theme.Manager TMx = new(Theme.Manager.Source.File, selectedItem.FileName)) { if (selectedItem.DoneByWinPaletter) TMx.Info.Author = Application.CompanyName; @@ -1212,7 +1212,7 @@ public void DoActionsAfterPackDownload() WindowState = FormWindowState.Minimized; Forms.ComplexSave.GetResponse(Forms.MainFrm.SaveFileDialog1, null, null, null); Program.TM_Original = (Theme.Manager)Program.TM.Clone(); - Program.TM = new Theme.Manager(Theme.Manager.Source.File, selectedItem.FileName); + Program.TM = new(Theme.Manager.Source.File, selectedItem.FileName); if (selectedItem.DoneByWinPaletter) Program.TM.Info.Author = Application.CompanyName; Forms.MainFrm.ApplyStylesToElements(Program.TM, false); @@ -1246,7 +1246,7 @@ public void PerformSearch() if (string.IsNullOrWhiteSpace(search_text)) return; - var lst = new Dictionary(); + Dictionary lst = new(); lst.Clear(); foreach (var st_itm in store_container.Controls.OfType()) @@ -1264,13 +1264,13 @@ public void PerformSearch() found_sum += 1; - var ctrl = new UI.Controllers.StoreItem() + UI.Controllers.StoreItem ctrl = new() { FileName = st_item.Key, TM = st_item.Value.TM, MD5_ThemeFile = CalculateMD5(st_item.Key), DoneByWinPaletter = st_item.Value.DoneByWinPaletter, - Size = new Size(w, h), + Size = new(w, h), URL_ThemeFile = st_item.Value.URL_ThemeFile }; @@ -1349,13 +1349,13 @@ public long GetFileSizeFromURL(string url) public void UpdateExtendedTitlebar() { - var Pd = new System.Windows.Forms.Padding(0, Titlebar_panel.Height, 0, 0); + System.Windows.Forms.Padding Pd = new(0, Titlebar_panel.Height, 0, 0); Titlebar_panel.BackColor = Color.FromArgb(0, 0, 0); bool CompositionEnabled = DWMAPI.IsCompositionEnabled(); if (OS.W12 || OS.W11 || OS.W10) { - CompositionEnabled = CompositionEnabled & Convert.ToBoolean(GetReg(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize", "EnableTransparency", true)); + CompositionEnabled &= Convert.ToBoolean(GetReg(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize", "EnableTransparency", true)); } if (CompositionEnabled) @@ -1495,7 +1495,7 @@ private void Back_btn_Click(object sender, EventArgs e) if (selectedItem is not null && selectedItem.TM.AppTheme.Enabled) { - Program.Settings = new Settings(Settings.Mode.Registry); + Program.Settings = new(Settings.Mode.Registry); GetRoundedCorners(); GetDarkMode(); ApplyStyle(this, true); @@ -1503,7 +1503,7 @@ private void Back_btn_Click(object sender, EventArgs e) RemoveAllStoreItems(search_results); - Titlebar_lbl.Font = new Font("Segoe UI", Titlebar_lbl.Font.Size, Titlebar_lbl.Font.Style); + Titlebar_lbl.Font = new("Segoe UI", Titlebar_lbl.Font.Size, Titlebar_lbl.Font.Style); Tabs.SelectedIndex = 0; Program.Animator.HideSync(back_btn); @@ -1663,8 +1663,8 @@ private void Search_box_KeyPress(object sender, KeyPressEventArgs e) PerformSearch(); } - private Point newPoint = new Point(); - private Point oldPoint = new Point(); + private Point newPoint = new(); + private Point oldPoint = new(); private void CustomTitlebar_MouseDown(object sender, MouseEventArgs e) { @@ -1707,7 +1707,7 @@ private void Button1_Click(object sender, EventArgs e) return; } - using (var FD = new Ookii.Dialogs.WinForms.VistaFolderBrowserDialog()) + using (Ookii.Dialogs.WinForms.VistaFolderBrowserDialog FD = new()) { if (FD.ShowDialog() == DialogResult.OK) { diff --git a/WinPaletter/Store/Store_CPToggles.Designer.cs b/WinPaletter/Store/Store_CPToggles.Designer.cs index d737fe2f..9f5c1a87 100644 --- a/WinPaletter/Store/Store_CPToggles.Designer.cs +++ b/WinPaletter/Store/Store_CPToggles.Designer.cs @@ -63,7 +63,7 @@ private void InitializeComponent() Button1.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; Button1.BackColor = Color.FromArgb(34, 34, 34); - Button1.Font = new Font("Segoe UI", 9.0f); + Button1.Font = new("Segoe UI", 9.0f); Button1.ForeColor = Color.White; Button1.Image = null; Button1.Location = new Point(368, 303); @@ -78,7 +78,7 @@ private void InitializeComponent() Button7.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; Button7.BackColor = Color.FromArgb(34, 34, 34); - Button7.Font = new Font("Segoe UI", 9.0f); + Button7.Font = new("Segoe UI", 9.0f); Button7.ForeColor = Color.White; Button7.Image = null; Button7.Location = new Point(175, 303); @@ -92,7 +92,7 @@ private void InitializeComponent() // Label17.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; Label17.BackColor = Color.Transparent; - Label17.Font = new Font("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); + Label17.Font = new("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); Label17.Location = new Point(42, 12); Label17.Name = "Label17"; Label17.Size = new Size(513, 35); @@ -114,7 +114,7 @@ private void InitializeComponent() Button3.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; Button3.BackColor = Color.FromArgb(34, 34, 34); - Button3.Font = new Font("Segoe UI", 9.0f); + Button3.Font = new("Segoe UI", 9.0f); Button3.ForeColor = Color.White; Button3.Image = null; Button3.Location = new Point(89, 303); @@ -137,10 +137,10 @@ private void InitializeComponent() Controls.Add(Button7); Controls.Add(Button1); Controls.Add(CheckedListBox1); - Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); ForeColor = Color.White; FormBorderStyle = FormBorderStyle.FixedSingle; - Margin = new Padding(4, 3, 4, 3); + Margin = new(4, 3, 4, 3); MaximizeBox = false; MinimizeBox = false; Name = "Store_CPToggles"; diff --git a/WinPaletter/Store/Store_DownloadProgress.Designer.cs b/WinPaletter/Store/Store_DownloadProgress.Designer.cs index 1da44dc3..0f141627 100644 --- a/WinPaletter/Store/Store_DownloadProgress.Designer.cs +++ b/WinPaletter/Store/Store_DownloadProgress.Designer.cs @@ -98,7 +98,7 @@ private void InitializeComponent() // // Label5 // - Label5.Font = new Font("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); + Label5.Font = new("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); Label5.Location = new Point(42, 134); Label5.Name = "Label5"; Label5.Size = new Size(117, 24); @@ -108,7 +108,7 @@ private void InitializeComponent() // // Label6 // - Label6.Font = new Font("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); + Label6.Font = new("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); Label6.Location = new Point(42, 104); Label6.Name = "Label6"; Label6.Size = new Size(117, 24); @@ -118,7 +118,7 @@ private void InitializeComponent() // // Label7 // - Label7.Font = new Font("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); + Label7.Font = new("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); Label7.Location = new Point(42, 74); Label7.Name = "Label7"; Label7.Size = new Size(117, 24); @@ -157,7 +157,7 @@ private void InitializeComponent() // Button3.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; Button3.BackColor = Color.FromArgb(34, 34, 34); - Button3.Font = new Font("Segoe UI", 9.0f); + Button3.Font = new("Segoe UI", 9.0f); Button3.ForeColor = Color.White; Button3.Image = null; Button3.Location = new Point(592, 200); @@ -195,7 +195,7 @@ private void InitializeComponent() // Label1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; Label1.BackColor = Color.Transparent; - Label1.Font = new Font("Segoe UI", 11.25f, FontStyle.Regular, GraphicsUnit.Point, 0); + Label1.Font = new("Segoe UI", 11.25f, FontStyle.Regular, GraphicsUnit.Point, 0); Label1.Location = new Point(65, 10); Label1.Name = "Label1"; Label1.Size = new Size(607, 48); @@ -222,10 +222,10 @@ private void InitializeComponent() Controls.Add(Label2); Controls.Add(ProgressBar1); Controls.Add(AnimatedBox1); - Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); ForeColor = Color.White; FormBorderStyle = FormBorderStyle.FixedSingle; - Margin = new Padding(4, 3, 4, 3); + Margin = new(4, 3, 4, 3); MaximizeBox = false; MinimizeBox = false; Name = "Store_DownloadProgress"; diff --git a/WinPaletter/Store/Store_DownloadProgress.cs b/WinPaletter/Store/Store_DownloadProgress.cs index 928a01c8..ac7a7da8 100644 --- a/WinPaletter/Store/Store_DownloadProgress.cs +++ b/WinPaletter/Store/Store_DownloadProgress.cs @@ -14,7 +14,7 @@ public partial class Store_DownloadProgress public string ThemeName; public string ThemeVersion; - private Stopwatch SW = new Stopwatch(); + private Stopwatch SW = new(); private WebClient _ThemeDownloader; private WebClient ThemeDownloader @@ -45,7 +45,7 @@ private WebClient ThemeDownloader public Store_DownloadProgress() { - ThemeDownloader = new WebClient(); + ThemeDownloader = new(); InitializeComponent(); } @@ -64,7 +64,7 @@ private void Store_DownloadProgress_Load(object sender, EventArgs e) SW.Reset(); SW.Start(); - ThemeDownloader = new WebClient(); + ThemeDownloader = new(); ThemeDownloader.DownloadFileAsync(new Uri(URL), File); } diff --git a/WinPaletter/Store/Store_Hover.Designer.cs b/WinPaletter/Store/Store_Hover.Designer.cs index 6acc6f1a..035502ad 100644 --- a/WinPaletter/Store/Store_Hover.Designer.cs +++ b/WinPaletter/Store/Store_Hover.Designer.cs @@ -44,10 +44,10 @@ private void InitializeComponent() BackColor = Color.FromArgb(25, 25, 25); BackgroundImageLayout = ImageLayout.Stretch; ClientSize = new Size(528, 297); - Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); ForeColor = Color.White; FormBorderStyle = FormBorderStyle.None; - Margin = new Padding(4, 3, 4, 3); + Margin = new(4, 3, 4, 3); MaximizeBox = false; MinimizeBox = false; Name = "Store_Hover"; diff --git a/WinPaletter/Store/Store_Hover.cs b/WinPaletter/Store/Store_Hover.cs index 47d43283..3ba3d6cf 100644 --- a/WinPaletter/Store/Store_Hover.cs +++ b/WinPaletter/Store/Store_Hover.cs @@ -14,11 +14,11 @@ protected override CreateParams CreateParams { get { - var cp = base.CreateParams; + CreateParams cp = base.CreateParams; if (!DWMAPI.IsCompositionEnabled()) { - cp.ClassStyle = cp.ClassStyle | DWMAPI.CS_DROPSHADOW; - cp.ExStyle = cp.ExStyle | 33554432; + cp.ClassStyle |= DWMAPI.CS_DROPSHADOW; + cp.ExStyle |= 33554432; return cp; } else @@ -102,9 +102,9 @@ private void Store_Hover_Load(object sender, EventArgs e) } if (p.X + Width > Program.Computer.Screen.Bounds.Width) - p = new Point(Program.Computer.Screen.Bounds.Width - Width, p.Y); + p = new(Program.Computer.Screen.Bounds.Width - Width, p.Y); if (p.Y + Height > Program.Computer.Screen.Bounds.Height) - p = new Point(p.X, Program.Computer.Screen.Bounds.Height - Height); + p = new(p.X, Program.Computer.Screen.Bounds.Height - Height); Location = p; _shown = false; diff --git a/WinPaletter/Store/Store_Intro.Designer.cs b/WinPaletter/Store/Store_Intro.Designer.cs index 8af6cd2f..56f658ed 100644 --- a/WinPaletter/Store/Store_Intro.Designer.cs +++ b/WinPaletter/Store/Store_Intro.Designer.cs @@ -109,7 +109,7 @@ private void InitializeComponent() CheckBox1.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; CheckBox1.BackColor = Color.FromArgb(25, 25, 25); CheckBox1.Checked = true; - CheckBox1.Font = new Font("Segoe UI", 9.0f); + CheckBox1.Font = new("Segoe UI", 9.0f); CheckBox1.ForeColor = Color.White; CheckBox1.Location = new Point(12, 13); CheckBox1.Name = "CheckBox1"; @@ -122,7 +122,7 @@ private void InitializeComponent() // Button2.BackColor = Color.FromArgb(50, 50, 50); - Button2.Font = new Font("Segoe UI", 9.0f); + Button2.Font = new("Segoe UI", 9.0f); Button2.ForeColor = Color.White; Button2.Image = null; Button2.Location = new Point(482, 10); @@ -136,7 +136,7 @@ private void InitializeComponent() // Button1.BackColor = Color.FromArgb(50, 50, 50); - Button1.Font = new Font("Segoe UI", 9.0f); + Button1.Font = new("Segoe UI", 9.0f); Button1.ForeColor = Color.White; Button1.Image = null; Button1.Location = new Point(568, 10); @@ -189,7 +189,7 @@ private void InitializeComponent() // Label2 // Label2.BackColor = Color.Transparent; - Label2.Font = new Font("Segoe UI", 11.25f, FontStyle.Regular, GraphicsUnit.Point, 0); + Label2.Font = new("Segoe UI", 11.25f, FontStyle.Regular, GraphicsUnit.Point, 0); Label2.Location = new Point(117, 227); Label2.Name = "Label2"; Label2.Size = new Size(419, 24); @@ -211,7 +211,7 @@ private void InitializeComponent() // Label1 // Label1.BackColor = Color.Transparent; - Label1.Font = new Font("Segoe UI", 14.25f, FontStyle.Regular, GraphicsUnit.Point, 0); + Label1.Font = new("Segoe UI", 14.25f, FontStyle.Regular, GraphicsUnit.Point, 0); Label1.Location = new Point(149, 187); Label1.Name = "Label1"; Label1.Size = new Size(355, 40); @@ -235,10 +235,10 @@ private void InitializeComponent() // Label4.BackColor = Color.Transparent; Label4.Dock = DockStyle.Fill; - Label4.Font = new Font("Segoe UI", 11.25f, FontStyle.Regular, GraphicsUnit.Point, 0); + Label4.Font = new("Segoe UI", 11.25f, FontStyle.Regular, GraphicsUnit.Point, 0); Label4.Location = new Point(0, 40); Label4.Name = "Label4"; - Label4.Padding = new Padding(20, 10, 0, 0); + Label4.Padding = new(20, 10, 0, 0); Label4.Size = new Size(412, 262); Label4.TabIndex = 3; Label4.Text = resources.GetString("Label4.Text"); @@ -259,10 +259,10 @@ private void InitializeComponent() // Label3.BackColor = Color.FromArgb(50, 100, 100, 100); Label3.Dock = DockStyle.Top; - Label3.Font = new Font("Segoe UI", 12.75f, FontStyle.Bold, GraphicsUnit.Point, 0); + Label3.Font = new("Segoe UI", 12.75f, FontStyle.Bold, GraphicsUnit.Point, 0); Label3.Location = new Point(0, 0); Label3.Name = "Label3"; - Label3.Padding = new Padding(5, 5, 0, 0); + Label3.Padding = new(5, 5, 0, 0); Label3.Size = new Size(652, 40); Label3.TabIndex = 2; Label3.Text = "There are two ways for WinPaletter Store"; @@ -285,7 +285,7 @@ private void InitializeComponent() // Button4.BackColor = Color.FromArgb(50, 50, 50); - Button4.Font = new Font("Segoe UI", 9.0f); + Button4.Font = new("Segoe UI", 9.0f); Button4.ForeColor = Color.White; Button4.Image = null; Button4.Location = new Point(23, 105); @@ -299,10 +299,10 @@ private void InitializeComponent() // Label7.BackColor = Color.Transparent; Label7.Dock = DockStyle.Fill; - Label7.Font = new Font("Segoe UI", 11.25f, FontStyle.Regular, GraphicsUnit.Point, 0); + Label7.Font = new("Segoe UI", 11.25f, FontStyle.Regular, GraphicsUnit.Point, 0); Label7.Location = new Point(0, 40); Label7.Name = "Label7"; - Label7.Padding = new Padding(20, 10, 0, 0); + Label7.Padding = new(20, 10, 0, 0); Label7.Size = new Size(412, 262); Label7.TabIndex = 7; Label7.Text = "Visit this documentation to know how to upload your themes to WinPaletter Store G" + "itHub repository"; @@ -323,10 +323,10 @@ private void InitializeComponent() // Label8.BackColor = Color.FromArgb(50, 100, 100, 100); Label8.Dock = DockStyle.Top; - Label8.Font = new Font("Segoe UI", 12.75f, FontStyle.Bold); + Label8.Font = new("Segoe UI", 12.75f, FontStyle.Bold); Label8.Location = new Point(0, 0); Label8.Name = "Label8"; - Label8.Padding = new Padding(5, 5, 0, 0); + Label8.Padding = new(5, 5, 0, 0); Label8.Size = new Size(652, 40); Label8.TabIndex = 6; Label8.Text = "You can upload your themes to WinPaletter Store repository"; @@ -349,7 +349,7 @@ private void InitializeComponent() // Button5.BackColor = Color.FromArgb(50, 50, 50); - Button5.Font = new Font("Segoe UI", 9.0f); + Button5.Font = new("Segoe UI", 9.0f); Button5.ForeColor = Color.White; Button5.Image = null; Button5.Location = new Point(23, 145); @@ -363,10 +363,10 @@ private void InitializeComponent() // Label14.BackColor = Color.Transparent; Label14.Dock = DockStyle.Fill; - Label14.Font = new Font("Segoe UI", 11.25f, FontStyle.Regular, GraphicsUnit.Point, 0); + Label14.Font = new("Segoe UI", 11.25f, FontStyle.Regular, GraphicsUnit.Point, 0); Label14.Location = new Point(0, 40); Label14.Name = "Label14"; - Label14.Padding = new Padding(20, 10, 0, 0); + Label14.Padding = new(20, 10, 0, 0); Label14.Size = new Size(412, 262); Label14.TabIndex = 9; Label14.Text = @"You can add links of servers\GitHub repositories to get more themes through WinPa" + "letter Store. Visit this documentation to know more about Store source extension" + ""; @@ -387,10 +387,10 @@ private void InitializeComponent() // Label15.BackColor = Color.FromArgb(50, 100, 100, 100); Label15.Dock = DockStyle.Top; - Label15.Font = new Font("Segoe UI", 12.75f, FontStyle.Bold); + Label15.Font = new("Segoe UI", 12.75f, FontStyle.Bold); Label15.Location = new Point(0, 0); Label15.Name = "Label15"; - Label15.Padding = new Padding(5, 5, 0, 0); + Label15.Padding = new(5, 5, 0, 0); Label15.Size = new Size(652, 40); Label15.TabIndex = 8; Label15.Text = "You can extend the sources from which WinPaletter Store can get themes!"; @@ -413,7 +413,7 @@ private void InitializeComponent() // Button3.BackColor = Color.FromArgb(50, 50, 50); - Button3.Font = new Font("Segoe UI", 9.0f); + Button3.Font = new("Segoe UI", 9.0f); Button3.ForeColor = Color.White; Button3.Image = null; Button3.Location = new Point(23, 121); @@ -427,10 +427,10 @@ private void InitializeComponent() // Label5.BackColor = Color.Transparent; Label5.Dock = DockStyle.Fill; - Label5.Font = new Font("Segoe UI", 11.25f, FontStyle.Regular, GraphicsUnit.Point, 0); + Label5.Font = new("Segoe UI", 11.25f, FontStyle.Regular, GraphicsUnit.Point, 0); Label5.Location = new Point(0, 40); Label5.Name = "Label5"; - Label5.Padding = new Padding(20, 10, 0, 0); + Label5.Padding = new(20, 10, 0, 0); Label5.Size = new Size(412, 262); Label5.TabIndex = 5; Label5.Text = "This is an optional feature. Visit this documentation to know more about Store se" + @"rver\GitHub repository creation."; @@ -451,10 +451,10 @@ private void InitializeComponent() // Label6.BackColor = Color.FromArgb(50, 100, 100, 100); Label6.Dock = DockStyle.Top; - Label6.Font = new Font("Segoe UI", 12.75f, FontStyle.Bold); + Label6.Font = new("Segoe UI", 12.75f, FontStyle.Bold); Label6.Location = new Point(0, 0); Label6.Name = "Label6"; - Label6.Padding = new Padding(5, 5, 0, 0); + Label6.Padding = new(5, 5, 0, 0); Label6.Size = new Size(652, 40); Label6.TabIndex = 4; Label6.Text = "You can create your own WinPaletter Store online source!"; @@ -488,7 +488,7 @@ private void InitializeComponent() // Label11 // Label11.BackColor = Color.Transparent; - Label11.Font = new Font("Segoe UI", 11.25f, FontStyle.Regular, GraphicsUnit.Point, 0); + Label11.Font = new("Segoe UI", 11.25f, FontStyle.Regular, GraphicsUnit.Point, 0); Label11.Location = new Point(176, 227); Label11.Name = "Label11"; Label11.Size = new Size(301, 24); @@ -510,7 +510,7 @@ private void InitializeComponent() // Label12 // Label12.BackColor = Color.Transparent; - Label12.Font = new Font("Segoe UI", 14.25f, FontStyle.Regular, GraphicsUnit.Point, 0); + Label12.Font = new("Segoe UI", 14.25f, FontStyle.Regular, GraphicsUnit.Point, 0); Label12.Location = new Point(176, 187); Label12.Name = "Label12"; Label12.Size = new Size(301, 40); @@ -526,11 +526,11 @@ private void InitializeComponent() ClientSize = new Size(660, 380); Controls.Add(TablessControl1); Controls.Add(Panel1); - Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); ForeColor = Color.White; FormBorderStyle = FormBorderStyle.FixedSingle; HelpButton = true; - Margin = new Padding(4, 3, 4, 3); + Margin = new(4, 3, 4, 3); MaximizeBox = false; MinimizeBox = false; Name = "Store_Intro"; diff --git a/WinPaletter/Store/Store_SearchFilter.Designer.cs b/WinPaletter/Store/Store_SearchFilter.Designer.cs index 6495e88b..d481aa3e 100644 --- a/WinPaletter/Store/Store_SearchFilter.Designer.cs +++ b/WinPaletter/Store/Store_SearchFilter.Designer.cs @@ -52,7 +52,7 @@ private void InitializeComponent() // Button1.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; Button1.BackColor = Color.FromArgb(34, 34, 34); - Button1.Font = new Font("Segoe UI", 9.0f); + Button1.Font = new("Segoe UI", 9.0f); Button1.ForeColor = Color.White; Button1.Image = null; Button1.Location = new Point(269, 245); @@ -66,7 +66,7 @@ private void InitializeComponent() // Button7.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; Button7.BackColor = Color.FromArgb(34, 34, 34); - Button7.Font = new Font("Segoe UI", 9.0f); + Button7.Font = new("Segoe UI", 9.0f); Button7.ForeColor = Color.White; Button7.Image = null; Button7.Location = new Point(183, 245); @@ -79,7 +79,7 @@ private void InitializeComponent() // Label6 // Label6.BackColor = Color.Transparent; - Label6.Font = new Font("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); + Label6.Font = new("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); Label6.Location = new Point(42, 12); Label6.Name = "Label6"; Label6.Size = new Size(172, 24); @@ -103,7 +103,7 @@ private void InitializeComponent() CheckBox1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; CheckBox1.BackColor = Color.FromArgb(25, 25, 25); CheckBox1.Checked = true; - CheckBox1.Font = new Font("Segoe UI", 9.0f); + CheckBox1.Font = new("Segoe UI", 9.0f); CheckBox1.ForeColor = Color.White; CheckBox1.Location = new Point(45, 39); CheckBox1.Name = "CheckBox1"; @@ -116,7 +116,7 @@ private void InitializeComponent() CheckBox2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; CheckBox2.BackColor = Color.FromArgb(25, 25, 25); CheckBox2.Checked = true; - CheckBox2.Font = new Font("Segoe UI", 9.0f); + CheckBox2.Font = new("Segoe UI", 9.0f); CheckBox2.ForeColor = Color.White; CheckBox2.Location = new Point(45, 99); CheckBox2.Name = "CheckBox2"; @@ -129,7 +129,7 @@ private void InitializeComponent() CheckBox3.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; CheckBox3.BackColor = Color.FromArgb(25, 25, 25); CheckBox3.Checked = true; - CheckBox3.Font = new Font("Segoe UI", 9.0f); + CheckBox3.Font = new("Segoe UI", 9.0f); CheckBox3.ForeColor = Color.White; CheckBox3.Location = new Point(45, 69); CheckBox3.Name = "CheckBox3"; @@ -150,10 +150,10 @@ private void InitializeComponent() Controls.Add(PictureBox16); Controls.Add(Button7); Controls.Add(Button1); - Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); ForeColor = Color.White; FormBorderStyle = FormBorderStyle.FixedSingle; - Margin = new Padding(4, 3, 4, 3); + Margin = new(4, 3, 4, 3); MaximizeBox = false; MinimizeBox = false; Name = "Store_SearchFilter"; diff --git a/WinPaletter/Terminals/CMD.Designer.cs b/WinPaletter/Terminals/CMD.Designer.cs index 29688dfe..d38da7c7 100644 --- a/WinPaletter/Terminals/CMD.Designer.cs +++ b/WinPaletter/Terminals/CMD.Designer.cs @@ -874,7 +874,7 @@ private void InitializeComponent() this.CMD_CursorColor.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.CMD_CursorColor.BackColor = System.Drawing.Color.White; - this.CMD_CursorColor.DefaultColor = System.Drawing.Color.White; + this.CMD_CursorColor.DefaultBackColor = System.Drawing.Color.White; this.CMD_CursorColor.DontShowInfo = false; this.CMD_CursorColor.Location = new System.Drawing.Point(97, 6); this.CMD_CursorColor.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1265,7 +1265,7 @@ private void InitializeComponent() // this.ColorTable00.AllowDrop = true; this.ColorTable00.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); - this.ColorTable00.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); + this.ColorTable00.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); this.ColorTable00.DontShowInfo = false; this.ColorTable00.Location = new System.Drawing.Point(28, 36); this.ColorTable00.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1301,7 +1301,7 @@ private void InitializeComponent() // this.ColorTable01.AllowDrop = true; this.ColorTable01.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(55)))), ((int)(((byte)(218))))); - this.ColorTable01.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(55)))), ((int)(((byte)(218))))); + this.ColorTable01.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(55)))), ((int)(((byte)(218))))); this.ColorTable01.DontShowInfo = false; this.ColorTable01.Location = new System.Drawing.Point(28, 67); this.ColorTable01.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1326,7 +1326,7 @@ private void InitializeComponent() // this.ColorTable02.AllowDrop = true; this.ColorTable02.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(161)))), ((int)(((byte)(14))))); - this.ColorTable02.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(161)))), ((int)(((byte)(14))))); + this.ColorTable02.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(161)))), ((int)(((byte)(14))))); this.ColorTable02.DontShowInfo = false; this.ColorTable02.Location = new System.Drawing.Point(28, 98); this.ColorTable02.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1340,7 +1340,7 @@ private void InitializeComponent() // this.ColorTable03.AllowDrop = true; this.ColorTable03.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(150)))), ((int)(((byte)(221))))); - this.ColorTable03.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(150)))), ((int)(((byte)(221))))); + this.ColorTable03.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(150)))), ((int)(((byte)(221))))); this.ColorTable03.DontShowInfo = false; this.ColorTable03.Location = new System.Drawing.Point(28, 129); this.ColorTable03.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1387,7 +1387,7 @@ private void InitializeComponent() // this.ColorTable04.AllowDrop = true; this.ColorTable04.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(15)))), ((int)(((byte)(31))))); - this.ColorTable04.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(15)))), ((int)(((byte)(31))))); + this.ColorTable04.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(15)))), ((int)(((byte)(31))))); this.ColorTable04.DontShowInfo = false; this.ColorTable04.Location = new System.Drawing.Point(28, 160); this.ColorTable04.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1423,7 +1423,7 @@ private void InitializeComponent() // this.ColorTable05.AllowDrop = true; this.ColorTable05.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(23)))), ((int)(((byte)(152))))); - this.ColorTable05.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(23)))), ((int)(((byte)(152))))); + this.ColorTable05.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(23)))), ((int)(((byte)(152))))); this.ColorTable05.DontShowInfo = false; this.ColorTable05.Location = new System.Drawing.Point(28, 191); this.ColorTable05.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1448,7 +1448,7 @@ private void InitializeComponent() // this.ColorTable06.AllowDrop = true; this.ColorTable06.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(193)))), ((int)(((byte)(156)))), ((int)(((byte)(0))))); - this.ColorTable06.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(193)))), ((int)(((byte)(156)))), ((int)(((byte)(0))))); + this.ColorTable06.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(193)))), ((int)(((byte)(156)))), ((int)(((byte)(0))))); this.ColorTable06.DontShowInfo = false; this.ColorTable06.Location = new System.Drawing.Point(28, 222); this.ColorTable06.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1484,7 +1484,7 @@ private void InitializeComponent() // this.ColorTable15.AllowDrop = true; this.ColorTable15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); - this.ColorTable15.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.ColorTable15.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); this.ColorTable15.DontShowInfo = false; this.ColorTable15.Location = new System.Drawing.Point(189, 253); this.ColorTable15.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1498,7 +1498,7 @@ private void InitializeComponent() // this.ColorTable07.AllowDrop = true; this.ColorTable07.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.ColorTable07.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); + this.ColorTable07.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); this.ColorTable07.DontShowInfo = false; this.ColorTable07.Location = new System.Drawing.Point(28, 253); this.ColorTable07.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1523,7 +1523,7 @@ private void InitializeComponent() // this.ColorTable08.AllowDrop = true; this.ColorTable08.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(118)))), ((int)(((byte)(118)))), ((int)(((byte)(118))))); - this.ColorTable08.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(118)))), ((int)(((byte)(118)))), ((int)(((byte)(118))))); + this.ColorTable08.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(118)))), ((int)(((byte)(118)))), ((int)(((byte)(118))))); this.ColorTable08.DontShowInfo = false; this.ColorTable08.Location = new System.Drawing.Point(189, 36); this.ColorTable08.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1537,7 +1537,7 @@ private void InitializeComponent() // this.ColorTable14.AllowDrop = true; this.ColorTable14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(241)))), ((int)(((byte)(165))))); - this.ColorTable14.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(241)))), ((int)(((byte)(165))))); + this.ColorTable14.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(241)))), ((int)(((byte)(165))))); this.ColorTable14.DontShowInfo = false; this.ColorTable14.Location = new System.Drawing.Point(189, 222); this.ColorTable14.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1573,7 +1573,7 @@ private void InitializeComponent() // this.ColorTable09.AllowDrop = true; this.ColorTable09.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(120)))), ((int)(((byte)(255))))); - this.ColorTable09.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(120)))), ((int)(((byte)(255))))); + this.ColorTable09.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(120)))), ((int)(((byte)(255))))); this.ColorTable09.DontShowInfo = false; this.ColorTable09.Location = new System.Drawing.Point(189, 67); this.ColorTable09.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1587,7 +1587,7 @@ private void InitializeComponent() // this.ColorTable13.AllowDrop = true; this.ColorTable13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(0)))), ((int)(((byte)(158))))); - this.ColorTable13.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(0)))), ((int)(((byte)(158))))); + this.ColorTable13.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(0)))), ((int)(((byte)(158))))); this.ColorTable13.DontShowInfo = false; this.ColorTable13.Location = new System.Drawing.Point(189, 191); this.ColorTable13.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1612,7 +1612,7 @@ private void InitializeComponent() // this.ColorTable12.AllowDrop = true; this.ColorTable12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(72)))), ((int)(((byte)(86))))); - this.ColorTable12.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(72)))), ((int)(((byte)(86))))); + this.ColorTable12.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(72)))), ((int)(((byte)(86))))); this.ColorTable12.DontShowInfo = false; this.ColorTable12.Location = new System.Drawing.Point(189, 160); this.ColorTable12.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1626,7 +1626,7 @@ private void InitializeComponent() // this.ColorTable10.AllowDrop = true; this.ColorTable10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(198)))), ((int)(((byte)(12))))); - this.ColorTable10.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(198)))), ((int)(((byte)(12))))); + this.ColorTable10.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(198)))), ((int)(((byte)(12))))); this.ColorTable10.DontShowInfo = false; this.ColorTable10.Location = new System.Drawing.Point(189, 98); this.ColorTable10.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1640,7 +1640,7 @@ private void InitializeComponent() // this.ColorTable11.AllowDrop = true; this.ColorTable11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(97)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); - this.ColorTable11.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(97)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); + this.ColorTable11.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(97)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); this.ColorTable11.DontShowInfo = false; this.ColorTable11.Location = new System.Drawing.Point(189, 129); this.ColorTable11.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); diff --git a/WinPaletter/Terminals/CMD.cs b/WinPaletter/Terminals/CMD.cs index 6253547d..045fabfc 100644 --- a/WinPaletter/Terminals/CMD.cs +++ b/WinPaletter/Terminals/CMD.cs @@ -13,7 +13,7 @@ namespace WinPaletter public partial class CMD { - private Font F_cmd = new Font("Consolas", 18f, FontStyle.Regular); + private Font F_cmd = new("Consolas", 18f, FontStyle.Regular); private bool _Shown = false; public Edition _Edition = Edition.CMD; @@ -107,7 +107,7 @@ private void Button10_Click(object sender, EventArgs e) if (CMDEnabled.Checked) { Cursor = Cursors.WaitCursor; - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyToTM(TMx, _Edition); ApplyToTM(Program.TM, _Edition); @@ -169,7 +169,7 @@ private void CMD_Shown(object sender, EventArgs e) public void ApplyCursorShape() { CMD_PreviewCursorInner.Dock = DockStyle.Fill; - CMD_PreviewCUR2.Padding = new Padding(1, 1, 1, 1); + CMD_PreviewCUR2.Padding = new(1, 1, 1, 1); if (CMD_CursorStyle.SelectedIndex == 0) { @@ -227,7 +227,7 @@ public void ApplyCursorShape() if (CMD_CursorStyle.SelectedIndex == 5) { CMD_PreviewCursorInner.Dock = DockStyle.None; - CMD_PreviewCUR2.Padding = new Padding(0, 0, 0, 0); + CMD_PreviewCUR2.Padding = new(0, 0, 0, 0); CMD_PreviewCursorInner.Width = CMD_PreviewCUR2.Width; CMD_PreviewCursorInner.Height = 1; CMD_PreviewCursorInner.BackColor = CMD_PreviewCUR.BackColor; @@ -268,7 +268,7 @@ public void ApplyPreview() CMD1.CMD_PopupBackground = CMD_PopupBackgroundBar.Value; CMD1.CMD_ScreenColorsForeground = CMD_AccentForegroundBar.Value; CMD1.CMD_ScreenColorsBackground = CMD_AccentBackgroundBar.Value; - CMD1.Font = new Font(F_cmd.Name, F_cmd.Size, F_cmd.Style); + CMD1.Font = new(F_cmd.Name, F_cmd.Size, F_cmd.Style); CMD1.PowerShell = _Edition == Edition.PowerShellx64 | _Edition == Edition.PowerShellx86; CMD1.Raster = CMD_RasterToggle.Checked; switch (RasterList.SelectedItem) @@ -354,7 +354,7 @@ public void ApplyPreview() } FontName.Text = F_cmd.Name; - FontName.Font = new Font(F_cmd.Name, 9f, F_cmd.Style); + FontName.Font = new(F_cmd.Name, 9f, F_cmd.Style); CMD1.Refresh(); } @@ -792,8 +792,8 @@ public void SetFromTM(Theme.Structures.Console Console) ColorTable14.BackColor = Console.ColorTable14; ColorTable15.BackColor = Console.ColorTable15; - ColorTable05.DefaultColor = Color.FromArgb(136, 23, 152); - ColorTable06.DefaultColor = Color.FromArgb(193, 156, 0); + ColorTable05.DefaultBackColor = Color.FromArgb(136, 23, 152); + ColorTable06.DefaultBackColor = Color.FromArgb(193, 156, 0); CMD_PopupForegroundBar.Value = Console.PopupForeground; CMD_PopupBackgroundBar.Value = Console.PopupBackground; @@ -876,12 +876,12 @@ public void SetFromTM(Theme.Structures.Console Console) { { var temp = Font.FromLogFont(new NativeMethods.GDI32.LogFont() { lfFaceName = Console.FaceName, lfWeight = Console.FontWeight }); - F_cmd = new Font(temp.FontFamily, (int)Math.Round(Console.FontSize / 65536d), temp.Style); + F_cmd = new(temp.FontFamily, (int)Math.Round(Console.FontSize / 65536d), temp.Style); } } FontName.Text = F_cmd.Name; - FontName.Font = new Font(F_cmd.Name, 9f, F_cmd.Style); + FontName.Font = new(F_cmd.Name, 9f, F_cmd.Style); CMD_FontSizeBar.Value = (int)Math.Round(F_cmd.Size); CMD_FontSizeVal.Text = F_cmd.Size.ToString(); @@ -930,7 +930,7 @@ public void SetFromTM(Theme.Structures.Console Console) public void ApplyToTM(Theme.Manager TM, Edition Edition) { - var Console = new Theme.Structures.Console() + Theme.Structures.Console Console = new() { Enabled = CMDEnabled.Checked, ColorTable00 = ColorTable00.BackColor, @@ -1195,9 +1195,9 @@ private void Button4_Click(object sender, EventArgs e) { case Edition.CMD: { - var prc = new Process() + Process prc = new() { - StartInfo = new ProcessStartInfo() + StartInfo = new() { FileName = PathsExt.CMD, Verb = "runas", @@ -1210,9 +1210,9 @@ private void Button4_Click(object sender, EventArgs e) case Edition.PowerShellx86: { - var prc = new Process() + Process prc = new() { - StartInfo = new ProcessStartInfo() + StartInfo = new() { FileName = PathsExt.PS86_app, Verb = "runas", @@ -1225,9 +1225,9 @@ private void Button4_Click(object sender, EventArgs e) case Edition.PowerShellx64: { - var prc = new Process() + Process prc = new() { - StartInfo = new ProcessStartInfo() + StartInfo = new() { FileName = PathsExt.PS64_app, Verb = "runas", @@ -1260,12 +1260,12 @@ private void CMD_FontWeightBox_SelectedIndexChanged(object sender, EventArgs e) if (!_Shown) return; NativeMethods.GDI32.LogFont fx = new(); - F_cmd = new Font(F_cmd.Name, F_cmd.Size, F_cmd.Style); + F_cmd = new(F_cmd.Name, F_cmd.Size, F_cmd.Style); F_cmd.ToLogFont(fx); fx.lfWeight = CMD_FontWeightBox.SelectedIndex * 100; { var temp = Font.FromLogFont(fx); - F_cmd = new Font(temp.Name, F_cmd.Size, temp.Style); + F_cmd = new(temp.Name, F_cmd.Size, temp.Style); } ApplyPreview(); } @@ -1274,7 +1274,7 @@ private void CMD_FontsBox_SelectedIndexChanged(object sender, EventArgs e) { if (_Shown) { - F_cmd = new Font(FontName.Font.Name, F_cmd.Size, F_cmd.Style); + F_cmd = new(FontName.Font.Name, F_cmd.Size, F_cmd.Style); ApplyPreview(); } @@ -1285,7 +1285,7 @@ private void CMD_FontSizeBar_Scroll(object sender) CMD_FontSizeVal.Text = CMD_FontSizeBar.Value.ToString(); if (_Shown) { - F_cmd = new Font(F_cmd.Name, CMD_FontSizeBar.Value, F_cmd.Style); + F_cmd = new(F_cmd.Name, CMD_FontSizeBar.Value, F_cmd.Style); ApplyPreview(); } } @@ -1323,9 +1323,9 @@ private void CMD_CursorColor_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender, CMD_PreviewCUR2 }; + List CList = new() { (Control)sender, CMD_PreviewCUR2 }; - var C = Forms.ColorPickerDlg.Pick(CList); + Color C = Forms.ColorPickerDlg.Pick(CList); CMD_PreviewCUR2.BackColor = C; ((UI.Controllers.ColorItem)sender).BackColor = C; @@ -1364,43 +1364,43 @@ private void ColorTable00_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender, CMD1 }; + List CList = new() { (Control)sender, CMD1 }; - var _Conditions = new Conditions(); + Conditions _conditions = new(); if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable00".ToLower())) - _Conditions.CMD_ColorTable00 = true; + _conditions.CMD_ColorTable00 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable01".ToLower())) - _Conditions.CMD_ColorTable01 = true; + _conditions.CMD_ColorTable01 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable02".ToLower())) - _Conditions.CMD_ColorTable02 = true; + _conditions.CMD_ColorTable02 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable03".ToLower())) - _Conditions.CMD_ColorTable03 = true; + _conditions.CMD_ColorTable03 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable04".ToLower())) - _Conditions.CMD_ColorTable04 = true; + _conditions.CMD_ColorTable04 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable05".ToLower())) - _Conditions.CMD_ColorTable05 = true; + _conditions.CMD_ColorTable05 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable06".ToLower())) - _Conditions.CMD_ColorTable06 = true; + _conditions.CMD_ColorTable06 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable07".ToLower())) - _Conditions.CMD_ColorTable07 = true; + _conditions.CMD_ColorTable07 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable08".ToLower())) - _Conditions.CMD_ColorTable08 = true; + _conditions.CMD_ColorTable08 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable09".ToLower())) - _Conditions.CMD_ColorTable09 = true; + _conditions.CMD_ColorTable09 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable10".ToLower())) - _Conditions.CMD_ColorTable10 = true; + _conditions.CMD_ColorTable10 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable11".ToLower())) - _Conditions.CMD_ColorTable11 = true; + _conditions.CMD_ColorTable11 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable12".ToLower())) - _Conditions.CMD_ColorTable12 = true; + _conditions.CMD_ColorTable12 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable13".ToLower())) - _Conditions.CMD_ColorTable13 = true; + _conditions.CMD_ColorTable13 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable14".ToLower())) - _Conditions.CMD_ColorTable14 = true; + _conditions.CMD_ColorTable14 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable15".ToLower())) - _Conditions.CMD_ColorTable15 = true; + _conditions.CMD_ColorTable15 = true; - var C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions); ((UI.Controllers.ColorItem)sender).BackColor = C; ((UI.Controllers.ColorItem)sender).Invalidate(); @@ -1429,7 +1429,7 @@ private void Button8_Click(object sender, EventArgs e) { if (OpenWPTHDlg.ShowDialog() == DialogResult.OK) { - var TMx = new Theme.Manager(Theme.Manager.Source.File, OpenWPTHDlg.FileName); + Theme.Manager TMx = new(Theme.Manager.Source.File, OpenWPTHDlg.FileName); bool ee = CMDEnabled.Checked; ApplyFromTM(TMx, _Edition); ApplyPreview(); @@ -1445,7 +1445,7 @@ private void Button25_Click(object sender, EventArgs e) private void Button3_Click(object sender, EventArgs e) { - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); bool ee = CMDEnabled.Checked; ApplyFromTM(TMx, _Edition); ApplyPreview(); @@ -1493,9 +1493,9 @@ private void Button5_Click(object sender, EventArgs e) fx.lfWeight = CMD_FontWeightBox.SelectedIndex * 100; { var temp = Font.FromLogFont(fx); - F_cmd = new Font(temp.Name, F_cmd.Size, temp.Style); + F_cmd = new(temp.Name, F_cmd.Size, temp.Style); } - FontName.Font = new Font(FontDialog1.Font.Name, 9f, F_cmd.Style); + FontName.Font = new(FontDialog1.Font.Name, 9f, F_cmd.Style); } } diff --git a/WinPaletter/Terminals/ExternalTerminal.Designer.cs b/WinPaletter/Terminals/ExternalTerminal.Designer.cs index d6bb0596..6b4e8832 100644 --- a/WinPaletter/Terminals/ExternalTerminal.Designer.cs +++ b/WinPaletter/Terminals/ExternalTerminal.Designer.cs @@ -854,7 +854,7 @@ private void InitializeComponent() // this.ExtTerminal_ColorTable00.AllowDrop = true; this.ExtTerminal_ColorTable00.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); - this.ExtTerminal_ColorTable00.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); + this.ExtTerminal_ColorTable00.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); this.ExtTerminal_ColorTable00.DontShowInfo = false; this.ExtTerminal_ColorTable00.Location = new System.Drawing.Point(28, 36); this.ExtTerminal_ColorTable00.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -890,7 +890,7 @@ private void InitializeComponent() // this.ExtTerminal_ColorTable01.AllowDrop = true; this.ExtTerminal_ColorTable01.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(55)))), ((int)(((byte)(218))))); - this.ExtTerminal_ColorTable01.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(55)))), ((int)(((byte)(218))))); + this.ExtTerminal_ColorTable01.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(55)))), ((int)(((byte)(218))))); this.ExtTerminal_ColorTable01.DontShowInfo = false; this.ExtTerminal_ColorTable01.Location = new System.Drawing.Point(28, 67); this.ExtTerminal_ColorTable01.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -915,7 +915,7 @@ private void InitializeComponent() // this.ExtTerminal_ColorTable02.AllowDrop = true; this.ExtTerminal_ColorTable02.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(161)))), ((int)(((byte)(14))))); - this.ExtTerminal_ColorTable02.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(161)))), ((int)(((byte)(14))))); + this.ExtTerminal_ColorTable02.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(161)))), ((int)(((byte)(14))))); this.ExtTerminal_ColorTable02.DontShowInfo = false; this.ExtTerminal_ColorTable02.Location = new System.Drawing.Point(28, 98); this.ExtTerminal_ColorTable02.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -929,7 +929,7 @@ private void InitializeComponent() // this.ExtTerminal_ColorTable03.AllowDrop = true; this.ExtTerminal_ColorTable03.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(150)))), ((int)(((byte)(221))))); - this.ExtTerminal_ColorTable03.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(150)))), ((int)(((byte)(221))))); + this.ExtTerminal_ColorTable03.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(150)))), ((int)(((byte)(221))))); this.ExtTerminal_ColorTable03.DontShowInfo = false; this.ExtTerminal_ColorTable03.Location = new System.Drawing.Point(28, 129); this.ExtTerminal_ColorTable03.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -976,7 +976,7 @@ private void InitializeComponent() // this.ExtTerminal_ColorTable04.AllowDrop = true; this.ExtTerminal_ColorTable04.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(15)))), ((int)(((byte)(31))))); - this.ExtTerminal_ColorTable04.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(15)))), ((int)(((byte)(31))))); + this.ExtTerminal_ColorTable04.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(15)))), ((int)(((byte)(31))))); this.ExtTerminal_ColorTable04.DontShowInfo = false; this.ExtTerminal_ColorTable04.Location = new System.Drawing.Point(28, 160); this.ExtTerminal_ColorTable04.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1012,7 +1012,7 @@ private void InitializeComponent() // this.ExtTerminal_ColorTable05.AllowDrop = true; this.ExtTerminal_ColorTable05.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(23)))), ((int)(((byte)(152))))); - this.ExtTerminal_ColorTable05.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(23)))), ((int)(((byte)(152))))); + this.ExtTerminal_ColorTable05.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(23)))), ((int)(((byte)(152))))); this.ExtTerminal_ColorTable05.DontShowInfo = false; this.ExtTerminal_ColorTable05.Location = new System.Drawing.Point(28, 191); this.ExtTerminal_ColorTable05.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1037,7 +1037,7 @@ private void InitializeComponent() // this.ExtTerminal_ColorTable06.AllowDrop = true; this.ExtTerminal_ColorTable06.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(193)))), ((int)(((byte)(156)))), ((int)(((byte)(0))))); - this.ExtTerminal_ColorTable06.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(193)))), ((int)(((byte)(156)))), ((int)(((byte)(0))))); + this.ExtTerminal_ColorTable06.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(193)))), ((int)(((byte)(156)))), ((int)(((byte)(0))))); this.ExtTerminal_ColorTable06.DontShowInfo = false; this.ExtTerminal_ColorTable06.Location = new System.Drawing.Point(28, 222); this.ExtTerminal_ColorTable06.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1073,7 +1073,7 @@ private void InitializeComponent() // this.ExtTerminal_ColorTable15.AllowDrop = true; this.ExtTerminal_ColorTable15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); - this.ExtTerminal_ColorTable15.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.ExtTerminal_ColorTable15.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); this.ExtTerminal_ColorTable15.DontShowInfo = false; this.ExtTerminal_ColorTable15.Location = new System.Drawing.Point(189, 253); this.ExtTerminal_ColorTable15.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1087,7 +1087,7 @@ private void InitializeComponent() // this.ExtTerminal_ColorTable07.AllowDrop = true; this.ExtTerminal_ColorTable07.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.ExtTerminal_ColorTable07.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); + this.ExtTerminal_ColorTable07.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); this.ExtTerminal_ColorTable07.DontShowInfo = false; this.ExtTerminal_ColorTable07.Location = new System.Drawing.Point(28, 253); this.ExtTerminal_ColorTable07.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1112,7 +1112,7 @@ private void InitializeComponent() // this.ExtTerminal_ColorTable08.AllowDrop = true; this.ExtTerminal_ColorTable08.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(118)))), ((int)(((byte)(118)))), ((int)(((byte)(118))))); - this.ExtTerminal_ColorTable08.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(118)))), ((int)(((byte)(118)))), ((int)(((byte)(118))))); + this.ExtTerminal_ColorTable08.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(118)))), ((int)(((byte)(118)))), ((int)(((byte)(118))))); this.ExtTerminal_ColorTable08.DontShowInfo = false; this.ExtTerminal_ColorTable08.Location = new System.Drawing.Point(189, 36); this.ExtTerminal_ColorTable08.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1126,7 +1126,7 @@ private void InitializeComponent() // this.ExtTerminal_ColorTable14.AllowDrop = true; this.ExtTerminal_ColorTable14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(241)))), ((int)(((byte)(165))))); - this.ExtTerminal_ColorTable14.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(241)))), ((int)(((byte)(165))))); + this.ExtTerminal_ColorTable14.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(241)))), ((int)(((byte)(165))))); this.ExtTerminal_ColorTable14.DontShowInfo = false; this.ExtTerminal_ColorTable14.Location = new System.Drawing.Point(189, 222); this.ExtTerminal_ColorTable14.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1162,7 +1162,7 @@ private void InitializeComponent() // this.ExtTerminal_ColorTable09.AllowDrop = true; this.ExtTerminal_ColorTable09.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(120)))), ((int)(((byte)(255))))); - this.ExtTerminal_ColorTable09.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(120)))), ((int)(((byte)(255))))); + this.ExtTerminal_ColorTable09.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(120)))), ((int)(((byte)(255))))); this.ExtTerminal_ColorTable09.DontShowInfo = false; this.ExtTerminal_ColorTable09.Location = new System.Drawing.Point(189, 67); this.ExtTerminal_ColorTable09.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1176,7 +1176,7 @@ private void InitializeComponent() // this.ExtTerminal_ColorTable13.AllowDrop = true; this.ExtTerminal_ColorTable13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(0)))), ((int)(((byte)(158))))); - this.ExtTerminal_ColorTable13.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(0)))), ((int)(((byte)(158))))); + this.ExtTerminal_ColorTable13.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(0)))), ((int)(((byte)(158))))); this.ExtTerminal_ColorTable13.DontShowInfo = false; this.ExtTerminal_ColorTable13.Location = new System.Drawing.Point(189, 191); this.ExtTerminal_ColorTable13.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1201,7 +1201,7 @@ private void InitializeComponent() // this.ExtTerminal_ColorTable12.AllowDrop = true; this.ExtTerminal_ColorTable12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(72)))), ((int)(((byte)(86))))); - this.ExtTerminal_ColorTable12.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(72)))), ((int)(((byte)(86))))); + this.ExtTerminal_ColorTable12.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(72)))), ((int)(((byte)(86))))); this.ExtTerminal_ColorTable12.DontShowInfo = false; this.ExtTerminal_ColorTable12.Location = new System.Drawing.Point(189, 160); this.ExtTerminal_ColorTable12.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1215,7 +1215,7 @@ private void InitializeComponent() // this.ExtTerminal_ColorTable10.AllowDrop = true; this.ExtTerminal_ColorTable10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(198)))), ((int)(((byte)(12))))); - this.ExtTerminal_ColorTable10.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(198)))), ((int)(((byte)(12))))); + this.ExtTerminal_ColorTable10.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(198)))), ((int)(((byte)(12))))); this.ExtTerminal_ColorTable10.DontShowInfo = false; this.ExtTerminal_ColorTable10.Location = new System.Drawing.Point(189, 98); this.ExtTerminal_ColorTable10.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1229,7 +1229,7 @@ private void InitializeComponent() // this.ExtTerminal_ColorTable11.AllowDrop = true; this.ExtTerminal_ColorTable11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(97)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); - this.ExtTerminal_ColorTable11.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(97)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); + this.ExtTerminal_ColorTable11.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(97)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); this.ExtTerminal_ColorTable11.DontShowInfo = false; this.ExtTerminal_ColorTable11.Location = new System.Drawing.Point(189, 129); this.ExtTerminal_ColorTable11.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1703,7 +1703,7 @@ private void InitializeComponent() this.ExtTerminal_CursorColor.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.ExtTerminal_CursorColor.BackColor = System.Drawing.Color.White; - this.ExtTerminal_CursorColor.DefaultColor = System.Drawing.Color.White; + this.ExtTerminal_CursorColor.DefaultBackColor = System.Drawing.Color.White; this.ExtTerminal_CursorColor.DontShowInfo = false; this.ExtTerminal_CursorColor.Location = new System.Drawing.Point(97, 6); this.ExtTerminal_CursorColor.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); diff --git a/WinPaletter/Terminals/ExternalTerminal.cs b/WinPaletter/Terminals/ExternalTerminal.cs index 07af8206..e00e5d9c 100644 --- a/WinPaletter/Terminals/ExternalTerminal.cs +++ b/WinPaletter/Terminals/ExternalTerminal.cs @@ -15,7 +15,7 @@ namespace WinPaletter public partial class ExternalTerminal { private bool _Shown = false; - private Font f_extterminal = new Font("Consolas", 18f, FontStyle.Regular); + private Font f_extterminal = new("Consolas", 18f, FontStyle.Regular); public ExternalTerminal() { @@ -232,16 +232,16 @@ public void GetFromExtTerminal(string RegKey) { { var temp = Font.FromLogFont(new NativeMethods.GDI32.LogFont() { lfFaceName = y_cmd.ToString(), lfWeight = fw }); - f_extterminal = new Font(temp.FontFamily, ExtTerminal_FontSizeBar.Value, temp.Style); + f_extterminal = new(temp.FontFamily, ExtTerminal_FontSizeBar.Value, temp.Style); } FontName.Text = f_extterminal.Name; - FontName.Font = new Font(f_extterminal.Name, 9f, f_extterminal.Style); + FontName.Font = new(f_extterminal.Name, 9f, f_extterminal.Style); } } else { FontName.Text = "Consolas"; - FontName.Font = new Font("Consolas", 9f, f_extterminal.Style); + FontName.Font = new("Consolas", 9f, f_extterminal.Style); } ExtTerminal_CursorColor.BackColor = Color.FromArgb(255, Color.FromArgb(Conversions.ToInteger(GetReg(@"HKEY_CURRENT_USER\Console\" + RegKey, "CursorColor", _Def.CommandPrompt.W10_1909_CursorColor.Reverse().ToArgb()))).Reverse()); @@ -521,12 +521,12 @@ private void ExtTerminal_FontWeightBox_SelectedIndexChanged(object sender, Event return; NativeMethods.GDI32.LogFont fx = new(); - f_extterminal = new Font(FontName.Font.Name, f_extterminal.Size, f_extterminal.Style); + f_extterminal = new(FontName.Font.Name, f_extterminal.Size, f_extterminal.Style); f_extterminal.ToLogFont(fx); fx.lfWeight = ExtTerminal_FontWeightBox.SelectedIndex * 100; { var temp = Font.FromLogFont(fx); - f_extterminal = new Font(temp.Name, f_extterminal.Size, temp.Style); + f_extterminal = new(temp.Name, f_extterminal.Size, temp.Style); } FontName.Text = f_extterminal.Name; ApplyPreview(); @@ -536,7 +536,7 @@ private void ExtTerminal_FontsBox_SelectedIndexChanged(object sender, EventArgs { if (_Shown) { - f_extterminal = new Font(FontName.Font.Name, f_extterminal.Size, f_extterminal.Style); + f_extterminal = new(FontName.Font.Name, f_extterminal.Size, f_extterminal.Style); ApplyPreview(); } @@ -547,7 +547,7 @@ private void ExtTerminal_FontSizeBar_Scroll(object sender) ExtTerminal_FontSizeVal.Text = ExtTerminal_FontSizeBar.Value.ToString(); if (_Shown) { - f_extterminal = new Font(f_extterminal.Name, ExtTerminal_FontSizeBar.Value, f_extterminal.Style); + f_extterminal = new(f_extterminal.Name, ExtTerminal_FontSizeBar.Value, f_extterminal.Style); ApplyPreview(); } } @@ -576,9 +576,9 @@ private void ExtTerminal_CursorColor_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender, ExtTerminal_PreviewCUR2 }; + List CList = new() { (Control)sender, ExtTerminal_PreviewCUR2 }; - var C = Forms.ColorPickerDlg.Pick(CList); + Color C = Forms.ColorPickerDlg.Pick(CList); ((UI.Controllers.ColorItem)sender).BackColor = C; ((UI.Controllers.ColorItem)sender).Invalidate(); @@ -640,44 +640,44 @@ private void ColorTable00_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender, CMD4 }; + List CList = new() { (Control)sender, CMD4 }; - var _Conditions = new Conditions(); + Conditions _conditions = new(); if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable00".ToLower())) - _Conditions.CMD_ColorTable00 = true; + _conditions.CMD_ColorTable00 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable01".ToLower())) - _Conditions.CMD_ColorTable01 = true; + _conditions.CMD_ColorTable01 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable02".ToLower())) - _Conditions.CMD_ColorTable02 = true; + _conditions.CMD_ColorTable02 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable03".ToLower())) - _Conditions.CMD_ColorTable03 = true; + _conditions.CMD_ColorTable03 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable04".ToLower())) - _Conditions.CMD_ColorTable04 = true; + _conditions.CMD_ColorTable04 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable05".ToLower())) - _Conditions.CMD_ColorTable05 = true; + _conditions.CMD_ColorTable05 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable06".ToLower())) - _Conditions.CMD_ColorTable06 = true; + _conditions.CMD_ColorTable06 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable07".ToLower())) - _Conditions.CMD_ColorTable07 = true; + _conditions.CMD_ColorTable07 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable08".ToLower())) - _Conditions.CMD_ColorTable08 = true; + _conditions.CMD_ColorTable08 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable09".ToLower())) - _Conditions.CMD_ColorTable09 = true; + _conditions.CMD_ColorTable09 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable10".ToLower())) - _Conditions.CMD_ColorTable10 = true; + _conditions.CMD_ColorTable10 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable11".ToLower())) - _Conditions.CMD_ColorTable11 = true; + _conditions.CMD_ColorTable11 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable12".ToLower())) - _Conditions.CMD_ColorTable12 = true; + _conditions.CMD_ColorTable12 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable13".ToLower())) - _Conditions.CMD_ColorTable13 = true; + _conditions.CMD_ColorTable13 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable14".ToLower())) - _Conditions.CMD_ColorTable14 = true; + _conditions.CMD_ColorTable14 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable15".ToLower())) - _Conditions.CMD_ColorTable15 = true; + _conditions.CMD_ColorTable15 = true; - var C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions); ((UI.Controllers.ColorItem)sender).BackColor = C; ((UI.Controllers.ColorItem)sender).Invalidate(); @@ -696,7 +696,7 @@ public void ApplyCursorShape() { ExtTerminal_PreviewCursorInner.Dock = DockStyle.Fill; - ExtTerminal_PreviewCUR2.Padding = new Padding(1, 1, 1, 1); + ExtTerminal_PreviewCUR2.Padding = new(1, 1, 1, 1); if (ExtTerminal_CursorStyle.SelectedIndex == 0) { @@ -754,7 +754,7 @@ public void ApplyCursorShape() if (ExtTerminal_CursorStyle.SelectedIndex == 5) { ExtTerminal_PreviewCursorInner.Dock = DockStyle.None; - ExtTerminal_PreviewCUR2.Padding = new Padding(0, 0, 0, 0); + ExtTerminal_PreviewCUR2.Padding = new(0, 0, 0, 0); ExtTerminal_PreviewCursorInner.Width = ExtTerminal_PreviewCUR2.Width; ExtTerminal_PreviewCursorInner.Height = 1; ExtTerminal_PreviewCursorInner.BackColor = ExtTerminal_PreviewCUR.BackColor; @@ -797,7 +797,7 @@ public void ApplyPreview() CMD4.CMD_PopupBackground = ExtTerminal_PopupBackgroundBar.Value; CMD4.CMD_ScreenColorsForeground = ExtTerminal_AccentForegroundBar.Value; CMD4.CMD_ScreenColorsBackground = ExtTerminal_AccentBackgroundBar.Value; - CMD4.Font = new Font(f_extterminal.Name, f_extterminal.Size, f_extterminal.Style); + CMD4.Font = new(f_extterminal.Name, f_extterminal.Size, f_extterminal.Style); CMD4.Raster = ExtTerminal_RasterToggle.Checked; switch (RasterList.SelectedItem) @@ -1269,7 +1269,7 @@ public void UpdateFromTrack(int i) ExtTerminal_AccentForegroundBar.Invalidate(); FontName.Text = f_extterminal.Name; - FontName.Font = new Font(f_extterminal.Name, 9f, f_extterminal.Style); + FontName.Font = new(f_extterminal.Name, 9f, f_extterminal.Style); } } #endregion @@ -1328,8 +1328,8 @@ public void ApplyFromTM(Theme.Manager TM) ExtTerminal_ColorTable14.BackColor = TM.CommandPrompt.ColorTable14; ExtTerminal_ColorTable15.BackColor = TM.CommandPrompt.ColorTable15; - ExtTerminal_ColorTable05.DefaultColor = Color.FromArgb(136, 23, 152); - ExtTerminal_ColorTable06.DefaultColor = Color.FromArgb(193, 156, 0); + ExtTerminal_ColorTable05.DefaultBackColor = Color.FromArgb(136, 23, 152); + ExtTerminal_ColorTable06.DefaultBackColor = Color.FromArgb(193, 156, 0); ExtTerminal_PopupForegroundBar.Value = TM.CommandPrompt.PopupForeground; ExtTerminal_PopupBackgroundBar.Value = TM.CommandPrompt.PopupBackground; @@ -1412,12 +1412,12 @@ public void ApplyFromTM(Theme.Manager TM) { { var temp = Font.FromLogFont(new NativeMethods.GDI32.LogFont() { lfFaceName = TM.CommandPrompt.FaceName, lfWeight = TM.CommandPrompt.FontWeight }); - f_extterminal = new Font(temp.FontFamily, (int)Math.Round(TM.CommandPrompt.FontSize / 65536d), temp.Style); + f_extterminal = new(temp.FontFamily, (int)Math.Round(TM.CommandPrompt.FontSize / 65536d), temp.Style); } } FontName.Text = f_extterminal.Name; - FontName.Font = new Font(f_extterminal.Name, f_extterminal.Size, f_extterminal.Style); + FontName.Font = new(f_extterminal.Name, f_extterminal.Size, f_extterminal.Style); ExtTerminal_FontSizeBar.Value = (int)Math.Round(f_extterminal.Size); ExtTerminal_FontSizeVal.Text = f_extterminal.Size.ToString(); @@ -1471,7 +1471,7 @@ private void Button8_Click(object sender, EventArgs e) if (OpenWPTHDlg.ShowDialog() == DialogResult.OK) { - var TMx = new Theme.Manager(Theme.Manager.Source.File, OpenWPTHDlg.FileName); + Theme.Manager TMx = new(Theme.Manager.Source.File, OpenWPTHDlg.FileName); ApplyFromTM(TMx); ApplyPreview(); TMx.Dispose(); @@ -1486,7 +1486,7 @@ private void Button3_Click(object sender, EventArgs e) return; } - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyFromTM(TMx); ApplyPreview(); TMx.Dispose(); @@ -1542,9 +1542,9 @@ private void Button5_Click(object sender, EventArgs e) fx.lfWeight = ExtTerminal_FontWeightBox.SelectedIndex * 100; { var temp = Font.FromLogFont(fx); - f_extterminal = new Font(temp.Name, f_extterminal.Size, temp.Style); + f_extterminal = new(temp.Name, f_extterminal.Size, temp.Style); } - FontName.Font = new Font(FontDialog1.Font.Name, 9f, f_extterminal.Style); + FontName.Font = new(FontDialog1.Font.Name, 9f, f_extterminal.Style); } } diff --git a/WinPaletter/Terminals/TerminalInfo.Designer.cs b/WinPaletter/Terminals/TerminalInfo.Designer.cs index b4ab5e38..d3a8a7c1 100644 --- a/WinPaletter/Terminals/TerminalInfo.Designer.cs +++ b/WinPaletter/Terminals/TerminalInfo.Designer.cs @@ -224,7 +224,7 @@ private void InitializeComponent() // this.TerTabColor.AllowDrop = true; this.TerTabColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); - this.TerTabColor.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); + this.TerTabColor.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); this.TerTabColor.DontShowInfo = false; this.TerTabColor.Location = new System.Drawing.Point(120, 101); this.TerTabColor.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); diff --git a/WinPaletter/Terminals/TerminalInfo.cs b/WinPaletter/Terminals/TerminalInfo.cs index 5fd1dc9f..8a9b14ec 100644 --- a/WinPaletter/Terminals/TerminalInfo.cs +++ b/WinPaletter/Terminals/TerminalInfo.cs @@ -1,12 +1,13 @@ using System; using System.Collections.Generic; +using System.Drawing; using System.Windows.Forms; namespace WinPaletter { public partial class TerminalInfo { - public TProfile Profile = new TProfile(); + public TProfile Profile = new(); public TerminalInfo() { @@ -103,11 +104,11 @@ private void TerTabColor_Click(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender, Forms.WindowsTerminal.Terminal1 }; + List CList = new() { (Control)sender, Forms.WindowsTerminal.Terminal1 }; - var _Conditions = new Conditions() { Terminal_TabColor = true }; + Conditions _conditions = new(){ Terminal_TabColor = true }; - var C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions); Forms.WindowsTerminal.ApplyPreview(Forms.WindowsTerminal._Terminal); @@ -116,7 +117,5 @@ private void TerTabColor_Click(object sender, EventArgs e) CList.Clear(); } - - } } \ No newline at end of file diff --git a/WinPaletter/Terminals/TerminalsDashboard.cs b/WinPaletter/Terminals/TerminalsDashboard.cs index 9ad32556..292e1995 100644 --- a/WinPaletter/Terminals/TerminalsDashboard.cs +++ b/WinPaletter/Terminals/TerminalsDashboard.cs @@ -15,11 +15,11 @@ protected override CreateParams CreateParams { get { - var cp = base.CreateParams; + CreateParams cp = base.CreateParams; if (!DWMAPI.IsCompositionEnabled()) { - cp.ClassStyle = cp.ClassStyle | DWMAPI.CS_DROPSHADOW; - cp.ExStyle = cp.ExStyle | 33554432; + cp.ClassStyle |= DWMAPI.CS_DROPSHADOW; + cp.ExStyle |= 33554432; return cp; } else diff --git a/WinPaletter/Terminals/WindowsTerminal.Designer.cs b/WinPaletter/Terminals/WindowsTerminal.Designer.cs index c2ee141a..f157e0ff 100644 --- a/WinPaletter/Terminals/WindowsTerminal.Designer.cs +++ b/WinPaletter/Terminals/WindowsTerminal.Designer.cs @@ -504,7 +504,7 @@ private void InitializeComponent() this.TerTitlebarActive.AllowDrop = true; this.TerTitlebarActive.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerTitlebarActive.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); - this.TerTitlebarActive.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); + this.TerTitlebarActive.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); this.TerTitlebarActive.DontShowInfo = false; this.TerTitlebarActive.Location = new System.Drawing.Point(242, 3); this.TerTitlebarActive.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -519,7 +519,7 @@ private void InitializeComponent() this.TerTitlebarInactive.AllowDrop = true; this.TerTitlebarInactive.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerTitlebarInactive.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); - this.TerTitlebarInactive.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); + this.TerTitlebarInactive.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); this.TerTitlebarInactive.DontShowInfo = false; this.TerTitlebarInactive.Location = new System.Drawing.Point(242, 33); this.TerTitlebarInactive.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -557,7 +557,7 @@ private void InitializeComponent() this.TerTabActive.AllowDrop = true; this.TerTabActive.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerTabActive.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); - this.TerTabActive.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); + this.TerTabActive.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); this.TerTabActive.DontShowInfo = false; this.TerTabActive.Location = new System.Drawing.Point(242, 63); this.TerTabActive.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -572,7 +572,7 @@ private void InitializeComponent() this.TerTabInactive.AllowDrop = true; this.TerTabInactive.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerTabInactive.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); - this.TerTabInactive.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); + this.TerTabInactive.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); this.TerTabInactive.DontShowInfo = false; this.TerTabInactive.Location = new System.Drawing.Point(242, 93); this.TerTabInactive.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1019,7 +1019,7 @@ private void InitializeComponent() this.TerCursor.AllowDrop = true; this.TerCursor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerCursor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); - this.TerCursor.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); + this.TerCursor.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); this.TerCursor.DontShowInfo = false; this.TerCursor.Location = new System.Drawing.Point(245, 153); this.TerCursor.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1034,7 +1034,7 @@ private void InitializeComponent() this.TerWhiteB.AllowDrop = true; this.TerWhiteB.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerWhiteB.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); - this.TerWhiteB.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.TerWhiteB.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); this.TerWhiteB.DontShowInfo = false; this.TerWhiteB.Location = new System.Drawing.Point(245, 401); this.TerWhiteB.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1062,7 +1062,7 @@ private void InitializeComponent() this.TerBlue.AllowDrop = true; this.TerBlue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerBlue.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(55)))), ((int)(((byte)(218))))); - this.TerBlue.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(55)))), ((int)(((byte)(218))))); + this.TerBlue.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(55)))), ((int)(((byte)(218))))); this.TerBlue.DontShowInfo = false; this.TerBlue.Location = new System.Drawing.Point(140, 222); this.TerBlue.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1090,7 +1090,7 @@ private void InitializeComponent() this.TerSelection.AllowDrop = true; this.TerSelection.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerSelection.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); - this.TerSelection.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); + this.TerSelection.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); this.TerSelection.DontShowInfo = false; this.TerSelection.Location = new System.Drawing.Point(245, 123); this.TerSelection.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1131,7 +1131,7 @@ private void InitializeComponent() this.TerWhite.AllowDrop = true; this.TerWhite.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerWhite.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.TerWhite.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); + this.TerWhite.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); this.TerWhite.DontShowInfo = false; this.TerWhite.Location = new System.Drawing.Point(140, 401); this.TerWhite.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1146,7 +1146,7 @@ private void InitializeComponent() this.TerForeground.AllowDrop = true; this.TerForeground.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerForeground.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); - this.TerForeground.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); + this.TerForeground.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); this.TerForeground.DontShowInfo = false; this.TerForeground.Location = new System.Drawing.Point(245, 93); this.TerForeground.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1161,7 +1161,7 @@ private void InitializeComponent() this.TerCyanB.AllowDrop = true; this.TerCyanB.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerCyanB.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(97)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); - this.TerCyanB.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(97)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); + this.TerCyanB.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(97)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); this.TerCyanB.DontShowInfo = false; this.TerCyanB.Location = new System.Drawing.Point(245, 251); this.TerCyanB.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1189,7 +1189,7 @@ private void InitializeComponent() this.TerCyan.AllowDrop = true; this.TerCyan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerCyan.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(150)))), ((int)(((byte)(221))))); - this.TerCyan.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(150)))), ((int)(((byte)(221))))); + this.TerCyan.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(150)))), ((int)(((byte)(221))))); this.TerCyan.DontShowInfo = false; this.TerCyan.Location = new System.Drawing.Point(140, 251); this.TerCyan.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1204,7 +1204,7 @@ private void InitializeComponent() this.TerGreen.AllowDrop = true; this.TerGreen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerGreen.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(161)))), ((int)(((byte)(14))))); - this.TerGreen.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(161)))), ((int)(((byte)(14))))); + this.TerGreen.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(161)))), ((int)(((byte)(14))))); this.TerGreen.DontShowInfo = false; this.TerGreen.Location = new System.Drawing.Point(140, 281); this.TerGreen.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1232,7 +1232,7 @@ private void InitializeComponent() this.TerBackground.AllowDrop = true; this.TerBackground.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerBackground.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); - this.TerBackground.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); + this.TerBackground.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); this.TerBackground.DontShowInfo = false; this.TerBackground.Location = new System.Drawing.Point(245, 63); this.TerBackground.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1247,7 +1247,7 @@ private void InitializeComponent() this.TerYellow.AllowDrop = true; this.TerYellow.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerYellow.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(193)))), ((int)(((byte)(156)))), ((int)(((byte)(0))))); - this.TerYellow.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(193)))), ((int)(((byte)(156)))), ((int)(((byte)(0))))); + this.TerYellow.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(193)))), ((int)(((byte)(156)))), ((int)(((byte)(0))))); this.TerYellow.DontShowInfo = false; this.TerYellow.Location = new System.Drawing.Point(140, 371); this.TerYellow.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1262,7 +1262,7 @@ private void InitializeComponent() this.TerGreenB.AllowDrop = true; this.TerGreenB.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerGreenB.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(198)))), ((int)(((byte)(12))))); - this.TerGreenB.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(198)))), ((int)(((byte)(12))))); + this.TerGreenB.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(198)))), ((int)(((byte)(12))))); this.TerGreenB.DontShowInfo = false; this.TerGreenB.Location = new System.Drawing.Point(245, 281); this.TerGreenB.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1303,7 +1303,7 @@ private void InitializeComponent() this.TerBlack.AllowDrop = true; this.TerBlack.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerBlack.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); - this.TerBlack.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); + this.TerBlack.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(12)))), ((int)(((byte)(12)))), ((int)(((byte)(12))))); this.TerBlack.DontShowInfo = false; this.TerBlack.Location = new System.Drawing.Point(140, 191); this.TerBlack.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1318,7 +1318,7 @@ private void InitializeComponent() this.TerYellowB.AllowDrop = true; this.TerYellowB.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerYellowB.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(241)))), ((int)(((byte)(165))))); - this.TerYellowB.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(241)))), ((int)(((byte)(165))))); + this.TerYellowB.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(241)))), ((int)(((byte)(165))))); this.TerYellowB.DontShowInfo = false; this.TerYellowB.Location = new System.Drawing.Point(245, 371); this.TerYellowB.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1346,7 +1346,7 @@ private void InitializeComponent() this.TerBlackB.AllowDrop = true; this.TerBlackB.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerBlackB.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(118)))), ((int)(((byte)(118)))), ((int)(((byte)(118))))); - this.TerBlackB.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(118)))), ((int)(((byte)(118)))), ((int)(((byte)(118))))); + this.TerBlackB.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(118)))), ((int)(((byte)(118)))), ((int)(((byte)(118))))); this.TerBlackB.DontShowInfo = false; this.TerBlackB.Location = new System.Drawing.Point(245, 191); this.TerBlackB.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1361,7 +1361,7 @@ private void InitializeComponent() this.TerPurple.AllowDrop = true; this.TerPurple.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerPurple.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(23)))), ((int)(((byte)(152))))); - this.TerPurple.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(23)))), ((int)(((byte)(152))))); + this.TerPurple.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(23)))), ((int)(((byte)(152))))); this.TerPurple.DontShowInfo = false; this.TerPurple.Location = new System.Drawing.Point(140, 341); this.TerPurple.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1389,7 +1389,7 @@ private void InitializeComponent() this.TerPurpleB.AllowDrop = true; this.TerPurpleB.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerPurpleB.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(0)))), ((int)(((byte)(158))))); - this.TerPurpleB.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(0)))), ((int)(((byte)(158))))); + this.TerPurpleB.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(0)))), ((int)(((byte)(158))))); this.TerPurpleB.DontShowInfo = false; this.TerPurpleB.Location = new System.Drawing.Point(245, 341); this.TerPurpleB.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1404,7 +1404,7 @@ private void InitializeComponent() this.TerBlueB.AllowDrop = true; this.TerBlueB.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerBlueB.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(120)))), ((int)(((byte)(255))))); - this.TerBlueB.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(120)))), ((int)(((byte)(255))))); + this.TerBlueB.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(120)))), ((int)(((byte)(255))))); this.TerBlueB.DontShowInfo = false; this.TerBlueB.Location = new System.Drawing.Point(245, 222); this.TerBlueB.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1445,7 +1445,7 @@ private void InitializeComponent() this.TerRedB.AllowDrop = true; this.TerRedB.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerRedB.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(72)))), ((int)(((byte)(86))))); - this.TerRedB.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(72)))), ((int)(((byte)(86))))); + this.TerRedB.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(72)))), ((int)(((byte)(86))))); this.TerRedB.DontShowInfo = false; this.TerRedB.Location = new System.Drawing.Point(245, 311); this.TerRedB.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1460,7 +1460,7 @@ private void InitializeComponent() this.TerRed.AllowDrop = true; this.TerRed.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TerRed.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(15)))), ((int)(((byte)(31))))); - this.TerRed.DefaultColor = System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(15)))), ((int)(((byte)(31))))); + this.TerRed.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(15)))), ((int)(((byte)(31))))); this.TerRed.DontShowInfo = false; this.TerRed.Location = new System.Drawing.Point(140, 311); this.TerRed.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); diff --git a/WinPaletter/Terminals/WindowsTerminal.cs b/WinPaletter/Terminals/WindowsTerminal.cs index 3c988fa2..b1c24943 100644 --- a/WinPaletter/Terminals/WindowsTerminal.cs +++ b/WinPaletter/Terminals/WindowsTerminal.cs @@ -278,251 +278,251 @@ public void SetDefaultsToScheme(string Scheme) case var @case when @case == ("Campbell".ToLower() ?? string.Empty): { - TerBackground.DefaultColor = "FF0C0C0C".FromHEXToColor(true); - TerBlack.DefaultColor = "FF0C0C0C".FromHEXToColor(true); - TerBlue.DefaultColor = "FF0037DA".FromHEXToColor(true); - TerBlackB.DefaultColor = "FF767676".FromHEXToColor(true); - TerBlueB.DefaultColor = "FF3B78FF".FromHEXToColor(true); - TerCyanB.DefaultColor = "FF61D6D6".FromHEXToColor(true); - TerGreenB.DefaultColor = "FF16C60C".FromHEXToColor(true); - TerPurpleB.DefaultColor = "FFB4009E".FromHEXToColor(true); - TerRedB.DefaultColor = "FFE74856".FromHEXToColor(true); - TerWhiteB.DefaultColor = "FFF2F2F2".FromHEXToColor(true); - TerYellowB.DefaultColor = "FFF9F1A5".FromHEXToColor(true); - TerCursor.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerCyan.DefaultColor = "FF3A96DD".FromHEXToColor(true); - TerForeground.DefaultColor = "FFCCCCCC".FromHEXToColor(true); - TerGreen.DefaultColor = "FF13A10E".FromHEXToColor(true); - TerPurple.DefaultColor = "FF881798".FromHEXToColor(true); - TerRed.DefaultColor = "FFC50F1F".FromHEXToColor(true); - TerSelection.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerWhite.DefaultColor = "FFCCCCCC".FromHEXToColor(true); - TerYellow.DefaultColor = "FFC19C00".FromHEXToColor(true); + TerBackground.DefaultBackColor = "FF0C0C0C".FromHEXToColor(true); + TerBlack.DefaultBackColor = "FF0C0C0C".FromHEXToColor(true); + TerBlue.DefaultBackColor = "FF0037DA".FromHEXToColor(true); + TerBlackB.DefaultBackColor = "FF767676".FromHEXToColor(true); + TerBlueB.DefaultBackColor = "FF3B78FF".FromHEXToColor(true); + TerCyanB.DefaultBackColor = "FF61D6D6".FromHEXToColor(true); + TerGreenB.DefaultBackColor = "FF16C60C".FromHEXToColor(true); + TerPurpleB.DefaultBackColor = "FFB4009E".FromHEXToColor(true); + TerRedB.DefaultBackColor = "FFE74856".FromHEXToColor(true); + TerWhiteB.DefaultBackColor = "FFF2F2F2".FromHEXToColor(true); + TerYellowB.DefaultBackColor = "FFF9F1A5".FromHEXToColor(true); + TerCursor.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerCyan.DefaultBackColor = "FF3A96DD".FromHEXToColor(true); + TerForeground.DefaultBackColor = "FFCCCCCC".FromHEXToColor(true); + TerGreen.DefaultBackColor = "FF13A10E".FromHEXToColor(true); + TerPurple.DefaultBackColor = "FF881798".FromHEXToColor(true); + TerRed.DefaultBackColor = "FFC50F1F".FromHEXToColor(true); + TerSelection.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerWhite.DefaultBackColor = "FFCCCCCC".FromHEXToColor(true); + TerYellow.DefaultBackColor = "FFC19C00".FromHEXToColor(true); break; } case var case1 when case1 == ("Campbell Powershell".ToLower() ?? string.Empty): { - TerBackground.DefaultColor = "FF012456".FromHEXToColor(true); - TerBlack.DefaultColor = "FF0C0C0C".FromHEXToColor(true); - TerBlue.DefaultColor = "FF0037DA".FromHEXToColor(true); - TerBlackB.DefaultColor = "FF767676".FromHEXToColor(true); - TerBlueB.DefaultColor = "FF3B78FF".FromHEXToColor(true); - TerCyanB.DefaultColor = "FF61D6D6".FromHEXToColor(true); - TerGreenB.DefaultColor = "FF16C60C".FromHEXToColor(true); - TerPurpleB.DefaultColor = "FFB4009E".FromHEXToColor(true); - TerRedB.DefaultColor = "FFE74856".FromHEXToColor(true); - TerWhiteB.DefaultColor = "FFF2F2F2".FromHEXToColor(true); - TerYellowB.DefaultColor = "FFF9F1A5".FromHEXToColor(true); - TerCursor.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerCyan.DefaultColor = "FF3A96DD".FromHEXToColor(true); - TerForeground.DefaultColor = "FFCCCCCC".FromHEXToColor(true); - TerGreen.DefaultColor = "FF13A10E".FromHEXToColor(true); - TerPurple.DefaultColor = "FF881798".FromHEXToColor(true); - TerRed.DefaultColor = "FFC50F1F".FromHEXToColor(true); - TerSelection.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerWhite.DefaultColor = "FFCCCCCC".FromHEXToColor(true); - TerYellow.DefaultColor = "FFC19C00".FromHEXToColor(true); + TerBackground.DefaultBackColor = "FF012456".FromHEXToColor(true); + TerBlack.DefaultBackColor = "FF0C0C0C".FromHEXToColor(true); + TerBlue.DefaultBackColor = "FF0037DA".FromHEXToColor(true); + TerBlackB.DefaultBackColor = "FF767676".FromHEXToColor(true); + TerBlueB.DefaultBackColor = "FF3B78FF".FromHEXToColor(true); + TerCyanB.DefaultBackColor = "FF61D6D6".FromHEXToColor(true); + TerGreenB.DefaultBackColor = "FF16C60C".FromHEXToColor(true); + TerPurpleB.DefaultBackColor = "FFB4009E".FromHEXToColor(true); + TerRedB.DefaultBackColor = "FFE74856".FromHEXToColor(true); + TerWhiteB.DefaultBackColor = "FFF2F2F2".FromHEXToColor(true); + TerYellowB.DefaultBackColor = "FFF9F1A5".FromHEXToColor(true); + TerCursor.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerCyan.DefaultBackColor = "FF3A96DD".FromHEXToColor(true); + TerForeground.DefaultBackColor = "FFCCCCCC".FromHEXToColor(true); + TerGreen.DefaultBackColor = "FF13A10E".FromHEXToColor(true); + TerPurple.DefaultBackColor = "FF881798".FromHEXToColor(true); + TerRed.DefaultBackColor = "FFC50F1F".FromHEXToColor(true); + TerSelection.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerWhite.DefaultBackColor = "FFCCCCCC".FromHEXToColor(true); + TerYellow.DefaultBackColor = "FFC19C00".FromHEXToColor(true); break; } case var case2 when case2 == ("One Half Dark".ToLower() ?? string.Empty): { - TerBackground.DefaultColor = "FF282C34".FromHEXToColor(true); - TerBlack.DefaultColor = "FF282C34".FromHEXToColor(true); - TerBlue.DefaultColor = "FF61AFEF".FromHEXToColor(true); - TerBlackB.DefaultColor = "FF5A6374".FromHEXToColor(true); - TerBlueB.DefaultColor = "FF61AFEF".FromHEXToColor(true); - TerCyanB.DefaultColor = "FF56B6C2".FromHEXToColor(true); - TerGreenB.DefaultColor = "FF98C379".FromHEXToColor(true); - TerPurpleB.DefaultColor = "FFC678DD".FromHEXToColor(true); - TerRedB.DefaultColor = "FFE06C75".FromHEXToColor(true); - TerWhiteB.DefaultColor = "FFDCDFE4".FromHEXToColor(true); - TerYellowB.DefaultColor = "FFE5C07B".FromHEXToColor(true); - TerCursor.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerCyan.DefaultColor = "FF56B6C2".FromHEXToColor(true); - TerForeground.DefaultColor = "FFDCDFE4".FromHEXToColor(true); - TerGreen.DefaultColor = "FF98C379".FromHEXToColor(true); - TerPurple.DefaultColor = "FFC678DD".FromHEXToColor(true); - TerRed.DefaultColor = "FFE06C75".FromHEXToColor(true); - TerSelection.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerWhite.DefaultColor = "FFDCDFE4".FromHEXToColor(true); - TerYellow.DefaultColor = "FFE5C07B".FromHEXToColor(true); + TerBackground.DefaultBackColor = "FF282C34".FromHEXToColor(true); + TerBlack.DefaultBackColor = "FF282C34".FromHEXToColor(true); + TerBlue.DefaultBackColor = "FF61AFEF".FromHEXToColor(true); + TerBlackB.DefaultBackColor = "FF5A6374".FromHEXToColor(true); + TerBlueB.DefaultBackColor = "FF61AFEF".FromHEXToColor(true); + TerCyanB.DefaultBackColor = "FF56B6C2".FromHEXToColor(true); + TerGreenB.DefaultBackColor = "FF98C379".FromHEXToColor(true); + TerPurpleB.DefaultBackColor = "FFC678DD".FromHEXToColor(true); + TerRedB.DefaultBackColor = "FFE06C75".FromHEXToColor(true); + TerWhiteB.DefaultBackColor = "FFDCDFE4".FromHEXToColor(true); + TerYellowB.DefaultBackColor = "FFE5C07B".FromHEXToColor(true); + TerCursor.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerCyan.DefaultBackColor = "FF56B6C2".FromHEXToColor(true); + TerForeground.DefaultBackColor = "FFDCDFE4".FromHEXToColor(true); + TerGreen.DefaultBackColor = "FF98C379".FromHEXToColor(true); + TerPurple.DefaultBackColor = "FFC678DD".FromHEXToColor(true); + TerRed.DefaultBackColor = "FFE06C75".FromHEXToColor(true); + TerSelection.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerWhite.DefaultBackColor = "FFDCDFE4".FromHEXToColor(true); + TerYellow.DefaultBackColor = "FFE5C07B".FromHEXToColor(true); break; } case var case3 when case3 == ("One Half Light".ToLower() ?? string.Empty): { - TerBackground.DefaultColor = "FFFAFAFA".FromHEXToColor(true); - TerBlack.DefaultColor = "FF383A42".FromHEXToColor(true); - TerBlue.DefaultColor = "FF0184BC".FromHEXToColor(true); - TerBlackB.DefaultColor = "FF4F525D".FromHEXToColor(true); - TerBlueB.DefaultColor = "FF61AFEF".FromHEXToColor(true); - TerCyanB.DefaultColor = "FF56B5C1".FromHEXToColor(true); - TerGreenB.DefaultColor = "FF98C379".FromHEXToColor(true); - TerPurpleB.DefaultColor = "FFC577DD".FromHEXToColor(true); - TerRedB.DefaultColor = "FFDF6C75".FromHEXToColor(true); - TerWhiteB.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerYellowB.DefaultColor = "FFE4C07A".FromHEXToColor(true); - TerCursor.DefaultColor = "FF4F525D".FromHEXToColor(true); - TerCyan.DefaultColor = "FF0997B3".FromHEXToColor(true); - TerForeground.DefaultColor = "FF383A42".FromHEXToColor(true); - TerGreen.DefaultColor = "FF50A14F".FromHEXToColor(true); - TerPurple.DefaultColor = "FFA626A4".FromHEXToColor(true); - TerRed.DefaultColor = "FFE45649".FromHEXToColor(true); - TerSelection.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerWhite.DefaultColor = "FFFAFAFA".FromHEXToColor(true); - TerYellow.DefaultColor = "FFC18301".FromHEXToColor(true); + TerBackground.DefaultBackColor = "FFFAFAFA".FromHEXToColor(true); + TerBlack.DefaultBackColor = "FF383A42".FromHEXToColor(true); + TerBlue.DefaultBackColor = "FF0184BC".FromHEXToColor(true); + TerBlackB.DefaultBackColor = "FF4F525D".FromHEXToColor(true); + TerBlueB.DefaultBackColor = "FF61AFEF".FromHEXToColor(true); + TerCyanB.DefaultBackColor = "FF56B5C1".FromHEXToColor(true); + TerGreenB.DefaultBackColor = "FF98C379".FromHEXToColor(true); + TerPurpleB.DefaultBackColor = "FFC577DD".FromHEXToColor(true); + TerRedB.DefaultBackColor = "FFDF6C75".FromHEXToColor(true); + TerWhiteB.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerYellowB.DefaultBackColor = "FFE4C07A".FromHEXToColor(true); + TerCursor.DefaultBackColor = "FF4F525D".FromHEXToColor(true); + TerCyan.DefaultBackColor = "FF0997B3".FromHEXToColor(true); + TerForeground.DefaultBackColor = "FF383A42".FromHEXToColor(true); + TerGreen.DefaultBackColor = "FF50A14F".FromHEXToColor(true); + TerPurple.DefaultBackColor = "FFA626A4".FromHEXToColor(true); + TerRed.DefaultBackColor = "FFE45649".FromHEXToColor(true); + TerSelection.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerWhite.DefaultBackColor = "FFFAFAFA".FromHEXToColor(true); + TerYellow.DefaultBackColor = "FFC18301".FromHEXToColor(true); break; } case var case4 when case4 == ("Solarized Dark".ToLower() ?? string.Empty): { - TerBackground.DefaultColor = "FF002B36".FromHEXToColor(true); - TerBlack.DefaultColor = "FF002B36".FromHEXToColor(true); - TerBlue.DefaultColor = "FF268BD2".FromHEXToColor(true); - TerBlackB.DefaultColor = "FF073642".FromHEXToColor(true); - TerBlueB.DefaultColor = "FF839496".FromHEXToColor(true); - TerCyanB.DefaultColor = "FF93A1A1".FromHEXToColor(true); - TerGreenB.DefaultColor = "FF586E75".FromHEXToColor(true); - TerPurpleB.DefaultColor = "FF6C71C4".FromHEXToColor(true); - TerRedB.DefaultColor = "FFCB4B16".FromHEXToColor(true); - TerWhiteB.DefaultColor = "FFFDF6E3".FromHEXToColor(true); - TerYellowB.DefaultColor = "FF657B83".FromHEXToColor(true); - TerCursor.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerCyan.DefaultColor = "FF2AA198".FromHEXToColor(true); - TerForeground.DefaultColor = "FF839496".FromHEXToColor(true); - TerGreen.DefaultColor = "FF859900".FromHEXToColor(true); - TerPurple.DefaultColor = "FFD33682".FromHEXToColor(true); - TerRed.DefaultColor = "FFDC322F".FromHEXToColor(true); - TerSelection.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerWhite.DefaultColor = "FFEEE8D5".FromHEXToColor(true); - TerYellow.DefaultColor = "FFB58900".FromHEXToColor(true); + TerBackground.DefaultBackColor = "FF002B36".FromHEXToColor(true); + TerBlack.DefaultBackColor = "FF002B36".FromHEXToColor(true); + TerBlue.DefaultBackColor = "FF268BD2".FromHEXToColor(true); + TerBlackB.DefaultBackColor = "FF073642".FromHEXToColor(true); + TerBlueB.DefaultBackColor = "FF839496".FromHEXToColor(true); + TerCyanB.DefaultBackColor = "FF93A1A1".FromHEXToColor(true); + TerGreenB.DefaultBackColor = "FF586E75".FromHEXToColor(true); + TerPurpleB.DefaultBackColor = "FF6C71C4".FromHEXToColor(true); + TerRedB.DefaultBackColor = "FFCB4B16".FromHEXToColor(true); + TerWhiteB.DefaultBackColor = "FFFDF6E3".FromHEXToColor(true); + TerYellowB.DefaultBackColor = "FF657B83".FromHEXToColor(true); + TerCursor.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerCyan.DefaultBackColor = "FF2AA198".FromHEXToColor(true); + TerForeground.DefaultBackColor = "FF839496".FromHEXToColor(true); + TerGreen.DefaultBackColor = "FF859900".FromHEXToColor(true); + TerPurple.DefaultBackColor = "FFD33682".FromHEXToColor(true); + TerRed.DefaultBackColor = "FFDC322F".FromHEXToColor(true); + TerSelection.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerWhite.DefaultBackColor = "FFEEE8D5".FromHEXToColor(true); + TerYellow.DefaultBackColor = "FFB58900".FromHEXToColor(true); break; } case var case5 when case5 == ("Solarized Light".ToLower() ?? string.Empty): { - TerBackground.DefaultColor = "FFFDF6E3".FromHEXToColor(true); - TerBlack.DefaultColor = "FF002B36".FromHEXToColor(true); - TerBlue.DefaultColor = "FF268BD2".FromHEXToColor(true); - TerBlackB.DefaultColor = "FF073642".FromHEXToColor(true); - TerBlueB.DefaultColor = "FF839496".FromHEXToColor(true); - TerCyanB.DefaultColor = "FF93A1A1".FromHEXToColor(true); - TerGreenB.DefaultColor = "FF586E75".FromHEXToColor(true); - TerPurpleB.DefaultColor = "FF6C71C4".FromHEXToColor(true); - TerRedB.DefaultColor = "FFCB4B16".FromHEXToColor(true); - TerWhiteB.DefaultColor = "FFFDF6E3".FromHEXToColor(true); - TerYellowB.DefaultColor = "FF657B83".FromHEXToColor(true); - TerCursor.DefaultColor = "FF002B36".FromHEXToColor(true); - TerCyan.DefaultColor = "FF2AA198".FromHEXToColor(true); - TerForeground.DefaultColor = "FF657B83".FromHEXToColor(true); - TerGreen.DefaultColor = "FF859900".FromHEXToColor(true); - TerPurple.DefaultColor = "FFD33682".FromHEXToColor(true); - TerRed.DefaultColor = "FFDC322F".FromHEXToColor(true); - TerSelection.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerWhite.DefaultColor = "FFEEE8D5".FromHEXToColor(true); - TerYellow.DefaultColor = "FFB58900".FromHEXToColor(true); + TerBackground.DefaultBackColor = "FFFDF6E3".FromHEXToColor(true); + TerBlack.DefaultBackColor = "FF002B36".FromHEXToColor(true); + TerBlue.DefaultBackColor = "FF268BD2".FromHEXToColor(true); + TerBlackB.DefaultBackColor = "FF073642".FromHEXToColor(true); + TerBlueB.DefaultBackColor = "FF839496".FromHEXToColor(true); + TerCyanB.DefaultBackColor = "FF93A1A1".FromHEXToColor(true); + TerGreenB.DefaultBackColor = "FF586E75".FromHEXToColor(true); + TerPurpleB.DefaultBackColor = "FF6C71C4".FromHEXToColor(true); + TerRedB.DefaultBackColor = "FFCB4B16".FromHEXToColor(true); + TerWhiteB.DefaultBackColor = "FFFDF6E3".FromHEXToColor(true); + TerYellowB.DefaultBackColor = "FF657B83".FromHEXToColor(true); + TerCursor.DefaultBackColor = "FF002B36".FromHEXToColor(true); + TerCyan.DefaultBackColor = "FF2AA198".FromHEXToColor(true); + TerForeground.DefaultBackColor = "FF657B83".FromHEXToColor(true); + TerGreen.DefaultBackColor = "FF859900".FromHEXToColor(true); + TerPurple.DefaultBackColor = "FFD33682".FromHEXToColor(true); + TerRed.DefaultBackColor = "FFDC322F".FromHEXToColor(true); + TerSelection.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerWhite.DefaultBackColor = "FFEEE8D5".FromHEXToColor(true); + TerYellow.DefaultBackColor = "FFB58900".FromHEXToColor(true); break; } case var case6 when case6 == ("Tango Dark".ToLower() ?? string.Empty): { - TerBackground.DefaultColor = "FF000000".FromHEXToColor(true); - TerBlack.DefaultColor = "FF000000".FromHEXToColor(true); - TerBlue.DefaultColor = "FF3465A4".FromHEXToColor(true); - TerBlackB.DefaultColor = "FF555753".FromHEXToColor(true); - TerBlueB.DefaultColor = "FF729FCF".FromHEXToColor(true); - TerCyanB.DefaultColor = "FF34E2E2".FromHEXToColor(true); - TerGreenB.DefaultColor = "FF8AE234".FromHEXToColor(true); - TerPurpleB.DefaultColor = "FFAD7FA8".FromHEXToColor(true); - TerRedB.DefaultColor = "FFEF2929".FromHEXToColor(true); - TerWhiteB.DefaultColor = "FFEEEEEC".FromHEXToColor(true); - TerYellowB.DefaultColor = "FFFCE94F".FromHEXToColor(true); - TerCursor.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerCyan.DefaultColor = "FF06989A".FromHEXToColor(true); - TerForeground.DefaultColor = "FFD3D7CF".FromHEXToColor(true); - TerGreen.DefaultColor = "FF4E9A06".FromHEXToColor(true); - TerPurple.DefaultColor = "FF75507B".FromHEXToColor(true); - TerRed.DefaultColor = "FFCC0000".FromHEXToColor(true); - TerSelection.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerWhite.DefaultColor = "FFD3D7CF".FromHEXToColor(true); - TerYellow.DefaultColor = "FFC4A000".FromHEXToColor(true); + TerBackground.DefaultBackColor = "FF000000".FromHEXToColor(true); + TerBlack.DefaultBackColor = "FF000000".FromHEXToColor(true); + TerBlue.DefaultBackColor = "FF3465A4".FromHEXToColor(true); + TerBlackB.DefaultBackColor = "FF555753".FromHEXToColor(true); + TerBlueB.DefaultBackColor = "FF729FCF".FromHEXToColor(true); + TerCyanB.DefaultBackColor = "FF34E2E2".FromHEXToColor(true); + TerGreenB.DefaultBackColor = "FF8AE234".FromHEXToColor(true); + TerPurpleB.DefaultBackColor = "FFAD7FA8".FromHEXToColor(true); + TerRedB.DefaultBackColor = "FFEF2929".FromHEXToColor(true); + TerWhiteB.DefaultBackColor = "FFEEEEEC".FromHEXToColor(true); + TerYellowB.DefaultBackColor = "FFFCE94F".FromHEXToColor(true); + TerCursor.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerCyan.DefaultBackColor = "FF06989A".FromHEXToColor(true); + TerForeground.DefaultBackColor = "FFD3D7CF".FromHEXToColor(true); + TerGreen.DefaultBackColor = "FF4E9A06".FromHEXToColor(true); + TerPurple.DefaultBackColor = "FF75507B".FromHEXToColor(true); + TerRed.DefaultBackColor = "FFCC0000".FromHEXToColor(true); + TerSelection.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerWhite.DefaultBackColor = "FFD3D7CF".FromHEXToColor(true); + TerYellow.DefaultBackColor = "FFC4A000".FromHEXToColor(true); break; } case var case7 when case7 == ("Tango Light".ToLower() ?? string.Empty): { - TerBackground.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerBlack.DefaultColor = "FF000000".FromHEXToColor(true); - TerBlue.DefaultColor = "FF3465A4".FromHEXToColor(true); - TerBlackB.DefaultColor = "FF555753".FromHEXToColor(true); - TerBlueB.DefaultColor = "FF729FCF".FromHEXToColor(true); - TerCyanB.DefaultColor = "FF34E2E2".FromHEXToColor(true); - TerGreenB.DefaultColor = "FF8AE234".FromHEXToColor(true); - TerPurpleB.DefaultColor = "FFAD7FA8".FromHEXToColor(true); - TerRedB.DefaultColor = "FFEF2929".FromHEXToColor(true); - TerWhiteB.DefaultColor = "FFEEEEEC".FromHEXToColor(true); - TerYellowB.DefaultColor = "FFFCE94F".FromHEXToColor(true); - TerCursor.DefaultColor = "FF000000".FromHEXToColor(true); - TerCyan.DefaultColor = "FF06989A".FromHEXToColor(true); - TerForeground.DefaultColor = "FF555753".FromHEXToColor(true); - TerGreen.DefaultColor = "FF4E9A06".FromHEXToColor(true); - TerPurple.DefaultColor = "FF75507B".FromHEXToColor(true); - TerRed.DefaultColor = "FFCC0000".FromHEXToColor(true); - TerSelection.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerWhite.DefaultColor = "FFD3D7CF".FromHEXToColor(true); - TerYellow.DefaultColor = "FFC4A000".FromHEXToColor(true); + TerBackground.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerBlack.DefaultBackColor = "FF000000".FromHEXToColor(true); + TerBlue.DefaultBackColor = "FF3465A4".FromHEXToColor(true); + TerBlackB.DefaultBackColor = "FF555753".FromHEXToColor(true); + TerBlueB.DefaultBackColor = "FF729FCF".FromHEXToColor(true); + TerCyanB.DefaultBackColor = "FF34E2E2".FromHEXToColor(true); + TerGreenB.DefaultBackColor = "FF8AE234".FromHEXToColor(true); + TerPurpleB.DefaultBackColor = "FFAD7FA8".FromHEXToColor(true); + TerRedB.DefaultBackColor = "FFEF2929".FromHEXToColor(true); + TerWhiteB.DefaultBackColor = "FFEEEEEC".FromHEXToColor(true); + TerYellowB.DefaultBackColor = "FFFCE94F".FromHEXToColor(true); + TerCursor.DefaultBackColor = "FF000000".FromHEXToColor(true); + TerCyan.DefaultBackColor = "FF06989A".FromHEXToColor(true); + TerForeground.DefaultBackColor = "FF555753".FromHEXToColor(true); + TerGreen.DefaultBackColor = "FF4E9A06".FromHEXToColor(true); + TerPurple.DefaultBackColor = "FF75507B".FromHEXToColor(true); + TerRed.DefaultBackColor = "FFCC0000".FromHEXToColor(true); + TerSelection.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerWhite.DefaultBackColor = "FFD3D7CF".FromHEXToColor(true); + TerYellow.DefaultBackColor = "FFC4A000".FromHEXToColor(true); break; } case var case8 when case8 == ("Vintage".ToLower() ?? string.Empty): { - TerBackground.DefaultColor = "FF000000".FromHEXToColor(true); - TerBlack.DefaultColor = "FF000000".FromHEXToColor(true); - TerBlue.DefaultColor = "FF000080".FromHEXToColor(true); - TerBlackB.DefaultColor = "FF808080".FromHEXToColor(true); - TerBlueB.DefaultColor = "FF0000FF".FromHEXToColor(true); - TerCyanB.DefaultColor = "FF00FFFF".FromHEXToColor(true); - TerGreenB.DefaultColor = "FF00FF00".FromHEXToColor(true); - TerPurpleB.DefaultColor = "FFFF00FF".FromHEXToColor(true); - TerRedB.DefaultColor = "FFFF0000".FromHEXToColor(true); - TerWhiteB.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerYellowB.DefaultColor = "FFFFFF00".FromHEXToColor(true); - TerCursor.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerCyan.DefaultColor = "FF008080".FromHEXToColor(true); - TerForeground.DefaultColor = "FFC0C0C0".FromHEXToColor(true); - TerGreen.DefaultColor = "FF008000".FromHEXToColor(true); - TerPurple.DefaultColor = "FF800080".FromHEXToColor(true); - TerRed.DefaultColor = "FF800000".FromHEXToColor(true); - TerSelection.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerWhite.DefaultColor = "FFC0C0C0".FromHEXToColor(true); - TerYellow.DefaultColor = "FF808000".FromHEXToColor(true); + TerBackground.DefaultBackColor = "FF000000".FromHEXToColor(true); + TerBlack.DefaultBackColor = "FF000000".FromHEXToColor(true); + TerBlue.DefaultBackColor = "FF000080".FromHEXToColor(true); + TerBlackB.DefaultBackColor = "FF808080".FromHEXToColor(true); + TerBlueB.DefaultBackColor = "FF0000FF".FromHEXToColor(true); + TerCyanB.DefaultBackColor = "FF00FFFF".FromHEXToColor(true); + TerGreenB.DefaultBackColor = "FF00FF00".FromHEXToColor(true); + TerPurpleB.DefaultBackColor = "FFFF00FF".FromHEXToColor(true); + TerRedB.DefaultBackColor = "FFFF0000".FromHEXToColor(true); + TerWhiteB.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerYellowB.DefaultBackColor = "FFFFFF00".FromHEXToColor(true); + TerCursor.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerCyan.DefaultBackColor = "FF008080".FromHEXToColor(true); + TerForeground.DefaultBackColor = "FFC0C0C0".FromHEXToColor(true); + TerGreen.DefaultBackColor = "FF008000".FromHEXToColor(true); + TerPurple.DefaultBackColor = "FF800080".FromHEXToColor(true); + TerRed.DefaultBackColor = "FF800000".FromHEXToColor(true); + TerSelection.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerWhite.DefaultBackColor = "FFC0C0C0".FromHEXToColor(true); + TerYellow.DefaultBackColor = "FF808000".FromHEXToColor(true); break; } default: { - TerBackground.DefaultColor = "FF0C0C0C".FromHEXToColor(true); - TerBlack.DefaultColor = "FF0C0C0C".FromHEXToColor(true); - TerBlue.DefaultColor = "FF0037DA".FromHEXToColor(true); - TerBlackB.DefaultColor = "FF767676".FromHEXToColor(true); - TerBlueB.DefaultColor = "FF3B78FF".FromHEXToColor(true); - TerCyanB.DefaultColor = "FF61D6D6".FromHEXToColor(true); - TerGreenB.DefaultColor = "FF16C60C".FromHEXToColor(true); - TerPurpleB.DefaultColor = "FFB4009E".FromHEXToColor(true); - TerRedB.DefaultColor = "FFE74856".FromHEXToColor(true); - TerWhiteB.DefaultColor = "FFF2F2F2".FromHEXToColor(true); - TerYellowB.DefaultColor = "FFF9F1A5".FromHEXToColor(true); - TerCursor.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerCyan.DefaultColor = "FF3A96DD".FromHEXToColor(true); - TerForeground.DefaultColor = "FFCCCCCC".FromHEXToColor(true); - TerGreen.DefaultColor = "FF13A10E".FromHEXToColor(true); - TerPurple.DefaultColor = "FF881798".FromHEXToColor(true); - TerRed.DefaultColor = "FFC50F1F".FromHEXToColor(true); - TerSelection.DefaultColor = "FFFFFFFF".FromHEXToColor(true); - TerWhite.DefaultColor = "FFCCCCCC".FromHEXToColor(true); - TerYellow.DefaultColor = "FFC19C00".FromHEXToColor(true); + TerBackground.DefaultBackColor = "FF0C0C0C".FromHEXToColor(true); + TerBlack.DefaultBackColor = "FF0C0C0C".FromHEXToColor(true); + TerBlue.DefaultBackColor = "FF0037DA".FromHEXToColor(true); + TerBlackB.DefaultBackColor = "FF767676".FromHEXToColor(true); + TerBlueB.DefaultBackColor = "FF3B78FF".FromHEXToColor(true); + TerCyanB.DefaultBackColor = "FF61D6D6".FromHEXToColor(true); + TerGreenB.DefaultBackColor = "FF16C60C".FromHEXToColor(true); + TerPurpleB.DefaultBackColor = "FFB4009E".FromHEXToColor(true); + TerRedB.DefaultBackColor = "FFE74856".FromHEXToColor(true); + TerWhiteB.DefaultBackColor = "FFF2F2F2".FromHEXToColor(true); + TerYellowB.DefaultBackColor = "FFF9F1A5".FromHEXToColor(true); + TerCursor.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerCyan.DefaultBackColor = "FF3A96DD".FromHEXToColor(true); + TerForeground.DefaultBackColor = "FFCCCCCC".FromHEXToColor(true); + TerGreen.DefaultBackColor = "FF13A10E".FromHEXToColor(true); + TerPurple.DefaultBackColor = "FF881798".FromHEXToColor(true); + TerRed.DefaultBackColor = "FFC50F1F".FromHEXToColor(true); + TerSelection.DefaultBackColor = "FFFFFFFF".FromHEXToColor(true); + TerWhite.DefaultBackColor = "FFCCCCCC".FromHEXToColor(true); + TerYellow.DefaultBackColor = "FFC19C00".FromHEXToColor(true); break; } @@ -553,11 +553,11 @@ private void TerProfiles_SelectedIndexChanged(object sender, EventArgs e) TerFontName.Text = temp.Font.Face; NativeMethods.GDI32.LogFont fx = new(); - var f_cmd = new Font(temp.Font.Face, temp.Font.Size); + Font f_cmd = new(temp.Font.Face, temp.Font.Size); f_cmd.ToLogFont(fx); fx.lfWeight = (int)temp.Font.Weight * 100; - f_cmd = new Font(f_cmd.Name, f_cmd.Size, Font.FromLogFont(fx).Style); - TerFontName.Font = new Font(f_cmd.Name, 9f, f_cmd.Style); + f_cmd = new(f_cmd.Name, f_cmd.Size, Font.FromLogFont(fx).Style); + TerFontName.Font = new(f_cmd.Name, 9f, f_cmd.Style); TerFontSizeBar.Value = temp.Font.Size; TerFontWeight.SelectedIndex = (int)temp.Font.Weight; @@ -624,7 +624,7 @@ private void TerFontSizeBar_Scroll(object sender) TerFontSizeVal.Text = ((UI.WP.Trackbar)sender).Value.ToString(); - Terminal1.Font = new Font(Terminal1.Font.Name, TerFontSizeBar.Value, Terminal1.Font.Style); + Terminal1.Font = new(Terminal1.Font.Name, TerFontSizeBar.Value, Terminal1.Font.Style); { var temp = TerProfiles.SelectedIndex == 0 ? _Terminal.DefaultProf : _Terminal.Profiles[TerProfiles.SelectedIndex - 1]; @@ -698,44 +698,44 @@ private void ColorClick(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender, Terminal1 }; + List CList = new() { (Control)sender, Terminal1 }; - var _Conditions = new Conditions(); + Conditions _conditions = new(); if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable00".ToLower())) - _Conditions.CMD_ColorTable00 = true; + _conditions.CMD_ColorTable00 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable01".ToLower())) - _Conditions.CMD_ColorTable01 = true; + _conditions.CMD_ColorTable01 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable02".ToLower())) - _Conditions.CMD_ColorTable02 = true; + _conditions.CMD_ColorTable02 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable03".ToLower())) - _Conditions.CMD_ColorTable03 = true; + _conditions.CMD_ColorTable03 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable04".ToLower())) - _Conditions.CMD_ColorTable04 = true; + _conditions.CMD_ColorTable04 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable05".ToLower())) - _Conditions.CMD_ColorTable05 = true; + _conditions.CMD_ColorTable05 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable06".ToLower())) - _Conditions.CMD_ColorTable06 = true; + _conditions.CMD_ColorTable06 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable07".ToLower())) - _Conditions.CMD_ColorTable07 = true; + _conditions.CMD_ColorTable07 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable08".ToLower())) - _Conditions.CMD_ColorTable08 = true; + _conditions.CMD_ColorTable08 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable09".ToLower())) - _Conditions.CMD_ColorTable09 = true; + _conditions.CMD_ColorTable09 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable10".ToLower())) - _Conditions.CMD_ColorTable10 = true; + _conditions.CMD_ColorTable10 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable11".ToLower())) - _Conditions.CMD_ColorTable11 = true; + _conditions.CMD_ColorTable11 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable12".ToLower())) - _Conditions.CMD_ColorTable12 = true; + _conditions.CMD_ColorTable12 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable13".ToLower())) - _Conditions.CMD_ColorTable13 = true; + _conditions.CMD_ColorTable13 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable14".ToLower())) - _Conditions.CMD_ColorTable14 = true; + _conditions.CMD_ColorTable14 = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains("ColorTable15".ToLower())) - _Conditions.CMD_ColorTable15 = true; + _conditions.CMD_ColorTable15 = true; - var C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions); ((UI.Controllers.ColorItem)sender).BackColor = C; ((UI.Controllers.ColorItem)sender).Invalidate(); @@ -844,30 +844,30 @@ private void ColorMainsClick(object sender, EventArgs e) return; } - var CList = new List() { (Control)sender, Terminal1, Terminal2 }; + List CList = new() { (Control)sender, Terminal1, Terminal2 }; - var _Conditions = new Conditions(); + Conditions _conditions = new(); if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains(TerBackground.Name.ToLower())) - _Conditions.Terminal_Back = true; + _conditions.Terminal_Back = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains(TerForeground.Name.ToLower())) - _Conditions.Terminal_Fore = true; + _conditions.Terminal_Fore = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains(TerSelection.Name.ToLower())) - _Conditions.Terminal_Selection = true; + _conditions.Terminal_Selection = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains(TerCursor.Name.ToLower())) - _Conditions.Terminal_Cursor = true; + _conditions.Terminal_Cursor = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains(TerTabActive.Name.ToLower())) - _Conditions.Terminal_TabActive = true; + _conditions.Terminal_TabActive = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains(TerTabInactive.Name.ToLower())) - _Conditions.Terminal_TabInactive = true; + _conditions.Terminal_TabInactive = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains(TerTitlebarActive.Name.ToLower())) - _Conditions.Terminal_TitlebarActive = true; + _conditions.Terminal_TitlebarActive = true; if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains(TerTitlebarInactive.Name.ToLower())) - _Conditions.Terminal_TitlebarInactive = true; + _conditions.Terminal_TitlebarInactive = true; - var C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Color C = Forms.ColorPickerDlg.Pick(CList, _conditions); if (((UI.Controllers.ColorItem)sender).Name.ToString().ToLower().Contains(TerBackground.Name.ToLower())) { @@ -922,7 +922,7 @@ private void TerFonts_SelectedIndexChanged(object sender, EventArgs e) if (!_Shown) return; - Terminal1.Font = new Font(TerFontName.Font.Name, Terminal1.Font.Size, Terminal1.Font.Style); + Terminal1.Font = new(TerFontName.Font.Name, Terminal1.Font.Size, Terminal1.Font.Style); { var temp = TerProfiles.SelectedIndex == 0 ? _Terminal.DefaultProf : _Terminal.Profiles[TerProfiles.SelectedIndex - 1]; @@ -1033,10 +1033,10 @@ public void ApplyPreview(WinTerminal Terminal) { var temp = TerProfiles.SelectedIndex == 0 ? _Terminal.DefaultProf : _Terminal.Profiles[TerProfiles.SelectedIndex - 1]; NativeMethods.GDI32.LogFont fx = new(); - var f_cmd = new Font(temp.Font.Face, temp.Font.Size); + Font f_cmd = new(temp.Font.Face, temp.Font.Size); f_cmd.ToLogFont(fx); fx.lfWeight = (int)temp.Font.Weight * 100; - f_cmd = new Font(f_cmd.Name, f_cmd.Size, Font.FromLogFont(fx).Style); + f_cmd = new(f_cmd.Name, f_cmd.Size, Font.FromLogFont(fx).Style); Terminal1.Font = f_cmd; TerFontSizeVal.Text = f_cmd.Size.ToString(); } @@ -1060,18 +1060,18 @@ private void Button3_Click(object sender, EventArgs e) private void TerFontWeight_SelectedIndexChanged(object sender, EventArgs e) { NativeMethods.GDI32.LogFont fx = new(); - var f_cmd = new Font(Terminal1.Font.Name, Terminal1.Font.Size, Terminal1.Font.Style); + Font f_cmd = new(Terminal1.Font.Name, Terminal1.Font.Size, Terminal1.Font.Style); f_cmd.ToLogFont(fx); fx.lfWeight = TerFontWeight.SelectedIndex * 100; { - var temp = Font.FromLogFont(fx); - f_cmd = new Font(Terminal1.Font.Name, Terminal1.Font.Size, temp.Style); + Font temp = Font.FromLogFont(fx); + f_cmd = new(Terminal1.Font.Name, Terminal1.Font.Size, temp.Style); } Terminal1.Font = f_cmd; Terminal1.Refresh(); { - var temp1 = TerProfiles.SelectedIndex == 0 ? _Terminal.DefaultProf : _Terminal.Profiles[TerProfiles.SelectedIndex - 1]; + TProfile temp1 = TerProfiles.SelectedIndex == 0 ? _Terminal.DefaultProf : _Terminal.Profiles[TerProfiles.SelectedIndex - 1]; temp1.Font.Weight = (TProfile.FontWeight_Enum)TerFontWeight.SelectedIndex; } @@ -1552,12 +1552,12 @@ private void Button8_Click(object sender, EventArgs e) { if (SaveState == WinTerminal.Version.Stable) { - _Terminal = new WinTerminal(OpenWPTHDlg.FileName, WinTerminal.Mode.WinPaletterFile); + _Terminal = new(OpenWPTHDlg.FileName, WinTerminal.Mode.WinPaletterFile); } else if (SaveState == WinTerminal.Version.Preview) { - _Terminal = new WinTerminal(OpenWPTHDlg.FileName, WinTerminal.Mode.WinPaletterFile, WinTerminal.Version.Preview); + _Terminal = new(OpenWPTHDlg.FileName, WinTerminal.Mode.WinPaletterFile, WinTerminal.Version.Preview); } @@ -1577,13 +1577,13 @@ private void Button7_Click(object sender, EventArgs e) if (_Mode == WinTerminal.Version.Stable) { - _Terminal = new WinTerminal(OpenJSONDlg.FileName, WinTerminal.Mode.JSONFile); + _Terminal = new(OpenJSONDlg.FileName, WinTerminal.Mode.JSONFile); Load_FromTerminal(); } if (_Mode == WinTerminal.Version.Preview) { - _Terminal = new WinTerminal(OpenJSONDlg.FileName, WinTerminal.Mode.JSONFile, WinTerminal.Version.Preview); + _Terminal = new(OpenJSONDlg.FileName, WinTerminal.Mode.JSONFile, WinTerminal.Version.Preview); Load_FromTerminal(); } } @@ -1600,7 +1600,7 @@ private void Button7_Click(object sender, EventArgs e) private void Button17_Click(object sender, EventArgs e) { - var TC = new TColors() + TColors TC = new() { Name = TerSchemes.SelectedItem.ToString() + " Clone #" + TerSchemes.Items.Count, Background = _Terminal.Colors[TerSchemes.SelectedIndex].Background, @@ -1639,7 +1639,7 @@ private void Button18_Click(object sender, EventArgs e) return; } - var P = new TProfile() + TProfile P = new() { Name = _Terminal.Profiles[TerProfiles.SelectedIndex - 1].Name + " " + Program.Lang.Terminal_Clone + " #" + TerProfiles.Items.Count, BackgroundImage = _Terminal.Profiles[TerProfiles.SelectedIndex - 1].BackgroundImage, @@ -1670,7 +1670,7 @@ private void Button19_Click(object sender, EventArgs e) return; } - var Th = new TTheme() + TTheme Th = new() { Name = _Terminal.Themes[TerThemes.SelectedIndex - 3].Name + " " + Program.Lang.Terminal_Clone + " #" + TerThemes.Items.Count, Style = _Terminal.Themes[TerThemes.SelectedIndex - 3].Style, @@ -1750,11 +1750,11 @@ private void Button6_Click(object sender, EventArgs e) TerFontName.Text = CCatFrom.Font.Face; NativeMethods.GDI32.LogFont fx = new(); - var f_cmd = new Font(CCatFrom.Font.Face, CCatFrom.Font.Size); + Font f_cmd = new(CCatFrom.Font.Face, CCatFrom.Font.Size); f_cmd.ToLogFont(fx); fx.lfWeight = (int)CCatFrom.Font.Weight * 100; - f_cmd = new Font(f_cmd.Name, f_cmd.Size, Font.FromLogFont(fx).Style); - TerFontName.Font = new Font(f_cmd.Name, 9f, f_cmd.Style); + f_cmd = new(f_cmd.Name, f_cmd.Size, Font.FromLogFont(fx).Style); + TerFontName.Font = new(f_cmd.Name, 9f, f_cmd.Style); TerFontSizeBar.Value = CCatFrom.Font.Size; TerFontWeight.SelectedIndex = (int)CCatFrom.Font.Weight; @@ -1950,7 +1950,7 @@ private void Button21_Click(object sender, EventArgs e) private void Button22_Click(object sender, EventArgs e) { - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); switch (_Mode) { @@ -2019,9 +2019,9 @@ private void Button23_Click(object sender, EventArgs e) fx.lfWeight = TerFontWeight.SelectedIndex * 100; { var temp = Font.FromLogFont(fx); - Terminal1.Font = new Font(FontDialog1.Font.Name, FontDialog1.Font.Size, temp.Style); + Terminal1.Font = new(FontDialog1.Font.Name, FontDialog1.Font.Size, temp.Style); } - TerFontName.Font = new Font(FontDialog1.Font.Name, 9f, Terminal1.Font.Style); + TerFontName.Font = new(FontDialog1.Font.Name, 9f, Terminal1.Font.Style); TerFontSizeBar.Value = (int)Math.Round(FontDialog1.Font.Size); } diff --git a/WinPaletter/Terminals/WindowsTerminalCopycat.Designer.cs b/WinPaletter/Terminals/WindowsTerminalCopycat.Designer.cs index c6d5b9e8..c449d7d7 100644 --- a/WinPaletter/Terminals/WindowsTerminalCopycat.Designer.cs +++ b/WinPaletter/Terminals/WindowsTerminalCopycat.Designer.cs @@ -50,7 +50,7 @@ private void InitializeComponent() // Label163.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; Label163.BackColor = Color.Transparent; - Label163.Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Label163.Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); Label163.Location = new Point(42, 12); Label163.Name = "Label163"; Label163.Size = new Size(418, 24); @@ -73,7 +73,7 @@ private void InitializeComponent() ComboBox1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; ComboBox1.DrawMode = DrawMode.OwnerDrawVariable; ComboBox1.DropDownStyle = ComboBoxStyle.DropDownList; - ComboBox1.Font = new Font("Segoe UI", 9.0f); + ComboBox1.Font = new("Segoe UI", 9.0f); ComboBox1.ForeColor = Color.White; ComboBox1.FormattingEnabled = true; ComboBox1.ItemHeight = 20; @@ -86,7 +86,7 @@ private void InitializeComponent() // Button2.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; Button2.BackColor = Color.FromArgb(34, 34, 34); - Button2.Font = new Font("Segoe UI", 9.0f); + Button2.Font = new("Segoe UI", 9.0f); Button2.ForeColor = Color.White; Button2.Image = null; Button2.Location = new Point(294, 75); @@ -100,7 +100,7 @@ private void InitializeComponent() // Button1.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; Button1.BackColor = Color.FromArgb(34, 34, 34); - Button1.Font = new Font("Segoe UI", 9.0f); + Button1.Font = new("Segoe UI", 9.0f); Button1.ForeColor = Color.White; Button1.Image = null; Button1.ImageAlign = ContentAlignment.MiddleLeft; @@ -122,10 +122,10 @@ private void InitializeComponent() Controls.Add(ComboBox1); Controls.Add(Label163); Controls.Add(PictureBox33); - Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); ForeColor = Color.White; FormBorderStyle = FormBorderStyle.FixedSingle; - Margin = new Padding(4, 3, 4, 3); + Margin = new(4, 3, 4, 3); MaximizeBox = false; MinimizeBox = false; Name = "WindowsTerminalCopycat"; diff --git a/WinPaletter/Terminals/WindowsTerminalDecide.Designer.cs b/WinPaletter/Terminals/WindowsTerminalDecide.Designer.cs index d9707796..2c728d7b 100644 --- a/WinPaletter/Terminals/WindowsTerminalDecide.Designer.cs +++ b/WinPaletter/Terminals/WindowsTerminalDecide.Designer.cs @@ -66,7 +66,7 @@ private void InitializeComponent() // Label7.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; Label7.BackColor = Color.Transparent; - Label7.Font = new Font("Segoe UI", 9.75f, FontStyle.Bold, GraphicsUnit.Point, 0); + Label7.Font = new("Segoe UI", 9.75f, FontStyle.Bold, GraphicsUnit.Point, 0); Label7.Location = new Point(53, 12); Label7.Name = "Label7"; Label7.Size = new Size(344, 89); @@ -76,7 +76,7 @@ private void InitializeComponent() // Label144 // Label144.BackColor = Color.Transparent; - Label144.Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Label144.Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); Label144.Location = new Point(131, 197); Label144.Name = "Label144"; Label144.Size = new Size(64, 20); @@ -87,7 +87,7 @@ private void InitializeComponent() // Label1 // Label1.BackColor = Color.Transparent; - Label1.Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Label1.Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); Label1.Location = new Point(213, 197); Label1.Name = "Label1"; Label1.Size = new Size(64, 20); @@ -99,7 +99,7 @@ private void InitializeComponent() // Button2.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; Button2.BackColor = Color.FromArgb(14, 51, 75); - Button2.Font = new Font("Segoe UI", 9.0f); + Button2.Font = new("Segoe UI", 9.0f); Button2.ForeColor = Color.White; Button2.Image = null; Button2.Location = new Point(231, 305); @@ -113,7 +113,7 @@ private void InitializeComponent() // Button1.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; Button1.BackColor = Color.FromArgb(14, 51, 75); - Button1.Font = new Font("Segoe UI", 9.0f); + Button1.Font = new("Segoe UI", 9.0f); Button1.ForeColor = Color.White; Button1.Image = null; Button1.ImageAlign = ContentAlignment.MiddleLeft; @@ -127,7 +127,7 @@ private void InitializeComponent() // RadioImage2 // RadioImage2.Checked = false; - RadioImage2.Font = new Font("Segoe UI", 9.0f); + RadioImage2.Font = new("Segoe UI", 9.0f); RadioImage2.ForeColor = Color.White; RadioImage2.Image = (Image)resources.GetObject("RadioImage2.Image"); RadioImage2.Location = new Point(213, 130); @@ -138,7 +138,7 @@ private void InitializeComponent() // RadioImage1 // RadioImage1.Checked = false; - RadioImage1.Font = new Font("Segoe UI", 9.0f); + RadioImage1.Font = new("Segoe UI", 9.0f); RadioImage1.ForeColor = Color.White; RadioImage1.Image = (Image)resources.GetObject("RadioImage1.Image"); RadioImage1.Location = new Point(131, 130); @@ -164,7 +164,7 @@ private void InitializeComponent() AlertBox1.BackColor = Color.FromArgb(70, 51, 2); AlertBox1.CenterText = false; AlertBox1.CustomColor = Color.FromArgb(0, 81, 210); - AlertBox1.Font = new Font("Segoe UI", 9.0f); + AlertBox1.Font = new("Segoe UI", 9.0f); AlertBox1.Image = Properties.Resources.notify_warning; AlertBox1.Location = new Point(12, 248); AlertBox1.Name = "AlertBox1"; @@ -188,11 +188,11 @@ private void InitializeComponent() Controls.Add(RadioImage2); Controls.Add(RadioImage1); Controls.Add(Panel1); - Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); ForeColor = Color.White; FormBorderStyle = FormBorderStyle.FixedSingle; Icon = (Icon)resources.GetObject("$this.Icon"); - Margin = new Padding(4, 3, 4, 3); + Margin = new(4, 3, 4, 3); MaximizeBox = false; MinimizeBox = false; Name = "WindowsTerminalDecide"; diff --git a/WinPaletter/Theme/Default/Windows10.cs b/WinPaletter/Theme/Default/Windows10.cs index da169794..e14e4343 100644 --- a/WinPaletter/Theme/Default/Windows10.cs +++ b/WinPaletter/Theme/Default/Windows10.cs @@ -6,7 +6,7 @@ public static partial class Default { public static Manager Windows10() { - var TM = new Manager(Manager.Source.Empty); + Manager TM = new(Manager.Source.Empty); { ref Structures.Info Info = ref TM.Info; @@ -88,8 +88,8 @@ public static Manager Windows10() WinEffects.SysListView32 = false; } - TM.Terminal = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); - TM.TerminalPreview = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); + TM.Terminal = new(string.Empty, WinTerminal.Mode.Empty); + TM.TerminalPreview = new(string.Empty, WinTerminal.Mode.Empty); TM.Cursor_Enabled = true; TM.Cursor_Shadow = false; diff --git a/WinPaletter/Theme/Default/Windows11.cs b/WinPaletter/Theme/Default/Windows11.cs index 63423464..fbdbc08d 100644 --- a/WinPaletter/Theme/Default/Windows11.cs +++ b/WinPaletter/Theme/Default/Windows11.cs @@ -6,7 +6,7 @@ public static partial class Default { public static Manager Windows11() { - var TM = new Manager(Manager.Source.Empty); + Manager TM = new(Manager.Source.Empty); TM.Windows11.Titlebar_Inactive = Color.FromArgb(32, 32, 32); @@ -90,8 +90,8 @@ public static Manager Windows11() WinEffects.SysListView32 = false; } - TM.Terminal = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); - TM.TerminalPreview = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); + TM.Terminal = new(string.Empty, WinTerminal.Mode.Empty); + TM.TerminalPreview = new(string.Empty, WinTerminal.Mode.Empty); TM.Cursor_Enabled = true; TM.Cursor_Shadow = false; diff --git a/WinPaletter/Theme/Default/Windows12.cs b/WinPaletter/Theme/Default/Windows12.cs index 75c62ab0..dcfe3572 100644 --- a/WinPaletter/Theme/Default/Windows12.cs +++ b/WinPaletter/Theme/Default/Windows12.cs @@ -6,7 +6,7 @@ public static partial class Default { public static Manager Windows12() { - var TM = new Manager(Manager.Source.Empty); + Manager TM = new(Manager.Source.Empty); TM.Windows11.Titlebar_Inactive = Color.FromArgb(32, 32, 32); @@ -90,8 +90,8 @@ public static Manager Windows12() WinEffects.SysListView32 = false; } - TM.Terminal = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); - TM.TerminalPreview = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); + TM.Terminal = new(string.Empty, WinTerminal.Mode.Empty); + TM.TerminalPreview = new(string.Empty, WinTerminal.Mode.Empty); TM.Cursor_Enabled = true; TM.Cursor_Shadow = false; diff --git a/WinPaletter/Theme/Default/Windows7.cs b/WinPaletter/Theme/Default/Windows7.cs index b2726bc2..170d06dd 100644 --- a/WinPaletter/Theme/Default/Windows7.cs +++ b/WinPaletter/Theme/Default/Windows7.cs @@ -6,7 +6,7 @@ public static partial class Default { public static Manager Windows7() { - var TM = new Manager(Manager.Source.Empty); + Manager TM = new(Manager.Source.Empty); { ref Structures.Info Info = ref TM.Info; @@ -122,8 +122,8 @@ public static Manager Windows7() WinEffects.SysListView32 = false; } - TM.Terminal = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); - TM.TerminalPreview = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); + TM.Terminal = new(string.Empty, WinTerminal.Mode.Empty); + TM.TerminalPreview = new(string.Empty, WinTerminal.Mode.Empty); TM.Cursor_Enabled = true; TM.Cursor_Shadow = true; diff --git a/WinPaletter/Theme/Default/Windows81.cs b/WinPaletter/Theme/Default/Windows81.cs index 0e9f26c6..6f24cd97 100644 --- a/WinPaletter/Theme/Default/Windows81.cs +++ b/WinPaletter/Theme/Default/Windows81.cs @@ -6,7 +6,7 @@ public static partial class Default { public static Manager Windows81() { - var TM = new Manager(Manager.Source.Empty); + Manager TM = new(Manager.Source.Empty); { ref Structures.Info Info = ref TM.Info; @@ -109,8 +109,8 @@ public static Manager Windows81() MetricsFonts.SmCaptionWidth = 22; MetricsFonts.DesktopIconSize = 48; MetricsFonts.ShellIconSize = 32; - MetricsFonts.CaptionFont = new Font("Segoe UI", 11.25f, FontStyle.Regular); - MetricsFonts.SmCaptionFont = new Font("Segoe UI", 11.25f, FontStyle.Regular); + MetricsFonts.CaptionFont = new("Segoe UI", 11.25f, FontStyle.Regular); + MetricsFonts.SmCaptionFont = new("Segoe UI", 11.25f, FontStyle.Regular); } { @@ -123,8 +123,8 @@ public static Manager Windows81() WinEffects.SysListView32 = false; } - TM.Terminal = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); - TM.TerminalPreview = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); + TM.Terminal = new(string.Empty, WinTerminal.Mode.Empty); + TM.TerminalPreview = new(string.Empty, WinTerminal.Mode.Empty); TM.Cursor_Enabled = true; TM.Cursor_Shadow = false; diff --git a/WinPaletter/Theme/Default/WindowsVista.cs b/WinPaletter/Theme/Default/WindowsVista.cs index bcb7b606..09995691 100644 --- a/WinPaletter/Theme/Default/WindowsVista.cs +++ b/WinPaletter/Theme/Default/WindowsVista.cs @@ -6,7 +6,7 @@ public static partial class Default { public static Manager WindowsVista() { - var TM = new Manager(Manager.Source.Empty); + Manager TM = new(Manager.Source.Empty); { ref Structures.Info Info = ref TM.Info; @@ -164,8 +164,8 @@ public static Manager WindowsVista() WinEffects.SysListView32 = true; } - TM.Terminal = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); - TM.TerminalPreview = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); + TM.Terminal = new(string.Empty, WinTerminal.Mode.Empty); + TM.TerminalPreview = new(string.Empty, WinTerminal.Mode.Empty); TM.Cursor_Enabled = true; TM.Cursor_Shadow = true; diff --git a/WinPaletter/Theme/Default/WindowsXP.cs b/WinPaletter/Theme/Default/WindowsXP.cs index 4b2eaa14..799322a0 100644 --- a/WinPaletter/Theme/Default/WindowsXP.cs +++ b/WinPaletter/Theme/Default/WindowsXP.cs @@ -6,7 +6,7 @@ public static partial class Default { public static Manager WindowsXP() { - var TM = new Manager(Manager.Source.Empty); + Manager TM = new(Manager.Source.Empty); { ref Structures.Info Info = ref TM.Info; @@ -155,12 +155,12 @@ public static Manager WindowsXP() MetricsFonts.DesktopIconSize = 48; MetricsFonts.ShellIconSize = 32; MetricsFonts.Fonts_SingleBitPP = true; - MetricsFonts.CaptionFont = new Font("Trebuchet MS", 9.75f, FontStyle.Bold); - MetricsFonts.SmCaptionFont = new Font("Tahoma", 8.25f, FontStyle.Regular); - MetricsFonts.IconFont = new Font("Tahoma", 8.25f, FontStyle.Regular); - MetricsFonts.MenuFont = new Font("Tahoma", 8.25f, FontStyle.Regular); - MetricsFonts.MessageFont = new Font("Tahoma", 8.25f, FontStyle.Regular); - MetricsFonts.StatusFont = new Font("Tahoma", 8.25f, FontStyle.Regular); + MetricsFonts.CaptionFont = new("Trebuchet MS", 9.75f, FontStyle.Bold); + MetricsFonts.SmCaptionFont = new("Tahoma", 8.25f, FontStyle.Regular); + MetricsFonts.IconFont = new("Tahoma", 8.25f, FontStyle.Regular); + MetricsFonts.MenuFont = new("Tahoma", 8.25f, FontStyle.Regular); + MetricsFonts.MessageFont = new("Tahoma", 8.25f, FontStyle.Regular); + MetricsFonts.StatusFont = new("Tahoma", 8.25f, FontStyle.Regular); } TM.Cursor_Shadow = true; @@ -582,8 +582,8 @@ public static Manager WindowsXP() WinEffects.SysListView32 = true; } - TM.Terminal = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); - TM.TerminalPreview = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); + TM.Terminal = new(string.Empty, WinTerminal.Mode.Empty); + TM.TerminalPreview = new(string.Empty, WinTerminal.Mode.Empty); TM.Cursor_Enabled = true; TM.Cursor_Shadow = true; diff --git a/WinPaletter/Theme/Manager.cs b/WinPaletter/Theme/Manager.cs index 1946e760..0961e365 100644 --- a/WinPaletter/Theme/Manager.cs +++ b/WinPaletter/Theme/Manager.cs @@ -108,16 +108,16 @@ public Manager(Source Source, string File = "", bool IgnoreExtractionThemePack = else { TerPreDir = PathsExt.TerminalPreviewJSON; } } - if (System.IO.File.Exists(TerDir)) { Terminal = new WinTerminal(TerDir, WinTerminal.Mode.JSONFile); } - else { Terminal = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); } + if (System.IO.File.Exists(TerDir)) { Terminal = new(TerDir, WinTerminal.Mode.JSONFile); } + else { Terminal = new(string.Empty, WinTerminal.Mode.Empty); } - if (System.IO.File.Exists(TerPreDir)) { TerminalPreview = new WinTerminal(TerPreDir, WinTerminal.Mode.JSONFile, WinTerminal.Version.Preview); } - else { TerminalPreview = new WinTerminal(string.Empty, WinTerminal.Mode.Empty, WinTerminal.Version.Preview); } + if (System.IO.File.Exists(TerPreDir)) { TerminalPreview = new(TerPreDir, WinTerminal.Mode.JSONFile, WinTerminal.Version.Preview); } + else { TerminalPreview = new(string.Empty, WinTerminal.Mode.Empty, WinTerminal.Version.Preview); } } else { - Terminal = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); - TerminalPreview = new WinTerminal(string.Empty, WinTerminal.Mode.Empty, WinTerminal.Version.Preview); + Terminal = new(string.Empty, WinTerminal.Mode.Empty); + TerminalPreview = new(string.Empty, WinTerminal.Mode.Empty, WinTerminal.Version.Preview); } #endregion @@ -190,7 +190,7 @@ public Manager(Source Source, string File = "", bool IgnoreExtractionThemePack = } } - var txt = new List(); + List txt = new(); txt.Clear(); string Pack = new FileInfo(File).DirectoryName + @"\" + Path.GetFileNameWithoutExtension(File) + ".wptp"; bool Pack_IsValid = System.IO.File.Exists(Pack) && new FileInfo(Pack).Length > 0L && converter.GetFormat(File) == Converter_CP.WP_Format.JSON; @@ -204,9 +204,9 @@ public Manager(Source Source, string File = "", bool IgnoreExtractionThemePack = if (!Directory.Exists(cache)) Directory.CreateDirectory(cache); - using (var s = new FileStream(Pack, FileMode.Open, FileAccess.Read)) + using (FileStream s = new(Pack, FileMode.Open, FileAccess.Read)) { - using (var archive = new ZipArchive(s, ZipArchiveMode.Read)) + using (ZipArchive archive = new(s, ZipArchiveMode.Read)) { foreach (ZipArchiveEntry entry in archive.Entries) { @@ -279,8 +279,8 @@ public Manager(Source Source, string File = "", bool IgnoreExtractionThemePack = foreach (FieldInfo field in GetType().GetFields(bindingFlags)) { - var type = field.FieldType; - var JSet = new JsonSerializerSettings(); + Type type = field.FieldType; + JsonSerializerSettings JSet = new(); if (J[field.Name] is not null) field.SetValue(this, J[field.Name].ToObject(type)); @@ -323,7 +323,7 @@ public void Save(Source Destination, string File = "", TreeView TreeView = null, _ErrorHappened = false; - var sw_all = new Stopwatch(); + Stopwatch sw_all = new(); sw_all.Reset(); sw_all.Start(); @@ -525,7 +525,7 @@ public void Save(Source Destination, string File = "", TreeView TreeView = null, #endregion #region Windows Terminal - var sw = new Stopwatch(); + Stopwatch sw = new(); sw.Reset(); sw.Start(); if (OS.W12 || OS.W11 || OS.W10) @@ -786,7 +786,7 @@ public void Save(Source Destination, string File = "", TreeView TreeView = null, /// public string ToString(bool IgnoreCompression = false) { - var JSON_Overall = new JObject(); + JObject JSON_Overall = new(); JSON_Overall.RemoveAll(); Info.AppVersion = Program.Version; @@ -825,7 +825,7 @@ public string ToString(bool IgnoreCompression = false) public void PackThemeResources(Manager TM, string ThemeFile, string Pack) { string cache = @"%WinPaletterAppData%\ThemeResPack_Cache\" + string.Concat(TM.Info.ThemeName.Replace(" ", string.Empty).Split(Path.GetInvalidFileNameChars())) + @"\"; - var filesList = new Dictionary(); + Dictionary filesList = new(); filesList.Clear(); string x; string ZipEntry; diff --git a/WinPaletter/Theme/Properties/Properties.cs b/WinPaletter/Theme/Properties/Properties.cs index 09cb7ee6..5b3f1001 100644 --- a/WinPaletter/Theme/Properties/Properties.cs +++ b/WinPaletter/Theme/Properties/Properties.cs @@ -355,12 +355,12 @@ public partial class Manager ShellIconSize = 32, ShellSmallIconSize = 16, Fonts_SingleBitPP = false, - CaptionFont = new Font("Segoe UI", 9f, FontStyle.Regular), - IconFont = new Font("Segoe UI", 9f, FontStyle.Regular), - MenuFont = new Font("Segoe UI", 9f, FontStyle.Regular), - MessageFont = new Font("Segoe UI", 9f, FontStyle.Regular), - SmCaptionFont = new Font("Segoe UI", 9f, FontStyle.Regular), - StatusFont = new Font("Segoe UI", 9f, FontStyle.Regular), + CaptionFont = new("Segoe UI", 9f, FontStyle.Regular), + IconFont = new("Segoe UI", 9f, FontStyle.Regular), + MenuFont = new("Segoe UI", 9f, FontStyle.Regular), + MessageFont = new("Segoe UI", 9f, FontStyle.Regular), + SmCaptionFont = new("Segoe UI", 9f, FontStyle.Regular), + StatusFont = new("Segoe UI", 9f, FontStyle.Regular), FontSubstitute_MSShellDlg = "Microsoft Sans Serif", FontSubstitute_MSShellDlg2 = "Tahoma", FontSubstitute_SegoeUI = string.Empty @@ -549,9 +549,9 @@ public partial class Manager }; /// Object derived of class that has data about Windows Terminal Stable, and it can be customized. - public WinTerminal Terminal = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); + public WinTerminal Terminal = new(string.Empty, WinTerminal.Mode.Empty); /// Object derived of class that has data about Windows Terminal Preview, and it can be customized. - public WinTerminal TerminalPreview = new WinTerminal(string.Empty, WinTerminal.Mode.Empty); + public WinTerminal TerminalPreview = new(string.Empty, WinTerminal.Mode.Empty); } } \ No newline at end of file diff --git a/WinPaletter/Theme/Structures/Consoles/WinTerminal.cs b/WinPaletter/Theme/Structures/Consoles/WinTerminal.cs index 347e5a0f..b0e29179 100644 --- a/WinPaletter/Theme/Structures/Consoles/WinTerminal.cs +++ b/WinPaletter/Theme/Structures/Consoles/WinTerminal.cs @@ -52,7 +52,7 @@ public WinTerminal(string File, Mode Mode, Version Version = Version.Stable) { if (System.IO.File.Exists(File)) { - var St = new StreamReader(File); + StreamReader St = new(File); string JSON_String = St.ReadToEnd(); try @@ -66,7 +66,7 @@ public WinTerminal(string File, Mode Mode, Version Version = Version.Stable) #region Getting Default Profile - DefaultProf = new TProfile(); + DefaultProf = new(); if (JSonFile["profiles"] is not null) { @@ -115,7 +115,7 @@ public WinTerminal(string File, Mode Mode, Version Version = Version.Stable) #endregion #region Getting Profiles - Profiles = new List(); + Profiles = new(); Profiles.Clear(); if (JSonFile["profiles"] is not null) @@ -124,7 +124,7 @@ public WinTerminal(string File, Mode Mode, Version Version = Version.Stable) { foreach (var item in JSonFile["profiles"]["list"]) { - var P = new TProfile(); + TProfile P = new(); if (item["name"] is not null) P.Name = item["name"].ToString(); if (item["backgroundImage"] is not null) @@ -171,14 +171,14 @@ public WinTerminal(string File, Mode Mode, Version Version = Version.Stable) #endregion #region Getting All Colors Schemes - Colors = new List(); + Colors = new(); Colors.Clear(); if (JSonFile["schemes"] is not null) { foreach (var item in JSonFile["schemes"]) { - var TC = new TColors(); + TColors TC = new(); if (item["background"] is not null) TC.Background = HEX2RGB(item["background"].ToString()); @@ -258,14 +258,14 @@ public WinTerminal(string File, Mode Mode, Version Version = Version.Stable) #endregion #region Getting All Themes - Themes = new List(); + Themes = new(); Themes.Clear(); if (JSonFile["themes"] is not null) { foreach (var item in JSonFile["themes"]) { - var Th = new TTheme(); + TTheme Th = new(); if (item["name"] is not null) Th.Name = item["name"].ToString(); @@ -307,12 +307,12 @@ public WinTerminal(string File, Mode Mode, Version Version = Version.Stable) } else { - Profiles = new List(); - Colors = new List(); - DefaultProf = new TProfile(); - Themes = new List(); + Profiles = new(); + Colors = new(); + DefaultProf = new(); + Themes = new(); - Colors.Add(new TColors() + Colors.Add(new() { Name = "Campbell", Background = "FF0C0C0C".FromHEXToColor(true), @@ -343,7 +343,7 @@ public WinTerminal(string File, Mode Mode, Version Version = Version.Stable) case Mode.WinPaletterFile: { - using (var TBx = new Theme.Manager(WinPaletter.Theme.Manager.Source.File, File)) + using (Theme.Manager TBx = new(WinPaletter.Theme.Manager.Source.File, File)) { switch (Version) @@ -381,12 +381,12 @@ public WinTerminal(string File, Mode Mode, Version Version = Version.Stable) case Mode.Empty: { - Profiles = new List(); - Colors = new List(); - DefaultProf = new TProfile(); - Themes = new List(); + Profiles = new(); + Colors = new(); + DefaultProf = new(); + Themes = new(); - Colors.Add(new TColors() + Colors.Add(new() { Name = "Campbell", Background = "FF0C0C0C".FromHEXToColor(true), @@ -498,7 +498,7 @@ public string Save(string File, Mode Mode, Version Version = Version.Stable) } - var St = new StreamReader(SettingsFile); + StreamReader St = new(SettingsFile); string JSON_String = St.ReadToEnd(); JObject JSonFile = JObject.Parse(JSON_String); JObject JSonFileUntouched = JObject.Parse(JSON_String); @@ -515,7 +515,7 @@ public string Save(string File, Mode Mode, Version Version = Version.Stable) JSonFile["schemes"] = new JArray(); for (int x = 0, loopTo = Colors.Count - 1; x <= loopTo; x++) { - var JS = new JObject(); + JObject JS = new(); JS["background"] = RGB2HEX(Colors[x].Background); JS["black"] = RGB2HEX(Colors[x].Black); JS["blue"] = RGB2HEX(Colors[x].Blue); @@ -612,7 +612,7 @@ public string Save(string File, Mode Mode, Version Version = Version.Stable) if (!((JObject)JSonFile["profiles"]["defaults"]).ContainsKey("font")) { // JFont.Add("font"] - var JFont = new JObject(); + JObject JFont = new(); if (DefaultProf.Font.Weight! < 0) JFont["weight"] = FontWeight_ReturnToString(DefaultProf.Font.Weight); if (!string.IsNullOrEmpty(DefaultProf.Font.Face)) @@ -641,7 +641,7 @@ public string Save(string File, Mode Mode, Version Version = Version.Stable) for (int x = 0, loopTo1 = Profiles.Count - 1; x <= loopTo1; x++) { - var JS = new JObject(); + JObject JS = new(); JS["name"] = Profiles[x].Name; JS["backgroundImage"] = Profiles[x].BackgroundImage; @@ -664,7 +664,7 @@ public string Save(string File, Mode Mode, Version Version = Version.Stable) JS["useAcrylic"] = Profiles[x].UseAcrylic; - var JS_Font = new JObject(); + JObject JS_Font = new(); JS_Font["weight"] = FontWeight_ReturnToString(Profiles[x].Font.Weight); if (Profiles[x].Font.Face is not null) JS_Font["face"] = Profiles[x].Font.Face; @@ -730,26 +730,26 @@ public string Save(string File, Mode Mode, Version Version = Version.Stable) for (int x = 0, loopTo2 = Themes.Count - 1; x <= loopTo2; x++) { - var JS = new JObject(); + JObject JS = new(); if (!string.IsNullOrEmpty(Themes[x].Name)) JS["name"] = Themes[x].Name; - var JS_Tabs = new JObject(); + JObject JS_Tabs = new(); if (Themes[x].Tab_Active != Color.FromArgb(0, 0, 0, 0)) JS_Tabs["background"] = RGB2HEX(Themes[x].Tab_Active); if (Themes[x].Tab_Inactive != Color.FromArgb(0, 0, 0, 0)) JS_Tabs["unfocusedBackground"] = RGB2HEX(Themes[x].Tab_Inactive); JS["tab"] = JS_Tabs; - var JS_TabRow = new JObject(); + JObject JS_TabRow = new(); if (Themes[x].Titlebar_Active != Color.FromArgb(0, 0, 0, 0)) JS_TabRow["background"] = RGB2HEX(Themes[x].Titlebar_Active); if (Themes[x].Titlebar_Inactive != Color.FromArgb(0, 0, 0, 0)) JS_TabRow["unfocusedBackground"] = RGB2HEX(Themes[x].Titlebar_Inactive); JS["tabRow"] = JS_TabRow; - var JS_Window = new JObject(); + JObject JS_Window = new(); if (!string.IsNullOrEmpty(Themes[x].Style)) JS_Window["applicationTheme"] = Themes[x].Style; JS["window"] = JS_Window; @@ -779,7 +779,7 @@ public string Save(string File, Mode Mode, Version Version = Version.Stable) /// public static void TakeOwnership(string filepath) { - var proc = new Process(); + Process proc = new(); proc.StartInfo.FileName = "takeown.exe"; proc.StartInfo.Arguments = "/R /F \"" + filepath + "\""; proc.StartInfo.WindowStyle = ProcessWindowStyle.Hidden; @@ -1170,7 +1170,7 @@ public class TProfile : IComparable, ICloneable public int Opacity { get; set; } = 100; /// Object dependent on Windows Terminal font class. This object has data of font name, size and weight. - public TFont Font { get; set; } = new TFont(); + public TFont Font { get; set; } = new(); /// Background image path for this profile public string BackgroundImage { get; set; } = string.Empty; diff --git a/WinPaletter/Theme/Structures/Others/MetricsFonts.cs b/WinPaletter/Theme/Structures/Others/MetricsFonts.cs index 7ad8e2af..cc4dabf5 100644 --- a/WinPaletter/Theme/Structures/Others/MetricsFonts.cs +++ b/WinPaletter/Theme/Structures/Others/MetricsFonts.cs @@ -280,9 +280,9 @@ public void Apply(TreeView TreeView = null) if (!Program.Settings.ThemeApplyingBehavior.DelayMetrics) { - NONCLIENTMETRICS NCM = new NONCLIENTMETRICS(); + NONCLIENTMETRICS NCM = new(); NCM.cbSize = Marshal.SizeOf(NCM); - ICONMETRICS ICO = new ICONMETRICS(); + ICONMETRICS ICO = new(); ICO.cbSize = (uint)Marshal.SizeOf(ICO); SystemParametersInfo(TreeView, SPI.SPI_GETICONMETRICS, (int)ICO.cbSize, ref ICO, SPIF.SPIF_NONE); diff --git a/WinPaletter/Theme/Structures/Others/WinEffects.cs b/WinPaletter/Theme/Structures/Others/WinEffects.cs index cdf15be1..3b8a7487 100644 --- a/WinPaletter/Theme/Structures/Others/WinEffects.cs +++ b/WinPaletter/Theme/Structures/Others/WinEffects.cs @@ -428,7 +428,7 @@ public void Apply(TreeView TreeView = null) if (Enabled) { - ANIMATIONINFO anim = new ANIMATIONINFO(); + ANIMATIONINFO anim = new(); anim.cbSize = (uint)Marshal.SizeOf(anim); anim.IMinAnimate = WindowAnimation ? 1 : 0; diff --git a/WinPaletter/Theme/Structures/Wallpaper/Wallpaper.cs b/WinPaletter/Theme/Structures/Wallpaper/Wallpaper.cs index aaffb1a4..2bb13eab 100644 --- a/WinPaletter/Theme/Structures/Wallpaper/Wallpaper.cs +++ b/WinPaletter/Theme/Structures/Wallpaper/Wallpaper.cs @@ -181,7 +181,7 @@ public void Apply(bool SkipSettingWallpaper = false, TreeView TreeView = null) { if (OS.WXP | OS.WVista | OS.W7 && File.Exists(ImageFile) && !new FileInfo(ImageFile).FullName.StartsWith(PathsExt.Windows + @"\Web", StringComparison.OrdinalIgnoreCase)) { - using (var bmp = new Bitmap(Bitmap_Mgr.Load(ImageFile))) + using (Bitmap bmp = new(Bitmap_Mgr.Load(ImageFile))) { if (bmp.RawFormat != System.Drawing.Imaging.ImageFormat.Bmp) { @@ -214,7 +214,7 @@ public void Apply(bool SkipSettingWallpaper = false, TreeView TreeView = null) if (!SkipSettingWallpaper) { - using (var _ini = new INI(slideshow_ini)) + using (INI _ini = new(slideshow_ini)) { if (TreeView is not null) diff --git a/WinPaletter/Theme/Structures/Wallpaper/WallpaperTone.cs b/WinPaletter/Theme/Structures/Wallpaper/WallpaperTone.cs index 8244cf2b..fbd11bed 100644 --- a/WinPaletter/Theme/Structures/Wallpaper/WallpaperTone.cs +++ b/WinPaletter/Theme/Structures/Wallpaper/WallpaperTone.cs @@ -101,7 +101,7 @@ public void Apply(TreeView TreeView = null) if (TreeView is not null) Manager.AddNode(TreeView, string.Format(Program.Lang.Verbose_SettingHSLImage, path), "pe_patch"); - using (var ImgF = new ImageProcessor.ImageFactory()) + using (ImageProcessor.ImageFactory ImgF = new()) { ImgF.Load(Image); ImgF.Hue(H, true); diff --git a/WinPaletter/Theme/Structures/WinPaletter/AppTheme.cs b/WinPaletter/Theme/Structures/WinPaletter/AppTheme.cs index 1bfa52ef..b38210ae 100644 --- a/WinPaletter/Theme/Structures/WinPaletter/AppTheme.cs +++ b/WinPaletter/Theme/Structures/WinPaletter/AppTheme.cs @@ -30,11 +30,11 @@ public struct AppTheme : ICloneable /// Default AppTheme data structure public void Load(AppTheme @default) { - Enabled = Convert.ToBoolean(GetReg(@"HKEY_CURRENT_USER\Software\WinPaletter\Settings", "Appearance_Custom", @default.Enabled)); - BackColor = Color.FromArgb(Convert.ToInt32(GetReg(@"HKEY_CURRENT_USER\Software\WinPaletter\Settings", ".BackColor", @default.BackColor.ToArgb()))); - AccentColor = Color.FromArgb(Convert.ToInt32(GetReg(@"HKEY_CURRENT_USER\Software\WinPaletter\Settings", "AccentColor", @default.AccentColor.ToArgb()))); - DarkMode = Convert.ToBoolean(GetReg(@"HKEY_CURRENT_USER\Software\WinPaletter\Settings", "Custom_Dark", @default.DarkMode)); - RoundCorners = Convert.ToBoolean(GetReg(@"HKEY_CURRENT_USER\Software\WinPaletter\Settings", "RoundedCorners", @default.RoundCorners)); + Enabled = Convert.ToBoolean(GetReg(@"HKEY_CURRENT_USER\Software\WinPaletter\Settings\Appearance", "CustomColors", @default.Enabled)); + BackColor = Color.FromArgb(Convert.ToInt32(GetReg(@"HKEY_CURRENT_USER\Software\WinPaletter\Settings\Appearance", "BackColor", @default.BackColor.ToArgb()))); + AccentColor = Color.FromArgb(Convert.ToInt32(GetReg(@"HKEY_CURRENT_USER\Software\WinPaletter\Settings\Appearance", "AccentColor", @default.AccentColor.ToArgb()))); + DarkMode = Convert.ToBoolean(GetReg(@"HKEY_CURRENT_USER\Software\WinPaletter\Settings\Appearance", "CustomTheme", @default.DarkMode)); + RoundCorners = Convert.ToBoolean(GetReg(@"HKEY_CURRENT_USER\Software\WinPaletter\Settings\Appearance", "RoundedCorners", @default.RoundCorners)); } /// @@ -43,18 +43,18 @@ public void Load(AppTheme @default) /// TreeView used as theme log public void Apply(TreeView TreeView = null) { - EditReg(TreeView, @"HKEY_CURRENT_USER\Software\WinPaletter\Settings", "Appearance_Custom", Enabled); - EditReg(TreeView, @"HKEY_CURRENT_USER\Software\WinPaletter\Settings", ".BackColor", BackColor.ToArgb()); - EditReg(TreeView, @"HKEY_CURRENT_USER\Software\WinPaletter\Settings", "AccentColor", AccentColor.ToArgb()); - EditReg(TreeView, @"HKEY_CURRENT_USER\Software\WinPaletter\Settings", "Custom_Dark", DarkMode); - EditReg(TreeView, @"HKEY_CURRENT_USER\Software\WinPaletter\Settings", "RoundedCorners", RoundCorners); + EditReg(TreeView, @"HKEY_CURRENT_USER\Software\WinPaletter\Settings\Appearance", "CustomColors", Enabled); + EditReg(TreeView, @"HKEY_CURRENT_USER\Software\WinPaletter\Settings\Appearance", "BackColor", BackColor.ToArgb()); + EditReg(TreeView, @"HKEY_CURRENT_USER\Software\WinPaletter\Settings\Appearance", "AccentColor", AccentColor.ToArgb()); + EditReg(TreeView, @"HKEY_CURRENT_USER\Software\WinPaletter\Settings\Appearance", "CustomTheme", DarkMode); + EditReg(TreeView, @"HKEY_CURRENT_USER\Software\WinPaletter\Settings\Appearance", "RoundedCorners", RoundCorners); { ref Settings.Structures.Appearance Appearance = ref Program.Settings.Appearance; Appearance.CustomColors = Enabled; Appearance.BackColor = BackColor; Appearance.AccentColor = AccentColor; - Appearance.CustomTheme = DarkMode; + Appearance.CustomTheme_DarkMode = DarkMode; Appearance.RoundedCorners = RoundCorners; } diff --git a/WinPaletter/Theme/Structures/WindowsColors/Win32UI.cs b/WinPaletter/Theme/Structures/WindowsColors/Win32UI.cs index 59c4f045..63943d1a 100644 --- a/WinPaletter/Theme/Structures/WindowsColors/Win32UI.cs +++ b/WinPaletter/Theme/Structures/WindowsColors/Win32UI.cs @@ -489,7 +489,7 @@ public void Apply(TreeView TreeView = null) bool isClassic = string.IsNullOrEmpty(UxTheme.GetCurrentVS().Item1); // Hiding forms is added as there is a bug occurs when a classic theme applied on classic Windows mode - var fl = new List(); + List fl = new(); fl.Clear(); if (isClassic) { @@ -504,8 +504,8 @@ public void Apply(TreeView TreeView = null) } } - var C1 = new List(); - var C2 = new List(); + List C1 = new(); + List C2 = new(); C1.Clear(); C2.Clear(); diff --git a/WinPaletter/Theme/Structures/WindowsColors/Windows10x.cs b/WinPaletter/Theme/Structures/WindowsColors/Windows10x.cs index bb0c5040..f2be5ec5 100644 --- a/WinPaletter/Theme/Structures/WindowsColors/Windows10x.cs +++ b/WinPaletter/Theme/Structures/WindowsColors/Windows10x.cs @@ -94,7 +94,7 @@ public void Load(Windows10x @default) { if (OS.W12 || OS.W11 || OS.W10) { - var Colors = new List(); + List Colors = new(); Colors.Clear(); byte[] x; diff --git a/WinPaletter/Theme/Support/Apply.cs b/WinPaletter/Theme/Support/Apply.cs index 8e1a8c88..d879665b 100644 --- a/WinPaletter/Theme/Support/Apply.cs +++ b/WinPaletter/Theme/Support/Apply.cs @@ -58,7 +58,7 @@ public void Apply_LogonUI7(Theme.Structures.LogonUI7 LogonElement, string RegEnt } } - var bmpList = new List(); + List bmpList = new(); bmpList.Clear(); if (ReportProgress_Detailed) @@ -95,7 +95,7 @@ public void Apply_LogonUI7(Theme.Structures.LogonUI7 LogonElement, string RegEnt case Theme.Structures.LogonUI7.Sources.Wallpaper: { - using (Bitmap b = new Bitmap(Program.GetWallpaperFromRegistry())) + using (Bitmap b = new(Program.GetWallpaperFromRegistry())) { bmpList.Add((Bitmap)b.Resize(Program.Computer.Screen.Bounds.Size).Clone()); } @@ -126,8 +126,8 @@ public void Apply_LogonUI7(Theme.Structures.LogonUI7 LogonElement, string RegEnt if (ReportProgress_Detailed) AddNode(TreeView, Program.Lang.Verbose_BlurringLogonUIImg, "apply"); - var imgF = new ImageProcessor.ImageFactory(); - using (var b = new Bitmap(bmpList[x])) + ImageProcessor.ImageFactory imgF = new(); + using (Bitmap b = new(bmpList[x])) { imgF.Load(b); imgF.GaussianBlur(LogonElement.Blur_Intensity); @@ -268,7 +268,7 @@ public void Apply_LogonUI_8(TreeView TreeView = null) case Theme.Structures.LogonUI7.Sources.Wallpaper: { - using (var b = new Bitmap(Program.GetWallpaperFromRegistry())) + using (Bitmap b = new(Program.GetWallpaperFromRegistry())) { bmp = (Bitmap)b.Clone(); } @@ -301,12 +301,12 @@ public void Apply_LogonUI_8(TreeView TreeView = null) { if (ReportProgress_Detailed) AddNode(TreeView, Program.Lang.Verbose_BlurringLockScreenImg, "apply"); - var imgF = new ImageProcessor.ImageFactory(); - using (var b = new Bitmap(bmp)) + ImageProcessor.ImageFactory ImgF = new(); + using (Bitmap b = new(bmp)) { - imgF.Load(b); - imgF.GaussianBlur(LogonUI7.Blur_Intensity); - bmp = (Bitmap)imgF.Image; + ImgF.Load(b); + ImgF.GaussianBlur(LogonUI7.Blur_Intensity); + bmp = (Bitmap)ImgF.Image; } } @@ -396,7 +396,7 @@ public void Apply_Cursors(TreeView TreeView = null) EditReg(@"HKEY_CURRENT_USER\Software\WinPaletter\Cursors", string.Empty, Cursor_Enabled); - var sw = new Stopwatch(); + Stopwatch sw = new(); if (ReportProgress) AddNode(TreeView, string.Format("{0}: " + Program.Lang.TM_SavingCursorsColors, DateTime.Now.ToLongTimeString()), "info"); diff --git a/WinPaletter/Theme/Support/CursorsRender.cs b/WinPaletter/Theme/Support/CursorsRender.cs index b6058de3..4c340039 100644 --- a/WinPaletter/Theme/Support/CursorsRender.cs +++ b/WinPaletter/Theme/Support/CursorsRender.cs @@ -81,143 +81,142 @@ public void RenderCursor(Paths.CursorType Type, Manager TM, TreeView TreeView = string Path = string.Format(PathsExt.CursorsWP + @"\{0}.cur", CurName); - var fs = new FileStream(Path, FileMode.Create); - var EO = new EOIcoCurWriter(fs, 7, EOIcoCurWriter.IcoCurType.Cursor); + FileStream FS = new(Path, FileMode.Create); + EOIcoCurWriter EO = new(FS, 7, EOIcoCurWriter.IcoCurType.Cursor); for (float i = 1f; i <= 4f; i += 0.5f) { - var bmp = new Bitmap((int)Math.Round(32f * i), (int)Math.Round(32f * i), System.Drawing.Imaging.PixelFormat.Format32bppPArgb); - var HotPoint = new Point(1, 1); + Bitmap bmp = new((int)Math.Round(32f * i), (int)Math.Round(32f * i), System.Drawing.Imaging.PixelFormat.Format32bppPArgb); + Point HotPoint = new(1, 1); switch (Type) { case Paths.CursorType.Arrow: { - var CurOptions = new CursorOptions(TM.Cursor_Arrow) { Cursor = Paths.CursorType.Arrow, LineThickness = 1f, Scale = i, _Angle = 0f }; + CursorOptions CurOptions = new(TM.Cursor_Arrow) { Cursor = Paths.CursorType.Arrow, LineThickness = 1f, Scale = i, Angle = 0f }; bmp = Paths.Draw(CurOptions); - HotPoint = new Point(1, 1); + HotPoint = new(1, 1); break; } case Paths.CursorType.Help: { - var CurOptions = new CursorOptions(TM.Cursor_Help) { Cursor = Paths.CursorType.Help, LineThickness = 1f, Scale = i, _Angle = 0f }; + CursorOptions CurOptions = new(TM.Cursor_Help) { Cursor = Paths.CursorType.Help, LineThickness = 1f, Scale = i, Angle = 0f }; bmp = Paths.Draw(CurOptions); - HotPoint = new Point(1, 1); + HotPoint = new(1, 1); break; } case Paths.CursorType.None: { - var CurOptions = new CursorOptions(TM.Cursor_None) { Cursor = Paths.CursorType.None, LineThickness = 1f, Scale = i, _Angle = 0f }; + CursorOptions CurOptions = new(TM.Cursor_None) { Cursor = Paths.CursorType.None, LineThickness = 1f, Scale = i, Angle = 0f }; bmp = Paths.Draw(CurOptions); - HotPoint = new Point(1 + (int)Math.Round(8f * i), 1 + (int)Math.Round(8f * i)); + HotPoint = new(1 + (int)Math.Round(8f * i), 1 + (int)Math.Round(8f * i)); break; } case Paths.CursorType.Move: { - var CurOptions = new CursorOptions(TM.Cursor_Move) { Cursor = Paths.CursorType.Move, LineThickness = 1f, Scale = i, _Angle = 0f }; + CursorOptions CurOptions = new(TM.Cursor_Move) { Cursor = Paths.CursorType.Move, LineThickness = 1f, Scale = i, Angle = 0f }; bmp = Paths.Draw(CurOptions); - HotPoint = new Point(1 + (int)Math.Round(11f * i), 1 + (int)Math.Round(11f * i)); + HotPoint = new(1 + (int)Math.Round(11f * i), 1 + (int)Math.Round(11f * i)); break; } case Paths.CursorType.Up: { - var CurOptions = new CursorOptions(TM.Cursor_Up) { Cursor = Paths.CursorType.Up, LineThickness = 1f, Scale = i, _Angle = 0f }; + CursorOptions CurOptions = new(TM.Cursor_Up) { Cursor = Paths.CursorType.Up, LineThickness = 1f, Scale = i, Angle = 0f }; bmp = Paths.Draw(CurOptions); - HotPoint = new Point(1 + (int)Math.Round(4f * i), 1); + HotPoint = new(1 + (int)Math.Round(4f * i), 1); break; } case Paths.CursorType.NS: { - var CurOptions = new CursorOptions(TM.Cursor_NS) { Cursor = Paths.CursorType.NS, LineThickness = 1f, Scale = i, _Angle = 0f }; + CursorOptions CurOptions = new(TM.Cursor_NS) { Cursor = Paths.CursorType.NS, LineThickness = 1f, Scale = i, Angle = 0f }; bmp = Paths.Draw(CurOptions); - HotPoint = new Point(1 + (int)Math.Round(4f * i), 1 + (int)Math.Round(11f * i)); + HotPoint = new(1 + (int)Math.Round(4f * i), 1 + (int)Math.Round(11f * i)); break; } case Paths.CursorType.EW: { - var CurOptions = new CursorOptions(TM.Cursor_EW) { Cursor = Paths.CursorType.EW, LineThickness = 1f, Scale = i, _Angle = 0f }; + CursorOptions CurOptions = new(TM.Cursor_EW) { Cursor = Paths.CursorType.EW, LineThickness = 1f, Scale = i, Angle = 0f }; bmp = Paths.Draw(CurOptions); - HotPoint = new Point((int)Math.Round(1f + 11f * i), (int)Math.Round(1f + 4f * i)); + HotPoint = new((int)Math.Round(1f + 11f * i), (int)Math.Round(1f + 4f * i)); break; } case Paths.CursorType.NESW: { - var CurOptions = new CursorOptions(TM.Cursor_NESW) { Cursor = Paths.CursorType.NESW, LineThickness = 1f, Scale = i, _Angle = 0f }; + CursorOptions CurOptions = new(TM.Cursor_NESW) { Cursor = Paths.CursorType.NESW, LineThickness = 1f, Scale = i, Angle = 0f }; bmp = Paths.Draw(CurOptions); - HotPoint = new Point(1 + (int)Math.Round(8f * i), 1 + (int)Math.Round(8f * i)); + HotPoint = new(1 + (int)Math.Round(8f * i), 1 + (int)Math.Round(8f * i)); break; } case Paths.CursorType.NWSE: { - var CurOptions = new CursorOptions(TM.Cursor_NWSE) { Cursor = Paths.CursorType.NWSE, LineThickness = 1f, Scale = i, _Angle = 0f }; + CursorOptions CurOptions = new(TM.Cursor_NWSE) { Cursor = Paths.CursorType.NWSE, LineThickness = 1f, Scale = i, Angle = 0f }; bmp = Paths.Draw(CurOptions); - HotPoint = new Point(1 + (int)Math.Round(8f * i), 1 + (int)Math.Round(8f * i)); + HotPoint = new(1 + (int)Math.Round(8f * i), 1 + (int)Math.Round(8f * i)); break; } case Paths.CursorType.Pen: { - var CurOptions = new CursorOptions(TM.Cursor_Pen) { Cursor = Paths.CursorType.Pen, LineThickness = 1f, Scale = i, _Angle = 0f }; + CursorOptions CurOptions = new(TM.Cursor_Pen) { Cursor = Paths.CursorType.Pen, LineThickness = 1f, Scale = i, Angle = 0f }; bmp = Paths.Draw(CurOptions); - HotPoint = new Point(1, 1); + HotPoint = new(1, 1); break; } case Paths.CursorType.Link: { - var CurOptions = new CursorOptions(TM.Cursor_Link) { Cursor = Paths.CursorType.Link, LineThickness = 1f, Scale = i, _Angle = 0f }; + CursorOptions CurOptions = new(TM.Cursor_Link) { Cursor = Paths.CursorType.Link, LineThickness = 1f, Scale = i, Angle = 0f }; bmp = Paths.Draw(CurOptions); - HotPoint = new Point(1 + (int)Math.Round(6f * i), CurOptions.ArrowStyle != Paths.ArrowStyle.Classic ? 1 : 2); + HotPoint = new(1 + (int)Math.Round(6f * i), CurOptions.ArrowStyle != Paths.ArrowStyle.Classic ? 1 : 2); break; } case Paths.CursorType.Pin: { - var CurOptions = new CursorOptions(TM.Cursor_Pin) { Cursor = Paths.CursorType.Pin, LineThickness = 1f, Scale = i, _Angle = 0f }; + CursorOptions CurOptions = new(TM.Cursor_Pin) { Cursor = Paths.CursorType.Pin, LineThickness = 1f, Scale = i, Angle = 0f }; bmp = Paths.Draw(CurOptions); - HotPoint = new Point(1 + (int)Math.Round(6f * i), CurOptions.ArrowStyle != Paths.ArrowStyle.Classic ? 1 : 2); + HotPoint = new(1 + (int)Math.Round(6f * i), CurOptions.ArrowStyle != Paths.ArrowStyle.Classic ? 1 : 2); break; } case Paths.CursorType.Person: { - var CurOptions = new CursorOptions(TM.Cursor_Person) { Cursor = Paths.CursorType.Person, LineThickness = 1f, Scale = i, _Angle = 0f }; + CursorOptions CurOptions = new(TM.Cursor_Person) { Cursor = Paths.CursorType.Person, LineThickness = 1f, Scale = i, Angle = 0f }; bmp = Paths.Draw(CurOptions); - HotPoint = new Point(1 + (int)Math.Round(6f * i), CurOptions.ArrowStyle != Paths.ArrowStyle.Classic ? 1 : 2); + HotPoint = new(1 + (int)Math.Round(6f * i), CurOptions.ArrowStyle != Paths.ArrowStyle.Classic ? 1 : 2); break; } case Paths.CursorType.IBeam: { - var CurOptions = new CursorOptions(TM.Cursor_IBeam) { Cursor = Paths.CursorType.IBeam, LineThickness = 1f, Scale = i, _Angle = 0f }; + CursorOptions CurOptions = new(TM.Cursor_IBeam) { Cursor = Paths.CursorType.IBeam, LineThickness = 1f, Scale = i, Angle = 0f }; bmp = Paths.Draw(CurOptions); - HotPoint = new Point(1 + (int)Math.Round(4f * i), 1 + (int)Math.Round(9f * i)); + HotPoint = new(1 + (int)Math.Round(4f * i), 1 + (int)Math.Round(9f * i)); break; } case Paths.CursorType.Cross: { - var CurOptions = new CursorOptions(TM.Cursor_Cross) { Cursor = Paths.CursorType.Cross, LineThickness = 1f, Scale = i, _Angle = 0f }; + CursorOptions CurOptions = new(TM.Cursor_Cross) { Cursor = Paths.CursorType.Cross, LineThickness = 1f, Scale = i, Angle = 0f }; bmp = Paths.Draw(CurOptions); - HotPoint = new Point(1 + (int)Math.Round(9f * i), 1 + (int)Math.Round(9f * i)); + HotPoint = new(1 + (int)Math.Round(9f * i), 1 + (int)Math.Round(9f * i)); break; } } EO.WriteBitmap(bmp, null, HotPoint); - } - fs.Close(); + FS.Close(); if (TreeView is not null) AddNode(TreeView, string.Format(Program.Lang.Verbose_CursorRenderedInto, Path), "info"); @@ -251,16 +250,16 @@ public void RenderCursor(Paths.CursorType Type, Manager TM, TreeView TreeView = if (Type == Paths.CursorType.AppLoading) { - CursorOptions CurOptions = new(TM.Cursor_AppLoading) { Cursor = Paths.CursorType.AppLoading, LineThickness = 1f, Scale = factor, _Angle = angle }; - bm = new Bitmap(Paths.Draw(CurOptions)); - HotPoint = new Point(1, 1 + (int)Math.Round(8f * factor)); + CursorOptions CurOptions = new(TM.Cursor_AppLoading) { Cursor = Paths.CursorType.AppLoading, LineThickness = 1f, Scale = factor, Angle = angle }; + bm = new(Paths.Draw(CurOptions)); + HotPoint = new(1, 1 + (int)Math.Round(8f * factor)); } else if (Type == Paths.CursorType.Busy) { - CursorOptions CurOptions = new(TM.Cursor_Busy) { Cursor = Paths.CursorType.Busy, LineThickness = 1f, Scale = factor, _Angle = angle }; - bm = new Bitmap(Paths.Draw(CurOptions)); - HotPoint = new Point((CurOptions.CircleStyle != Paths.CircleStyle.Classic ? 1 : 2) + (int)Math.Round(11f * factor), 1 + (int)Math.Round(11f * factor)); + CursorOptions CurOptions = new(TM.Cursor_Busy) { Cursor = Paths.CursorType.Busy, LineThickness = 1f, Scale = factor, Angle = angle }; + bm = new(Paths.Draw(CurOptions)); + HotPoint = new((CurOptions.CircleStyle != Paths.CircleStyle.Classic ? 1 : 2) + (int)Math.Round(11f * factor), 1 + (int)Math.Round(11f * factor)); } if (bm != null) { BMPList.Add(bm); } diff --git a/WinPaletter/Theme/Support/Functions.cs b/WinPaletter/Theme/Support/Functions.cs index 6abb2580..583c9c69 100644 --- a/WinPaletter/Theme/Support/Functions.cs +++ b/WinPaletter/Theme/Support/Functions.cs @@ -19,10 +19,10 @@ public static List GetPaletteFromMSTheme(string Filename) if (System.IO.File.Exists(Filename)) { - var ls = new List(); + List ls = new(); ls.Clear(); - var tx = System.IO.File.ReadAllText(Filename).CList(); + List tx = System.IO.File.ReadAllText(Filename).CList(); foreach (string x in tx) { @@ -72,7 +72,7 @@ public static List GetPaletteFromString(string String, string ThemeName) { if (string.IsNullOrWhiteSpace(String) || !String.Contains("|") || string.IsNullOrWhiteSpace(ThemeName)) { return null; } - var ls = new List(); + List ls = new(); ls.Clear(); var AllThemes = String.CList(); @@ -133,7 +133,7 @@ public static List GetPaletteFromString(string String, string ThemeName) public List Colors(bool DontMergeRepeatedColors = false) { - var CL = new List(); + List CL = new(); CL.Clear(); foreach (var field in typeof(Windows10x).GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public)) @@ -374,7 +374,7 @@ public static bool IsFontInstalled(string fontName, FontStyle style) try { - using (var testFont = new Font(fontName, emSize, style)) + using (Font testFont = new(fontName, emSize, style)) { installed = 0 == string.Compare(fontName, testFont.Name, StringComparison.InvariantCultureIgnoreCase); } diff --git a/WinPaletter/Theme/Support/JSON_Helpers.cs b/WinPaletter/Theme/Support/JSON_Helpers.cs index d202247c..58022390 100644 --- a/WinPaletter/Theme/Support/JSON_Helpers.cs +++ b/WinPaletter/Theme/Support/JSON_Helpers.cs @@ -9,7 +9,7 @@ public partial class Manager { private JObject DeserializeProps(Type StructureType, object Structure) { - var j = new JObject(); + JObject j = new(); j.RemoveAll(); diff --git a/WinPaletter/Theme/Support/PreviewHelpers.cs b/WinPaletter/Theme/Support/PreviewHelpers.cs index 62b829b6..9bbc1b72 100644 --- a/WinPaletter/Theme/Support/PreviewHelpers.cs +++ b/WinPaletter/Theme/Support/PreviewHelpers.cs @@ -60,8 +60,7 @@ public enum WindowStyle /// public static void ApplyWin10xLegends(Theme.Manager TM, WindowStyle Style, Label lbl1, Label lbl2, Label lbl3, Label lbl4, Label lbl5, Label lbl6, Label lbl7, Label lbl8, Label lbl9, PictureBox pic1, PictureBox pic2, PictureBox pic3, PictureBox pic4, PictureBox pic5, PictureBox pic6, PictureBox pic7, PictureBox pic8, PictureBox pic9) { - if (ExplorerPatcher.IsAllowed()) - Program.EP = new ExplorerPatcher(); + if (ExplorerPatcher.IsAllowed()) Program.EP = new(); switch (Style) { @@ -367,8 +366,7 @@ public static void ApplyWin10xLegends(Theme.Manager TM, WindowStyle Style, Label /// public static void ApplyWinElementsColors(Theme.Manager TM, WindowStyle Style, bool AnimateColorChange, UI.Simulation.WinElement Taskbar, UI.Simulation.WinElement Start, UI.Simulation.WinElement ActionCenter, UI.WP.LabelAlt setting_icon_preview, UI.WP.LabelAlt settings_label, UI.WP.LabelAlt Link_preview) { - if (ExplorerPatcher.IsAllowed()) - Program.EP = new ExplorerPatcher(); + if (ExplorerPatcher.IsAllowed()) Program.EP = new(); Program.Style.RenderingHint = TM.MetricsFonts.Fonts_SingleBitPP ? TextRenderingHint.SingleBitPerPixelGridFit : TextRenderingHint.ClearTypeGridFit; @@ -1076,7 +1074,7 @@ public static void ApplyWinElementsColors(Theme.Manager TM, WindowStyle Style, b if (!Theme.Manager.IsFontInstalled("Segoe MDL2 Assets")) { - setting_icon_preview.Font = new Font("Arial", 28f, FontStyle.Regular); + setting_icon_preview.Font = new("Arial", 28f, FontStyle.Regular); setting_icon_preview.Text = "♣"; } @@ -1257,7 +1255,7 @@ public static void ApplyWinElementsStyle(Theme.Manager TM, WindowStyle Style, UI { PathsExt.MSTheme = PathsExt.MSTheme_Luna_theme; System.IO.File.WriteAllText(PathsExt.MSTheme_Luna_theme, string.Format("[VisualStyles]{1}Path={0}{1}ColorStyle=NormalColor{1}Size=NormalSize", PathsExt.appData + @"\VisualStyles\Luna\luna.msstyles", "\r\n")); - Program.resVS = new VisualStylesRes(PathsExt.MSTheme); + Program.resVS = new(PathsExt.MSTheme); break; } @@ -1265,7 +1263,7 @@ public static void ApplyWinElementsStyle(Theme.Manager TM, WindowStyle Style, UI { PathsExt.MSTheme = PathsExt.MSTheme_Luna_theme; System.IO.File.WriteAllText(PathsExt.MSTheme_Luna_theme, string.Format("[VisualStyles]{1}Path={0}{1}ColorStyle=HomeStead{1}Size=NormalSize", PathsExt.appData + @"\VisualStyles\Luna\luna.msstyles", "\r\n")); - Program.resVS = new VisualStylesRes(PathsExt.MSTheme); + Program.resVS = new(PathsExt.MSTheme); break; } @@ -1273,7 +1271,7 @@ public static void ApplyWinElementsStyle(Theme.Manager TM, WindowStyle Style, UI { PathsExt.MSTheme = PathsExt.MSTheme_Luna_theme; System.IO.File.WriteAllText(PathsExt.MSTheme_Luna_theme, string.Format("[VisualStyles]{1}Path={0}{1}ColorStyle=Metallic{1}Size=NormalSize", PathsExt.appData + @"\VisualStyles\Luna\luna.msstyles", "\r\n")); - Program.resVS = new VisualStylesRes(PathsExt.MSTheme); + Program.resVS = new(PathsExt.MSTheme); break; } @@ -1291,7 +1289,7 @@ public static void ApplyWinElementsStyle(Theme.Manager TM, WindowStyle Style, UI System.IO.File.WriteAllText(PathsExt.MSTheme_Luna_theme, string.Format("[VisualStyles]{1}Path={0}{1}ColorStyle={2}{1}Size=NormalSize", TM.WindowsXP.ThemeFile, "\r\n", TM.WindowsXP.ColorScheme)); } } - Program.resVS = new VisualStylesRes(PathsExt.MSTheme); + Program.resVS = new(PathsExt.MSTheme); break; } @@ -1299,7 +1297,7 @@ public static void ApplyWinElementsStyle(Theme.Manager TM, WindowStyle Style, UI { PathsExt.MSTheme = PathsExt.MSTheme_Luna_theme; System.IO.File.WriteAllText(PathsExt.MSTheme_Luna_theme, string.Format("[VisualStyles]{1}Path={0}{1}ColorStyle=NormalColor{1}Size=NormalSize", PathsExt.appData + @"\VisualStyles\Luna\luna.msstyles", "\r\n")); - Program.resVS = new VisualStylesRes(PathsExt.MSTheme); + Program.resVS = new(PathsExt.MSTheme); break; } @@ -1309,7 +1307,7 @@ public static void ApplyWinElementsStyle(Theme.Manager TM, WindowStyle Style, UI { if (System.IO.File.Exists(PathsExt.MSTheme) & !string.IsNullOrEmpty(PathsExt.MSTheme)) { - var vs = new Devcorp.Controls.VisualStyles.VisualStyleFile(PathsExt.MSTheme); + Devcorp.Controls.VisualStyles.VisualStyleFile vs = new(PathsExt.MSTheme); TM.Win32.Load(Theme.Structures.Win32UI.Sources.VisualStyles, vs.Metrics); } } @@ -1318,7 +1316,7 @@ public static void ApplyWinElementsStyle(Theme.Manager TM, WindowStyle Style, UI { if (System.IO.File.Exists(PathsExt.MSTheme) & !string.IsNullOrEmpty(PathsExt.MSTheme)) { - var vs = new Devcorp.Controls.VisualStyles.VisualStyleFile(PathsExt.MSTheme); + Devcorp.Controls.VisualStyles.VisualStyleFile vs = new(PathsExt.MSTheme); TM.MetricsFonts.Overwrite_Metrics(vs.Metrics); } } @@ -1327,7 +1325,7 @@ public static void ApplyWinElementsStyle(Theme.Manager TM, WindowStyle Style, UI { if (System.IO.File.Exists(PathsExt.MSTheme) & !string.IsNullOrEmpty(PathsExt.MSTheme)) { - var vs = new Devcorp.Controls.VisualStyles.VisualStyleFile(PathsExt.MSTheme); + Devcorp.Controls.VisualStyles.VisualStyleFile vs = new(PathsExt.MSTheme); TM.MetricsFonts.Overwrite_Fonts(vs.Metrics); } } @@ -1368,9 +1366,9 @@ public static void ApplyWinElementsStyle(Theme.Manager TM, WindowStyle Style, UI ClassicAppButton1.Text = string.Empty; ClassicAppButton2.Text = string.Empty; ClassicAppButton2.Left = ClassicAppButton1.Right + 3; - ClassicAppButton1.Font = new Font(TM.MetricsFonts.CaptionFont.Name, 8f, ClassicAppButton1.Font.Style); - ClassicAppButton2.Font = new Font(TM.MetricsFonts.CaptionFont.Name, 8f, ClassicAppButton2.Font.Style); - ClassicStartButton.Font = new Font(TM.MetricsFonts.CaptionFont.Name, 8.5f, ClassicStartButton.Font.Style); + ClassicAppButton1.Font = new(TM.MetricsFonts.CaptionFont.Name, 8f, ClassicAppButton1.Font.Style); + ClassicAppButton2.Font = new(TM.MetricsFonts.CaptionFont.Name, 8f, ClassicAppButton2.Font.Style); + ClassicStartButton.Font = new(TM.MetricsFonts.CaptionFont.Name, 8.5f, ClassicStartButton.Font.Style); ClassicAppButton1.HatchBrush = false; } @@ -1378,8 +1376,7 @@ public static void ApplyWinElementsStyle(Theme.Manager TM, WindowStyle Style, UI { case WindowStyle.W11: { - if (OS.W12 || OS.W11) - Program.EP = new ExplorerPatcher(); + if (OS.W12 || OS.W11) Program.EP = new(); if (ExplorerPatcher.IsAllowed()) { @@ -1404,8 +1401,8 @@ public static void ApplyWinElementsStyle(Theme.Manager TM, WindowStyle Style, UI { Start.BlurPower = 6; Start.NoisePower = 0.3f; - Start.Size = new Size(135, 200); - Start.Location = new Point(10, Taskbar.Bottom - Taskbar.Height - Start.Height - 10); + Start.Size = new(135, 200); + Start.Location = new(10, Taskbar.Bottom - Taskbar.Height - Start.Height - 10); } else { @@ -1416,7 +1413,7 @@ public static void ApplyWinElementsStyle(Theme.Manager TM, WindowStyle Style, UI { case ExplorerPatcher.StartStyles.NotRounded: { - Start.Size = new Size(182, 201); + Start.Size = new(182, 201); Start.Left = 0; Start.Top = Taskbar.Bottom - Taskbar.Height - Start.Height; Start.UseWin11RoundedCorners_WithWin10_Level1 = false; @@ -1426,7 +1423,7 @@ public static void ApplyWinElementsStyle(Theme.Manager TM, WindowStyle Style, UI case ExplorerPatcher.StartStyles.RoundedCornersDockedMenu: { - Start.Size = new Size(182, 201); + Start.Size = new(182, 201); Start.Left = 0; Start.Top = Taskbar.Bottom - Taskbar.Height - Start.Height; Start.UseWin11RoundedCorners_WithWin10_Level1 = true; @@ -1436,8 +1433,8 @@ public static void ApplyWinElementsStyle(Theme.Manager TM, WindowStyle Style, UI case ExplorerPatcher.StartStyles.RoundedCornersFloatingMenu: { - Start.Size = new Size(182, 201); - Start.Location = new Point(10, Taskbar.Bottom - Taskbar.Height - Start.Height - 10); + Start.Size = new(182, 201); + Start.Location = new(10, Taskbar.Bottom - Taskbar.Height - Start.Height - 10); Start.UseWin11RoundedCorners_WithWin10_Level1 = false; Start.UseWin11RoundedCorners_WithWin10_Level2 = true; break; @@ -1455,15 +1452,15 @@ public static void ApplyWinElementsStyle(Theme.Manager TM, WindowStyle Style, UI // ######################## Start.BlurPower = 6; Start.NoisePower = 0.3f; - Start.Size = new Size(135, 200); - Start.Location = new Point(10, Taskbar.Bottom - Taskbar.Height - Start.Height - 10); + Start.Size = new(135, 200); + Start.Location = new(10, Taskbar.Bottom - Taskbar.Height - Start.Height - 10); } ActionCenter.Dock = default; ActionCenter.BlurPower = 6; ActionCenter.NoisePower = 0.3f; - ActionCenter.Size = new Size(120, 85); - ActionCenter.Location = new Point(ActionCenter.Parent.Width - ActionCenter.Width - 10, ActionCenter.Parent.Height - ActionCenter.Height - Taskbar.Height - 10); + ActionCenter.Size = new(120, 85); + ActionCenter.Location = new(ActionCenter.Parent.Width - ActionCenter.Width - 10, ActionCenter.Parent.Height - ActionCenter.Height - Taskbar.Height - 10); break; } @@ -1481,7 +1478,7 @@ public static void ApplyWinElementsStyle(Theme.Manager TM, WindowStyle Style, UI Taskbar.Height = 35; Taskbar.UseWin11ORB_WithWin10 = false; - Start.Size = new Size(182, 201); + Start.Size = new(182, 201); Start.Left = 0; Start.Top = Taskbar.Bottom - Taskbar.Height - Start.Height; Start.UseWin11RoundedCorners_WithWin10_Level1 = false; @@ -1547,9 +1544,9 @@ public static void ApplyWinElementsStyle(Theme.Manager TM, WindowStyle Style, UI ClassicAppButton1.Text = ClassicWindow1.Text; ClassicAppButton2.Text = ClassicWindow2.Text; ClassicAppButton2.Left = ClassicAppButton1.Right + 3; - ClassicAppButton1.Font = new Font(TM.MetricsFonts.CaptionFont.Name, 8f, ClassicAppButton1.Font.Style); - ClassicAppButton2.Font = new Font(TM.MetricsFonts.CaptionFont.Name, 8f, ClassicAppButton2.Font.Style); - ClassicStartButton.Font = new Font(TM.MetricsFonts.CaptionFont.Name, 8.5f, ClassicStartButton.Font.Style); + ClassicAppButton1.Font = new(TM.MetricsFonts.CaptionFont.Name, 8f, ClassicAppButton1.Font.Style); + ClassicAppButton2.Font = new(TM.MetricsFonts.CaptionFont.Name, 8f, ClassicAppButton2.Font.Style); + ClassicStartButton.Font = new(TM.MetricsFonts.CaptionFont.Name, 8.5f, ClassicStartButton.Font.Style); ClassicAppButton1.HatchBrush = true; break; } @@ -1573,9 +1570,9 @@ public static void ApplyWinElementsStyle(Theme.Manager TM, WindowStyle Style, UI ClassicAppButton1.Text = ClassicWindow1.Text; ClassicAppButton2.Text = ClassicWindow2.Text; ClassicAppButton2.Left = ClassicAppButton1.Right + 3; - ClassicAppButton1.Font = new Font(TM.MetricsFonts.CaptionFont.Name, 8f, ClassicAppButton1.Font.Style); - ClassicAppButton2.Font = new Font(TM.MetricsFonts.CaptionFont.Name, 8f, ClassicAppButton2.Font.Style); - ClassicStartButton.Font = new Font(TM.MetricsFonts.CaptionFont.Name, 8.5f, ClassicStartButton.Font.Style); + ClassicAppButton1.Font = new(TM.MetricsFonts.CaptionFont.Name, 8f, ClassicAppButton1.Font.Style); + ClassicAppButton2.Font = new(TM.MetricsFonts.CaptionFont.Name, 8f, ClassicAppButton2.Font.Style); + ClassicStartButton.Font = new(TM.MetricsFonts.CaptionFont.Name, 8.5f, ClassicStartButton.Font.Style); ClassicAppButton1.HatchBrush = true; break; } @@ -1633,8 +1630,7 @@ public static void ApplyWindowStyles(Theme.Manager TM, WindowStyle Style, UI.Sim Window1.Active = true; Window2.Active = false; - if (ExplorerPatcher.IsAllowed()) - Program.EP = new ExplorerPatcher(); + if (ExplorerPatcher.IsAllowed()) Program.EP = new(); Window1.SuspendRefresh = true; Window2.SuspendRefresh = true; @@ -2342,7 +2338,7 @@ public static Bitmap GetTintedWallpaper(Theme.Structures.WallpaperTone WT) } } - using (var ImgF = new ImageProcessor.ImageFactory()) + using (ImageProcessor.ImageFactory ImgF = new()) { ImgF.Load(WT.Image); ImgF.Hue(WT.H, true); diff --git a/WinPaletter/Theme/Support/Voids.cs b/WinPaletter/Theme/Support/Voids.cs index b7274495..3d252c84 100644 --- a/WinPaletter/Theme/Support/Voids.cs +++ b/WinPaletter/Theme/Support/Voids.cs @@ -81,7 +81,8 @@ public void Execute(MethodInvoker Void, TreeView TreeView = null, string StartSt { bool ReportProgress = TreeView is not null; - var sw = new Stopwatch(); + Stopwatch sw = new(); + sw.Reset(); sw.Stop(); sw.Start(); diff --git a/WinPaletter/Updates/Updates.Designer.cs b/WinPaletter/Updates/Updates.Designer.cs index 892f9908..00480142 100644 --- a/WinPaletter/Updates/Updates.Designer.cs +++ b/WinPaletter/Updates/Updates.Designer.cs @@ -35,382 +35,397 @@ protected override void Dispose(bool disposing) [DebuggerStepThrough()] private void InitializeComponent() { - var resources = new System.ComponentModel.ComponentResourceManager(typeof(Updates)); - Label2 = new Label(); - Panel1 = new Panel(); - LinkLabel3 = new UI.WP.LinkLabel(); - LinkLabel3.LinkClicked += new LinkLabelLinkClickedEventHandler(LinkLabel3_LinkClicked); - RadioButton2 = new UI.WP.RadioButton(); - RadioButton3 = new UI.WP.RadioButton(); - RadioButton1 = new UI.WP.RadioButton(); - ProgressBar1 = new UI.WP.ProgressBar(); - SaveFileDialog1 = new SaveFileDialog(); - Label1 = new Label(); - PictureBox2 = new PictureBox(); - PictureBox4 = new PictureBox(); - Label6 = new Label(); - Label7 = new Label(); - PictureBox5 = new PictureBox(); - Label8 = new Label(); - Label9 = new Label(); - AnimatedBox1 = new UI.WP.AnimatedBox(); - Label3 = new UI.WP.LinkLabel(); - Label3.LinkClicked += new LinkLabelLinkClickedEventHandler(Label3_LinkClicked); - PictureBox1 = new PictureBox(); - Label17 = new Label(); - CheckBox1 = new UI.WP.CheckBox(); - CheckBox1.CheckedChanged += new UI.WP.CheckBox.CheckedChangedEventHandler(CheckBox1_CheckedChanged); - AlertBox2 = new UI.WP.AlertBox(); - Separator1 = new UI.WP.SeparatorH(); - Button3 = new UI.WP.Button(); - Button3.Click += new EventHandler(Button3_Click); - Button1 = new UI.WP.Button(); - Button1.Click += new EventHandler(Button1_Click); - Panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)PictureBox2).BeginInit(); - ((System.ComponentModel.ISupportInitialize)PictureBox4).BeginInit(); - ((System.ComponentModel.ISupportInitialize)PictureBox5).BeginInit(); - AnimatedBox1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)PictureBox1).BeginInit(); - SuspendLayout(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Updates)); + this.Label2 = new System.Windows.Forms.Label(); + this.Panel1 = new System.Windows.Forms.Panel(); + this.LinkLabel3 = new WinPaletter.UI.WP.LinkLabel(); + this.RadioButton2 = new WinPaletter.UI.WP.RadioButton(); + this.RadioButton3 = new WinPaletter.UI.WP.RadioButton(); + this.RadioButton1 = new WinPaletter.UI.WP.RadioButton(); + this.ProgressBar1 = new WinPaletter.UI.WP.ProgressBar(); + this.SaveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); + this.Label1 = new System.Windows.Forms.Label(); + this.PictureBox2 = new System.Windows.Forms.PictureBox(); + this.PictureBox4 = new System.Windows.Forms.PictureBox(); + this.Label6 = new System.Windows.Forms.Label(); + this.Label7 = new System.Windows.Forms.Label(); + this.PictureBox5 = new System.Windows.Forms.PictureBox(); + this.Label8 = new System.Windows.Forms.Label(); + this.Label9 = new System.Windows.Forms.Label(); + this.AnimatedBox1 = new WinPaletter.UI.WP.AnimatedBox(); + this.Label3 = new WinPaletter.UI.WP.LinkLabel(); + this.PictureBox1 = new System.Windows.Forms.PictureBox(); + this.Label17 = new System.Windows.Forms.Label(); + this.CheckBox1 = new WinPaletter.UI.WP.CheckBox(); + this.AlertBox2 = new WinPaletter.UI.WP.AlertBox(); + this.Separator1 = new WinPaletter.UI.WP.SeparatorH(); + this.Button3 = new WinPaletter.UI.WP.Button(); + this.Button1 = new WinPaletter.UI.WP.Button(); + this.Panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox5)).BeginInit(); + this.AnimatedBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit(); + this.SuspendLayout(); // // Label2 // - Label2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - Label2.Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); - Label2.Location = new Point(174, 78); - Label2.Name = "Label2"; - Label2.Size = new Size(233, 24); - Label2.TabIndex = 16; - Label2.Text = "0.0.0.0"; - Label2.TextAlign = ContentAlignment.MiddleLeft; + this.Label2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.Label2.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label2.Location = new System.Drawing.Point(174, 78); + this.Label2.Name = "Label2"; + this.Label2.Size = new System.Drawing.Size(233, 24); + this.Label2.TabIndex = 16; + this.Label2.Text = "0.0.0.0"; + this.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // Panel1 // - Panel1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - Panel1.Controls.Add(LinkLabel3); - Panel1.Controls.Add(RadioButton2); - Panel1.Controls.Add(RadioButton3); - Panel1.Controls.Add(RadioButton1); - Panel1.Location = new Point(11, 241); - Panel1.Name = "Panel1"; - Panel1.Size = new Size(395, 117); - Panel1.TabIndex = 18; - Panel1.Visible = false; + this.Panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.Panel1.Controls.Add(this.LinkLabel3); + this.Panel1.Controls.Add(this.RadioButton2); + this.Panel1.Controls.Add(this.RadioButton3); + this.Panel1.Controls.Add(this.RadioButton1); + this.Panel1.Location = new System.Drawing.Point(11, 241); + this.Panel1.Name = "Panel1"; + this.Panel1.Size = new System.Drawing.Size(395, 117); + this.Panel1.TabIndex = 18; + this.Panel1.Visible = false; // // LinkLabel3 // - LinkLabel3.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - LinkLabel3.Font = new Font("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); - LinkLabel3.ForeColor = Color.DodgerBlue; - LinkLabel3.LinkBehavior = LinkBehavior.NeverUnderline; - LinkLabel3.LinkColor = Color.DodgerBlue; - LinkLabel3.Location = new Point(16, 90); - LinkLabel3.Name = "LinkLabel3"; - LinkLabel3.Size = new Size(376, 24); - LinkLabel3.TabIndex = 33; - LinkLabel3.TabStop = true; - LinkLabel3.Text = "• What's new?"; - LinkLabel3.TextAlign = ContentAlignment.MiddleLeft; - LinkLabel3.Visible = false; + this.LinkLabel3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.LinkLabel3.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.LinkLabel3.ForeColor = System.Drawing.Color.DodgerBlue; + this.LinkLabel3.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; + this.LinkLabel3.LinkColor = System.Drawing.Color.DodgerBlue; + this.LinkLabel3.Location = new System.Drawing.Point(16, 90); + this.LinkLabel3.Name = "LinkLabel3"; + this.LinkLabel3.Size = new System.Drawing.Size(376, 24); + this.LinkLabel3.TabIndex = 33; + this.LinkLabel3.TabStop = true; + this.LinkLabel3.Text = "• What\'s new?"; + this.LinkLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.LinkLabel3.Visible = false; + this.LinkLabel3.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LinkLabel3_LinkClicked); // // RadioButton2 // - RadioButton2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - RadioButton2.BackColor = Color.FromArgb(25, 25, 25); - RadioButton2.Checked = false; - RadioButton2.Font = new Font("Segoe UI", 9.0f); - RadioButton2.ForeColor = Color.White; - RadioButton2.Location = new Point(3, 32); - RadioButton2.Name = "RadioButton2"; - RadioButton2.Size = new Size(389, 23); - RadioButton2.TabIndex = 2; - RadioButton2.Text = "Save download as..."; + this.RadioButton2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.RadioButton2.Checked = false; + this.RadioButton2.Font = new System.Drawing.Font("Segoe UI", 9F); + this.RadioButton2.ForeColor = System.Drawing.Color.White; + this.RadioButton2.Location = new System.Drawing.Point(3, 32); + this.RadioButton2.Name = "RadioButton2"; + this.RadioButton2.Size = new System.Drawing.Size(389, 23); + this.RadioButton2.TabIndex = 2; + this.RadioButton2.Text = "Save download as..."; // // RadioButton3 // - RadioButton3.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - RadioButton3.BackColor = Color.FromArgb(25, 25, 25); - RadioButton3.Checked = false; - RadioButton3.Font = new Font("Segoe UI", 9.0f); - RadioButton3.ForeColor = Color.White; - RadioButton3.Location = new Point(3, 61); - RadioButton3.Name = "RadioButton3"; - RadioButton3.Size = new Size(389, 23); - RadioButton3.TabIndex = 1; - RadioButton3.Text = "Just download from the browser"; + this.RadioButton3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.RadioButton3.Checked = false; + this.RadioButton3.Font = new System.Drawing.Font("Segoe UI", 9F); + this.RadioButton3.ForeColor = System.Drawing.Color.White; + this.RadioButton3.Location = new System.Drawing.Point(3, 61); + this.RadioButton3.Name = "RadioButton3"; + this.RadioButton3.Size = new System.Drawing.Size(389, 23); + this.RadioButton3.TabIndex = 1; + this.RadioButton3.Text = "Just download from the browser"; // // RadioButton1 // - RadioButton1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - RadioButton1.BackColor = Color.FromArgb(25, 25, 25); - RadioButton1.Checked = true; - RadioButton1.Font = new Font("Segoe UI", 9.0f); - RadioButton1.ForeColor = Color.White; - RadioButton1.Location = new Point(3, 3); - RadioButton1.Name = "RadioButton1"; - RadioButton1.Size = new Size(389, 23); - RadioButton1.TabIndex = 0; - RadioButton1.Text = "Download then close WinPaletter and replace it by the new update"; + this.RadioButton1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.RadioButton1.Checked = true; + this.RadioButton1.Font = new System.Drawing.Font("Segoe UI", 9F); + this.RadioButton1.ForeColor = System.Drawing.Color.White; + this.RadioButton1.Location = new System.Drawing.Point(3, 3); + this.RadioButton1.Name = "RadioButton1"; + this.RadioButton1.Size = new System.Drawing.Size(389, 23); + this.RadioButton1.TabIndex = 0; + this.RadioButton1.Text = "Download then close WinPaletter and replace it by the new update"; // // ProgressBar1 // - ProgressBar1.Location = new Point(11, 364); - ProgressBar1.Name = "ProgressBar1"; - ProgressBar1.Size = new Size(395, 10); - ProgressBar1.TabIndex = 3; - ProgressBar1.Visible = false; + this.ProgressBar1.AnimationDuration = 1000; + this.ProgressBar1.Appearance = WinPaletter.UI.WP.ProgressBar.ProgressBarAppearance.Bar; + this.ProgressBar1.BackColor = System.Drawing.Color.Transparent; + this.ProgressBar1.Location = new System.Drawing.Point(11, 364); + this.ProgressBar1.Name = "ProgressBar1"; + this.ProgressBar1.Size = new System.Drawing.Size(395, 10); + this.ProgressBar1.State = WinPaletter.UI.WP.ProgressBar.ProgressBarState.Normal; + this.ProgressBar1.Style = WinPaletter.UI.WP.ProgressBar.ProgressBarStyle.Continuous; + this.ProgressBar1.TabIndex = 3; + this.ProgressBar1.TaskbarBroadcast = true; + this.ProgressBar1.Visible = false; // // SaveFileDialog1 // - SaveFileDialog1.FileName = "WinPaletter"; - SaveFileDialog1.Filter = "Executable File|*.exe"; + this.SaveFileDialog1.FileName = "WinPaletter"; + this.SaveFileDialog1.Filter = "Executable File|*.exe"; // // Label1 // - Label1.Font = new Font("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); - Label1.Location = new Point(42, 78); - Label1.Name = "Label1"; - Label1.Size = new Size(126, 24); - Label1.TabIndex = 20; - Label1.Text = "Current version:"; - Label1.TextAlign = ContentAlignment.MiddleLeft; + this.Label1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label1.Location = new System.Drawing.Point(42, 78); + this.Label1.Name = "Label1"; + this.Label1.Size = new System.Drawing.Size(126, 24); + this.Label1.TabIndex = 20; + this.Label1.Text = "Current version:"; + this.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // PictureBox2 // - PictureBox2.Image = (Image)resources.GetObject("PictureBox2.Image"); - PictureBox2.Location = new Point(12, 78); - PictureBox2.Name = "PictureBox2"; - PictureBox2.Size = new Size(24, 24); - PictureBox2.TabIndex = 21; - PictureBox2.TabStop = false; + this.PictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox2.Image"))); + this.PictureBox2.Location = new System.Drawing.Point(12, 78); + this.PictureBox2.Name = "PictureBox2"; + this.PictureBox2.Size = new System.Drawing.Size(24, 24); + this.PictureBox2.TabIndex = 21; + this.PictureBox2.TabStop = false; // // PictureBox4 // - PictureBox4.Image = (Image)resources.GetObject("PictureBox4.Image"); - PictureBox4.Location = new Point(12, 108); - PictureBox4.Name = "PictureBox4"; - PictureBox4.Size = new Size(24, 24); - PictureBox4.TabIndex = 27; - PictureBox4.TabStop = false; + this.PictureBox4.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox4.Image"))); + this.PictureBox4.Location = new System.Drawing.Point(12, 108); + this.PictureBox4.Name = "PictureBox4"; + this.PictureBox4.Size = new System.Drawing.Size(24, 24); + this.PictureBox4.TabIndex = 27; + this.PictureBox4.TabStop = false; // // Label6 // - Label6.Font = new Font("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); - Label6.Location = new Point(42, 108); - Label6.Name = "Label6"; - Label6.Size = new Size(126, 24); - Label6.TabIndex = 26; - Label6.Text = "Update size:"; - Label6.TextAlign = ContentAlignment.MiddleLeft; + this.Label6.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label6.Location = new System.Drawing.Point(42, 108); + this.Label6.Name = "Label6"; + this.Label6.Size = new System.Drawing.Size(126, 24); + this.Label6.TabIndex = 26; + this.Label6.Text = "Update size:"; + this.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // Label7 // - Label7.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - Label7.Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); - Label7.Location = new Point(174, 108); - Label7.Name = "Label7"; - Label7.Size = new Size(233, 24); - Label7.TabIndex = 25; - Label7.TextAlign = ContentAlignment.MiddleLeft; + this.Label7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.Label7.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label7.Location = new System.Drawing.Point(174, 108); + this.Label7.Name = "Label7"; + this.Label7.Size = new System.Drawing.Size(233, 24); + this.Label7.TabIndex = 25; + this.Label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // PictureBox5 // - PictureBox5.Image = (Image)resources.GetObject("PictureBox5.Image"); - PictureBox5.Location = new Point(12, 138); - PictureBox5.Name = "PictureBox5"; - PictureBox5.Size = new Size(24, 24); - PictureBox5.TabIndex = 30; - PictureBox5.TabStop = false; + this.PictureBox5.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox5.Image"))); + this.PictureBox5.Location = new System.Drawing.Point(12, 138); + this.PictureBox5.Name = "PictureBox5"; + this.PictureBox5.Size = new System.Drawing.Size(24, 24); + this.PictureBox5.TabIndex = 30; + this.PictureBox5.TabStop = false; // // Label8 // - Label8.Font = new Font("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); - Label8.Location = new Point(42, 138); - Label8.Name = "Label8"; - Label8.Size = new Size(126, 24); - Label8.TabIndex = 29; - Label8.Text = "Release date:"; - Label8.TextAlign = ContentAlignment.MiddleLeft; + this.Label8.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label8.Location = new System.Drawing.Point(42, 138); + this.Label8.Name = "Label8"; + this.Label8.Size = new System.Drawing.Size(126, 24); + this.Label8.TabIndex = 29; + this.Label8.Text = "Release date:"; + this.Label8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // Label9 // - Label9.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - Label9.Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); - Label9.Location = new Point(174, 138); - Label9.Name = "Label9"; - Label9.Size = new Size(233, 24); - Label9.TabIndex = 28; - Label9.TextAlign = ContentAlignment.MiddleLeft; + this.Label9.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.Label9.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label9.Location = new System.Drawing.Point(174, 138); + this.Label9.Name = "Label9"; + this.Label9.Size = new System.Drawing.Size(233, 24); + this.Label9.TabIndex = 28; + this.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // AnimatedBox1 // - AnimatedBox1.Color1 = Color.DodgerBlue; - AnimatedBox1.Color2 = Color.Crimson; - AnimatedBox1.Controls.Add(Label3); - AnimatedBox1.Controls.Add(PictureBox1); - AnimatedBox1.Controls.Add(Label17); - AnimatedBox1.Dock = DockStyle.Top; - AnimatedBox1.Location = new Point(0, 0); - AnimatedBox1.Name = "AnimatedBox1"; - AnimatedBox1.Size = new Size(421, 68); - AnimatedBox1.Style = UI.WP.AnimatedBox.Styles.SwapColors; - AnimatedBox1.TabIndex = 32; + this.AnimatedBox1.BackColor = System.Drawing.Color.Transparent; + this.AnimatedBox1.Color1 = System.Drawing.Color.DodgerBlue; + this.AnimatedBox1.Color2 = System.Drawing.Color.Crimson; + this.AnimatedBox1.Controls.Add(this.Label3); + this.AnimatedBox1.Controls.Add(this.PictureBox1); + this.AnimatedBox1.Controls.Add(this.Label17); + this.AnimatedBox1.Dock = System.Windows.Forms.DockStyle.Top; + this.AnimatedBox1.Location = new System.Drawing.Point(0, 0); + this.AnimatedBox1.Name = "AnimatedBox1"; + this.AnimatedBox1.Size = new System.Drawing.Size(421, 68); + this.AnimatedBox1.Style = WinPaletter.UI.WP.AnimatedBox.Styles.SwapColors; + this.AnimatedBox1.TabIndex = 32; // // Label3 // - Label3.Anchor = AnchorStyles.Top | AnchorStyles.Right; - Label3.BackColor = Color.Transparent; - Label3.Font = new Font("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); - Label3.ForeColor = Color.DodgerBlue; - Label3.LinkBehavior = LinkBehavior.NeverUnderline; - Label3.LinkColor = Color.DodgerBlue; - Label3.Location = new Point(316, 22); - Label3.Name = "Label3"; - Label3.Size = new Size(93, 24); - Label3.TabIndex = 17; - Label3.TabStop = true; - Label3.Text = "Stable channel"; - Label3.TextAlign = ContentAlignment.MiddleCenter; + this.Label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.Label3.BackColor = System.Drawing.Color.Transparent; + this.Label3.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label3.ForeColor = System.Drawing.Color.DodgerBlue; + this.Label3.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; + this.Label3.LinkColor = System.Drawing.Color.DodgerBlue; + this.Label3.Location = new System.Drawing.Point(316, 22); + this.Label3.Name = "Label3"; + this.Label3.Size = new System.Drawing.Size(93, 24); + this.Label3.TabIndex = 17; + this.Label3.TabStop = true; + this.Label3.Text = "Stable channel"; + this.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.Label3.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.Label3_LinkClicked); // // PictureBox1 // - PictureBox1.BackColor = Color.Transparent; - PictureBox1.Image = (Image)resources.GetObject("PictureBox1.Image"); - PictureBox1.Location = new Point(10, 10); - PictureBox1.Name = "PictureBox1"; - PictureBox1.Size = new Size(48, 48); - PictureBox1.SizeMode = PictureBoxSizeMode.CenterImage; - PictureBox1.TabIndex = 8; - PictureBox1.TabStop = false; + this.PictureBox1.BackColor = System.Drawing.Color.Transparent; + this.PictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("PictureBox1.Image"))); + this.PictureBox1.Location = new System.Drawing.Point(10, 10); + this.PictureBox1.Name = "PictureBox1"; + this.PictureBox1.Size = new System.Drawing.Size(48, 48); + this.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.PictureBox1.TabIndex = 8; + this.PictureBox1.TabStop = false; // // Label17 // - Label17.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - Label17.BackColor = Color.Transparent; - Label17.Font = new Font("Segoe UI Semibold", 14.25f, FontStyle.Bold, GraphicsUnit.Point, 0); - Label17.Location = new Point(65, 10); - Label17.Name = "Label17"; - Label17.Size = new Size(245, 48); - Label17.TabIndex = 9; - Label17.Text = "Updates"; - Label17.TextAlign = ContentAlignment.MiddleLeft; + this.Label17.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.Label17.BackColor = System.Drawing.Color.Transparent; + this.Label17.Font = new System.Drawing.Font("Segoe UI Semibold", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label17.Location = new System.Drawing.Point(65, 10); + this.Label17.Name = "Label17"; + this.Label17.Size = new System.Drawing.Size(245, 48); + this.Label17.TabIndex = 9; + this.Label17.Text = "Updates"; + this.Label17.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // CheckBox1 // - CheckBox1.BackColor = Color.FromArgb(25, 25, 25); - CheckBox1.Checked = true; - CheckBox1.Font = new Font("Segoe UI", 9.0f); - CheckBox1.ForeColor = Color.White; - CheckBox1.Location = new Point(12, 168); - CheckBox1.Name = "CheckBox1"; - CheckBox1.Size = new Size(395, 23); - CheckBox1.TabIndex = 31; - CheckBox1.Text = "Automatic check for updates"; + this.CheckBox1.Checked = true; + this.CheckBox1.Font = new System.Drawing.Font("Segoe UI", 9F); + this.CheckBox1.ForeColor = System.Drawing.Color.White; + this.CheckBox1.Location = new System.Drawing.Point(12, 168); + this.CheckBox1.Name = "CheckBox1"; + this.CheckBox1.Size = new System.Drawing.Size(395, 23); + this.CheckBox1.TabIndex = 31; + this.CheckBox1.Text = "Automatic check for updates"; + this.CheckBox1.CheckedChanged += new WinPaletter.UI.WP.CheckBox.CheckedChangedEventHandler(this.CheckBox1_CheckedChanged); // // AlertBox2 // - AlertBox2.AlertStyle = UI.WP.AlertBox.Style.Warning; - AlertBox2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - AlertBox2.BackColor = Color.FromArgb(125, 20, 30); - AlertBox2.CenterText = true; - AlertBox2.CustomColor = Color.FromArgb(0, 81, 210); - AlertBox2.Font = new Font("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); - AlertBox2.Image = null; - AlertBox2.Location = new Point(12, 205); - AlertBox2.Name = "AlertBox2"; - AlertBox2.Size = new Size(395, 31); - AlertBox2.TabIndex = 12; - AlertBox2.TabStop = false; - AlertBox2.Text = "Update available"; - AlertBox2.Visible = false; + this.AlertBox2.AlertStyle = WinPaletter.UI.WP.AlertBox.Style.Warning; + this.AlertBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.AlertBox2.BackColor = System.Drawing.Color.Transparent; + this.AlertBox2.CenterText = true; + this.AlertBox2.CustomColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(81)))), ((int)(((byte)(210))))); + this.AlertBox2.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.AlertBox2.Image = null; + this.AlertBox2.Location = new System.Drawing.Point(12, 205); + this.AlertBox2.Name = "AlertBox2"; + this.AlertBox2.Size = new System.Drawing.Size(395, 31); + this.AlertBox2.TabIndex = 12; + this.AlertBox2.TabStop = false; + this.AlertBox2.Text = "Update available"; + this.AlertBox2.Visible = false; // // Separator1 // - Separator1.AlternativeLook = false; - Separator1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - Separator1.Location = new Point(12, 198); - Separator1.Name = "Separator1"; - Separator1.Size = new Size(395, 1); - Separator1.TabIndex = 8; - Separator1.TabStop = false; + this.Separator1.AlternativeLook = false; + this.Separator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.Separator1.BackColor = System.Drawing.Color.Transparent; + this.Separator1.Location = new System.Drawing.Point(12, 198); + this.Separator1.Name = "Separator1"; + this.Separator1.Size = new System.Drawing.Size(395, 1); + this.Separator1.TabIndex = 8; + this.Separator1.TabStop = false; // // Button3 // - Button3.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; - Button3.BackColor = Color.FromArgb(34, 34, 34); - - Button3.Font = new Font("Segoe UI", 9.0f); - Button3.ForeColor = Color.White; - Button3.Image = null; - Button3.Location = new Point(162, 382); - Button3.Name = "Button3"; - Button3.Size = new Size(80, 34); - Button3.TabIndex = 2; - Button3.Text = "Cancel"; - Button3.UseVisualStyleBackColor = false; - // - // Button12 - // - Button1.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; - Button1.BackColor = Color.FromArgb(34, 34, 34); - - Button1.Font = new Font("Segoe UI", 9.0f); - Button1.ForeColor = Color.White; - Button1.Image = null; - Button1.ImageAlign = ContentAlignment.MiddleLeft; - Button1.Location = new Point(248, 382); - Button1.Name = "Button1"; - Button1.Size = new Size(161, 34); - Button1.TabIndex = 0; - Button1.Text = "Check for updates"; - Button1.UseVisualStyleBackColor = false; + this.Button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.Button3.CustomColor = System.Drawing.Color.Empty; + this.Button3.Flag = WinPaletter.UI.WP.Button.Flags.None; + this.Button3.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button3.ForeColor = System.Drawing.Color.White; + this.Button3.Image = null; + this.Button3.Location = new System.Drawing.Point(162, 382); + this.Button3.Name = "Button3"; + this.Button3.Size = new System.Drawing.Size(80, 34); + this.Button3.TabIndex = 2; + this.Button3.Text = "Cancel"; + this.Button3.UseVisualStyleBackColor = false; + this.Button3.Click += new System.EventHandler(this.Button3_Click); + // + // Button1 + // + this.Button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.Button1.CustomColor = System.Drawing.Color.Empty; + this.Button1.Flag = WinPaletter.UI.WP.Button.Flags.None; + this.Button1.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Button1.ForeColor = System.Drawing.Color.White; + this.Button1.Image = null; + this.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.Button1.Location = new System.Drawing.Point(248, 382); + this.Button1.Name = "Button1"; + this.Button1.Size = new System.Drawing.Size(161, 34); + this.Button1.TabIndex = 0; + this.Button1.Text = "Check for updates"; + this.Button1.UseVisualStyleBackColor = false; + this.Button1.Click += new System.EventHandler(this.Button1_Click); // // Updates // - AutoScaleDimensions = new SizeF(7.0f, 15.0f); - AutoScaleMode = AutoScaleMode.Font; - BackColor = Color.FromArgb(25, 25, 25); - ClientSize = new Size(421, 428); - Controls.Add(AnimatedBox1); - Controls.Add(CheckBox1); - Controls.Add(PictureBox5); - Controls.Add(Label8); - Controls.Add(Label9); - Controls.Add(PictureBox4); - Controls.Add(Label6); - Controls.Add(Label7); - Controls.Add(PictureBox2); - Controls.Add(Label1); - Controls.Add(ProgressBar1); - Controls.Add(Panel1); - Controls.Add(Label2); - Controls.Add(AlertBox2); - Controls.Add(Separator1); - Controls.Add(Button3); - Controls.Add(Button1); - Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); - ForeColor = Color.White; - FormBorderStyle = FormBorderStyle.FixedSingle; - Icon = (Icon)resources.GetObject("$this.Icon"); - Margin = new Padding(4, 3, 4, 3); - MaximizeBox = false; - MinimizeBox = false; - Name = "Updates"; - StartPosition = FormStartPosition.CenterScreen; - Text = "Updates"; - TopMost = true; - Panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)PictureBox2).EndInit(); - ((System.ComponentModel.ISupportInitialize)PictureBox4).EndInit(); - ((System.ComponentModel.ISupportInitialize)PictureBox5).EndInit(); - AnimatedBox1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)PictureBox1).EndInit(); - Load += new EventHandler(Updates_Load); - Shown += new EventHandler(Updates_Shown); - FormClosing += new FormClosingEventHandler(Updates_FormClosing); - FormClosed += new FormClosedEventHandler(Updates_FormClosed); - ResumeLayout(false); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); + this.ClientSize = new System.Drawing.Size(421, 428); + this.Controls.Add(this.AnimatedBox1); + this.Controls.Add(this.CheckBox1); + this.Controls.Add(this.PictureBox5); + this.Controls.Add(this.Label8); + this.Controls.Add(this.Label9); + this.Controls.Add(this.PictureBox4); + this.Controls.Add(this.Label6); + this.Controls.Add(this.Label7); + this.Controls.Add(this.PictureBox2); + this.Controls.Add(this.Label1); + this.Controls.Add(this.ProgressBar1); + this.Controls.Add(this.Panel1); + this.Controls.Add(this.Label2); + this.Controls.Add(this.AlertBox2); + this.Controls.Add(this.Separator1); + this.Controls.Add(this.Button3); + this.Controls.Add(this.Button1); + this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.ForeColor = System.Drawing.Color.White; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "Updates"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Updates"; + this.TopMost = true; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Updates_FormClosing); + this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Updates_FormClosed); + this.Load += new System.EventHandler(this.Updates_Load); + this.Shown += new System.EventHandler(this.Updates_Shown); + this.Panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox5)).EndInit(); + this.AnimatedBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit(); + this.ResumeLayout(false); } diff --git a/WinPaletter/Updates/Updates.cs b/WinPaletter/Updates/Updates.cs index 84c9138c..9e0f3a04 100644 --- a/WinPaletter/Updates/Updates.cs +++ b/WinPaletter/Updates/Updates.cs @@ -49,12 +49,12 @@ private WebClient UC public decimal UpdateSize; public DateTime ReleaseDate; private bool _Shown = false; - public List ls = new List(); + public List ls = new(); public Updates() { - WebCL = new WebClient(); - UC = new WebClient(); + WebCL = new(); + UC = new(); InitializeComponent(); } @@ -213,7 +213,7 @@ private void Updates_Load(object sender, EventArgs e) { this.LoadLanguage(); ApplyStyle(this); - UC = new WebClient(); + UC = new(); LinkLabel3.Visible = false; string F = Program.Lang.RightToLeft ? "{1}: {0}" : "{0} {1}"; Label3.Text = string.Format(F, Program.Settings.Updates.Channel == Settings.Structures.Updates.Channels.Stable ? Program.Lang.Stable : Program.Lang.Beta, Program.Lang.Channel); @@ -290,7 +290,7 @@ private void Updates_Load(object sender, EventArgs e) private void Label3_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - var f = new Updates(); + Updates f = new(); Close(); Forms.SettingsX.ShowDialog(); f.ShowDialog(); diff --git a/WinPaletter/Win32UI/VS2Win32UI.Designer.cs b/WinPaletter/Win32UI/VS2Win32UI.Designer.cs index 85e61ffd..f04ffb6f 100644 --- a/WinPaletter/Win32UI/VS2Win32UI.Designer.cs +++ b/WinPaletter/Win32UI/VS2Win32UI.Designer.cs @@ -54,7 +54,7 @@ private void InitializeComponent() // Button16.Anchor = AnchorStyles.Top | AnchorStyles.Right; Button16.BackColor = Color.FromArgb(34, 34, 34); - Button16.Font = new Font("Segoe UI", 9.0f); + Button16.Font = new("Segoe UI", 9.0f); Button16.ForeColor = Color.White; Button16.Image = (Image)resources.GetObject("Button16.Image"); Button16.Location = new Point(466, 12); @@ -95,7 +95,7 @@ private void InitializeComponent() // Label102 // Label102.BackColor = Color.Transparent; - Label102.Font = new Font("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); + Label102.Font = new("Segoe UI", 9.0f, FontStyle.Bold, GraphicsUnit.Point, 0); Label102.ForeColor = Color.White; Label102.Location = new Point(42, 12); Label102.Name = "Label102"; @@ -108,7 +108,7 @@ private void InitializeComponent() // Button7.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; Button7.BackColor = Color.FromArgb(34, 34, 34); - Button7.Font = new Font("Segoe UI", 9.0f); + Button7.Font = new("Segoe UI", 9.0f); Button7.ForeColor = Color.White; Button7.Image = null; Button7.Location = new Point(242, 94); @@ -122,7 +122,7 @@ private void InitializeComponent() // Button8.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; Button8.BackColor = Color.FromArgb(34, 34, 34); - Button8.Font = new Font("Segoe UI", 9.0f); + Button8.Font = new("Segoe UI", 9.0f); Button8.ForeColor = Color.White; Button8.Image = (Image)resources.GetObject("Button8.Image"); Button8.ImageAlign = ContentAlignment.MiddleLeft; @@ -141,7 +141,7 @@ private void InitializeComponent() // Label1 // Label1.BackColor = Color.Transparent; - Label1.Font = new Font("Segoe UI", 9.0f, FontStyle.Italic, GraphicsUnit.Point, 0); + Label1.Font = new("Segoe UI", 9.0f, FontStyle.Italic, GraphicsUnit.Point, 0); Label1.ForeColor = Color.White; Label1.Location = new Point(84, 39); Label1.Name = "Label1"; @@ -163,10 +163,10 @@ private void InitializeComponent() Controls.Add(TextBox1); Controls.Add(PictureBox17); Controls.Add(Label102); - Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); ForeColor = Color.White; FormBorderStyle = FormBorderStyle.FixedSingle; - Margin = new Padding(4, 3, 4, 3); + Margin = new(4, 3, 4, 3); MaximizeBox = false; MinimizeBox = false; Name = "VS2Win32UI"; diff --git a/WinPaletter/Win32UI/VS2Win32UI.cs b/WinPaletter/Win32UI/VS2Win32UI.cs index 828a3a8b..87c23d91 100644 --- a/WinPaletter/Win32UI/VS2Win32UI.cs +++ b/WinPaletter/Win32UI/VS2Win32UI.cs @@ -45,7 +45,7 @@ private void Button8_Click(object sender, EventArgs e) if ((File.Exists(TextBox1.Text) && File.Exists(theme)) & !string.IsNullOrEmpty(theme)) { - var vs = new VisualStyleFile(theme); + VisualStyleFile vs = new(theme); LoadColors(vs.Metrics); Forms.Win32UI.ApplyRetroPreview(); Close(); diff --git a/WinPaletter/Win32UI/Win32UI.Designer.cs b/WinPaletter/Win32UI/Win32UI.Designer.cs index 58a6091d..b7f48dd8 100644 --- a/WinPaletter/Win32UI/Win32UI.Designer.cs +++ b/WinPaletter/Win32UI/Win32UI.Designer.cs @@ -401,7 +401,6 @@ private void InitializeComponent() // Toggle1 // this.Toggle1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Toggle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); this.Toggle1.Checked = true; this.Toggle1.DarkLight_Toggler = false; this.Toggle1.Location = new System.Drawing.Point(447, 66); @@ -426,7 +425,6 @@ private void InitializeComponent() // Toggle2 // this.Toggle2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Toggle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); this.Toggle2.Checked = true; this.Toggle2.DarkLight_Toggler = false; this.Toggle2.Location = new System.Drawing.Point(447, 36); @@ -755,7 +753,7 @@ private void InitializeComponent() this.btnface_pick.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.btnface_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.btnface_pick.DefaultColor = System.Drawing.Color.Black; + this.btnface_pick.DefaultBackColor = System.Drawing.Color.Black; this.btnface_pick.DontShowInfo = false; this.btnface_pick.Location = new System.Drawing.Point(3, 24); this.btnface_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -816,7 +814,7 @@ private void InitializeComponent() // this.btnlight_pick.AllowDrop = true; this.btnlight_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.btnlight_pick.DefaultColor = System.Drawing.Color.Black; + this.btnlight_pick.DefaultBackColor = System.Drawing.Color.Black; this.btnlight_pick.DontShowInfo = false; this.btnlight_pick.Location = new System.Drawing.Point(3, 24); this.btnlight_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -852,7 +850,7 @@ private void InitializeComponent() // this.btnhilight_pick.AllowDrop = true; this.btnhilight_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.btnhilight_pick.DefaultColor = System.Drawing.Color.Black; + this.btnhilight_pick.DefaultBackColor = System.Drawing.Color.Black; this.btnhilight_pick.DontShowInfo = false; this.btnhilight_pick.Location = new System.Drawing.Point(3, 24); this.btnhilight_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -888,7 +886,7 @@ private void InitializeComponent() // this.Frame_pick.AllowDrop = true; this.Frame_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.Frame_pick.DefaultColor = System.Drawing.Color.Black; + this.Frame_pick.DefaultBackColor = System.Drawing.Color.Black; this.Frame_pick.DontShowInfo = false; this.Frame_pick.Location = new System.Drawing.Point(3, 24); this.Frame_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -924,7 +922,7 @@ private void InitializeComponent() // this.btntext_pick.AllowDrop = true; this.btntext_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.btntext_pick.DefaultColor = System.Drawing.Color.Black; + this.btntext_pick.DefaultBackColor = System.Drawing.Color.Black; this.btntext_pick.DontShowInfo = false; this.btntext_pick.Location = new System.Drawing.Point(3, 24); this.btntext_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -960,7 +958,7 @@ private void InitializeComponent() // this.btndkshadow_pick.AllowDrop = true; this.btndkshadow_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.btndkshadow_pick.DefaultColor = System.Drawing.Color.Black; + this.btndkshadow_pick.DefaultBackColor = System.Drawing.Color.Black; this.btndkshadow_pick.DontShowInfo = false; this.btndkshadow_pick.Location = new System.Drawing.Point(3, 24); this.btndkshadow_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -996,7 +994,7 @@ private void InitializeComponent() // this.btnshadow_pick.AllowDrop = true; this.btnshadow_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.btnshadow_pick.DefaultColor = System.Drawing.Color.Black; + this.btnshadow_pick.DefaultBackColor = System.Drawing.Color.Black; this.btnshadow_pick.DontShowInfo = false; this.btnshadow_pick.Location = new System.Drawing.Point(3, 24); this.btnshadow_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1155,7 +1153,7 @@ private void InitializeComponent() this.GActivetitle_pick.AllowDrop = true; this.GActivetitle_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.GActivetitle_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.GActivetitle_pick.DefaultColor = System.Drawing.Color.Black; + this.GActivetitle_pick.DefaultBackColor = System.Drawing.Color.Black; this.GActivetitle_pick.DontShowInfo = false; this.GActivetitle_pick.Location = new System.Drawing.Point(251, 4); this.GActivetitle_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1168,7 +1166,7 @@ private void InitializeComponent() this.activetitle_pick.AllowDrop = true; this.activetitle_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.activetitle_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.activetitle_pick.DefaultColor = System.Drawing.Color.Black; + this.activetitle_pick.DefaultBackColor = System.Drawing.Color.Black; this.activetitle_pick.DontShowInfo = false; this.activetitle_pick.Location = new System.Drawing.Point(159, 4); this.activetitle_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1221,7 +1219,7 @@ private void InitializeComponent() this.TitleText_pick.AllowDrop = true; this.TitleText_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TitleText_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.TitleText_pick.DefaultColor = System.Drawing.Color.Black; + this.TitleText_pick.DefaultBackColor = System.Drawing.Color.Black; this.TitleText_pick.DontShowInfo = false; this.TitleText_pick.Location = new System.Drawing.Point(251, 4); this.TitleText_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1274,7 +1272,7 @@ private void InitializeComponent() this.ActiveBorder_pick.AllowDrop = true; this.ActiveBorder_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.ActiveBorder_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.ActiveBorder_pick.DefaultColor = System.Drawing.Color.Black; + this.ActiveBorder_pick.DefaultBackColor = System.Drawing.Color.Black; this.ActiveBorder_pick.DontShowInfo = false; this.ActiveBorder_pick.Location = new System.Drawing.Point(251, 4); this.ActiveBorder_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1327,7 +1325,7 @@ private void InitializeComponent() this.InactivetitleText_pick.AllowDrop = true; this.InactivetitleText_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.InactivetitleText_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.InactivetitleText_pick.DefaultColor = System.Drawing.Color.Black; + this.InactivetitleText_pick.DefaultBackColor = System.Drawing.Color.Black; this.InactivetitleText_pick.DontShowInfo = false; this.InactivetitleText_pick.Location = new System.Drawing.Point(251, 4); this.InactivetitleText_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1367,7 +1365,7 @@ private void InitializeComponent() this.GInactivetitle_pick.AllowDrop = true; this.GInactivetitle_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.GInactivetitle_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.GInactivetitle_pick.DefaultColor = System.Drawing.Color.Black; + this.GInactivetitle_pick.DefaultBackColor = System.Drawing.Color.Black; this.GInactivetitle_pick.DontShowInfo = false; this.GInactivetitle_pick.Location = new System.Drawing.Point(251, 4); this.GInactivetitle_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1394,7 +1392,7 @@ private void InitializeComponent() this.InactiveTitle_pick.AllowDrop = true; this.InactiveTitle_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.InactiveTitle_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.InactiveTitle_pick.DefaultColor = System.Drawing.Color.Black; + this.InactiveTitle_pick.DefaultBackColor = System.Drawing.Color.Black; this.InactiveTitle_pick.DontShowInfo = false; this.InactiveTitle_pick.Location = new System.Drawing.Point(159, 4); this.InactiveTitle_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1447,7 +1445,7 @@ private void InitializeComponent() this.InactiveBorder_pick.AllowDrop = true; this.InactiveBorder_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.InactiveBorder_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.InactiveBorder_pick.DefaultColor = System.Drawing.Color.Black; + this.InactiveBorder_pick.DefaultBackColor = System.Drawing.Color.Black; this.InactiveBorder_pick.DontShowInfo = false; this.InactiveBorder_pick.Location = new System.Drawing.Point(251, 4); this.InactiveBorder_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1517,7 +1515,7 @@ private void InitializeComponent() this.menu_pick.AllowDrop = true; this.menu_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.menu_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.menu_pick.DefaultColor = System.Drawing.Color.Black; + this.menu_pick.DefaultBackColor = System.Drawing.Color.Black; this.menu_pick.DontShowInfo = false; this.menu_pick.Location = new System.Drawing.Point(251, 4); this.menu_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1570,7 +1568,7 @@ private void InitializeComponent() this.menubar_pick.AllowDrop = true; this.menubar_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.menubar_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.menubar_pick.DefaultColor = System.Drawing.Color.Black; + this.menubar_pick.DefaultBackColor = System.Drawing.Color.Black; this.menubar_pick.DontShowInfo = false; this.menubar_pick.Location = new System.Drawing.Point(251, 4); this.menubar_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1623,7 +1621,7 @@ private void InitializeComponent() this.menuhilight_pick.AllowDrop = true; this.menuhilight_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.menuhilight_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.menuhilight_pick.DefaultColor = System.Drawing.Color.Black; + this.menuhilight_pick.DefaultBackColor = System.Drawing.Color.Black; this.menuhilight_pick.DontShowInfo = false; this.menuhilight_pick.Location = new System.Drawing.Point(251, 4); this.menuhilight_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1676,7 +1674,7 @@ private void InitializeComponent() this.hottracking_pick.AllowDrop = true; this.hottracking_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.hottracking_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.hottracking_pick.DefaultColor = System.Drawing.Color.Black; + this.hottracking_pick.DefaultBackColor = System.Drawing.Color.Black; this.hottracking_pick.DontShowInfo = false; this.hottracking_pick.Location = new System.Drawing.Point(251, 4); this.hottracking_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1729,7 +1727,7 @@ private void InitializeComponent() this.hilighttext_pick.AllowDrop = true; this.hilighttext_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.hilighttext_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.hilighttext_pick.DefaultColor = System.Drawing.Color.Black; + this.hilighttext_pick.DefaultBackColor = System.Drawing.Color.Black; this.hilighttext_pick.DontShowInfo = false; this.hilighttext_pick.Location = new System.Drawing.Point(251, 4); this.hilighttext_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1782,7 +1780,7 @@ private void InitializeComponent() this.hilight_pick.AllowDrop = true; this.hilight_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.hilight_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.hilight_pick.DefaultColor = System.Drawing.Color.Black; + this.hilight_pick.DefaultBackColor = System.Drawing.Color.Black; this.hilight_pick.DontShowInfo = false; this.hilight_pick.Location = new System.Drawing.Point(251, 4); this.hilight_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1835,7 +1833,7 @@ private void InitializeComponent() this.menutext_pick.AllowDrop = true; this.menutext_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.menutext_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.menutext_pick.DefaultColor = System.Drawing.Color.Black; + this.menutext_pick.DefaultBackColor = System.Drawing.Color.Black; this.menutext_pick.DontShowInfo = false; this.menutext_pick.Location = new System.Drawing.Point(251, 4); this.menutext_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1905,7 +1903,7 @@ private void InitializeComponent() this.Window_pick.AllowDrop = true; this.Window_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.Window_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.Window_pick.DefaultColor = System.Drawing.Color.Black; + this.Window_pick.DefaultBackColor = System.Drawing.Color.Black; this.Window_pick.DontShowInfo = false; this.Window_pick.Location = new System.Drawing.Point(251, 4); this.Window_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -1958,7 +1956,7 @@ private void InitializeComponent() this.InfoWindow_pick.AllowDrop = true; this.InfoWindow_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.InfoWindow_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.InfoWindow_pick.DefaultColor = System.Drawing.Color.Black; + this.InfoWindow_pick.DefaultBackColor = System.Drawing.Color.Black; this.InfoWindow_pick.DontShowInfo = false; this.InfoWindow_pick.Location = new System.Drawing.Point(251, 4); this.InfoWindow_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -2011,7 +2009,7 @@ private void InitializeComponent() this.InfoText_pick.AllowDrop = true; this.InfoText_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.InfoText_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.InfoText_pick.DefaultColor = System.Drawing.Color.Black; + this.InfoText_pick.DefaultBackColor = System.Drawing.Color.Black; this.InfoText_pick.DontShowInfo = false; this.InfoText_pick.Location = new System.Drawing.Point(251, 4); this.InfoText_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -2064,7 +2062,7 @@ private void InitializeComponent() this.AppWorkspace_pick.AllowDrop = true; this.AppWorkspace_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.AppWorkspace_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.AppWorkspace_pick.DefaultColor = System.Drawing.Color.Black; + this.AppWorkspace_pick.DefaultBackColor = System.Drawing.Color.Black; this.AppWorkspace_pick.DontShowInfo = false; this.AppWorkspace_pick.Location = new System.Drawing.Point(251, 4); this.AppWorkspace_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -2117,7 +2115,7 @@ private void InitializeComponent() this.background_pick.AllowDrop = true; this.background_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.background_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.background_pick.DefaultColor = System.Drawing.Color.Black; + this.background_pick.DefaultBackColor = System.Drawing.Color.Black; this.background_pick.DontShowInfo = false; this.background_pick.Location = new System.Drawing.Point(251, 4); this.background_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -2170,7 +2168,7 @@ private void InitializeComponent() this.GrayText_pick.AllowDrop = true; this.GrayText_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.GrayText_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.GrayText_pick.DefaultColor = System.Drawing.Color.Black; + this.GrayText_pick.DefaultBackColor = System.Drawing.Color.Black; this.GrayText_pick.DontShowInfo = false; this.GrayText_pick.Location = new System.Drawing.Point(251, 4); this.GrayText_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -2223,7 +2221,7 @@ private void InitializeComponent() this.WindowText_pick.AllowDrop = true; this.WindowText_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.WindowText_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.WindowText_pick.DefaultColor = System.Drawing.Color.Black; + this.WindowText_pick.DefaultBackColor = System.Drawing.Color.Black; this.WindowText_pick.DontShowInfo = false; this.WindowText_pick.Location = new System.Drawing.Point(251, 4); this.WindowText_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -2263,7 +2261,7 @@ private void InitializeComponent() this.btnaltface_pick.AllowDrop = true; this.btnaltface_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnaltface_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.btnaltface_pick.DefaultColor = System.Drawing.Color.Black; + this.btnaltface_pick.DefaultBackColor = System.Drawing.Color.Black; this.btnaltface_pick.DontShowInfo = false; this.btnaltface_pick.Location = new System.Drawing.Point(251, 4); this.btnaltface_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -2341,7 +2339,7 @@ private void InitializeComponent() this.desktop_pick.AllowDrop = true; this.desktop_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.desktop_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.desktop_pick.DefaultColor = System.Drawing.Color.Black; + this.desktop_pick.DefaultBackColor = System.Drawing.Color.Black; this.desktop_pick.DontShowInfo = false; this.desktop_pick.Location = new System.Drawing.Point(251, 4); this.desktop_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -2394,7 +2392,7 @@ private void InitializeComponent() this.Scrollbar_pick.AllowDrop = true; this.Scrollbar_pick.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.Scrollbar_pick.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(47)))), ((int)(((byte)(48))))); - this.Scrollbar_pick.DefaultColor = System.Drawing.Color.Black; + this.Scrollbar_pick.DefaultBackColor = System.Drawing.Color.Black; this.Scrollbar_pick.DontShowInfo = false; this.Scrollbar_pick.Location = new System.Drawing.Point(251, 4); this.Scrollbar_pick.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -2463,6 +2461,7 @@ private void InitializeComponent() this.LabelR13.AutoSize = true; this.LabelR13.BackColor = System.Drawing.Color.White; this.LabelR13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.LabelR13.DrawOnGlass = false; this.LabelR13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.LabelR13.ForeColor = System.Drawing.Color.Black; this.LabelR13.Location = new System.Drawing.Point(184, 77); @@ -2534,6 +2533,7 @@ private void InitializeComponent() // this.LabelR9.BackColor = System.Drawing.Color.Transparent; this.LabelR9.Dock = System.Windows.Forms.DockStyle.Fill; + this.LabelR9.DrawOnGlass = false; this.LabelR9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.LabelR9.ForeColor = System.Drawing.Color.DimGray; this.LabelR9.Location = new System.Drawing.Point(21, 0); @@ -2569,6 +2569,7 @@ private void InitializeComponent() // this.LabelR5.BackColor = System.Drawing.Color.Transparent; this.LabelR5.Dock = System.Windows.Forms.DockStyle.Fill; + this.LabelR5.DrawOnGlass = false; this.LabelR5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.LabelR5.ForeColor = System.Drawing.Color.White; this.LabelR5.Location = new System.Drawing.Point(21, 0); @@ -2594,6 +2595,7 @@ private void InitializeComponent() // this.LabelR6.BackColor = System.Drawing.Color.Transparent; this.LabelR6.Dock = System.Windows.Forms.DockStyle.Fill; + this.LabelR6.DrawOnGlass = false; this.LabelR6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.LabelR6.ForeColor = System.Drawing.Color.Black; this.LabelR6.Location = new System.Drawing.Point(21, 0); @@ -2667,6 +2669,7 @@ private void InitializeComponent() this.LabelR4.AutoSize = true; this.LabelR4.BackColor = System.Drawing.Color.Transparent; this.LabelR4.Dock = System.Windows.Forms.DockStyle.Top; + this.LabelR4.DrawOnGlass = false; this.LabelR4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.LabelR4.ForeColor = System.Drawing.Color.Black; this.LabelR4.Location = new System.Drawing.Point(4, 22); @@ -2767,6 +2770,7 @@ private void InitializeComponent() // this.LabelR3.BackColor = System.Drawing.Color.Transparent; this.LabelR3.Dock = System.Windows.Forms.DockStyle.Fill; + this.LabelR3.DrawOnGlass = false; this.LabelR3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.LabelR3.ForeColor = System.Drawing.Color.Black; this.LabelR3.Location = new System.Drawing.Point(1, 3); @@ -2780,6 +2784,7 @@ private void InitializeComponent() // this.LabelR2.BackColor = System.Drawing.Color.Transparent; this.LabelR2.Dock = System.Windows.Forms.DockStyle.Left; + this.LabelR2.DrawOnGlass = false; this.LabelR2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.LabelR2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.LabelR2.Location = new System.Drawing.Point(40, 0); @@ -2794,6 +2799,7 @@ private void InitializeComponent() // this.LabelR1.BackColor = System.Drawing.Color.Transparent; this.LabelR1.Dock = System.Windows.Forms.DockStyle.Left; + this.LabelR1.DrawOnGlass = false; this.LabelR1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.LabelR1.ForeColor = System.Drawing.Color.Black; this.LabelR1.Location = new System.Drawing.Point(0, 0); diff --git a/WinPaletter/Win32UI/Win32UI.cs b/WinPaletter/Win32UI/Win32UI.cs index 8b46b374..ea2c4ce6 100644 --- a/WinPaletter/Win32UI/Win32UI.cs +++ b/WinPaletter/Win32UI/Win32UI.cs @@ -114,38 +114,38 @@ public void ApplyDefaultTMValues() { using (Theme.Manager DefTM = Theme.Default.Get()) { - ActiveBorder_pick.DefaultColor = DefTM.Win32.ActiveBorder; - activetitle_pick.DefaultColor = DefTM.Win32.ActiveTitle; - AppWorkspace_pick.DefaultColor = DefTM.Win32.AppWorkspace; - background_pick.DefaultColor = DefTM.Win32.Background; - btnaltface_pick.DefaultColor = DefTM.Win32.ButtonAlternateFace; - btndkshadow_pick.DefaultColor = DefTM.Win32.ButtonDkShadow; - btnface_pick.DefaultColor = DefTM.Win32.ButtonFace; - btnhilight_pick.DefaultColor = DefTM.Win32.ButtonHilight; - btnlight_pick.DefaultColor = DefTM.Win32.ButtonLight; - btnshadow_pick.DefaultColor = DefTM.Win32.ButtonShadow; - btntext_pick.DefaultColor = DefTM.Win32.ButtonText; - GActivetitle_pick.DefaultColor = DefTM.Win32.GradientActiveTitle; - GInactivetitle_pick.DefaultColor = DefTM.Win32.GradientInactiveTitle; - GrayText_pick.DefaultColor = DefTM.Win32.GrayText; - hilighttext_pick.DefaultColor = DefTM.Win32.HilightText; - hottracking_pick.DefaultColor = DefTM.Win32.HotTrackingColor; - InactiveBorder_pick.DefaultColor = DefTM.Win32.InactiveBorder; - InactiveTitle_pick.DefaultColor = DefTM.Win32.InactiveTitle; - InactivetitleText_pick.DefaultColor = DefTM.Win32.InactiveTitleText; - InfoText_pick.DefaultColor = DefTM.Win32.InfoText; - InfoWindow_pick.DefaultColor = DefTM.Win32.InfoWindow; - menu_pick.DefaultColor = DefTM.Win32.Menu; - menubar_pick.DefaultColor = DefTM.Win32.MenuBar; - menutext_pick.DefaultColor = DefTM.Win32.MenuText; - Scrollbar_pick.DefaultColor = DefTM.Win32.Scrollbar; - TitleText_pick.DefaultColor = DefTM.Win32.TitleText; - Window_pick.DefaultColor = DefTM.Win32.Window; - Frame_pick.DefaultColor = DefTM.Win32.WindowFrame; - WindowText_pick.DefaultColor = DefTM.Win32.WindowText; - hilight_pick.DefaultColor = DefTM.Win32.Hilight; - menuhilight_pick.DefaultColor = DefTM.Win32.MenuHilight; - desktop_pick.DefaultColor = DefTM.Win32.Desktop; + ActiveBorder_pick.DefaultBackColor = DefTM.Win32.ActiveBorder; + activetitle_pick.DefaultBackColor = DefTM.Win32.ActiveTitle; + AppWorkspace_pick.DefaultBackColor = DefTM.Win32.AppWorkspace; + background_pick.DefaultBackColor = DefTM.Win32.Background; + btnaltface_pick.DefaultBackColor = DefTM.Win32.ButtonAlternateFace; + btndkshadow_pick.DefaultBackColor = DefTM.Win32.ButtonDkShadow; + btnface_pick.DefaultBackColor = DefTM.Win32.ButtonFace; + btnhilight_pick.DefaultBackColor = DefTM.Win32.ButtonHilight; + btnlight_pick.DefaultBackColor = DefTM.Win32.ButtonLight; + btnshadow_pick.DefaultBackColor = DefTM.Win32.ButtonShadow; + btntext_pick.DefaultBackColor = DefTM.Win32.ButtonText; + GActivetitle_pick.DefaultBackColor = DefTM.Win32.GradientActiveTitle; + GInactivetitle_pick.DefaultBackColor = DefTM.Win32.GradientInactiveTitle; + GrayText_pick.DefaultBackColor = DefTM.Win32.GrayText; + hilighttext_pick.DefaultBackColor = DefTM.Win32.HilightText; + hottracking_pick.DefaultBackColor = DefTM.Win32.HotTrackingColor; + InactiveBorder_pick.DefaultBackColor = DefTM.Win32.InactiveBorder; + InactiveTitle_pick.DefaultBackColor = DefTM.Win32.InactiveTitle; + InactivetitleText_pick.DefaultBackColor = DefTM.Win32.InactiveTitleText; + InfoText_pick.DefaultBackColor = DefTM.Win32.InfoText; + InfoWindow_pick.DefaultBackColor = DefTM.Win32.InfoWindow; + menu_pick.DefaultBackColor = DefTM.Win32.Menu; + menubar_pick.DefaultBackColor = DefTM.Win32.MenuBar; + menutext_pick.DefaultBackColor = DefTM.Win32.MenuText; + Scrollbar_pick.DefaultBackColor = DefTM.Win32.Scrollbar; + TitleText_pick.DefaultBackColor = DefTM.Win32.TitleText; + Window_pick.DefaultBackColor = DefTM.Win32.Window; + Frame_pick.DefaultBackColor = DefTM.Win32.WindowFrame; + WindowText_pick.DefaultBackColor = DefTM.Win32.WindowText; + hilight_pick.DefaultBackColor = DefTM.Win32.Hilight; + menuhilight_pick.DefaultBackColor = DefTM.Win32.MenuHilight; + desktop_pick.DefaultBackColor = DefTM.Win32.Desktop; } } @@ -203,9 +203,7 @@ private void Button1_Click(object sender, EventArgs e) private void ColorItem_Click(object sender, EventArgs e) { - - if (e is DragEventArgs) - return; + if (e is DragEventArgs) return; try { @@ -219,476 +217,439 @@ private void ColorItem_Click(object sender, EventArgs e) return; } } - catch + catch { } + + List CList = new(); + CList.Add((Control)sender); + + Color C = ((UI.Controllers.ColorItem)sender).BackColor; + string CtrlName = ((UI.Controllers.ColorItem)sender).Name.ToString().ToLower(); + + if (CtrlName == "activetitle_pick".ToLower()) { + CList.Add(WindowR2); + CList.Add(WindowR3); + CList.Add(WindowR4); + + Conditions _conditions = new() { WindowRColor1 = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + WindowR2.Color1 = C; + WindowR3.Color1 = C; + WindowR4.Color1 = C; } - var CList = new List() { (Control)sender }; + else if (CtrlName == "GActivetitle_pick".ToLower()) + { + CList.Add(WindowR2); + CList.Add(WindowR3); + CList.Add(WindowR4); + + Conditions _conditions = new() { WindowRColor2 = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + WindowR2.Color2 = C; + WindowR3.Color2 = C; + WindowR4.Color2 = C; + } - Color C = ((UI.Controllers.ColorItem)sender).BackColor; + else if (CtrlName == "TitleText_pick".ToLower()) + { + CList.Add(WindowR2); + CList.Add(WindowR3); + CList.Add(WindowR4); + + Conditions _conditions = new() { WindowRForeColor = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + WindowR2.ForeColor = C; + WindowR3.ForeColor = C; + WindowR4.ForeColor = C; + } - switch (((UI.Controllers.ColorItem)sender).ToString().ToLower() ?? string.Empty) + else if (CtrlName == "InactiveTitle_pick".ToLower()) { - case var @case when @case == ("activetitle_pick".ToLower() ?? string.Empty): - { - CList.Add(WindowR2); - CList.Add(WindowR3); - CList.Add(WindowR4); - - var _Conditions = new Conditions() { WindowRColor1 = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - WindowR2.Color1 = C; - WindowR3.Color1 = C; - WindowR4.Color1 = C; - break; - } + CList.Add(WindowR1); + Conditions _conditions = new() { WindowRColor1 = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + WindowR1.Color1 = C; + } - case var case1 when case1 == ("GActivetitle_pick".ToLower() ?? string.Empty): - { - CList.Add(WindowR2); - CList.Add(WindowR3); - CList.Add(WindowR4); - - var _Conditions = new Conditions() { WindowRColor2 = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - WindowR2.Color2 = C; - WindowR3.Color2 = C; - WindowR4.Color2 = C; - break; - } + else if (CtrlName == "GInactivetitle_pick".ToLower()) + { + CList.Add(WindowR1); + Conditions _conditions = new() { WindowRColor2 = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + WindowR1.Color2 = C; + } - case var case2 when case2 == ("TitleText_pick".ToLower() ?? string.Empty): - { - CList.Add(WindowR2); - CList.Add(WindowR3); - CList.Add(WindowR4); - - var _Conditions = new Conditions() { WindowRForeColor = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - WindowR2.ForeColor = C; - WindowR3.ForeColor = C; - WindowR4.ForeColor = C; - break; - } + else if (CtrlName == "InactivetitleText_pick".ToLower()) + { + CList.Add(WindowR1); + Conditions _conditions = new() { WindowRForeColor = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + WindowR1.ForeColor = C; + } - case var case3 when case3 == ("InactiveTitle_pick".ToLower() ?? string.Empty): - { - CList.Add(WindowR1); - var _Conditions = new Conditions() { WindowRColor1 = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - WindowR1.Color1 = C; - break; - } + else if (CtrlName == "ActiveBorder_pick".ToLower()) + { + CList.Add(WindowR2); + CList.Add(WindowR3); + CList.Add(WindowR4); + + Conditions _conditions = new() { WindowRBorder = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + WindowR2.ColorBorder = C; + WindowR3.ColorBorder = C; + WindowR4.ColorBorder = C; + } - case var case4 when case4 == ("GInactivetitle_pick".ToLower() ?? string.Empty): - { - CList.Add(WindowR1); - var _Conditions = new Conditions() { WindowRColor2 = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - WindowR1.Color2 = C; - break; - } + else if (CtrlName == "InactiveBorder_pick".ToLower()) + { + CList.Add(WindowR1); + Conditions _conditions = new() { WindowRBorder = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + WindowR1.ColorBorder = C; + } - case var case5 when case5 == ("InactivetitleText_pick".ToLower() ?? string.Empty): - { - CList.Add(WindowR1); - var _Conditions = new Conditions() { WindowRForeColor = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - WindowR1.ForeColor = C; - break; - } + else if (CtrlName == "Frame_pick".ToLower()) + { + foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) + CList.Add(ButtonR); - case var case6 when case6 == ("ActiveBorder_pick".ToLower() ?? string.Empty): - { - CList.Add(WindowR2); - CList.Add(WindowR3); - CList.Add(WindowR4); - - var _Conditions = new Conditions() { WindowRBorder = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - WindowR2.ColorBorder = C; - WindowR3.ColorBorder = C; - WindowR4.ColorBorder = C; - break; - } + CList.Add(Retro3DPreview1); - case var case7 when case7 == ("InactiveBorder_pick".ToLower() ?? string.Empty): - { - CList.Add(WindowR1); - var _Conditions = new Conditions() { WindowRBorder = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - WindowR1.ColorBorder = C; - break; - } + Conditions _conditions = new() { WindowRFrame = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); - case var case8 when case8 == ("Frame_pick".ToLower() ?? string.Empty): - { - foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) - CList.Add(ButtonR); + foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) + ButtonR.WindowFrame = C; - CList.Add(Retro3DPreview1); + Retro3DPreview1.WindowFrame = C; + } - var _Conditions = new Conditions() { WindowRFrame = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + else if (CtrlName == "btnface_pick".ToLower()) + { + foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) + CList.Add(WindowR); + foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) + CList.Add(ButtonR); - foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) - ButtonR.WindowFrame = C; + CList.Add(Retro3DPreview1); + CList.Add(PanelR2); + Conditions _conditions = new() { ButtonRFace = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); - Retro3DPreview1.WindowFrame = C; - break; - } + foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) + { + if (!WindowR.UseItAsMenu) + WindowR.BackColor = C; + else + WindowR.ButtonFace = C; + } + foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) + ButtonR.BackColor = C; - case var case9 when case9 == ("btnface_pick".ToLower() ?? string.Empty): - { - foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) - CList.Add(WindowR); - foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) - CList.Add(ButtonR); - - CList.Add(Retro3DPreview1); - CList.Add(PanelR2); - var _Conditions = new Conditions() { ButtonRFace = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - - foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) - { - if (!WindowR.UseItAsMenu) - WindowR.BackColor = C; - else - WindowR.ButtonFace = C; - } - foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) - ButtonR.BackColor = C; - - Retro3DPreview1.BackColor = C; - PanelR2.BackColor = C; - break; - } + Retro3DPreview1.BackColor = C; + PanelR2.BackColor = C; + } - case var case10 when case10 == ("btndkshadow_pick".ToLower() ?? string.Empty): - { - foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) - CList.Add(WindowR); - foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) - CList.Add(ButtonR); + else if (CtrlName == "btndkshadow_pick".ToLower()) + { + foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) + CList.Add(WindowR); + foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) + CList.Add(ButtonR); - CList.Add(Retro3DPreview1); - CList.Add(TextBoxR1); + CList.Add(Retro3DPreview1); + CList.Add(TextBoxR1); - var _Conditions = new Conditions() { ButtonRDkShadow = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Conditions _conditions = new() { ButtonRDkShadow = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); - foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) - WindowR.ButtonDkShadow = C; - foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) - ButtonR.ButtonDkShadow = C; + foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) + WindowR.ButtonDkShadow = C; + foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) + ButtonR.ButtonDkShadow = C; - Retro3DPreview1.ButtonDkShadow = C; - TextBoxR1.ButtonDkShadow = C; - break; - } + Retro3DPreview1.ButtonDkShadow = C; + TextBoxR1.ButtonDkShadow = C; + } - case var case11 when case11 == ("btnhilight_pick".ToLower() ?? string.Empty): - { - foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) - CList.Add(WindowR); - foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) - CList.Add(ButtonR); - foreach (PanelRaisedR ButtonR in pnl_preview.GetAllControls().OfType()) - CList.Add(ButtonR); - - CList.Add(Retro3DPreview1); - CList.Add(TextBoxR1); - CList.Add(PanelR1); - CList.Add(PanelR2); - - var _Conditions = new Conditions() { ButtonRHilight = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - - foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) - WindowR.ButtonHilight = C; - foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) - ButtonR.ButtonHilight = C; - foreach (PanelRaisedR ButtonR in pnl_preview.GetAllControls().OfType()) - ButtonR.ButtonHilight = C; - - TextBoxR1.ButtonHilight = C; - PanelR1.ButtonHilight = C; - PanelR2.ButtonHilight = C; - Retro3DPreview1.ButtonHilight = C; - break; - } + else if (CtrlName == "btnhilight_pick".ToLower()) + { + foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) + CList.Add(WindowR); + foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) + CList.Add(ButtonR); + foreach (PanelRaisedR ButtonR in pnl_preview.GetAllControls().OfType()) + CList.Add(ButtonR); + + CList.Add(Retro3DPreview1); + CList.Add(TextBoxR1); + CList.Add(PanelR1); + CList.Add(PanelR2); + + Conditions _conditions = new() { ButtonRHilight = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + + foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) + WindowR.ButtonHilight = C; + foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) + ButtonR.ButtonHilight = C; + foreach (PanelRaisedR ButtonR in pnl_preview.GetAllControls().OfType()) + ButtonR.ButtonHilight = C; + + TextBoxR1.ButtonHilight = C; + PanelR1.ButtonHilight = C; + PanelR2.ButtonHilight = C; + Retro3DPreview1.ButtonHilight = C; + } - case var case12 when case12 == ("btnlight_pick".ToLower() ?? string.Empty): - { - foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) - CList.Add(WindowR); - foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) - CList.Add(ButtonR); + else if (CtrlName == "btnlight_pick".ToLower()) + { + foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) + CList.Add(WindowR); + foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) + CList.Add(ButtonR); - CList.Add(Retro3DPreview1); - CList.Add(TextBoxR1); + CList.Add(Retro3DPreview1); + CList.Add(TextBoxR1); - var _Conditions = new Conditions() { ButtonRLight = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); + Conditions _conditions = new() { ButtonRLight = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); - foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) - WindowR.ButtonLight = C; - foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) - ButtonR.ButtonLight = C; + foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) + WindowR.ButtonLight = C; + foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) + ButtonR.ButtonLight = C; - TextBoxR1.ButtonLight = C; - Retro3DPreview1.ButtonLight = C; - break; - } + TextBoxR1.ButtonLight = C; + Retro3DPreview1.ButtonLight = C; + } - case var case13 when case13 == ("btnshadow_pick".ToLower() ?? string.Empty): - { - foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) - CList.Add(WindowR); - foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) - CList.Add(ButtonR); - foreach (PanelRaisedR ButtonR in pnl_preview.GetAllControls().OfType()) - CList.Add(ButtonR); - - CList.Add(Retro3DPreview1); - CList.Add(TextBoxR1); - CList.Add(PanelR1); - - var _Conditions = new Conditions() { ButtonRShadow = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - - foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) - WindowR.ButtonShadow = C; - foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) - ButtonR.ButtonShadow = C; - foreach (PanelRaisedR ButtonR in pnl_preview.GetAllControls().OfType()) - ButtonR.ButtonShadow = C; - - Retro3DPreview1.ButtonShadow = C; - TextBoxR1.ButtonShadow = C; - PanelR1.ButtonShadow = C; - break; - } + else if (CtrlName == "btnshadow_pick".ToLower()) + { + foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) + CList.Add(WindowR); + foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) + CList.Add(ButtonR); + foreach (PanelRaisedR ButtonR in pnl_preview.GetAllControls().OfType()) + CList.Add(ButtonR); + + CList.Add(Retro3DPreview1); + CList.Add(TextBoxR1); + CList.Add(PanelR1); + + Conditions _conditions = new() { ButtonRShadow = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + + foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) + WindowR.ButtonShadow = C; + foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) + ButtonR.ButtonShadow = C; + foreach (PanelRaisedR ButtonR in pnl_preview.GetAllControls().OfType()) + ButtonR.ButtonShadow = C; + + Retro3DPreview1.ButtonShadow = C; + TextBoxR1.ButtonShadow = C; + PanelR1.ButtonShadow = C; + } - case var case14 when case14 == ("btntext_pick".ToLower() ?? string.Empty): - { - foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) - CList.Add(WindowR); - foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) - CList.Add(ButtonR); - - CList.Add(Retro3DPreview1); - var _Conditions = new Conditions() { ButtonRText = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - - foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) - WindowR.ButtonText = C; - foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) - ButtonR.ForeColor = C; - - Retro3DPreview1.ForeColor = C; - break; - } + else if (CtrlName == "btntext_pick".ToLower()) + { + foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) + CList.Add(WindowR); + foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) + CList.Add(ButtonR); - case var case15 when case15 == ("AppWorkspace_pick".ToLower() ?? string.Empty): - { - CList.Add(programcontainer); - var _Conditions = new Conditions() { RetroAppWorkspace = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - programcontainer.BackColor = C; - break; - } + CList.Add(Retro3DPreview1); + Conditions _conditions = new() { ButtonRText = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); - case var case16 when case16 == ("background_pick".ToLower() ?? string.Empty): - { - CList.Add(pnl_preview); - var _Conditions = new Conditions() { RetroBackground = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - pnl_preview.BackColor = C; - break; - } + foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) + WindowR.ButtonText = C; + foreach (ButtonR ButtonR in pnl_preview.GetAllControls().OfType()) + ButtonR.ForeColor = C; - case var case17 when case17 == ("menu_pick".ToLower() ?? string.Empty): - { - CList.Add(Menu_Window); - - if (!Toggle1.Checked) - CList.Add(PanelR1); - if (!Toggle1.Checked) - CList.Add(menucontainer0); - - var _Conditions = new Conditions() { RetroBackground = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - Menu_Window.BackColor = C; - Menu_Window.Invalidate(); - - if (!Toggle1.Checked) - PanelR1.BackColor = C; - if (!Toggle1.Checked) - menucontainer0.BackColor = C; - break; - } + Retro3DPreview1.ForeColor = C; + } - case var case18 when case18 == ("menubar_pick".ToLower() ?? string.Empty): - { - if (Toggle1.Checked) - { - CList.Add(menucontainer0); - var _Conditions = new Conditions() { RetroBackground = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - menucontainer0.BackColor = C; - } - else - { - C = Forms.ColorPickerDlg.Pick(CList); - ((UI.Controllers.ColorItem)sender).BackColor = C; - } - - break; - } + else if (CtrlName == "AppWorkspace_pick".ToLower()) + { + CList.Add(programcontainer); + Conditions _conditions = new() { RetroAppWorkspace = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + programcontainer.BackColor = C; + } - case var case19 when case19 == ("hilight_pick".ToLower() ?? string.Empty): - { - if (Toggle1.Checked) - { - CList.Add(highlight); - CList.Add(PanelR1); - var _Conditions = new Conditions() { ButtonRShadow = true, RetroBackground = true, RetroHighlight17BitFixer = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - highlight.BackColor = C; - PanelR1.ButtonShadow = C; - } - else - { - CList.Add(highlight); - CList.Add(menuhilight); - var _Conditions = new Conditions() { RetroBackground = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - highlight.BackColor = C; - menuhilight.BackColor = C; - } - - break; - } + else if (CtrlName == "background_pick".ToLower()) + { + CList.Add(pnl_preview); + Conditions _conditions = new() { RetroBackground = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + pnl_preview.BackColor = C; + } + else if (CtrlName == "menu_pick".ToLower()) + { + CList.Add(Menu_Window); + + if (!Toggle1.Checked) + CList.Add(PanelR1); + if (!Toggle1.Checked) + CList.Add(menucontainer0); + + Conditions _conditions = new() { RetroBackground = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + Menu_Window.BackColor = C; + Menu_Window.Invalidate(); + + if (!Toggle1.Checked) + PanelR1.BackColor = C; + if (!Toggle1.Checked) + menucontainer0.BackColor = C; + } - case var case20 when case20 == ("menuhilight_pick".ToLower() ?? string.Empty): - { - if (Toggle1.Checked) - { - CList.Add(menuhilight); - CList.Add(PanelR1); - var _Conditions = new Conditions() { RetroBackground = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - menuhilight.BackColor = C; - PanelR1.BackColor = C; - } - else - { - C = Forms.ColorPickerDlg.Pick(CList); - ((UI.Controllers.ColorItem)sender).BackColor = C; - } - - break; - } + else if (CtrlName == "menubar_pick".ToLower()) + { + if (Toggle1.Checked) + { + CList.Add(menucontainer0); + Conditions _conditions = new() { RetroBackground = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + menucontainer0.BackColor = C; + } + else + { + C = Forms.ColorPickerDlg.Pick(CList); + ((UI.Controllers.ColorItem)sender).BackColor = C; + } + } - case var case21 when case21 == ("menutext_pick".ToLower() ?? string.Empty): - { - CList.Add(LabelR1); - if (!Toggle1.Checked) - CList.Add(LabelR3); - CList.Add(LabelR6); - - C = Forms.ColorPickerDlg.Pick(CList); - - LabelR1.ForeColor = C; - if (!Toggle1.Checked) - LabelR3.ForeColor = C; - LabelR6.ForeColor = C; - break; - } + else if (CtrlName == "hilight_pick".ToLower()) + { + if (Toggle1.Checked) + { + CList.Add(highlight); + CList.Add(PanelR1); + Conditions _conditions = new() { ButtonRShadow = true, RetroBackground = true, RetroHighlight17BitFixer = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + highlight.BackColor = C; + PanelR1.ButtonShadow = C; + } + else + { + CList.Add(highlight); + CList.Add(menuhilight); + Conditions _conditions = new() { RetroBackground = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + highlight.BackColor = C; + menuhilight.BackColor = C; + } - case var case22 when case22 == ("hilighttext_pick".ToLower() ?? string.Empty): - { - CList.Add(LabelR5); - if (Toggle1.Checked) - CList.Add(LabelR3); - - C = Forms.ColorPickerDlg.Pick(CList); - LabelR5.ForeColor = C; - if (Toggle1.Checked) - LabelR3.ForeColor = C; - break; - } + } - case var case23 when case23 == ("GrayText_pick".ToLower() ?? string.Empty): - { - CList.Add(LabelR2); - CList.Add(LabelR9); + else if (CtrlName == "menuhilight_pick".ToLower()) + { + if (Toggle1.Checked) + { + CList.Add(menuhilight); + CList.Add(PanelR1); + Conditions _conditions = new() { RetroBackground = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + menuhilight.BackColor = C; + PanelR1.BackColor = C; + } + else + { + C = Forms.ColorPickerDlg.Pick(CList); + ((UI.Controllers.ColorItem)sender).BackColor = C; + } - C = Forms.ColorPickerDlg.Pick(CList); - LabelR2.ForeColor = C; - LabelR9.ForeColor = C; - break; - } + } - case var case24 when case24 == ("Window_pick".ToLower() ?? string.Empty): - { - CList.Add(TextBoxR1); - var _Conditions = new Conditions() { RetroBackground = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - TextBoxR1.BackColor = C; - break; - } + else if (CtrlName == "menutext_pick".ToLower()) + { + CList.Add(LabelR1); + if (!Toggle1.Checked) + CList.Add(LabelR3); + CList.Add(LabelR6); - case var case25 when case25 == ("WindowText_pick".ToLower() ?? string.Empty): - { - CList.Add(TextBoxR1); - CList.Add(LabelR4); - - var _Conditions = new Conditions() { WindowRText = true, WindowRForeColor = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - TextBoxR1.ForeColor = C; - LabelR4.ForeColor = C; - break; - } + C = Forms.ColorPickerDlg.Pick(CList); - case var case26 when case26 == ("InfoWindow_pick".ToLower() ?? string.Empty): - { - CList.Add(LabelR13); - var _Conditions = new Conditions() { RetroBackground = true }; - C = Forms.ColorPickerDlg.Pick(CList, _Conditions); - LabelR13.BackColor = C; - break; - } + LabelR1.ForeColor = C; + if (!Toggle1.Checked) + LabelR3.ForeColor = C; + LabelR6.ForeColor = C; + } - case var case27 when case27 == ("InfoText_pick".ToLower() ?? string.Empty): - { - CList.Add(LabelR13); - C = Forms.ColorPickerDlg.Pick(CList); - LabelR13.ForeColor = C; - break; - } + else if (CtrlName == "hilighttext_pick".ToLower()) + { + CList.Add(LabelR5); + if (Toggle1.Checked) + CList.Add(LabelR3); + + C = Forms.ColorPickerDlg.Pick(CList); + LabelR5.ForeColor = C; + if (Toggle1.Checked) + LabelR3.ForeColor = C; + } - case var case28 when case28 == ("Scrollbar_pick".ToLower() ?? string.Empty): - { - C = Forms.ColorPickerDlg.Pick(CList); - break; - } + else if (CtrlName == "GrayText_pick".ToLower()) + { + CList.Add(LabelR2); + CList.Add(LabelR9); - default: - { - C = Forms.ColorPickerDlg.Pick(CList); - break; - } + C = Forms.ColorPickerDlg.Pick(CList); + LabelR2.ForeColor = C; + LabelR9.ForeColor = C; + } + + else if (CtrlName == "Window_pick".ToLower()) + { + CList.Add(TextBoxR1); + Conditions _conditions = new() { RetroBackground = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + TextBoxR1.BackColor = C; + } + else if (CtrlName == "WindowText_pick".ToLower()) + { + CList.Add(TextBoxR1); + CList.Add(LabelR4); - } ((ColorItem)sender).BackColor = C; + Conditions _conditions = new() { WindowRText = true, WindowRForeColor = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + TextBoxR1.ForeColor = C; + LabelR4.ForeColor = C; + } + + else if (CtrlName == "InfoWindow_pick".ToLower()) + { + CList.Add(LabelR13); + Conditions _conditions = new() { RetroBackground = true }; + C = Forms.ColorPickerDlg.Pick(CList, _conditions); + LabelR13.BackColor = C; + } - foreach (var Ctrl in CList) - Ctrl.Refresh(); + else if (CtrlName == "InfoText_pick".ToLower()) + { + CList.Add(LabelR13); + C = Forms.ColorPickerDlg.Pick(CList); + LabelR13.ForeColor = C; + } + else if (CtrlName == "Scrollbar_pick".ToLower()) + { + C = Forms.ColorPickerDlg.Pick(CList); + } + + else + { + C = Forms.ColorPickerDlg.Pick(CList); + } + + ((ColorItem)sender).BackColor = C; + + foreach (Control Ctrl in CList) { Ctrl.Refresh(); } CList.Clear(); WindowR1.Invalidate(); @@ -831,7 +792,7 @@ public void LoadFromWin9xTheme(string File, Theme.Structures.Win32UI _DefWin32) if (System.IO.File.Exists(File)) { - using (var _ini = new INI(File)) + using (INI _ini = new(File)) { string Section = @"Control Panel\Colors"; @@ -911,12 +872,12 @@ public void LoadFromWinThemeString(string String, string ThemeName) return; } - var ls = new List(); + List ls = new(); ls.Clear(); - var AllThemes = String.CList(); + List AllThemes = String.CList(); string SelectedTheme = string.Empty; - var SelectedThemeList = new List(); + List SelectedThemeList = new(); bool Found = false; @@ -1060,7 +1021,7 @@ public void SetMetrics(Theme.Manager TM) int iP = 3 + TM.MetricsFonts.PaddedBorderWidth + TM.MetricsFonts.BorderWidth; int iT = 4 + TM.MetricsFonts.PaddedBorderWidth + TM.MetricsFonts.BorderWidth + TM.MetricsFonts.CaptionHeight + GetTitlebarTextHeight(TM.MetricsFonts.CaptionFont); - var _Padding = new Padding(iP, iT, iP, iP); + Padding _Padding = new(iP, iT, iP, iP); foreach (WindowR WindowR in pnl_preview.GetAllControls().OfType()) { @@ -1260,7 +1221,7 @@ private void Button7_Click(object sender, EventArgs e) { if (OpenFileDialog1.ShowDialog() == DialogResult.OK) { - var TMx = new Theme.Manager(Theme.Manager.Source.File, OpenFileDialog1.FileName); + Theme.Manager TMx = new(Theme.Manager.Source.File, OpenFileDialog1.FileName); LoadTM(TMx); TMx.Dispose(); } @@ -1268,7 +1229,7 @@ private void Button7_Click(object sender, EventArgs e) private void Button5_Click(object sender, EventArgs e) { - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); LoadTM(TMx); TMx.Dispose(); } @@ -1289,7 +1250,7 @@ private void Toggle2_CheckedChanged(object sender, EventArgs e) private void Button10_Click(object sender, EventArgs e) { Cursor = Cursors.WaitCursor; - var TMx = new Theme.Manager(Theme.Manager.Source.Registry); + Theme.Manager TMx = new(Theme.Manager.Source.Registry); ApplyToTM(TMx); ApplyToTM(Program.TM); @@ -1314,7 +1275,7 @@ private void Button6_Click(object sender, EventArgs e) { if (SaveFileDialog2.ShowDialog() == DialogResult.OK) { - var s = new List(); + List s = new(); s.Clear(); s.Add("; " + string.Format(Program.Lang.OldMSTheme_Copyrights, DateTime.Now.Year)); s.Add("; " + string.Format(Program.Lang.OldMSTheme_ProgrammedBy, Application.CompanyName)); @@ -1510,12 +1471,15 @@ private void Menu_Window_SizeChanged(object sender, EventArgs e) RetroShadow1.Size = Menu_Window.Size; RetroShadow1.Location = Menu_Window.Location + (Size)new Point(6, 5); - var b = new Bitmap(RetroShadow1.Width, RetroShadow1.Height); - var g = Graphics.FromImage(b); - g.DrawGlow(new Rectangle(5, 5, b.Width - 10 - 1, b.Height - 10 - 1), Color.FromArgb(128, 0, 0, 0)); - g.Save(); - RetroShadow1.Image = b; - g.Dispose(); + using (Bitmap b = new(RetroShadow1.Width, RetroShadow1.Height)) + using (Graphics G = Graphics.FromImage(b)) + { + G.Clear(Color.Transparent); + G.DrawGlow(new(5, 5, b.Width - 10 - 1, b.Height - 10 - 1), Color.FromArgb(128, 0, 0, 0)); + G.Save(); + G.Dispose(); + RetroShadow1.Image = new Bitmap(b); + } RetroShadow1.BringToFront(); Menu_Window.BringToFront(); @@ -1543,6 +1507,5 @@ private void Form_HelpButtonClicked(object sender, CancelEventArgs e) { Process.Start(Properties.Resources.Link_Wiki + "/Edit-Windows-classic-colors"); } - } } \ No newline at end of file diff --git a/WinPaletter/Win32UI/Win32UI.resx b/WinPaletter/Win32UI/Win32UI.resx index 71b54776..a8ce318e 100644 --- a/WinPaletter/Win32UI/Win32UI.resx +++ b/WinPaletter/Win32UI/Win32UI.resx @@ -134,7 +134,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADE - DAAAAk1TRnQBSQFMAgEBBQEAAVwBAwFcAQMBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + DAAAAk1TRnQBSQFMAgEBBQEAAXQBAwF0AQMBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABIAMAAQEBAAEgBgABIP8AKwADKQE9AlMBUQGiAzMBUvQAAmMBXQHfAdwBjQEQAf8CbwFgAfP0AAJH AUYBgANiAe4CUQFQAZz/APUAA0cBggJVAVMBqgMzAVD0AAJmAWAB4AHiAZwBGwH/A0ABb/QAAlwBWQG+ AeQBoAEeAf8CYQFcAdkDEgEX8AADIwEyAmsBWgHyAeUBowEfAf8CZQFeAd0DGwEm8AADKQE9AnABZQHx diff --git a/WinPaletter/WinPaletter.csproj b/WinPaletter/WinPaletter.csproj index acffe095..a3280677 100644 --- a/WinPaletter/WinPaletter.csproj +++ b/WinPaletter/WinPaletter.csproj @@ -258,12 +258,6 @@ UserPassword.cs - - Form - - - Form1.cs - Component @@ -1192,9 +1186,6 @@ Sounds_Editor.cs - - Form1.cs - Lang_Add_Snippet.cs diff --git a/WinPaletter/bk.Designer.cs b/WinPaletter/bk.Designer.cs index 381b8bee..27f26829 100644 --- a/WinPaletter/bk.Designer.cs +++ b/WinPaletter/bk.Designer.cs @@ -44,9 +44,9 @@ private void InitializeComponent() BackColor = Color.Black; ClientSize = new Size(617, 362); ControlBox = false; - Font = new Font("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + Font = new("Segoe UI", 9.0f, FontStyle.Regular, GraphicsUnit.Point, 0); FormBorderStyle = FormBorderStyle.None; - Margin = new Padding(4, 3, 4, 3); + Margin = new(4, 3, 4, 3); MaximizeBox = false; MinimizeBox = false; Name = "BK";