From 7ac2f7883e30a96c229f22418c575603856f3376 Mon Sep 17 00:00:00 2001 From: sydneyowl <84191144+SydneyOwl@users.noreply.github.com> Date: Sat, 17 Aug 2024 10:59:53 +0800 Subject: [PATCH] :bug: Some texts failed to display on dark mode --- Constants/Common/THANKSLIST.cs | 26 ++++++++++++++++++++++++ Icons.axaml | 1 + Properties/SETTINGS.cs | 2 +- Views/Common/AboutWindow.axaml | 10 +++++++-- Views/Common/AboutWindow.axaml.cs | 15 +++++++++++--- Views/Gt12/VfoModeWindow.axaml | 4 ++-- Views/Plugin/SatelliteHelperWindow.axaml | 2 +- Views/Shx8800Pro/VfoModeWindow.axaml | 4 ++-- 8 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 Constants/Common/THANKSLIST.cs diff --git a/Constants/Common/THANKSLIST.cs b/Constants/Common/THANKSLIST.cs new file mode 100644 index 0000000..679529c --- /dev/null +++ b/Constants/Common/THANKSLIST.cs @@ -0,0 +1,26 @@ +using System.Collections.Generic; + +namespace SenhaixFreqWriter.Constants.Common; + +public class THANKSLIST +{ + public static List ThankUList = new() + { + "BH7EWP - 跨平台开发阶段的大力支持，验证了8800写频部分在mac端的可行性（包括蓝牙及写频线），以及许多富有建设性的建议！", + "BA4QDP - bug反馈（未修复）：蓝牙写频可能在macOS13及以下存在bug，并对测试给予了大力支持！", + "BH4HLI - bug反馈（已修复）：无法进行8600pro的开机画面写入，并验证了修正后的软件可以正常写入开机画面！", + "BH6ROG - 验证了8600pro写频软件在mac端可用，并帮助测试了8800pro写频部分在mac端的可用性，同时提出了许多建设性的建议！", + "NiZiv - 提出了一些文档修正的意见！", + }; + + public static string ToThankUString() + { + string thanks = ""; + for (var i = 0; i < ThankUList.Count; i++) + { + thanks += ThankUList[i]+"\n"; + } + + return thanks; + } +} \ No newline at end of file diff --git a/Icons.axaml b/Icons.axaml index 44983aa..c381579 100644 --- a/Icons.axaml +++ b/Icons.axaml @@ -40,6 +40,7 @@ M252.78 20.875c-1.302.012-2.6.03-3.905.063-37.928.974-76.148 11.153-111.28 31.437C25.164 117.285-13.41 261.322 51.5 373.75s208.946 151.036 321.375 86.125c77.7-44.86 120.1-127.513 117.47-211.406-3.563 65.847-35.898 128.573-91 169.374-10.828 9.62-22.774 18.315-35.814 25.844-103.68 59.86-235.983 24.4-295.842-79.282-59.86-103.68-24.43-235.984 79.25-295.844 35.64-20.576 74.67-29.88 112.968-29.03 63.304 1.4 124.623 30.57 165.438 82.53l-32.594 23.032c-33.27-42.835-84.01-66.6-136.063-67-.96-.008-1.91-.012-2.875 0-.964.01-1.943.038-2.906.062-28.006.717-56.222 8.215-82.156 23.188-82.99 47.914-111.508 154.322-63.594 237.312 47.914 82.99 154.32 111.51 237.313 63.594 51.37-29.66 81.862-81.724 86.28-136.78-12.53 45.37-42.32 86.745-85.438 114.186-.02.013-.043.018-.062.03l-.344.22c-3.16 2.147-6.42 4.216-9.78 6.156-74.245 42.865-168.918 17.494-211.782-56.75-42.864-74.243-17.493-168.917 56.75-211.78 23.2-13.396 48.39-20.122 73.375-20.782 47.953-1.266 95.138 19.858 125.968 59.156l-39.844 28.156c-20.232-24.32-50.055-37.79-80.594-38.03-1.17-.01-2.33 0-3.5.03-17.035.432-34.176 4.995-49.938 14.094-50.435 29.12-67.806 93.877-38.687 144.313 29.12 50.434 93.908 67.806 144.344 38.686 21.245-12.267 36.623-30.85 45.124-52.03-18.815 21.064-44.364 36.888-73.938 44.155-.04.013-.084.02-.125.033-37.507 10.787-78.796-4.816-99.217-40.188-24.07-41.688-9.845-94.712 31.843-118.78 13.028-7.523 27.143-11.314 41.156-11.69 25.66-.685 50.898 10.098 68.188 30.25l-41 28.97c-5.497-4.796-12.664-7.72-20.53-7.72-17.277 0-31.283 14.007-31.283 31.282 0 17.276 14.004 31.282 31.282 31.282 17.277 0 31.28-14.007 31.28-31.283 0-1.187-.06-2.347-.188-3.5l120.094-57.312 4.03-1.75-.06-.156 62.25-29.72 9.25-4.438-5.282-8.812-19.97-33.375-5.155-8.625-8.25 5.813-8.095 5.718c-45.9-58.864-116.14-91.053-187.844-90.405z M13.4142 3.82843C12.6332 3.04738 11.3668 3.04738 10.5858 3.82843L9.91421 4.5L11.482 6.06774C11.6472 6.02356 11.8208 6 12 6C13.1046 6 14 6.89543 14 8C14 8.17916 13.9764 8.35282 13.9323 8.51804L15.982 10.5677C16.1472 10.5236 16.3208 10.5 16.5 10.5C17.6046 10.5 18.5 11.3954 18.5 12.5C18.5 13.6046 17.6046 14.5 16.5 14.5C15.3954 14.5 14.5 13.6046 14.5 12.5C14.5 12.3208 14.5236 12.1472 14.5677 11.982L13 10.4142V15.2676C13.5978 15.6134 14 16.2597 14 17C14 18.1046 13.1046 19 12 19C10.8954 19 10 18.1046 10 17C10 16.2597 10.4022 15.6134 11 15.2676V9.73244C10.4022 9.38663 10 8.74028 10 8C10 7.82084 10.0236 7.64718 10.0677 7.48196L8.5 5.91421L3.82843 10.5858C3.04738 11.3668 3.04738 12.6332 3.82843 13.4142L10.5858 20.1716C11.3668 20.9526 12.6332 20.9526 13.4142 20.1716L20.1716 13.4142C20.9526 12.6332 20.9526 11.3668 20.1716 10.5858L13.4142 3.82843ZM9.17157 2.41421C10.7337 0.852115 13.2663 0.852119 14.8284 2.41422L21.5858 9.17157C23.1479 10.7337 23.1479 13.2663 21.5858 14.8284L14.8284 21.5858C13.2663 23.1479 10.7337 23.1479 9.17157 21.5858L2.41421 14.8284C0.852115 13.2663 0.852119 10.7337 2.41422 9.17157L9.17157 2.41421Z M9 13.829A3.004 3.004 0 0 0 11 11a3.003 3.003 0 0 0-2-2.829V0H7v8.171A3.004 3.004 0 0 0 5 11c0 1.306.836 2.417 2 2.829V16h2v-2.171zm-5-6A3.004 3.004 0 0 0 6 5a3.003 3.003 0 0 0-2-2.829V0H2v2.171A3.004 3.004 0 0 0 0 5c0 1.306.836 2.417 2 2.829V16h2V7.829zm10 0A3.004 3.004 0 0 0 16 5a3.003 3.003 0 0 0-2-2.829V0h-2v2.171A3.004 3.004 0 0 0 10 5c0 1.306.836 2.417 2 2.829V16h2V7.829zM12 6V4h2v2h-2zM2 6V4h2v2H2zm5 6v-2h2v2H7z + M512,216.906c-0.031-29.313-23.781-53.078-53.094-53.094h-75.891c-3.531,0-43.578,0-47.219,0 c-6.953,0.063-13.328,1.094-17.969,1.031c-1.859,0-3.328-0.156-4.188-0.344L313,164.313l-0.156-0.469 c-0.141-0.609-0.281-1.625-0.281-3.094c0-0.906,0.141-2.188,0.25-3.438l30.281-74.875c2.906-7.188,4.281-14.656,4.281-21.969 c0.031-23.188-13.844-45.156-36.656-54.406c-7.156-2.891-14.641-4.281-21.984-4.281c-23.203-0.016-45.141,13.875-54.391,36.672 l-0.047,0.078l-51.359,129.313h0.031c-3.438,8.063-6.203,15.625-8.906,22.156c-4.078,10.031-8.063,17.25-12.766,21.438 c-2.359,2.125-4.922,3.719-8.484,4.969c-3.531,1.219-8.172,2.047-14.391,2.047c-3.781-0.016-7.375,0.422-10.891,1.078H44.5 c-24.594,0-44.5,19.922-44.5,44.5v201.703c0,24.578,19.906,44.484,44.5,44.484h61.578c13.641,0,24.719-11.063,24.719-24.719 v-20.484c4.328,2.531,8.891,4.828,13.797,6.672c17.156,6.5,37.531,9.219,62.063,9.219h191.25c29.313,0,53.094-23.719,53.094-53.047 c0-6.891-1.406-13.453-3.828-19.453c21.156-7,36.453-26.875,36.453-50.375c0.016-9.594-2.688-18.547-7.141-26.25 c6.422-5.25,10.781-12.156,13.266-19.375c2.719-7.75,3.656-15.906,3.656-24.203c0-5.141-1.094-10.141-2.969-15.016 c-1.375-3.469-3.172-6.891-5.375-10.125C501.125,253.938,511.984,236.703,512,216.906z M458.938,243.797h-8.844 c-3.469,0-6.813,1.391-9.25,3.828s-3.844,5.813-3.844,9.25s1.406,6.813,3.844,9.25s5.781,3.844,9.25,3.844 c2.516,0,4.578,0.563,6.594,1.609c2.969,1.516,5.797,4.375,7.75,7.719c1.969,3.281,2.875,7.047,2.813,8.906 c0.031,8.297-1.438,15.078-3.719,19.078c-1.156,2.031-2.391,3.453-3.906,4.594c-1.531,1.125-3.438,2.063-6.344,2.688 c-4.938,1-8.813,4.734-10.031,9.625c-1.234,4.906,0.438,10.031,4.344,13.25c6.094,5.094,9.875,12.313,9.875,20.594 c-0.031,14.844-12.047,26.875-26.922,26.906h-6.234c-5.438,0-10.313,3.344-12.219,8.438c-1.938,5.094-0.531,10.813,3.563,14.438 c5.688,5.078,9.172,12.063,9.172,20.047c-0.016,14.844-12.047,26.859-26.922,26.891h-191.25 c-20.063,0.016-36.031-2.063-48.313-5.969c-9.25-2.938-16.391-6.828-22.172-11.688c-1.938-1.656-3.703-3.469-5.375-5.359V245.5 c2.109-0.531,4.547-0.875,7.625-0.875c11.328,0,21.156-2.047,29.453-6.25c6.188-3.109,11.375-7.406,15.5-12.172 c6.188-7.203,10.219-15.297,13.719-23.484c3.5-8.219,6.5-16.625,10.031-24.906l0.156-0.313l51.328-129.281 c5.109-12.625,17.281-20.266,30.125-20.281c4.047,0,8.172,0.766,12.172,2.391c12.656,5.094,20.297,17.266,20.313,30.141 c0,4.047-0.75,8.156-2.375,12.172l-31,76.672c-0.422,1.016-0.688,2.047-0.844,3.125c-0.391,2.906-0.594,5.656-0.594,8.313 c0,4.875,0.688,9.484,2.484,13.781c1.313,3.219,3.297,6.203,5.734,8.563c3.656,3.594,8.078,5.594,12.031,6.625 c4,1.063,7.719,1.281,11.172,1.297c7.422-0.047,14.109-1.094,17.969-1.031c3.641,0,43.688,0,47.219,0h75.891 c14.844-0.016,26.938,12.047,26.938,26.922C485.813,231.75,473.781,243.781,458.938,243.797z diff --git a/Properties/SETTINGS.cs b/Properties/SETTINGS.cs index 2cc18b2..1c3f9fa 100644 --- a/Properties/SETTINGS.cs +++ b/Properties/SETTINGS.cs @@ -15,7 +15,7 @@ public partial class SETTINGS :ObservableObject [ObservableProperty] private bool enableDebugChanDataOutput = false; [ObservableProperty] private bool enableAutoBackup = true; [ObservableProperty] private int backupInterval = 180; - [ObservableProperty] private int maxBackupNumber = 200; + [ObservableProperty] private int maxBackupNumber = 300; [ObservableProperty] private string dataDir= AppContext.BaseDirectory; [ObservableProperty] private string windowsBlePluginName = "BLEPlugin_windows_x64.exe"; [ObservableProperty] private string osXBlePluginName = "BLEPlugin_macos_x64"; diff --git a/Views/Common/AboutWindow.axaml b/Views/Common/AboutWindow.axaml index 86bff0f..71df310 100644 --- a/Views/Common/AboutWindow.axaml +++ b/Views/Common/AboutWindow.axaml @@ -32,8 +32,14 @@ - - + + + diff --git a/Views/Common/AboutWindow.axaml.cs b/Views/Common/AboutWindow.axaml.cs index c954a3d..e8436d3 100644 --- a/Views/Common/AboutWindow.axaml.cs +++ b/Views/Common/AboutWindow.axaml.cs @@ -7,6 +7,7 @@ using Avalonia.Media; using MsBox.Avalonia; using Newtonsoft.Json.Linq; +using SenhaixFreqWriter.Constants.Common; using Version = SenhaixFreqWriter.Properties.Version; namespace SenhaixFreqWriter.Views.Common; @@ -16,9 +17,9 @@ public partial class AboutWindow : Window public AboutWindow() { InitializeComponent(); - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) windows.Background = Brushes.BlanchedAlmond; - if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) linux.Background = Brushes.BlanchedAlmond; - if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) macos.Background = Brushes.BlanchedAlmond; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) windows.Background = Brushes.BurlyWood; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) linux.Background = Brushes.BurlyWood; + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) macos.Background = Brushes.BurlyWood; MVersionTag.Content = Version.VersionTag == "@TAG_NAME@" ? "（内部版本）" : Version.VersionTag; MGitCommitHash.Content = Version.GitCommitHash == "@COMMIT_HASH@" ? "（内部版本）" : Version.GitCommitHash; MBuildTime.Content = Version.BuildTime == "@BUILD_TIME@" ? "（内部版本）" : Version.BuildTime; @@ -110,4 +111,12 @@ private async void UpdateButton_OnClick(object? sender, RoutedEventArgs e) MessageBoxManager.GetMessageBoxStandard("注意", "无法获取最新版本信息~").ShowWindowDialogAsync(this); } } + + private void AckButton_OnClick(object? sender, RoutedEventArgs e) + { + var thanks = $@"感谢以下友台对软件开发的大力支持： +{THANKSLIST.ToThankUString()} +名单可能多有遗漏之处，请见谅，并请及时告知！"; + MessageBoxManager.GetMessageBoxStandard("注意",thanks).ShowWindowDialogAsync(this); + } } \ No newline at end of file diff --git a/Views/Gt12/VfoModeWindow.axaml b/Views/Gt12/VfoModeWindow.axaml index 08c8980..ec94d17 100644 --- a/Views/Gt12/VfoModeWindow.axaml +++ b/Views/Gt12/VfoModeWindow.axaml @@ -10,7 +10,7 @@ CanResize="False"> -