From 8e9e964c0223a2fa88ab03d567a00f47be5a754d Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Wed, 26 Nov 2025 09:06:37 +0100 Subject: [PATCH] merge beheben --- UID/usrctlProcedures.Designer.vb | 20 ++++++++++---------- UID/usrctlProcedures.vb | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/UID/usrctlProcedures.Designer.vb b/UID/usrctlProcedures.Designer.vb index 6c2b762..573265b 100644 --- a/UID/usrctlProcedures.Designer.vb +++ b/UID/usrctlProcedures.Designer.vb @@ -93,7 +93,7 @@ Partial Class usrctlProcedures Me.Button50 = New System.Windows.Forms.Button() Me.Button49 = New System.Windows.Forms.Button() Me.TabPage7 = New System.Windows.Forms.TabPage() - Me.Button53 = New System.Windows.Forms.Button() + Me.btnT1Data = New System.Windows.Forms.Button() Me.Label22 = New System.Windows.Forms.Label() Me.dtpbis = New System.Windows.Forms.DateTimePicker() Me.lblDakosyImport = New System.Windows.Forms.Label() @@ -164,7 +164,7 @@ Partial Class usrctlProcedures Me.Column2 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.Button54 = New System.Windows.Forms.Button() Me.Label23 = New System.Windows.Forms.Label() - Me.TabControl1.SuspendLayout() + 'Me.TabControl1.SuspendLayout() Me.TabPage3.SuspendLayout() Me.TabPage1.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -1502,7 +1502,7 @@ Partial Class usrctlProcedures ' 'TabPage9 ' - Me.TabPage9.Controls.Add(Me.Button53) + Me.TabPage9.Controls.Add(Me.btnT1Data) Me.TabPage9.Location = New System.Drawing.Point(4, 22) Me.TabPage9.Name = "TabPage9" Me.TabPage9.Padding = New System.Windows.Forms.Padding(3) @@ -1513,12 +1513,12 @@ Partial Class usrctlProcedures ' 'Button53 ' - Me.Button53.Location = New System.Drawing.Point(228, 120) - Me.Button53.Name = "Button53" - Me.Button53.Size = New System.Drawing.Size(145, 49) - Me.Button53.TabIndex = 25 - Me.Button53.Text = "T1 Servcie" - Me.Button53.UseVisualStyleBackColor = True + Me.btnT1Data.Location = New System.Drawing.Point(228, 120) + Me.btnT1Data.Name = "btnT1Data" + Me.btnT1Data.Size = New System.Drawing.Size(145, 49) + Me.btnT1Data.TabIndex = 25 + Me.btnT1Data.Text = "T1 Servcie" + Me.btnT1Data.UseVisualStyleBackColor = True ' 'usrctlProcedures ' @@ -1736,7 +1736,7 @@ Partial Class usrctlProcedures Friend WithEvents Button52 As Button Friend WithEvents Label22 As Label Friend WithEvents dtpbis As DateTimePicker - Friend WithEvents Button53 As Button + Friend WithEvents btnT1Data As Button Friend WithEvents Label23 As Label Friend WithEvents Button54 As Button Friend WithEvents TabPage8 As TabPage diff --git a/UID/usrctlProcedures.vb b/UID/usrctlProcedures.vb index bb107a2..ca8c8cc 100644 --- a/UID/usrctlProcedures.vb +++ b/UID/usrctlProcedures.vb @@ -4444,7 +4444,7 @@ OPTION (MAXRECURSION 1000);", "AVISO") ' End Using End Sub - Private Sub Button53_Click(sender As Object, e As EventArgs) Handles Button53.Click + Private Sub btnT1Data_Click(sender As Object, e As EventArgs) Handles btnT1Data.Click TESTs("D:\Andreas\TMP\TESTT1.pdf") End Sub