Skip to content

Commit 0029b38

Browse files
FoxTesFoxTes
committed
New version.
1 parent 14991f4 commit 0029b38

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

‎src/Modules/SmartThermo.Modules.DataViewer/Views/Represent/LoadDataViewerWindow.xaml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,7 @@
147147
</Grid>
148148
</DataTemplate>
149149
<DataTemplate x:Key="Data0">
150-
<Grid
151-
Margin="0,8,8,8"
152-
Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
150+
<Grid Margin="0,8,8,8" Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
153151

154152
<Grid.RowDefinitions>
155153
<RowDefinition Height="8" />
@@ -219,7 +217,8 @@
219217
</Border>
220218
<TextBlock
221219
Grid.Row="3"
222-
Grid.ColumnSpan="3" Grid.Column="0"
220+
Grid.Column="0"
221+
Grid.ColumnSpan="3"
223222
HorizontalAlignment="Center"
224223
VerticalAlignment="Center"
225224
Foreground="{DynamicResource SystemControlBackgroundBaseMediumLowBrush}"
@@ -419,9 +418,7 @@
419418
</Grid>
420419
</DataTemplate>
421420
<DataTemplate x:Key="Data1">
422-
<Grid
423-
Margin="8"
424-
Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
421+
<Grid Margin="8" Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
425422

426423
<Grid.RowDefinitions>
427424
<RowDefinition Height="8" />
@@ -491,7 +488,8 @@
491488
</Border>
492489
<TextBlock
493490
Grid.Row="3"
494-
Grid.ColumnSpan="3" Grid.Column="0"
491+
Grid.Column="0"
492+
Grid.ColumnSpan="3"
495493
HorizontalAlignment="Center"
496494
VerticalAlignment="Center"
497495
Foreground="{DynamicResource SystemControlBackgroundBaseMediumLowBrush}"
@@ -691,9 +689,7 @@
691689
</Grid>
692690
</DataTemplate>
693691
<DataTemplate x:Key="Data2">
694-
<Grid
695-
Margin="8"
696-
Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
692+
<Grid Margin="8" Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
697693

698694
<Grid.RowDefinitions>
699695
<RowDefinition Height="8" />
@@ -763,7 +759,8 @@
763759
</Border>
764760
<TextBlock
765761
Grid.Row="3"
766-
Grid.ColumnSpan="3" Grid.Column="0"
762+
Grid.Column="0"
763+
Grid.ColumnSpan="3"
767764
HorizontalAlignment="Center"
768765
VerticalAlignment="Center"
769766
Foreground="{DynamicResource SystemControlBackgroundBaseMediumLowBrush}"
@@ -1033,7 +1030,8 @@
10331030
</Border>
10341031
<TextBlock
10351032
Grid.Row="3"
1036-
Grid.ColumnSpan="3" Grid.Column="0"
1033+
Grid.Column="0"
1034+
Grid.ColumnSpan="3"
10371035
HorizontalAlignment="Center"
10381036
VerticalAlignment="Center"
10391037
Foreground="{DynamicResource SystemControlBackgroundBaseMediumLowBrush}"
@@ -1104,7 +1102,7 @@
11041102
</DataTemplate>
11051103

11061104
<DataTemplate x:Key="Chart4">
1107-
<Grid Margin="0,8,8,0" Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
1105+
<Grid Margin="8,8,8,0" Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
11081106
<lvc:CartesianChart
11091107
Margin="8"
11101108
DisableAnimations="True"
@@ -1303,7 +1301,8 @@
13031301
</Border>
13041302
<TextBlock
13051303
Grid.Row="3"
1306-
Grid.ColumnSpan="3" Grid.Column="0"
1304+
Grid.Column="0"
1305+
Grid.ColumnSpan="3"
13071306
HorizontalAlignment="Center"
13081307
VerticalAlignment="Center"
13091308
Foreground="{DynamicResource SystemControlBackgroundBaseMediumLowBrush}"
@@ -1374,7 +1373,7 @@
13741373
</DataTemplate>
13751374

13761375
<DataTemplate x:Key="Chart5">
1377-
<Grid Margin="0,8,8,0" Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
1376+
<Grid Margin="8,8,8,0" Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
13781377
<lvc:CartesianChart
13791378
Margin="8"
13801379
DisableAnimations="True"
@@ -1573,7 +1572,8 @@
15731572
</Border>
15741573
<TextBlock
15751574
Grid.Row="3"
1576-
Grid.ColumnSpan="3" Grid.Column="0"
1575+
Grid.Column="0"
1576+
Grid.ColumnSpan="3"
15771577
HorizontalAlignment="Center"
15781578
VerticalAlignment="Center"
15791579
Foreground="{DynamicResource SystemControlBackgroundBaseMediumLowBrush}"

‎src/SmartThermo/Dialogs/Views/AboutDialog.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<Grid>
1111
<ui:SimpleStackPanel Width="320" Spacing="16">
1212
<TextBlock Style="{DynamicResource TitleTextBlockStyle}">SmartThermo</TextBlock>
13-
<TextBlock>Версия прошивки 0.3.0</TextBlock>
14-
<TextBlock TextWrapping="WrapWithOverflow">SmartThermo - это ПО для контроля, управления и записи данных с датчиков температуры.</TextBlock>
13+
<TextBlock>Версия прошивки - 0.4.0</TextBlock>
14+
<TextBlock TextWrapping="WrapWithOverflow">SmartThermo - это ПО для контроля, мониторинга и записи данных с датчиков температуры.</TextBlock>
1515
</ui:SimpleStackPanel>
1616
</Grid>
1717
</ui:ContentDialog>

‎src/SmartThermo/SmartThermo.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<UseWPF>true</UseWPF>
77
<EnableNETAnalyzers>true</EnableNETAnalyzers>
88
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
9-
<AssemblyVersion>0.3.0.0</AssemblyVersion>
10-
<FileVersion>0.3.0.0</FileVersion>
11-
<Version>0.3.0</Version>
9+
<AssemblyVersion>0.4.0.0</AssemblyVersion>
10+
<FileVersion>0.4.0.0</FileVersion>
11+
<Version>0.4.0</Version>
1212
</PropertyGroup>
1313

1414
<ItemGroup>

0 commit comments

Comments
 (0)