New resources, translations, tweaks

- Renamed NUT_PasswordEnc setting to NUT_Password
- Created Model codefile for UpgradePrefsDialog. Move necessary bacing properties and bound them on the Form.
- Updated some strings concerning the form
- Added a regedit icon to represent the UpgradePrefsDialog wizard.
- Removed excess Imports
- Removed much of the logic out of UpgradePrefsDialog.vb and into the model. Also made small changes to the Form and resources.
- Removed extraneous WinNUT icon
- Some reorganization in WinNUT.vb; adding a Form event handling region, moving old preferences detection code into a later form event so the Form will appear with user-friendly log output displayed. Linked up manual upgrade launch command in the toolstrip menu. Also make sure settings are saved when preferences are changed.
- Updated data in Setup project file; updated icon reference, attempted to remove extra references again.

WinNUT_V2/WinNUT-Client/ApplicationEvents.vb

@@ -34,7 +34,7 @@ Namespace My
         Private Msg_Error As New TextBox
 
         Private SensitiveProperties As List(Of String) = New List(Of String)({"NUT_ServerAddress", "NUT_ServerPort", "NUT_UPSName",
-                                                           "NUT_Username", "NUT_PasswordEnc"})
+                                                           "NUT_Username", "NUT_Password"})
         Private crashReportData As String
 
         Private Sub MyApplication_Startup(sender As Object, e As StartupEventArgs) Handles Me.Startup

WinNUT_V2/WinNUT-Client/Models/UpgradePrefsDialogModel.vb

@@ -0,0 +1,339 @@
+' 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.ComponentModel
+Imports System.IO
+Imports System.Runtime.CompilerServices
+Imports System.Threading
+Imports WinNUT_Client_Common
+
+Namespace Models
+    Friend Class UpgradePrefsDialogModel
+        Implements INotifyPropertyChanged
+
+        Private ReadOnly upgradeWorker As New BackgroundWorker With {
+            .WorkerReportsProgress = True
+        }
+        Private oldPrefs As OldParams.UpgradableParams
+
+#Region "Properties and backing fields"
+
+        Private _ImportPreviousSettings As Boolean
+        Private _BackupPreviousSettings As Boolean
+        Private _DeletePreviousSettings As Boolean
+        Private _OKButtonEnabled As Boolean
+        Private _FormEnabled As Boolean
+        Private _FormUseWaitCursor As Boolean
+        Private _ProgressPercent = 0
+        Private _Icon As Bitmap = My.Resources.regedit_exe_14_100_0
+
+        Public Property ImportPreviousSettigns As Boolean
+            Get
+                Return _ImportPreviousSettings
+            End Get
+            Set(value As Boolean)
+                _ImportPreviousSettings = value
+                NotifyPropertyChanged()
+                ' CalculateOKButtonState()
+            End Set
+        End Property
+
+        Public Property BackupPreviousSettings As Boolean
+            Get
+                Return _BackupPreviousSettings
+            End Get
+            Set(value As Boolean)
+                If _BackupPreviousSettings <> value Then
+                    _BackupPreviousSettings = value
+                    NotifyPropertyChanged()
+                    ' CalculateOKButtonState()
+                End If
+            End Set
+        End Property
+
+        Public Property DeletePreviousSettings As Boolean
+            Get
+                Return _DeletePreviousSettings
+            End Get
+            Set(value As Boolean)
+                _DeletePreviousSettings = value
+                NotifyPropertyChanged()
+                ' CalculateOKButtonState()
+            End Set
+        End Property
+
+        Public Property OKButtonEnabled As Boolean
+            Get
+                Return _OKButtonEnabled
+            End Get
+            Set(value As Boolean)
+                If _OKButtonEnabled <> value Then
+                    _OKButtonEnabled = value
+                    NotifyPropertyChanged()
+                End If
+            End Set
+        End Property
+
+        ''' <summary>
+        ''' Enable/disable the main form and cascade changes down as necessary.
+        ''' </summary>
+        ''' <returns></returns>
+        Public Property FormEnabled As Boolean
+            Get
+                Return _FormEnabled
+            End Get
+            Set(value As Boolean)
+                If _FormEnabled <> value Then
+                    _FormEnabled = value
+                    NotifyPropertyChanged()
+                End If
+            End Set
+        End Property
+
+        Public Property FormUseWaitCursor As Boolean
+            Get
+                Return _FormUseWaitCursor
+            End Get
+            Set(value As Boolean)
+                If _FormUseWaitCursor <> value Then
+                    _FormUseWaitCursor = value
+                    NotifyPropertyChanged()
+                End If
+            End Set
+        End Property
+
+        Public Property ProgressPercent As Integer
+            Get
+                Return _ProgressPercent
+            End Get
+            Set(value As Integer)
+                If value < 0 OrElse value > 100 Then
+                    Throw New ArgumentOutOfRangeException(
+                            "Progress must be reported as a percentage inbetween 0 and 100.")
+                Else
+                    _ProgressPercent = value
+                    NotifyPropertyChanged()
+                End If
+            End Set
+        End Property
+
+        Public ReadOnly Property UpgradeInProgress As Boolean
+            Get
+                Return upgradeWorker IsNot Nothing AndAlso upgradeWorker.IsBusy
+            End Get
+        End Property
+
+        Public Property Icon As Bitmap
+            Get
+                Return _Icon
+            End Get
+            Private Set(value As Bitmap)
+                If Not _Icon.Equals(value) Then
+                    _Icon = value
+                    NotifyPropertyChanged()
+                End If
+            End Set
+        End Property
+
+#End Region
+
+        Public Event WorkComplete As RunWorkerCompletedEventHandler
+
+#Region "INotifyPropertyChanged implementation"
+
+        ' This method is called by the Set accessor of each property.  
+        ' The CallerMemberName attribute that is applied to the optional propertyName  
+        ' parameter causes the property name of the caller to be substituted as an argument.  
+        Private Sub NotifyPropertyChanged(<CallerMemberName()> Optional ByVal propertyName As String = Nothing)
+            RaiseEvent PropertyChanged(Me, New PropertyChangedEventArgs(propertyName))
+        End Sub
+
+        Public Event PropertyChanged As PropertyChangedEventHandler Implements INotifyPropertyChanged.PropertyChanged
+
+#End Region
+
+        Friend Sub New()
+            FormEnabled = True
+            FormUseWaitCursor = False
+            ImportPreviousSettigns = True
+            BackupPreviousSettings = True
+
+            AddHandler upgradeWorker.DoWork, AddressOf ProcessUpgradeWork
+            AddHandler upgradeWorker.ProgressChanged, AddressOf UpgradeProgressChanged
+            AddHandler upgradeWorker.RunWorkerCompleted, AddressOf UpgradeWorkComplete
+        End Sub
+
+        Friend Sub BeginUpgradeWorkAsync()
+            FormEnabled = False
+            FormUseWaitCursor = True
+            upgradeWorker.RunWorkerAsync()
+        End Sub
+
+        Friend Sub CancelUpgradeWork()
+            upgradeWorker.CancelAsync()
+        End Sub
+
+        Private Sub CalculateOKButtonState(Optional sender As Object = Nothing, Optional args As PropertyChangedEventArgs = Nothing) _
+            Handles Me.PropertyChanged
+
+            If FormEnabled AndAlso ImportPreviousSettigns OrElse BackupPreviousSettings OrElse DeletePreviousSettings Then
+                OKButtonEnabled = True
+            Else
+                OKButtonEnabled = False
+            End If
+        End Sub
+
+#Region "BackgroundWorker"
+        ''' <summary>
+        ''' Perform the work of <see cref="upgradeWorker"/>
+        ''' </summary>
+        ''' <param name="sender"></param>
+        ''' <param name="e"></param>
+        Private Sub ProcessUpgradeWork(sender As Object, e As DoWorkEventArgs)
+            If Not e.Cancel AndAlso ImportPreviousSettigns Then
+                DoImportWork()
+                Thread.Sleep(2000)
+            End If
+
+            If Not e.Cancel AndAlso BackupPreviousSettings Then
+                DoBackupWork()
+                Thread.Sleep(2000)
+            End If
+
+            If Not e.Cancel AndAlso DeletePreviousSettings Then
+                DoDeleteWork()
+                Thread.Sleep(2000)
+            End If
+        End Sub
+
+        Private Sub UpgradeWorkComplete(sender As Object, e As RunWorkerCompletedEventArgs)
+            oldPrefs = Nothing
+
+            If e.Cancelled Then
+                LogFile.LogTracing("Upgrade work was cancelled.", LogLvl.LOG_WARNING, Me, My.Resources.UpgradePrefsDialog_Cancelled)
+            End If
+
+            If e.Error IsNot Nothing Then
+                LogFile.LogTracing("Error encountered while doing upgrade work: " & e.Error.ToString(), LogLvl.LOG_ERROR, Me,
+                                   String.Format(My.Resources.UpgradePrefsDialog_ErrorEncountered, e.Error.Message))
+            End If
+
+            ProgressPercent = 100
+
+            RaiseEvent WorkComplete(sender, e)
+        End Sub
+
+        Private Sub ReportProgress(percentComplete As Integer, logMsg As String, logLevel As LogLvl, sender As Object,
+                                   Optional logRes As String = Nothing)
+            upgradeWorker.ReportProgress(percentComplete,
+                                     New UpgradeWorkerProgressReport(logMsg, logLevel, sender, logRes))
+        End Sub
+
+        Private Sub UpgradeProgressChanged(sender As Object, e As ProgressChangedEventArgs)
+            Dim progReport As UpgradeWorkerProgressReport = CType(e.UserState, UpgradeWorkerProgressReport)
+            LogFile.LogTracing(progReport.LogOutput, progReport.LogLevel, progReport.Sender, progReport.LogResourceString)
+            ProgressPercent = e.ProgressPercentage
+        End Sub
+
+        Private Sub DoImportWork()
+            ReportProgress(0, "Import operation beginning.", LogLvl.LOG_NOTICE, Me)
+            oldPrefs = New OldParams.UpgradableParams()
+            ReportProgress(100, "Old parameters loaded.", LogLvl.LOG_NOTICE, Me)
+
+            Dim progress = 0
+            For Each section As KeyValuePair(Of String, Dictionary(Of String, Object)) In oldPrefs.Parameters
+                For Each oldPref As KeyValuePair(Of String, Object) In section.Value
+                    Dim percentComplete = (progress / oldPrefs.TotalPrefs) * 100
+                    Try
+                        Dim pairLookupRes = oldPrefs.PrefSettingsLookup.First(Function(p As OldParams.UpgradableParams.PrefSettingPair)
+                                                                                  Return p.OldPreferenceName.Equals(oldPref.Key)
+                                                                              End Function)
+                        My.Settings.Item(pairLookupRes.NewSettingsName) = oldPref.Value
+                        ReportProgress(percentComplete, "Imported " & oldPref.Key & " into " & pairLookupRes.NewSettingsName,
+                            LogLvl.LOG_NOTICE, Me)
+
+                        ' Remove found entry since we no longer need it.
+                        oldPrefs.PrefSettingsLookup.Remove(pairLookupRes)
+                        progress += 1
+                    Catch ex As Exception
+                        ReportProgress(percentComplete, String.Format("Error importing {0}:{2}{1}",
+                        oldPref.Key, vbNewLine, ex.ToString()), LogLvl.LOG_ERROR, Me)
+                    End Try
+                Next
+            Next
+
+
+            Dim failedSettingsPairs = oldPrefs.PrefSettingsLookup
+
+            If failedSettingsPairs.Count > 0 Then
+                Dim unmatchedPairsList = String.Empty
+                For Each failedPair In failedSettingsPairs
+                    unmatchedPairsList &= String.Format("[{0}, {1}]", failedPair.OldPreferenceName, failedPair.NewSettingsName)
+                Next
+
+                ReportProgress(95, String.Format("{0} unmatched settings pairs: {1}", failedSettingsPairs.Count,
+                        unmatchedPairsList), LogLvl.LOG_ERROR, Me,
+                        String.Format(My.Resources.UpgradePrefsDialog_UnmatchedPairs, failedSettingsPairs.Count))
+            End If
+
+            ReportProgress(100, "Import procedure complete.", LogLvl.LOG_NOTICE, Me,
+                               My.Resources.UpgradePrefsDialog_ImportProcedureCompleted)
+        End Sub
+
+        ''' <summary>
+        ''' Performs synchronous work to backup Registry data. Throws exceptions if any error occurs.
+        ''' </summary>
+        Private Sub DoBackupWork()
+            ReportProgress(0, "Beginning backup procedure.", LogLvl.LOG_NOTICE, Me)
+
+            Dim saveFileDialog = New SaveFileDialog() With {
+                .DefaultExt = "reg",
+                .FileName = "WinNUT-Prefs-Export",
+                .InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Desktop),
+                .Title = My.Resources.UpgradePrefsDialog_BackupLocationTitle
+            }
+            Dim dialogRes = saveFileDialog.ShowDialog()
+
+            If dialogRes = DialogResult.Cancel Then
+                Throw New InvalidOperationException("User opted to cancel the backup file dialog.")
+            End If
+
+            Dim fileLoc = Path.GetDirectoryName(saveFileDialog.FileName) & "\\" & saveFileDialog.FileName
+            ReportProgress(50, "Beginning reg export process to " & fileLoc, LogLvl.LOG_NOTICE, Me)
+            OldParams.WinNUT_Params.ExportParams(fileLoc)
+            ReportProgress(100, "reg export process exited. Backup complete.", LogLvl.LOG_NOTICE, Me,
+                String.Format(My.Resources.UpgradePrefsDialog_BackupProcedureCompleted, fileLoc))
+        End Sub
+
+        Private Sub DoDeleteWork()
+            ReportProgress(0, "Starting delete procedure.", LogLvl.LOG_NOTICE, Me)
+            OldParams.WinNUT_Params.DeleteParams()
+            ReportProgress(100, "Delete procedure completed successfully.", LogLvl.LOG_NOTICE, Me,
+                    My.Resources.UpgradePrefsDialog_DeleteProcedureComplete)
+        End Sub
+
+#End Region
+
+        Protected Class UpgradeWorkerProgressReport
+            Public Property LogOutput As String
+            Public Property LogLevel As LogLvl
+            Public Property Sender As Object
+            Public Property LogResourceString As String
+
+            Public Sub New(logOutput As String, logLevel As LogLvl, sender As Object, Optional logRes As String = Nothing)
+                Me.LogOutput = logOutput
+                Me.LogLevel = logLevel
+                Me.Sender = sender
+                Me.LogResourceString = logRes
+            End Sub
+        End Class
+
+    End Class
+
+End Namespace