Pilz.NET/Pilz.Updating
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Pascal
2024-06-27 06:28:52 +02:00
parent 4457b30f4d
commit 9c5dc2143d
7 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Pilz.Updating.Client.Gui/UpdateWindow.cs
View File

@@ -1,6 +1,5 @@
using Pilz.UI.Telerik; using Pilz.UI.Telerik;
using Pilz.Updating.Client.Gui.LangRes; using Pilz.Updating.Client.Gui.LangRes;
using Pilz.Updating.UpdateInstaller.My.Resources;
using Telerik.WinControls; using Telerik.WinControls;
namespace Pilz.Updating.Client.Gui; namespace Pilz.Updating.Client.Gui;
@@ -26,9 +25,9 @@ public partial class UpdateWindow : Telerik.WinControls.UI.RadForm
// Init Application Header Text // Init Application Header Text
string header; string header;
if (!string.IsNullOrEmpty(applicationName)) if (!string.IsNullOrEmpty(applicationName))
header = string.Format(UpdateInstallerLangRes.String_UpdatingApplicationX, applicationName); header = string.Format(StatusLangRes.String_UpdatingApplicationX, applicationName);
else else
header = UpdateInstallerLangRes.String_UpdateIsRunning; header = StatusLangRes.String_UpdateIsRunning;
radLabel_Header.Text = $"<html><span style=\"font-size: 18pt; color: #b7472a\"><b>{header}</b></span></html>"; radLabel_Header.Text = $"<html><span style=\"font-size: 18pt; color: #b7472a\"><b>{header}</b></span></html>";
} }
@@ -43,19 +42,19 @@ public partial class UpdateWindow : Telerik.WinControls.UI.RadForm
switch (status) switch (status)
{ {
case UpdateStatus.Copying: case UpdateStatus.Copying:
newStatusText = UpdateInstallerLangRes.Status_CopyingFiles; newStatusText = StatusLangRes.Status_CopyingFiles;
break; break;
case UpdateStatus.Done: case UpdateStatus.Done:
newStatusText = UpdateInstallerLangRes.Status_Done; newStatusText = StatusLangRes.Status_Done;
break; break;
case UpdateStatus.Extracting: case UpdateStatus.Extracting:
newStatusText = UpdateInstallerLangRes.Status_Extracting; newStatusText = StatusLangRes.Status_Extracting;
break; break;
case UpdateStatus.Cleanup: case UpdateStatus.Cleanup:
newStatusText = UpdateInstallerLangRes.Status_RemovingFiles; newStatusText = StatusLangRes.Status_RemovingFiles;
break; break;
case UpdateStatus.Waiting: case UpdateStatus.Waiting:
newStatusText = UpdateInstallerLangRes.Status_Waiting; newStatusText = StatusLangRes.Status_Waiting;
break; break;
} }

3
Pilz.Updating.Client/Properties/AssemblyInfo.cs
View File

@@ -1,5 +1,4 @@
using global::System; using global::System.Runtime.InteropServices;
using global::System.Runtime.InteropServices;
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird. // Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird.

4
Pilz.Updating.Client/UpdateClientEventArgs.cs
View File

@@ -1,6 +1,4 @@
using Pilz.Updating.Client.Installer; namespace Pilz.Updating.Client;
namespace Pilz.Updating.Client;
public class UpdateClientEventArgs(UpdateClient client) : EventArgs public class UpdateClientEventArgs(UpdateClient client) : EventArgs
{ {

4
Pilz.Updating.Client/UpdateStatusEventArgs.cs
View File

@@ -1,6 +1,4 @@
using Pilz.Updating.Client.Installer; namespace Pilz.Updating.Client;
namespace Pilz.Updating.Client;
public class UpdateStatusEventArgs(UpdateClient client, UpdateStatus status, UpdateStatusEvent state, bool canCancel) : UpdateClientEventArgs(client) public class UpdateStatusEventArgs(UpdateClient client, UpdateStatus status, UpdateStatusEvent state, bool canCancel) : UpdateClientEventArgs(client)
{ {

2
Pilz.Updating/AppVersion.cs
View File

@@ -52,7 +52,7 @@ public class AppVersion(Version version, int build, Channels channel)
{ {
version = Parse(input); version = Parse(input);
} }
catch(Exception) catch (Exception)
{ {
version = null; version = null;
} }

4
Pilz.Updating/Json/AppVersionStringJsonConverter.cs
View File

@@ -1,6 +1,4 @@
using Newtonsoft.Json.Serialization; using Newtonsoft.Json;
using Newtonsoft.Json;
using System.Globalization;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
namespace Pilz.Updating.Json; namespace Pilz.Updating.Json;

3
Pilz.Updating/Properties/AssemblyInfo.cs
View File

@@ -1,5 +1,4 @@
using global::System; using global::System.Runtime.CompilerServices;
using global::System.Runtime.CompilerServices;
using global::System.Runtime.InteropServices; using global::System.Runtime.InteropServices;
[assembly: ComVisible(false)] [assembly: ComVisible(false)]