From 3e5aeabead786d79c1c8b7fc48e26130bd17a0f0 Mon Sep 17 00:00:00 2001 From: OlgunR Date: Tue, 7 Apr 2026 15:07:54 +0200 Subject: [PATCH] Remove LicenseManager form UI & Load PanelMain without License --- ToolCollection/frmStart.Designer.vb | 82 +++++++++++++++-------------- ToolCollection/frmStart.resx | 2 +- ToolCollection/frmStart.vb | 82 ++--------------------------- 3 files changed, 47 insertions(+), 119 deletions(-) diff --git a/ToolCollection/frmStart.Designer.vb b/ToolCollection/frmStart.Designer.vb index bbbd7fb..24dbbdc 100644 --- a/ToolCollection/frmStart.Designer.vb +++ b/ToolCollection/frmStart.Designer.vb @@ -37,14 +37,13 @@ Partial Class frmStart Me.ZeigeLogFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ÖffneLogverzeichnisToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ModuleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.LizenzverwaltungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PasswortverwaltungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GrundeinstellungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.CriticalEmailTestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.HilfeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ÜberToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components) - Me.Panel1 = New System.Windows.Forms.Panel() + Me.PanelMain = New System.Windows.Forms.Panel() Me.btnNachbearbeitungAD = New System.Windows.Forms.Button() Me.grbxMoRe = New System.Windows.Forms.GroupBox() Me.btnOpen_MoReProfile = New System.Windows.Forms.Button() @@ -64,14 +63,16 @@ Partial Class frmStart Me.TimerNIRestart = New System.Windows.Forms.Timer(Me.components) Me.TimerErrorLog = New System.Windows.Forms.Timer(Me.components) Me.TimerDeleteLogfiles = New System.Windows.Forms.Timer(Me.components) + Me.groupboxNachbearbeitungAD = New System.Windows.Forms.GroupBox() Me.StatusStrip1.SuspendLayout() Me.menHauptmenü.SuspendLayout() - Me.Panel1.SuspendLayout() + Me.PanelMain.SuspendLayout() Me.grbxMoRe.SuspendLayout() Me.GroupBoxIntegration.SuspendLayout() Me.GBNachindexierung.SuspendLayout() Me.grbDI.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() + Me.groupboxNachbearbeitungAD.SuspendLayout() Me.SuspendLayout() ' 'StatusStrip1 @@ -183,34 +184,27 @@ Partial Class frmStart ' 'ModuleToolStripMenuItem ' - Me.ModuleToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LizenzverwaltungToolStripMenuItem, Me.PasswortverwaltungToolStripMenuItem, Me.GrundeinstellungenToolStripMenuItem, Me.CriticalEmailTestToolStripMenuItem}) + Me.ModuleToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PasswortverwaltungToolStripMenuItem, Me.GrundeinstellungenToolStripMenuItem, Me.CriticalEmailTestToolStripMenuItem}) Me.ModuleToolStripMenuItem.Name = "ModuleToolStripMenuItem" Me.ModuleToolStripMenuItem.Size = New System.Drawing.Size(75, 20) Me.ModuleToolStripMenuItem.Text = "Bearbeiten" ' - 'LizenzverwaltungToolStripMenuItem - ' - Me.LizenzverwaltungToolStripMenuItem.Name = "LizenzverwaltungToolStripMenuItem" - Me.LizenzverwaltungToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F10 - Me.LizenzverwaltungToolStripMenuItem.Size = New System.Drawing.Size(190, 22) - Me.LizenzverwaltungToolStripMenuItem.Text = "Lizenzverwaltung" - ' 'PasswortverwaltungToolStripMenuItem ' Me.PasswortverwaltungToolStripMenuItem.Name = "PasswortverwaltungToolStripMenuItem" - Me.PasswortverwaltungToolStripMenuItem.Size = New System.Drawing.Size(190, 22) + Me.PasswortverwaltungToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.PasswortverwaltungToolStripMenuItem.Text = "Passwortverwaltung" ' 'GrundeinstellungenToolStripMenuItem ' Me.GrundeinstellungenToolStripMenuItem.Name = "GrundeinstellungenToolStripMenuItem" - Me.GrundeinstellungenToolStripMenuItem.Size = New System.Drawing.Size(190, 22) + Me.GrundeinstellungenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.GrundeinstellungenToolStripMenuItem.Text = "Grundeinstellungen" ' 'CriticalEmailTestToolStripMenuItem ' Me.CriticalEmailTestToolStripMenuItem.Name = "CriticalEmailTestToolStripMenuItem" - Me.CriticalEmailTestToolStripMenuItem.Size = New System.Drawing.Size(190, 22) + Me.CriticalEmailTestToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.CriticalEmailTestToolStripMenuItem.Text = "Critical Email - Test" ' 'HilfeToolStripMenuItem @@ -243,51 +237,50 @@ Partial Class frmStart Me.ImageList1.Images.SetKeyName(7, "ico6700.ico") Me.ImageList1.Images.SetKeyName(8, "ico7215.ico") ' - 'Panel1 + 'PanelMain ' - Me.Panel1.Controls.Add(Me.btnNachbearbeitungAD) - Me.Panel1.Controls.Add(Me.grbxMoRe) - Me.Panel1.Controls.Add(Me.GroupBoxIntegration) - Me.Panel1.Controls.Add(Me.GBNachindexierung) - Me.Panel1.Controls.Add(Me.grbDI) - Me.Panel1.Dock = System.Windows.Forms.DockStyle.Left - Me.Panel1.Location = New System.Drawing.Point(0, 24) - Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(163, 589) - Me.Panel1.TabIndex = 10 + Me.PanelMain.Controls.Add(Me.groupboxNachbearbeitungAD) + Me.PanelMain.Controls.Add(Me.grbxMoRe) + Me.PanelMain.Controls.Add(Me.GroupBoxIntegration) + Me.PanelMain.Controls.Add(Me.GBNachindexierung) + Me.PanelMain.Controls.Add(Me.grbDI) + Me.PanelMain.Dock = System.Windows.Forms.DockStyle.Left + Me.PanelMain.Location = New System.Drawing.Point(0, 24) + Me.PanelMain.Name = "PanelMain" + Me.PanelMain.Size = New System.Drawing.Size(163, 589) + Me.PanelMain.TabIndex = 10 ' 'btnNachbearbeitungAD ' Me.btnNachbearbeitungAD.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnNachbearbeitungAD.Image = Global.ToolCollection.My.Resources.Resources.Untitled__142_ Me.btnNachbearbeitungAD.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnNachbearbeitungAD.Location = New System.Drawing.Point(6, 470) + Me.btnNachbearbeitungAD.Location = New System.Drawing.Point(6, 21) Me.btnNachbearbeitungAD.Name = "btnNachbearbeitungAD" - Me.btnNachbearbeitungAD.Size = New System.Drawing.Size(152, 42) + Me.btnNachbearbeitungAD.Size = New System.Drawing.Size(153, 42) Me.btnNachbearbeitungAD.TabIndex = 4 - Me.btnNachbearbeitungAD.Text = "ActiveDirectory" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Nachbearbeitung" + Me.btnNachbearbeitungAD.Text = "ActiveDirectory" Me.btnNachbearbeitungAD.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnNachbearbeitungAD.UseVisualStyleBackColor = True - Me.btnNachbearbeitungAD.Visible = False ' 'grbxMoRe ' Me.grbxMoRe.Controls.Add(Me.btnOpen_MoReProfile) Me.grbxMoRe.Dock = System.Windows.Forms.DockStyle.Top + Me.grbxMoRe.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.grbxMoRe.Location = New System.Drawing.Point(0, 394) Me.grbxMoRe.Name = "grbxMoRe" Me.grbxMoRe.Size = New System.Drawing.Size(163, 70) Me.grbxMoRe.TabIndex = 4 Me.grbxMoRe.TabStop = False Me.grbxMoRe.Text = "Move and Rename" - Me.grbxMoRe.Visible = False ' 'btnOpen_MoReProfile ' Me.btnOpen_MoReProfile.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnOpen_MoReProfile.Image = Global.ToolCollection.My.Resources.Resources.Untitled__49_ Me.btnOpen_MoReProfile.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnOpen_MoReProfile.Location = New System.Drawing.Point(3, 21) + Me.btnOpen_MoReProfile.Location = New System.Drawing.Point(6, 21) Me.btnOpen_MoReProfile.Name = "btnOpen_MoReProfile" Me.btnOpen_MoReProfile.Size = New System.Drawing.Size(153, 41) Me.btnOpen_MoReProfile.TabIndex = 4 @@ -299,20 +292,20 @@ Partial Class frmStart ' Me.GroupBoxIntegration.Controls.Add(Me.Button3) Me.GroupBoxIntegration.Dock = System.Windows.Forms.DockStyle.Top + Me.GroupBoxIntegration.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.GroupBoxIntegration.Location = New System.Drawing.Point(0, 325) Me.GroupBoxIntegration.Name = "GroupBoxIntegration" Me.GroupBoxIntegration.Size = New System.Drawing.Size(163, 69) Me.GroupBoxIntegration.TabIndex = 3 Me.GroupBoxIntegration.TabStop = False Me.GroupBoxIntegration.Text = "DD Integration" - Me.GroupBoxIntegration.Visible = False ' 'Button3 ' Me.Button3.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button3.Image = Global.ToolCollection.My.Resources.Resources.Untitled__640_ Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button3.Location = New System.Drawing.Point(4, 21) + Me.Button3.Location = New System.Drawing.Point(6, 21) Me.Button3.Name = "Button3" Me.Button3.Size = New System.Drawing.Size(153, 41) Me.Button3.TabIndex = 2 @@ -333,7 +326,6 @@ Partial Class frmStart Me.GBNachindexierung.TabIndex = 1 Me.GBNachindexierung.TabStop = False Me.GBNachindexierung.Text = "Nachindexierung" - Me.GBNachindexierung.Visible = False ' 'Button1 ' @@ -387,7 +379,6 @@ Partial Class frmStart Me.grbDI.TabIndex = 0 Me.grbDI.TabStop = False Me.grbDI.Text = "Dateiimporter" - Me.grbDI.Visible = False ' 'btnRegelverwaltung ' @@ -459,13 +450,25 @@ Partial Class frmStart ' Me.TimerDeleteLogfiles.Interval = 1000 ' + 'groupboxNachbearbeitungAD + ' + Me.groupboxNachbearbeitungAD.Controls.Add(Me.btnNachbearbeitungAD) + Me.groupboxNachbearbeitungAD.Dock = System.Windows.Forms.DockStyle.Top + Me.groupboxNachbearbeitungAD.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.groupboxNachbearbeitungAD.Location = New System.Drawing.Point(0, 464) + Me.groupboxNachbearbeitungAD.Name = "groupboxNachbearbeitungAD" + Me.groupboxNachbearbeitungAD.Size = New System.Drawing.Size(163, 72) + Me.groupboxNachbearbeitungAD.TabIndex = 5 + Me.groupboxNachbearbeitungAD.TabStop = False + Me.groupboxNachbearbeitungAD.Text = "Nachbearbeitung" + ' 'frmStart ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1237, 638) Me.ContextMenuStrip = Me.ContextMenuStrip1 - Me.Controls.Add(Me.Panel1) + Me.Controls.Add(Me.PanelMain) Me.Controls.Add(Me.menHauptmenü) Me.Controls.Add(Me.StatusStrip1) Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -476,12 +479,13 @@ Partial Class frmStart Me.StatusStrip1.PerformLayout() Me.menHauptmenü.ResumeLayout(False) Me.menHauptmenü.PerformLayout() - Me.Panel1.ResumeLayout(False) + Me.PanelMain.ResumeLayout(False) Me.grbxMoRe.ResumeLayout(False) Me.GroupBoxIntegration.ResumeLayout(False) Me.GBNachindexierung.ResumeLayout(False) Me.grbDI.ResumeLayout(False) Me.ContextMenuStrip1.ResumeLayout(False) + Me.groupboxNachbearbeitungAD.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -493,11 +497,10 @@ Partial Class frmStart Friend WithEvents DateiToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents BeendenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ModuleToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents LizenzverwaltungToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents HilfeToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ÜberToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ImageList1 As System.Windows.Forms.ImageList - Friend WithEvents Panel1 As System.Windows.Forms.Panel + Friend WithEvents PanelMain As System.Windows.Forms.Panel Friend WithEvents grbDI As System.Windows.Forms.GroupBox Friend WithEvents btnDIMain As System.Windows.Forms.Button Friend WithEvents btnDIProfile As System.Windows.Forms.Button @@ -526,4 +529,5 @@ Partial Class frmStart Friend WithEvents TimerDeleteLogfiles As Timer Friend WithEvents ToolStripStatusLabel_LogDeleteTime As ToolStripStatusLabel Friend WithEvents ToolStripStatusLabel_ConnectionString As ToolStripStatusLabel + Friend WithEvents groupboxNachbearbeitungAD As GroupBox End Class diff --git a/ToolCollection/frmStart.resx b/ToolCollection/frmStart.resx index 0b2336c..c72ad91 100644 --- a/ToolCollection/frmStart.resx +++ b/ToolCollection/frmStart.resx @@ -159,7 +159,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAO - FAAAAk1TRnQBSQFMAgEBCQEAAYABAwGAAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + FAAAAk1TRnQBSQFMAgEBCQEAAYgBAwGIAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/ToolCollection/frmStart.vb b/ToolCollection/frmStart.vb index 9f0beb0..b1dba14 100644 --- a/ToolCollection/frmStart.vb +++ b/ToolCollection/frmStart.vb @@ -306,7 +306,7 @@ Public Class frmStart Cursor = Cursors.Default End Sub - Private Sub LizenzverwaltungToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles LizenzverwaltungToolStripMenuItem.Click + Private Sub LizenzverwaltungToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) ' Öffnet den Lizenz-Manager frmLizenzmanager.ShowDialog() End Sub @@ -321,85 +321,9 @@ Public Class frmStart Public Sub LoadAllModules() Me._validModules = Nothing - If Not My.Settings.licensekey = "" Then - If My.Settings.licensekey = "DD MaxLicense" Or My.Settings.licensekey.ToUpper = "DDALLIN" Or My.Settings.licensekey.ToUpper = "DD_ALL_IN" Or My.Settings.licensekey.ToUpper = "DD_ALLIN" Then - Me.grbDI.Visible = True - Me.GBNachindexierung.Visible = True - Me.GroupBoxIntegration.Visible = True + LICENSE_AD = True + LICENSE_MoveRename = True - btnNachbearbeitungAD.Visible = True - LICENSE_AD = True - LICENSE_MoveRename = True - Else - 'Me.licenseManager = New ClassLicenseManager = Nothing - Me.licenseManager = New ClassLicenseManager("#DigitalData9731258!#", My.Settings.licensekey) - - Me.licenseManager.licenseString = Me.licenseManager.DecodeLicenseKey(My.Settings.licensekey) - - Me.licenseManager.licenseStringArray = Me.licenseManager.SplitLicenseString(Me.licenseManager.licenseString) - Me.licenseManager.LoadLicenses() - - If Me.licenseManager.Licenses.machine.ToLower <> "all" Then - If Me.licenseManager.Licenses.machine.ToLower <> My.Computer.Name.ToLower Then - MsgBox("Ihre Lizenz gilt nicht für diese Maschine. " & vbNewLine & "Gelesener Computer Name: '" & My.Computer.Name & "'" & vbNewLine & "License Computer Name: '" & Me.licenseManager.Licenses.machine & "'" & vbNewLine & - "Bitte setzen Sie sich mit Digital Data in Verbindung.", MsgBoxStyle.Exclamation, "Lizenz ungültig:") - Me.grbDI.Visible = False - Me.GBNachindexierung.Visible = False - Me.GroupBoxIntegration.Visible = False - - Exit Sub - End If - End If - - Dim i As Integer = 0 - - If Me.licenseManager.Licenses.Licenses IsNot Nothing Then - For Each license As ClassLicense In Me.licenseManager.Licenses.Licenses() - Dim expires As String = license.Expires.Date - If IsExpired(license.Expires.Date) = False Then - ' MsgBox(license.Modulename & vbNewLine & expires) - Select Case license.Modulename - Case "Dateiimport" - Me.grbDI.Visible = True - Case "Nachindexierung" - Me.GBNachindexierung.Visible = True - Case "MerkatorIntegration" - Me.GroupBoxIntegration.Visible = True - Case "MoveandRename" - 'Me.grbxMoRe.Visible = True - LICENSE_MoveRename = True - Case "NachbearbeitungAD" - btnNachbearbeitungAD.Visible = True - LICENSE_AD = True - End Select - i += 1 - Else - MsgBox("Ihre Lizenz für das Modul '" & license.Modulename & "' ist am ' " & license.Expires.Date.ToShortDateString & "' abgelaufen" & vbNewLine & "Bitte setzen Sie sich mit Digital Data in Verbindung.", MsgBoxStyle.Exclamation, "Lizenz abgelaufen:") - Select Case license.Modulename - Case "Dateiimport" - Me.grbDI.Visible = False - Case "Nachindexierung" - Me.GBNachindexierung.Visible = False - Case "MerkatorIntegration" - Me.GroupBoxIntegration.Visible = False - Case "MoveandRename" - Me.GroupBoxIntegration.Visible = False - LICENSE_MoveRename = False - Case "NachbearbeitungAD" - btnNachbearbeitungAD.Visible = False - LICENSE_AD = False - End Select - i += 1 - End If - 'Date.TryParse(expires, license.Expires) - - Next - End If - End If - - - - End If End Sub Private Function IsExpired(ByVal _Date As Date) If Date.Today > _Date Then