Skip to content

Commit 7a39098

Browse files
SSStuartSSStuart
committed
[v0.1.3] Fixed new startup Container script
- Fixed an essential error that would not display an empty container if there was no container already saved (first launch). - Updated target .NET Framework to 9.0 - Added version display in the settings window
1 parent 3717d8b commit 7a39098

4 files changed

Lines changed: 25 additions & 14 deletions

File tree

‎App.xaml.cs‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,19 @@ private void Application_Startup(object sender, StartupEventArgs e)
3030
return;
3131
}
3232

33-
//base.OnStartup(e);
34-
3533
string saveDirectory = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\DesktopContainer";
3634
if (!Directory.Exists(saveDirectory))
3735
Directory.CreateDirectory(saveDirectory);
3836

39-
List<string> savedContainer = Directory.GetFiles(saveDirectory, "*.json").ToList();
37+
List<string> savedContainer = [.. Directory.GetFiles(saveDirectory, "*.json")];
4038

4139
foreach (string container in savedContainer)
4240
{
4341
StreamReader r = new(container);
4442
string json = r.ReadToEnd();
4543
if(json != "")
4644
{
47-
List<List<string>> save_datas = JsonSerializer.Deserialize<List<List<string>>>(json);
45+
List<List<string>> save_datas = JsonSerializer.Deserialize<List<List<string>>>(json) ?? [];
4846
r.Close();
4947

5048
string timestampText = container.Split("\\")[^1].Split("container")[1].Split(".")[0];
@@ -53,6 +51,13 @@ private void Application_Startup(object sender, StartupEventArgs e)
5351
newContainer.Show();
5452
}
5553
}
54+
55+
if (savedContainer.Count == 0)
56+
{
57+
MainWindow emptyContainer = new();
58+
emptyContainer.Show();
59+
}
60+
5661
}
5762

5863
void App_SessionEnding(object sender, SessionEndingCancelEventArgs e)

‎ContainerSettings.xaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
<ColumnDefinition Width="auto"/>
2121
</Grid.ColumnDefinitions>
2222

23-
<TextBlock x:Name="Settings_Title" Text="Settings" HorizontalAlignment="Center" Background="{x:Null}" Foreground="White" />
23+
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
24+
<TextBlock x:Name="Settings_Title" Text="Settings" HorizontalAlignment="Center" Background="{x:Null}" Foreground="White" />
25+
<TextBlock x:Name="Settings_Version" Text="v0.1.3" HorizontalAlignment="Center" Background="{x:Null}" Foreground="White" Margin="10,0,10,0" Opacity="0.5" />
26+
</StackPanel>
2427

2528
<Button x:Name="Btn_CloseSettings" Grid.Column="1" Click="Btn_CloseSettings_Click" FontSize="15" Width="16" Height="16" Margin="2,2,2,2" Cursor="Hand" ToolTip="Close" >
2629
<Button.Background>

‎ContainerSettings.xaml.cs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Diagnostics;
44
using System.IO;
55
using System.Linq;
6+
using System.Reflection;
67
using System.Text.Json;
78
using System.Windows;
89
using System.Windows.Controls;
@@ -23,6 +24,8 @@ public ContainerSettings(long ownerTimestampPassed)
2324
{
2425
InitializeComponent();
2526

27+
Settings_Version.Text = "v" + Assembly.GetExecutingAssembly().GetName().Version.ToString();
28+
2629
ownerTimestamp = ownerTimestampPassed;
2730

2831
// Récupération des fichiers Container pour le dropdown
@@ -40,7 +43,7 @@ public ContainerSettings(long ownerTimestampPassed)
4043
string json = r.ReadToEnd();
4144
if (json != "")
4245
{
43-
List<List<string>> save_datas = JsonSerializer.Deserialize<List<List<string>>>(json);
46+
List<List<string>> save_datas = JsonSerializer.Deserialize<List<List<string>>>(json) ?? [];
4447
r.Close();
4548

4649
string name = save_datas[0][0];
@@ -58,7 +61,7 @@ public ContainerSettings(long ownerTimestampPassed)
5861
string json = r.ReadToEnd();
5962
if (json != "")
6063
{
61-
List<List<string>> save_datas = JsonSerializer.Deserialize<List<List<string>>>(json);
64+
List<List<string>> save_datas = JsonSerializer.Deserialize<List<List<string>>>(json) ?? [];
6265
r.Close();
6366

6467
string name = save_datas[0][0];
@@ -93,10 +96,10 @@ private void BtnReload_Click(object sender, RoutedEventArgs e)
9396
}
9497

9598
int containerIndex;
96-
string selectedTimestamp;
99+
string selectedTimestamp = "";
97100
private void CmbBox_ContainersList_SelectionChanged(object sender, SelectionChangedEventArgs e)
98101
{
99-
string selectedValue = CmbBox_ContainersList.SelectedItem.ToString();
102+
string selectedValue = CmbBox_ContainersList.SelectedItem.ToString() ?? "";
100103
selectedTimestamp = selectedValue.Split("[")[1].Replace("]","");
101104

102105
if (selectedValue.Contains("(BACKUP)"))
@@ -189,7 +192,7 @@ private void PositionAnchorEdit()
189192
if (json != "")
190193
{
191194

192-
List<List<string>> save_datas = JsonSerializer.Deserialize<List<List<string>>>(json);
195+
List<List<string>> save_datas = JsonSerializer.Deserialize<List<List<string>>>(json) ?? [];
193196
r.Close();
194197

195198
save_datas[0][5] = position;

‎Desktop Container.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net6.0-windows</TargetFramework>
5+
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
66
<RootNamespace>Desktop_Container</RootNamespace>
77
<Nullable>enable</Nullable>
88
<UseWPF>true</UseWPF>
99
<ApplicationIcon>images\icone.ico</ApplicationIcon>
10-
<AssemblyVersion>0.1.2</AssemblyVersion>
11-
<FileVersion>0.1.2</FileVersion>
10+
<AssemblyVersion>0.1.3</AssemblyVersion>
11+
<FileVersion>0.1.3</FileVersion>
1212
</PropertyGroup>
1313

1414

@@ -89,7 +89,7 @@
8989

9090
<ItemGroup>
9191
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
92-
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
92+
<PackageReference Include="System.Drawing.Common" Version="9.0.2" />
9393
</ItemGroup>
9494

9595
<ItemGroup>

0 commit comments

Comments
 (0)