From 1ad6c7ec656319850d9e866cdec045cf1a3d4466 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 15 Jun 2018 10:48:17 +0200 Subject: [PATCH] jj: fix group/modules grid, add combobox for user language --- .../DDUserManager/frmMain.Designer.vb | 38 +++++++++++------ DDUserManager/DDUserManager/frmMain.resx | 41 +++++++++++++++---- 2 files changed, 60 insertions(+), 19 deletions(-) diff --git a/DDUserManager/DDUserManager/frmMain.Designer.vb b/DDUserManager/DDUserManager/frmMain.Designer.vb index 59c8a3f..fe3810b 100644 --- a/DDUserManager/DDUserManager/frmMain.Designer.vb +++ b/DDUserManager/DDUserManager/frmMain.Designer.vb @@ -69,7 +69,6 @@ Partial Class frmMain Me.PRENAMETextBox = New System.Windows.Forms.TextBox() Me.EMAILTextBox = New System.Windows.Forms.TextBox() Me.ADDED_WHOTextBox = New System.Windows.Forms.TextBox() - Me.LANGUAGETextBox = New System.Windows.Forms.TextBox() Me.GUIDTextBox = New System.Windows.Forms.TextBox() Me.COMMENTTextBox = New System.Windows.Forms.TextBox() Me.NAMETextBox = New System.Windows.Forms.TextBox() @@ -337,6 +336,7 @@ Partial Class frmMain Me.TBDD_GROUPSTableAdapter = New DDUserManager.DS_ChangeSTableAdapters.TBDD_GROUPSTableAdapter() Me.TableAdapterManager1 = New DDUserManager.DS_ChangeSTableAdapters.TableAdapterManager() Me.TBDD_GROUPS_USERTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_GROUPS_USERTableAdapter() + Me.LANGUAGEComboBox = New System.Windows.Forms.ComboBox() GUIDLabel = New System.Windows.Forms.Label() PRENAMELabel = New System.Windows.Forms.Label() NAMELabel = New System.Windows.Forms.Label() @@ -822,10 +822,12 @@ Partial Class frmMain ' Me.SplitContainer1.Panel1.Controls.Add(Me.SplitContainer2) Me.SplitContainer1.Panel1.Controls.Add(Me.GridUsers) + Me.SplitContainer1.Panel1.RightToLeft = System.Windows.Forms.RightToLeft.No ' 'SplitContainer1.Panel2 ' Me.SplitContainer1.Panel2.Controls.Add(Me.XtraTabControl2) + Me.SplitContainer1.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No Me.SplitContainer1.Size = New System.Drawing.Size(1193, 759) Me.SplitContainer1.SplitterDistance = 375 Me.SplitContainer1.TabIndex = 63 @@ -840,6 +842,7 @@ Partial Class frmMain 'SplitContainer2.Panel1 ' Me.SplitContainer2.Panel1.AutoScroll = True + Me.SplitContainer2.Panel1.Controls.Add(Me.LANGUAGEComboBox) Me.SplitContainer2.Panel1.Controls.Add(Me.DATE_FORMATComboBox) Me.SplitContainer2.Panel1.Controls.Add(Me.TextBox2) Me.SplitContainer2.Panel1.Controls.Add(Me.TextBox1) @@ -855,7 +858,6 @@ Partial Class frmMain Me.SplitContainer2.Panel1.Controls.Add(ADDED_WHENLabel) Me.SplitContainer2.Panel1.Controls.Add(Me.EMAILTextBox) Me.SplitContainer2.Panel1.Controls.Add(Me.ADDED_WHOTextBox) - Me.SplitContainer2.Panel1.Controls.Add(Me.LANGUAGETextBox) Me.SplitContainer2.Panel1.Controls.Add(COMMENTLabel) Me.SplitContainer2.Panel1.Controls.Add(Me.GUIDTextBox) Me.SplitContainer2.Panel1.Controls.Add(EMAILLabel) @@ -866,6 +868,7 @@ Partial Class frmMain Me.SplitContainer2.Panel1.Controls.Add(PRENAMELabel) Me.SplitContainer2.Panel1.Controls.Add(Me.USERNAMETextBox) Me.SplitContainer2.Panel1.Controls.Add(Me.SHORTNAMETextBox) + Me.SplitContainer2.Panel1.RightToLeft = System.Windows.Forms.RightToLeft.No ' 'SplitContainer2.Panel2 ' @@ -875,6 +878,7 @@ Partial Class frmMain Me.SplitContainer2.Panel2.Controls.Add(Me.listGroups) Me.SplitContainer2.Panel2.Controls.Add(Me.Label2) Me.SplitContainer2.Panel2.Controls.Add(Me.listClients) + Me.SplitContainer2.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No Me.SplitContainer2.Size = New System.Drawing.Size(765, 375) Me.SplitContainer2.SplitterDistance = 195 Me.SplitContainer2.TabIndex = 63 @@ -953,14 +957,6 @@ Partial Class frmMain Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(163, 21) Me.ADDED_WHOTextBox.TabIndex = 45 ' - 'LANGUAGETextBox - ' - Me.LANGUAGETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "LANGUAGE", True)) - Me.LANGUAGETextBox.Location = New System.Drawing.Point(347, 102) - Me.LANGUAGETextBox.Name = "LANGUAGETextBox" - Me.LANGUAGETextBox.Size = New System.Drawing.Size(109, 21) - Me.LANGUAGETextBox.TabIndex = 13 - ' 'GUIDTextBox ' Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "GUID", True)) @@ -1160,11 +1156,13 @@ Partial Class frmMain Me.SplitContainerUserGroups1.Panel1.Controls.Add(Me.Panel3) Me.SplitContainerUserGroups1.Panel1.Controls.Add(Me.btnGroups_AddUsers) Me.SplitContainerUserGroups1.Panel1.Controls.Add(Me.btnGroups_RemoveUsers) + Me.SplitContainerUserGroups1.Panel1.RightToLeft = System.Windows.Forms.RightToLeft.No ' 'SplitContainerUserGroups1.Panel2 ' Me.SplitContainerUserGroups1.Panel2.Controls.Add(Me.Panel2) Me.SplitContainerUserGroups1.Panel2.Controls.Add(Me.Panel1) + Me.SplitContainerUserGroups1.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No Me.SplitContainerUserGroups1.Size = New System.Drawing.Size(1187, 349) Me.SplitContainerUserGroups1.SplitterDistance = 434 Me.SplitContainerUserGroups1.TabIndex = 8 @@ -1457,11 +1455,13 @@ Partial Class frmMain Me.SplitContainer4.Panel1.Controls.Add(Me.Panel6) Me.SplitContainer4.Panel1.Controls.Add(Me.btnClients_AddUsers) Me.SplitContainer4.Panel1.Controls.Add(Me.btnClients_RemoveUsers) + Me.SplitContainer4.Panel1.RightToLeft = System.Windows.Forms.RightToLeft.No ' 'SplitContainer4.Panel2 ' Me.SplitContainer4.Panel2.Controls.Add(Me.Panel4) Me.SplitContainer4.Panel2.Controls.Add(Me.Panel5) + Me.SplitContainer4.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No Me.SplitContainer4.Size = New System.Drawing.Size(1187, 349) Me.SplitContainer4.SplitterDistance = 434 Me.SplitContainer4.TabIndex = 0 @@ -1736,11 +1736,13 @@ Partial Class frmMain Me.SplitContainer6.Panel1.Controls.Add(Me.btnModules_AddUsers) Me.SplitContainer6.Panel1.Controls.Add(Me.btnModules_RemoveUsers) Me.SplitContainer6.Panel1.Controls.Add(Me.Panel9) + Me.SplitContainer6.Panel1.RightToLeft = System.Windows.Forms.RightToLeft.No ' 'SplitContainer6.Panel2 ' Me.SplitContainer6.Panel2.Controls.Add(Me.Panel8) Me.SplitContainer6.Panel2.Controls.Add(Me.Panel7) + Me.SplitContainer6.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No Me.SplitContainer6.Size = New System.Drawing.Size(1187, 349) Me.SplitContainer6.SplitterDistance = 434 Me.SplitContainer6.TabIndex = 0 @@ -2626,9 +2628,11 @@ Partial Class frmMain ' 'Panel13 ' + Me.Panel13.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Panel13.Controls.Add(Me.gridModulesGroups_AvailableGroups) Me.Panel13.Controls.Add(Me.Label15) - Me.Panel13.Dock = System.Windows.Forms.DockStyle.Left Me.Panel13.Location = New System.Drawing.Point(0, 0) Me.Panel13.Name = "Panel13" Me.Panel13.Size = New System.Drawing.Size(320, 349) @@ -3507,6 +3511,16 @@ Partial Class frmMain ' Me.TBDD_GROUPS_USERTableAdapter.ClearBeforeFill = True ' + 'LANGUAGEComboBox + ' + 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, 102) + Me.LANGUAGEComboBox.Name = "LANGUAGEComboBox" + Me.LANGUAGEComboBox.Size = New System.Drawing.Size(109, 21) + Me.LANGUAGEComboBox.TabIndex = 55 + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3686,7 +3700,6 @@ Partial Class frmMain Friend WithEvents PRENAMETextBox As TextBox Friend WithEvents NAMETextBox As TextBox Friend WithEvents EMAILTextBox As TextBox - Friend WithEvents LANGUAGETextBox As TextBox Friend WithEvents USERNAMETextBox As TextBox Friend WithEvents SHORTNAMETextBox As TextBox Friend WithEvents GUIDTextBox As TextBox @@ -3944,4 +3957,5 @@ Partial Class frmMain Friend WithEvents TBDD_GROUPSTableAdapter As DS_ChangeSTableAdapters.TBDD_GROUPSTableAdapter Friend WithEvents TableAdapterManager1 As DS_ChangeSTableAdapters.TableAdapterManager Friend WithEvents TBDD_GROUPS_USERTableAdapter As UserDataSetTableAdapters.TBDD_GROUPS_USERTableAdapter + Friend WithEvents LANGUAGEComboBox As ComboBox End Class diff --git a/DDUserManager/DDUserManager/frmMain.resx b/DDUserManager/DDUserManager/frmMain.resx index 3c5e5c9..2bc0002 100644 --- a/DDUserManager/DDUserManager/frmMain.resx +++ b/DDUserManager/DDUserManager/frmMain.resx @@ -216,9 +216,6 @@ 136, 17 - - 17, 17 - 469, 95 @@ -228,11 +225,11 @@ 911, 56 - - 1026, 134 + + 136, 17 - - 906, 134 + + 17, 17 693, 17 @@ -312,6 +309,36 @@ 17, 95 + + 247, 95 + + + 909, 95 + + + 17, 17 + + + 469, 95 + + + 489, 56 + + + 911, 56 + + + 1026, 134 + + + 906, 134 + + + 906, 134 + + + 17, 95 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO