Update Logo and Fix the adaptive behavior of the taskbar

SQc04 · Mar 23, 2024 · 3971208 · 3971208
1 parent 03af1eb
commit 3971208
Show file tree

Hide file tree

Showing 65 changed files with 161 additions and 46 deletions.
diff --git a/Assets/BadgeLogo.scale-100.png b/Assets/BadgeLogo.scale-100.png
diff --git a/Assets/BadgeLogo.scale-125.png b/Assets/BadgeLogo.scale-125.png
diff --git a/Assets/BadgeLogo.scale-150.png b/Assets/BadgeLogo.scale-150.png
diff --git a/Assets/BadgeLogo.scale-200.png b/Assets/BadgeLogo.scale-200.png
diff --git a/Assets/BadgeLogo.scale-400.png b/Assets/BadgeLogo.scale-400.png
diff --git a/Assets/FSFSoft.png b/Assets/FSFSoft.png
diff --git a/Assets/FSFSoftLogo.png b/Assets/FSFSoftLogo.png
diff --git a/Assets/FSFSoftLogo.scale-100.png b/Assets/FSFSoftLogo.scale-100.png
diff --git a/Assets/FSFSoftLogo.scale-125.png b/Assets/FSFSoftLogo.scale-125.png
diff --git a/Assets/FSFSoftLogo.scale-150.png b/Assets/FSFSoftLogo.scale-150.png
diff --git a/Assets/FSFSoftLogo.scale-200.png b/Assets/FSFSoftLogo.scale-200.png
diff --git a/Assets/FSFSoftLogo.scale-400.png b/Assets/FSFSoftLogo.scale-400.png
diff --git a/Assets/LargeTile.scale-100.png b/Assets/LargeTile.scale-100.png
diff --git a/Assets/LargeTile.scale-125.png b/Assets/LargeTile.scale-125.png
diff --git a/Assets/LargeTile.scale-150.png b/Assets/LargeTile.scale-150.png
diff --git a/Assets/LargeTile.scale-200.png b/Assets/LargeTile.scale-200.png
diff --git a/Assets/LargeTile.scale-400.png b/Assets/LargeTile.scale-400.png
diff --git a/Assets/SmallTile.scale-100.png b/Assets/SmallTile.scale-100.png
diff --git a/Assets/SmallTile.scale-125.png b/Assets/SmallTile.scale-125.png
diff --git a/Assets/SmallTile.scale-150.png b/Assets/SmallTile.scale-150.png
diff --git a/Assets/SmallTile.scale-200.png b/Assets/SmallTile.scale-200.png
diff --git a/Assets/SmallTile.scale-400.png b/Assets/SmallTile.scale-400.png
diff --git a/Assets/SplashScreen.scale-100.png b/Assets/SplashScreen.scale-100.png
diff --git a/Assets/SplashScreen.scale-125.png b/Assets/SplashScreen.scale-125.png
diff --git a/Assets/SplashScreen.scale-150.png b/Assets/SplashScreen.scale-150.png
diff --git a/Assets/SplashScreen.scale-200.png b/Assets/SplashScreen.scale-200.png
diff --git a/Assets/SplashScreen.scale-400.png b/Assets/SplashScreen.scale-400.png
diff --git a/Assets/Square150x150Logo.scale-100.png b/Assets/Square150x150Logo.scale-100.png
diff --git a/Assets/Square150x150Logo.scale-125.png b/Assets/Square150x150Logo.scale-125.png
diff --git a/Assets/Square150x150Logo.scale-150.png b/Assets/Square150x150Logo.scale-150.png
diff --git a/Assets/Square150x150Logo.scale-200.png b/Assets/Square150x150Logo.scale-200.png
diff --git a/Assets/Square150x150Logo.scale-400.png b/Assets/Square150x150Logo.scale-400.png
diff --git a/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png b/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png
diff --git a/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png b/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png
diff --git a/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png
diff --git a/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png b/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png
diff --git a/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png b/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png
diff --git a/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
diff --git a/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
diff --git a/Assets/Square44x44Logo.altform-unplated_targetsize-32.png b/Assets/Square44x44Logo.altform-unplated_targetsize-32.png
diff --git a/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
diff --git a/Assets/Square44x44Logo.scale-100.png b/Assets/Square44x44Logo.scale-100.png
diff --git a/Assets/Square44x44Logo.scale-125.png b/Assets/Square44x44Logo.scale-125.png
diff --git a/Assets/Square44x44Logo.scale-150.png b/Assets/Square44x44Logo.scale-150.png
diff --git a/Assets/Square44x44Logo.scale-200.png b/Assets/Square44x44Logo.scale-200.png
diff --git a/Assets/Square44x44Logo.scale-400.png b/Assets/Square44x44Logo.scale-400.png
diff --git a/Assets/Square44x44Logo.targetsize-16.png b/Assets/Square44x44Logo.targetsize-16.png
diff --git a/Assets/Square44x44Logo.targetsize-24.png b/Assets/Square44x44Logo.targetsize-24.png
diff --git a/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/Assets/Square44x44Logo.targetsize-256.png b/Assets/Square44x44Logo.targetsize-256.png
diff --git a/Assets/Square44x44Logo.targetsize-32.png b/Assets/Square44x44Logo.targetsize-32.png
diff --git a/Assets/Square44x44Logo.targetsize-48.png b/Assets/Square44x44Logo.targetsize-48.png
diff --git a/Assets/Wide310x150Logo.scale-100.png b/Assets/Wide310x150Logo.scale-100.png
diff --git a/Assets/Wide310x150Logo.scale-125.png b/Assets/Wide310x150Logo.scale-125.png
diff --git a/Assets/Wide310x150Logo.scale-150.png b/Assets/Wide310x150Logo.scale-150.png
diff --git a/Assets/Wide310x150Logo.scale-200.png b/Assets/Wide310x150Logo.scale-200.png
diff --git a/Assets/Wide310x150Logo.scale-400.png b/Assets/Wide310x150Logo.scale-400.png
diff --git a/FSFSoft.ico b/FSFSoft.ico
diff --git a/FSFSoftH.ico b/FSFSoftH.ico
diff --git a/FSGaryityTool_Win11.csproj b/FSGaryityTool_Win11.csproj
@@ -16,7 +16,7 @@
 		<DefaultLanguage>zh-cn</DefaultLanguage>
 		<PackageCertificateThumbprint>44A69BF79CCE3D4449484E6D059292A4AABE7E63</PackageCertificateThumbprint>
 		<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
-		<ApplicationIcon>FSSoftH.ico</ApplicationIcon>
+		<ApplicationIcon>FSFSoftH.ico</ApplicationIcon>
 		<SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
 		<LangVersion>11.0</LangVersion>
 		<PackageIcon>SmallTile.scale-400.png</PackageIcon>
@@ -33,7 +33,7 @@
 		<requireLicenseAcceptance>flase</requireLicenseAcceptance>
 		<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
 		<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-		<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+		<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
 		<AppxPackageDir>D:\I\FAIRING STUDIO\FSSoftware\FSGarvityTool\FSGaryityTool_Win11\bin\win10-x64\publish\x64-Pkg\</AppxPackageDir>
 		<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
 		<GenerateTestArtifacts>True</GenerateTestArtifacts>
@@ -42,6 +42,12 @@
 		<Version />
 	</PropertyGroup>
   <ItemGroup>
+    <Content Remove="Assets\FSFSoft.png" />
+    <Content Remove="Assets\FSFSoftLogo.scale-100.png" />
+    <Content Remove="Assets\FSFSoftLogo.scale-125.png" />
+    <Content Remove="Assets\FSFSoftLogo.scale-150.png" />
+    <Content Remove="Assets\FSFSoftLogo.scale-200.png" />
+    <Content Remove="Assets\FSFSoftLogo.scale-400.png" />
     <Content Remove="Assets\StoreLogo.png" />
   </ItemGroup>
   <ItemGroup>
@@ -70,6 +76,7 @@
     <Content Include="Assets\Square44x44Logo.scale-200.png" />
     <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
+    <Content Include="FSFSoftH.ico" />
     <Content Include="FSSoftH.ico" />
   </ItemGroup>
 
@@ -199,7 +206,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>0.2.15</VersionPrefix>
+    <VersionPrefix>0.2.18</VersionPrefix>
   </PropertyGroup>
 
 

diff --git a/MainWindow.xaml b/MainWindow.xaml
@@ -26,27 +26,33 @@
         </Grid.RowDefinitions>
 
 
-        <StackPanel Grid.Column="2" Grid.Row="0" Orientation="Horizontal" Canvas.ZIndex="10">
-            <Image x:Name="TitleBarIcon" Stretch="Fill" Source="/Assets/StoreLogo.png"
-            HorizontalAlignment="Left"
-            Width="20" Height="20"
-            Margin="0,2,0,0"/>
+
 
-            <TextBlock x:Name="TitleBarTextBlock" 
-            Text="App title" 
-            Style="{StaticResource CaptionTextBlockStyle}"
-            VerticalAlignment="Center"
-            Margin="8,2,0,0"/>
-        </StackPanel>
 
-
-        <Border x:Name="AppTitleBara" Grid.Column="2" Grid.Row="0" Height="48" VerticalAlignment="Top" Canvas.ZIndex="9" >
+        <Border x:Name="AppTitleBara" Grid.Column="2" Grid.Row="0" Height="48" VerticalAlignment="Top" Canvas.ZIndex="9" Margin="0,0,0,0">
             <!--Background="{ThemeResource SystemAccentColorLight2}"-->
-            <TextBlock x:Name="AppTitle" VerticalAlignment="Top" Margin="0,8,0,0" />
+            <!--<TextBlock x:Name="AppTitle" VerticalAlignment="Top" Margin="0,8,0,0" />-->
+            <Grid>
+                <StackPanel Grid.Column="2" Grid.Row="0" Orientation="Horizontal" Canvas.ZIndex="10">
+                    <Image x:Name="TitleBarIcon" Stretch="Fill" Source="/Assets/FSFSoftLogo.png"
+                            HorizontalAlignment="Left"
+                            Width="20" Height="20"
+                            Margin="0,2,0,0"/>
+
+                    <TextBlock x:Name="TitleBarTextBlock" 
+                                Text="App title" 
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                VerticalAlignment="Center"
+                                Margin="8,2,0,0"/>
+                </StackPanel>
+            </Grid>
         </Border>
 
         <NavigationView x:Name="FSnv" Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" Grid.ColumnSpan="2" IsTitleBarAutoPaddingEnabled="False" PaneDisplayMode="Auto" IsTabStop="False" 
-                        IsBackEnabled="True" BackRequested="NavigationView_BackRequested" SelectionChanged="NavigationView_SelectionChanged" Margin="0,0,0,0">
+                        IsBackEnabled="True" BackRequested="NavigationView_BackRequested" 
+                        SelectionChanged="NavigationView_SelectionChanged" 
+                        DisplayModeChanged="NavigationView_DisplayModeChanged"
+                        Margin="0,0,0,0">
             <NavigationView.MenuItems>
                 <NavigationViewItem Icon="Sort" Content="Serial Port" Tag="MainPage1" />
                 <NavigationViewItem Content="Download FLASH" Tag="Page2">
@@ -69,7 +75,7 @@
                 </NavigationViewItem>-->
                 <NavigationViewItem Tag="FSPage" Content="FairingStudio">
                     <NavigationViewItem.Icon>
-                        <BitmapIcon UriSource="/Assets/StoreLogo.png" ShowAsMonochrome="False"/>
+                        <BitmapIcon UriSource="/Assets/FSFSoftLogo.png" ShowAsMonochrome="False"/>
                     </NavigationViewItem.Icon>
                 </NavigationViewItem>
             </NavigationView.FooterMenuItems>

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -59,7 +59,7 @@ namespace FSGaryityTool_Win11
     public sealed partial class MainWindow : Window
     {
 
-        public static string FSSoftVersion = "0.2.15";
+        public static string FSSoftVersion = "0.2.18";
         public static int FsPage = 0;
         public static TomlTable settingstomlSp;
 
@@ -116,7 +116,7 @@ public MainWindow()
 
             m_AppWindow = GetAppWindowForCurrentWindow();
             m_AppWindow.Title = "FSGravityTool";//Set AppWindow
-            m_AppWindow.SetIcon("FSsoftH.ico");
+            m_AppWindow.SetIcon("FSFSoftH.ico");
 
 
             string SYSAPLOCAL = Environment.GetFolderPath(folder: Environment.SpecialFolder.LocalApplicationData);
@@ -225,6 +225,7 @@ public MainWindow()
                         ["AutoDaveSet"] = "1",
                         ["AutoSerichCom"] = "1",
                         ["AutoConnect"] = "1",
+                        ["DefaultTXNewLine"] = "1"
                     },
 
                 };
@@ -257,7 +258,7 @@ public MainWindow()
                 Debug.WriteLine(">");
 
                 //缓存设置
-                string defpage, baud, party, stop, data, rxhex, txhex, dtr, rts, shtime, autosco, autosavrset, autosercom, autoconnect;
+                string defpage, baud, party, stop, data, rxhex, txhex, dtr, rts, shtime, autosco, autosavrset, autosercom, autoconnect, txnewline;
                 using (StreamReader reader = File.OpenText(Page1.FSSetToml))                    //打开TOML文件
                 {
                     settingstomlSp = TOML.Parse(reader);
@@ -291,6 +292,8 @@ public MainWindow()
                     else autosercom = "1";
                     if ((string)settingstomlSp["SerialPortSettings"]["AutoConnect"] != "Tommy.TomlLazy") autoconnect = settingstomlSp["SerialPortSettings"]["AutoConnect"];
                     else autoconnect = "1";
+                    if ((string)settingstomlSp["SerialPortSettings"]["DefaultTXNewLine"] != "Tommy.TomlLazy") txnewline = settingstomlSp["SerialPortSettings"]["DefaultTXNewLine"];
+                    else txnewline = "1";
                     //if (settingstomlSp["SerialPortSettings"] != null)  = ;
 
                     settingstomlSp = new TomlTable
@@ -325,6 +328,7 @@ public MainWindow()
                             ["AutoDaveSet"] = autosavrset,
                             ["AutoSerichCom"] = autosercom,
                             ["AutoConnect"] = autoconnect,
+                            ["DefaultTXNewLine"] = txnewline,
                         },
 
                     };
@@ -466,7 +470,7 @@ private AppWindow GetAppWindowForCurrentWindow()
             return AppWindow.GetFromWindowId(wndId);
         }
 
-        private void NavigationView_BackRequested(NavigationView sender, NavigationViewBackRequestedEventArgs args)
+        private void NavigationView_BackRequested(NavigationView sender, NavigationViewBackRequestedEventArgs args)     //返回按钮
         {
 
             if (FsPage == 0) ;                  //SerialPortPage
@@ -483,6 +487,17 @@ private void NavigationView_BackRequested(NavigationView sender, NavigationViewB
             //else if (FsPage == 5) ;           //SettingsPage
         }
 
+        private void NavigationView_DisplayModeChanged(Microsoft.UI.Xaml.Controls.NavigationView sender, Microsoft.UI.Xaml.Controls.NavigationViewDisplayModeChangedEventArgs args)
+        {
+            if (args.DisplayMode == Microsoft.UI.Xaml.Controls.NavigationViewDisplayMode.Minimal)
+            {
+                AppTitleBara.Margin = new Thickness(48, 0, 0, 0);
+            }
+            else
+            {
+                AppTitleBara.Margin = new Thickness(0, 0, 0, 0);
+            }
+        }
 
         /*
         

diff --git a/Package.appxmanifest b/Package.appxmanifest
@@ -9,12 +9,12 @@
   <Identity
     Name="8153eea4-0701-4df3-b478-ccfc268ddd1b"
     Publisher="CN=FAIRING STUDIO"
-    Version="0.2.14.0" />
+    Version="0.2.18.0" />
 
   <Properties>
     <DisplayName>FSGaryityTool</DisplayName>
     <PublisherDisplayName>FAIRING STUDIO</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
+    <Logo>Assets\FSFSoftLogo.png</Logo>
 
 
   </Properties>

diff --git a/Page1.xaml b/Page1.xaml
@@ -155,7 +155,7 @@
                     </StackPanel.Transitions>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
-                    <ToggleButton x:Name="SaveSetButton" Checked="SaveSetButton_Checked" IsThreeState="False" IsChecked="False" Width="120" Margin="6">AutoSaveSet</ToggleButton>
+                    <ToggleButton x:Name="TXNewLineButton" Click="TXNewLineButton_Click" Width="120" Margin="6">TXNewLine</ToggleButton>
                     <ToggleButton x:Name="DTRButton" Click="DTRButton_Click" Width="48" Margin="6">DTR</ToggleButton>
                     <ToggleButton x:Name="RTSButton" Click="RTSButton_Click" Width="48" Margin="6">RTS</ToggleButton>
                     <StackPanel.Transitions>
@@ -165,7 +165,7 @@
                     </StackPanel.Transitions>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
-                    <ToggleButton x:Name="ShowTimeButton" Click="ShowTimeButton_Click" Width="120" Margin="6">Showtimestamp</ToggleButton>
+                    <ToggleButton x:Name="SaveSetButton" Click="SaveSetButton_Click" IsThreeState="False" IsChecked="False" Width="120" Margin="6">AutoSaveSet</ToggleButton>
                     <ToggleButton x:Name="AUTOScrollButton" Click="AUTOScrollButton_Click" Width="108" Margin="6">AUTOScroll</ToggleButton>
                     <StackPanel.Transitions>
                         <TransitionCollection>
@@ -187,6 +187,7 @@
 
                 <StackPanel Orientation="Horizontal">
                     <Button x:Name="RSTButton" Click="RSTButton_Click" Width="120" Margin="6">RST</Button>
+                    <ToggleButton x:Name="ShowTimeButton" Click="ShowTimeButton_Click" Width="108" Margin="6">Showtimestamp</ToggleButton>
                     <StackPanel.Transitions>
                         <TransitionCollection>
                             <RepositionThemeTransition />