fyr77/EnvyUpdate
Archived
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases 31 Packages Wiki Activity Actions

cleanup code

Browse source
This commit is contained in:
Jakob 2023-08-29 16:10:12 +02:00
parent 3e2f389fc3
commit 70cef4a361
2 changed files with 36 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
EnvyUpdate/DashboardPage.xaml
View file

@ -45,7 +45,7 @@
Message="..." Message="..."
Severity="Informational" /> Severity="Informational" />
<ui:Button x:Name="buttonSkipVersion" Margin="8,0,0,0" Grid.Column="1" Appearance="Secondary" Icon="ArrowForward24" Visibility="Collapsed" ToolTip="{x:Static p:Resources.ui_skipversion}" Click="buttonSkipVersion_Click" /> <ui:Button x:Name="buttonSkipVersion" Margin="8,0,0,0" Grid.Column="1" Appearance="Dark" Icon="ArrowForward24" Visibility="Collapsed" ToolTip="{x:Static p:Resources.ui_skipversion}" Click="buttonSkipVersion_Click" />
<ui:Button x:Name="buttonDownload" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Icon="ArrowDownload24" Visibility="Collapsed" Click="buttonDownload_Click" /> <ui:Button x:Name="buttonDownload" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Icon="ArrowDownload24" Visibility="Collapsed" Click="buttonDownload_Click" />
<ui:Button x:Name="buttonInstall" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Icon="AppsAddIn24" Visibility="Collapsed" Click="buttonInstall_Click" /> <ui:Button x:Name="buttonInstall" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Icon="AppsAddIn24" Visibility="Collapsed" Click="buttonInstall_Click" />

57
EnvyUpdate/DashboardPage.xaml.cs
View file

@ -168,22 +168,37 @@ namespace EnvyUpdate
Debug.LogToFile("INFO Got online driver version: " + onlineDriv); Debug.LogToFile("INFO Got online driver version: " + onlineDriv);
} }
string correctLocalDriv;
string correctOnlineDriv;
try try
{ {
if (float.Parse(localDriv) < float.Parse(onlineDriv)) float.Parse(onlineDriv);
correctLocalDriv = localDriv;
correctOnlineDriv = onlineDriv;
}
catch (FormatException)
{
Debug.LogToFile("INFO Caught FormatException, assuming locale workaround is necessary.");
//Thank you locales. Some languages need , instead of . for proper parsing
correctLocalDriv = localDriv.Replace('.', ',');
correctOnlineDriv = onlineDriv.Replace('.', ',');
}
if (float.Parse(correctLocalDriv) < float.Parse(correctOnlineDriv))
{ {
Debug.LogToFile("INFO Local version is older than online. Setting UI..."); Debug.LogToFile("INFO Local version is older than online. Setting UI...");
SetInfoBar(false); SetInfoBar(false);
buttonDownload.Visibility = Visibility.Visible; buttonDownload.Visibility = Visibility.Visible;
buttonSkipVersion.Visibility = Visibility.Visible;
if (skippedVer == null) if (skippedVer == null)
{ {
buttonSkipVersion.ToolTip = Properties.Resources.ui_skipversion; buttonSkipVersion.ToolTip = Properties.Resources.ui_skipversion;
buttonSkipVersion.IsEnabled = true; buttonSkipVersion.IsEnabled = true;
buttonSkipVersion.Visibility = Visibility.Visible;
} }
else else
{ {
buttonSkipVersion.IsEnabled = true; buttonSkipVersion.IsEnabled = false;
buttonSkipVersion.ToolTip = Properties.Resources.ui_skipped; buttonSkipVersion.ToolTip = Properties.Resources.ui_skipped;
} }
@ -201,42 +216,6 @@ namespace EnvyUpdate
buttonSkipVersion.Visibility = Visibility.Collapsed; buttonSkipVersion.Visibility = Visibility.Collapsed;
SetInfoBar(true); SetInfoBar(true);
} }
}
catch (FormatException)
{
Debug.LogToFile("INFO Caught FormatException, assuming locale workaround is necessary.");
//Thank you locales. Some languages need , instead of . for proper parsing
string cLocalDriv = localDriv.Replace('.', ',');
string cOnlineDriv = onlineDriv.Replace('.', ',');
if (float.Parse(cLocalDriv) < float.Parse(cOnlineDriv))
{
Debug.LogToFile("INFO Local version is older than online. Setting UI...");
SetInfoBar(false);
buttonDownload.Visibility = Visibility.Visible;
if (skippedVer == null)
{
buttonSkipVersion.IsEnabled = true;
buttonSkipVersion.Visibility = Visibility.Visible;
}
else
{
buttonSkipVersion.IsEnabled = false;
buttonSkipVersion.ToolTip = Properties.Resources.ui_skipped;
}
if (skippedVer != onlineDriv)
{
Debug.LogToFile("INFO Showing update popup notification.");
Notify.ShowDrivUpdatePopup();
}
}
else
{
Debug.LogToFile("INFO Local version is up to date.");
buttonSkipVersion.Visibility = Visibility.Collapsed;
SetInfoBar(true);
}
}
//Check for different version than skipped version //Check for different version than skipped version
if (skippedVer != null && skippedVer != onlineDriv) if (skippedVer != null && skippedVer != onlineDriv)