diff --git a/WinNUT_V2/WinNUT-Client/App.config b/WinNUT_V2/WinNUT-Client/App.config index e336ab6..005762c 100644 --- a/WinNUT_V2/WinNUT-Client/App.config +++ b/WinNUT_V2/WinNUT-Client/App.config @@ -49,9 +49,6 @@ - - False - False diff --git a/WinNUT_V2/WinNUT-Client/ApplicationEvents.vb b/WinNUT_V2/WinNUT-Client/ApplicationEvents.vb index 8f774a5..910964b 100644 --- a/WinNUT_V2/WinNUT-Client/ApplicationEvents.vb +++ b/WinNUT_V2/WinNUT-Client/ApplicationEvents.vb @@ -1,28 +1,13 @@ -' WinNUT-Client is a NUT windows client for monitoring your ups hooked up to your favorite linux server. -' Copyright (C) 2019-2021 Gawindx (Decaux Nicolas) -' -' This program is free software: you can redistribute it and/or modify it under the terms of the -' GNU General Public License as published by the Free Software Foundation, either version 3 of the -' License, or any later version. -' -' This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY - -Imports System.Configuration -Imports System.Deployment.Application +Imports System.Configuration Imports System.Globalization Imports System.IO Imports System.Text.RegularExpressions Imports Microsoft.VisualBasic.ApplicationServices Imports Newtonsoft.Json Imports WinNUT_Client_Common +Imports WinNUT_Client_Common.OldParams Namespace My - ' Les événements suivants sont disponibles pour MyApplication : - ' Startup : Déclenché au démarrage de l'application avant la création du formulaire de démarrage. - ' Shutdown : Déclenché après la fermeture de tous les formulaires de l'application. Cet événement n'est pas déclenché si l'application se termine de façon anormale. - ' UnhandledException : Déclenché si l'application rencontre une exception non gérée. - ' StartupNextInstance : Déclenché lors du lancement d'une application à instance unique et si cette application est déjà active. - ' NetworkAvailabilityChanged : Déclenché quand la connexion réseau est connectée ou déconnectée. Partial Friend Class MyApplication ' Default culture for output so logs can be shared with the project. Private Shared ReadOnly DEF_CULTURE_INFO As CultureInfo = CultureInfo.InvariantCulture @@ -41,16 +26,16 @@ Namespace My Private Sub MyApplication_Startup(sender As Object, e As StartupEventArgs) Handles Me.Startup ' Uncomment below and comment out Handles line for _UnhandledException sub when debugging unhandled exceptions. ' AddHandler AppDomain.CurrentDomain.UnhandledException, AddressOf AppDomainUnhandledException - + AddHandler Settings.SettingsLoaded, AddressOf OnSettingsFirstLoaded Init_Globals() - LogFile.LogTracing(String.Format("{0} v{1} starting up.", My.Application.Info.ProductName, My.Application.Info.Version), + LogFile.LogTracing(String.Format("{0} v{1} starting up.", Application.Info.ProductName, Application.Info.Version), LogLvl.LOG_NOTICE, Me) ' LogFile.LogTracing($"DataDirectory: { ApplicationDeployment.CurrentDeployment.DataDirectory }", LogLvl.LOG_NOTICE, Me) - ' If first run indicated by Settings, attempt upgrade in case older version is present. - ' Only necessary when deploying MSI. Remove once using pure ClickOnce. + ' Starting without previous settings. May be new installation or MSI upgrade. If Settings.IsFirstRun Then Try + ' Handle MSI upgrade scenario. Settings.Upgrade() LogFile.LogTracing("Settings upgrade completed without exception.", LogLvl.LOG_NOTICE, Me) Catch ex As ConfigurationErrorsException @@ -58,6 +43,14 @@ Namespace My LogFile.LogException(ex, Me) End Try + ' If Settings still appear new, check if old Registry preferences are leftover. + If Settings.IsFirstRun AndAlso WinNUT_Params.ParamsExist Then + LogFile.LogTracing("Previous preferences data detected in the Registry.", LogLvl.LOG_NOTICE, Me, + Resources.DetectedPreviousPrefsData) + + Forms.UpgradePrefsDialog.ShowDialog() + End If + Settings.IsFirstRun = False Settings.Save() End If @@ -196,5 +189,32 @@ Namespace My Private Sub Close_Button_Click(sender As Object, e As EventArgs) CrashBug_Form.Close() End Sub + + ''' + ''' Handles validation of Settings when loaded. + ''' + ''' + ''' + Private Sub OnSettingsFirstLoaded(sender As Object, e As SettingsLoadedEventArgs) + LogFile.LogTracing("OnSettingsFirstLoaded event raised.", LogLvl.LOG_DEBUG, Me) + + ' Verify that encrypted data can be decrypted + Try + Settings.NUT_Username?.ToString() + Catch ex As Exception + LogFile.LogTracing("Error attempting to decrypt encrypted data. Resetting to defaults.", + LogLvl.LOG_ERROR, Me, Resources.Log_Str_ErrorDecrypting) + LogFile.LogException(ex, Me) + + Settings.NUT_Username = New SerializedProtectedString() + Settings.NUT_Password = New SerializedProtectedString() + End Try + + If Not Settings.NUT_PollIntervalMsec > 0 Then + LogFile.LogTracing("Incorrect value of " & Settings.NUT_PollIntervalMsec & + " for Poll Delay/Interval, resetting to default.", LogLvl.LOG_ERROR, Me) + Settings.NUT_PollIntervalMsec = MySettings.Default.NUT_PollIntervalMsec + End If + End Sub End Class End Namespace diff --git a/WinNUT_V2/WinNUT-Client/Models/UpgradePrefsDialogModel.vb b/WinNUT_V2/WinNUT-Client/Models/UpgradePrefsDialogModel.vb index d594394..a265b5e 100644 --- a/WinNUT_V2/WinNUT-Client/Models/UpgradePrefsDialogModel.vb +++ b/WinNUT_V2/WinNUT-Client/Models/UpgradePrefsDialogModel.vb @@ -201,9 +201,8 @@ Namespace Models LogFile.LogTracing("Requesting cancellation of upgradeWorker.", LogLvl.LOG_NOTICE, Me) upgradeWorker.CancelAsync() Else - LogFile.LogTracing("Exiting out of upgrade dialog.", LogLvl.LOG_NOTICE, Me) + LogFile.LogTracing("Exiting out of upgrade dialog.", LogLvl.LOG_NOTICE, Me, My.Resources.UpgradePrefsDialog_Cancelled) _parentForm.DialogResult = DialogResult.Cancel - My.Settings.UpgradePrefsCompleted = True _parentForm.Close() End If End Sub @@ -263,13 +262,11 @@ Namespace Models If e.Cancelled Then ProgressPercent = 0 - LogFile.LogTracing("Upgrade work was cancelled.", LogLvl.LOG_WARNING, Me, My.Resources.UpgradePrefsDialog_Cancelled) + LogFile.LogTracing("Upgrade work was cancelled.", LogLvl.LOG_WARNING, Me) Return End If ProgressPercent = 100 - - My.Settings.UpgradePrefsCompleted = True _parentForm.Close() End Sub diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-Client.zh-TW.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-Client.zh-TW.xlf index ed3220d..63cc2e7 100644 --- a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-Client.zh-TW.xlf +++ b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-Client.zh-TW.xlf @@ -509,15 +509,6 @@ Remaining Time : {WinNUT.Lbl_VRTime.Text} ..\Resources\Delete_LogFile_24x24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Delete_LogFile_24x24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Old ups.ini imported -Ini File Moved to {0}.old - 已匯入舊的 ups.ini， ini 檔案已重新命名為 {0}.old - - - Old ups.ini imported - 匯入舊的 ups.ini - Reconnection In Progress 正在重新連線 @@ -712,15 +703,15 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa Unavailable Indicate that a variable is unavailable - + ..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -729,6 +720,10 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa Checking for update... Inform the user that WinNUT is checking for an update. + + Error loading encrypted Settings (username/password) + Error loading encrypted Settings (username/password) + Short log string to alert the user that there was an error loading encrypted Settings, and give examples of what those Settings were. ..\Resources\CopyHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\CopyHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -2430,8 +2425,8 @@ Accepted value: Numeric value from 0 to 100. None - 180, 22 - 180, 22 + 177, 22 + 177, 22 UPS Variable @@ -2454,8 +2449,8 @@ Accepted value: Numeric value from 0 to 100. 檔案 - 180, 22 - 180, 22 + 133, 22 + 133, 22 Disconnect @@ -3637,59 +3632,59 @@ Accepted value: Numeric value from 0 to 100. - - 180, 22 - 180, 22 + + 133, 22 + 133, 22 Connect Connect - + - + - + - + - + - + - - 177, 6 - 177, 6 + + 130, 6 + 130, 6 - - 180, 22 - 180, 22 + + 133, 22 + 133, 22 Persist Persist - + False False - + NoControl NoControl - + False False diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.de-DE.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.de-DE.xlf index ddc7e9e..e119930 100644 --- a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.de-DE.xlf +++ b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.de-DE.xlf @@ -1195,21 +1195,21 @@ 17, 17 - UPS name to monitor. + UPS name to monitor. Accepted Value: Name of the UPS configured in the Nut server. - Name der zu überwachenden USV. + Name der zu überwachenden USV. Wertebereich: Name der auf dem NUT-Server konfigurierten USV. - Nut Server Port Number (default = 3493). + Nut Server Port Number (default = 3493). Accepted value: Numeric value from 1 to 65535. - NUT-Server Portnummer (Standard = 3493). + NUT-Server Portnummer (Standard = 3493). Wertebereich: Numerischer Wert von 1 bis 65535. - Nut server address. + Nut server address. Accepted value: IPV4 / IPV6 / FQDN address. - Adresse des NUT-Servers. + Adresse des NUT-Servers. Wertebereich: IPV4 / IPV6 / FQDN-Adresse. @@ -1221,51 +1221,51 @@ Wertebereich: IPV4 / IPV6 / FQDN-Adresse. Legt die Eingangsfrequenz fest, wenn dieser Wert nicht von der USV geliefert wird. - Maximum Battery Voltage. + Maximum Battery Voltage. Accepted value: Numeric value from 0 to 100. - Maximale Akkuspannung. + Maximale Akkuspannung. Wertebereich: Numerischer Wert von 0 bis 100. - Maximum Output Voltage. + Maximum Output Voltage. Accepted value: Numeric value from 0 to 999. - Maximale Ausgangsspannung. + Maximale Ausgangsspannung. Wertebereich: Numerischer Wert von 0 bis 999. - Maximum input frequency. + Maximum input frequency. Accepted value: Numeric value from 0 to 100. - Maximale Eingangsfrequenz. + Maximale Eingangsfrequenz. Wertebereich: Numerischer Wert von 0 bis 100. - Minimum Battery Voltage. + Minimum Battery Voltage. Accepted value: Numeric value from 0 to 100. - Minimale Akkuspannung. + Minimale Akkuspannung. Wertebereich: Numerischer Wert von 0 bis 100. - Minimum Output Voltage. + Minimum Output Voltage. Accepted value: Numeric value from 0 to 999. - Minimale Ausgangsspannung. + Minimale Ausgangsspannung. Wertebereich: Numerischer Wert von 0 bis 999. - Minimum input frequency. + Minimum input frequency. Accepted value: Numeric value from 0 to 100. - Minimale Eingangsfrequenz. + Minimale Eingangsfrequenz. Wertebereich: Numerischer Wert von 0 bis 100. - Maximum input voltage. + Maximum input voltage. Accepted value: Numeric value from 0 to 999. - Maximale Eingangsspannung. + Maximale Eingangsspannung. Wertebereich: Numerischer Wert von 0 bis 999. - Minimum input voltage. + Minimum input voltage. Accepted value: Numeric value from 0 to 999. - Minimale Eingangsspannung. + Minimale Eingangsspannung. Wertebereich: Numerischer Wert von 0 bis 999. @@ -1305,23 +1305,23 @@ Wertebereich: Numerischer Wert von 0 bis 999. In Taskleiste oder Systray minimieren. - Additional grace period limit. + Additional grace period limit. Accepted value: Numeric value from 0 to 3600. - Limit für zusätzliche Verzögerung. + Limit für zusätzliche Verzögerung. Wertebereich: Numerischer Wert von 0 bis 3600. - Allow additional time during the shutdown procedure. -Note: + Allow additional time during the shutdown procedure. +Note: This additional time could go beyond the UPS backup time - USE WITH CAUTION!!! - Zusätzliche Zeit für das Herunterfahren erlauben. -Hinweis: + Zusätzliche Zeit für das Herunterfahren erlauben. +Hinweis: Diese zusätzliche Zeit kann über die Verfügbarkeit der USV hinausgehen - MIT VORSICHT VERWENDEN !!! - Stop procedure delay if delayed. + Stop procedure delay if delayed. Accepted value: Numeric value from 0 to 3600. - Stoppvorgang bei Verzögerung unterbrechen. + Stoppvorgang bei Verzögerung unterbrechen. Wertebereich: Numerischer Wert von 0 bis 3600. @@ -1333,15 +1333,15 @@ Wertebereich: Numerischer Wert von 0 bis 3600. Führt die Stopp-Aktion sofort oder zeitgesteuert aus. - Lower backup time limit triggering the shutdown procedure. + Lower backup time limit triggering the shutdown procedure. Accepted value: Numeric value from 0 to 3600. - Unteres Backup-Zeitlimit, welches das Herunterfahren auslöst. + Unteres Backup-Zeitlimit, welches das Herunterfahren auslöst. Wertebereich: Numerischer Wert von 0 bis 3600. - Lower limit of the battery level triggering the shutdown procedure. + Lower limit of the battery level triggering the shutdown procedure. Accepted value: Numeric value from 0 to 100. - Untergrenze des Akkuladestands, welcher den Abschaltvorgang auslöst. + Untergrenze des Akkuladestands, welcher den Abschaltvorgang auslöst. Wertebereich: Numerischer Wert von 0 bis 100. @@ -1710,20 +1710,11 @@ Wertebereich: Numerischer Wert von 0 bis 100. Anwendung heruntergefahren um - Battery_Charge : {0} + Battery_Charge : {0} Remaining Time : {1} - Akkuladung: {0} + Akkuladung: {0} Verbleibende Zeit: {1} - - Old ups.ini imported -Ini File Moved to {0}.old - Alte ups.ini importiert INI-Datei nach {0}.old verschoben - - - Old ups.ini imported - Alte ups.ini importiert - Reconnection In Progress Wiederverbindung läuft @@ -1864,15 +1855,15 @@ Ini File Moved to {0}.old Notify the user that the old preferences have been exported to a file, and give the full path with {0}. - An error occurred during the upgrade procedure: - -{0} - + An error occurred during the upgrade procedure: + +{0} + Please correct the error, or cancel the upgrade dialog to continue with the default settings. - Während des Upgrade-Vorgangs ist ein Fehler aufgetreten: - -{0} - + Während des Upgrade-Vorgangs ist ein Fehler aufgetreten: + +{0} + Bitte beheben Sie den Fehler oder brechen Sie den Aktualisierungsdialog ab, um mit den Standardeinstellungen fortzufahren. Alert the user that an error occurred during the upgrade procedure, attempt to give a brief summary of the error, and prompt them to take the next step. @@ -1922,6 +1913,10 @@ Bitte beheben Sie den Fehler oder brechen Sie den Aktualisierungsdialog ab, um m Updateprüfung läuft... Inform the user that WinNUT is checking for an update. + + Error loading encrypted Settings (username/password) + Error loading encrypted Settings (username/password) + Short log string to alert the user that there was an error loading encrypted Settings, and give examples of what those Settings were. ..\Resources\CopyHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\CopyHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1974,8 +1969,8 @@ Bitte beheben Sie den Fehler oder brechen Sie den Aktualisierungsdialog ab, um m 248, 17 - 180, 22 - 180, 22 + 177, 22 + 177, 22 UPS Variable @@ -1998,8 +1993,8 @@ Bitte beheben Sie den Fehler oder brechen Sie den Aktualisierungsdialog ab, um m Datei - 180, 22 - 180, 22 + 133, 22 + 133, 22 Disconnect @@ -3241,9 +3236,9 @@ Bitte beheben Sie den Fehler oder brechen Sie den Aktualisierungsdialog ab, um m - - 180, 22 - 180, 22 + + 133, 22 + 133, 22 Connect @@ -3273,13 +3268,13 @@ Bitte beheben Sie den Fehler oder brechen Sie den Aktualisierungsdialog ab, um m - - 177, 6 - 177, 6 + + 130, 6 + 130, 6 - - 180, 22 - 180, 22 + + 133, 22 + 133, 22 Persist @@ -3307,29 +3302,29 @@ Bitte beheben Sie den Fehler oder brechen Sie den Aktualisierungsdialog ab, um m - This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published -by the Free Software Foundation, either version 3 of the License, or -any later version. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty -of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License + This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published +by the Free Software Foundation, either version 3 of the License, or +any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with this program. If not, see https://www.gnu.org/licenses/. - This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published -by the Free Software Foundation, either version 3 of the License, or -any later version. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty -of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License + This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published +by the Free Software Foundation, either version 3 of the License, or +any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with this program. If not, see https://www.gnu.org/licenses/. @@ -3687,9 +3682,9 @@ along with this program. If not, see https://www.gnu.org/licenses/. 2 - Battery_Charge : {WinNUT.UPS_BattCh} + Battery_Charge : {WinNUT.UPS_BattCh} Remaining Time : {WinNUT.Lbl_VRTime.Text} - Akkuladung: {WinNUT.UPS_BattCh} + Akkuladung: {WinNUT.UPS_BattCh} Verbleibende Zeit: {WinNUT.Lbl_VRTime.Text} @@ -3762,8 +3757,8 @@ Verbleibende Zeit: {WinNUT.Lbl_VRTime.Text} 2 - WinNUT has been upgraded to a new Settings and Preferences system, and must use that going forward. Items leftover from the previous system have been deteceted in your user Registry hive. Select the actions below that you would like to have performed on the old preferences. If you wish to take no action, select Cancel and the default settings will be used. This message will not be displayed again as long as the new program data remains intact. - + WinNUT has been upgraded to a new Settings and Preferences system, and must use that going forward. Items leftover from the previous system have been deteceted in your user Registry hive. Select the actions below that you would like to have performed on the old preferences. If you wish to take no action, select Cancel and the default settings will be used. This message will not be displayed again as long as the new program data remains intact. + WinNUT wurde auf ein neues System für die Einstellungen umgestellt und wird dieses in Zukunft verwenden. In der Registry wurden Einstellungen des vorherigen Systems gefunden. Wählen Sie unten die Aktionen aus, die Sie für diese alten Einstellungen durchführen möchten. Wenn Sie keine Maßnahmen ergreifen möchten, wählen Sie Abbrechen. Daraufhin werden die Standardeinstellungen verwendet. Diese Meldung wird nicht mehr angezeigt, solange die neuen Einstellungen intakt sind. diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.fr-FR.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.fr-FR.xlf index 19fa710..0510f80 100644 --- a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.fr-FR.xlf +++ b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.fr-FR.xlf @@ -1718,16 +1718,6 @@ Remaining Time : {1} Charge Batterie : {0} Temps restant : {1} - - Old ups.ini imported -Ini File Moved to {0}.old - Ancien Fichier "ups.ini" importé -Fichier Ini déplacé vers {0}.old - - - Old ups.ini imported - Ancien Fichier "ups.ini" importé - Reconnection In Progress Reconnexion en cours @@ -1909,15 +1899,15 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa Unavailable Indicate that a variable is unavailable - + ..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1926,6 +1916,10 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa Checking for update... Inform the user that WinNUT is checking for an update. + + Error loading encrypted Settings (username/password) + Error loading encrypted Settings (username/password) + Short log string to alert the user that there was an error loading encrypted Settings, and give examples of what those Settings were. ..\Resources\CopyHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\CopyHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1978,8 +1972,8 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa 248, 17 - 180, 22 - 180, 22 + 177, 22 + 177, 22 UPS Variable @@ -2002,8 +1996,8 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa Fichier - 180, 22 - 180, 22 + 133, 22 + 133, 22 Disconnect @@ -3245,59 +3239,59 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa - - 180, 22 - 180, 22 + + 133, 22 + 133, 22 Connect Connect - + - + - + - + - + - + - - 177, 6 - 177, 6 + + 130, 6 + 130, 6 - - 180, 22 - 180, 22 + + 133, 22 + 133, 22 Persist Persist - + False False - + NoControl NoControl - + False False diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.ru-RU.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.ru-RU.xlf index 0a183c9..1f2ca43 100644 --- a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.ru-RU.xlf +++ b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.ru-RU.xlf @@ -510,15 +510,6 @@ Remaining Time : {WinNUT.Lbl_VRTime.Text} ..\Resources\Delete_LogFile_24x24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Delete_LogFile_24x24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Old ups.ini imported -Ini File Moved to {0}.old - Старая версия ups.ini перемещена в {0}.old - - - Old ups.ini imported - Старая версия ups.ini импортирована - Reconnection In Progress Переподключение в процессе @@ -714,15 +705,15 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa Unavailable Indicate that a variable is unavailable - + ..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -731,6 +722,10 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa Checking for update... Inform the user that WinNUT is checking for an update. + + Error loading encrypted Settings (username/password) + Error loading encrypted Settings (username/password) + Short log string to alert the user that there was an error loading encrypted Settings, and give examples of what those Settings were. ..\Resources\CopyHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\CopyHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -2449,8 +2444,8 @@ Accepted value: Numeric value from 0 to 100. None - 180, 22 - 180, 22 + 177, 22 + 177, 22 UPS Variable @@ -2473,8 +2468,8 @@ Accepted value: Numeric value from 0 to 100. Файл - 180, 22 - 180, 22 + 133, 22 + 133, 22 Disconnect @@ -3656,59 +3651,59 @@ Accepted value: Numeric value from 0 to 100. - - 180, 22 - 180, 22 + + 133, 22 + 133, 22 Connect Connect - + - + - + - + - + - + - - 177, 6 - 177, 6 + + 130, 6 + 130, 6 - - 180, 22 - 180, 22 + + 133, 22 + 133, 22 Persist Persist - + False False - + NoControl NoControl - + False False diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.uk-UA.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.uk-UA.xlf index 38118f4..5576c0c 100644 --- a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.uk-UA.xlf +++ b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.uk-UA.xlf @@ -510,15 +510,6 @@ Remaining Time : {WinNUT.Lbl_VRTime.Text} ..\Resources\Delete_LogFile_24x24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Delete_LogFile_24x24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Old ups.ini imported -Ini File Moved to {0}.old - Стара версія ups.ini переміщена в {0}.old - - - Old ups.ini imported - Старая версія ups.ini імпортована - Reconnection In Progress Перепідключення в процесі @@ -714,15 +705,15 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa Недоступно Indicate that a variable is unavailable - + ..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -731,6 +722,10 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa Checking for update... Inform the user that WinNUT is checking for an update. + + Error loading encrypted Settings (username/password) + Error loading encrypted Settings (username/password) + Short log string to alert the user that there was an error loading encrypted Settings, and give examples of what those Settings were. ..\Resources\CopyHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\CopyHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -2449,8 +2444,8 @@ Accepted value: Numeric value from 0 to 100. None - 180, 22 - 180, 22 + 177, 22 + 177, 22 UPS Variable @@ -2473,8 +2468,8 @@ Accepted value: Numeric value from 0 to 100. Файл - 180, 22 - 180, 22 + 133, 22 + 133, 22 Disconnect @@ -3656,59 +3651,59 @@ Accepted value: Numeric value from 0 to 100. - - 180, 22 - 180, 22 + + 133, 22 + 133, 22 Connect Connect - + - + - + - + - + - + - - 177, 6 - 177, 6 + + 130, 6 + 130, 6 - - 180, 22 - 180, 22 + + 133, 22 + 133, 22 Persist Persist - + False False - + NoControl NoControl - + False False diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf index b5eabca..1212296 100644 --- a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf +++ b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf @@ -498,16 +498,6 @@ Remaining Time : {WinNUT.Lbl_VRTime.Text} ..\Resources\Delete_LogFile_24x24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Delete_LogFile_24x24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Old ups.ini imported -Ini File Moved to {0}.old - 导入了旧的 ups.ini -Ini 文件重命名为 {0}.old - - - Old ups.ini imported - 导入了旧的 ups.ini - Reconnection In Progress 重连中 @@ -715,15 +705,15 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa 参数无效 Indicate that a variable is unavailable - + ..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\RepeatHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\internetconnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -732,6 +722,10 @@ Please correct the error, or cancel the upgrade dialog to continue with the defa Checking for update... Inform the user that WinNUT is checking for an update. + + Error loading encrypted Settings (username/password) + Error loading encrypted Settings (username/password) + Short log string to alert the user that there was an error loading encrypted Settings, and give examples of what those Settings were. ..\Resources\CopyHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\CopyHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -2449,8 +2443,8 @@ Accepted value: Numeric value from 0 to 100. None - 180, 22 - 180, 22 + 177, 22 + 177, 22 UPS Variable @@ -2473,8 +2467,8 @@ Accepted value: Numeric value from 0 to 100. 文件 - 180, 22 - 180, 22 + 133, 22 + 133, 22 Disconnect @@ -3656,59 +3650,59 @@ Accepted value: Numeric value from 0 to 100. - - 180, 22 - 180, 22 + + 133, 22 + 133, 22 Connect Connect - + - + - + - + - + - + - - 177, 6 - 177, 6 + + 130, 6 + 130, 6 - - 180, 22 - 180, 22 + + 133, 22 + 133, 22 Persist Persist - + False False - + NoControl NoControl - + False False diff --git a/WinNUT_V2/WinNUT-Client/My Project/Resources.Designer.vb b/WinNUT_V2/WinNUT-Client/My Project/Resources.Designer.vb index 464d11f..23d5fd5 100644 --- a/WinNUT_V2/WinNUT-Client/My Project/Resources.Designer.vb +++ b/WinNUT_V2/WinNUT-Client/My Project/Resources.Designer.vb @@ -398,25 +398,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Looks up a localized string similar to Old ups.ini imported - '''Ini File Moved to {0}.old. - ''' - Public ReadOnly Property Frm_Main_Str_01() As String - Get - Return ResourceManager.GetString("Frm_Main_Str_01", resourceCulture) - End Get - End Property - - ''' - ''' Looks up a localized string similar to Old ups.ini imported. - ''' - Public ReadOnly Property Frm_Main_Str_02() As String - Get - Return ResourceManager.GetString("Frm_Main_Str_02", resourceCulture) - End Get - End Property - ''' ''' Looks up a localized string similar to Reconnection In Progress. ''' @@ -698,6 +679,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Error loading encrypted Settings (username/password). + ''' + Public ReadOnly Property Log_Str_ErrorDecrypting() As String + Get + Return ResourceManager.GetString("Log_Str_ErrorDecrypting", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Checking for update.... ''' diff --git a/WinNUT_V2/WinNUT-Client/My Project/Resources.de-DE.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.de-DE.resx index 01ff829..6e37571 100644 --- a/WinNUT_V2/WinNUT-Client/My Project/Resources.de-DE.resx +++ b/WinNUT_V2/WinNUT-Client/My Project/Resources.de-DE.resx @@ -19,12 +19,6 @@ Akkuladung: {0} Verbleibende Zeit: {1} - - Alte ups.ini importiert INI-Datei nach {0}.old verschoben - - - Alte ups.ini importiert - Wiederverbindung läuft diff --git a/WinNUT_V2/WinNUT-Client/My Project/Resources.fr-FR.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.fr-FR.resx index 7781d6c..02f3253 100644 --- a/WinNUT_V2/WinNUT-Client/My Project/Resources.fr-FR.resx +++ b/WinNUT_V2/WinNUT-Client/My Project/Resources.fr-FR.resx @@ -19,13 +19,6 @@ Charge Batterie : {0} Temps restant : {1} - - Ancien Fichier "ups.ini" importé -Fichier Ini déplacé vers {0}.old - - - Ancien Fichier "ups.ini" importé - Reconnexion en cours diff --git a/WinNUT_V2/WinNUT-Client/My Project/Resources.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.resx index fdd332a..9fd7ee5 100644 --- a/WinNUT_V2/WinNUT-Client/My Project/Resources.resx +++ b/WinNUT_V2/WinNUT-Client/My Project/Resources.resx @@ -221,13 +221,6 @@ ..\Resources\disconnect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Old ups.ini imported -Ini File Moved to {0}.old - - - Old ups.ini imported - Reconnection In Progress @@ -332,6 +325,10 @@ Remaining Time : {1} Stop condition imposed by the NUT server + + Error loading encrypted Settings (username/password) + Short log string to alert the user that there was an error loading encrypted Settings, and give examples of what those Settings were. + Old preferences were not detected in your system. Similar to _Enabled tooltip, except that the preferences were not detected. diff --git a/WinNUT_V2/WinNUT-Client/My Project/Resources.ru-RU.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.ru-RU.resx index 5284133..585d46f 100644 --- a/WinNUT_V2/WinNUT-Client/My Project/Resources.ru-RU.resx +++ b/WinNUT_V2/WinNUT-Client/My Project/Resources.ru-RU.resx @@ -15,12 +15,6 @@ Программное отключение в - - Старая версия ups.ini перемещена в {0}.old - - - Старая версия ups.ini импортирована - Переподключение в процессе diff --git a/WinNUT_V2/WinNUT-Client/My Project/Resources.uk-UA.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.uk-UA.resx index 96f6fe7..5d56a72 100644 --- a/WinNUT_V2/WinNUT-Client/My Project/Resources.uk-UA.resx +++ b/WinNUT_V2/WinNUT-Client/My Project/Resources.uk-UA.resx @@ -15,12 +15,6 @@ Програмне вимкнення о - - Стара версія ups.ini переміщена в {0}.old - - - Старая версія ups.ini імпортована - Перепідключення в процесі diff --git a/WinNUT_V2/WinNUT-Client/My Project/Resources.zh-CN.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.zh-CN.resx index e5e4f2f..00e3cc6 100644 --- a/WinNUT_V2/WinNUT-Client/My Project/Resources.zh-CN.resx +++ b/WinNUT_V2/WinNUT-Client/My Project/Resources.zh-CN.resx @@ -15,13 +15,6 @@ 应用程序被关闭于 - - 导入了旧的 ups.ini -Ini 文件重命名为 {0}.old - - - 导入了旧的 ups.ini - 重连中 diff --git a/WinNUT_V2/WinNUT-Client/My Project/Resources.zh-TW.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.zh-TW.resx index 7c85684..846b7b7 100644 --- a/WinNUT_V2/WinNUT-Client/My Project/Resources.zh-TW.resx +++ b/WinNUT_V2/WinNUT-Client/My Project/Resources.zh-TW.resx @@ -15,12 +15,6 @@ 應用程式關閉於 - - 已匯入舊的 ups.ini， ini 檔案已重新命名為 {0}.old - - - 匯入舊的 ups.ini - 正在重新連線 diff --git a/WinNUT_V2/WinNUT-Client/My Project/Settings.Designer.vb b/WinNUT_V2/WinNUT-Client/My Project/Settings.Designer.vb index 4e2f6c4..b4eb4fd 100644 --- a/WinNUT_V2/WinNUT-Client/My Project/Settings.Designer.vb +++ b/WinNUT_V2/WinNUT-Client/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -54,18 +54,6 @@ Namespace My End Get End Property - _ - Public Property UpgradePrefsCompleted() As Boolean - Get - Return CType(Me("UpgradePrefsCompleted"),Boolean) - End Get - Set - Me("UpgradePrefsCompleted") = value - End Set - End Property - _ diff --git a/WinNUT_V2/WinNUT-Client/My Project/Settings.settings b/WinNUT_V2/WinNUT-Client/My Project/Settings.settings index 13fdede..579c341 100644 --- a/WinNUT_V2/WinNUT-Client/My Project/Settings.settings +++ b/WinNUT_V2/WinNUT-Client/My Project/Settings.settings @@ -2,9 +2,6 @@ - - False - False diff --git a/WinNUT_V2/WinNUT-Client/WinNUT.Designer.vb b/WinNUT_V2/WinNUT-Client/WinNUT.Designer.vb index 2e8f118..015397a 100644 --- a/WinNUT_V2/WinNUT-Client/WinNUT.Designer.vb +++ b/WinNUT_V2/WinNUT-Client/WinNUT.Designer.vb @@ -36,13 +36,13 @@ Partial Class WinNUT Me.Main_Menu = New System.Windows.Forms.MenuStrip() Me.Menu_File = New System.Windows.Forms.ToolStripMenuItem() Me.Menu_UPS_Var = New System.Windows.Forms.ToolStripMenuItem() - Me.Menu_Quit = New System.Windows.Forms.ToolStripMenuItem() Me.ManageOldPrefsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.Menu_Quit = New System.Windows.Forms.ToolStripMenuItem() Me.Menu_Connection = New System.Windows.Forms.ToolStripMenuItem() + Me.Menu_Persist = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() Me.Menu_Connect = New System.Windows.Forms.ToolStripMenuItem() Me.Menu_Disconnect = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() - Me.Menu_Persist = New System.Windows.Forms.ToolStripMenuItem() Me.Menu_Settings = New System.Windows.Forms.ToolStripMenuItem() Me.Menu_Help = New System.Windows.Forms.ToolStripMenuItem() Me.Menu_About = New System.Windows.Forms.ToolStripMenuItem() @@ -68,25 +68,25 @@ Partial Class WinNUT Me.Lbl_OB = New System.Windows.Forms.Label() Me.Lbl_OL = New System.Windows.Forms.Label() Me.GB_InV_Dial = New System.Windows.Forms.GroupBox() + Me.AG_InV = New WinNUT_Client.Controls.UPSVarGauge() Me.Lbl_InV_Dial = New System.Windows.Forms.Label() Me.GB_OutV_Dial = New System.Windows.Forms.GroupBox() + Me.AG_OutV = New WinNUT_Client.Controls.UPSVarGauge() Me.Lbl_OutV_Dial = New System.Windows.Forms.Label() Me.GB_BattCh_Dial = New System.Windows.Forms.GroupBox() Me.PBox_Battery_State = New System.Windows.Forms.PictureBox() Me.Lbl_BattCh_Dial = New System.Windows.Forms.Label() + Me.AG_BattCh = New WinNUT_Client.Controls.UPSVarGauge() Me.GB_Load_Dial = New System.Windows.Forms.GroupBox() + Me.AG_Load = New WinNUT_Client.Controls.UPSVarGauge() Me.Lbl_Load_Dial = New System.Windows.Forms.Label() Me.GB_BattV_Dial = New System.Windows.Forms.GroupBox() + Me.AG_BattV = New WinNUT_Client.Controls.UPSVarGauge() Me.Lbl_BattV_Dial = New System.Windows.Forms.Label() Me.GB_InF_Dial = New System.Windows.Forms.GroupBox() + Me.AG_InF = New WinNUT_Client.Controls.UPSVarGauge() Me.Lbl_InF_Dial = New System.Windows.Forms.Label() Me.CB_CurrentLog = New System.Windows.Forms.ComboBox() - Me.AG_InF = New WinNUT_Client.Controls.UPSVarGauge() - Me.AG_InV = New WinNUT_Client.Controls.UPSVarGauge() - Me.AG_BattV = New WinNUT_Client.Controls.UPSVarGauge() - Me.AG_Load = New WinNUT_Client.Controls.UPSVarGauge() - Me.AG_OutV = New WinNUT_Client.Controls.UPSVarGauge() - Me.AG_BattCh = New WinNUT_Client.Controls.UPSVarGauge() Me.ContextMenu_Systray.SuspendLayout() Me.Main_Menu.SuspendLayout() Me.GB_Status.SuspendLayout() @@ -162,23 +162,36 @@ Partial Class WinNUT resources.ApplyResources(Me.Menu_UPS_Var, "Menu_UPS_Var") Me.Menu_UPS_Var.Name = "Menu_UPS_Var" ' - 'Menu_Quit - ' - Me.Menu_Quit.Name = "Menu_Quit" - resources.ApplyResources(Me.Menu_Quit, "Menu_Quit") - ' 'ManageOldPrefsToolStripMenuItem ' resources.ApplyResources(Me.ManageOldPrefsToolStripMenuItem, "ManageOldPrefsToolStripMenuItem") Me.ManageOldPrefsToolStripMenuItem.Image = Global.WinNUT_Client.My.Resources.Resources.regedit_exe_14_100_0 Me.ManageOldPrefsToolStripMenuItem.Name = "ManageOldPrefsToolStripMenuItem" ' + 'Menu_Quit + ' + Me.Menu_Quit.Name = "Menu_Quit" + resources.ApplyResources(Me.Menu_Quit, "Menu_Quit") + ' 'Menu_Connection ' Me.Menu_Connection.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.Menu_Persist, Me.ToolStripSeparator1, Me.Menu_Connect, Me.Menu_Disconnect}) Me.Menu_Connection.Name = "Menu_Connection" resources.ApplyResources(Me.Menu_Connection, "Menu_Connection") ' + 'Menu_Persist + ' + Me.Menu_Persist.Checked = Global.WinNUT_Client.My.MySettings.Default.NUT_AutoReconnect + Me.Menu_Persist.CheckOnClick = True + Me.Menu_Persist.Image = Global.WinNUT_Client.My.Resources.Resources.RepeatHS + Me.Menu_Persist.Name = "Menu_Persist" + resources.ApplyResources(Me.Menu_Persist, "Menu_Persist") + ' + 'ToolStripSeparator1 + ' + Me.ToolStripSeparator1.Name = "ToolStripSeparator1" + resources.ApplyResources(Me.ToolStripSeparator1, "ToolStripSeparator1") + ' 'Menu_Connect ' Me.Menu_Connect.Image = Global.WinNUT_Client.My.Resources.Resources.internetconnection @@ -191,19 +204,6 @@ Partial Class WinNUT Me.Menu_Disconnect.Image = Global.WinNUT_Client.My.Resources.Resources.disconnect2 Me.Menu_Disconnect.Name = "Menu_Disconnect" ' - 'ToolStripSeparator1 - ' - Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - resources.ApplyResources(Me.ToolStripSeparator1, "ToolStripSeparator1") - ' - 'Menu_Persist - ' - Me.Menu_Persist.Checked = Global.WinNUT_Client.My.MySettings.Default.NUT_AutoReconnect - Me.Menu_Persist.CheckOnClick = True - Me.Menu_Persist.Image = Global.WinNUT_Client.My.Resources.Resources.RepeatHS - Me.Menu_Persist.Name = "Menu_Persist" - resources.ApplyResources(Me.Menu_Persist, "Menu_Persist") - ' 'Menu_Settings ' Me.Menu_Settings.Name = "Menu_Settings" @@ -380,6 +380,31 @@ Partial Class WinNUT Me.GB_InV_Dial.Name = "GB_InV_Dial" Me.GB_InV_Dial.TabStop = False ' + 'AG_InV + ' + Me.AG_InV.BaseArcRadius = 45 + Me.AG_InV.BaseArcWidth = 5 + Me.AG_InV.GradientOrientation = WinNUT_Client.Controls.UPSVarGauge.GradientOrientationEnum.BottomToTop + Me.AG_InV.GradientType = WinNUT_Client.Controls.UPSVarGauge.GradientTypeEnum.RedGreen + resources.ApplyResources(Me.AG_InV, "AG_InV") + Me.AG_InV.MaxValue = 100 + Me.AG_InV.MinValue = 0 + Me.AG_InV.Name = "AG_InV" + Me.AG_InV.NeedleRadius = 32 + Me.AG_InV.ScaleLinesInterInnerRadius = 40 + Me.AG_InV.ScaleLinesInterOuterRadius = 48 + Me.AG_InV.ScaleLinesMajorInnerRadius = 40 + Me.AG_InV.ScaleLinesMajorOuterRadius = 48 + Me.AG_InV.ScaleLinesMinorInnerRadius = 42 + Me.AG_InV.ScaleLinesMinorOuterRadius = 48 + Me.AG_InV.ScaleNumbersFormat = Nothing + Me.AG_InV.ScaleNumbersRadius = 60 + Me.AG_InV.UnitValue1 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.Volts + Me.AG_InV.UnitValue2 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.None + Me.AG_InV.Value = 0! + Me.AG_InV.Value1 = 0! + Me.AG_InV.Value2 = 0! + ' 'Lbl_InV_Dial ' resources.ApplyResources(Me.Lbl_InV_Dial, "Lbl_InV_Dial") @@ -393,6 +418,31 @@ Partial Class WinNUT Me.GB_OutV_Dial.Name = "GB_OutV_Dial" Me.GB_OutV_Dial.TabStop = False ' + 'AG_OutV + ' + Me.AG_OutV.BaseArcRadius = 45 + Me.AG_OutV.BaseArcWidth = 5 + Me.AG_OutV.GradientOrientation = WinNUT_Client.Controls.UPSVarGauge.GradientOrientationEnum.BottomToTop + Me.AG_OutV.GradientType = WinNUT_Client.Controls.UPSVarGauge.GradientTypeEnum.RedGreen + resources.ApplyResources(Me.AG_OutV, "AG_OutV") + Me.AG_OutV.MaxValue = 100 + Me.AG_OutV.MinValue = 0 + Me.AG_OutV.Name = "AG_OutV" + Me.AG_OutV.NeedleRadius = 32 + Me.AG_OutV.ScaleLinesInterInnerRadius = 40 + Me.AG_OutV.ScaleLinesInterOuterRadius = 48 + Me.AG_OutV.ScaleLinesMajorInnerRadius = 40 + Me.AG_OutV.ScaleLinesMajorOuterRadius = 48 + Me.AG_OutV.ScaleLinesMinorInnerRadius = 42 + Me.AG_OutV.ScaleLinesMinorOuterRadius = 48 + Me.AG_OutV.ScaleNumbersFormat = Nothing + Me.AG_OutV.ScaleNumbersRadius = 60 + Me.AG_OutV.UnitValue1 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.Volts + Me.AG_OutV.UnitValue2 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.None + Me.AG_OutV.Value = 0! + Me.AG_OutV.Value1 = 0! + Me.AG_OutV.Value2 = 0! + ' 'Lbl_OutV_Dial ' resources.ApplyResources(Me.Lbl_OutV_Dial, "Lbl_OutV_Dial") @@ -418,6 +468,31 @@ Partial Class WinNUT resources.ApplyResources(Me.Lbl_BattCh_Dial, "Lbl_BattCh_Dial") Me.Lbl_BattCh_Dial.Name = "Lbl_BattCh_Dial" ' + 'AG_BattCh + ' + Me.AG_BattCh.BaseArcRadius = 45 + Me.AG_BattCh.BaseArcWidth = 5 + Me.AG_BattCh.GradientOrientation = WinNUT_Client.Controls.UPSVarGauge.GradientOrientationEnum.LeftToRight + Me.AG_BattCh.GradientType = WinNUT_Client.Controls.UPSVarGauge.GradientTypeEnum.RedGreen + resources.ApplyResources(Me.AG_BattCh, "AG_BattCh") + Me.AG_BattCh.MaxValue = 100 + Me.AG_BattCh.MinValue = 0 + Me.AG_BattCh.Name = "AG_BattCh" + Me.AG_BattCh.NeedleRadius = 32 + Me.AG_BattCh.ScaleLinesInterInnerRadius = 40 + Me.AG_BattCh.ScaleLinesInterOuterRadius = 48 + Me.AG_BattCh.ScaleLinesMajorInnerRadius = 40 + Me.AG_BattCh.ScaleLinesMajorOuterRadius = 48 + Me.AG_BattCh.ScaleLinesMinorInnerRadius = 42 + Me.AG_BattCh.ScaleLinesMinorOuterRadius = 48 + Me.AG_BattCh.ScaleNumbersFormat = Nothing + Me.AG_BattCh.ScaleNumbersRadius = 60 + Me.AG_BattCh.UnitValue1 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.Percent + Me.AG_BattCh.UnitValue2 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.None + Me.AG_BattCh.Value = 0! + Me.AG_BattCh.Value1 = 0! + Me.AG_BattCh.Value2 = 0! + ' 'GB_Load_Dial ' resources.ApplyResources(Me.GB_Load_Dial, "GB_Load_Dial") @@ -426,6 +501,31 @@ Partial Class WinNUT Me.GB_Load_Dial.Name = "GB_Load_Dial" Me.GB_Load_Dial.TabStop = False ' + 'AG_Load + ' + Me.AG_Load.BaseArcRadius = 45 + Me.AG_Load.BaseArcWidth = 5 + Me.AG_Load.GradientOrientation = WinNUT_Client.Controls.UPSVarGauge.GradientOrientationEnum.RightToLeft + Me.AG_Load.GradientType = WinNUT_Client.Controls.UPSVarGauge.GradientTypeEnum.RedGreen + resources.ApplyResources(Me.AG_Load, "AG_Load") + Me.AG_Load.MaxValue = 100 + Me.AG_Load.MinValue = 0 + Me.AG_Load.Name = "AG_Load" + Me.AG_Load.NeedleRadius = 32 + Me.AG_Load.ScaleLinesInterInnerRadius = 40 + Me.AG_Load.ScaleLinesInterOuterRadius = 48 + Me.AG_Load.ScaleLinesMajorInnerRadius = 40 + Me.AG_Load.ScaleLinesMajorOuterRadius = 48 + Me.AG_Load.ScaleLinesMinorInnerRadius = 42 + Me.AG_Load.ScaleLinesMinorOuterRadius = 48 + Me.AG_Load.ScaleNumbersFormat = Nothing + Me.AG_Load.ScaleNumbersRadius = 60 + Me.AG_Load.UnitValue1 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.Percent + Me.AG_Load.UnitValue2 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.Watts + Me.AG_Load.Value = 0! + Me.AG_Load.Value1 = 0! + Me.AG_Load.Value2 = 0! + ' 'Lbl_Load_Dial ' resources.ApplyResources(Me.Lbl_Load_Dial, "Lbl_Load_Dial") @@ -439,6 +539,31 @@ Partial Class WinNUT Me.GB_BattV_Dial.Name = "GB_BattV_Dial" Me.GB_BattV_Dial.TabStop = False ' + 'AG_BattV + ' + Me.AG_BattV.BaseArcRadius = 45 + Me.AG_BattV.BaseArcWidth = 5 + Me.AG_BattV.GradientOrientation = WinNUT_Client.Controls.UPSVarGauge.GradientOrientationEnum.BottomToTop + Me.AG_BattV.GradientType = WinNUT_Client.Controls.UPSVarGauge.GradientTypeEnum.RedGreen + resources.ApplyResources(Me.AG_BattV, "AG_BattV") + Me.AG_BattV.MaxValue = 100 + Me.AG_BattV.MinValue = 0 + Me.AG_BattV.Name = "AG_BattV" + Me.AG_BattV.NeedleRadius = 32 + Me.AG_BattV.ScaleLinesInterInnerRadius = 40 + Me.AG_BattV.ScaleLinesInterOuterRadius = 48 + Me.AG_BattV.ScaleLinesMajorInnerRadius = 40 + Me.AG_BattV.ScaleLinesMajorOuterRadius = 48 + Me.AG_BattV.ScaleLinesMinorInnerRadius = 42 + Me.AG_BattV.ScaleLinesMinorOuterRadius = 48 + Me.AG_BattV.ScaleNumbersFormat = Nothing + Me.AG_BattV.ScaleNumbersRadius = 60 + Me.AG_BattV.UnitValue1 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.Volts + Me.AG_BattV.UnitValue2 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.None + Me.AG_BattV.Value = 0! + Me.AG_BattV.Value1 = 0! + Me.AG_BattV.Value2 = 0! + ' 'Lbl_BattV_Dial ' resources.ApplyResources(Me.Lbl_BattV_Dial, "Lbl_BattV_Dial") @@ -452,17 +577,6 @@ Partial Class WinNUT Me.GB_InF_Dial.Name = "GB_InF_Dial" Me.GB_InF_Dial.TabStop = False ' - 'Lbl_InF_Dial - ' - resources.ApplyResources(Me.Lbl_InF_Dial, "Lbl_InF_Dial") - Me.Lbl_InF_Dial.Name = "Lbl_InF_Dial" - ' - 'CB_CurrentLog - ' - Me.CB_CurrentLog.FormattingEnabled = True - resources.ApplyResources(Me.CB_CurrentLog, "CB_CurrentLog") - Me.CB_CurrentLog.Name = "CB_CurrentLog" - ' 'AG_InF ' Me.AG_InF.BaseArcRadius = 45 @@ -488,130 +602,17 @@ Partial Class WinNUT Me.AG_InF.Value1 = 0! Me.AG_InF.Value2 = 0! ' - 'AG_InV - ' - Me.AG_InV.BaseArcRadius = 45 - Me.AG_InV.BaseArcWidth = 5 - Me.AG_InV.GradientOrientation = WinNUT_Client.Controls.UPSVarGauge.GradientOrientationEnum.BottomToTop - Me.AG_InV.GradientType = WinNUT_Client.Controls.UPSVarGauge.GradientTypeEnum.RedGreen - resources.ApplyResources(Me.AG_InV, "AG_InV") - Me.AG_InV.MaxValue = 100 - Me.AG_InV.MinValue = 0 - Me.AG_InV.Name = "AG_InV" - Me.AG_InV.NeedleRadius = 32 - Me.AG_InV.ScaleLinesInterInnerRadius = 40 - Me.AG_InV.ScaleLinesInterOuterRadius = 48 - Me.AG_InV.ScaleLinesMajorInnerRadius = 40 - Me.AG_InV.ScaleLinesMajorOuterRadius = 48 - Me.AG_InV.ScaleLinesMinorInnerRadius = 42 - Me.AG_InV.ScaleLinesMinorOuterRadius = 48 - Me.AG_InV.ScaleNumbersFormat = Nothing - Me.AG_InV.ScaleNumbersRadius = 60 - Me.AG_InV.UnitValue1 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.Volts - Me.AG_InV.UnitValue2 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.None - Me.AG_InV.Value = 0! - Me.AG_InV.Value1 = 0! - Me.AG_InV.Value2 = 0! - ' - 'AG_BattV - ' - Me.AG_BattV.BaseArcRadius = 45 - Me.AG_BattV.BaseArcWidth = 5 - Me.AG_BattV.GradientOrientation = WinNUT_Client.Controls.UPSVarGauge.GradientOrientationEnum.BottomToTop - Me.AG_BattV.GradientType = WinNUT_Client.Controls.UPSVarGauge.GradientTypeEnum.RedGreen - resources.ApplyResources(Me.AG_BattV, "AG_BattV") - Me.AG_BattV.MaxValue = 100 - Me.AG_BattV.MinValue = 0 - Me.AG_BattV.Name = "AG_BattV" - Me.AG_BattV.NeedleRadius = 32 - Me.AG_BattV.ScaleLinesInterInnerRadius = 40 - Me.AG_BattV.ScaleLinesInterOuterRadius = 48 - Me.AG_BattV.ScaleLinesMajorInnerRadius = 40 - Me.AG_BattV.ScaleLinesMajorOuterRadius = 48 - Me.AG_BattV.ScaleLinesMinorInnerRadius = 42 - Me.AG_BattV.ScaleLinesMinorOuterRadius = 48 - Me.AG_BattV.ScaleNumbersFormat = Nothing - Me.AG_BattV.ScaleNumbersRadius = 60 - Me.AG_BattV.UnitValue1 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.Volts - Me.AG_BattV.UnitValue2 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.None - Me.AG_BattV.Value = 0! - Me.AG_BattV.Value1 = 0! - Me.AG_BattV.Value2 = 0! - ' - 'AG_Load - ' - Me.AG_Load.BaseArcRadius = 45 - Me.AG_Load.BaseArcWidth = 5 - Me.AG_Load.GradientOrientation = WinNUT_Client.Controls.UPSVarGauge.GradientOrientationEnum.RightToLeft - Me.AG_Load.GradientType = WinNUT_Client.Controls.UPSVarGauge.GradientTypeEnum.RedGreen - resources.ApplyResources(Me.AG_Load, "AG_Load") - Me.AG_Load.MaxValue = 100 - Me.AG_Load.MinValue = 0 - Me.AG_Load.Name = "AG_Load" - Me.AG_Load.NeedleRadius = 32 - Me.AG_Load.ScaleLinesInterInnerRadius = 40 - Me.AG_Load.ScaleLinesInterOuterRadius = 48 - Me.AG_Load.ScaleLinesMajorInnerRadius = 40 - Me.AG_Load.ScaleLinesMajorOuterRadius = 48 - Me.AG_Load.ScaleLinesMinorInnerRadius = 42 - Me.AG_Load.ScaleLinesMinorOuterRadius = 48 - Me.AG_Load.ScaleNumbersFormat = Nothing - Me.AG_Load.ScaleNumbersRadius = 60 - Me.AG_Load.UnitValue1 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.Percent - Me.AG_Load.UnitValue2 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.Watts - Me.AG_Load.Value = 0! - Me.AG_Load.Value1 = 0! - Me.AG_Load.Value2 = 0! - ' - 'AG_OutV + 'Lbl_InF_Dial ' - Me.AG_OutV.BaseArcRadius = 45 - Me.AG_OutV.BaseArcWidth = 5 - Me.AG_OutV.GradientOrientation = WinNUT_Client.Controls.UPSVarGauge.GradientOrientationEnum.BottomToTop - Me.AG_OutV.GradientType = WinNUT_Client.Controls.UPSVarGauge.GradientTypeEnum.RedGreen - resources.ApplyResources(Me.AG_OutV, "AG_OutV") - Me.AG_OutV.MaxValue = 100 - Me.AG_OutV.MinValue = 0 - Me.AG_OutV.Name = "AG_OutV" - Me.AG_OutV.NeedleRadius = 32 - Me.AG_OutV.ScaleLinesInterInnerRadius = 40 - Me.AG_OutV.ScaleLinesInterOuterRadius = 48 - Me.AG_OutV.ScaleLinesMajorInnerRadius = 40 - Me.AG_OutV.ScaleLinesMajorOuterRadius = 48 - Me.AG_OutV.ScaleLinesMinorInnerRadius = 42 - Me.AG_OutV.ScaleLinesMinorOuterRadius = 48 - Me.AG_OutV.ScaleNumbersFormat = Nothing - Me.AG_OutV.ScaleNumbersRadius = 60 - Me.AG_OutV.UnitValue1 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.Volts - Me.AG_OutV.UnitValue2 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.None - Me.AG_OutV.Value = 0! - Me.AG_OutV.Value1 = 0! - Me.AG_OutV.Value2 = 0! + resources.ApplyResources(Me.Lbl_InF_Dial, "Lbl_InF_Dial") + Me.Lbl_InF_Dial.Name = "Lbl_InF_Dial" ' - 'AG_BattCh + 'CB_CurrentLog ' - Me.AG_BattCh.BaseArcRadius = 45 - Me.AG_BattCh.BaseArcWidth = 5 - Me.AG_BattCh.GradientOrientation = WinNUT_Client.Controls.UPSVarGauge.GradientOrientationEnum.LeftToRight - Me.AG_BattCh.GradientType = WinNUT_Client.Controls.UPSVarGauge.GradientTypeEnum.RedGreen - resources.ApplyResources(Me.AG_BattCh, "AG_BattCh") - Me.AG_BattCh.MaxValue = 100 - Me.AG_BattCh.MinValue = 0 - Me.AG_BattCh.Name = "AG_BattCh" - Me.AG_BattCh.NeedleRadius = 32 - Me.AG_BattCh.ScaleLinesInterInnerRadius = 40 - Me.AG_BattCh.ScaleLinesInterOuterRadius = 48 - Me.AG_BattCh.ScaleLinesMajorInnerRadius = 40 - Me.AG_BattCh.ScaleLinesMajorOuterRadius = 48 - Me.AG_BattCh.ScaleLinesMinorInnerRadius = 42 - Me.AG_BattCh.ScaleLinesMinorOuterRadius = 48 - Me.AG_BattCh.ScaleNumbersFormat = Nothing - Me.AG_BattCh.ScaleNumbersRadius = 60 - Me.AG_BattCh.UnitValue1 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.Percent - Me.AG_BattCh.UnitValue2 = WinNUT_Client.Controls.UPSVarGauge.UnitValueEnum.None - Me.AG_BattCh.Value = 0! - Me.AG_BattCh.Value1 = 0! - Me.AG_BattCh.Value2 = 0! + Me.CB_CurrentLog.CausesValidation = False + Me.CB_CurrentLog.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + resources.ApplyResources(Me.CB_CurrentLog, "CB_CurrentLog") + Me.CB_CurrentLog.Name = "CB_CurrentLog" ' 'WinNUT ' @@ -712,9 +713,9 @@ Partial Class WinNUT Friend WithEvents GB_InF_Dial As GroupBox Friend WithEvents AG_InF As WinNUT_Client.Controls.UPSVarGauge Friend WithEvents Lbl_InF_Dial As Label - Friend WithEvents CB_CurrentLog As ComboBox Friend WithEvents PBox_Battery_State As PictureBox Friend WithEvents ManageOldPrefsToolStripMenuItem As ToolStripMenuItem Friend WithEvents ToolStripSeparator1 As ToolStripSeparator Friend WithEvents Menu_Persist As ToolStripMenuItem + Private WithEvents CB_CurrentLog As ComboBox End Class diff --git a/WinNUT_V2/WinNUT-Client/WinNUT.de-DE.resx b/WinNUT_V2/WinNUT-Client/WinNUT.de-DE.resx index bd54f27..14cb97a 100644 --- a/WinNUT_V2/WinNUT-Client/WinNUT.de-DE.resx +++ b/WinNUT_V2/WinNUT-Client/WinNUT.de-DE.resx @@ -105,9 +105,6 @@ Alte Einstellungen verwalten... - - 180, 22 - Verbinden @@ -129,12 +126,6 @@ - - 177, 6 - - - 180, 22 - Automatische Wiederverbindung diff --git a/WinNUT_V2/WinNUT-Client/WinNUT.fr-FR.resx b/WinNUT_V2/WinNUT-Client/WinNUT.fr-FR.resx index e29ad5c..52275cb 100644 --- a/WinNUT_V2/WinNUT-Client/WinNUT.fr-FR.resx +++ b/WinNUT_V2/WinNUT-Client/WinNUT.fr-FR.resx @@ -102,9 +102,6 @@ 177, 22 - - 180, 22 - @@ -123,12 +120,6 @@ - - 177, 6 - - - 180, 22 - False diff --git a/WinNUT_V2/WinNUT-Client/WinNUT.resx b/WinNUT_V2/WinNUT-Client/WinNUT.resx index 4f951cd..eb1539d 100644 --- a/WinNUT_V2/WinNUT-Client/WinNUT.resx +++ b/WinNUT_V2/WinNUT-Client/WinNUT.resx @@ -186,11 +186,44 @@ None + + 0, 0 + + + 0, 24 + + + 231, 24 + + + 0 + + + MenuStrip1 + + + Main_Menu + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + 37, 20 + + + File + False - 180, 22 + 177, 22 UPS Variable @@ -213,59 +246,23 @@ Exit - - 37, 20 - - - File - 81, 20 Connection - - 61, 20 - - - Settings - - - 44, 20 - - - Help - - - 0, 0 - - - 0, 24 - - - 231, 24 - - - 0 - - - MenuStrip1 - - - Main_Menu - - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 133, 22 - - $this + + Persist - - 9 + + 130, 6 - 180, 22 + 133, 22 Connect @@ -274,19 +271,22 @@ False - 180, 22 + 133, 22 Disconnect - - 177, 6 + + 61, 20 - - 180, 22 + + Settings - - Persist + + 44, 20 + + + Help 144, 22 @@ -1221,6 +1221,30 @@ 3 + + 6, 26 + + + 148, 130 + + + 1 + + + + + + AG_InV + + + WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + GB_InV_Dial + + + 0 + True @@ -1270,7 +1294,7 @@ AG_OutV - WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=2.3.8972.25554, Culture=neutral, PublicKeyToken=null + WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null GB_OutV_Dial @@ -1311,6 +1335,36 @@ 6 + + 6, 26 + + + 148, 130 + + + 148, 130 + + + 148, 130 + + + 1 + + + + + + AG_OutV + + + WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + GB_OutV_Dial + + + 0 + True @@ -1384,7 +1438,7 @@ AG_BattCh - WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=2.3.8972.25554, Culture=neutral, PublicKeyToken=null + WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null GB_BattCh_Dial @@ -1476,6 +1530,36 @@ 1 + + 6, 27 + + + 148, 130 + + + 148, 130 + + + 148, 130 + + + 1 + + + + + + AG_BattCh + + + WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + GB_BattCh_Dial + + + 2 + True @@ -1486,7 +1570,7 @@ AG_Load - WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=2.3.8972.25554, Culture=neutral, PublicKeyToken=null + WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null GB_Load_Dial @@ -1527,6 +1611,36 @@ 5 + + 6, 26 + + + 148, 130 + + + 148, 130 + + + 148, 130 + + + 1 + + + + + + AG_Load + + + WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + GB_Load_Dial + + + 0 + True @@ -1576,7 +1690,7 @@ AG_BattV - WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=2.3.8972.25554, Culture=neutral, PublicKeyToken=null + WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null GB_BattV_Dial @@ -1617,6 +1731,36 @@ 4 + + 6, 26 + + + 148, 130 + + + 148, 130 + + + 148, 130 + + + 1 + + + + + + AG_BattV + + + WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + GB_BattV_Dial + + + 0 + True @@ -1666,7 +1810,7 @@ AG_InF - WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=2.3.8972.25554, Culture=neutral, PublicKeyToken=null + WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null GB_InF_Dial @@ -1707,6 +1851,36 @@ 2 + + 6, 26 + + + 148, 130 + + + 148, 130 + + + 148, 130 + + + 1 + + + + + + AG_InF + + + WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + GB_InF_Dial + + + 0 + True @@ -1776,180 +1950,6 @@ 1 - - 6, 26 - - - 148, 130 - - - 148, 130 - - - 148, 130 - - - 1 - - - - - - AG_InF - - - WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=2.3.8972.25578, Culture=neutral, PublicKeyToken=null - - - GB_InF_Dial - - - 0 - - - 6, 26 - - - 148, 130 - - - 1 - - - - - - AG_InV - - - WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=2.3.8972.25578, Culture=neutral, PublicKeyToken=null - - - GB_InV_Dial - - - 0 - - - 6, 26 - - - 148, 130 - - - 148, 130 - - - 148, 130 - - - 1 - - - - - - AG_BattV - - - WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=2.3.8972.25578, Culture=neutral, PublicKeyToken=null - - - GB_BattV_Dial - - - 0 - - - 6, 26 - - - 148, 130 - - - 148, 130 - - - 148, 130 - - - 1 - - - - - - AG_Load - - - WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=2.3.8972.25578, Culture=neutral, PublicKeyToken=null - - - GB_Load_Dial - - - 0 - - - 6, 26 - - - 148, 130 - - - 148, 130 - - - 148, 130 - - - 1 - - - - - - AG_OutV - - - WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=2.3.8972.25578, Culture=neutral, PublicKeyToken=null - - - GB_OutV_Dial - - - 0 - - - 6, 27 - - - 148, 130 - - - 148, 130 - - - 148, 130 - - - 1 - - - - - - AG_BattCh - - - WinNUT_Client.Controls.UPSVarGauge, WinNUT-Client, Version=2.3.8972.25578, Culture=neutral, PublicKeyToken=null - - - GB_BattCh_Dial - - - 2 - True @@ -1962,9 +1962,6 @@ 704, 381 - - NoControl - 720, 420 @@ -2034,34 +2031,28 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Menu_Quit - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ManageOldPrefsToolStripMenuItem System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Menu_Connection + + Menu_Quit - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Menu_Connect + + Menu_Connection - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Menu_Disconnect + + Menu_Persist - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2070,10 +2061,16 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Menu_Persist + + Menu_Connect - + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Menu_Disconnect + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/WinNUT_V2/WinNUT-Client/WinNUT.ru-RU.resx b/WinNUT_V2/WinNUT-Client/WinNUT.ru-RU.resx index 06c87ae..bec73e0 100644 --- a/WinNUT_V2/WinNUT-Client/WinNUT.ru-RU.resx +++ b/WinNUT_V2/WinNUT-Client/WinNUT.ru-RU.resx @@ -102,9 +102,6 @@ 177, 22 - - 180, 22 - @@ -123,12 +120,6 @@ - - 177, 6 - - - 180, 22 - False diff --git a/WinNUT_V2/WinNUT-Client/WinNUT.uk-UA.resx b/WinNUT_V2/WinNUT-Client/WinNUT.uk-UA.resx index ee90ec2..ee1abea 100644 --- a/WinNUT_V2/WinNUT-Client/WinNUT.uk-UA.resx +++ b/WinNUT_V2/WinNUT-Client/WinNUT.uk-UA.resx @@ -102,9 +102,6 @@ Керування старими налаштуваннями... - - 180, 22 - @@ -123,12 +120,6 @@ - - 177, 6 - - - 180, 22 - False diff --git a/WinNUT_V2/WinNUT-Client/WinNUT.vb b/WinNUT_V2/WinNUT-Client/WinNUT.vb index deec7d5..f7a315e 100644 --- a/WinNUT_V2/WinNUT-Client/WinNUT.vb +++ b/WinNUT_V2/WinNUT-Client/WinNUT.vb @@ -1,4 +1,5 @@ -Imports WinNUT_Client_Common +Imports System.Configuration +Imports WinNUT_Client_Common Public Class WinNUT #Region "Properties" @@ -9,12 +10,6 @@ Public Class WinNUT End Set End Property - Private ReadOnly Property OldPrefsExist As Boolean - Get - Return OldParams.WinNUT_Params.RegistryKeyRoot IsNot Nothing - End Get - End Property - Private ReadOnly Property IsUPSConnected As Boolean Get Return UPS_Device IsNot Nothing AndAlso UPS_Device.IsConnected @@ -71,8 +66,6 @@ Public Class WinNUT Private Sub WinNUT_Load(sender As Object, e As EventArgs) Handles MyBase.Load 'Add Main Gui's Strings - StrLog.Insert(AppResxStr.STR_MAIN_OLDINI_RENAMED, My.Resources.Frm_Main_Str_01) - StrLog.Insert(AppResxStr.STR_MAIN_OLDINI, My.Resources.Frm_Main_Str_02) StrLog.Insert(AppResxStr.STR_MAIN_RECONNECT, My.Resources.Frm_Main_Str_03) StrLog.Insert(AppResxStr.STR_MAIN_NOTCONN, My.Resources.Frm_Main_Str_05) StrLog.Insert(AppResxStr.STR_MAIN_CONN, My.Resources.Frm_Main_Str_06) @@ -169,18 +162,13 @@ Public Class WinNUT LogFile.LogTracing("Update Icon at Startup", LogLvl.LOG_DEBUG, Me) ' Start_Tray_Icon = Nothing - ' TODO: Move below code to a dedicated onsettingsloaded method. - ApplyApplicationPreferences() UpdateMainMenuState() + ReInitDisplayValues() - ' If this is the first time WinNUT has been launched with the Settings system, check if old preferences exist - ' and prompt the user to upgrade. - If Not My.Settings.UpgradePrefsCompleted AndAlso OldPrefsExist Then - LogFile.LogTracing("Previous preferences data detected in the Registry.", LogLvl.LOG_NOTICE, Me, - My.Resources.DetectedPreviousPrefsData) - - RunRegPrefsUpgrade() - End If + ' Prepare visual log combo box + For Each line In LogFile.DisplayedLogs + AddLogLine(line) + Next AddHandler UpdateController.UpdateCheckCompleted, AddressOf OnCheckForUpdateCompleted 'Run Update @@ -191,11 +179,35 @@ Public Class WinNUT AddHandler Microsoft.Win32.SystemEvents.PowerModeChanged, AddressOf SystemEvents_PowerModeChanged AddHandler RequestConnect, AddressOf UPS_Connect - AddHandler My.Settings.PropertyChanged, AddressOf SettingsPropertyChanged + AddHandler My.Settings.SettingChanging, AddressOf SettingChanging LogFile.LogTracing("WinNUT Form completed Load.", LogLvl.LOG_NOTICE, Me) End Sub +#Region "Debug menu" +#If DEBUG Then + Private Sub TestFillAndTrim() + For i = LogFile.DisplayedLogs.Count To Logger.MAX_DISPLAYED_LOGS + 3 + LogFile.LogTracing("Test logging line " & i, LogLvl.LOG_DEBUG, Me, "Test logging line " & i) + Next + End Sub + + Private Sub InsertDebugMenuOnLoad(sender As Object, e As EventArgs) Handles MyBase.Load + Dim testFillAndTrimCommand As New ToolStripMenuItem("Test Fill and Trim") + AddHandler testFillAndTrimCommand.Click, AddressOf TestFillAndTrim + + Dim logDisplaySubmenu As New ToolStripMenuItem("LogDisplay") + logDisplaySubmenu.DropDownItems.Add(testFillAndTrimCommand) + + Dim debugMenu As New ToolStripMenuItem("Debug") + debugMenu.DropDownItems.Add(logDisplaySubmenu) + Main_Menu.Items.Add(debugMenu) + + LogFile.LogTracing("Inserted debug menu to Main_Menu.", LogLvl.LOG_DEBUG, Me, "Debug Menu enabled.") + End Sub +#End If +#End Region + ''' ''' Second-to-last step in loading the Form. "Occurs when the form is activated in code or by the user." ''' @@ -227,6 +239,7 @@ Public Class WinNUT ''' ''' Final step in loading the main form for the first time. + ''' "The Shown event is _only_ raised the first time a form is displayed" ''' ''' ''' @@ -309,8 +322,8 @@ Public Class WinNUT #End Region - Private Sub SettingsPropertyChanged(sender As Object, e As System.ComponentModel.PropertyChangedEventArgs) - LogFile.LogTracing("SettingsPropertyChanged: " & e.PropertyName, LogLvl.LOG_DEBUG, Me) + Private Sub SettingChanging(sender As Object, e As SettingChangingEventArgs) + LogFile.LogTracing("SettingChanging: " & e.SettingName, LogLvl.LOG_DEBUG, Me) UpdateMainMenuState() End Sub @@ -318,7 +331,7 @@ Public Class WinNUT Private Sub UpdateMainMenuState() Menu_Persist.Checked = My.Settings.NUT_AutoReconnect - If OldParams.WinNUT_Params.RegistryKeyRoot IsNot Nothing Then + If OldParams.WinNUT_Params.ParamsExist Then ManageOldPrefsToolStripMenuItem.Enabled = True ManageOldPrefsToolStripMenuItem.ToolTipText = My.Resources.ManageOldPrefsToolstripMenuItem_Enabled_TooltipText Else @@ -818,13 +831,6 @@ Public Class WinNUT LogFile.IsWritingToFile = My.Settings.LG_LogToFile LogFile.LogLevelValue = My.Settings.LG_LogLevel - ' Validate interval value because it's been incorrectly stored in older versions. - If My.Settings.NUT_PollIntervalMsec <= 0 Then - LogFile.LogTracing("Incorrect value of " & My.Settings.NUT_PollIntervalMsec & - " for Poll Delay/Interval, resetting to default.", LogLvl.LOG_ERROR, Me) - My.Settings.NUT_PollIntervalMsec = My.MySettings.Default.NUT_PollIntervalMsec - End If - If autoReconnect Then UPS_Connect() End If @@ -939,21 +945,21 @@ Public Class WinNUT lvgForm.Show() End Sub - Public Sub Update_InstantLog(sender As Object) Handles LogFile.NewData - Dim Message As String = LogFile.CurrentLogData - Static Dim Event_Id = 1 - LogFile.LogTracing("New Log to CB_Current Log : " & Message, LogLvl.LOG_DEBUG, sender.ToString) - Message = "[Id " & Event_Id & ": " & Format(Now, "General Date") & "] " & Message - Event_Id += 1 - CB_CurrentLog.Items.Insert(0, Message) - CB_CurrentLog.SelectedIndex = 0 - If CB_CurrentLog.Items.Count > 10 Then - For i = 10 To (CB_CurrentLog.Items.Count - 1) Step 1 - CB_CurrentLog.Items.Remove(i) - Next + Private Sub AddLogLine(logLine As String) Handles LogFile.DisplayedLogsLineAdded + If Not CB_CurrentLog.Items.Contains(logLine) Then + ' Invert insertions so latest items appear at the top. + CB_CurrentLog.Items.Insert(0, logLine) + CB_CurrentLog.SelectedIndex = 0 + Else + LogFile.LogTracing("Attempted to add duplicate item to CB_CurrentLog: " & logLine, LogLvl.LOG_ERROR, Me) End If End Sub + Private Sub TrimLogLine(removedLine As String) Handles LogFile.DisplayedLogsTrimmed + LogFile.LogTracing("Receiving event to trim end of displayed logs list.", LogLvl.LOG_DEBUG, Me) + CB_CurrentLog.Items.Remove(removedLine) + End Sub + Private Sub HandleUPSStatusChange(sender As UPS_Device, newStatuses As UPS_States) Handles UPS_Device.StatusesChanged LogFile.LogTracing("Handling new UPS status(es)...", LogLvl.LOG_DEBUG, Me) diff --git a/WinNUT_V2/WinNUT-Client/WinNUT.zh-CN.resx b/WinNUT_V2/WinNUT-Client/WinNUT.zh-CN.resx index 47a17e3..be44ec1 100644 --- a/WinNUT_V2/WinNUT-Client/WinNUT.zh-CN.resx +++ b/WinNUT_V2/WinNUT-Client/WinNUT.zh-CN.resx @@ -105,9 +105,6 @@ 管理旧设置... - - 180, 22 - @@ -126,12 +123,6 @@ - - 177, 6 - - - 180, 22 - False diff --git a/WinNUT_V2/WinNUT-Client/WinNUT.zh-TW.resx b/WinNUT_V2/WinNUT-Client/WinNUT.zh-TW.resx index 1c2f0da..797fa5b 100644 --- a/WinNUT_V2/WinNUT-Client/WinNUT.zh-TW.resx +++ b/WinNUT_V2/WinNUT-Client/WinNUT.zh-TW.resx @@ -102,9 +102,6 @@ 177, 22 - - 180, 22 - @@ -123,12 +120,6 @@ - - 177, 6 - - - 180, 22 - False diff --git a/WinNUT_V2/WinNUT-Client_Common/Common_Enums.vb b/WinNUT_V2/WinNUT-Client_Common/Common_Enums.vb index 2a11270..1e0be5a 100644 --- a/WinNUT_V2/WinNUT-Client_Common/Common_Enums.vb +++ b/WinNUT_V2/WinNUT-Client_Common/Common_Enums.vb @@ -31,8 +31,6 @@ End Enum 'Define Resource Str Public Enum AppResxStr - STR_MAIN_OLDINI_RENAMED - STR_MAIN_OLDINI STR_MAIN_RECONNECT STR_MAIN_NOTCONN STR_MAIN_CONN diff --git a/WinNUT_V2/WinNUT-Client_Common/Logger.vb b/WinNUT_V2/WinNUT-Client_Common/Logger.vb index 2cf31bd..83714fa 100644 --- a/WinNUT_V2/WinNUT-Client_Common/Logger.vb +++ b/WinNUT_V2/WinNUT-Client_Common/Logger.vb @@ -16,6 +16,7 @@ Imports Microsoft.VisualBasic.Logging Public Class Logger #Region "Constants/Shared" Private Const LOG_FILE_CREATION_SCHEDULE = LogFileCreationScheduleOption.Daily + Public Const MAX_DISPLAYED_LOGS = 50 ' Set TEST_RELEASE_DIRS in the custom compiler constants dialog for file storage to behave like release. #If DEBUG AndAlso Not TEST_RELEASE_DIRS Then @@ -32,15 +33,17 @@ Public Class Logger #Region "Private/backing values" Private LogFile As FileLogTraceListener - Private L_CurrentLogData As String Private LastEventsList As New List(Of Object) + Private _displayedLogs As New Queue(Of String)(MAX_DISPLAYED_LOGS) + Private _displayedLogsCounter As Integer = 0 ' As incrementing when a new displayed log is added. Private _DateTimeFormatInfo As DateTimeFormatInfo = DEFAULT_DATETIMEFORMAT #End Region Public LogLevelValue As LogLvl - Public Event NewData(sender As Object) + Public Event DisplayedLogsLineAdded(newLine As String) + Public Event DisplayedLogsTrimmed(removedLine As String) #Region "Properties" @@ -56,15 +59,14 @@ Public Class Logger End Set End Property - Public Property CurrentLogData() As String + ''' + ''' Friendly log messages that are intended to be displayed to the user. + ''' + ''' + Public ReadOnly Property DisplayedLogs As Queue(Of String) Get - Dim Tmp_Data = L_CurrentLogData - L_CurrentLogData = Nothing - Return Tmp_Data + Return _displayedLogs End Get - Set(Value As String) - L_CurrentLogData = Value - End Set End Property Public ReadOnly Property LastEvents() As List(Of Object) @@ -220,10 +222,20 @@ Public Class Logger LogFile.WriteLine(FinalMsg) End If - 'If LvlError = LogLvl.LOG_NOTICE Then + ' Insert new log message for display to the user, and prune old ones. If LogToDisplay IsNot Nothing Then - L_CurrentLogData = LogToDisplay - RaiseEvent NewData(sender) + If _displayedLogs.Count >= MAX_DISPLAYED_LOGS Then + Dim removedLog = _displayedLogs.Dequeue() + LogTracing($"Removed log from displayed logs collection: { removedLog }", LogLvl.LOG_DEBUG, Me) + RaiseEvent DisplayedLogsTrimmed(removedLog) + End If + + _displayedLogsCounter += 1 + Dim newLogLine = String.Format("[{0}][{1}] {2}", _displayedLogsCounter, + String.Format(Now, "General Date"), LogToDisplay) + _displayedLogs.Enqueue(newLogLine) + LogTracing("Added new line to displayed logs collection: " & newLogLine, LogLvl.LOG_DEBUG, Me) + RaiseEvent DisplayedLogsLineAdded(newLogLine) End If End Sub diff --git a/WinNUT_V2/WinNUT-Client_Common/OldParams/WinNUT_Params.vb b/WinNUT_V2/WinNUT-Client_Common/OldParams/WinNUT_Params.vb index 9da8688..dfaaead 100644 --- a/WinNUT_V2/WinNUT-Client_Common/OldParams/WinNUT_Params.vb +++ b/WinNUT_V2/WinNUT-Client_Common/OldParams/WinNUT_Params.vb @@ -86,6 +86,12 @@ Namespace OldParams End Get End Property + Public Shared ReadOnly Property ParamsExist As Boolean + Get + Return RegistryKeyRoot IsNot Nothing + End Get + End Property + ''' ''' Load parameters from the Windows User Registry Hive. '''