diff --git a/EDMI_ClientSuite/My Project/licenses.licx b/EDMI_ClientSuite/My Project/licenses.licx index 94f1f510..bd4139f0 100644 --- a/EDMI_ClientSuite/My Project/licenses.licx +++ b/EDMI_ClientSuite/My Project/licenses.licx @@ -1,10 +1,11 @@ +DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/EDMI_ClientSuite/UserManager/UserControlAssignment.vb b/EDMI_ClientSuite/UserManager/UserControlAssignment.vb index b8537657..da30d8d9 100644 --- a/EDMI_ClientSuite/UserManager/UserControlAssignment.vb +++ b/EDMI_ClientSuite/UserManager/UserControlAssignment.vb @@ -44,20 +44,24 @@ Public Class UserControlAssignment ViewAssignedToParent.OptionsSelection.MultiSelect = True ' Load view layouts + Try + Dim ViewParentListPath = GetLayoutPath(GroupName.LayoutUserManager, Name, ViewParentList.Name) + Dim ViewAssignedPath = GetLayoutPath(GroupName.LayoutUserManager, Name, ViewAssignedToParent.Name) + Dim ViewNotAssignedPath = GetLayoutPath(GroupName.LayoutUserManager, Name, ViewNotAssignedToParent.Name) - Dim ViewParentListPath = GetLayoutPath(GroupName.LayoutUserManager, Name, ViewParentList.Name) - Dim ViewAssignedPath = GetLayoutPath(GroupName.LayoutUserManager, Name, ViewAssignedToParent.Name) - Dim ViewNotAssignedPath = GetLayoutPath(GroupName.LayoutUserManager, Name, ViewNotAssignedToParent.Name) + If IO.File.Exists(ViewParentListPath) Then + ViewParentList.RestoreLayoutFromXml(ViewParentListPath) + End If + If IO.File.Exists(ViewAssignedPath) Then + ViewAssignedToParent.RestoreLayoutFromXml(ViewAssignedPath) + End If + If IO.File.Exists(ViewNotAssignedPath) Then + ViewNotAssignedToParent.RestoreLayoutFromXml(ViewNotAssignedPath) + End If + Catch ex As Exception + + End Try - If IO.File.Exists(ViewParentListPath) Then - ViewParentList.RestoreLayoutFromXml(ViewParentListPath) - End If - If IO.File.Exists(ViewAssignedPath) Then - ViewAssignedToParent.RestoreLayoutFromXml(ViewAssignedPath) - End If - If IO.File.Exists(ViewNotAssignedPath) Then - ViewNotAssignedToParent.RestoreLayoutFromXml(ViewNotAssignedPath) - End If End Sub Private Function MaybeCopyToDataTable(RowCollection As EnumerableRowCollection(Of DataRow)) As DataTable diff --git a/EDMI_ClientSuite/UserManager/frmEdit.Designer.vb b/EDMI_ClientSuite/UserManager/frmEdit.Designer.vb index 9acf8be7..c50f1484 100644 --- a/EDMI_ClientSuite/UserManager/frmEdit.Designer.vb +++ b/EDMI_ClientSuite/UserManager/frmEdit.Designer.vb @@ -29,12 +29,12 @@ Partial Class frmEdit Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.SuspendLayout() CType(Me.GridList, System.ComponentModel.ISupportInitialize).BeginInit() @@ -103,6 +103,12 @@ Partial Class frmEdit Me.RibbonControl1.Size = New System.Drawing.Size(1104, 146) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "BarButtonItem1" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.Name = "BarButtonItem1" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) @@ -132,12 +138,6 @@ Partial Class frmEdit Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Text = "RibbonPage2" ' - 'BarButtonItem1 - ' - Me.BarButtonItem1.Caption = "BarButtonItem1" - Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.Name = "BarButtonItem1" - ' 'frmEdit ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/EDMI_ClientSuite/UserManager/frmUserManager.Designer.vb b/EDMI_ClientSuite/UserManager/frmUserManager.Designer.vb index cd81a3a7..c55228b3 100644 --- a/EDMI_ClientSuite/UserManager/frmUserManager.Designer.vb +++ b/EDMI_ClientSuite/UserManager/frmUserManager.Designer.vb @@ -25,21 +25,19 @@ Partial Class frmUserManager Me.BarButtonGroupEdit = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonAssign = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonRefresh = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPageCategoryUserManager = New DevExpress.XtraBars.Ribbon.RibbonPageCategory() Me.RibbonPageUserManager = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() - Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() - Me.TabPageUserToGroup = New DevExpress.XtraTab.XtraTabPage() - Me.UCUserToGroup = New DigitalData.GUIs.ClientSuite.UserControlAssignment() - Me.TabPageGroupToGroup = New DevExpress.XtraTab.XtraTabPage() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.BarButtonRefresh = New DevExpress.XtraBars.BarButtonItem() + Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.UCUserToGroup = New DigitalData.GUIs.ClientSuite.UserControlAssignment() + Me.OfficeNavigationBar1 = New DevExpress.XtraBars.Navigation.OfficeNavigationBar() + Me.NavigationBarItem1 = New DevExpress.XtraBars.Navigation.NavigationBarItem() + Me.NavigationBarItem2 = New DevExpress.XtraBars.Navigation.NavigationBarItem() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.XtraTabControl1.SuspendLayout() - Me.TabPageUserToGroup.SuspendLayout() + CType(Me.OfficeNavigationBar1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl @@ -86,6 +84,14 @@ Partial Class frmUserManager Me.BarButtonItem1.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.LargeImage"), System.Drawing.Image) Me.BarButtonItem1.Name = "BarButtonItem1" ' + 'BarButtonRefresh + ' + Me.BarButtonRefresh.Caption = "Neu Laden" + Me.BarButtonRefresh.Id = 8 + Me.BarButtonRefresh.ImageOptions.Image = CType(resources.GetObject("BarButtonRefresh.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonRefresh.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonRefresh.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonRefresh.Name = "BarButtonRefresh" + ' 'RibbonPageCategoryUserManager ' Me.RibbonPageCategoryUserManager.Name = "RibbonPageCategoryUserManager" @@ -112,6 +118,12 @@ Partial Class frmUserManager Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "Zuordnung" ' + 'RibbonPageGroup3 + ' + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonRefresh) + Me.RibbonPageGroup3.Name = "RibbonPageGroup3" + Me.RibbonPageGroup3.Text = "Daten" + ' 'RibbonStatusBar ' Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 519) @@ -119,62 +131,44 @@ Partial Class frmUserManager Me.RibbonStatusBar.Ribbon = Me.RibbonControl Me.RibbonStatusBar.Size = New System.Drawing.Size(1070, 21) ' - 'XtraTabControl1 - ' - Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.XtraTabControl1.HeaderLocation = DevExpress.XtraTab.TabHeaderLocation.Left - Me.XtraTabControl1.HeaderOrientation = DevExpress.XtraTab.TabOrientation.Horizontal - Me.XtraTabControl1.Location = New System.Drawing.Point(0, 146) - Me.XtraTabControl1.Name = "XtraTabControl1" - Me.XtraTabControl1.SelectedTabPage = Me.TabPageUserToGroup - Me.XtraTabControl1.Size = New System.Drawing.Size(1070, 373) - Me.XtraTabControl1.TabIndex = 2 - Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageUserToGroup, Me.TabPageGroupToGroup}) - ' - 'TabPageUserToGroup - ' - Me.TabPageUserToGroup.Controls.Add(Me.UCUserToGroup) - Me.TabPageUserToGroup.Name = "TabPageUserToGroup" - Me.TabPageUserToGroup.Size = New System.Drawing.Size(966, 371) - Me.TabPageUserToGroup.Text = "User zu Gruppe" - ' 'UCUserToGroup ' - Me.UCUserToGroup.Dock = System.Windows.Forms.DockStyle.Fill - Me.UCUserToGroup.Location = New System.Drawing.Point(0, 0) + Me.UCUserToGroup.Location = New System.Drawing.Point(250, 168) Me.UCUserToGroup.Name = "UCUserToGroup" - Me.UCUserToGroup.Size = New System.Drawing.Size(966, 371) + Me.UCUserToGroup.Size = New System.Drawing.Size(567, 300) Me.UCUserToGroup.TabIndex = 0 Me.UCUserToGroup.TextAssignedToParent = "Zugeordnete Benutzer zu Gruppe:" Me.UCUserToGroup.TextNotAssignedToParent = "Nicht zugeordnete Benutzer:" Me.UCUserToGroup.TextParentList = "Verfügbare Gruppen:" ' - 'TabPageGroupToGroup + 'OfficeNavigationBar1 ' - Me.TabPageGroupToGroup.Name = "TabPageGroupToGroup" - Me.TabPageGroupToGroup.Size = New System.Drawing.Size(966, 371) - Me.TabPageGroupToGroup.Text = "Gruppe zu Gruppe" + Me.OfficeNavigationBar1.Dock = System.Windows.Forms.DockStyle.Bottom + Me.OfficeNavigationBar1.Items.AddRange(New DevExpress.XtraBars.Navigation.NavigationBarItem() {Me.NavigationBarItem1, Me.NavigationBarItem2}) + Me.OfficeNavigationBar1.Location = New System.Drawing.Point(0, 474) + Me.OfficeNavigationBar1.Name = "OfficeNavigationBar1" + Me.OfficeNavigationBar1.Size = New System.Drawing.Size(1070, 45) + Me.OfficeNavigationBar1.TabIndex = 2 + Me.OfficeNavigationBar1.Text = "OfficeNavigationBar1" ' - 'RibbonPageGroup3 + 'NavigationBarItem1 ' - Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonRefresh) - Me.RibbonPageGroup3.Name = "RibbonPageGroup3" - Me.RibbonPageGroup3.Text = "Daten" + Me.NavigationBarItem1.Name = "NavigationBarItem1" + Me.NavigationBarItem1.Text = "Userzuordnung" ' - 'BarButtonRefresh + 'NavigationBarItem2 ' - Me.BarButtonRefresh.Caption = "Neu Laden" - Me.BarButtonRefresh.Id = 8 - Me.BarButtonRefresh.ImageOptions.Image = CType(resources.GetObject("BarButtonItem2.ImageOptions.Image"), System.Drawing.Image) - Me.BarButtonRefresh.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.LargeImage"), System.Drawing.Image) - Me.BarButtonRefresh.Name = "BarButtonRefresh" + Me.NavigationBarItem2.Name = "NavigationBarItem2" + Me.NavigationBarItem2.ShowPeekFormOnItemHover = DevExpress.Utils.DefaultBoolean.[True] + Me.NavigationBarItem2.Text = "Gruppenzuordnung" ' 'frmUserManager ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1070, 540) - Me.Controls.Add(Me.XtraTabControl1) + Me.Controls.Add(Me.UCUserToGroup) + Me.Controls.Add(Me.OfficeNavigationBar1) Me.Controls.Add(Me.RibbonStatusBar) Me.Controls.Add(Me.RibbonControl) Me.Name = "frmUserManager" @@ -182,9 +176,7 @@ Partial Class frmUserManager Me.StatusBar = Me.RibbonStatusBar Me.Text = "User Manager" CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.XtraTabControl1.ResumeLayout(False) - Me.TabPageUserToGroup.ResumeLayout(False) + CType(Me.OfficeNavigationBar1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -197,13 +189,13 @@ Partial Class frmUserManager Friend WithEvents BarButtonUserEdit As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonGroupEdit As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageCategoryUserManager As DevExpress.XtraBars.Ribbon.RibbonPageCategory - Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl - Friend WithEvents TabPageUserToGroup As DevExpress.XtraTab.XtraTabPage - Friend WithEvents TabPageGroupToGroup As DevExpress.XtraTab.XtraTabPage Friend WithEvents UCUserToGroup As UserControlAssignment Friend WithEvents BarButtonAssign As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonRefresh As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents OfficeNavigationBar1 As DevExpress.XtraBars.Navigation.OfficeNavigationBar + Friend WithEvents NavigationBarItem1 As DevExpress.XtraBars.Navigation.NavigationBarItem + Friend WithEvents NavigationBarItem2 As DevExpress.XtraBars.Navigation.NavigationBarItem End Class diff --git a/EDMI_ClientSuite/UserManager/frmUserManager.resx b/EDMI_ClientSuite/UserManager/frmUserManager.resx index 6a561110..c16d22d1 100644 --- a/EDMI_ClientSuite/UserManager/frmUserManager.resx +++ b/EDMI_ClientSuite/UserManager/frmUserManager.resx @@ -214,30 +214,30 @@ 8P/Qn7tosvK/5TOR4kykOBMpzqPsfgBphQ1j4i+mWAAAAABJRU5ErkJggg== - + - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAJ3RFWHRUaXRsZQBSZWZyZXNo - O1JlcGVhdDtCYXJzO1JpYmJvbjtSZWxvYWTNTfbpAAAA0klEQVQ4T6WSsQ3CQBAEjUQBNGDRgXOKsMhI - yB0iR5DTBCWQkpmMfmji2X39nk7oHoEJRjrt3u2/fd+klP4iFH/Biv58Fy0YwQSeBdbU6OW+WsACHECq - cAMbEAasQA8YcgIDWBdYP4BC2ihgXxoYYrrzO6CQUbpMDumaOUQNHui8Cf1JWjQsLCTwjI8mh4/XyxJ1 - 9RB/Pa6K4iDNw+bi2zB138A90+CP6qQ734fY5/kGPhKuSCHva9wBhdicDyB8JAqJ2ILcWwsg857yXELx - e1LzAv/sh1p6xTM7AAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAndEVYdFRpdGxlAFJlZnJlc2g7UmVwZWF0O0JhcnM7 + UmliYm9uO1JlbG9hZM1N9ukAAADSSURBVDhPpZKxDcJAEASNRAE0YNGBc4qwyEjIHSJHkNMEJZCSmYx+ + aOLZff2eTugegQlGOu3e7b9936SU/iIUf8GK/nwXLRjBBJ4F1tTo5b5awAIcQKpwAxsQBqxADxhyAgNY + F1g/gELaKGBfGhhiuvM7oJBRukwO6Zo5RA0e6LwJ/UlaNCwsJPCMjyaHj9fLEnX1EH89roriIM3D5uLb + MHXfwD3T4I/qpDvfh9jn+QY+Eq5IIe9r3AGF2JwPIHwkConYgtxbCyDznvJcQvF7UvMC/+yHWnrFMzsA + AAAASUVORK5CYII= - + - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAJ3RFWHRUaXRsZQBSZWZyZXNo - O1JlcGVhdDtCYXJzO1JpYmJvbjtSZWxvYWTNTfbpAAABzklEQVRYR8WWPU7DUBCEUwSadEgUKBQUIOUE - 0CUn8FVS0iZCQhwBbuAD0HCAdNSpKCi4Ar2ZQd5o32Ze7BDxUnxKPG92d+S/50HTNEdFiiWRYkmkWBIp - lkSKOaqHtwmYgxqswXcL/1Pj2kTV5pBiBE3HYAk+QNMBPfSOVa+IFD1odAteQRzUBWumqqdHigYakAvw - CdSQLlZgZwgpEhSSqv29AhbiHSzADJy18D81rsUQPBPZyyFFgiIOZwMf4hHcKD/hGngBMcRS+cmWcF8/ - D1Fgww0LcRL9EXhGIIbgjSmfjuQAw89hjMONynt3AS/PRLwcc+VNDmDKDTf2CcF7wtfWyrf5A0PXcKNX - CPh4Y/q6tfKZue9wIwnB47Del+qg4gND/NZvGniwyHe7N8+ULwLf3pdxqwmBgRuLL1gonwLerhDJmUuK - DZi4q/kiPlLZF1AE3lyIio+69yaFBozcduPOx5fLSPk98JwCFYLDh9GfHHhQwC3VNyAM0fUqfgLXwIdI - TrtHigRF/AZQ23CfzegL+BByBpGigcIp4JYaQ/SBIS6B7G1I0YMGDPHXD5I71dMjxQgaHe+TzIOmx/ko - /U+kWBIplkSKJZFiOZrBD//k8vo54AqiAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAndEVYdFRpdGxlAFJlZnJlc2g7UmVwZWF0O0JhcnM7 + UmliYm9uO1JlbG9hZM1N9ukAAAHOSURBVFhHxZY9TsNQEIRTBJp0SBQoFBQg5QTQJSfwVVLSJkJCHAFu + 4APQcIB01KkoKLgCvZlB3mjfZl7sEPFSfEo8b3Z35L/nQdM0R0WKJZFiSaRYEimWRIo5qoe3CZiDGqzB + dwv/U+PaRNXmkGIETcdgCT5A0wE99I5Vr4gUPWh0C15BHNQFa6aqp0eKBhqQC/AJ1JAuVmBnCCkSFJKq + /b0CFuIdLMAMnLXwPzWuxRA8E9nLIUWCIg5nAx/iEdwoP+EaeAExxFL5yZZwXz8PUWDDDQtxEv0ReEYg + huCNKZ+O5ADDz2GMw43Ke3cBL89EvBxz5U0OYMoNN/YJwXvC19bKt/kDQ9dwo1cI+Hhj+rq18pm573Aj + CcHjsN6X6qDiA0P81m8aeLDId7s3z5QvAt/el3GrCYGBG4svWCifAt6uEMmZS4oNmLir+SI+UtkXUATe + XIiKj7r3JoUGjNx2487Hl8tI+T3wnAIVgsOH0Z8ceFDALdU3IAzR9Sp+AtfAh0hOu0eKBEX8BlDbcJ/N + 6Av4EHIGkaKBwinglhpD9IEhLoHsbUjRgwYM8dcPkjvV0yPFCBod75PMg6bH+Sj9T6RYEimWRIolkWI5 + msEP/+Ty+jngCqIAAAAASUVORK5CYII= \ No newline at end of file diff --git a/EDMI_ClientSuite/UserManager/frmUserManager.vb b/EDMI_ClientSuite/UserManager/frmUserManager.vb index 02a8b415..800238ca 100644 --- a/EDMI_ClientSuite/UserManager/frmUserManager.vb +++ b/EDMI_ClientSuite/UserManager/frmUserManager.vb @@ -82,5 +82,7 @@ Public Class frmUserManager Await UpdateUserToGroupData() End Sub + Private Sub OfficeNavigationBar1_ItemClick(sender As Object, e As DevExpress.XtraBars.Navigation.NavigationBarItemEventArgs) Handles OfficeNavigationBar1.ItemClick + End Sub End Class \ No newline at end of file diff --git a/EDMI_ClientSuite/frmConfigService.Designer.vb b/EDMI_ClientSuite/frmConfigService.Designer.vb index 5404985e..632807fe 100644 --- a/EDMI_ClientSuite/frmConfigService.Designer.vb +++ b/EDMI_ClientSuite/frmConfigService.Designer.vb @@ -110,6 +110,7 @@ Partial Class frmConfigService ' 'txtPort ' + Me.txtPort.EditValue = "9000" Me.txtPort.Location = New System.Drawing.Point(268, 32) Me.txtPort.Name = "txtPort" Me.txtPort.Properties.Mask.EditMask = "n0" diff --git a/EDMI_ClientSuite/frmConfigService.vb b/EDMI_ClientSuite/frmConfigService.vb index 46993fb2..dc94000c 100644 --- a/EDMI_ClientSuite/frmConfigService.vb +++ b/EDMI_ClientSuite/frmConfigService.vb @@ -13,28 +13,33 @@ End Sub Private Async Sub btnTest_Click(sender As Object, e As EventArgs) Handles btnTest.Click - Dim oIPAddress = txtIPAddress.Text - Dim oPort = txtPort.Text - Dim oEndpointURL = $"net.tcp://{oIPAddress}:{oPort}/DigitalData/Services/Main" - Dim oResult As ClassService.ConnectionTestResult + Try + Dim oIPAddress = txtIPAddress.Text + Dim oPort = txtPort.Text + Dim oEndpointURL = $"net.tcp://{oIPAddress}:{oPort}/DigitalData/Services/Main" + Dim oResult As ClassService.ConnectionTestResult - My.SysConfig.ServiceIP = oIPAddress - My.SysConfig.ServicePort = Integer.Parse(oPort) + My.SysConfig.ServiceIP = oIPAddress + My.SysConfig.ServicePort = Integer.Parse(oPort) - lblStatus.Text = "Verbindung wird hergestellt..." - oResult = Await _Service.TestConnectionAsync() + lblStatus.Text = "Verbindung wird hergestellt..." + oResult = Await _Service.TestConnectionAsync() + + If oResult = ClassService.ConnectionTestResult.Successful Then + My.SystemConfigManager.Save() + lblStatus.Text = "Verbindung hergestellt." + Else + Select Case oResult + Case ClassService.ConnectionTestResult.NotFound + lblStatus.Text = "Dienst konnte nicht gefunden werden. Bitte überprüfen sie Addresse und Port." + Case Else + lblStatus.Text = "Unbekannter Fehler." + End Select + End If + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical) + End Try - If oResult = ClassService.ConnectionTestResult.Successful Then - My.SystemConfigManager.Save() - lblStatus.Text = "Verbindung hergestellt." - Else - Select Case oResult - Case ClassService.ConnectionTestResult.NotFound - lblStatus.Text = "Dienst konnte nicht gefunden werden. Bitte überprüfen sie Addresse und Port." - Case Else - lblStatus.Text = "Unbekannter Fehler." - End Select - End If End Sub Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click diff --git a/EDMI_ClientSuite/frmMain.vb b/EDMI_ClientSuite/frmMain.vb index e4efa7f7..1d9f4573 100644 --- a/EDMI_ClientSuite/frmMain.vb +++ b/EDMI_ClientSuite/frmMain.vb @@ -41,8 +41,12 @@ Public Class frmMain _Timer = New ClassTimer(My.LogConfig, Me, My.SysConfig.HeartbeatInterval) AddHandler _Timer.OnlineChanged, AddressOf HandleOnlineChanged SetOnlineLabel() + Try + UserLookAndFeel.Default.SetSkinStyle(My.UIConfig.SkinName) + Catch ex As Exception + + End Try - UserLookAndFeel.Default.SetSkinStyle(My.UIConfig.SkinName) LabelCurrentUser.Caption = My.Application.User.UserName LabelCurrentMachine.Caption = My.Application.User.MachineName