New version.

FoxTes · Mar 30, 2021 · 0029b38 · 0029b38
1 parent 14991f4
commit 0029b38
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/src/Modules/SmartThermo.Modules.DataViewer/Views/Represent/LoadDataViewerWindow.xaml b/src/Modules/SmartThermo.Modules.DataViewer/Views/Represent/LoadDataViewerWindow.xaml
@@ -147,9 +147,7 @@
             </Grid>
         </DataTemplate>
         <DataTemplate x:Key="Data0">
-            <Grid
-                Margin="0,8,8,8"
-                Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
+            <Grid Margin="0,8,8,8" Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
 
                 <Grid.RowDefinitions>
                     <RowDefinition Height="8" />
@@ -219,7 +217,8 @@
                 </Border>
                 <TextBlock
                     Grid.Row="3"
-                    Grid.ColumnSpan="3" Grid.Column="0"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="3"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Foreground="{DynamicResource SystemControlBackgroundBaseMediumLowBrush}"
@@ -419,9 +418,7 @@
             </Grid>
         </DataTemplate>
         <DataTemplate x:Key="Data1">
-            <Grid
-                Margin="8"
-                Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
+            <Grid Margin="8" Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
 
                 <Grid.RowDefinitions>
                     <RowDefinition Height="8" />
@@ -491,7 +488,8 @@
                 </Border>
                 <TextBlock
                     Grid.Row="3"
-                    Grid.ColumnSpan="3" Grid.Column="0"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="3"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Foreground="{DynamicResource SystemControlBackgroundBaseMediumLowBrush}"
@@ -691,9 +689,7 @@
             </Grid>
         </DataTemplate>
         <DataTemplate x:Key="Data2">
-            <Grid
-                Margin="8"
-                Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
+            <Grid Margin="8" Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
 
                 <Grid.RowDefinitions>
                     <RowDefinition Height="8" />
@@ -763,7 +759,8 @@
                 </Border>
                 <TextBlock
                     Grid.Row="3"
-                    Grid.ColumnSpan="3" Grid.Column="0"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="3"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Foreground="{DynamicResource SystemControlBackgroundBaseMediumLowBrush}"
@@ -1033,7 +1030,8 @@
                 </Border>
                 <TextBlock
                     Grid.Row="3"
-                    Grid.ColumnSpan="3" Grid.Column="0"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="3"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Foreground="{DynamicResource SystemControlBackgroundBaseMediumLowBrush}"
@@ -1104,7 +1102,7 @@
         </DataTemplate>
 
         <DataTemplate x:Key="Chart4">
-            <Grid Margin="0,8,8,0" Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
+            <Grid Margin="8,8,8,0" Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
                 <lvc:CartesianChart
                     Margin="8"
                     DisableAnimations="True"
@@ -1303,7 +1301,8 @@
                 </Border>
                 <TextBlock
                     Grid.Row="3"
-                    Grid.ColumnSpan="3" Grid.Column="0"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="3"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Foreground="{DynamicResource SystemControlBackgroundBaseMediumLowBrush}"
@@ -1374,7 +1373,7 @@
         </DataTemplate>
 
         <DataTemplate x:Key="Chart5">
-            <Grid Margin="0,8,8,0" Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
+            <Grid Margin="8,8,8,0" Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
                 <lvc:CartesianChart
                     Margin="8"
                     DisableAnimations="True"
@@ -1573,7 +1572,8 @@
                 </Border>
                 <TextBlock
                     Grid.Row="3"
-                    Grid.ColumnSpan="3" Grid.Column="0"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="3"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Foreground="{DynamicResource SystemControlBackgroundBaseMediumLowBrush}"

diff --git a/src/SmartThermo/Dialogs/Views/AboutDialog.xaml b/src/SmartThermo/Dialogs/Views/AboutDialog.xaml
@@ -10,8 +10,8 @@
     <Grid>
         <ui:SimpleStackPanel Width="320" Spacing="16">
             <TextBlock Style="{DynamicResource TitleTextBlockStyle}">SmartThermo</TextBlock>
-            <TextBlock>Версия прошивки 0.3.0</TextBlock>
-            <TextBlock TextWrapping="WrapWithOverflow">SmartThermo - это ПО для контроля, управления и записи данных с датчиков температуры.</TextBlock>
+            <TextBlock>Версия прошивки - 0.4.0</TextBlock>
+            <TextBlock TextWrapping="WrapWithOverflow">SmartThermo - это ПО для контроля, мониторинга и записи данных с датчиков температуры.</TextBlock>
         </ui:SimpleStackPanel>
     </Grid>
 </ui:ContentDialog>
diff --git a/src/SmartThermo/SmartThermo.csproj b/src/SmartThermo/SmartThermo.csproj
@@ -6,9 +6,9 @@
     <UseWPF>true</UseWPF>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-    <AssemblyVersion>0.3.0.0</AssemblyVersion>
-    <FileVersion>0.3.0.0</FileVersion>
-    <Version>0.3.0</Version>
+    <AssemblyVersion>0.4.0.0</AssemblyVersion>
+    <FileVersion>0.4.0.0</FileVersion>
+    <Version>0.4.0</Version>
   </PropertyGroup>
 
   <ItemGroup>