merge

Aviso/frmHauptfenster.Designer.vb

@@ -254,6 +254,8 @@ Partial Class frmHauptfenster
         Me.Button11 = New System.Windows.Forms.Button()
         Me.btnMAVerzeichnis = New System.Windows.Forms.Button()
         Me.btnMitarbeiterKonto = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
+        Me.Label9 = New System.Windows.Forms.Label()
         Me.btnKontakt = New System.Windows.Forms.Button()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.Button5 = New System.Windows.Forms.Button()
@@ -387,7 +389,6 @@ Partial Class frmHauptfenster
         Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
         Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
         Me.timerStandzeit = New System.Windows.Forms.Timer(Me.components)
-        Me.Label9 = New System.Windows.Forms.Label()
         Me.TimerUPDATE = New System.Windows.Forms.Timer(Me.components)
         Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlOptionen = New System.Windows.Forms.Panel()
@@ -1862,6 +1863,7 @@ Partial Class frmHauptfenster
         Me.Top.Controls.Add(Me.Button11)
         Me.Top.Controls.Add(Me.btnMAVerzeichnis)
         Me.Top.Controls.Add(Me.btnMitarbeiterKonto)
+        Me.Top.Controls.Add(Me.Label9)
         Me.Top.Controls.Add(Me.btnKontakt)
         Me.Top.Controls.Add(Me.Button2)
         Me.Top.Controls.Add(Me.Button5)
@@ -1874,6 +1876,7 @@ Partial Class frmHauptfenster
         Me.Top.Controls.Add(Me.Button3)
         Me.Top.Controls.Add(Me.btnKunden)
         Me.Top.Controls.Add(Me.btnSpedBuch)
+        Me.Top.Controls.Add(Me.UsrCntlTestsystem1)
         Me.Top.Dock = System.Windows.Forms.DockStyle.Top
         Me.Top.Location = New System.Drawing.Point(0, 20)
         Me.Top.Name = "Top"
@@ -1961,6 +1964,33 @@ Partial Class frmHauptfenster
         Me.btnMitarbeiterKonto.TextAlign = System.Drawing.ContentAlignment.BottomCenter
         Me.btnMitarbeiterKonto.UseVisualStyleBackColor = False
         '
+        'UsrCntlTestsystem1
+        '
+        Me.UsrCntlTestsystem1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlTestsystem1.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.UsrCntlTestsystem1.ForeColor = System.Drawing.Color.Red
+        Me.UsrCntlTestsystem1.Location = New System.Drawing.Point(633, 9)
+        Me.UsrCntlTestsystem1.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6)
+        Me.UsrCntlTestsystem1.Name = "UsrCntlTestsystem1"
+        Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28)
+        Me.UsrCntlTestsystem1.TabIndex = 8
+        '
+        'Label9
+        '
+        Me.Label9.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label9.AutoSize = True
+        Me.Label9.BackColor = System.Drawing.Color.White
+        Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold)
+        Me.Label9.ForeColor = System.Drawing.Color.Red
+        Me.Label9.Location = New System.Drawing.Point(905, 19)
+        Me.Label9.Name = "Label9"
+        Me.Label9.Size = New System.Drawing.Size(438, 15)
+        Me.Label9.TabIndex = 9
+        Me.Label9.Text = "Es ist ein Programm-Update verfügbar, bitte das AVISO neu starten."
+        Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Label9.Visible = False
+        '
         'btnKontakt
         '
         Me.btnKontakt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -3751,22 +3781,6 @@ Partial Class frmHauptfenster
         '
         Me.timerStandzeit.Interval = 300000
         '
-        'Label9
-        '
-        Me.Label9.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label9.AutoSize = True
-        Me.Label9.BackColor = System.Drawing.Color.White
-        Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold)
-        Me.Label9.ForeColor = System.Drawing.Color.Red
-        Me.Label9.Location = New System.Drawing.Point(370, 5)
-        Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(438, 15)
-        Me.Label9.TabIndex = 9
-        Me.Label9.Text = "Es ist ein Programm-Update verfügbar, bitte das AVISO neu starten."
-        Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Label9.Visible = False
-        '
         'TimerUPDATE
         '
         Me.TimerUPDATE.Interval = 900000
@@ -4030,8 +4044,6 @@ Partial Class frmHauptfenster
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1302, 694)
         Me.Controls.Add(Me.pnlOptionen)
-        Me.Controls.Add(Me.Label9)
-        Me.Controls.Add(Me.UsrCntlTestsystem1)
         Me.Controls.Add(Me.SplitContainer1)
         Me.Controls.Add(Me.pnlLeft)
         Me.Controls.Add(Me.Top)
@@ -4049,6 +4061,7 @@ Partial Class frmHauptfenster
         Me.pnlDetailsRechts.ResumeLayout(False)
         Me.pnlDetailsRechts.PerformLayout()
         Me.Top.ResumeLayout(False)
+        Me.Top.PerformLayout()
         Me.SplitContainer2.Panel1.ResumeLayout(False)
         Me.SplitContainer2.Panel2.ResumeLayout(False)
         CType(Me.SplitContainer2, System.ComponentModel.ISupportInitialize).EndInit()
@@ -4097,7 +4110,6 @@ Partial Class frmHauptfenster
         Me.cntVerag.ResumeLayout(False)
         Me.pnlLeft.ResumeLayout(False)
         Me.ResumeLayout(False)
-        Me.PerformLayout()
 
     End Sub
     Friend WithEvents mnuInfo As System.Windows.Forms.ToolStripMenuItem