✨ Update theme color in dark theme

SydneyOwl · Aug 17, 2024 · f2f69c3 · f2f69c3
1 parent 7ac2f78
commit f2f69c3
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 43 deletions.
diff --git a/App.axaml b/App.axaml
@@ -43,24 +43,27 @@
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
                 <ResourceDictionary x:Key="Dark">
-                    <SolidColorBrush x:Key='btBackgroundBrush'>DarkGray</SolidColorBrush>
-                    <SolidColorBrush x:Key='pgBackgroundBrush'>DarkGray</SolidColorBrush>
-                    <SolidColorBrush x:Key='dgvBackgroundBrush'>LightGray</SolidColorBrush>
-                    <SolidColorBrush x:Key='tbBackgroundBrush'>LightSlateGray</SolidColorBrush>
-                    <SolidColorBrush x:Key='dgBackgroundBrush'>LightSlateGray</SolidColorBrush>
+                    <SolidColorBrush x:Key='btBackgroundBrush'>#121212</SolidColorBrush>
+                    <SolidColorBrush x:Key='pgBackgroundBrush'>#536271</SolidColorBrush>
+                    <SolidColorBrush x:Key='dgvBackgroundBrush'>#3E4C5E</SolidColorBrush>
+                    <SolidColorBrush x:Key='tbBackgroundBrush'>#536271</SolidColorBrush>
+                    <SolidColorBrush x:Key='borderBrush'>BurlyWood</SolidColorBrush>
+                    <SolidColorBrush x:Key='dgBackgroundBrush'>#3E4C5E</SolidColorBrush>
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="Light">
                     <SolidColorBrush x:Key='btBackgroundBrush'>BlanchedAlmond</SolidColorBrush>
                     <SolidColorBrush x:Key='pgBackgroundBrush'>BlanchedAlmond</SolidColorBrush>
                     <SolidColorBrush x:Key='dgvBackgroundBrush'>White</SolidColorBrush>
                     <SolidColorBrush x:Key='tbBackgroundBrush'>SkyBlue</SolidColorBrush>
+                    <SolidColorBrush x:Key='borderBrush'>Black</SolidColorBrush>
                     <SolidColorBrush x:Key='dgBackgroundBrush'>White</SolidColorBrush>
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="Default">
                     <SolidColorBrush x:Key='btBackgroundBrush'>BlanchedAlmond</SolidColorBrush>
                     <SolidColorBrush x:Key='pgBackgroundBrush'>BlanchedAlmond</SolidColorBrush>
                     <SolidColorBrush x:Key='dgvBackgroundBrush'>White</SolidColorBrush>
                     <SolidColorBrush x:Key='tbBackgroundBrush'>SkyBlue</SolidColorBrush>
+                    <SolidColorBrush x:Key='borderBrush'>Black</SolidColorBrush>
                     <SolidColorBrush x:Key='dgBackgroundBrush'>White</SolidColorBrush>
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>

diff --git a/Properties/SETTINGS.cs b/Properties/SETTINGS.cs
@@ -14,8 +14,8 @@ public partial class SETTINGS :ObservableObject
     [ObservableProperty] private bool enableSelectPortInAdvance = true;
     [ObservableProperty] private bool enableDebugChanDataOutput = false;
     [ObservableProperty] private bool enableAutoBackup = true;
-    [ObservableProperty] private int backupInterval = 180;
-    [ObservableProperty] private int maxBackupNumber = 300;
+    [ObservableProperty] private int backupInterval = 200;
+    [ObservableProperty] private int maxBackupNumber = 150;
     [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/Gt12/MainWindow.axaml b/Views/Gt12/MainWindow.axaml
@@ -154,11 +154,11 @@
                 <Label Margin="30,7,0,0" Content="连接状态：未连接" Name="statusLabel" />
             </StackPanel>
         </Border>
-        <Border Height="25" Background="LemonChiffon" BorderBrush="Black" BorderThickness="1" DockPanel.Dock="Bottom">
+        <Border Height="25" Background="{DynamicResource tbBackgroundBrush}" BorderBrush="Black" BorderThickness="1" DockPanel.Dock="Bottom">
             <!-- <StackPanel Orientation="Horizontal"> -->
             <!-- <Label Foreground="MediumBlue" Content="{x:Static verConstants:Version.VersionTag}" /> -->
             <!-- <TextBlock Foreground="MediumBlue">|https://github.com/SydneyOwl/senhaix-freq-writer-enhanced|</TextBlock> -->
-            <TextBlock Foreground="Blue" Name="tipBlock" />
+            <TextBlock Name="tipBlock" />
             <!-- </StackPanel> -->
         </Border>
         <Border Height="40" Background="{DynamicResource tbBackgroundBrush}" BorderBrush="Black" BorderThickness="1"

diff --git a/Views/Gt12/VfoModeWindow.axaml b/Views/Gt12/VfoModeWindow.axaml
@@ -9,7 +9,7 @@
         WindowStartupLocation="CenterScreen"
         CanResize="False">
     <Canvas>
-        <Border Height="550" Width="300" Margin="10" BorderThickness="1" BorderBrush="Black" />
+        <Border Height="550" Width="300" Margin="10" BorderThickness="1" BorderBrush="{StaticResource borderBrush}" />
         <Label Content="VFO A" Background="BurlyWood" FontSize="20" Canvas.Left="20" />
         <Label Content="频率" FontSize="15" Canvas.Left="20" Canvas.Top="50" />
         <TextBox Canvas.Left="100" Canvas.Top="45" Width="150"
@@ -58,7 +58,7 @@
         <TextBox Canvas.Left="100" Canvas.Top="485" Width="150" Height="30" Text="{Binding VfoInfos.VfoAOffset}"
                  LostFocus="freqOffset_OnLostFocus" />
 
-        <Border Height="550" Width="300" Margin="10" BorderThickness="1" BorderBrush="Black" Canvas.Left="350" />
+        <Border Height="550" Width="300" Margin="10" BorderThickness="1" BorderBrush="{StaticResource borderBrush}" Canvas.Left="350" />
         <Label Content="VFO B" Background="BurlyWood" FontSize="20" Canvas.Left="370" />
         <Label Content="频率" FontSize="15" Canvas.Left="370" Canvas.Top="50" />
         <TextBox Canvas.Left="450" Canvas.Top="45" Width="150" Height="30"

diff --git a/Views/Plugin/SatelliteHelperWindow.axaml b/Views/Plugin/SatelliteHelperWindow.axaml
@@ -26,7 +26,7 @@
                  Width="250" Canvas.Top="270" Canvas.Left="250"
                  SelectionChanged="ModeListBox_OnSelectionChanged" />
 
-        <Border Width="260" Height="95" BorderBrush="Black" BorderThickness="1"
+        <Border Width="260" Height="95" BorderBrush="{StaticResource borderBrush}" BorderThickness="1"
                 Canvas.Top="480" Canvas.Left="10" />
         <CheckBox Canvas.Top="510" Canvas.Left="20" IsChecked="True" Name="doppler" />
         <Label Content="多普勒" Canvas.Top="510" Canvas.Left="40" />
@@ -39,7 +39,7 @@
         <TextBox Canvas.Top="535" Canvas.Left="145" Name="voffset" Text="5" />
         <Label Content="kHz" Canvas.Top="540" Canvas.Left="220" />
 
-        <Border Width="210" Height="155" BorderBrush="Black" BorderThickness="1"
+        <Border Width="210" Height="155" BorderBrush="{StaticResource borderBrush}" BorderThickness="1"
                 Canvas.Top="450" Canvas.Left="290" />
 
         <Label Content="(手动覆盖)" Canvas.Top="440" Canvas.Left="300" Background="BurlyWood" />

diff --git a/Views/Shx8800Pro/MainWindow.axaml b/Views/Shx8800Pro/MainWindow.axaml
@@ -160,11 +160,11 @@
                 </Button>
             </StackPanel>
         </Border>
-        <Border Height="25" Background="LemonChiffon" BorderBrush="Black" BorderThickness="1" DockPanel.Dock="Bottom">
+        <Border Height="25" Background="{DynamicResource tbBackgroundBrush}" BorderBrush="Black" BorderThickness="1" DockPanel.Dock="Bottom">
             <!-- <StackPanel Orientation="Horizontal"> -->
             <!-- <Label Foreground="MediumBlue" Content="{x:Static verConstants:Version.VersionTag}" /> -->
             <!-- <TextBlock Foreground="MediumBlue">|https://github.com/SydneyOwl/senhaix-freq-writer-enhanced|</TextBlock> -->
-            <TextBlock Foreground="Blue" Name="tipBlock" />
+            <TextBlock Name="tipBlock" />
             <!-- </StackPanel> -->
         </Border>
         <Border Height="40" Background="{DynamicResource tbBackgroundBrush}" BorderBrush="Black" BorderThickness="1"

diff --git a/Views/Shx8800Pro/VfoModeWindow.axaml b/Views/Shx8800Pro/VfoModeWindow.axaml
@@ -9,7 +9,7 @@
         WindowStartupLocation="CenterScreen"
         CanResize="False">
     <Canvas>
-        <Border Height="480" Width="300" Margin="10" BorderThickness="1" BorderBrush="Black" />
+        <Border Height="480" Width="300" Margin="10" BorderThickness="1" BorderBrush="{StaticResource borderBrush}" />
         <Label Content="VFO A" Background="BurlyWood" FontSize="20" Canvas.Left="20" />
         <Label Content="频率" FontSize="15" Canvas.Left="20" Canvas.Top="50" />
         <TextBox Canvas.Left="100" Canvas.Top="45" Width="150"
@@ -50,7 +50,7 @@
         <TextBox Canvas.Left="100" Canvas.Top="405" Width="150" Height="30" Text="{Binding VfoInfos.VfoAOffset}"
                  LostFocus="freqOffset_OnLostFocus" />
 
-        <Border Height="480" Width="300" Margin="10" BorderThickness="1" BorderBrush="Black" Canvas.Left="350" />
+        <Border Height="480" Width="300" Margin="10" BorderThickness="1" BorderBrush="{StaticResource borderBrush}" Canvas.Left="350" />
         <Label Content="VFO B" Background="BurlyWood" FontSize="20" Canvas.Left="370" />
         <Label Content="频率" FontSize="15" Canvas.Left="370" Canvas.Top="50" />
         <TextBox Canvas.Left="450" Canvas.Top="45" Width="150" Height="30"

diff --git a/Views/Shx8x00/DTMFWindow.axaml b/Views/Shx8x00/DTMFWindow.axaml
@@ -10,71 +10,71 @@
         Title="DTMF参数"
         KeyDown="Input_OnKeyDown">
     <Canvas>
-        <Border Height="200" Width="380" Margin="10" BorderThickness="1" BorderBrush="Black" />
-        <Label Canvas.Top="0" Canvas.Left="20" Background="White">编码码组：</Label>
-        <Label Canvas.Top="30" Canvas.Left="20" Background="White">1：</Label>
+        <Border Height="200" Width="380" Margin="10" BorderThickness="1" BorderBrush="{StaticResource borderBrush}" />
+        <Label Canvas.Top="0" Canvas.Left="20" Background="BurlyWood">编码码组：</Label>
+        <Label Canvas.Top="30" Canvas.Left="20" >1：</Label>
         <TextBox Canvas.Top="25" Canvas.Left="50" Text="{Binding Dtmf.GroupOfDtmf1}"
                  TextChanged="TextBox_OnTextChanged" />
-        <Label Canvas.Top="65" Canvas.Left="20" Background="White">2：</Label>
+        <Label Canvas.Top="65" Canvas.Left="20" >2：</Label>
         <TextBox Canvas.Top="60" Canvas.Left="50" Text="{Binding Dtmf.GroupOfDtmf2}"
                  TextChanged="TextBox_OnTextChanged" />
-        <Label Canvas.Top="100" Canvas.Left="20" Background="White">3：</Label>
+        <Label Canvas.Top="100" Canvas.Left="20">3：</Label>
         <TextBox Canvas.Top="95" Canvas.Left="50" Text="{Binding Dtmf.GroupOfDtmf3}"
                  TextChanged="TextBox_OnTextChanged" />
-        <Label Canvas.Top="135" Canvas.Left="20" Background="White">4：</Label>
+        <Label Canvas.Top="135" Canvas.Left="20">4：</Label>
         <TextBox Canvas.Top="130" Canvas.Left="50" Text="{Binding Dtmf.GroupOfDtmf4}"
                  TextChanged="TextBox_OnTextChanged" />
-        <Label Canvas.Top="170" Canvas.Left="20" Background="White">5：</Label>
+        <Label Canvas.Top="170" Canvas.Left="20">5：</Label>
         <TextBox Canvas.Top="165" Canvas.Left="50" Text="{Binding Dtmf.GroupOfDtmf5}"
                  TextChanged="TextBox_OnTextChanged" />
 
-        <Label Canvas.Top="30" Canvas.Left="130" Background="White">6：</Label>
+        <Label Canvas.Top="30" Canvas.Left="130" >6：</Label>
         <TextBox Canvas.Top="25" Canvas.Left="160" Text="{Binding Dtmf.GroupOfDtmf6}"
                  TextChanged="TextBox_OnTextChanged" />
-        <Label Canvas.Top="65" Canvas.Left="130" Background="White">7：</Label>
+        <Label Canvas.Top="65" Canvas.Left="130" >7：</Label>
         <TextBox Canvas.Top="60" Canvas.Left="160" Text="{Binding Dtmf.GroupOfDtmf7}"
                  TextChanged="TextBox_OnTextChanged" />
-        <Label Canvas.Top="100" Canvas.Left="130" Background="White">8：</Label>
+        <Label Canvas.Top="100" Canvas.Left="130" >8：</Label>
         <TextBox Canvas.Top="95" Canvas.Left="160" Text="{Binding Dtmf.GroupOfDtmf8}"
                  TextChanged="TextBox_OnTextChanged" />
-        <Label Canvas.Top="135" Canvas.Left="130" Background="White">9：</Label>
+        <Label Canvas.Top="135" Canvas.Left="130" >9：</Label>
         <TextBox Canvas.Top="130" Canvas.Left="160" Text="{Binding Dtmf.GroupOfDtmf9}"
                  TextChanged="TextBox_OnTextChanged" />
-        <Label Canvas.Top="170" Canvas.Left="130" Background="White">10：</Label>
+        <Label Canvas.Top="170" Canvas.Left="130" >10：</Label>
         <TextBox Canvas.Top="165" Canvas.Left="160" Text="{Binding Dtmf.GroupOfDtmfA}"
                  TextChanged="TextBox_OnTextChanged" />
 
-        <Label Canvas.Top="30" Canvas.Left="250" Background="White">11：</Label>
+        <Label Canvas.Top="30" Canvas.Left="250" >11：</Label>
         <TextBox Canvas.Top="25" Canvas.Left="280" Text="{Binding Dtmf.GroupOfDtmfB}"
                  TextChanged="TextBox_OnTextChanged" />
-        <Label Canvas.Top="65" Canvas.Left="250" Background="White">12：</Label>
+        <Label Canvas.Top="65" Canvas.Left="250" >12：</Label>
         <TextBox Canvas.Top="60" Canvas.Left="280" Text="{Binding Dtmf.GroupOfDtmfC}"
                  TextChanged="TextBox_OnTextChanged" />
-        <Label Canvas.Top="100" Canvas.Left="250" Background="White">13：</Label>
+        <Label Canvas.Top="100" Canvas.Left="250" >13：</Label>
         <TextBox Canvas.Top="95" Canvas.Left="280" Text="{Binding Dtmf.GroupOfDtmfD}"
                  TextChanged="TextBox_OnTextChanged" />
-        <Label Canvas.Top="135" Canvas.Left="250" Background="White">14：</Label>
+        <Label Canvas.Top="135" Canvas.Left="250" >14：</Label>
         <TextBox Canvas.Top="130" Canvas.Left="280" Text="{Binding Dtmf.GroupOfDtmfE}"
                  TextChanged="TextBox_OnTextChanged" />
-        <Label Canvas.Top="170" Canvas.Left="250" Background="White">15：</Label>
+        <Label Canvas.Top="170" Canvas.Left="250" >15：</Label>
         <TextBox Canvas.Top="165" Canvas.Left="280" Text="{Binding Dtmf.GroupOfDtmfF}"
                  TextChanged="TextBox_OnTextChanged" />
 
-        <Border Height="160" Width="180" BorderThickness="1" BorderBrush="Black"
+        <Border Height="160" Width="180" BorderThickness="1" BorderBrush="{StaticResource borderBrush}"
                 Canvas.Left="10" Canvas.Top="220" />
-        <Label Canvas.Top="210" Canvas.Left="20" Background="White">本机ID码：</Label>
+        <Label Canvas.Top="210" Canvas.Left="20" Background="BurlyWood">本机ID码：</Label>
         <TextBox Canvas.Top="250" Canvas.Left="50" Width="100" Text="{Binding Dtmf.TheIdOfLocalHost}"
                  TextChanged="idhost_OnTextChanged" />
         <CheckBox Canvas.Top="290" Canvas.Left="20" IsChecked="{Binding Dtmf.SendOnPttPressed}">按下PTT时发送</CheckBox>
         <CheckBox Canvas.Top="320" Canvas.Left="20" IsChecked="{Binding Dtmf.SendOnPttReleased}">松开PTT时发送</CheckBox>
 
         <Border Height="160" Width="180"
-                Canvas.Right="10" Canvas.Top="220" BorderThickness="1" BorderBrush="Black" />
-        <Label Canvas.Top="240" Canvas.Left="215" Background="White" FontSize="13">发送DTMF码时码持续时间：</Label>
+                Canvas.Right="10" Canvas.Top="220" BorderThickness="1" BorderBrush="{StaticResource borderBrush}" />
+        <Label Canvas.Top="240" Canvas.Left="215" FontSize="13">发送DTMF码时码持续时间：</Label>
         <ComboBox Canvas.Left="245" Canvas.Top="265" Width="90"
                   ItemsSource="{x:Static constants:DtmfChoice.StopOrLastTime}"
                   SelectedIndex="{Binding Dtmf.LastTimeSend}" />
-        <Label Canvas.Top="310" Canvas.Left="215" Background="White" FontSize="13">发送DTMF码时码间断时间：</Label>
+        <Label Canvas.Top="310" Canvas.Left="215" FontSize="13">发送DTMF码时码间断时间：</Label>
         <ComboBox Canvas.Left="245" Canvas.Top="335" Width="90"
                   ItemsSource="{x:Static constants:DtmfChoice.StopOrLastTime}"
                   SelectedIndex="{Binding Dtmf.LastTimeStop}" />

diff --git a/Views/Shx8x00/MainWindow.axaml b/Views/Shx8x00/MainWindow.axaml
@@ -156,11 +156,11 @@
                 </Button>
             </StackPanel>
         </Border>
-        <Border Height="25" Background="LemonChiffon" BorderBrush="Black" BorderThickness="1" DockPanel.Dock="Bottom">
+        <Border Height="25" Background="{DynamicResource tbBackgroundBrush}" BorderBrush="Black" BorderThickness="1" DockPanel.Dock="Bottom">
             <!-- <StackPanel Orientation="Horizontal"> -->
             <!-- <Label Foreground="MediumBlue" Content="{x:Static verConstants:Version.VersionTag}" /> -->
             <!-- <TextBlock Foreground="MediumBlue">|https://github.com/SydneyOwl/senhaix-freq-writer-enhanced|</TextBlock> -->
-            <TextBlock Foreground="Blue" Name="tipBlock" />
+            <TextBlock Name="tipBlock" />
             <!-- </StackPanel> -->
         </Border>
         <Border Background="{DynamicResource dgvBackgroundBrush}" BorderBrush="Black" BorderThickness="1">

diff --git a/Views/Shx8x00/OptionalWindow.axaml b/Views/Shx8x00/OptionalWindow.axaml
@@ -57,7 +57,7 @@
                           SelectedIndex="{Binding Fun.CbBSaveMode}" />
 
                 <Label Canvas.Top="-10" Canvas.Left="230" Background="BurlyWood">A段模式</Label>
-                <Border Height="380" Width="240" Canvas.Top="-10" Canvas.Left="220" BorderBrush="Black"
+                <Border Height="380" Width="240" Canvas.Top="-10" Canvas.Left="220" BorderBrush="{StaticResource borderBrush}"
                         BorderThickness="1" />
                 <Label Canvas.Top="15" Canvas.Left="230">当前频率(MHz)</Label>
                 <TextBox Canvas.Top="10" Canvas.Left="340" Text="{Binding Fun.TBACurFreq}"
@@ -103,7 +103,7 @@
                           SelectedIndex="{Binding Fun.CbBAFhss}" />
                 <!-- ///////////////////////////////////////////////////////////////// -->
                 <Label Canvas.Top="-10" Canvas.Left="500" Background="BurlyWood">B段模式</Label>
-                <Border Height="380" Width="240" Canvas.Top="-10" Canvas.Left="480" BorderBrush="Black"
+                <Border Height="380" Width="240" Canvas.Top="-10" Canvas.Left="480" BorderBrush="{StaticResource borderBrush}"
                         BorderThickness="1" />
                 <Label Canvas.Top="15" Canvas.Left="490">当前频率(MHz)</Label>
                 <TextBox Canvas.Top="10" Canvas.Left="600" Text="{Binding Fun.TBBCurFreq}"