diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index 56c3c2b1..e2189b04 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -275,7 +275,11 @@ Partial Class frmKundenblatt Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25) Me.tbFirmendaten.Name = "tbFirmendaten" Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3) +<<<<<<< HEAD + Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 897) +======= Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 1084) +>>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d Me.tbFirmendaten.TabIndex = 3 Me.tbFirmendaten.Text = "Firmendaten" ' @@ -285,9 +289,25 @@ Partial Class frmKundenblatt Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(3, 3) Me.Panel4.Name = "Panel4" +<<<<<<< HEAD + Me.Panel4.Size = New System.Drawing.Size(1624, 891) + Me.Panel4.TabIndex = 0 + ' + 'UsrcntlKundeBearbeitenFull1 + ' + Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White + Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) + Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" + Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 891) + Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 + ' +======= Me.Panel4.Size = New System.Drawing.Size(1624, 1078) Me.Panel4.TabIndex = 0 ' +>>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d 'tbcntrMain ' Me.tbcntrMain.Appearance = System.Windows.Forms.TabAppearance.FlatButtons @@ -303,7 +323,11 @@ Partial Class frmKundenblatt Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMain.Name = "tbcntrMain" Me.tbcntrMain.SelectedIndex = 0 +<<<<<<< HEAD + Me.tbcntrMain.Size = New System.Drawing.Size(1638, 926) +======= Me.tbcntrMain.Size = New System.Drawing.Size(1638, 1113) +>>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d Me.tbcntrMain.TabIndex = 3 ' 'tbAllgemein @@ -343,7 +367,11 @@ Partial Class frmKundenblatt Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0) Me.tbAllgemein.Name = "tbAllgemein" Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3) +<<<<<<< HEAD + Me.tbAllgemein.Size = New System.Drawing.Size(1630, 897) +======= Me.tbAllgemein.Size = New System.Drawing.Size(1630, 1084) +>>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' @@ -442,7 +470,11 @@ Partial Class frmKundenblatt Me.dgvOffenePosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.dgvOffenePosten.RowHeadersVisible = False Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect +<<<<<<< HEAD + Me.dgvOffenePosten.Size = New System.Drawing.Size(714, 298) +======= Me.dgvOffenePosten.Size = New System.Drawing.Size(714, 485) +>>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d Me.dgvOffenePosten.TabIndex = 175 ' 'btnOP @@ -781,6 +813,17 @@ Partial Class frmKundenblatt Me.dgvSperrliste.Location = New System.Drawing.Point(732, 36) Me.dgvSperrliste.Name = "dgvSperrliste" Me.dgvSperrliste.ReadOnly = True +<<<<<<< HEAD + DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle7 + Me.dgvSperrliste.Size = New System.Drawing.Size(432, 853) +======= DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -790,6 +833,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle10 Me.dgvSperrliste.Size = New System.Drawing.Size(432, 1040) +>>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d Me.dgvSperrliste.TabIndex = 23 ' 'PictureBox2 @@ -874,7 +918,11 @@ Partial Class frmKundenblatt Me.tbMdm.Location = New System.Drawing.Point(4, 25) Me.tbMdm.Name = "tbMdm" Me.tbMdm.Padding = New System.Windows.Forms.Padding(3) +<<<<<<< HEAD + Me.tbMdm.Size = New System.Drawing.Size(1630, 897) +======= Me.tbMdm.Size = New System.Drawing.Size(1630, 1084) +>>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d Me.tbMdm.TabIndex = 10 Me.tbMdm.Text = "MDM" Me.tbMdm.UseVisualStyleBackColor = True @@ -892,7 +940,11 @@ Partial Class frmKundenblatt Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMDM.Name = "tbcntrMDM" Me.tbcntrMDM.SelectedIndex = 0 +<<<<<<< HEAD + Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 891) +======= Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 1078) +>>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d Me.tbcntrMDM.TabIndex = 0 ' 'tbSDL @@ -904,7 +956,11 @@ Partial Class frmKundenblatt Me.tbSDL.Margin = New System.Windows.Forms.Padding(0) Me.tbSDL.Name = "tbSDL" Me.tbSDL.Padding = New System.Windows.Forms.Padding(3) +<<<<<<< HEAD + Me.tbSDL.Size = New System.Drawing.Size(1616, 865) +======= Me.tbSDL.Size = New System.Drawing.Size(1616, 1052) +>>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d Me.tbSDL.TabIndex = 5 Me.tbSDL.Text = "SDL-Leistungen" Me.tbSDL.UseVisualStyleBackColor = True @@ -946,7 +1002,11 @@ Partial Class frmKundenblatt DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle14 Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect +<<<<<<< HEAD + Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 669) +======= Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 856) +>>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d Me.dgvSDLLeistungenFull.TabIndex = 5 ' 'Panel6 @@ -1050,7 +1110,11 @@ Partial Class frmKundenblatt Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL) Me.Panel5.Controls.Add(Me.rtbVermerke) Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom +<<<<<<< HEAD + Me.Panel5.Location = New System.Drawing.Point(3, 719) +======= Me.Panel5.Location = New System.Drawing.Point(3, 906) +>>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d Me.Panel5.Name = "Panel5" Me.Panel5.Size = New System.Drawing.Size(1610, 143) Me.Panel5.TabIndex = 177 @@ -2364,7 +2428,11 @@ Partial Class frmKundenblatt Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScroll = True Me.BackColor = System.Drawing.Color.White +<<<<<<< HEAD + Me.ClientSize = New System.Drawing.Size(1180, 1055) +======= Me.ClientSize = New System.Drawing.Size(1180, 1242) +>>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d Me.Controls.Add(Me.lblAbfVerb) Me.Controls.Add(Me.btnAbfVerb) Me.Controls.Add(Me.tbcntrMain)