jj

EDMI_ClientSuite/frmMain.vb

@@ -15,6 +15,9 @@ Public Class frmMain
         ' Dieser Aufruf ist für den Designer erforderlich.
         InitializeComponent()
 
+        ' Assign My.MainForm before everything else
+        My.MainForm = Me
+
         ' Show splashscreen
         frmSplash.ShowDialog()
     End Sub
@@ -39,8 +42,8 @@ Public Class frmMain
 
         oDataTable.Rows.Add(oRow)
 
-        ProcessManagerOverview.DataSource = oDataTable
-        AddHandler ProcessManagerOverview.RowDoubleClicked, Sub(RowView As DataRowView)
+        ProcessManagerWidget.DataSource = oDataTable
+        AddHandler ProcessManagerWidget.RowDoubleClicked, Sub(RowView As DataRowView)
                                                                 MsgBox($"Clicked on Document {RowView.Row.Item("DocName")}")
                                                             End Sub
 
@@ -90,7 +93,7 @@ Public Class frmMain
     End Sub
 
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
-        Dim frm As New frmFileTest(My.LogConfig)
+        Dim frm As New frmFileTest()
         frm.MdiParent = DocumentManager.MdiParent
         frm.Show()
     End Sub
@@ -99,6 +102,7 @@ Public Class frmMain
         Dim frm As New frmEntityDesigner()
         frm.MdiParent = DocumentManager.MdiParent
         frm.Show()
+
         RibbonPageCategoryEntityDesigner.Visible = True
     End Sub
 
@@ -109,30 +113,17 @@ Public Class frmMain
     End Sub
 
     Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
-        Dim oUser1 = New LicenseModuleUser With {
-            .Type = UserType.PowerUser,
-            .Test = False,
-            .Count = 5,
-            .ValidUntil = New Date(),
-            .ValidUntilSpecified = True
-        }
-
+        Dim oUser1 = LicenseCreator.NewUser(UserType.PowerUser, 5)
+        Dim oUser2 = LicenseCreator.NewUser(UserType.WriteOnly, 5, Date.Now)
         Dim oUsers As New List(Of LicenseModuleUser)
         oUsers.Add(oUser1)
+        oUsers.Add(oUser2)
 
-        Dim oModule = New LicenseModule() With {
-            .Users = oUsers.ToArray(),
-            .Name = "EDMI",
-            .ValidUntil = New Date(),
-            .ValidUntilSpecified = True
-        }
-
+        Dim oModule = LicenseCreator.NewModule("EDMI", oUsers)
         Dim oModules As New List(Of LicenseModule)
         oModules.Add(oModule)
 
-        Dim oLicense = New LicenseSchema() With {
-            .Modules = oModules.ToArray
-        }
+        Dim oLicense = LicenseCreator.NewLicense(oModules)
 
         Dim oLicenseFile As New LicenseFile(My.LogConfig, "E:\")
         oLicenseFile.SaveFile(oLicense)