Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

SDL/Classes/cEABeleg.vb

@@ -267,6 +267,7 @@ Public Class EABeleg
     Property SgutKompl As Object = Nothing
     Property rksv_id As Integer = Nothing
     Property rksv_BelegId As Integer = Nothing
+    Property rksv_BelegIdStorno As Object = Nothing
     Property rksv_jws As String = Nothing
     Property rksv_qr As String = Nothing
     Property rksv_umsatz As Double = Nothing
@@ -339,6 +340,7 @@ Public Class EABeleg
                         Me.gebuchtStorno = cSqlDb.checkNullBool(dr.Item("gebuchtStorno"))
                         Me.SgutKompl = cSqlDb.checkNullReturnValue(dr.Item("SgutKompl"), Nothing)
                         Me.rksv_BelegId = cSqlDb.checkNullReturnValue(dr.Item("rksv_BelegId"), Nothing)
+                        Me.rksv_BelegIdStorno = cSqlDb.checkNullReturnValue(dr.Item("rksv_BelegIdStorno"), Nothing)
                         Me.rksv_id = cSqlDb.checkNullReturnValue(dr.Item("rksv_id"), Nothing)
 
                         Me.rksv_jws = cSqlDb.checkNullReturnValue(dr.Item("rksv_jws"), Nothing)
@@ -519,6 +521,7 @@ Public Class EABeleg
 
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_id", rksv_id))
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_BelegId", rksv_BelegId))
+        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_BelegIdStorno", rksv_BelegIdStorno))
 
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_jws", rksv_jws))
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_qr", rksv_qr))

SDL/Classes/cRKSV.vb

@@ -519,7 +519,7 @@ Public Class cRKSV
             'Dim [error] As VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.ErrorCode
             'Dim InitializeLibraryResultSpecified As Boolean
             '     Dim [error] = "" 'm_com.InitializeLibrary(tbLicense.Text, "D:\Database\DSFinVK\dsfinvkdb.db3", "Administrator", "test", cashbox)
-            m_com.InitializeLibrary("SQLGUIDE01.verag.ost.dmn", "itg_RKSV_DE", "dsfinvk", "dsfinvk#1337", cashbox, [error], InitializeLibraryResultSpecified)
+            '  m_com.InitializeLibrary("SQLGUIDE01.verag.ost.dmn", "itg_RKSV_DE", "dsfinvk", "dsfinvk#1337", cashbox, [error], InitializeLibraryResultSpecified)
 
             ' MsgBox("1: " & [error])
 
@@ -532,15 +532,34 @@ Public Class cRKSV
 
             ' MsgBox("2")
             Dim BON_ID As Integer = 0
+            If False Then
+
                 Dim BON_IDSpecified = False
                 Dim GetNextBON_IDResultSpecified = False
                 m_com.GetNextBON_ID(cashbox, BON_ID, BON_IDSpecified, [error], GetNextBON_IDResultSpecified)
-            'MsgBox("3: " & [error])
+                '  MsgBox("3: " & [error])
 
                 If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then
+                    If [error].ToString() <> "CASHBOX_ALREADY_MANAGED" Then '--> CASHBOX_ALREADY_MANAGED --> der Fehler darf auftreten, die Cashbox wird Serverseitig initialisert, hier nur der Versuch, falls das nciht geschehen ist... lt. Jan Mika / AITG
                         MessageBox.Show([error].ToString(), "Error2", MessageBoxButtons.OK, MessageBoxIcon.[Error])
                         Return False
                     End If
+                End If
+            Else
+                '  MsgBox(RKSV_Beleg_Id)
+                BON_ID = RKSV_Beleg_Id
+            End If
+
+            'Dim BON_ID As Integer = 0
+            'Dim BON_IDSpecified = False
+            'Dim GetNextBON_IDResultSpecified = False
+            'm_com.GetNextBON_ID(cashbox, BON_ID, BON_IDSpecified, [error], GetNextBON_IDResultSpecified)
+            ''MsgBox("3: " & [error])
+
+            'If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then
+            '    MessageBox.Show([error].ToString(), "Error2", MessageBoxButtons.OK, MessageBoxIcon.[Error])
+            '    Return False
+            'End If
 
             'Dim BON_NR As Integer = 0
             '[error] = m_com.GetNextBON_NR(cashbox, BON_NR)
@@ -2527,13 +2546,6 @@ Public Class cRKSV_DE
                 Return False
             End If
 
-            Dim BON_NR As Integer = 0
-            [error] = m_com.GetNextBON_ID(cashbox, BON_NR)
-
-            If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then
-                MessageBox.Show([error].ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error])
-                Return False
-            End If
 
 
 

SDL/Classes/cRKSV_Kasse.vb

@@ -24,6 +24,7 @@ Public Class cRKSV_Kasse
     Property rksv_DE_pwd As Object = Nothing
     Property rksv_DE_apiToken As Object = Nothing
     Property rksv_DE_license As Object = Nothing
+    Property rksv_StornoIncreaseBelegCnt As Object = Nothing
 
 
     Dim SQL As New SQL
@@ -222,6 +223,7 @@ Public Class cRKSV_Kasse
                         Me.rksv_DE_pwd = cSqlDb.checkNullReturnValue(dr.Item("rksv_DE_pwd"), Nothing)
                         Me.rksv_DE_apiToken = cSqlDb.checkNullReturnValue(dr.Item("rksv_DE_apiToken"), Nothing)
                         Me.rksv_DE_license = cSqlDb.checkNullReturnValue(dr.Item("rksv_DE_license"), Nothing)
+                        Me.rksv_StornoIncreaseBelegCnt = cSqlDb.checkNullBool(dr.Item("rksv_StornoIncreaseBelegCnt"))
 
                     End If
                     dr.Close()
@@ -258,6 +260,7 @@ Public Class cRKSV_Kasse
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_DE_pwd", rksv_DE_pwd))
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_DE_apiToken", rksv_DE_apiToken))
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_DE_license", rksv_DE_license))
+        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_StornoIncreaseBelegCnt", rksv_StornoIncreaseBelegCnt))
 
 
         Return list

SDL/kassenbuch/frmKassenbuch.vb

@@ -909,6 +909,9 @@ Public Class frmKassenbuch
                 End If
 
 
+
+
+
                 'NUR KB
                 If f.cbxStornoRKSV.Checked Or f.cbxStornoBELEG.Checked Or f.cbxStornoErzwingenAdmin.Checked Then
                     Dim grund2 = InputBox("ADMIN-Storno (" & If(f.cbxStornoRKSV.Checked, " -RKSV-Tabelle- ", "") & If(f.cbxStornoBELEG.Checked, " -BELEG-Tabelle- ", "") & If(f.cbxStornoErzwingenAdmin.Checked, " -KASSENBUCH-Tabelle- ", "") & "):" & vbNewLine & vbNewLine & "Betrag: " & BELEGTmp.rksv_umsatz & vbNewLine & "Datum: " & BELEGTmp.BelegDat & vbNewLine & vbNewLine & "Bitte geben Sie einen Stornogrund an:" & vbNewLine, "Storno")
@@ -918,11 +921,17 @@ Public Class frmKassenbuch
                     End If
 
                     Dim KASSETmp As New cRKSV_Kasse(BELEGTmp.rksv_id)
+                    ' Dim OLD_rksv_BelegId = BELEGTmp.rksv_BelegId
                     If BELEGTmp.BelegDat < Now.AddMonths(-2) And Not master_Kasse Then
                         MsgBox("Beleg älter als 2 Monate, Aktion wird abgebrochen") 'alte Belege nicht mehr storinieren
                         Exit Sub
                     End If
 
+                    'If KASSETmp.StornoIncreaseBelegCnt Then ' Ob beim Storno eine neue BelegNr vergeben werden soll
+                    '    Dim RKSV_Beleg_Id = KASSETmp.INCREASE_BELEG_UMSATZ(BELEGTmp.rksv_umsatz)
+                    '    BELEGTmp.rksv_BelegId = RKSV_Beleg_Id
+                    'End If
+
                     If f.cbxStornoErzwingenAdmin.Checked Then
                         BELEGTmp = cRKSV.STORNO(BELEGTmp, grund2, True, KASSETmp.rksv_firma) 'Beleg storno und Kassenbuch Gegenbuchung
                     End If
@@ -980,6 +989,12 @@ Public Class frmKassenbuch
 
                     Dim OLD_rksv_BelegId = BELEGTmp.rksv_BelegId
                     Dim KASSETmp As New cRKSV_Kasse(BELEGTmp.rksv_id)
+
+                    If KASSETmp.rksv_StornoIncreaseBelegCnt Then ' Ob beim Storno eine neue BelegNr vergeben werden soll
+                        Dim RKSV_Beleg_Id = KASSETmp.INCREASE_BELEG_UMSATZ(BELEGTmp.rksv_umsatz)
+                        BELEGTmp.rksv_BelegIdStorno = RKSV_Beleg_Id
+                    End If
+
                     BELEGTmp = cRKSV.STORNO(BELEGTmp, grund, KASSETmp.rksv_firma) 'Beleg storno und Kassenbuch Gegenbuchung
                     '    BELEGTmp = cRKSV.STORNO(BELEGTmp, "") 'Beleg storno und Kassenbuch Gegenbuchung
 
@@ -997,16 +1012,18 @@ Public Class frmKassenbuch
                         Dim LastJWS As String = ""
                         Dim answer = ""
                         If KASSETmp.rksv_aktiv Then
-                            If Not cRKSV.stornoRKSV(KASSETmp, BELEGTmp.BelegDat, BELEGTmp.Steuerschlüssel, BELEGTmp.rksv_BelegId, BELEGTmp.rksv_umsatz, QRQString, LastJWS, answer) Then
+                            If Not cRKSV.stornoRKSV(KASSETmp, BELEGTmp.BelegDat, BELEGTmp.Steuerschlüssel, If(BELEGTmp.rksv_BelegIdStorno, BELEGTmp.rksv_BelegId), BELEGTmp.rksv_umsatz, QRQString, LastJWS, answer) Then
                                 'FEHLER!!
+                                If KASSETmp.rksv_StornoIncreaseBelegCnt Then BELEGTmp.rksv_BelegIdStorno = Nothing
                                 BELEGTmp = cRKSV.STORNO_RUECKGAENGIG(BELEGTmp, grund, KASSETmp.rksv_firma) 'Beleg storno und Kassenbuch Gegenbuchung
                                 MessageBox.Show("Fehler bei der RKSV-Storinerung:" & vbNewLine & vbNewLine & answer, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error)
                                 Exit Sub
                             End If
                         End If
                         If KASSETmp.rksvDE_aktiv Then
-                            If Not cRKSV.stornoRKSV_DE(PERSONALTmp, BELEGTmp, KASSETmp, BELEGTmp.rksv_BelegId, OLD_rksv_BelegId, BELEGTmp.rksv_umsatz, QRQString, LastJWS, False, answer) Then
+                            If Not cRKSV.stornoRKSV_DE(PERSONALTmp, BELEGTmp, KASSETmp, If(BELEGTmp.rksv_BelegIdStorno, BELEGTmp.rksv_BelegId), BELEGTmp.rksv_BelegId, BELEGTmp.rksv_umsatz, QRQString, LastJWS, False, answer) Then
                                 'FEHLER!!
+                                If KASSETmp.rksv_StornoIncreaseBelegCnt Then BELEGTmp.rksv_BelegIdStorno = Nothing
                                 BELEGTmp = cRKSV.STORNO_RUECKGAENGIG(BELEGTmp, grund, KASSETmp.rksv_firma) 'Beleg storno und Kassenbuch Gegenbuchung
                                 MessageBox.Show("Fehler bei der RKSV-Storinerung:" & vbNewLine & vbNewLine & answer, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error)
                                 Exit Sub

SDL/kunden/frmKundenUebersichtZOLL.Designer.vb

@@ -93,14 +93,14 @@ Partial Class frmKundenUebersichtZOLL
         Me.tbSpeditionsbuch = New System.Windows.Forms.TabPage()
         Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components)
         Me.Panel1 = New System.Windows.Forms.Panel()
-        Me.MenuStripSDL = New System.Windows.Forms.MenuStrip()
+        Me.MenuStripKunden = New System.Windows.Forms.MenuStrip()
         Me.mnueKunden = New System.Windows.Forms.ToolStripMenuItem()
         Me.mnueZoll = New System.Windows.Forms.ToolStripMenuItem()
         Me.mnueOfferte = New System.Windows.Forms.ToolStripMenuItem()
         Me.mnueRechnungen = New System.Windows.Forms.ToolStripMenuItem()
         Me.mnueSpeditionsbuch = New System.Windows.Forms.ToolStripMenuItem()
         Me.mnueStatistik = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripFormulare = New System.Windows.Forms.ToolStripMenuItem()
+        Me.mneFormulare = New System.Windows.Forms.ToolStripMenuItem()
         Me.MANAGERToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
         Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem()
@@ -118,8 +118,8 @@ Partial Class frmKundenUebersichtZOLL
         Me.VeragCustomsServiceToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem()
         Me.mnueFiskal = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem()
         Me.toolNeuerKunde = New System.Windows.Forms.ToolStripMenuItem()
+        Me.mneBearbeiten = New System.Windows.Forms.ToolStripMenuItem()
         Me.toolOptionen = New System.Windows.Forms.ToolStripMenuItem()
         Me.BearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AnDakosyÜbertragenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -163,7 +163,7 @@ Partial Class frmKundenUebersichtZOLL
         CType(Me.dgvRg, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.MyPanel1.SuspendLayout()
         Me.Panel1.SuspendLayout()
-        Me.MenuStripSDL.SuspendLayout()
+        Me.MenuStripKunden.SuspendLayout()
         Me.pnlTop.SuspendLayout()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.ContextMenuStrip3.SuspendLayout()
@@ -940,21 +940,21 @@ Partial Class frmKundenUebersichtZOLL
         Me.Panel1.Size = New System.Drawing.Size(1190, 726)
         Me.Panel1.TabIndex = 201
         '
-        'MenuStripSDL
+        'MenuStripKunden
         '
-        Me.MenuStripSDL.AutoSize = False
+        Me.MenuStripKunden.AutoSize = False
-        Me.MenuStripSDL.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.MenuStripKunden.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.MenuStripSDL.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.MenuStripKunden.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.MenuStripSDL.Dock = System.Windows.Forms.DockStyle.Left
+        Me.MenuStripKunden.Dock = System.Windows.Forms.DockStyle.Left
-        Me.MenuStripSDL.ImageScalingSize = New System.Drawing.Size(24, 24)
+        Me.MenuStripKunden.ImageScalingSize = New System.Drawing.Size(24, 24)
-        Me.MenuStripSDL.ImeMode = System.Windows.Forms.ImeMode.NoControl
+        Me.MenuStripKunden.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.MenuStripSDL.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnueKunden, Me.mnueZoll, Me.mnueOfferte, Me.mnueRechnungen, Me.mnueSpeditionsbuch, Me.mnueStatistik, Me.ToolStripFormulare, Me.mnueFiskal, Me.toolNeuerKunde, Me.ToolStripMenuItem5, Me.toolOptionen, Me.ToolStripMenuItem1, Me.ToolStripMenuItem11})
+        Me.MenuStripKunden.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnueKunden, Me.mnueZoll, Me.mnueOfferte, Me.mnueRechnungen, Me.mnueSpeditionsbuch, Me.mnueStatistik, Me.mneFormulare, Me.mnueFiskal, Me.toolNeuerKunde, Me.mneBearbeiten, Me.toolOptionen, Me.ToolStripMenuItem1, Me.ToolStripMenuItem11})
-        Me.MenuStripSDL.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow
+        Me.MenuStripKunden.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow
-        Me.MenuStripSDL.Location = New System.Drawing.Point(0, 0)
+        Me.MenuStripKunden.Location = New System.Drawing.Point(0, 0)
-        Me.MenuStripSDL.Name = "MenuStripSDL"
+        Me.MenuStripKunden.Name = "MenuStripKunden"
-        Me.MenuStripSDL.Size = New System.Drawing.Size(114, 758)
+        Me.MenuStripKunden.Size = New System.Drawing.Size(114, 758)
-        Me.MenuStripSDL.TabIndex = 208
+        Me.MenuStripKunden.TabIndex = 208
-        Me.MenuStripSDL.Text = "test"
+        Me.MenuStripKunden.Text = "test"
         '
         'mnueKunden
         '
@@ -1046,22 +1046,22 @@ Partial Class frmKundenUebersichtZOLL
         Me.mnueStatistik.TextAlign = System.Drawing.ContentAlignment.BottomCenter
         Me.mnueStatistik.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
         '
-        'ToolStripFormulare
+        'mneFormulare
         '
-        Me.ToolStripFormulare.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.mneFormulare.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.ToolStripFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem9, Me.ToolStripMenuItem10, Me.ToolStripMenuItem14, Me.ToolStripMenuItem16, Me.ToolStripMenuItem17, Me.ToolStripMenuItem19})
+        Me.mneFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem9, Me.ToolStripMenuItem10, Me.ToolStripMenuItem14, Me.ToolStripMenuItem16, Me.ToolStripMenuItem17, Me.ToolStripMenuItem19})
-        Me.ToolStripFormulare.Enabled = False
+        Me.mneFormulare.Enabled = False
-        Me.ToolStripFormulare.Font = New System.Drawing.Font("Segoe UI", 9.0!)
+        Me.mneFormulare.Font = New System.Drawing.Font("Segoe UI", 9.0!)
-        Me.ToolStripFormulare.ForeColor = System.Drawing.Color.White
+        Me.mneFormulare.ForeColor = System.Drawing.Color.White
-        Me.ToolStripFormulare.Image = Global.SDL.My.Resources.Resources.report
+        Me.mneFormulare.Image = Global.SDL.My.Resources.Resources.report
-        Me.ToolStripFormulare.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.mneFormulare.ImageAlign = System.Drawing.ContentAlignment.TopCenter
-        Me.ToolStripFormulare.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
+        Me.mneFormulare.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
-        Me.ToolStripFormulare.Margin = New System.Windows.Forms.Padding(0, 10, 0, 0)
+        Me.mneFormulare.Margin = New System.Windows.Forms.Padding(0, 10, 0, 0)
-        Me.ToolStripFormulare.Name = "ToolStripFormulare"
+        Me.mneFormulare.Name = "mneFormulare"
-        Me.ToolStripFormulare.Size = New System.Drawing.Size(107, 64)
+        Me.mneFormulare.Size = New System.Drawing.Size(107, 64)
-        Me.ToolStripFormulare.Text = "Formulare"
+        Me.mneFormulare.Text = "Formulare"
-        Me.ToolStripFormulare.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.mneFormulare.TextAlign = System.Drawing.ContentAlignment.BottomCenter
-        Me.ToolStripFormulare.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
+        Me.mneFormulare.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
         '
         'MANAGERToolStripMenuItem
         '
@@ -1171,20 +1171,6 @@ Partial Class frmKundenUebersichtZOLL
         Me.mnueFiskal.Text = "Fiskal"
         Me.mnueFiskal.Visible = False
         '
-        'ToolStripMenuItem5
-        '
-        Me.ToolStripMenuItem5.Enabled = False
-        Me.ToolStripMenuItem5.ForeColor = System.Drawing.Color.White
-        Me.ToolStripMenuItem5.Image = Global.SDL.My.Resources.Resources.stift1
-        Me.ToolStripMenuItem5.ImageAlign = System.Drawing.ContentAlignment.TopCenter
-        Me.ToolStripMenuItem5.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
-        Me.ToolStripMenuItem5.Margin = New System.Windows.Forms.Padding(0, 20, 0, 0)
-        Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
-        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(107, 44)
-        Me.ToolStripMenuItem5.Text = "Bearbeiten"
-        Me.ToolStripMenuItem5.TextAlign = System.Drawing.ContentAlignment.BottomCenter
-        Me.ToolStripMenuItem5.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
-        '
         'toolNeuerKunde
         '
         Me.toolNeuerKunde.ForeColor = System.Drawing.Color.White
@@ -1198,6 +1184,20 @@ Partial Class frmKundenUebersichtZOLL
         Me.toolNeuerKunde.TextAlign = System.Drawing.ContentAlignment.BottomCenter
         Me.toolNeuerKunde.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
         '
+        'mneBearbeiten
+        '
+        Me.mneBearbeiten.Enabled = False
+        Me.mneBearbeiten.ForeColor = System.Drawing.Color.White
+        Me.mneBearbeiten.Image = Global.SDL.My.Resources.Resources.stift1
+        Me.mneBearbeiten.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.mneBearbeiten.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
+        Me.mneBearbeiten.Margin = New System.Windows.Forms.Padding(0, 20, 0, 0)
+        Me.mneBearbeiten.Name = "mneBearbeiten"
+        Me.mneBearbeiten.Size = New System.Drawing.Size(107, 44)
+        Me.mneBearbeiten.Text = "Bearbeiten"
+        Me.mneBearbeiten.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.mneBearbeiten.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
+        '
         'toolOptionen
         '
         Me.toolOptionen.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BearbeitenToolStripMenuItem, Me.AnDakosyÜbertragenToolStripMenuItem, Me.AufschubEORIBearbeitenToolStripMenuItem, Me.SYSKAÜbertragToolStripMenuItem})
@@ -1421,7 +1421,7 @@ Partial Class frmKundenUebersichtZOLL
         Me.Controls.Add(Me.rtbInfo)
         Me.Controls.Add(Me.Panel1)
         Me.Controls.Add(Me.pnlTop)
-        Me.Controls.Add(Me.MenuStripSDL)
+        Me.Controls.Add(Me.MenuStripKunden)
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.MinimumSize = New System.Drawing.Size(900, 780)
         Me.Name = "frmKundenUebersichtZOLL"
@@ -1451,8 +1451,8 @@ Partial Class frmKundenUebersichtZOLL
         Me.MyPanel1.ResumeLayout(False)
         Me.MyPanel1.PerformLayout()
         Me.Panel1.ResumeLayout(False)
-        Me.MenuStripSDL.ResumeLayout(False)
+        Me.MenuStripKunden.ResumeLayout(False)
-        Me.MenuStripSDL.PerformLayout()
+        Me.MenuStripKunden.PerformLayout()
         Me.pnlTop.ResumeLayout(False)
         Me.pnlTop.PerformLayout()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1467,7 +1467,7 @@ Partial Class frmKundenUebersichtZOLL
     Friend WithEvents pnlZollTarife As System.Windows.Forms.Panel
     Friend WithEvents Panel1 As System.Windows.Forms.Panel
     Friend WithEvents TabPage1 As System.Windows.Forms.TabPage
-    Friend WithEvents MenuStripSDL As System.Windows.Forms.MenuStrip
+    Friend WithEvents MenuStripKunden As System.Windows.Forms.MenuStrip
     Friend WithEvents mnueKunden As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents mnueZoll As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents mnueOfferte As System.Windows.Forms.ToolStripMenuItem
@@ -1519,7 +1519,7 @@ Partial Class frmKundenUebersichtZOLL
     Friend WithEvents tbFiskal As System.Windows.Forms.TabPage
     Friend WithEvents Label35 As System.Windows.Forms.Label
     Friend WithEvents tmrFiskal As System.Windows.Forms.Timer
-    Friend WithEvents ToolStripFormulare As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mneFormulare As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents MANAGERToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator
     Friend WithEvents ToolStripMenuItem4 As System.Windows.Forms.ToolStripMenuItem
@@ -1559,7 +1559,7 @@ Partial Class frmKundenUebersichtZOLL
     Friend WithEvents UsrCntlOfferte1 As usrCntlOfferte
     Friend WithEvents ContextMenuStrip3 As ContextMenuStrip
     Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem
-    Friend WithEvents ToolStripMenuItem5 As ToolStripMenuItem
+    Friend WithEvents mneBearbeiten As ToolStripMenuItem
     Friend WithEvents HochladenToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents ScannenToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents ÄndernToolStripMenuItem As ToolStripMenuItem

SDL/kunden/frmKundenUebersichtZOLL.resx

@@ -126,7 +126,7 @@
   <metadata name="NotifyIcon1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="MenuStripSDL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="MenuStripKunden.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>232, 17</value>
   </metadata>
   <metadata name="tmrFiskal.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

SDL/kunden/frmKundenUebersichtZOLL.vb

@@ -55,7 +55,7 @@ Public Class frmKundenUebersichtZOLL
             'strip, such as context menu strip just add additional code 
             'line under InitializeComponent(), and it will work;
             InitializeComponent()
-            MenuStripSDL.Renderer = New MyRenderer()
+            MenuStripKunden.Renderer = New MyRenderer()
 
         Catch ex As Exception
             MsgBox(ex.Message & ex.StackTrace)
@@ -67,7 +67,7 @@ Public Class frmKundenUebersichtZOLL
         Try
             InitializeComponent()
             Me.kdNr = KdNr
-            MenuStripSDL.Renderer = New MyRenderer()
+            MenuStripKunden.Renderer = New MyRenderer()
 
         Catch ex As Exception
             MsgBox(ex.Message & ex.StackTrace)
@@ -102,6 +102,10 @@ Public Class frmKundenUebersichtZOLL
 
 
     Private Sub frmKundenUebersichtZOLL_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then Exit Sub
+
+
         Me.BER_STUFE = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("KUNDEN", "SDL")
         timerOP.Interval = 500
         timerOP.Enabled = False
@@ -158,9 +162,9 @@ Public Class frmKundenUebersichtZOLL
             mnueSpeditionsbuch.Visible = False
             mnueStatistik.Visible = False
             toolOptionen.Visible = False
-            ToolStripMenuItem5.Visible = False
+            mneBearbeiten.Visible = False
             mnueOfferte.Visible = False
-            ToolStripFormulare.Visible = False
+            mneFormulare.Visible = False
             mnueFiskal.Visible = False
             toolNeuerKunde.Visible = False
             ' cbx.Checked = True
@@ -247,7 +251,7 @@ Public Class frmKundenUebersichtZOLL
         loaded = False
         If Not (New kundenSQL).existByKdNr(kdnr) Then
             Me.tbcntrKundenDaten.Visible = False
-            For Each m As ToolStripItem In MenuStripSDL.Items
+            For Each m As ToolStripItem In MenuStripKunden.Items
                 m.Enabled = False
             Next
             'initAbfVerb(False)
@@ -284,13 +288,13 @@ Public Class frmKundenUebersichtZOLL
 
         mnueKunden.Enabled = True
         mnueZoll.Enabled = True
-        ToolStripFormulare.Enabled = True
+        mneFormulare.Enabled = True
         mnueOfferte.Enabled = True
         mnueStatistik.Enabled = True
         mnueRechnungen.Enabled = True
         mnueSpeditionsbuch.Enabled = True
         toolOptionen.Enabled = True
-        ToolStripMenuItem5.Enabled = True
+        mneBearbeiten.Enabled = True
         'SchließenToolStripMenuItem.Enabled = True
         mnueFiskal.Enabled = True
 
@@ -323,9 +327,9 @@ Public Class frmKundenUebersichtZOLL
                 mnueRechnungen.Enabled = False
                 mnueSpeditionsbuch.Enabled = False
                 mnueStatistik.Enabled = False
-                ToolStripFormulare.Enabled = False
+                mneFormulare.Enabled = False
                 mnueFiskal.Enabled = False
-                ToolStripMenuItem5.Enabled = False
+                mneBearbeiten.Enabled = False
                 toolOptionen.Enabled = False
                 UsrCntlOfferte1.init(-1)
             End If
@@ -631,8 +635,8 @@ Public Class frmKundenUebersichtZOLL
 
     Sub changeTab(index As Integer, tsi As ToolStripItem)
         tbcntrKundenDaten.SelectedIndex = index
-        For Each i As ToolStripItem In MenuStripSDL.Items
+        For Each i As ToolStripItem In MenuStripKunden.Items
-            i.Font = New Font(MenuStripSDL.Font.FontFamily, MenuStripSDL.Font.Size, FontStyle.Regular)
+            i.Font = New Font(MenuStripKunden.Font.FontFamily, MenuStripKunden.Font.Size, FontStyle.Regular)
         Next
         tsi.Font = New Font(tsi.Font.FontFamily, tsi.Font.Size, FontStyle.Underline Or FontStyle.Bold)
     End Sub
@@ -1292,7 +1296,7 @@ Public Class frmKundenUebersichtZOLL
 
 
 
-    Private Sub ToolStripMenuItem5_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem5.Click
+    Private Sub ToolStripMenuItem5_Click(sender As Object, e As EventArgs) Handles mneBearbeiten.Click
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("Kundendaten_bearbeiten", "SDL") = 0 Then
             If kdNr > 0 Then
                 Dim frmKundenblatt As New frmKundenblatt

SDL/kunden/usrCntlKundenuebersicht.vb

@@ -174,7 +174,7 @@ Public Class usrCntlKundenuebersicht
             If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
                 Try
 
-                    tbWeitereKundenDetails.TabPages.Remove(TabPage3)
+                    tbWeitereKundenDetails.TabPages.Remove(tbUmsatz)
                     tbWeitereKundenDetails.TabPages.Remove(tbOffenePosten)
                     tbcntrAllg.TabPages.Remove(tbAvisoMail)
                     tbcntrAllg.TabPages.Remove(tbKdSpez)
@@ -264,13 +264,13 @@ Public Class usrCntlKundenuebersicht
 
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
             Try
-                tbWeitereKundenDetails.TabPages.Remove(TabPage3)
+                tbWeitereKundenDetails.TabPages.Remove(tbUmsatz)
                 tbWeitereKundenDetails.TabPages.Remove(tbOffenePosten)
             Catch ex As Exception
 
             End Try
             If ADRESSE IsNot Nothing AndAlso ADRESSE.LandKz = "TR" Then
-                tbWeitereKundenDetails.TabPages.Add(TabPage3)
+                tbWeitereKundenDetails.TabPages.Add(tbUmsatz)
                 tbWeitereKundenDetails.TabPages.Add(tbOffenePosten)
             End If
         End If
@@ -689,9 +689,9 @@ Public Class usrCntlKundenuebersicht
     End Sub
     Sub initDGVAnhaenge()
         usrCntlAnhaenge.INIT(kdNr)
-        TabPage8.Text = "Anhänge"
+        tbAnhaenge.Text = "Anhänge"
         '   MsgBox(usrCntlAnhaenge.MyListBox1.Items.Count)
-        If usrCntlAnhaenge.MyListBox1.Items.Count > 0 Then TabPage8.Text &= " (" & usrCntlAnhaenge.MyListBox1.Items.Count & ")"
+        If usrCntlAnhaenge.MyListBox1.Items.Count > 0 Then tbAnhaenge.Text &= " (" & usrCntlAnhaenge.MyListBox1.Items.Count & ")"
         Exit Sub
         With dgvAnhaenge
             .DataSource = SQL.loadDgvBySql("SELECT [da_id],[da_pfad],[da_name]  FROM [tblDatenarchiv] " &
@@ -2050,7 +2050,7 @@ Public Class usrCntlKundenuebersicht
         End If
     End Sub
 
-    Private Sub FlatButton5_Click_1(sender As Object, e As EventArgs) Handles FlatButton5.Click
+    Private Sub FlatButton5_Click_1(sender As Object, e As EventArgs) Handles btnSaveOfferte.Click
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("OFFERTEN_SPERRE", "SDL") > 0 Then
             Exit Sub
         End If

VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb

@@ -36,6 +36,7 @@ Partial Class frmMessenger
         Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger))
         Me.SplitContainer = New System.Windows.Forms.SplitContainer()
         Me.SplitContainer2 = New System.Windows.Forms.SplitContainer()
         Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
@@ -50,7 +51,7 @@ Partial Class frmMessenger
         Me.Button9 = New System.Windows.Forms.Button()
         Me.btnTEST = New System.Windows.Forms.Button()
         Me.Panel2 = New System.Windows.Forms.Panel()
-        Me.CheckBox1 = New System.Windows.Forms.CheckBox()
+        Me.cbxInaktiveChatsSpecial = New System.Windows.Forms.CheckBox()
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
         Me.UsrCntlChat_Art_Btn_MACHAT = New VERAG_PROG_ALLGEMEIN.usrCntlChat_Art_Btn()
@@ -59,7 +60,7 @@ Partial Class frmMessenger
         Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.PictureBox1 = New System.Windows.Forms.PictureBox()
         Me.lbl = New System.Windows.Forms.Label()
-        Me.Button2 = New System.Windows.Forms.Button()
+        Me.btnNeu = New System.Windows.Forms.Button()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
         Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components)
@@ -81,13 +82,13 @@ Partial Class frmMessenger
         Me.Panel8 = New System.Windows.Forms.Panel()
         Me.Label2 = New System.Windows.Forms.Label()
         Me.Panel9 = New System.Windows.Forms.Panel()
-        Me.Button7 = New System.Windows.Forms.Button()
+        Me.btnMemberAdd = New System.Windows.Forms.Button()
-        Me.Button5 = New System.Windows.Forms.Button()
+        Me.btnMemberDel = New System.Windows.Forms.Button()
         Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel()
         Me.Button6 = New System.Windows.Forms.Button()
         Me.pic = New System.Windows.Forms.PictureBox()
-        Me.Button3 = New System.Windows.Forms.Button()
+        Me.btnSendAtt = New System.Windows.Forms.Button()
-        Me.btn = New System.Windows.Forms.Button()
+        Me.btnSenden = New System.Windows.Forms.Button()
         Me.rtbChatMessage = New System.Windows.Forms.RichTextBox()
         Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer(Me.components)
         Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components)
@@ -388,23 +389,23 @@ Partial Class frmMessenger
         '
         'Panel2
         '
-        Me.Panel2.Controls.Add(Me.CheckBox1)
+        Me.Panel2.Controls.Add(Me.cbxInaktiveChatsSpecial)
         Me.Panel2.Dock = System.Windows.Forms.DockStyle.Bottom
         Me.Panel2.Location = New System.Drawing.Point(0, 899)
         Me.Panel2.Name = "Panel2"
         Me.Panel2.Size = New System.Drawing.Size(275, 23)
         Me.Panel2.TabIndex = 6
         '
-        'CheckBox1
+        'cbxInaktiveChatsSpecial
         '
-        Me.CheckBox1.AutoSize = True
+        Me.cbxInaktiveChatsSpecial.AutoSize = True
-        Me.CheckBox1.Location = New System.Drawing.Point(9, 5)
+        Me.cbxInaktiveChatsSpecial.Location = New System.Drawing.Point(9, 5)
-        Me.CheckBox1.Name = "CheckBox1"
+        Me.cbxInaktiveChatsSpecial.Name = "cbxInaktiveChatsSpecial"
-        Me.CheckBox1.Size = New System.Drawing.Size(93, 17)
+        Me.cbxInaktiveChatsSpecial.Size = New System.Drawing.Size(93, 17)
-        Me.CheckBox1.TabIndex = 7
+        Me.cbxInaktiveChatsSpecial.TabIndex = 7
-        Me.CheckBox1.Text = "inaktive Chats"
+        Me.cbxInaktiveChatsSpecial.Text = "inaktive Chats"
-        Me.CheckBox1.UseVisualStyleBackColor = True
+        Me.cbxInaktiveChatsSpecial.UseVisualStyleBackColor = True
-        Me.CheckBox1.Visible = False
+        Me.cbxInaktiveChatsSpecial.Visible = False
         '
         'Panel1
         '
@@ -413,7 +414,7 @@ Partial Class frmMessenger
         Me.Panel1.Controls.Add(Me.MyTextBox1)
         Me.Panel1.Controls.Add(Me.PictureBox1)
         Me.Panel1.Controls.Add(Me.lbl)
-        Me.Panel1.Controls.Add(Me.Button2)
+        Me.Panel1.Controls.Add(Me.btnNeu)
         Me.Panel1.Controls.Add(Me.Button1)
         Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
         Me.Panel1.Location = New System.Drawing.Point(0, 0)
@@ -507,17 +508,17 @@ Partial Class frmMessenger
         Me.lbl.TabIndex = 3
         Me.lbl.Text = "AVISO - CHAT"
         '
-        'Button2
+        'btnNeu
         '
-        Me.Button2.BackColor = System.Drawing.Color.MediumSeaGreen
+        Me.btnNeu.BackColor = System.Drawing.Color.MediumSeaGreen
-        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnNeu.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button2.ForeColor = System.Drawing.Color.White
+        Me.btnNeu.ForeColor = System.Drawing.Color.White
-        Me.Button2.Location = New System.Drawing.Point(198, 4)
+        Me.btnNeu.Location = New System.Drawing.Point(198, 4)
-        Me.Button2.Name = "Button2"
+        Me.btnNeu.Name = "btnNeu"
-        Me.Button2.Size = New System.Drawing.Size(71, 33)
+        Me.btnNeu.Size = New System.Drawing.Size(71, 33)
-        Me.Button2.TabIndex = 2
+        Me.btnNeu.TabIndex = 2
-        Me.Button2.Text = "+ NEU"
+        Me.btnNeu.Text = "+ NEU"
-        Me.Button2.UseVisualStyleBackColor = False
+        Me.btnNeu.UseVisualStyleBackColor = False
         '
         'Button1
         '
@@ -641,8 +642,8 @@ Partial Class frmMessenger
         Me.pnl.Controls.Add(Me.SplitContainer3)
         Me.pnl.Controls.Add(Me.Button6)
         Me.pnl.Controls.Add(Me.pic)
-        Me.pnl.Controls.Add(Me.Button3)
+        Me.pnl.Controls.Add(Me.btnSendAtt)
-        Me.pnl.Controls.Add(Me.btn)
+        Me.pnl.Controls.Add(Me.btnSenden)
         Me.pnl.Controls.Add(Me.rtbChatMessage)
         Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnl.Location = New System.Drawing.Point(0, 0)
@@ -665,7 +666,8 @@ Partial Class frmMessenger
         '
         'SplitContainer3
         '
-        Me.SplitContainer3.Dock = System.Windows.Forms.DockStyle.Bottom
+        Me.SplitContainer3.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.SplitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel1
         Me.SplitContainer3.Location = New System.Drawing.Point(0, 119)
         Me.SplitContainer3.Name = "SplitContainer3"
@@ -801,37 +803,37 @@ Partial Class frmMessenger
         'Panel9
         '
         Me.Panel9.BackColor = System.Drawing.SystemColors.Control
-        Me.Panel9.Controls.Add(Me.Button7)
+        Me.Panel9.Controls.Add(Me.btnMemberAdd)
-        Me.Panel9.Controls.Add(Me.Button5)
+        Me.Panel9.Controls.Add(Me.btnMemberDel)
         Me.Panel9.Dock = System.Windows.Forms.DockStyle.Bottom
         Me.Panel9.Location = New System.Drawing.Point(0, 169)
         Me.Panel9.Name = "Panel9"
         Me.Panel9.Size = New System.Drawing.Size(220, 30)
         Me.Panel9.TabIndex = 10
         '
-        'Button7
+        'btnMemberAdd
         '
-        Me.Button7.BackColor = System.Drawing.Color.MediumSeaGreen
+        Me.btnMemberAdd.BackColor = System.Drawing.Color.MediumSeaGreen
-        Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnMemberAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button7.ForeColor = System.Drawing.Color.White
+        Me.btnMemberAdd.ForeColor = System.Drawing.Color.White
-        Me.Button7.Location = New System.Drawing.Point(151, 2)
+        Me.btnMemberAdd.Location = New System.Drawing.Point(151, 2)
-        Me.Button7.Name = "Button7"
+        Me.btnMemberAdd.Name = "btnMemberAdd"
-        Me.Button7.Size = New System.Drawing.Size(69, 26)
+        Me.btnMemberAdd.Size = New System.Drawing.Size(69, 26)
-        Me.Button7.TabIndex = 8
+        Me.btnMemberAdd.TabIndex = 8
-        Me.Button7.Text = "+ NEU"
+        Me.btnMemberAdd.Text = "+ NEU"
-        Me.Button7.UseVisualStyleBackColor = False
+        Me.btnMemberAdd.UseVisualStyleBackColor = False
         '
-        'Button5
+        'btnMemberDel
         '
-        Me.Button5.BackColor = System.Drawing.Color.Red
+        Me.btnMemberDel.BackColor = System.Drawing.Color.Red
-        Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnMemberDel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button5.ForeColor = System.Drawing.Color.White
+        Me.btnMemberDel.ForeColor = System.Drawing.Color.White
-        Me.Button5.Location = New System.Drawing.Point(90, 2)
+        Me.btnMemberDel.Location = New System.Drawing.Point(90, 2)
-        Me.Button5.Name = "Button5"
+        Me.btnMemberDel.Name = "btnMemberDel"
-        Me.Button5.Size = New System.Drawing.Size(58, 26)
+        Me.btnMemberDel.Size = New System.Drawing.Size(58, 26)
-        Me.Button5.TabIndex = 9
+        Me.btnMemberDel.TabIndex = 9
-        Me.Button5.Text = "- ENTF"
+        Me.btnMemberDel.Text = "- ENTF"
-        Me.Button5.UseVisualStyleBackColor = False
+        Me.btnMemberDel.UseVisualStyleBackColor = False
         '
         'FlowLayoutPanel
         '
@@ -869,31 +871,31 @@ Partial Class frmMessenger
         Me.pic.TabStop = False
         Me.pic.WaitOnLoad = True
         '
-        'Button3
+        'btnSendAtt
         '
-        Me.Button3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnSendAtt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Button3.BackColor = System.Drawing.Color.SteelBlue
+        Me.btnSendAtt.BackColor = System.Drawing.Color.SteelBlue
-        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnSendAtt.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button3.ForeColor = System.Drawing.Color.White
+        Me.btnSendAtt.ForeColor = System.Drawing.Color.White
-        Me.Button3.Location = New System.Drawing.Point(526, 44)
+        Me.btnSendAtt.Location = New System.Drawing.Point(526, 44)
-        Me.Button3.Name = "Button3"
+        Me.btnSendAtt.Name = "btnSendAtt"
-        Me.Button3.Size = New System.Drawing.Size(65, 41)
+        Me.btnSendAtt.Size = New System.Drawing.Size(65, 41)
-        Me.Button3.TabIndex = 2
+        Me.btnSendAtt.TabIndex = 2
-        Me.Button3.Text = "+ Anhang"
+        Me.btnSendAtt.Text = "+ Anhang"
-        Me.Button3.UseVisualStyleBackColor = False
+        Me.btnSendAtt.UseVisualStyleBackColor = False
         '
-        'btn
+        'btnSenden
         '
-        Me.btn.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnSenden.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btn.BackColor = System.Drawing.Color.SteelBlue
+        Me.btnSenden.BackColor = System.Drawing.Color.SteelBlue
-        Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnSenden.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btn.ForeColor = System.Drawing.Color.White
+        Me.btnSenden.ForeColor = System.Drawing.Color.White
-        Me.btn.Location = New System.Drawing.Point(526, 4)
+        Me.btnSenden.Location = New System.Drawing.Point(526, 4)
-        Me.btn.Name = "btn"
+        Me.btnSenden.Name = "btnSenden"
-        Me.btn.Size = New System.Drawing.Size(103, 40)
+        Me.btnSenden.Size = New System.Drawing.Size(103, 40)
-        Me.btn.TabIndex = 1
+        Me.btnSenden.TabIndex = 1
-        Me.btn.Text = "Senden"
+        Me.btnSenden.Text = "Senden"
-        Me.btn.UseVisualStyleBackColor = False
+        Me.btnSenden.UseVisualStyleBackColor = False
         '
         'rtbChatMessage
         '
@@ -958,6 +960,7 @@ Partial Class frmMessenger
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(912, 922)
         Me.Controls.Add(Me.SplitContainer)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.Name = "frmMessenger"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "Messenger"
@@ -1010,13 +1013,13 @@ Partial Class frmMessenger
     Friend WithEvents SplitContainer1 As SplitContainer
     Friend WithEvents MyFlowLayoutPanel1 As VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel
     Friend WithEvents pnl As Panel
-    Friend WithEvents btn As Button
+    Friend WithEvents btnSenden As Button
     Friend WithEvents rtbChatMessage As RichTextBox
     Friend WithEvents lbl As Label
-    Friend WithEvents Button2 As Button
+    Friend WithEvents btnNeu As Button
     Friend WithEvents Button1 As Button
     Friend WithEvents UsrCntlMessenger_ChatElement1 As usrCntlMessenger_ChatElement
-    Friend WithEvents Button3 As Button
+    Friend WithEvents btnSendAtt As Button
     Friend WithEvents btnTEST As Button
     Friend WithEvents TimerNEW_MESSAGE As Timer
     Friend WithEvents Timer_REFRESH As Timer
@@ -1042,7 +1045,7 @@ Partial Class frmMessenger
     Friend WithEvents Button9 As Button
     Friend WithEvents DGVSonstige As MyDatagridview
     Friend WithEvents Panel6 As Panel
-    Friend WithEvents CheckBox1 As CheckBox
+    Friend WithEvents cbxInaktiveChatsSpecial As CheckBox
     Friend WithEvents Button6 As Button
     Friend WithEvents pnlTeilnehmer As Panel
     Friend WithEvents Label2 As Label
@@ -1059,8 +1062,8 @@ Partial Class frmMessenger
     Friend WithEvents Panel9 As Panel
     Friend WithEvents Panel2 As Panel
     Friend WithEvents Panel1 As Panel
-    Friend WithEvents Button5 As Button
+    Friend WithEvents btnMemberDel As Button
-    Friend WithEvents Button7 As Button
+    Friend WithEvents btnMemberAdd As Button
     Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
     Friend WithEvents UsrCntlChat_Art_Btn_MACHAT As usrCntlChat_Art_Btn
     Friend WithEvents UsrCntlChat_Art_Btn_LKWCHAT As usrCntlChat_Art_Btn

VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb

@@ -67,7 +67,7 @@ Public Class frmMessenger
         End If
     End Sub
 
-    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnNeu.Click
         Dim f As New frmMessenger_NeuerChat
         f.ShowDialog(Me)
 
@@ -131,6 +131,7 @@ Public Class frmMessenger
         'loaded = True
         alloweasteregg = cAllgemein.MITARBEITER.mit_ChatEasteregg
         initEmojis()
+        VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)
     End Sub
 
     Sub initEmojis()
@@ -214,6 +215,14 @@ Public Class frmMessenger
         UsrCntlChat_Art_Btn_SNDCHAT.setCnt(newMsgSND)
 
 
+        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein._LAN
+            Case "DE"
+            Case Else
+                UsrCntlChat_Art_Btn_MACHAT.btn.Text = "General"
+                UsrCntlChat_Art_Btn_LKWCHAT.btn.Text = "Truck"
+                UsrCntlChat_Art_Btn_SNDCHAT.btn.Text = "Shipment"
+        End Select
+
 
         With dgvChats
             Dim loadedTmp = loaded
@@ -697,7 +706,7 @@ Public Class frmMessenger
         End If
     End Sub
 
-    Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
+    Private Sub btn_Click(sender As Object, e As EventArgs) Handles btnSenden.Click
         If Not CHAT.chat_aktiv Then MsgBox("Chat inaktiv!") : Exit Sub
         If rtbChatMessage.Text.Trim <> "" Then
             If CHAT IsNot Nothing Then
@@ -761,7 +770,7 @@ Public Class frmMessenger
 
     Private Sub rtbChatMessage_KeyDown(sender As Object, e As KeyEventArgs) Handles rtbChatMessage.KeyDown
         If e.Modifiers = Keys.Control And e.KeyCode = Keys.Return Then
-            btn.PerformClick()
+            btnSenden.PerformClick()
             e.Handled = True
         End If
     End Sub
@@ -909,7 +918,7 @@ Public Class frmMessenger
         End Try
     End Sub
 
-    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
+    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles btnSendAtt.Click
         If Not CHAT.chat_aktiv Then MsgBox("Chat inaktiv!") : Exit Sub
         If CHAT IsNot Nothing Then
             Dim fd As New OpenFileDialog
@@ -1217,13 +1226,13 @@ Public Class frmMessenger
 
 
 
-    Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click
+    Private Sub Button7_Click(sender As Object, e As EventArgs) Handles btnMemberAdd.Click
         Dim f As New frmMessenger_NeuerChat(CHAT)
         f.ShowDialog()
         initDGVMembers()
     End Sub
 
-    Private Sub Button5_Click_1(sender As Object, e As EventArgs) Handles Button5.Click
+    Private Sub Button5_Click_1(sender As Object, e As EventArgs) Handles btnMemberDel.Click
         If dgvChatMembers.SelectedRows.Count >= 1 Then
             If vbYes = MsgBox("Teilnehmer wirklich entfernen?", vbYesNoCancel) Then
                 Dim ol As New List(Of Object)
@@ -1284,4 +1293,8 @@ Public Class frmMessenger
     Private Sub UsrCntlChat_Art_snd_Load(ctl As usrCntlChat_Art_Btn) Handles UsrCntlChat_Art_Btn_SNDCHAT.CLICKED
 
     End Sub
+
+    Private Sub MyFlowLayoutPanel1_Paint(sender As Object, e As PaintEventArgs) Handles MyFlowLayoutPanel1.Paint
+
+    End Sub
 End Class

VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger_Members.Designer.vb

@@ -27,15 +27,15 @@ Partial Class frmMessenger_Members
         Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger_Members))
         Me.dgvChatMembers = New System.Windows.Forms.DataGridView()
+        Me.clmnMaId = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnFirma = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.lbl = New System.Windows.Forms.Label()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.clmnMaId = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.clmnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.clmnFirma = New System.Windows.Forms.DataGridViewTextBoxColumn()
         CType(Me.dgvChatMembers, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -64,8 +64,7 @@ Partial Class frmMessenger_Members
         DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
         DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
         Me.dgvChatMembers.DefaultCellStyle = DataGridViewCellStyle2
-        Me.dgvChatMembers.Location = New System.Drawing.Point(18, 37)
+        Me.dgvChatMembers.Location = New System.Drawing.Point(12, 24)
-        Me.dgvChatMembers.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.dgvChatMembers.Name = "dgvChatMembers"
         Me.dgvChatMembers.ReadOnly = True
         DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
@@ -79,16 +78,40 @@ Partial Class frmMessenger_Members
         Me.dgvChatMembers.RowHeadersVisible = False
         Me.dgvChatMembers.RowHeadersWidth = 62
         Me.dgvChatMembers.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvChatMembers.Size = New System.Drawing.Size(490, 497)
+        Me.dgvChatMembers.Size = New System.Drawing.Size(327, 323)
         Me.dgvChatMembers.TabIndex = 2
         '
+        'clmnMaId
+        '
+        Me.clmnMaId.HeaderText = "Column1"
+        Me.clmnMaId.MinimumWidth = 8
+        Me.clmnMaId.Name = "clmnMaId"
+        Me.clmnMaId.ReadOnly = True
+        Me.clmnMaId.Visible = False
+        Me.clmnMaId.Width = 150
+        '
+        'clmnName
+        '
+        Me.clmnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.clmnName.HeaderText = "Name"
+        Me.clmnName.MinimumWidth = 8
+        Me.clmnName.Name = "clmnName"
+        Me.clmnName.ReadOnly = True
+        '
+        'clmnFirma
+        '
+        Me.clmnFirma.HeaderText = "Firma"
+        Me.clmnFirma.MinimumWidth = 8
+        Me.clmnFirma.Name = "clmnFirma"
+        Me.clmnFirma.ReadOnly = True
+        Me.clmnFirma.Width = 150
+        '
         'lbl
         '
         Me.lbl.AutoSize = True
-        Me.lbl.Location = New System.Drawing.Point(14, 12)
+        Me.lbl.Location = New System.Drawing.Point(9, 8)
-        Me.lbl.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lbl.Name = "lbl"
-        Me.lbl.Size = New System.Drawing.Size(81, 20)
+        Me.lbl.Size = New System.Drawing.Size(55, 13)
         Me.lbl.TabIndex = 4
         Me.lbl.Text = "Mitglieder:"
         '
@@ -97,10 +120,9 @@ Partial Class frmMessenger_Members
         Me.Button2.BackColor = System.Drawing.Color.MediumSeaGreen
         Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button2.ForeColor = System.Drawing.Color.White
-        Me.Button2.Location = New System.Drawing.Point(402, 543)
+        Me.Button2.Location = New System.Drawing.Point(268, 353)
-        Me.Button2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(106, 51)
+        Me.Button2.Size = New System.Drawing.Size(71, 33)
         Me.Button2.TabIndex = 5
         Me.Button2.Text = "+ NEU"
         Me.Button2.UseVisualStyleBackColor = False
@@ -111,10 +133,9 @@ Partial Class frmMessenger_Members
         Me.Button1.BackColor = System.Drawing.Color.Red
         Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button1.ForeColor = System.Drawing.Color.White
-        Me.Button1.Location = New System.Drawing.Point(268, 543)
+        Me.Button1.Location = New System.Drawing.Point(179, 353)
-        Me.Button1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(124, 51)
+        Me.Button1.Size = New System.Drawing.Size(83, 33)
         Me.Button1.TabIndex = 6
         Me.Button1.Text = "- Entfernen"
         Me.Button1.UseVisualStyleBackColor = False
@@ -142,43 +163,17 @@ Partial Class frmMessenger_Members
         Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3"
         Me.DataGridViewTextBoxColumn3.Width = 150
         '
-        'clmnMaId
-        '
-        Me.clmnMaId.HeaderText = "Column1"
-        Me.clmnMaId.MinimumWidth = 8
-        Me.clmnMaId.Name = "clmnMaId"
-        Me.clmnMaId.ReadOnly = True
-        Me.clmnMaId.Visible = False
-        Me.clmnMaId.Width = 150
-        '
-        'clmnName
-        '
-        Me.clmnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        Me.clmnName.HeaderText = "Name"
-        Me.clmnName.MinimumWidth = 8
-        Me.clmnName.Name = "clmnName"
-        Me.clmnName.ReadOnly = True
-        '
-        'clmnFirma
-        '
-        Me.clmnFirma.HeaderText = "Firma"
-        Me.clmnFirma.MinimumWidth = 8
-        Me.clmnFirma.Name = "clmnFirma"
-        Me.clmnFirma.ReadOnly = True
-        Me.clmnFirma.Width = 150
-        '
         'frmMessenger_Members
         '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(520, 606)
+        Me.ClientSize = New System.Drawing.Size(347, 394)
         Me.Controls.Add(Me.Button1)
         Me.Controls.Add(Me.Button2)
         Me.Controls.Add(Me.lbl)
         Me.Controls.Add(Me.dgvChatMembers)
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Name = "frmMessenger_Members"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "Mitglieder"

VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger_NeuerChat.Designer.vb

@@ -25,6 +25,9 @@ Partial Class frmMessenger_NeuerChat
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger_NeuerChat))
         Me.dgvMitarbeiter = New System.Windows.Forms.DataGridView()
         Me.dgvChatMembers = New System.Windows.Forms.DataGridView()
+        Me.clmnMaId = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnFirma = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.btn = New System.Windows.Forms.Button()
         Me.lbl = New System.Windows.Forms.Label()
         Me.Label1 = New System.Windows.Forms.Label()
@@ -34,9 +37,6 @@ Partial Class frmMessenger_NeuerChat
         Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.clmnMaId = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.clmnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.clmnFirma = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         CType(Me.dgvMitarbeiter, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dgvChatMembers, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -72,6 +72,26 @@ Partial Class frmMessenger_NeuerChat
         Me.dgvChatMembers.Size = New System.Drawing.Size(327, 323)
         Me.dgvChatMembers.TabIndex = 2
         '
+        'clmnMaId
+        '
+        Me.clmnMaId.HeaderText = "Column1"
+        Me.clmnMaId.Name = "clmnMaId"
+        Me.clmnMaId.ReadOnly = True
+        Me.clmnMaId.Visible = False
+        '
+        'clmnName
+        '
+        Me.clmnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.clmnName.HeaderText = "Name"
+        Me.clmnName.Name = "clmnName"
+        Me.clmnName.ReadOnly = True
+        '
+        'clmnFirma
+        '
+        Me.clmnFirma.HeaderText = "Firma"
+        Me.clmnFirma.Name = "clmnFirma"
+        Me.clmnFirma.ReadOnly = True
+        '
         'btn
         '
         Me.btn.BackColor = System.Drawing.Color.SteelBlue
@@ -144,10 +164,12 @@ Partial Class frmMessenger_NeuerChat
         Me.MyTextBox2._DateTimeOnly = False
         Me.MyTextBox2._numbersOnly = False
         Me.MyTextBox2._numbersOnlyKommastellen = ""
+        Me.MyTextBox2._numbersOnlyTrennzeichen = True
         Me.MyTextBox2._Prozent = False
         Me.MyTextBox2._ShortDateNew = False
         Me.MyTextBox2._ShortDateOnly = False
         Me.MyTextBox2._TimeOnly = False
+        Me.MyTextBox2._TimeOnly_Seconds = False
         Me.MyTextBox2._value = ""
         Me.MyTextBox2._Waehrung = False
         Me.MyTextBox2._WaehrungZeichen = True
@@ -161,35 +183,17 @@ Partial Class frmMessenger_NeuerChat
         Me.MyTextBox2.Size = New System.Drawing.Size(327, 20)
         Me.MyTextBox2.TabIndex = 6
         '
-        'clmnMaId
-        '
-        Me.clmnMaId.HeaderText = "Column1"
-        Me.clmnMaId.Name = "clmnMaId"
-        Me.clmnMaId.ReadOnly = True
-        Me.clmnMaId.Visible = False
-        '
-        'clmnName
-        '
-        Me.clmnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        Me.clmnName.HeaderText = "Name"
-        Me.clmnName.Name = "clmnName"
-        Me.clmnName.ReadOnly = True
-        '
-        'clmnFirma
-        '
-        Me.clmnFirma.HeaderText = "Firma"
-        Me.clmnFirma.Name = "clmnFirma"
-        Me.clmnFirma.ReadOnly = True
-        '
         'MyTextBox1
         '
         Me.MyTextBox1._DateTimeOnly = False
         Me.MyTextBox1._numbersOnly = False
         Me.MyTextBox1._numbersOnlyKommastellen = ""
+        Me.MyTextBox1._numbersOnlyTrennzeichen = True
         Me.MyTextBox1._Prozent = False
         Me.MyTextBox1._ShortDateNew = False
         Me.MyTextBox1._ShortDateOnly = False
         Me.MyTextBox1._TimeOnly = False
+        Me.MyTextBox1._TimeOnly_Seconds = False
         Me.MyTextBox1._value = ""
         Me.MyTextBox1._Waehrung = False
         Me.MyTextBox1._WaehrungZeichen = True

VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger_SonstigeNEW.Designer.vb

@@ -71,8 +71,7 @@ Partial Class frmMessenger_SonstigeNEW
         '
         Me.lblErrArt.AutoSize = True
         Me.lblErrArt.ForeColor = System.Drawing.Color.Red
-        Me.lblErrArt.Location = New System.Drawing.Point(126, 164)
+        Me.lblErrArt.Location = New System.Drawing.Point(84, 107)
-        Me.lblErrArt.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblErrArt.Name = "lblErrArt"
         Me.lblErrArt.Size = New System.Drawing.Size(68, 13)
         Me.lblErrArt.TabIndex = 4
@@ -105,6 +104,7 @@ Partial Class frmMessenger_SonstigeNEW
         '
         Me.SplitContainer.Dock = System.Windows.Forms.DockStyle.Fill
         Me.SplitContainer.Location = New System.Drawing.Point(0, 0)
+        Me.SplitContainer.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
         Me.SplitContainer.Name = "SplitContainer"
         '
         'SplitContainer.Panel1
@@ -120,16 +120,18 @@ Partial Class frmMessenger_SonstigeNEW
         Me.SplitContainer.Panel2.Controls.Add(Me.Button6)
         Me.SplitContainer.Panel2.Controls.Add(Me.dgvChatMembers)
         Me.SplitContainer.Panel2.Controls.Add(Me.Label1)
-        Me.SplitContainer.Size = New System.Drawing.Size(1502, 1171)
+        Me.SplitContainer.Size = New System.Drawing.Size(1001, 761)
-        Me.SplitContainer.SplitterDistance = 1019
+        Me.SplitContainer.SplitterDistance = 679
+        Me.SplitContainer.SplitterWidth = 3
         Me.SplitContainer.TabIndex = 11
         '
         'pnlMain
         '
         Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.pnlMain.Location = New System.Drawing.Point(0, 187)
+        Me.pnlMain.Location = New System.Drawing.Point(0, 122)
+        Me.pnlMain.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
         Me.pnlMain.Name = "pnlMain"
-        Me.pnlMain.Size = New System.Drawing.Size(1019, 861)
+        Me.pnlMain.Size = New System.Drawing.Size(679, 558)
         Me.pnlMain.TabIndex = 9
         '
         'Panel2
@@ -138,9 +140,10 @@ Partial Class frmMessenger_SonstigeNEW
         Me.Panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.Panel2.Controls.Add(Me.Button8)
         Me.Panel2.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.Panel2.Location = New System.Drawing.Point(0, 1048)
+        Me.Panel2.Location = New System.Drawing.Point(0, 680)
+        Me.Panel2.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
         Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(1019, 123)
+        Me.Panel2.Size = New System.Drawing.Size(679, 81)
         Me.Panel2.TabIndex = 12
         '
         'Button8
@@ -148,10 +151,9 @@ Partial Class frmMessenger_SonstigeNEW
         Me.Button8.BackColor = System.Drawing.Color.White
         Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button8.ForeColor = System.Drawing.Color.Black
-        Me.Button8.Location = New System.Drawing.Point(762, 28)
+        Me.Button8.Location = New System.Drawing.Point(508, 18)
-        Me.Button8.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Button8.Name = "Button8"
-        Me.Button8.Size = New System.Drawing.Size(240, 75)
+        Me.Button8.Size = New System.Drawing.Size(160, 49)
         Me.Button8.TabIndex = 16
         Me.Button8.Text = "Speichern"
         Me.Button8.UseVisualStyleBackColor = False
@@ -171,8 +173,9 @@ Partial Class frmMessenger_SonstigeNEW
         Me.pnl.Controls.Add(Me.Button7)
         Me.pnl.Dock = System.Windows.Forms.DockStyle.Top
         Me.pnl.Location = New System.Drawing.Point(0, 0)
+        Me.pnl.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
         Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(1019, 187)
+        Me.pnl.Size = New System.Drawing.Size(679, 122)
         Me.pnl.TabIndex = 8
         '
         'Button3
@@ -180,10 +183,9 @@ Partial Class frmMessenger_SonstigeNEW
         Me.Button3.BackColor = System.Drawing.Color.Red
         Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button3.ForeColor = System.Drawing.Color.White
-        Me.Button3.Location = New System.Drawing.Point(878, 30)
+        Me.Button3.Location = New System.Drawing.Point(585, 20)
-        Me.Button3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Button3.Name = "Button3"
-        Me.Button3.Size = New System.Drawing.Size(124, 51)
+        Me.Button3.Size = New System.Drawing.Size(83, 33)
         Me.Button3.TabIndex = 14
         Me.Button3.Text = "Löschen"
         Me.Button3.UseVisualStyleBackColor = False
@@ -193,8 +195,7 @@ Partial Class frmMessenger_SonstigeNEW
         '
         Me.lblErrName.AutoSize = True
         Me.lblErrName.ForeColor = System.Drawing.Color.Red
-        Me.lblErrName.Location = New System.Drawing.Point(126, 63)
+        Me.lblErrName.Location = New System.Drawing.Point(84, 41)
-        Me.lblErrName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblErrName.Name = "lblErrName"
         Me.lblErrName.Size = New System.Drawing.Size(83, 13)
         Me.lblErrName.TabIndex = 10
@@ -208,19 +209,19 @@ Partial Class frmMessenger_SonstigeNEW
         Me.cboArt._value = ""
         Me.cboArt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
         Me.cboArt.FormattingEnabled = True
-        Me.cboArt.Location = New System.Drawing.Point(130, 126)
+        Me.cboArt.Location = New System.Drawing.Point(87, 82)
+        Me.cboArt.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
         Me.cboArt.Name = "cboArt"
-        Me.cboArt.Size = New System.Drawing.Size(674, 37)
+        Me.cboArt.Size = New System.Drawing.Size(451, 28)
         Me.cboArt.TabIndex = 9
         '
         'Label4
         '
         Me.Label4.AutoSize = True
         Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
-        Me.Label4.Location = New System.Drawing.Point(28, 126)
+        Me.Label4.Location = New System.Drawing.Point(19, 82)
-        Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(48, 29)
+        Me.Label4.Size = New System.Drawing.Size(34, 20)
         Me.Label4.TabIndex = 8
         Me.Label4.Text = "Art:"
         '
@@ -228,10 +229,9 @@ Partial Class frmMessenger_SonstigeNEW
         '
         Me.Label3.AutoSize = True
         Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
-        Me.Label3.Location = New System.Drawing.Point(28, 89)
+        Me.Label3.Location = New System.Drawing.Point(19, 58)
-        Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(84, 29)
+        Me.Label3.Size = New System.Drawing.Size(55, 20)
         Me.Label3.TabIndex = 7
         Me.Label3.Text = "Name:"
         '
@@ -251,23 +251,23 @@ Partial Class frmMessenger_SonstigeNEW
         Me.MyTextBox1._WaehrungZeichen = True
         Me.MyTextBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
         Me.MyTextBox1.ForeColor = System.Drawing.Color.Black
-        Me.MyTextBox1.Location = New System.Drawing.Point(130, 86)
+        Me.MyTextBox1.Location = New System.Drawing.Point(87, 56)
+        Me.MyTextBox1.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
         Me.MyTextBox1.MaxLength = 200
         Me.MyTextBox1.MaxLineLength = -1
         Me.MyTextBox1.MaxLines_Warning = ""
         Me.MyTextBox1.MaxLines_Warning_Label = Nothing
         Me.MyTextBox1.Name = "MyTextBox1"
-        Me.MyTextBox1.Size = New System.Drawing.Size(673, 35)
+        Me.MyTextBox1.Size = New System.Drawing.Size(450, 26)
         Me.MyTextBox1.TabIndex = 6
         '
         'Label2
         '
         Me.Label2.AutoSize = True
         Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label2.Location = New System.Drawing.Point(27, 28)
+        Me.Label2.Location = New System.Drawing.Point(18, 18)
-        Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(230, 29)
+        Me.Label2.Size = New System.Drawing.Size(157, 20)
         Me.Label2.TabIndex = 5
         Me.Label2.Text = "CHAT Erweiterung"
         '
@@ -276,10 +276,9 @@ Partial Class frmMessenger_SonstigeNEW
         Me.Button7.BackColor = System.Drawing.Color.MediumSeaGreen
         Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button7.ForeColor = System.Drawing.Color.White
-        Me.Button7.Location = New System.Drawing.Point(811, 88)
+        Me.Button7.Location = New System.Drawing.Point(541, 57)
-        Me.Button7.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Button7.Name = "Button7"
-        Me.Button7.Size = New System.Drawing.Size(191, 75)
+        Me.Button7.Size = New System.Drawing.Size(127, 49)
         Me.Button7.TabIndex = 4
         Me.Button7.Text = "Erstellen"
         Me.Button7.UseVisualStyleBackColor = False
@@ -290,10 +289,9 @@ Partial Class frmMessenger_SonstigeNEW
         Me.Button5.BackColor = System.Drawing.Color.Red
         Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button5.ForeColor = System.Drawing.Color.White
-        Me.Button5.Location = New System.Drawing.Point(212, 977)
+        Me.Button5.Location = New System.Drawing.Point(141, 635)
-        Me.Button5.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Button5.Name = "Button5"
-        Me.Button5.Size = New System.Drawing.Size(124, 51)
+        Me.Button5.Size = New System.Drawing.Size(83, 33)
         Me.Button5.TabIndex = 12
         Me.Button5.Text = "- Entfernen"
         Me.Button5.UseVisualStyleBackColor = False
@@ -307,9 +305,10 @@ Partial Class frmMessenger_SonstigeNEW
         Me.Panel3.Controls.Add(Me.Button2)
         Me.Panel3.Controls.Add(Me.Button1)
         Me.Panel3.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.Panel3.Location = New System.Drawing.Point(0, 1048)
+        Me.Panel3.Location = New System.Drawing.Point(0, 680)
+        Me.Panel3.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
         Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(479, 123)
+        Me.Panel3.Size = New System.Drawing.Size(319, 81)
         Me.Panel3.TabIndex = 13
         '
         'Button4
@@ -318,10 +317,9 @@ Partial Class frmMessenger_SonstigeNEW
         Me.Button4.BackColor = System.Drawing.Color.Red
         Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button4.ForeColor = System.Drawing.Color.White
-        Me.Button4.Location = New System.Drawing.Point(79, 28)
+        Me.Button4.Location = New System.Drawing.Point(52, 18)
-        Me.Button4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Button4.Name = "Button4"
-        Me.Button4.Size = New System.Drawing.Size(124, 75)
+        Me.Button4.Size = New System.Drawing.Size(83, 49)
         Me.Button4.TabIndex = 15
         Me.Button4.Text = "Verbergen"
         Me.Button4.UseVisualStyleBackColor = False
@@ -332,10 +330,9 @@ Partial Class frmMessenger_SonstigeNEW
         Me.Button2.BackColor = System.Drawing.Color.MediumSeaGreen
         Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button2.ForeColor = System.Drawing.Color.White
-        Me.Button2.Location = New System.Drawing.Point(919, 28)
+        Me.Button2.Location = New System.Drawing.Point(613, 18)
-        Me.Button2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(191, 75)
+        Me.Button2.Size = New System.Drawing.Size(127, 49)
         Me.Button2.TabIndex = 4
         Me.Button2.Text = "Erstellen"
         Me.Button2.UseVisualStyleBackColor = False
@@ -346,10 +343,9 @@ Partial Class frmMessenger_SonstigeNEW
         Me.Button1.BackColor = System.Drawing.Color.MediumSeaGreen
         Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button1.ForeColor = System.Drawing.Color.White
-        Me.Button1.Location = New System.Drawing.Point(211, 28)
+        Me.Button1.Location = New System.Drawing.Point(140, 18)
-        Me.Button1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(240, 75)
+        Me.Button1.Size = New System.Drawing.Size(160, 49)
         Me.Button1.TabIndex = 4
         Me.Button1.Text = "Freigeben" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(Chat starten)"
         Me.Button1.UseVisualStyleBackColor = False
@@ -360,10 +356,9 @@ Partial Class frmMessenger_SonstigeNEW
         Me.Button6.BackColor = System.Drawing.Color.MediumSeaGreen
         Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button6.ForeColor = System.Drawing.Color.White
-        Me.Button6.Location = New System.Drawing.Point(346, 977)
+        Me.Button6.Location = New System.Drawing.Point(231, 635)
-        Me.Button6.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Button6.Name = "Button6"
-        Me.Button6.Size = New System.Drawing.Size(106, 51)
+        Me.Button6.Size = New System.Drawing.Size(71, 33)
         Me.Button6.TabIndex = 11
         Me.Button6.Text = "+ NEU"
         Me.Button6.UseVisualStyleBackColor = False
@@ -397,8 +392,7 @@ Partial Class frmMessenger_SonstigeNEW
         DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
         DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
         Me.dgvChatMembers.DefaultCellStyle = DataGridViewCellStyle2
-        Me.dgvChatMembers.Location = New System.Drawing.Point(16, 31)
+        Me.dgvChatMembers.Location = New System.Drawing.Point(11, 20)
-        Me.dgvChatMembers.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.dgvChatMembers.Name = "dgvChatMembers"
         Me.dgvChatMembers.ReadOnly = True
         DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
@@ -412,7 +406,7 @@ Partial Class frmMessenger_SonstigeNEW
         Me.dgvChatMembers.RowHeadersVisible = False
         Me.dgvChatMembers.RowHeadersWidth = 62
         Me.dgvChatMembers.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvChatMembers.Size = New System.Drawing.Size(436, 936)
+        Me.dgvChatMembers.Size = New System.Drawing.Size(291, 608)
         Me.dgvChatMembers.TabIndex = 7
         '
         'DataGridViewTextBoxColumn7
@@ -443,8 +437,7 @@ Partial Class frmMessenger_SonstigeNEW
         'Label1
         '
         Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(12, 9)
+        Me.Label1.Location = New System.Drawing.Point(8, 6)
-        Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(55, 13)
         Me.Label1.TabIndex = 8
@@ -474,13 +467,12 @@ Partial Class frmMessenger_SonstigeNEW
         '
         'frmMessenger_SonstigeNEW
         '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(1502, 1171)
+        Me.ClientSize = New System.Drawing.Size(1001, 761)
         Me.Controls.Add(Me.SplitContainer)
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Name = "frmMessenger_SonstigeNEW"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "Mitglieder"

VERAG_PROG_ALLGEMEIN/Messenger/usrCntlChat_Art_Btn.Designer.vb

@@ -43,13 +43,14 @@ Partial Class usrCntlChat_Art_Btn
         '
         'lblLKWChat_MsgCnt
         '
-        Me.lblLKWChat_MsgCnt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.lblLKWChat_MsgCnt.BackColor = System.Drawing.Color.Red
+        Me.lblLKWChat_MsgCnt.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
+        Me.lblLKWChat_MsgCnt.Dock = System.Windows.Forms.DockStyle.Right
         Me.lblLKWChat_MsgCnt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold)
         Me.lblLKWChat_MsgCnt.ForeColor = System.Drawing.Color.White
-        Me.lblLKWChat_MsgCnt.Location = New System.Drawing.Point(95, 4)
+        Me.lblLKWChat_MsgCnt.Location = New System.Drawing.Point(98, 0)
         Me.lblLKWChat_MsgCnt.Name = "lblLKWChat_MsgCnt"
-        Me.lblLKWChat_MsgCnt.Size = New System.Drawing.Size(26, 21)
+        Me.lblLKWChat_MsgCnt.Size = New System.Drawing.Size(26, 29)
         Me.lblLKWChat_MsgCnt.TabIndex = 105
         Me.lblLKWChat_MsgCnt.Text = "99"
         Me.lblLKWChat_MsgCnt.TextAlign = System.Drawing.ContentAlignment.MiddleCenter

VERAG_PROG_ALLGEMEIN/cAllgemein.vb

@@ -183,6 +183,23 @@ Public Class cAllgemein
     Public Shared Sub _TRANSLATE(o As System.Windows.Forms.Control, lan As String)
         _TRANSLATE(o, o, lan)
     End Sub
+    Public Shared Function _getTRANSLATE_SUB(oMain As System.Windows.Forms.Control, o As System.Windows.Forms.Control, s As Object, Optional defaultStr As String = "") As String
+        If defaultStr = "" Then defaultStr = s.Text
+        If _LAN = "DE" Then Return defaultStr
+        Dim TextTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.TRANSLATE.list.FindAll(Function(x) x.trs_object = oMain.Name And x.trs_control = o.Name And (x.trs_subControl IsNot DBNull.Value AndAlso x.trs_subControl = s.Name) And x.trs_sprache = _LAN)
+        If TextTmp IsNot Nothing And TextTmp.Count > 0 Then
+            Return TextTmp(0).trs_text
+        End If
+        Return defaultStr
+    End Function
+    Public Shared Function _getTRANSLATE(oMain As System.Windows.Forms.Control, o As System.Windows.Forms.Control, Optional defaultStr As String = "") As String
+        If defaultStr = "" Then defaultStr = o.Text
+        Dim TextTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.TRANSLATE.list.FindAll(Function(x) x.trs_object = oMain.Name And x.trs_control = o.Name And x.trs_sprache = _LAN)
+        If TextTmp IsNot Nothing And TextTmp.Count > 0 Then
+            Return TextTmp(0).trs_text
+        End If
+        Return defaultStr
+    End Function
     Public Shared Sub _TRANSLATE(o As System.Windows.Forms.Control, s As System.Windows.Forms.Control, lan As String)
         If lan = "" Then Exit Sub
         If lan = "DE" Then Exit Sub
@@ -206,6 +223,9 @@ Public Class cAllgemein
                         If (TypeOf obj Is System.Windows.Forms.Button) Or (TypeOf obj Is VERAG_PROG_ALLGEMEIN.FlatButton) Then
                             DirectCast(obj, System.Windows.Forms.Button).Text = TXT.trs_text
                         End If
+                        If (TypeOf obj Is System.Windows.Forms.CheckBox) Or (TypeOf obj Is VERAG_PROG_ALLGEMEIN.MyCheckbox) Then
+                            DirectCast(obj, System.Windows.Forms.CheckBox).Text = TXT.trs_text
+                        End If
                         If (TypeOf obj Is System.Windows.Forms.TabPage) Then
                             DirectCast(obj, System.Windows.Forms.TabPage).Text = TXT.trs_text
                         End If
@@ -215,6 +235,15 @@ Public Class cAllgemein
                         If (TypeOf obj Is System.Windows.Forms.GroupBox) Then
                             DirectCast(obj, System.Windows.Forms.GroupBox).Text = TXT.trs_text
                         End If
+
+                        If (TypeOf obj Is System.Windows.Forms.MenuStrip) Then
+                            For Each tb As System.Windows.Forms.ToolStripMenuItem In DirectCast(obj, System.Windows.Forms.MenuStrip).Items
+                                If tb.Name = TXT.trs_subControl Then
+                                    tb.Text = TXT.trs_text
+                                End If
+                            Next
+                        End If
+
                         'If (TypeOf obj Is System.Windows.Forms.TabControl) Then -->in Tabpage geregelt
                         '    For Each tb As System.Windows.Forms.TabPage In DirectCast(obj, System.Windows.Forms.TabControl).TabPages
                         '        If tb.Name = TXT.trs_subControl Then