From 1cd5533deed1151cd9d89b6a6b68236baf3c7dec Mon Sep 17 00:00:00 2001 From: OlgunR Date: Tue, 21 Oct 2025 11:46:33 +0200 Subject: [PATCH] Instanzname vergeben und anzeigen - frmGrundeinstellungen, frmStart --- .../My Project/Settings.Designer.vb | 12 ++ ToolCollection/My Project/Settings.settings | 3 + ToolCollection/app.config | 3 + .../frmGrundeinstellungen.Designer.vb | 184 +++++++++++------- ToolCollection/frmGrundeinstellungen.vb | 12 +- ToolCollection/frmStart.vb | 7 +- 6 files changed, 146 insertions(+), 75 deletions(-) diff --git a/ToolCollection/My Project/Settings.Designer.vb b/ToolCollection/My Project/Settings.Designer.vb index e1a7777..21e5005 100644 --- a/ToolCollection/My Project/Settings.Designer.vb +++ b/ToolCollection/My Project/Settings.Designer.vb @@ -745,6 +745,18 @@ Namespace My Me("vNIStatusFinished") = value End Set End Property + + _ + Public Property vInstanceName() As String + Get + Return CType(Me("vInstanceName"),String) + End Get + Set + Me("vInstanceName") = value + End Set + End Property End Class End Namespace diff --git a/ToolCollection/My Project/Settings.settings b/ToolCollection/My Project/Settings.settings index e0a5519..9399d37 100644 --- a/ToolCollection/My Project/Settings.settings +++ b/ToolCollection/My Project/Settings.settings @@ -184,5 +184,8 @@ False + + + \ No newline at end of file diff --git a/ToolCollection/app.config b/ToolCollection/app.config index 8ac8d9d..31cb7d1 100644 --- a/ToolCollection/app.config +++ b/ToolCollection/app.config @@ -162,6 +162,9 @@ False + + + diff --git a/ToolCollection/frmGrundeinstellungen.Designer.vb b/ToolCollection/frmGrundeinstellungen.Designer.vb index f2928fd..a99c9e9 100644 --- a/ToolCollection/frmGrundeinstellungen.Designer.vb +++ b/ToolCollection/frmGrundeinstellungen.Designer.vb @@ -32,29 +32,33 @@ Partial Class frmGrundeinstellungen Me.lblTimeDeleteLogs = New System.Windows.Forms.Label() Me.txtTimeDeleteLogs = New System.Windows.Forms.TextBox() Me.chkAutoDeleteLogs = New System.Windows.Forms.CheckBox() - Me.TextBox4 = New System.Windows.Forms.TextBox() Me.Label6 = New System.Windows.Forms.Label() - Me.TextBox1 = New System.Windows.Forms.TextBox() - Me.TextBox2 = New System.Windows.Forms.TextBox() Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.Label4 = New System.Windows.Forms.Label() Me.cmbCores = New System.Windows.Forms.ComboBox() Me.GroupBox3 = New System.Windows.Forms.GroupBox() - Me.txterrorIndex = New System.Windows.Forms.TextBox() Me.Label5 = New System.Windows.Forms.Label() Me.GroupBox4 = New System.Windows.Forms.GroupBox() - Me.TextBox3 = New System.Windows.Forms.TextBox() Me.GroupBox5 = New System.Windows.Forms.GroupBox() - Me.cmbSleeptill = New System.Windows.Forms.ComboBox() Me.Label9 = New System.Windows.Forms.Label() - Me.cmbSleepFrom = New System.Windows.Forms.ComboBox() Me.Label8 = New System.Windows.Forms.Label() Me.Label7 = New System.Windows.Forms.Label() + Me.GroupBox6 = New System.Windows.Forms.GroupBox() + Me.txtInstanceName = New System.Windows.Forms.TextBox() + Me.Label10 = New System.Windows.Forms.Label() + Me.cmbSleeptill = New System.Windows.Forms.ComboBox() + Me.cmbSleepFrom = New System.Windows.Forms.ComboBox() + Me.TextBox3 = New System.Windows.Forms.TextBox() + Me.txterrorIndex = New System.Windows.Forms.TextBox() + Me.TextBox4 = New System.Windows.Forms.TextBox() + Me.TextBox1 = New System.Windows.Forms.TextBox() + Me.TextBox2 = New System.Windows.Forms.TextBox() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() Me.GroupBox3.SuspendLayout() Me.GroupBox4.SuspendLayout() Me.GroupBox5.SuspendLayout() + Me.GroupBox6.SuspendLayout() Me.SuspendLayout() ' 'Label1 @@ -150,42 +154,15 @@ Partial Class frmGrundeinstellungen Me.chkAutoDeleteLogs.Text = "Automatisches Löschen" Me.chkAutoDeleteLogs.UseVisualStyleBackColor = True ' - 'TextBox4 - ' - Me.TextBox4.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ToolCollection.My.MySettings.Default, "logolder_then", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.TextBox4.Location = New System.Drawing.Point(232, 79) - Me.TextBox4.Name = "TextBox4" - Me.TextBox4.Size = New System.Drawing.Size(84, 22) - Me.TextBox4.TabIndex = 7 - Me.TextBox4.Text = Global.ToolCollection.My.MySettings.Default.logolder_then - ' 'Label6 ' Me.Label6.AutoSize = True Me.Label6.Location = New System.Drawing.Point(229, 63) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(199, 13) + Me.Label6.Size = New System.Drawing.Size(198, 13) Me.Label6.TabIndex = 6 Me.Label6.Text = "LogDateien löschen - ""Älter als""-Tage:" ' - 'TextBox1 - ' - Me.TextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ToolCollection.My.MySettings.Default, "vLogNI", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.TextBox1.Location = New System.Drawing.Point(9, 34) - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(188, 22) - Me.TextBox1.TabIndex = 1 - Me.TextBox1.Text = Global.ToolCollection.My.MySettings.Default.vLogNI - ' - 'TextBox2 - ' - Me.TextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ToolCollection.My.MySettings.Default, "vLogDI", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.TextBox2.Location = New System.Drawing.Point(9, 79) - Me.TextBox2.Name = "TextBox2" - Me.TextBox2.Size = New System.Drawing.Size(188, 22) - Me.TextBox2.TabIndex = 3 - Me.TextBox2.Text = Global.ToolCollection.My.MySettings.Default.vLogDI - ' 'GroupBox2 ' Me.GroupBox2.Controls.Add(Me.Label4) @@ -228,15 +205,6 @@ Partial Class frmGrundeinstellungen Me.GroupBox3.TabStop = False Me.GroupBox3.Text = "Fehlerhandling:" ' - 'txterrorIndex - ' - Me.txterrorIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ToolCollection.My.MySettings.Default, "ERROR_INDEX", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.txterrorIndex.Location = New System.Drawing.Point(15, 34) - Me.txterrorIndex.Name = "txterrorIndex" - Me.txterrorIndex.Size = New System.Drawing.Size(182, 22) - Me.txterrorIndex.TabIndex = 2 - Me.txterrorIndex.Text = Global.ToolCollection.My.MySettings.Default.ERROR_INDEX - ' 'Label5 ' Me.Label5.AutoSize = True @@ -257,14 +225,6 @@ Partial Class frmGrundeinstellungen Me.GroupBox4.TabStop = False Me.GroupBox4.Text = "Verweise" ' - 'TextBox3 - ' - Me.TextBox3.Location = New System.Drawing.Point(9, 21) - Me.TextBox3.Name = "TextBox3" - Me.TextBox3.Size = New System.Drawing.Size(188, 22) - Me.TextBox3.TabIndex = 0 - Me.TextBox3.Text = Global.ToolCollection.My.MySettings.Default.DLL_WMOTOOL - ' 'GroupBox5 ' Me.GroupBox5.Controls.Add(Me.cmbSleeptill) @@ -280,16 +240,6 @@ Partial Class frmGrundeinstellungen Me.GroupBox5.TabStop = False Me.GroupBox5.Text = "ToolCollection Sleep-Modus:" ' - 'cmbSleeptill - ' - Me.cmbSleeptill.FormattingEnabled = True - Me.cmbSleeptill.Items.AddRange(New Object() {"01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24"}) - Me.cmbSleeptill.Location = New System.Drawing.Point(90, 69) - Me.cmbSleeptill.Name = "cmbSleeptill" - Me.cmbSleeptill.Size = New System.Drawing.Size(63, 21) - Me.cmbSleeptill.TabIndex = 4 - Me.cmbSleeptill.Text = Global.ToolCollection.My.MySettings.Default.Sleep_End - ' 'Label9 ' Me.Label9.AutoSize = True @@ -299,16 +249,6 @@ Partial Class frmGrundeinstellungen Me.Label9.TabIndex = 3 Me.Label9.Text = "Stunde bis" ' - 'cmbSleepFrom - ' - Me.cmbSleepFrom.FormattingEnabled = True - Me.cmbSleepFrom.Items.AddRange(New Object() {"01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24"}) - Me.cmbSleepFrom.Location = New System.Drawing.Point(9, 69) - Me.cmbSleepFrom.Name = "cmbSleepFrom" - Me.cmbSleepFrom.Size = New System.Drawing.Size(63, 21) - Me.cmbSleepFrom.TabIndex = 2 - Me.cmbSleepFrom.Text = Global.ToolCollection.My.MySettings.Default.Sleep_Begin - ' 'Label8 ' Me.Label8.AutoSize = True @@ -328,12 +268,105 @@ Partial Class frmGrundeinstellungen Me.Label7.TabIndex = 0 Me.Label7.Text = "Bestimmen Sie hier die Zeitspanne in welcher weder ein Import " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "noch eine Nachind" & "exierung erfolgen soll:" + ' + 'GroupBox6 + ' + Me.GroupBox6.Controls.Add(Me.Label10) + Me.GroupBox6.Controls.Add(Me.txtInstanceName) + Me.GroupBox6.Dock = System.Windows.Forms.DockStyle.Top + Me.GroupBox6.Location = New System.Drawing.Point(0, 494) + Me.GroupBox6.Name = "GroupBox6" + Me.GroupBox6.Size = New System.Drawing.Size(470, 74) + Me.GroupBox6.TabIndex = 11 + Me.GroupBox6.TabStop = False + Me.GroupBox6.Text = "Instanz-Einstellungen" + ' + 'txtInstanceName + ' + Me.txtInstanceName.Location = New System.Drawing.Point(15, 36) + Me.txtInstanceName.Name = "txtInstanceName" + Me.txtInstanceName.Size = New System.Drawing.Size(182, 22) + Me.txtInstanceName.TabIndex = 0 + ' + 'Label10 + ' + Me.Label10.AutoSize = True + Me.Label10.Location = New System.Drawing.Point(12, 20) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(97, 13) + Me.Label10.TabIndex = 1 + Me.Label10.Text = "Name für Instanz:" + ' + 'cmbSleeptill + ' + Me.cmbSleeptill.FormattingEnabled = True + Me.cmbSleeptill.Items.AddRange(New Object() {"01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24"}) + Me.cmbSleeptill.Location = New System.Drawing.Point(90, 69) + Me.cmbSleeptill.Name = "cmbSleeptill" + Me.cmbSleeptill.Size = New System.Drawing.Size(63, 21) + Me.cmbSleeptill.TabIndex = 4 + Me.cmbSleeptill.Text = Global.ToolCollection.My.MySettings.Default.Sleep_End + ' + 'cmbSleepFrom + ' + Me.cmbSleepFrom.FormattingEnabled = True + Me.cmbSleepFrom.Items.AddRange(New Object() {"01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24"}) + Me.cmbSleepFrom.Location = New System.Drawing.Point(9, 69) + Me.cmbSleepFrom.Name = "cmbSleepFrom" + Me.cmbSleepFrom.Size = New System.Drawing.Size(63, 21) + Me.cmbSleepFrom.TabIndex = 2 + Me.cmbSleepFrom.Text = Global.ToolCollection.My.MySettings.Default.Sleep_Begin + ' + 'TextBox3 + ' + Me.TextBox3.Location = New System.Drawing.Point(15, 21) + Me.TextBox3.Name = "TextBox3" + Me.TextBox3.Size = New System.Drawing.Size(182, 22) + Me.TextBox3.TabIndex = 0 + Me.TextBox3.Text = Global.ToolCollection.My.MySettings.Default.DLL_WMOTOOL + ' + 'txterrorIndex + ' + Me.txterrorIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ToolCollection.My.MySettings.Default, "ERROR_INDEX", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.txterrorIndex.Location = New System.Drawing.Point(15, 34) + Me.txterrorIndex.Name = "txterrorIndex" + Me.txterrorIndex.Size = New System.Drawing.Size(182, 22) + Me.txterrorIndex.TabIndex = 2 + Me.txterrorIndex.Text = Global.ToolCollection.My.MySettings.Default.ERROR_INDEX + ' + 'TextBox4 + ' + Me.TextBox4.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ToolCollection.My.MySettings.Default, "logolder_then", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.TextBox4.Location = New System.Drawing.Point(232, 79) + Me.TextBox4.Name = "TextBox4" + Me.TextBox4.Size = New System.Drawing.Size(84, 22) + Me.TextBox4.TabIndex = 7 + Me.TextBox4.Text = Global.ToolCollection.My.MySettings.Default.logolder_then + ' + 'TextBox1 + ' + Me.TextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ToolCollection.My.MySettings.Default, "vLogNI", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.TextBox1.Location = New System.Drawing.Point(9, 34) + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Size = New System.Drawing.Size(188, 22) + Me.TextBox1.TabIndex = 1 + Me.TextBox1.Text = Global.ToolCollection.My.MySettings.Default.vLogNI + ' + 'TextBox2 + ' + Me.TextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ToolCollection.My.MySettings.Default, "vLogDI", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.TextBox2.Location = New System.Drawing.Point(9, 79) + Me.TextBox2.Name = "TextBox2" + Me.TextBox2.Size = New System.Drawing.Size(188, 22) + Me.TextBox2.TabIndex = 3 + Me.TextBox2.Text = Global.ToolCollection.My.MySettings.Default.vLogDI ' 'frmGrundeinstellungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(470, 590) + Me.ClientSize = New System.Drawing.Size(470, 607) + Me.Controls.Add(Me.GroupBox6) Me.Controls.Add(Me.GroupBox5) Me.Controls.Add(Me.GroupBox4) Me.Controls.Add(Me.GroupBox3) @@ -353,6 +386,8 @@ Partial Class frmGrundeinstellungen Me.GroupBox4.PerformLayout() Me.GroupBox5.ResumeLayout(False) Me.GroupBox5.PerformLayout() + Me.GroupBox6.ResumeLayout(False) + Me.GroupBox6.PerformLayout() Me.ResumeLayout(False) End Sub @@ -383,4 +418,7 @@ Partial Class frmGrundeinstellungen Friend WithEvents lblTimeDeleteLogs As Label Friend WithEvents txtTimeDeleteLogs As TextBox Friend WithEvents lblLogDeleteTime As Label + Friend WithEvents GroupBox6 As GroupBox + Friend WithEvents Label10 As Label + Friend WithEvents txtInstanceName As TextBox End Class diff --git a/ToolCollection/frmGrundeinstellungen.vb b/ToolCollection/frmGrundeinstellungen.vb index 8079ba3..043431f 100644 --- a/ToolCollection/frmGrundeinstellungen.vb +++ b/ToolCollection/frmGrundeinstellungen.vb @@ -1,4 +1,6 @@ -Public Class frmGrundeinstellungen +Imports ToolCollection.My + +Public Class frmGrundeinstellungen Private Shared _Instance As frmGrundeinstellungen = Nothing Private _isLoading As Boolean = False @@ -98,6 +100,8 @@ Private Sub FrmGrundeinstellungen_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load _isLoading = True + txtInstanceName.Text = My.Settings.vInstanceName + Try If My.Settings.vAutoDeleteLogs Then chkAutoDeleteLogs.Checked = My.Settings.vAutoDeleteLogs @@ -138,4 +142,10 @@ frmStart.Instance().SetupTimerDeleteLogfiles() End If End Sub + + Private Sub txtInstanceName_TextChanged(sender As Object, e As EventArgs) Handles txtInstanceName.TextChanged + My.Settings.vInstanceName = txtInstanceName.Text + My.Settings.Save() + txtInstanceName.Text = My.Settings.vInstanceName + End Sub End Class \ No newline at end of file diff --git a/ToolCollection/frmStart.vb b/ToolCollection/frmStart.vb index cd378fc..8c0533c 100644 --- a/ToolCollection/frmStart.vb +++ b/ToolCollection/frmStart.vb @@ -129,6 +129,10 @@ Public Class frmStart End If End Sub + Private Sub CaptionForm() + Me.Text = Application.CompanyName & " - " & Application.ProductName & " - " & My.Settings.vInstanceName + End Sub + Private Sub FMStart_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load _Instance = Me @@ -157,7 +161,7 @@ Public Class frmStart 'Aktueller Benutzer Me.tslblVersion.Text = Environment.UserName.ToString - Me.Text = Application.CompanyName & "-" & Application.ProductName + CaptionForm() Me.tslblVersion.Text = "Version: " & My.Application.Info.Version.ToString 'Aktuelle Machine Me.Status_Machine.Text = My.Computer.Name @@ -490,6 +494,7 @@ Public Class frmStart Dim frm As New frmGrundeinstellungen frm = frmGrundeinstellungen.Instance frm.ShowDialog() + CaptionForm() Cursor = Cursors.Default End Sub