diff --git a/DDUserManager/DDUserManager/frmMain.Designer.vb b/DDUserManager/DDUserManager/frmMain.Designer.vb index edfe078..36bba75 100644 --- a/DDUserManager/DDUserManager/frmMain.Designer.vb +++ b/DDUserManager/DDUserManager/frmMain.Designer.vb @@ -181,7 +181,6 @@ Partial Class frmMain Me.TBDD_USERBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() - Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorMovePreviousItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorSeparator = New System.Windows.Forms.ToolStripSeparator() @@ -190,6 +189,7 @@ Partial Class frmMain Me.BindingNavigatorMoveNextItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator() + Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton() Me.TBDD_USERBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton() Me.btnImportUsers = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton() @@ -552,7 +552,7 @@ Partial Class frmMain 'USERNAMELabel ' USERNAMELabel.AutoSize = True - USERNAMELabel.Location = New System.Drawing.Point(238, 67) + USERNAMELabel.Location = New System.Drawing.Point(285, 68) USERNAMELabel.Name = "USERNAMELabel" USERNAMELabel.Size = New System.Drawing.Size(80, 13) USERNAMELabel.TabIndex = 6 @@ -561,7 +561,7 @@ Partial Class frmMain 'SHORTNAMELabel ' SHORTNAMELabel.AutoSize = True - SHORTNAMELabel.Location = New System.Drawing.Point(238, 94) + SHORTNAMELabel.Location = New System.Drawing.Point(285, 95) SHORTNAMELabel.Name = "SHORTNAMELabel" SHORTNAMELabel.Size = New System.Drawing.Size(40, 13) SHORTNAMELabel.TabIndex = 8 @@ -580,7 +580,7 @@ Partial Class frmMain 'LANGUAGELabel ' LANGUAGELabel.AutoSize = True - LANGUAGELabel.Location = New System.Drawing.Point(238, 120) + LANGUAGELabel.Location = New System.Drawing.Point(285, 121) LANGUAGELabel.Name = "LANGUAGELabel" LANGUAGELabel.Size = New System.Drawing.Size(50, 13) LANGUAGELabel.TabIndex = 12 @@ -589,7 +589,7 @@ Partial Class frmMain 'COMMENTLabel ' COMMENTLabel.AutoSize = True - COMMENTLabel.Location = New System.Drawing.Point(238, 147) + COMMENTLabel.Location = New System.Drawing.Point(285, 148) COMMENTLabel.Name = "COMMENTLabel" COMMENTLabel.Size = New System.Drawing.Size(65, 13) COMMENTLabel.TabIndex = 16 @@ -931,7 +931,7 @@ Partial Class frmMain Me.LANGUAGEComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "LANGUAGE", True)) Me.LANGUAGEComboBox.FormattingEnabled = True Me.LANGUAGEComboBox.Items.AddRange(New Object() {"de-DE", "en-US"}) - Me.LANGUAGEComboBox.Location = New System.Drawing.Point(347, 117) + Me.LANGUAGEComboBox.Location = New System.Drawing.Point(394, 118) Me.LANGUAGEComboBox.Name = "LANGUAGEComboBox" Me.LANGUAGEComboBox.Size = New System.Drawing.Size(109, 21) Me.LANGUAGEComboBox.TabIndex = 55 @@ -989,7 +989,7 @@ Partial Class frmMain Me.PRENAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "PRENAME", True)) Me.PRENAMETextBox.Location = New System.Drawing.Point(106, 64) Me.PRENAMETextBox.Name = "PRENAMETextBox" - Me.PRENAMETextBox.Size = New System.Drawing.Size(109, 21) + Me.PRENAMETextBox.Size = New System.Drawing.Size(160, 21) Me.PRENAMETextBox.TabIndex = 3 ' 'EMAILTextBox @@ -997,7 +997,7 @@ Partial Class frmMain Me.EMAILTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "EMAIL", True)) Me.EMAILTextBox.Location = New System.Drawing.Point(106, 117) Me.EMAILTextBox.Name = "EMAILTextBox" - Me.EMAILTextBox.Size = New System.Drawing.Size(109, 21) + Me.EMAILTextBox.Size = New System.Drawing.Size(160, 21) Me.EMAILTextBox.TabIndex = 11 ' 'ADDED_WHOTextBox @@ -1022,9 +1022,9 @@ Partial Class frmMain 'COMMENTTextBox ' Me.COMMENTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "COMMENT", True)) - Me.COMMENTTextBox.Location = New System.Drawing.Point(347, 144) + Me.COMMENTTextBox.Location = New System.Drawing.Point(394, 145) Me.COMMENTTextBox.Name = "COMMENTTextBox" - Me.COMMENTTextBox.Size = New System.Drawing.Size(109, 21) + Me.COMMENTTextBox.Size = New System.Drawing.Size(144, 21) Me.COMMENTTextBox.TabIndex = 17 ' 'NAMETextBox @@ -1032,23 +1032,23 @@ Partial Class frmMain Me.NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "NAME", True)) Me.NAMETextBox.Location = New System.Drawing.Point(106, 91) Me.NAMETextBox.Name = "NAMETextBox" - Me.NAMETextBox.Size = New System.Drawing.Size(109, 21) + Me.NAMETextBox.Size = New System.Drawing.Size(160, 21) Me.NAMETextBox.TabIndex = 5 ' 'USERNAMETextBox ' Me.USERNAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "USERNAME", True)) - Me.USERNAMETextBox.Location = New System.Drawing.Point(347, 64) + Me.USERNAMETextBox.Location = New System.Drawing.Point(394, 65) Me.USERNAMETextBox.Name = "USERNAMETextBox" - Me.USERNAMETextBox.Size = New System.Drawing.Size(109, 21) + Me.USERNAMETextBox.Size = New System.Drawing.Size(144, 21) Me.USERNAMETextBox.TabIndex = 7 ' 'SHORTNAMETextBox ' Me.SHORTNAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "SHORTNAME", True)) - Me.SHORTNAMETextBox.Location = New System.Drawing.Point(347, 91) + Me.SHORTNAMETextBox.Location = New System.Drawing.Point(394, 92) Me.SHORTNAMETextBox.Name = "SHORTNAMETextBox" - Me.SHORTNAMETextBox.Size = New System.Drawing.Size(109, 21) + Me.SHORTNAMETextBox.Size = New System.Drawing.Size(144, 21) Me.SHORTNAMETextBox.TabIndex = 9 ' 'Label12 @@ -2089,15 +2089,6 @@ Partial Class frmMain Me.BindingNavigatorCountItem.Text = "von {0} Benutzern" Me.BindingNavigatorCountItem.ToolTipText = "Die Gesamtanzahl der Elemente." ' - 'BindingNavigatorDeleteItem - ' - Me.BindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.BindingNavigatorDeleteItem.Image = CType(resources.GetObject("BindingNavigatorDeleteItem.Image"), System.Drawing.Image) - Me.BindingNavigatorDeleteItem.Name = "BindingNavigatorDeleteItem" - Me.BindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = True - Me.BindingNavigatorDeleteItem.Size = New System.Drawing.Size(23, 22) - Me.BindingNavigatorDeleteItem.Text = "Löschen" - ' 'BindingNavigatorMoveFirstItem ' Me.BindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image @@ -2158,6 +2149,15 @@ Partial Class frmMain Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2" Me.BindingNavigatorSeparator2.Size = New System.Drawing.Size(6, 25) ' + 'BindingNavigatorDeleteItem + ' + Me.BindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.BindingNavigatorDeleteItem.Image = CType(resources.GetObject("BindingNavigatorDeleteItem.Image"), System.Drawing.Image) + Me.BindingNavigatorDeleteItem.Name = "BindingNavigatorDeleteItem" + Me.BindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = True + Me.BindingNavigatorDeleteItem.Size = New System.Drawing.Size(23, 22) + Me.BindingNavigatorDeleteItem.Text = "Löschen" + ' 'TBDD_USERBindingNavigatorSaveItem ' Me.TBDD_USERBindingNavigatorSaveItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image @@ -2284,7 +2284,7 @@ Partial Class frmMain Me.NAMETextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_GROUPSBindingSource1, "NAME", True)) Me.NAMETextBox1.Location = New System.Drawing.Point(106, 64) Me.NAMETextBox1.Name = "NAMETextBox1" - Me.NAMETextBox1.Size = New System.Drawing.Size(128, 21) + Me.NAMETextBox1.Size = New System.Drawing.Size(409, 21) Me.NAMETextBox1.TabIndex = 4 ' 'TextBox3 @@ -2301,7 +2301,7 @@ Partial Class frmMain Me.COMMENTTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_GROUPSBindingSource1, "COMMENT", True)) Me.COMMENTTextBox1.Location = New System.Drawing.Point(106, 91) Me.COMMENTTextBox1.Name = "COMMENTTextBox1" - Me.COMMENTTextBox1.Size = New System.Drawing.Size(128, 21) + Me.COMMENTTextBox1.Size = New System.Drawing.Size(409, 21) Me.COMMENTTextBox1.TabIndex = 6 ' 'ADDED_WHOTextBox1 @@ -3071,7 +3071,7 @@ Partial Class frmMain Me.CLIENT_NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CLIENTBindingSource, "CLIENT_NAME", True)) Me.CLIENT_NAMETextBox.Location = New System.Drawing.Point(106, 64) Me.CLIENT_NAMETextBox.Name = "CLIENT_NAMETextBox" - Me.CLIENT_NAMETextBox.Size = New System.Drawing.Size(109, 21) + Me.CLIENT_NAMETextBox.Size = New System.Drawing.Size(408, 21) Me.CLIENT_NAMETextBox.TabIndex = 3 ' 'CHANGED_WHOTextBox2 @@ -3088,7 +3088,7 @@ Partial Class frmMain Me.SHORTNAMETextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CLIENTBindingSource, "SHORTNAME", True)) Me.SHORTNAMETextBox1.Location = New System.Drawing.Point(106, 91) Me.SHORTNAMETextBox1.Name = "SHORTNAMETextBox1" - Me.SHORTNAMETextBox1.Size = New System.Drawing.Size(109, 21) + Me.SHORTNAMETextBox1.Size = New System.Drawing.Size(408, 21) Me.SHORTNAMETextBox1.TabIndex = 5 ' 'TextBox6 @@ -3105,7 +3105,7 @@ Partial Class frmMain Me.COMMENTTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CLIENTBindingSource, "COMMENT", True)) Me.COMMENTTextBox2.Location = New System.Drawing.Point(106, 118) Me.COMMENTTextBox2.Name = "COMMENTTextBox2" - Me.COMMENTTextBox2.Size = New System.Drawing.Size(109, 21) + Me.COMMENTTextBox2.Size = New System.Drawing.Size(408, 21) Me.COMMENTTextBox2.TabIndex = 7 ' 'TextBox5 diff --git a/DDUserManager/DDUserManager/frmMain.resx b/DDUserManager/DDUserManager/frmMain.resx index 6313187..bda8c14 100644 --- a/DDUserManager/DDUserManager/frmMain.resx +++ b/DDUserManager/DDUserManager/frmMain.resx @@ -220,19 +220,19 @@ 17, 17 - 642, 95 + 469, 95 489, 56 - 911, 56 + 703, 56 - 17, 173 + 1026, 134 - 1162, 134 + 906, 134 693, 17 @@ -310,7 +310,7 @@ - 190, 95 + 17, 95 @@ -403,7 +403,7 @@ - 420, 95 + 247, 95 @@ -477,7 +477,7 @@ - 1082, 95 + 909, 95 @@ -535,37 +535,37 @@ 256, 56 - 1116, 56 + 908, 56 - 865, 95 + 692, 95 - 17, 134 + 1148, 95 - 273, 134 + 17, 134 - 524, 134 + 268, 134 - 641, 134 + 385, 134 - 910, 134 + 654, 134 - 237, 173 + 1246, 134 - 445, 173 + 17, 173 1152, 17 - 17, 95 + 1107, 56 198 diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb index 92711ec..f64caca 100644 --- a/DDUserManager/DDUserManager/frmMain.vb +++ b/DDUserManager/DDUserManager/frmMain.vb @@ -1115,7 +1115,8 @@ Public Class frmMain Dim oMessage = String.Format("Wollen sie den Benutzer {0} löschen?", oUsername) If MessageBox.Show(oMessage, "Benutzer löschen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) = DialogResult.Yes Then - If QueriesTableAdapter1.PRDD_DELETE_USER(oUserId) = -1 Then + Dim osql = $"EXEC PRDD_DELETE_USER {oUserId}" + If clsDatabase.Execute_Scalar(osql) = -1 Then MessageBox.Show("Fehler beim Löschen des Benutzers.", "Benutzer löschen", MessageBoxButtons.OK, MessageBoxIcon.Warning) Else UpdateSavedLabel()