diff --git a/DDUserManager/DDUserManager.sln b/DDUserManager/DDUserManager.sln index d83702f..0840b9d 100644 --- a/DDUserManager/DDUserManager.sln +++ b/DDUserManager/DDUserManager.sln @@ -1,12 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2020 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29728.190 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDUserManager", "DDUserManager\DDUserManager.vbproj", "{87122913-C196-46BC-A7CD-27F7E201E55F}" EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupWix", "SetupWix\SetupWix.wixproj", "{BCE990D1-E422-4096-A4BE-6E940FB25127}" EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupVS19", "SetupVS19\SetupVS19.wixproj", "{93D47F6E-A8A5-44F1-9534-3FFCA5ED3C17}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -29,6 +31,12 @@ Global {BCE990D1-E422-4096-A4BE-6E940FB25127}.Release|Any CPU.ActiveCfg = Release|x86 {BCE990D1-E422-4096-A4BE-6E940FB25127}.Release|x86.ActiveCfg = Release|x86 {BCE990D1-E422-4096-A4BE-6E940FB25127}.Release|x86.Build.0 = Release|x86 + {93D47F6E-A8A5-44F1-9534-3FFCA5ED3C17}.Debug|Any CPU.ActiveCfg = Debug|x86 + {93D47F6E-A8A5-44F1-9534-3FFCA5ED3C17}.Debug|x86.ActiveCfg = Debug|x86 + {93D47F6E-A8A5-44F1-9534-3FFCA5ED3C17}.Debug|x86.Build.0 = Debug|x86 + {93D47F6E-A8A5-44F1-9534-3FFCA5ED3C17}.Release|Any CPU.ActiveCfg = Release|x86 + {93D47F6E-A8A5-44F1-9534-3FFCA5ED3C17}.Release|x86.ActiveCfg = Release|x86 + {93D47F6E-A8A5-44F1-9534-3FFCA5ED3C17}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DDUserManager/DDUserManager/App.config b/DDUserManager/DDUserManager/App.config index 1b93a2f..9721a27 100644 --- a/DDUserManager/DDUserManager/App.config +++ b/DDUserManager/DDUserManager/App.config @@ -1,30 +1,18 @@ - -
- - -
+ +
- - - + - - - - - - - - - (&(objectClass=group) (samAccountName=*)) + + diff --git a/DDUserManager/DDUserManager/DDUserManager.vbproj b/DDUserManager/DDUserManager/DDUserManager.vbproj index f9954f7..9d0f29f 100644 --- a/DDUserManager/DDUserManager/DDUserManager.vbproj +++ b/DDUserManager/DDUserManager/DDUserManager.vbproj @@ -51,14 +51,14 @@ user.ico - - - - - - - - + + + + + + + + ..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll @@ -74,17 +74,23 @@ ..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll - - P:\Visual Studio Projekte\Bibliotheken\NLog\NLog.dll + + + ..\packages\NLog.4.7.2\lib\net45\NLog.dll + + + + + @@ -228,6 +234,7 @@ Settings.Designer.vb + UserDataSet.xsd diff --git a/DDUserManager/DDUserManager/DDUserManager.vbproj.bak b/DDUserManager/DDUserManager/DDUserManager.vbproj.bak index 0f423b1..b824241 100644 --- a/DDUserManager/DDUserManager/DDUserManager.vbproj.bak +++ b/DDUserManager/DDUserManager/DDUserManager.vbproj.bak @@ -51,20 +51,13 @@ user.ico - - - - + - - - - ..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll @@ -81,17 +74,23 @@ ..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll - - P:\Visual Studio Projekte\Bibliotheken\NLog\NLog.dll + + + ..\packages\NLog.4.7.2\lib\net45\NLog.dll + + + + + @@ -117,7 +116,6 @@ - True True @@ -236,6 +234,7 @@ Settings.Designer.vb + UserDataSet.xsd diff --git a/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb b/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb index 137a118..9b3aec7 100644 --- a/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb +++ b/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/DDUserManager/DDUserManager/My Project/Settings.Designer.vb b/DDUserManager/DDUserManager/My Project/Settings.Designer.vb index 8fb2a52..17d912e 100644 --- a/DDUserManager/DDUserManager/My Project/Settings.Designer.vb +++ b/DDUserManager/DDUserManager/My Project/Settings.Designer.vb @@ -56,35 +56,12 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("")> _ Public ReadOnly Property DD_ECMConnectionString() As String Get Return CType(Me("DD_ECMConnectionString"),String) End Get End Property - - _ - Public ReadOnly Property AD_GROUP_QUERY() As String - Get - Return CType(Me("AD_GROUP_QUERY"),String) - End Get - End Property - - _ - Public Property AD_USER_QUERY() As String - Get - Return CType(Me("AD_USER_QUERY"),String) - End Get - Set - Me("AD_USER_QUERY") = value - End Set - End Property End Class End Namespace diff --git a/DDUserManager/DDUserManager/My Project/Settings.settings b/DDUserManager/DDUserManager/My Project/Settings.settings index 494437e..5338c76 100644 --- a/DDUserManager/DDUserManager/My Project/Settings.settings +++ b/DDUserManager/DDUserManager/My Project/Settings.settings @@ -2,18 +2,7 @@ - - <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</ConnectionString> - <ProviderName>System.Data.SqlClient</ProviderName> -</SerializableConnectionString> - Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd - - - (&(objectClass=group) (samAccountName=*)) - - + diff --git a/DDUserManager/DDUserManager/My Project/licenses.licx b/DDUserManager/DDUserManager/My Project/licenses.licx index 824a99f..fb06462 100644 --- a/DDUserManager/DDUserManager/My Project/licenses.licx +++ b/DDUserManager/DDUserManager/My Project/licenses.licx @@ -1 +1 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/DDUserManager/DDUserManager/My Project/licenses.licx.bak b/DDUserManager/DDUserManager/My Project/licenses.licx.bak index 4308626..824a99f 100644 --- a/DDUserManager/DDUserManager/My Project/licenses.licx.bak +++ b/DDUserManager/DDUserManager/My Project/licenses.licx.bak @@ -1 +1 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/DDUserManager/DDUserManager/frmMain.Designer.vb b/DDUserManager/DDUserManager/frmMain.Designer.vb index 9d821aa..5a0c30d 100644 --- a/DDUserManager/DDUserManager/frmMain.Designer.vb +++ b/DDUserManager/DDUserManager/frmMain.Designer.vb @@ -22,6 +22,7 @@ Partial Class frmMain 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim GUIDLabel As System.Windows.Forms.Label Dim PRENAMELabel As System.Windows.Forms.Label Dim NAMELabel As System.Windows.Forms.Label @@ -62,7 +63,7 @@ Partial Class frmMain Me.Label8 = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label() Me.LANGUAGEComboBox = New System.Windows.Forms.ComboBox() - Me.TBDD_USERBindingSource = New System.Windows.Forms.BindingSource() + Me.TBDD_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.UserDataSet = New DDUserManager.UserDataSet() Me.DATE_FORMATComboBox = New System.Windows.Forms.ComboBox() Me.TextBox2 = New System.Windows.Forms.TextBox() @@ -79,12 +80,12 @@ Partial Class frmMain Me.Label12 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.listModules = New System.Windows.Forms.ListBox() - Me.TBDD_MODULESBindingSource = New System.Windows.Forms.BindingSource() + Me.TBDD_MODULESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.listGroups = New System.Windows.Forms.ListBox() - Me.TBDD_GROUPSBindingSource = New System.Windows.Forms.BindingSource() + Me.TBDD_GROUPSBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.Label2 = New System.Windows.Forms.Label() Me.listClients = New System.Windows.Forms.ListBox() - Me.TBDD_CLIENTBindingSource = New System.Windows.Forms.BindingSource() + Me.TBDD_CLIENTBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.GridUsers = New DevExpress.XtraGrid.GridControl() Me.gvUsers = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colPRENAME = New DevExpress.XtraGrid.Columns.GridColumn() @@ -116,7 +117,7 @@ Partial Class frmMain Me.labelGroups_AssignedUsers = New System.Windows.Forms.Label() Me.Panel1 = New System.Windows.Forms.Panel() Me.gridGroups_AllGroups = New DevExpress.XtraGrid.GridControl() - Me.TBDD_GROUPSBindingSource1 = New System.Windows.Forms.BindingSource() + Me.TBDD_GROUPSBindingSource1 = New System.Windows.Forms.BindingSource(Me.components) Me.DS_ChangeS = New DDUserManager.DS_ChangeS() Me.viewGroups_AllGroups = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colNAME2 = New DevExpress.XtraGrid.Columns.GridColumn() @@ -177,7 +178,7 @@ Partial Class frmMain Me.GridColumn11 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn12 = New DevExpress.XtraGrid.Columns.GridColumn() Me.Label9 = New System.Windows.Forms.Label() - Me.TBDD_USERBindingNavigator = New System.Windows.Forms.BindingNavigator() + 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.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton() @@ -256,7 +257,7 @@ Partial Class frmMain Me.colNAME10 = New DevExpress.XtraGrid.Columns.GridColumn() Me.colSHORT_NAME = New DevExpress.XtraGrid.Columns.GridColumn() Me.Label16 = New System.Windows.Forms.Label() - Me.TBDD_GROUPSBindingNavigator = New System.Windows.Forms.BindingNavigator() + Me.TBDD_GROUPSBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorCountItem1 = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorDeleteItem1 = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorMoveFirstItem1 = New System.Windows.Forms.ToolStripButton() @@ -287,7 +288,7 @@ Partial Class frmMain Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn6 = New DevExpress.XtraGrid.Columns.GridColumn() - Me.TBDD_CLIENTBindingNavigator = New System.Windows.Forms.BindingNavigator() + Me.TBDD_CLIENTBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorAddNewItem2 = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorCountItem2 = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorDeleteItem2 = New System.Windows.Forms.ToolStripButton() @@ -312,7 +313,7 @@ Partial Class frmMain Me.GridColumn8 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn9 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn10 = New DevExpress.XtraGrid.Columns.GridColumn() - Me.TBDD_MODULESBindingNavigator = New System.Windows.Forms.BindingNavigator() + Me.TBDD_MODULESBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorCountItem3 = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorMoveFirstItem3 = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorMovePreviousItem3 = New System.Windows.Forms.ToolStripButton() @@ -340,14 +341,14 @@ Partial Class frmMain Me.btnOpenLogDir = New System.Windows.Forms.Button() Me.btnOpenConfigDir = New System.Windows.Forms.Button() Me.btnConfigConnections = New System.Windows.Forms.Button() - Me.TBDD_GROUPS_USERBindingSource = New System.Windows.Forms.BindingSource() + Me.TBDD_GROUPS_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBDD_USERTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_USERTableAdapter() Me.TableAdapterManager = New DDUserManager.UserDataSetTableAdapters.TableAdapterManager() - Me.TBDD_CLIENT_USERBindingSource = New System.Windows.Forms.BindingSource() + Me.TBDD_CLIENT_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBDD_CLIENT_USERTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_CLIENT_USERTableAdapter() Me.TBDD_CLIENTTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_CLIENTTableAdapter() Me.TBDD_MODULESTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_MODULESTableAdapter() - Me.TBDD_USER_MODULESBindingSource = New System.Windows.Forms.BindingSource() + Me.TBDD_USER_MODULESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBDD_USER_MODULESTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_USER_MODULESTableAdapter() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tsLabelUser = New System.Windows.Forms.ToolStripStatusLabel() @@ -833,8 +834,10 @@ Partial Class frmMain Me.tabPageUsers.Controls.Add(Me.SplitContainer1) Me.tabPageUsers.Controls.Add(Me.TBDD_USERBindingNavigator) Me.tabPageUsers.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.user + Me.tabPageUsers.ImageOptions.SvgImage = CType(resources.GetObject("tabPageUsers.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.tabPageUsers.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabPageUsers.Name = "tabPageUsers" - Me.tabPageUsers.Size = New System.Drawing.Size(1193, 784) + Me.tabPageUsers.Size = New System.Drawing.Size(1197, 783) Me.tabPageUsers.Text = "Benutzer" ' 'SplitContainer1 @@ -854,8 +857,8 @@ Partial Class frmMain ' 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.Size = New System.Drawing.Size(1197, 758) + Me.SplitContainer1.SplitterDistance = 374 Me.SplitContainer1.TabIndex = 63 ' 'SplitContainer2 @@ -907,8 +910,8 @@ Partial Class frmMain 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(793, 375) - Me.SplitContainer2.SplitterDistance = 181 + Me.SplitContainer2.Size = New System.Drawing.Size(797, 374) + Me.SplitContainer2.SplitterDistance = 180 Me.SplitContainer2.TabIndex = 63 ' 'Label8 @@ -1138,7 +1141,7 @@ Partial Class frmMain Me.GridUsers.Location = New System.Drawing.Point(0, 0) Me.GridUsers.MainView = Me.gvUsers Me.GridUsers.Name = "GridUsers" - Me.GridUsers.Size = New System.Drawing.Size(400, 375) + Me.GridUsers.Size = New System.Drawing.Size(400, 374) Me.GridUsers.TabIndex = 58 Me.GridUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.gvUsers}) ' @@ -1191,7 +1194,7 @@ Partial Class frmMain Me.XtraTabControl2.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl2.Name = "XtraTabControl2" Me.XtraTabControl2.SelectedTabPage = Me.tabGroupAssign - Me.XtraTabControl2.Size = New System.Drawing.Size(1193, 380) + Me.XtraTabControl2.Size = New System.Drawing.Size(1197, 380) Me.XtraTabControl2.TabIndex = 0 Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.tabGroupAssign, Me.tabClientAssign, Me.tabModuleAssign}) ' @@ -1199,8 +1202,10 @@ Partial Class frmMain ' Me.tabGroupAssign.Controls.Add(Me.SplitContainerUserGroups1) Me.tabGroupAssign.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.group + Me.tabGroupAssign.ImageOptions.SvgImage = CType(resources.GetObject("tabGroupAssign.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.tabGroupAssign.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabGroupAssign.Name = "tabGroupAssign" - Me.tabGroupAssign.Size = New System.Drawing.Size(1187, 349) + Me.tabGroupAssign.Size = New System.Drawing.Size(1195, 348) Me.tabGroupAssign.Text = "Gruppen Zuordnung" ' 'SplitContainerUserGroups1 @@ -1221,8 +1226,8 @@ Partial Class frmMain 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.Size = New System.Drawing.Size(1195, 348) + Me.SplitContainerUserGroups1.SplitterDistance = 436 Me.SplitContainerUserGroups1.TabIndex = 8 ' 'Panel3 @@ -1234,7 +1239,7 @@ Partial Class frmMain Me.Panel3.Controls.Add(Me.labelGroups_AvailableUsers) Me.Panel3.Location = New System.Drawing.Point(0, 0) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(320, 349) + Me.Panel3.Size = New System.Drawing.Size(322, 348) Me.Panel3.TabIndex = 10 ' 'gridGroups_AvailableUsers @@ -1244,7 +1249,7 @@ Partial Class frmMain Me.gridGroups_AvailableUsers.Location = New System.Drawing.Point(0, 30) Me.gridGroups_AvailableUsers.MainView = Me.viewGroups_AvailableUsers Me.gridGroups_AvailableUsers.Name = "gridGroups_AvailableUsers" - Me.gridGroups_AvailableUsers.Size = New System.Drawing.Size(320, 319) + Me.gridGroups_AvailableUsers.Size = New System.Drawing.Size(322, 318) Me.gridGroups_AvailableUsers.TabIndex = 5 Me.gridGroups_AvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewGroups_AvailableUsers, Me.GridView1}) ' @@ -1306,7 +1311,7 @@ Partial Class frmMain Me.labelGroups_AvailableUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.labelGroups_AvailableUsers.Location = New System.Drawing.Point(0, 0) Me.labelGroups_AvailableUsers.Name = "labelGroups_AvailableUsers" - Me.labelGroups_AvailableUsers.Size = New System.Drawing.Size(320, 30) + Me.labelGroups_AvailableUsers.Size = New System.Drawing.Size(322, 30) Me.labelGroups_AvailableUsers.TabIndex = 7 Me.labelGroups_AvailableUsers.Text = "Nicht zugeordnete Benutzer:" Me.labelGroups_AvailableUsers.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1316,7 +1321,7 @@ Partial Class frmMain Me.btnGroups_AddUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnGroups_AddUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_right Me.btnGroups_AddUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnGroups_AddUsers.Location = New System.Drawing.Point(328, 108) + Me.btnGroups_AddUsers.Location = New System.Drawing.Point(330, 108) Me.btnGroups_AddUsers.Name = "btnGroups_AddUsers" Me.btnGroups_AddUsers.Size = New System.Drawing.Size(103, 50) Me.btnGroups_AddUsers.TabIndex = 9 @@ -1328,7 +1333,7 @@ Partial Class frmMain Me.btnGroups_RemoveUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnGroups_RemoveUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_left_red Me.btnGroups_RemoveUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnGroups_RemoveUsers.Location = New System.Drawing.Point(329, 164) + Me.btnGroups_RemoveUsers.Location = New System.Drawing.Point(331, 164) Me.btnGroups_RemoveUsers.Name = "btnGroups_RemoveUsers" Me.btnGroups_RemoveUsers.Size = New System.Drawing.Size(103, 50) Me.btnGroups_RemoveUsers.TabIndex = 8 @@ -1342,7 +1347,7 @@ Partial Class frmMain Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel2.Location = New System.Drawing.Point(326, 0) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(423, 349) + Me.Panel2.Size = New System.Drawing.Size(429, 348) Me.Panel2.TabIndex = 9 ' 'gridGroups_AssignedUsers @@ -1352,7 +1357,7 @@ Partial Class frmMain Me.gridGroups_AssignedUsers.Location = New System.Drawing.Point(0, 30) Me.gridGroups_AssignedUsers.MainView = Me.viewGroups_AssignedUsers Me.gridGroups_AssignedUsers.Name = "gridGroups_AssignedUsers" - Me.gridGroups_AssignedUsers.Size = New System.Drawing.Size(423, 319) + Me.gridGroups_AssignedUsers.Size = New System.Drawing.Size(429, 318) Me.gridGroups_AssignedUsers.TabIndex = 5 Me.gridGroups_AssignedUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewGroups_AssignedUsers, Me.GridView3}) ' @@ -1416,7 +1421,7 @@ Partial Class frmMain Me.labelGroups_AssignedUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.labelGroups_AssignedUsers.Location = New System.Drawing.Point(0, 0) Me.labelGroups_AssignedUsers.Name = "labelGroups_AssignedUsers" - Me.labelGroups_AssignedUsers.Size = New System.Drawing.Size(423, 30) + Me.labelGroups_AssignedUsers.Size = New System.Drawing.Size(429, 30) Me.labelGroups_AssignedUsers.TabIndex = 7 Me.labelGroups_AssignedUsers.Text = "Aktuelle Benutzer in Gruppe: {0}" Me.labelGroups_AssignedUsers.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1428,7 +1433,7 @@ Partial Class frmMain Me.Panel1.Dock = System.Windows.Forms.DockStyle.Left Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(326, 349) + Me.Panel1.Size = New System.Drawing.Size(326, 348) Me.Panel1.TabIndex = 8 ' 'gridGroups_AllGroups @@ -1438,7 +1443,7 @@ Partial Class frmMain Me.gridGroups_AllGroups.Location = New System.Drawing.Point(0, 30) Me.gridGroups_AllGroups.MainView = Me.viewGroups_AllGroups Me.gridGroups_AllGroups.Name = "gridGroups_AllGroups" - Me.gridGroups_AllGroups.Size = New System.Drawing.Size(326, 319) + Me.gridGroups_AllGroups.Size = New System.Drawing.Size(326, 318) Me.gridGroups_AllGroups.TabIndex = 6 Me.gridGroups_AllGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewGroups_AllGroups}) ' @@ -1498,8 +1503,10 @@ Partial Class frmMain ' Me.tabClientAssign.Controls.Add(Me.SplitContainer4) Me.tabClientAssign.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.book + Me.tabClientAssign.ImageOptions.SvgImage = CType(resources.GetObject("tabClientAssign.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.tabClientAssign.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabClientAssign.Name = "tabClientAssign" - Me.tabClientAssign.Size = New System.Drawing.Size(1187, 349) + Me.tabClientAssign.Size = New System.Drawing.Size(1191, 352) Me.tabClientAssign.Text = "Mandanten Zuordnung" ' 'SplitContainer4 @@ -1520,8 +1527,8 @@ Partial Class frmMain 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.Size = New System.Drawing.Size(1191, 352) + Me.SplitContainer4.SplitterDistance = 435 Me.SplitContainer4.TabIndex = 0 ' 'Panel6 @@ -1533,7 +1540,7 @@ Partial Class frmMain Me.Panel6.Controls.Add(Me.Label7) Me.Panel6.Location = New System.Drawing.Point(0, 0) Me.Panel6.Name = "Panel6" - Me.Panel6.Size = New System.Drawing.Size(320, 349) + Me.Panel6.Size = New System.Drawing.Size(321, 352) Me.Panel6.TabIndex = 12 ' 'gridClients_AvailableUsers @@ -1543,7 +1550,7 @@ Partial Class frmMain Me.gridClients_AvailableUsers.Location = New System.Drawing.Point(0, 30) Me.gridClients_AvailableUsers.MainView = Me.viewClients_AvailableUsers Me.gridClients_AvailableUsers.Name = "gridClients_AvailableUsers" - Me.gridClients_AvailableUsers.Size = New System.Drawing.Size(320, 319) + Me.gridClients_AvailableUsers.Size = New System.Drawing.Size(321, 322) Me.gridClients_AvailableUsers.TabIndex = 0 Me.gridClients_AvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewClients_AvailableUsers}) ' @@ -1599,7 +1606,7 @@ Partial Class frmMain Me.Label7.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label7.Location = New System.Drawing.Point(0, 0) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(320, 30) + Me.Label7.Size = New System.Drawing.Size(321, 30) Me.Label7.TabIndex = 2 Me.Label7.Text = "Nicht zugeordnete Benutzer:" Me.Label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1609,7 +1616,7 @@ Partial Class frmMain Me.btnClients_AddUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnClients_AddUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_right Me.btnClients_AddUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnClients_AddUsers.Location = New System.Drawing.Point(328, 108) + Me.btnClients_AddUsers.Location = New System.Drawing.Point(329, 108) Me.btnClients_AddUsers.Name = "btnClients_AddUsers" Me.btnClients_AddUsers.Size = New System.Drawing.Size(103, 50) Me.btnClients_AddUsers.TabIndex = 11 @@ -1621,7 +1628,7 @@ Partial Class frmMain Me.btnClients_RemoveUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnClients_RemoveUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_left_red Me.btnClients_RemoveUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnClients_RemoveUsers.Location = New System.Drawing.Point(329, 164) + Me.btnClients_RemoveUsers.Location = New System.Drawing.Point(330, 164) Me.btnClients_RemoveUsers.Name = "btnClients_RemoveUsers" Me.btnClients_RemoveUsers.Size = New System.Drawing.Size(103, 50) Me.btnClients_RemoveUsers.TabIndex = 10 @@ -1635,7 +1642,7 @@ Partial Class frmMain Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(326, 0) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(423, 349) + Me.Panel4.Size = New System.Drawing.Size(426, 352) Me.Panel4.TabIndex = 0 ' 'gridClients_AssignedUsers @@ -1645,7 +1652,7 @@ Partial Class frmMain Me.gridClients_AssignedUsers.Location = New System.Drawing.Point(0, 30) Me.gridClients_AssignedUsers.MainView = Me.viewClients_AssignedUsers Me.gridClients_AssignedUsers.Name = "gridClients_AssignedUsers" - Me.gridClients_AssignedUsers.Size = New System.Drawing.Size(423, 319) + Me.gridClients_AssignedUsers.Size = New System.Drawing.Size(426, 322) Me.gridClients_AssignedUsers.TabIndex = 0 Me.gridClients_AssignedUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewClients_AssignedUsers}) ' @@ -1702,7 +1709,7 @@ Partial Class frmMain Me.labelClients_AssignedUsers.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.labelClients_AssignedUsers.Location = New System.Drawing.Point(0, 0) Me.labelClients_AssignedUsers.Name = "labelClients_AssignedUsers" - Me.labelClients_AssignedUsers.Size = New System.Drawing.Size(423, 30) + Me.labelClients_AssignedUsers.Size = New System.Drawing.Size(426, 30) Me.labelClients_AssignedUsers.TabIndex = 2 Me.labelClients_AssignedUsers.Text = "Zugeordnete Benutzer zu Mandant {0}:" Me.labelClients_AssignedUsers.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1714,7 +1721,7 @@ Partial Class frmMain Me.Panel5.Dock = System.Windows.Forms.DockStyle.Left Me.Panel5.Location = New System.Drawing.Point(0, 0) Me.Panel5.Name = "Panel5" - Me.Panel5.Size = New System.Drawing.Size(326, 349) + Me.Panel5.Size = New System.Drawing.Size(326, 352) Me.Panel5.TabIndex = 1 ' 'gridClients_AllClients @@ -1724,7 +1731,7 @@ Partial Class frmMain Me.gridClients_AllClients.Location = New System.Drawing.Point(0, 30) Me.gridClients_AllClients.MainView = Me.viewClients_AllClients Me.gridClients_AllClients.Name = "gridClients_AllClients" - Me.gridClients_AllClients.Size = New System.Drawing.Size(326, 319) + Me.gridClients_AllClients.Size = New System.Drawing.Size(326, 322) Me.gridClients_AllClients.TabIndex = 0 Me.gridClients_AllClients.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewClients_AllClients}) ' @@ -1779,8 +1786,10 @@ Partial Class frmMain ' Me.tabModuleAssign.Controls.Add(Me.SplitContainer6) Me.tabModuleAssign.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.plugin + Me.tabModuleAssign.ImageOptions.SvgImage = CType(resources.GetObject("tabModuleAssign.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.tabModuleAssign.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabModuleAssign.Name = "tabModuleAssign" - Me.tabModuleAssign.Size = New System.Drawing.Size(1187, 349) + Me.tabModuleAssign.Size = New System.Drawing.Size(1191, 352) Me.tabModuleAssign.Text = "Modul Zuordnung" ' 'SplitContainer6 @@ -1801,8 +1810,8 @@ Partial Class frmMain 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.Size = New System.Drawing.Size(1191, 352) + Me.SplitContainer6.SplitterDistance = 435 Me.SplitContainer6.TabIndex = 0 ' 'btnModules_AddUsers @@ -1810,7 +1819,7 @@ Partial Class frmMain Me.btnModules_AddUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnModules_AddUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_right Me.btnModules_AddUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnModules_AddUsers.Location = New System.Drawing.Point(328, 108) + Me.btnModules_AddUsers.Location = New System.Drawing.Point(329, 108) Me.btnModules_AddUsers.Name = "btnModules_AddUsers" Me.btnModules_AddUsers.Size = New System.Drawing.Size(103, 50) Me.btnModules_AddUsers.TabIndex = 13 @@ -1822,7 +1831,7 @@ Partial Class frmMain Me.btnModules_RemoveUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnModules_RemoveUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_left_red Me.btnModules_RemoveUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnModules_RemoveUsers.Location = New System.Drawing.Point(329, 164) + Me.btnModules_RemoveUsers.Location = New System.Drawing.Point(330, 164) Me.btnModules_RemoveUsers.Name = "btnModules_RemoveUsers" Me.btnModules_RemoveUsers.Size = New System.Drawing.Size(103, 50) Me.btnModules_RemoveUsers.TabIndex = 12 @@ -1838,7 +1847,7 @@ Partial Class frmMain Me.Panel9.Controls.Add(Me.Label10) Me.Panel9.Location = New System.Drawing.Point(0, 0) Me.Panel9.Name = "Panel9" - Me.Panel9.Size = New System.Drawing.Size(320, 349) + Me.Panel9.Size = New System.Drawing.Size(321, 352) Me.Panel9.TabIndex = 9 ' 'gridModules_AvailableUsers @@ -1848,7 +1857,7 @@ Partial Class frmMain Me.gridModules_AvailableUsers.Location = New System.Drawing.Point(0, 30) Me.gridModules_AvailableUsers.MainView = Me.viewModules_AvailableUsers Me.gridModules_AvailableUsers.Name = "gridModules_AvailableUsers" - Me.gridModules_AvailableUsers.Size = New System.Drawing.Size(320, 319) + Me.gridModules_AvailableUsers.Size = New System.Drawing.Size(321, 322) Me.gridModules_AvailableUsers.TabIndex = 6 Me.gridModules_AvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewModules_AvailableUsers, Me.GridView8}) ' @@ -1910,7 +1919,7 @@ Partial Class frmMain Me.Label10.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label10.Location = New System.Drawing.Point(0, 0) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(320, 30) + Me.Label10.Size = New System.Drawing.Size(321, 30) Me.Label10.TabIndex = 8 Me.Label10.Text = "Nicht zugeordnete Benutzer:" Me.Label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1922,7 +1931,7 @@ Partial Class frmMain Me.Panel8.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel8.Location = New System.Drawing.Point(326, 0) Me.Panel8.Name = "Panel8" - Me.Panel8.Size = New System.Drawing.Size(423, 349) + Me.Panel8.Size = New System.Drawing.Size(426, 352) Me.Panel8.TabIndex = 10 ' 'gridModules_AssignedUsers @@ -1932,7 +1941,7 @@ Partial Class frmMain Me.gridModules_AssignedUsers.Location = New System.Drawing.Point(0, 30) Me.gridModules_AssignedUsers.MainView = Me.viewModules_AssignedUsers Me.gridModules_AssignedUsers.Name = "gridModules_AssignedUsers" - Me.gridModules_AssignedUsers.Size = New System.Drawing.Size(423, 319) + Me.gridModules_AssignedUsers.Size = New System.Drawing.Size(426, 322) Me.gridModules_AssignedUsers.TabIndex = 6 Me.gridModules_AssignedUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewModules_AssignedUsers, Me.GridView10}) ' @@ -1994,7 +2003,7 @@ Partial Class frmMain Me.labelModules_AssignedUsers.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.labelModules_AssignedUsers.Location = New System.Drawing.Point(0, 0) Me.labelModules_AssignedUsers.Name = "labelModules_AssignedUsers" - Me.labelModules_AssignedUsers.Size = New System.Drawing.Size(423, 30) + Me.labelModules_AssignedUsers.Size = New System.Drawing.Size(426, 30) Me.labelModules_AssignedUsers.TabIndex = 8 Me.labelModules_AssignedUsers.Text = "Zugeordnete Benutzer zu Modul {0}:" Me.labelModules_AssignedUsers.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -2006,7 +2015,7 @@ Partial Class frmMain Me.Panel7.Dock = System.Windows.Forms.DockStyle.Left Me.Panel7.Location = New System.Drawing.Point(0, 0) Me.Panel7.Name = "Panel7" - Me.Panel7.Size = New System.Drawing.Size(326, 349) + Me.Panel7.Size = New System.Drawing.Size(326, 352) Me.Panel7.TabIndex = 9 ' 'gridModules_AllModules @@ -2016,7 +2025,7 @@ Partial Class frmMain Me.gridModules_AllModules.Location = New System.Drawing.Point(0, 30) Me.gridModules_AllModules.MainView = Me.viewModules_AllModules Me.gridModules_AllModules.Name = "gridModules_AllModules" - Me.gridModules_AllModules.Size = New System.Drawing.Size(326, 319) + Me.gridModules_AllModules.Size = New System.Drawing.Size(326, 322) Me.gridModules_AllModules.TabIndex = 7 Me.gridModules_AllModules.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewModules_AllModules}) ' @@ -2074,7 +2083,7 @@ Partial Class frmMain Me.TBDD_USERBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem Me.TBDD_USERBindingNavigator.Name = "TBDD_USERBindingNavigator" Me.TBDD_USERBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem - Me.TBDD_USERBindingNavigator.Size = New System.Drawing.Size(1193, 25) + Me.TBDD_USERBindingNavigator.Size = New System.Drawing.Size(1197, 25) Me.TBDD_USERBindingNavigator.TabIndex = 1 Me.TBDD_USERBindingNavigator.Text = "BindingNavigator1" ' @@ -2121,6 +2130,7 @@ Partial Class frmMain ' Me.BindingNavigatorPositionItem.AccessibleName = "Position" Me.BindingNavigatorPositionItem.AutoSize = False + Me.BindingNavigatorPositionItem.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.BindingNavigatorPositionItem.Name = "BindingNavigatorPositionItem" Me.BindingNavigatorPositionItem.Size = New System.Drawing.Size(50, 23) Me.BindingNavigatorPositionItem.Text = "0" @@ -2194,8 +2204,10 @@ Partial Class frmMain Me.tabPageGroups.Controls.Add(Me.SplitContainer3) Me.tabPageGroups.Controls.Add(Me.TBDD_GROUPSBindingNavigator) Me.tabPageGroups.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.group + Me.tabPageGroups.ImageOptions.SvgImage = CType(resources.GetObject("tabPageGroups.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.tabPageGroups.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabPageGroups.Name = "tabPageGroups" - Me.tabPageGroups.Size = New System.Drawing.Size(1193, 784) + Me.tabPageGroups.Size = New System.Drawing.Size(1197, 787) Me.tabPageGroups.Text = "Gruppen" ' 'SplitContainer3 @@ -2412,7 +2424,7 @@ Partial Class frmMain Me.XtraTabPage1.Controls.Add(Me.SplitContainer5) Me.XtraTabPage1.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.book Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(1190, 349) + Me.XtraTabPage1.Size = New System.Drawing.Size(1194, 352) Me.XtraTabPage1.Text = "Mandanten Zuordnung" ' 'SplitContainer5 @@ -2431,8 +2443,8 @@ Partial Class frmMain ' Me.SplitContainer5.Panel2.Controls.Add(Me.Panel12) Me.SplitContainer5.Panel2.Controls.Add(Me.Panel11) - Me.SplitContainer5.Size = New System.Drawing.Size(1190, 349) - Me.SplitContainer5.SplitterDistance = 435 + Me.SplitContainer5.Size = New System.Drawing.Size(1194, 352) + Me.SplitContainer5.SplitterDistance = 436 Me.SplitContainer5.TabIndex = 0 ' 'btnClients_AddGroups @@ -2440,7 +2452,7 @@ Partial Class frmMain Me.btnClients_AddGroups.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnClients_AddGroups.Image = Global.DDUserManager.My.Resources.Resources.arrow_right Me.btnClients_AddGroups.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnClients_AddGroups.Location = New System.Drawing.Point(329, 108) + Me.btnClients_AddGroups.Location = New System.Drawing.Point(330, 108) Me.btnClients_AddGroups.Name = "btnClients_AddGroups" Me.btnClients_AddGroups.Size = New System.Drawing.Size(103, 50) Me.btnClients_AddGroups.TabIndex = 15 @@ -2452,7 +2464,7 @@ Partial Class frmMain Me.btnClients_RemoveGroups.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnClients_RemoveGroups.Image = Global.DDUserManager.My.Resources.Resources.arrow_left_red Me.btnClients_RemoveGroups.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnClients_RemoveGroups.Location = New System.Drawing.Point(330, 164) + Me.btnClients_RemoveGroups.Location = New System.Drawing.Point(331, 164) Me.btnClients_RemoveGroups.Name = "btnClients_RemoveGroups" Me.btnClients_RemoveGroups.Size = New System.Drawing.Size(103, 50) Me.btnClients_RemoveGroups.TabIndex = 14 @@ -2468,7 +2480,7 @@ Partial Class frmMain Me.Panel10.Controls.Add(Me.Label5) Me.Panel10.Location = New System.Drawing.Point(0, 0) Me.Panel10.Name = "Panel10" - Me.Panel10.Size = New System.Drawing.Size(320, 366) + Me.Panel10.Size = New System.Drawing.Size(321, 369) Me.Panel10.TabIndex = 0 ' 'gridClientsGroups_AvailableGroups @@ -2478,7 +2490,7 @@ Partial Class frmMain Me.gridClientsGroups_AvailableGroups.Location = New System.Drawing.Point(0, 30) Me.gridClientsGroups_AvailableGroups.MainView = Me.viewClientsGroups_AvailableGroups Me.gridClientsGroups_AvailableGroups.Name = "gridClientsGroups_AvailableGroups" - Me.gridClientsGroups_AvailableGroups.Size = New System.Drawing.Size(320, 336) + Me.gridClientsGroups_AvailableGroups.Size = New System.Drawing.Size(321, 339) Me.gridClientsGroups_AvailableGroups.TabIndex = 0 Me.gridClientsGroups_AvailableGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewClientsGroups_AvailableGroups}) ' @@ -2518,7 +2530,7 @@ Partial Class frmMain Me.Label5.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label5.Location = New System.Drawing.Point(0, 0) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(320, 30) + Me.Label5.Size = New System.Drawing.Size(321, 30) Me.Label5.TabIndex = 1 Me.Label5.Text = "Nicht zugeordnete Gruppen:" Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -2530,7 +2542,7 @@ Partial Class frmMain Me.Panel12.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel12.Location = New System.Drawing.Point(326, 0) Me.Panel12.Name = "Panel12" - Me.Panel12.Size = New System.Drawing.Size(425, 349) + Me.Panel12.Size = New System.Drawing.Size(428, 352) Me.Panel12.TabIndex = 0 ' 'gridClientsGroups_AssignedGroups @@ -2540,7 +2552,7 @@ Partial Class frmMain Me.gridClientsGroups_AssignedGroups.Location = New System.Drawing.Point(0, 30) Me.gridClientsGroups_AssignedGroups.MainView = Me.viewClientsGroups_AssignedGroups Me.gridClientsGroups_AssignedGroups.Name = "gridClientsGroups_AssignedGroups" - Me.gridClientsGroups_AssignedGroups.Size = New System.Drawing.Size(425, 319) + Me.gridClientsGroups_AssignedGroups.Size = New System.Drawing.Size(428, 322) Me.gridClientsGroups_AssignedGroups.TabIndex = 0 Me.gridClientsGroups_AssignedGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewClientsGroups_AssignedGroups}) ' @@ -2581,7 +2593,7 @@ Partial Class frmMain Me.labelClients_AssignedGroups.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.labelClients_AssignedGroups.Location = New System.Drawing.Point(0, 0) Me.labelClients_AssignedGroups.Name = "labelClients_AssignedGroups" - Me.labelClients_AssignedGroups.Size = New System.Drawing.Size(425, 30) + Me.labelClients_AssignedGroups.Size = New System.Drawing.Size(428, 30) Me.labelClients_AssignedGroups.TabIndex = 1 Me.labelClients_AssignedGroups.Text = "Zugeordnete Gruppen zu Mandant {0}" Me.labelClients_AssignedGroups.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -2593,7 +2605,7 @@ Partial Class frmMain Me.Panel11.Dock = System.Windows.Forms.DockStyle.Left Me.Panel11.Location = New System.Drawing.Point(0, 0) Me.Panel11.Name = "Panel11" - Me.Panel11.Size = New System.Drawing.Size(326, 349) + Me.Panel11.Size = New System.Drawing.Size(326, 352) Me.Panel11.TabIndex = 0 ' 'gridClientsGroups_AllClients @@ -2603,7 +2615,7 @@ Partial Class frmMain Me.gridClientsGroups_AllClients.Location = New System.Drawing.Point(0, 30) Me.gridClientsGroups_AllClients.MainView = Me.viewClientsGroups_AllClients Me.gridClientsGroups_AllClients.Name = "gridClientsGroups_AllClients" - Me.gridClientsGroups_AllClients.Size = New System.Drawing.Size(326, 319) + Me.gridClientsGroups_AllClients.Size = New System.Drawing.Size(326, 322) Me.gridClientsGroups_AllClients.TabIndex = 0 Me.gridClientsGroups_AllClients.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewClientsGroups_AllClients}) ' @@ -2651,7 +2663,7 @@ Partial Class frmMain Me.XtraTabPage2.Controls.Add(Me.SplitContainer7) Me.XtraTabPage2.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.plugin Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(1190, 349) + Me.XtraTabPage2.Size = New System.Drawing.Size(1194, 352) Me.XtraTabPage2.Text = "Modul Zuordnung" ' 'SplitContainer7 @@ -2670,8 +2682,8 @@ Partial Class frmMain ' Me.SplitContainer7.Panel2.Controls.Add(Me.Panel15) Me.SplitContainer7.Panel2.Controls.Add(Me.Panel14) - Me.SplitContainer7.Size = New System.Drawing.Size(1190, 349) - Me.SplitContainer7.SplitterDistance = 435 + Me.SplitContainer7.Size = New System.Drawing.Size(1194, 352) + Me.SplitContainer7.SplitterDistance = 436 Me.SplitContainer7.TabIndex = 0 ' 'btnModules_AddGroups @@ -2679,7 +2691,7 @@ Partial Class frmMain Me.btnModules_AddGroups.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnModules_AddGroups.Image = Global.DDUserManager.My.Resources.Resources.arrow_right Me.btnModules_AddGroups.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnModules_AddGroups.Location = New System.Drawing.Point(329, 108) + Me.btnModules_AddGroups.Location = New System.Drawing.Point(330, 108) Me.btnModules_AddGroups.Name = "btnModules_AddGroups" Me.btnModules_AddGroups.Size = New System.Drawing.Size(103, 50) Me.btnModules_AddGroups.TabIndex = 17 @@ -2691,7 +2703,7 @@ Partial Class frmMain Me.btnModules_RemoveGroups.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnModules_RemoveGroups.Image = Global.DDUserManager.My.Resources.Resources.arrow_left_red Me.btnModules_RemoveGroups.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnModules_RemoveGroups.Location = New System.Drawing.Point(330, 164) + Me.btnModules_RemoveGroups.Location = New System.Drawing.Point(331, 164) Me.btnModules_RemoveGroups.Name = "btnModules_RemoveGroups" Me.btnModules_RemoveGroups.Size = New System.Drawing.Size(103, 50) Me.btnModules_RemoveGroups.TabIndex = 16 @@ -2707,7 +2719,7 @@ Partial Class frmMain Me.Panel13.Controls.Add(Me.Label15) Me.Panel13.Location = New System.Drawing.Point(0, 0) Me.Panel13.Name = "Panel13" - Me.Panel13.Size = New System.Drawing.Size(321, 349) + Me.Panel13.Size = New System.Drawing.Size(322, 352) Me.Panel13.TabIndex = 0 ' 'gridModulesGroups_AvailableGroups @@ -2717,7 +2729,7 @@ Partial Class frmMain Me.gridModulesGroups_AvailableGroups.Location = New System.Drawing.Point(0, 30) Me.gridModulesGroups_AvailableGroups.MainView = Me.viewModulesGroups_AvailableGroups Me.gridModulesGroups_AvailableGroups.Name = "gridModulesGroups_AvailableGroups" - Me.gridModulesGroups_AvailableGroups.Size = New System.Drawing.Size(321, 319) + Me.gridModulesGroups_AvailableGroups.Size = New System.Drawing.Size(322, 322) Me.gridModulesGroups_AvailableGroups.TabIndex = 0 Me.gridModulesGroups_AvailableGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewModulesGroups_AvailableGroups}) ' @@ -2757,7 +2769,7 @@ Partial Class frmMain Me.Label15.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label15.Location = New System.Drawing.Point(0, 0) Me.Label15.Name = "Label15" - Me.Label15.Size = New System.Drawing.Size(321, 30) + Me.Label15.Size = New System.Drawing.Size(322, 30) Me.Label15.TabIndex = 1 Me.Label15.Text = "Nicht zugeordnete Gruppen:" Me.Label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -2769,7 +2781,7 @@ Partial Class frmMain Me.Panel15.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel15.Location = New System.Drawing.Point(326, 0) Me.Panel15.Name = "Panel15" - Me.Panel15.Size = New System.Drawing.Size(425, 349) + Me.Panel15.Size = New System.Drawing.Size(428, 352) Me.Panel15.TabIndex = 1 ' 'gridModulesGroups_AssignedGroups @@ -2779,7 +2791,7 @@ Partial Class frmMain Me.gridModulesGroups_AssignedGroups.Location = New System.Drawing.Point(0, 30) Me.gridModulesGroups_AssignedGroups.MainView = Me.viewModulesGroups_AssignedGroups Me.gridModulesGroups_AssignedGroups.Name = "gridModulesGroups_AssignedGroups" - Me.gridModulesGroups_AssignedGroups.Size = New System.Drawing.Size(425, 319) + Me.gridModulesGroups_AssignedGroups.Size = New System.Drawing.Size(428, 322) Me.gridModulesGroups_AssignedGroups.TabIndex = 1 Me.gridModulesGroups_AssignedGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewModulesGroups_AssignedGroups}) ' @@ -2820,7 +2832,7 @@ Partial Class frmMain Me.labelModules_AssignedGroups.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.labelModules_AssignedGroups.Location = New System.Drawing.Point(0, 0) Me.labelModules_AssignedGroups.Name = "labelModules_AssignedGroups" - Me.labelModules_AssignedGroups.Size = New System.Drawing.Size(425, 30) + Me.labelModules_AssignedGroups.Size = New System.Drawing.Size(428, 30) Me.labelModules_AssignedGroups.TabIndex = 0 Me.labelModules_AssignedGroups.Text = "Zugeordnete Gruppen zu Modul {0}" Me.labelModules_AssignedGroups.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -2832,7 +2844,7 @@ Partial Class frmMain Me.Panel14.Dock = System.Windows.Forms.DockStyle.Left Me.Panel14.Location = New System.Drawing.Point(0, 0) Me.Panel14.Name = "Panel14" - Me.Panel14.Size = New System.Drawing.Size(326, 349) + Me.Panel14.Size = New System.Drawing.Size(326, 352) Me.Panel14.TabIndex = 0 ' 'gridModulesGroups_AllModules @@ -2842,7 +2854,7 @@ Partial Class frmMain Me.gridModulesGroups_AllModules.Location = New System.Drawing.Point(0, 30) Me.gridModulesGroups_AllModules.MainView = Me.viewModulesGroups_AllModules Me.gridModulesGroups_AllModules.Name = "gridModulesGroups_AllModules" - Me.gridModulesGroups_AllModules.Size = New System.Drawing.Size(326, 319) + Me.gridModulesGroups_AllModules.Size = New System.Drawing.Size(326, 322) Me.gridModulesGroups_AllModules.TabIndex = 1 Me.gridModulesGroups_AllModules.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewModulesGroups_AllModules}) ' @@ -2900,7 +2912,7 @@ Partial Class frmMain Me.TBDD_GROUPSBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem1 Me.TBDD_GROUPSBindingNavigator.Name = "TBDD_GROUPSBindingNavigator" Me.TBDD_GROUPSBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem1 - Me.TBDD_GROUPSBindingNavigator.Size = New System.Drawing.Size(1193, 25) + Me.TBDD_GROUPSBindingNavigator.Size = New System.Drawing.Size(1197, 25) Me.TBDD_GROUPSBindingNavigator.TabIndex = 0 Me.TBDD_GROUPSBindingNavigator.Text = "BindingNavigator1" ' @@ -2947,6 +2959,7 @@ Partial Class frmMain ' Me.BindingNavigatorPositionItem1.AccessibleName = "Position" Me.BindingNavigatorPositionItem1.AutoSize = False + Me.BindingNavigatorPositionItem1.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.BindingNavigatorPositionItem1.Name = "BindingNavigatorPositionItem1" Me.BindingNavigatorPositionItem1.Size = New System.Drawing.Size(50, 23) Me.BindingNavigatorPositionItem1.Text = "0" @@ -3012,8 +3025,10 @@ Partial Class frmMain Me.tabPageClients.Controls.Add(Me.gridClients) Me.tabPageClients.Controls.Add(Me.TBDD_CLIENTBindingNavigator) Me.tabPageClients.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.book + Me.tabPageClients.ImageOptions.SvgImage = CType(resources.GetObject("tabPageClients.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.tabPageClients.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabPageClients.Name = "tabPageClients" - Me.tabPageClients.Size = New System.Drawing.Size(1193, 784) + Me.tabPageClients.Size = New System.Drawing.Size(1197, 787) Me.tabPageClients.Text = "Mandanten" ' 'Panel17 @@ -3039,7 +3054,7 @@ Partial Class frmMain Me.Panel17.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel17.Location = New System.Drawing.Point(400, 25) Me.Panel17.Name = "Panel17" - Me.Panel17.Size = New System.Drawing.Size(793, 759) + Me.Panel17.Size = New System.Drawing.Size(797, 762) Me.Panel17.TabIndex = 20 ' 'Label18 @@ -3138,7 +3153,7 @@ Partial Class frmMain Me.gridClients.Location = New System.Drawing.Point(0, 25) Me.gridClients.MainView = Me.GridView4 Me.gridClients.Name = "gridClients" - Me.gridClients.Size = New System.Drawing.Size(400, 759) + Me.gridClients.Size = New System.Drawing.Size(400, 762) Me.gridClients.TabIndex = 19 Me.gridClients.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView4}) ' @@ -3192,7 +3207,7 @@ Partial Class frmMain Me.TBDD_CLIENTBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem2 Me.TBDD_CLIENTBindingNavigator.Name = "TBDD_CLIENTBindingNavigator" Me.TBDD_CLIENTBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem2 - Me.TBDD_CLIENTBindingNavigator.Size = New System.Drawing.Size(1193, 25) + Me.TBDD_CLIENTBindingNavigator.Size = New System.Drawing.Size(1197, 25) Me.TBDD_CLIENTBindingNavigator.TabIndex = 4 Me.TBDD_CLIENTBindingNavigator.Text = "BindingNavigator2" ' @@ -3248,6 +3263,7 @@ Partial Class frmMain ' Me.BindingNavigatorPositionItem2.AccessibleName = "Position" Me.BindingNavigatorPositionItem2.AutoSize = False + Me.BindingNavigatorPositionItem2.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.BindingNavigatorPositionItem2.Name = "BindingNavigatorPositionItem2" Me.BindingNavigatorPositionItem2.Size = New System.Drawing.Size(50, 23) Me.BindingNavigatorPositionItem2.Text = "0" @@ -3295,8 +3311,10 @@ Partial Class frmMain Me.tabPageModules.Controls.Add(Me.gridModules) Me.tabPageModules.Controls.Add(Me.TBDD_MODULESBindingNavigator) Me.tabPageModules.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.plugin + Me.tabPageModules.ImageOptions.SvgImage = CType(resources.GetObject("tabPageModules.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.tabPageModules.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabPageModules.Name = "tabPageModules" - Me.tabPageModules.Size = New System.Drawing.Size(1193, 784) + Me.tabPageModules.Size = New System.Drawing.Size(1197, 783) Me.tabPageModules.Text = "Module" ' 'Panel18 @@ -3313,7 +3331,7 @@ Partial Class frmMain Me.Panel18.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel18.Location = New System.Drawing.Point(400, 25) Me.Panel18.Name = "Panel18" - Me.Panel18.Size = New System.Drawing.Size(793, 759) + Me.Panel18.Size = New System.Drawing.Size(797, 758) Me.Panel18.TabIndex = 40 ' 'Label19 @@ -3369,7 +3387,7 @@ Partial Class frmMain Me.gridModules.Location = New System.Drawing.Point(0, 25) Me.gridModules.MainView = Me.GridView5 Me.gridModules.Name = "gridModules" - Me.gridModules.Size = New System.Drawing.Size(400, 759) + Me.gridModules.Size = New System.Drawing.Size(400, 758) Me.gridModules.TabIndex = 39 Me.gridModules.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView5}) ' @@ -3423,7 +3441,7 @@ Partial Class frmMain Me.TBDD_MODULESBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem3 Me.TBDD_MODULESBindingNavigator.Name = "TBDD_MODULESBindingNavigator" Me.TBDD_MODULESBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem3 - Me.TBDD_MODULESBindingNavigator.Size = New System.Drawing.Size(1193, 25) + Me.TBDD_MODULESBindingNavigator.Size = New System.Drawing.Size(1197, 25) Me.TBDD_MODULESBindingNavigator.TabIndex = 38 Me.TBDD_MODULESBindingNavigator.Text = "BindingNavigator1" ' @@ -3461,6 +3479,7 @@ Partial Class frmMain ' Me.BindingNavigatorPositionItem3.AccessibleName = "Position" Me.BindingNavigatorPositionItem3.AutoSize = False + Me.BindingNavigatorPositionItem3.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.BindingNavigatorPositionItem3.Name = "BindingNavigatorPositionItem3" Me.BindingNavigatorPositionItem3.Size = New System.Drawing.Size(50, 23) Me.BindingNavigatorPositionItem3.Text = "0" @@ -3497,9 +3516,11 @@ Partial Class frmMain 'tabPageRights ' Me.tabPageRights.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.key + Me.tabPageRights.ImageOptions.SvgImage = CType(resources.GetObject("tabPageRights.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.tabPageRights.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabPageRights.Name = "tabPageRights" Me.tabPageRights.PageEnabled = False - Me.tabPageRights.Size = New System.Drawing.Size(1193, 784) + Me.tabPageRights.Size = New System.Drawing.Size(1197, 783) Me.tabPageRights.Text = "Rechte" ' 'tabPageSettings @@ -3512,8 +3533,10 @@ Partial Class frmMain Me.tabPageSettings.Controls.Add(Me.btnOpenConfigDir) Me.tabPageSettings.Controls.Add(Me.btnConfigConnections) Me.tabPageSettings.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.cog + Me.tabPageSettings.ImageOptions.SvgImage = CType(resources.GetObject("tabPageSettings.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.tabPageSettings.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabPageSettings.Name = "tabPageSettings" - Me.tabPageSettings.Size = New System.Drawing.Size(1193, 784) + Me.tabPageSettings.Size = New System.Drawing.Size(1197, 787) Me.tabPageSettings.Text = "Einstellungen" ' 'Button2 diff --git a/DDUserManager/DDUserManager/frmMain.resx b/DDUserManager/DDUserManager/frmMain.resx index bda8c14..204b8f6 100644 --- a/DDUserManager/DDUserManager/frmMain.resx +++ b/DDUserManager/DDUserManager/frmMain.resx @@ -234,6 +234,75 @@ 906, 134 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw + MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu + bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQ3VzdG9tZXJzIj4NCiAgICA8cGF0 + aCBkPSJNMTAsOS45Yy0wLjEsMC41LDAuMiwwLjksMC40LDEuNHMtMC4xLDEuNywwLjksMS42YzAsMCww + LDAuMSwwLDAuMmMwLjYsMi4zLDIsNC45LDQuNyw0LjlzNC4yLTIuNiw0LjctNC45ICAgVjEzYzEsMC4x + LDAuNi0xLjEsMC45LTEuNmMwLjItMC41LDAuNC0wLjksMC4zLTEuNGMtMC4xLTAuNC0wLjQtMC40LTAu + NS0wLjNDMjMuMiw0LjgsMjAuMyw1LDIwLjMsNVMyMCwyLDE0LjgsMiAgIEMxMCwyLDkuNCw2LDEwLjUs + OS42QzEwLjQsOS42LDEwLjEsOS43LDEwLDkuOXogTTIwLDE4Yy0wLjgsMS41LTIuMSw0LTQsNHMtMy4y + LTIuNS00LTRjLTIuMywzLjUtOCwxLTgsOC41VjMwaDI0di0zLjUgICBDMjgsMTkuMSwyMi4zLDIxLjQs + MjAsMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAG0CAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkJvb2siPg0KICAgIDxwYXRoIGQ9Ik05LDZoMTdWNWMw + LTAuNi0wLjQtMS0xLTFIOUM3LjMsNCw2LDUuMyw2LDd2MThjMCwxLjcsMS4zLDMsMywzaDE2YzAuNiww + LDEtMC40LDEtMVY4SDlDOC40LDgsOCw3LjYsOCw3ICAgUzguNCw2LDksNnoiIGNsYXNzPSJHcmVlbiIg + Lz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGcEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk + aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp + c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 + O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 + ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp + c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJQcm9kdWN0X3g1Rl9H + cm91cCI+DQogICAgPHBhdGggZD0iTTE2LDcuNGw0LTRWMTBoLTRWNy40eiBNMjYsMTcuNFYzMGw0LTRW + MTMuNEwyNiwxNy40eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAg + IDxwYXRoIGQ9Ik0xNC42LDZIMmw0LTRoMTIuNkwxNC42LDZ6IE0xNiwxMmwtNCw0aDEyLjZsNC00SDE2 + eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgICA8L2c+DQogICAgPGcgY2xhc3M9InN0MSI+DQogICAgICA8 + cGF0aCBkPSJNMTQsMTEuMmwtNCw0VjE4djJIMlY4aDEyVjExLjJ6IE0xMiwzMGgxMlYxOEgxMlYzMHoi + IGNsYXNzPSJZZWxsb3ciIC8+DQogICAgPC9nPg0KICA8L2c+DQo8L3N2Zz4L + + 693, 17 @@ -307,6 +376,30 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOoDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw + MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu + bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW1wbG95ZWVzIj4NCiAgICA8cGF0 + aCBkPSJNMTAsOS45Yy0wLjEsMC41LDAuMiwwLjksMC40LDEuNHMtMC4xLDEuNywwLjksMS42YzAsMCww + LDAuMSwwLDAuMmMwLjYsMi4zLDIsNC45LDQuNyw0LjlzNC4yLTIuNiw0LjctNC45ICAgVjEzYzEsMC4x + LDAuNi0xLjEsMC45LTEuNmMwLjItMC41LDAuNC0wLjksMC4zLTEuNGMtMC4xLTAuNC0wLjQtMC40LTAu + NS0wLjNDMjMuMiw0LjgsMjAuMyw1LDIwLjMsNVMyMCwyLDE0LjgsMiAgIEMxMCwyLDkuNCw2LDEwLjUs + OS42QzEwLjQsOS42LDEwLjEsOS43LDEwLDkuOXogTTIwLDE4Yy0wLjgsMS41LTIuMSw0LTQsNHMtMy4y + LTIuNS00LTRjLTIuMywzLjUtOCwxLTgsOC41VjMwaDI0di0zLjUgICBDMjgsMTkuMSwyMi4zLDIxLjQs + MjAsMTh6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== @@ -400,6 +493,30 @@ E7V6kYT56vTjmYyZyuSHcI/tBr8Z4L3STaABvGoBz3qAkzqBWEEKrJO2gytnwSiamDIQEsdX5RXG5Xz7 hni3KDu2QmMb1gtm7LCuPoApHAIjqh+mLmWTEoFP3P7ALT8No7fhYDRhTKs6COI3IvPLoUkp30UAAAAA SUVORK5CYII= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw + MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu + bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQ3VzdG9tZXJzIj4NCiAgICA8cGF0 + aCBkPSJNMTAsOS45Yy0wLjEsMC41LDAuMiwwLjksMC40LDEuNHMtMC4xLDEuNywwLjksMS42YzAsMCww + LDAuMSwwLDAuMmMwLjYsMi4zLDIsNC45LDQuNyw0LjlzNC4yLTIuNiw0LjctNC45ICAgVjEzYzEsMC4x + LDAuNi0xLjEsMC45LTEuNmMwLjItMC41LDAuNC0wLjksMC4zLTEuNGMtMC4xLTAuNC0wLjQtMC40LTAu + NS0wLjNDMjMuMiw0LjgsMjAuMyw1LDIwLjMsNVMyMCwyLDE0LjgsMiAgIEMxMCwyLDkuNCw2LDEwLjUs + OS42QzEwLjQsOS42LDEwLjEsOS43LDEwLDkuOXogTTIwLDE4Yy0wLjgsMS41LTIuMSw0LTQsNHMtMy4y + LTIuNS00LTRjLTIuMywzLjUtOCwxLTgsOC41VjMwaDI0di0zLjUgICBDMjgsMTkuMSwyMi4zLDIxLjQs + MjAsMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= @@ -474,6 +591,24 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAG0CAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkJvb2siPg0KICAgIDxwYXRoIGQ9Ik05LDZoMTdWNWMw + LTAuNi0wLjQtMS0xLTFIOUM3LjMsNCw2LDUuMyw2LDd2MThjMCwxLjcsMS4zLDMsMywzaDE2YzAuNiww + LDEtMC40LDEtMVY4SDlDOC40LDgsOCw3LjYsOCw3ICAgUzguNCw2LDksNnoiIGNsYXNzPSJHcmVlbiIg + Lz4NCiAgPC9nPg0KPC9zdmc+Cw== @@ -517,6 +652,74 @@ kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGcEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk + aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp + c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 + O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 + ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp + c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJQcm9kdWN0X3g1Rl9H + cm91cCI+DQogICAgPHBhdGggZD0iTTE2LDcuNGw0LTRWMTBoLTRWNy40eiBNMjYsMTcuNFYzMGw0LTRW + MTMuNEwyNiwxNy40eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAg + IDxwYXRoIGQ9Ik0xNC42LDZIMmw0LTRoMTIuNkwxNC42LDZ6IE0xNiwxMmwtNCw0aDEyLjZsNC00SDE2 + eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgICA8L2c+DQogICAgPGcgY2xhc3M9InN0MSI+DQogICAgICA8 + cGF0aCBkPSJNMTQsMTEuMmwtNCw0VjE4djJIMlY4aDEyVjExLjJ6IE0xMiwzMGgxMlYxOEgxMlYzMHoi + IGNsYXNzPSJZZWxsb3ciIC8+DQogICAgPC9nPg0KICA8L2c+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIECAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + UmVke2ZpbGw6I0QxMUMxQzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuR3JlZW57ZmlsbDojMDM5 + QzIzO30KPC9zdHlsZT4NCiAgPGcgaWQ9IktleSI+DQogICAgPHBhdGggZD0iTTIwLDRjLTQuNCwwLTgs + My42LTgsOGMwLDEuMiwwLjMsMi4zLDAuNywzLjNMNCwyNHY0aDR2LTJoMnYtMmgybDQuNy00LjdjMSww + LjUsMi4xLDAuNywzLjMsMC43ICAgYzQuNCwwLDgtMy42LDgtOFMyNC40LDQsMjAsNHogTTIyLDEyYy0x + LjEsMC0yLTAuOS0yLTJjMC0xLjEsMC45LTIsMi0yczIsMC45LDIsMkMyNCwxMS4xLDIzLjEsMTIsMjIs + MTJ6IiBjbGFzcz0iWWVsbG93IiAvPg0KICA8L2c+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4DAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iUHJvcGVydGllcyI+DQogICAgPHBhdGggZD0iTTMwLDE4di00bC00LjQtMC43Yy0w + LjItMC44LTAuNS0xLjUtMC45LTIuMWwyLjYtMy42bC0yLjgtMi44bC0zLjYsMi42Yy0wLjctMC40LTEu + NC0wLjctMi4xLTAuOUwxOCwyaC00ICAgbC0wLjcsNC40Yy0wLjgsMC4yLTEuNSwwLjUtMi4xLDAuOUw3 + LjUsNC43TDQuNyw3LjVsMi42LDMuNmMtMC40LDAuNy0wLjcsMS40LTAuOSwyLjFMMiwxNHY0bDQuNCww + LjdjMC4yLDAuOCwwLjUsMS41LDAuOSwyLjEgICBsLTIuNiwzLjZsMi44LDIuOGwzLjYtMi42YzAuNyww + LjQsMS40LDAuNywyLjEsMC45TDE0LDMwaDRsMC43LTQuNGMwLjgtMC4yLDEuNS0wLjUsMi4xLTAuOWwz + LjYsMi42bDIuOC0yLjhsLTIuNi0zLjYgICBjMC40LTAuNywwLjctMS40LDAuOS0yLjFMMzAsMTh6IE0x + NiwyMGMtMi4yLDAtNC0xLjgtNC00YzAtMi4yLDEuOC00LDQtNHM0LDEuOCw0LDRDMjAsMTguMiwxOC4y + LDIwLDE2LDIweiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb index e71e56c..bb5a318 100644 --- a/DDUserManager/DDUserManager/frmMain.vb +++ b/DDUserManager/DDUserManager/frmMain.vb @@ -23,15 +23,15 @@ Public Class frmMain Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try - MyLogConfig = New LogConfig(LogConfig.PathType.AppData) + MyLogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, Application.CompanyName, Application.ProductName) MyLogger = MyLogConfig.GetLogger() - MyConfig = New ConfigManager(Of UserConfig)(MyLogConfig, Application.CommonAppDataPath) + MyConfig = New ConfigManager(Of UserConfig)(MyLogConfig, Application.CommonAppDataPath, Application.CommonAppDataPath) LoadConfig(MyConfig) CurrentVersion = Assembly.GetEntryAssembly().GetName().Version.ToString() - txtLDAPGroupQuery.DataBindings.Add(New Binding("Text", My.Settings, "AD_GROUP_QUERY")) + 'txtLDAPGroupQuery.DataBindings.Add(New Binding("Text", My.Settings, "AD_GROUP_QUERY")) MyLogger.Info("Starting UserManager v" & CurrentVersion) MyLogger.Info($"Current Username: {Environment.UserName}") diff --git a/DDUserManager/DDUserManager/packages.config b/DDUserManager/DDUserManager/packages.config new file mode 100644 index 0000000..f8dbc83 --- /dev/null +++ b/DDUserManager/DDUserManager/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/DDUserManager/SetupVS19/Config.wxi b/DDUserManager/SetupVS19/Config.wxi new file mode 100644 index 0000000..1c3bed2 --- /dev/null +++ b/DDUserManager/SetupVS19/Config.wxi @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DDUserManager/SetupVS19/Product.wxs b/DDUserManager/SetupVS19/Product.wxs new file mode 100644 index 0000000..7de4b66 --- /dev/null +++ b/DDUserManager/SetupVS19/Product.wxs @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DISABLE_DESKTOP_ICON + + + + + DISABLE_STARTMENU_ICON + + + + + + + + + + + + 1 + + 1 + 1 + NOT WIXUI_DONTVALIDATEPATH + "1"]]> + WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1" + 1 + 1 + + 1 + "1"]]> + + 1 + + + diff --git a/DDUserManager/SetupVS19/SetupVS19.wixproj b/DDUserManager/SetupVS19/SetupVS19.wixproj new file mode 100644 index 0000000..b9f5735 --- /dev/null +++ b/DDUserManager/SetupVS19/SetupVS19.wixproj @@ -0,0 +1,63 @@ + + + + Debug + x86 + 3.10 + 93d47f6e-a8a5-44f1-9534-3ffca5ed3c17 + 2.0 + SetupVS19 + Package + + + bin\$(Configuration)\ + obj\$(Configuration)\ + Debug + + -b "$(SolutionDir)DDUserManager\bin\$(Configuration)" + + + + bin\$(Configuration)\ + obj\$(Configuration)\ + + + + + + + + + + C:\Program Files (x86)\WiX Toolset v3.14\bin\WixUtilExtension.dll + WixUtilExtension + + + C:\Program Files (x86)\WiX Toolset v3.14\bin\WixUIExtension.dll + WixUIExtension + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DDUserManager/SetupWix/Product.wxs b/DDUserManager/SetupWix/Product.wxs index d3f79d7..2aac9da 100644 --- a/DDUserManager/SetupWix/Product.wxs +++ b/DDUserManager/SetupWix/Product.wxs @@ -96,18 +96,22 @@ - - - - - - - - + + + + + + + + - - + + + + + +