From 9c5dc2143d7cc472a80d530a27a5017c26469b49 Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Thu, 27 Jun 2024 06:28:52 +0200 Subject: [PATCH] cleanup --- Pilz.Updating.Client.Gui/UpdateWindow.cs | 15 +++++++-------- Pilz.Updating.Client/Properties/AssemblyInfo.cs | 3 +-- Pilz.Updating.Client/UpdateClientEventArgs.cs | 4 +--- Pilz.Updating.Client/UpdateStatusEventArgs.cs | 4 +--- Pilz.Updating/AppVersion.cs | 2 +- .../Json/AppVersionStringJsonConverter.cs | 4 +--- Pilz.Updating/Properties/AssemblyInfo.cs | 3 +-- 7 files changed, 13 insertions(+), 22 deletions(-) diff --git a/Pilz.Updating.Client.Gui/UpdateWindow.cs b/Pilz.Updating.Client.Gui/UpdateWindow.cs index da603d0..e0ec455 100644 --- a/Pilz.Updating.Client.Gui/UpdateWindow.cs +++ b/Pilz.Updating.Client.Gui/UpdateWindow.cs @@ -1,6 +1,5 @@ using Pilz.UI.Telerik; using Pilz.Updating.Client.Gui.LangRes; -using Pilz.Updating.UpdateInstaller.My.Resources; using Telerik.WinControls; namespace Pilz.Updating.Client.Gui; @@ -26,9 +25,9 @@ public partial class UpdateWindow : Telerik.WinControls.UI.RadForm // Init Application Header Text string header; if (!string.IsNullOrEmpty(applicationName)) - header = string.Format(UpdateInstallerLangRes.String_UpdatingApplicationX, applicationName); + header = string.Format(StatusLangRes.String_UpdatingApplicationX, applicationName); else - header = UpdateInstallerLangRes.String_UpdateIsRunning; + header = StatusLangRes.String_UpdateIsRunning; radLabel_Header.Text = $"{header}"; } @@ -43,19 +42,19 @@ public partial class UpdateWindow : Telerik.WinControls.UI.RadForm switch (status) { case UpdateStatus.Copying: - newStatusText = UpdateInstallerLangRes.Status_CopyingFiles; + newStatusText = StatusLangRes.Status_CopyingFiles; break; case UpdateStatus.Done: - newStatusText = UpdateInstallerLangRes.Status_Done; + newStatusText = StatusLangRes.Status_Done; break; case UpdateStatus.Extracting: - newStatusText = UpdateInstallerLangRes.Status_Extracting; + newStatusText = StatusLangRes.Status_Extracting; break; case UpdateStatus.Cleanup: - newStatusText = UpdateInstallerLangRes.Status_RemovingFiles; + newStatusText = StatusLangRes.Status_RemovingFiles; break; case UpdateStatus.Waiting: - newStatusText = UpdateInstallerLangRes.Status_Waiting; + newStatusText = StatusLangRes.Status_Waiting; break; } diff --git a/Pilz.Updating.Client/Properties/AssemblyInfo.cs b/Pilz.Updating.Client/Properties/AssemblyInfo.cs index df9add3..d448455 100644 --- a/Pilz.Updating.Client/Properties/AssemblyInfo.cs +++ b/Pilz.Updating.Client/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ -using global::System; -using global::System.Runtime.InteropServices; +using global::System.Runtime.InteropServices; [assembly: ComVisible(false)] // Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird. diff --git a/Pilz.Updating.Client/UpdateClientEventArgs.cs b/Pilz.Updating.Client/UpdateClientEventArgs.cs index 007d3db..ce05972 100644 --- a/Pilz.Updating.Client/UpdateClientEventArgs.cs +++ b/Pilz.Updating.Client/UpdateClientEventArgs.cs @@ -1,6 +1,4 @@ -using Pilz.Updating.Client.Installer; - -namespace Pilz.Updating.Client; +namespace Pilz.Updating.Client; public class UpdateClientEventArgs(UpdateClient client) : EventArgs { diff --git a/Pilz.Updating.Client/UpdateStatusEventArgs.cs b/Pilz.Updating.Client/UpdateStatusEventArgs.cs index b6b2120..5aa8165 100644 --- a/Pilz.Updating.Client/UpdateStatusEventArgs.cs +++ b/Pilz.Updating.Client/UpdateStatusEventArgs.cs @@ -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) { diff --git a/Pilz.Updating/AppVersion.cs b/Pilz.Updating/AppVersion.cs index 245ca98..9cec1a5 100644 --- a/Pilz.Updating/AppVersion.cs +++ b/Pilz.Updating/AppVersion.cs @@ -52,7 +52,7 @@ public class AppVersion(Version version, int build, Channels channel) { version = Parse(input); } - catch(Exception) + catch (Exception) { version = null; } diff --git a/Pilz.Updating/Json/AppVersionStringJsonConverter.cs b/Pilz.Updating/Json/AppVersionStringJsonConverter.cs index 3256b89..6516a53 100644 --- a/Pilz.Updating/Json/AppVersionStringJsonConverter.cs +++ b/Pilz.Updating/Json/AppVersionStringJsonConverter.cs @@ -1,6 +1,4 @@ -using Newtonsoft.Json.Serialization; -using Newtonsoft.Json; -using System.Globalization; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; namespace Pilz.Updating.Json; diff --git a/Pilz.Updating/Properties/AssemblyInfo.cs b/Pilz.Updating/Properties/AssemblyInfo.cs index 2ae65cf..fc165b0 100644 --- a/Pilz.Updating/Properties/AssemblyInfo.cs +++ b/Pilz.Updating/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ -using global::System; -using global::System.Runtime.CompilerServices; +using global::System.Runtime.CompilerServices; using global::System.Runtime.InteropServices; [assembly: ComVisible(false)]