LicenceManager 2.1c1 :

- modifiche per AboutBox
- tolte costanti inutili
- semplificato Ini file
- modificata generazione licenza.

MainWindow/MainWindowVM.vb

@@ -157,25 +157,25 @@ Public Class MainWindowVM
         End Set
     End Property
 
-    Private m_MainMenuV As New MainMenuV
-    Private m_NewClientPageV As New NewClientPageV
-    Private m_NewKeyPageV As New NewKeyPageV
-    Private m_NewLicencePageV As New NewLicencePageV
-    Private m_NewProductPageV As New NewProductPageV
-    Private m_NewVersionPageV As New NewVersionPageV
-    Private m_NewResellerPageV As New NewResellerPageV
-    Private m_SearchClientPageV As New SearchClientPageV
-    Private m_SearchKeyPageV As New SearchKeyPageV
-    Private m_SearchLicencePageV As New SearchLicencePageV
-    Private m_SearchProductPageV As New SearchProductPageV
-    Private m_SearchVersionPageV As New SearchVersionPageV
-    Private m_SearchResellerPageV As New SearchResellerPageV
-    Private m_UpdateClientPageV As New UpdateClientPageV
-    Private m_UpdateKeyPageV As New UpdateKeyPageV
-    Private m_UpdateLicencePageV As New UpdateLicencePageV
-    Private m_UpdateProductPageV As New UpdateProductPageV
-    Private m_UpdateVersionPageV As New UpdateVersionPageV
-    Private m_UpdateResellerPageV As New UpdateResellerPageV
+    Private m_MainMenuV As MainMenuV
+    Private m_NewClientPageV As NewClientPageV
+    Private m_NewKeyPageV As NewKeyPageV
+    Private m_NewLicencePageV As NewLicencePageV
+    Private m_NewProductPageV As NewProductPageV
+    Private m_NewVersionPageV As NewVersionPageV
+    Private m_NewResellerPageV As NewResellerPageV
+    Private m_SearchClientPageV As SearchClientPageV
+    Private m_SearchKeyPageV As SearchKeyPageV
+    Private m_SearchLicencePageV As SearchLicencePageV
+    Private m_SearchProductPageV As SearchProductPageV
+    Private m_SearchVersionPageV As SearchVersionPageV
+    Private m_SearchResellerPageV As SearchResellerPageV
+    Private m_UpdateClientPageV As UpdateClientPageV
+    Private m_UpdateKeyPageV As UpdateKeyPageV
+    Private m_UpdateLicencePageV As UpdateLicencePageV
+    Private m_UpdateProductPageV As UpdateProductPageV
+    Private m_UpdateVersionPageV As UpdateVersionPageV
+    Private m_UpdateResellerPageV As UpdateResellerPageV
 
     Public ReadOnly Property ProjectContent As FrameworkElement
         Get
@@ -224,6 +224,9 @@ Public Class MainWindowVM
         End Get
     End Property
 
+   ' definizione comandi
+   Private m_cmdAboutBox As ICommand
+
 #End Region    ' FIELDS & PROPERTIES
 
 #Region "CONSTRUCTOR"
@@ -233,6 +236,26 @@ Public Class MainWindowVM
       Map.BeginInit(Me)
       ' Costruisco model della MainWindow
       m_MainWindowM = New MainWindowM
+      ' Creo tutti gli oggetti
+      m_MainMenuV = New MainMenuV
+      m_NewClientPageV = New NewClientPageV
+      m_NewKeyPageV = New NewKeyPageV
+      m_NewLicencePageV = New NewLicencePageV
+      m_NewProductPageV = New NewProductPageV
+      m_NewVersionPageV = New NewVersionPageV
+      m_NewResellerPageV = New NewResellerPageV
+      m_SearchClientPageV = New SearchClientPageV
+      m_SearchKeyPageV = New SearchKeyPageV
+      m_SearchLicencePageV = New SearchLicencePageV
+      m_SearchProductPageV = New SearchProductPageV
+      m_SearchVersionPageV = New SearchVersionPageV
+      m_SearchResellerPageV = New SearchResellerPageV
+      m_UpdateClientPageV = New UpdateClientPageV
+      m_UpdateKeyPageV = New UpdateKeyPageV
+      m_UpdateLicencePageV = New UpdateLicencePageV
+      m_UpdateProductPageV = New UpdateProductPageV
+      m_UpdateVersionPageV = New UpdateVersionPageV
+      m_UpdateResellerPageV = New UpdateResellerPageV
       ' Setto il titolo dell'applicazione
       SetTitle(My.Application.Info.Title.ToString() & " ver. " &
                               My.Application.Info.Version.Major.ToString() &
@@ -267,26 +290,26 @@ Public Class MainWindowVM
 
 #Region "COMMANDS"
 
-   '#Region "AboutBoxCommand"
+#Region "AboutBoxCommand"
 
-   '   ' Returns a command that manage the MainWindow_Unloaded command
-   '   Public ReadOnly Property AboutBoxCommand() As ICommand
-   '      Get
-   '         If m_cmdAboutBox Is Nothing Then
-   '            m_cmdAboutBox = New Command(AddressOf AboutBox)
-   '         End If
-   '         Return m_cmdAboutBox
-   '      End Get
-   '   End Property
+   ' Returns a command that manage the MainWindow_Unloaded command
+   Public ReadOnly Property AboutBoxCommand() As ICommand
+      Get
+         If m_cmdAboutBox Is Nothing Then
+            m_cmdAboutBox = New Command(AddressOf AboutBox)
+         End If
+         Return m_cmdAboutBox
+      End Get
+   End Property
 
-   '   ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
-   '   Public Sub AboutBox(ByVal param As Object)
-   '      Dim AboutBoxWindow As New AboutBoxV
-   '      AboutBoxWindow.Owner = Application.Current.MainWindow
-   '      AboutBoxWindow.ShowDialog()
-   '   End Sub
+   ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
+   Public Sub AboutBox(ByVal param As Object)
+      Dim AboutBoxWindow As New AboutBoxV
+      AboutBoxWindow.Owner = Application.Current.MainWindow
+      AboutBoxWindow.ShowDialog()
+   End Sub
 
-   '#End Region ' AboutBoxCommand
+#End Region ' AboutBoxCommand
 
 #End Region    ' COMMANDS