TryCatch NavigationPane
This commit is contained in:
parent
72788c84bd
commit
39ae902929
@ -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.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.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.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.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
|
|
||||||
|
|||||||
@ -44,20 +44,24 @@ Public Class UserControlAssignment
|
|||||||
ViewAssignedToParent.OptionsSelection.MultiSelect = True
|
ViewAssignedToParent.OptionsSelection.MultiSelect = True
|
||||||
|
|
||||||
' Load view layouts
|
' 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)
|
If IO.File.Exists(ViewParentListPath) Then
|
||||||
Dim ViewAssignedPath = GetLayoutPath(GroupName.LayoutUserManager, Name, ViewAssignedToParent.Name)
|
ViewParentList.RestoreLayoutFromXml(ViewParentListPath)
|
||||||
Dim ViewNotAssignedPath = GetLayoutPath(GroupName.LayoutUserManager, Name, ViewNotAssignedToParent.Name)
|
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
|
End Sub
|
||||||
|
|
||||||
Private Function MaybeCopyToDataTable(RowCollection As EnumerableRowCollection(Of DataRow)) As DataTable
|
Private Function MaybeCopyToDataTable(RowCollection As EnumerableRowCollection(Of DataRow)) As DataTable
|
||||||
|
|||||||
14
EDMI_ClientSuite/UserManager/frmEdit.Designer.vb
generated
14
EDMI_ClientSuite/UserManager/frmEdit.Designer.vb
generated
@ -29,12 +29,12 @@ Partial Class frmEdit
|
|||||||
Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
|
Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
|
||||||
Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup()
|
Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup()
|
||||||
Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
|
Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
|
||||||
|
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
|
||||||
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
||||||
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||||
Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||||
Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
|
Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
|
||||||
Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
||||||
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
|
|
||||||
CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
|
CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||||
Me.SplitContainerControl1.SuspendLayout()
|
Me.SplitContainerControl1.SuspendLayout()
|
||||||
CType(Me.GridList, System.ComponentModel.ISupportInitialize).BeginInit()
|
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.Size = New System.Drawing.Size(1104, 146)
|
||||||
Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
|
Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
|
||||||
'
|
'
|
||||||
|
'BarButtonItem1
|
||||||
|
'
|
||||||
|
Me.BarButtonItem1.Caption = "BarButtonItem1"
|
||||||
|
Me.BarButtonItem1.Id = 1
|
||||||
|
Me.BarButtonItem1.Name = "BarButtonItem1"
|
||||||
|
'
|
||||||
'RibbonPage1
|
'RibbonPage1
|
||||||
'
|
'
|
||||||
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2})
|
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.Name = "RibbonPage2"
|
||||||
Me.RibbonPage2.Text = "RibbonPage2"
|
Me.RibbonPage2.Text = "RibbonPage2"
|
||||||
'
|
'
|
||||||
'BarButtonItem1
|
|
||||||
'
|
|
||||||
Me.BarButtonItem1.Caption = "BarButtonItem1"
|
|
||||||
Me.BarButtonItem1.Id = 1
|
|
||||||
Me.BarButtonItem1.Name = "BarButtonItem1"
|
|
||||||
'
|
|
||||||
'frmEdit
|
'frmEdit
|
||||||
'
|
'
|
||||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||||
|
|||||||
@ -25,21 +25,19 @@ Partial Class frmUserManager
|
|||||||
Me.BarButtonGroupEdit = New DevExpress.XtraBars.BarButtonItem()
|
Me.BarButtonGroupEdit = New DevExpress.XtraBars.BarButtonItem()
|
||||||
Me.BarButtonAssign = New DevExpress.XtraBars.BarButtonItem()
|
Me.BarButtonAssign = New DevExpress.XtraBars.BarButtonItem()
|
||||||
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
|
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
|
||||||
|
Me.BarButtonRefresh = New DevExpress.XtraBars.BarButtonItem()
|
||||||
Me.RibbonPageCategoryUserManager = New DevExpress.XtraBars.Ribbon.RibbonPageCategory()
|
Me.RibbonPageCategoryUserManager = New DevExpress.XtraBars.Ribbon.RibbonPageCategory()
|
||||||
Me.RibbonPageUserManager = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
Me.RibbonPageUserManager = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
||||||
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||||
Me.RibbonPageGroup2 = 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.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.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||||
CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
|
CType(Me.OfficeNavigationBar1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||||
Me.XtraTabControl1.SuspendLayout()
|
|
||||||
Me.TabPageUserToGroup.SuspendLayout()
|
|
||||||
Me.SuspendLayout()
|
Me.SuspendLayout()
|
||||||
'
|
'
|
||||||
'RibbonControl
|
'RibbonControl
|
||||||
@ -86,6 +84,14 @@ Partial Class frmUserManager
|
|||||||
Me.BarButtonItem1.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.LargeImage"), System.Drawing.Image)
|
Me.BarButtonItem1.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.LargeImage"), System.Drawing.Image)
|
||||||
Me.BarButtonItem1.Name = "BarButtonItem1"
|
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
|
'RibbonPageCategoryUserManager
|
||||||
'
|
'
|
||||||
Me.RibbonPageCategoryUserManager.Name = "RibbonPageCategoryUserManager"
|
Me.RibbonPageCategoryUserManager.Name = "RibbonPageCategoryUserManager"
|
||||||
@ -112,6 +118,12 @@ Partial Class frmUserManager
|
|||||||
Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
|
Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
|
||||||
Me.RibbonPageGroup2.Text = "Zuordnung"
|
Me.RibbonPageGroup2.Text = "Zuordnung"
|
||||||
'
|
'
|
||||||
|
'RibbonPageGroup3
|
||||||
|
'
|
||||||
|
Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonRefresh)
|
||||||
|
Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
|
||||||
|
Me.RibbonPageGroup3.Text = "Daten"
|
||||||
|
'
|
||||||
'RibbonStatusBar
|
'RibbonStatusBar
|
||||||
'
|
'
|
||||||
Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 519)
|
Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 519)
|
||||||
@ -119,62 +131,44 @@ Partial Class frmUserManager
|
|||||||
Me.RibbonStatusBar.Ribbon = Me.RibbonControl
|
Me.RibbonStatusBar.Ribbon = Me.RibbonControl
|
||||||
Me.RibbonStatusBar.Size = New System.Drawing.Size(1070, 21)
|
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
|
'UCUserToGroup
|
||||||
'
|
'
|
||||||
Me.UCUserToGroup.Dock = System.Windows.Forms.DockStyle.Fill
|
Me.UCUserToGroup.Location = New System.Drawing.Point(250, 168)
|
||||||
Me.UCUserToGroup.Location = New System.Drawing.Point(0, 0)
|
|
||||||
Me.UCUserToGroup.Name = "UCUserToGroup"
|
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.TabIndex = 0
|
||||||
Me.UCUserToGroup.TextAssignedToParent = "Zugeordnete Benutzer zu Gruppe:"
|
Me.UCUserToGroup.TextAssignedToParent = "Zugeordnete Benutzer zu Gruppe:"
|
||||||
Me.UCUserToGroup.TextNotAssignedToParent = "Nicht zugeordnete Benutzer:"
|
Me.UCUserToGroup.TextNotAssignedToParent = "Nicht zugeordnete Benutzer:"
|
||||||
Me.UCUserToGroup.TextParentList = "Verfügbare Gruppen:"
|
Me.UCUserToGroup.TextParentList = "Verfügbare Gruppen:"
|
||||||
'
|
'
|
||||||
'TabPageGroupToGroup
|
'OfficeNavigationBar1
|
||||||
'
|
'
|
||||||
Me.TabPageGroupToGroup.Name = "TabPageGroupToGroup"
|
Me.OfficeNavigationBar1.Dock = System.Windows.Forms.DockStyle.Bottom
|
||||||
Me.TabPageGroupToGroup.Size = New System.Drawing.Size(966, 371)
|
Me.OfficeNavigationBar1.Items.AddRange(New DevExpress.XtraBars.Navigation.NavigationBarItem() {Me.NavigationBarItem1, Me.NavigationBarItem2})
|
||||||
Me.TabPageGroupToGroup.Text = "Gruppe zu Gruppe"
|
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.NavigationBarItem1.Name = "NavigationBarItem1"
|
||||||
Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
|
Me.NavigationBarItem1.Text = "Userzuordnung"
|
||||||
Me.RibbonPageGroup3.Text = "Daten"
|
|
||||||
'
|
'
|
||||||
'BarButtonRefresh
|
'NavigationBarItem2
|
||||||
'
|
'
|
||||||
Me.BarButtonRefresh.Caption = "Neu Laden"
|
Me.NavigationBarItem2.Name = "NavigationBarItem2"
|
||||||
Me.BarButtonRefresh.Id = 8
|
Me.NavigationBarItem2.ShowPeekFormOnItemHover = DevExpress.Utils.DefaultBoolean.[True]
|
||||||
Me.BarButtonRefresh.ImageOptions.Image = CType(resources.GetObject("BarButtonItem2.ImageOptions.Image"), System.Drawing.Image)
|
Me.NavigationBarItem2.Text = "Gruppenzuordnung"
|
||||||
Me.BarButtonRefresh.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.LargeImage"), System.Drawing.Image)
|
|
||||||
Me.BarButtonRefresh.Name = "BarButtonRefresh"
|
|
||||||
'
|
'
|
||||||
'frmUserManager
|
'frmUserManager
|
||||||
'
|
'
|
||||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||||
Me.ClientSize = New System.Drawing.Size(1070, 540)
|
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.RibbonStatusBar)
|
||||||
Me.Controls.Add(Me.RibbonControl)
|
Me.Controls.Add(Me.RibbonControl)
|
||||||
Me.Name = "frmUserManager"
|
Me.Name = "frmUserManager"
|
||||||
@ -182,9 +176,7 @@ Partial Class frmUserManager
|
|||||||
Me.StatusBar = Me.RibbonStatusBar
|
Me.StatusBar = Me.RibbonStatusBar
|
||||||
Me.Text = "User Manager"
|
Me.Text = "User Manager"
|
||||||
CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit()
|
CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit()
|
||||||
CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
|
CType(Me.OfficeNavigationBar1, System.ComponentModel.ISupportInitialize).EndInit()
|
||||||
Me.XtraTabControl1.ResumeLayout(False)
|
|
||||||
Me.TabPageUserToGroup.ResumeLayout(False)
|
|
||||||
Me.ResumeLayout(False)
|
Me.ResumeLayout(False)
|
||||||
Me.PerformLayout()
|
Me.PerformLayout()
|
||||||
|
|
||||||
@ -197,13 +189,13 @@ Partial Class frmUserManager
|
|||||||
Friend WithEvents BarButtonUserEdit As DevExpress.XtraBars.BarButtonItem
|
Friend WithEvents BarButtonUserEdit As DevExpress.XtraBars.BarButtonItem
|
||||||
Friend WithEvents BarButtonGroupEdit As DevExpress.XtraBars.BarButtonItem
|
Friend WithEvents BarButtonGroupEdit As DevExpress.XtraBars.BarButtonItem
|
||||||
Friend WithEvents RibbonPageCategoryUserManager As DevExpress.XtraBars.Ribbon.RibbonPageCategory
|
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 UCUserToGroup As UserControlAssignment
|
||||||
Friend WithEvents BarButtonAssign As DevExpress.XtraBars.BarButtonItem
|
Friend WithEvents BarButtonAssign As DevExpress.XtraBars.BarButtonItem
|
||||||
Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
|
Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
|
||||||
Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
|
Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
|
||||||
Friend WithEvents BarButtonRefresh As DevExpress.XtraBars.BarButtonItem
|
Friend WithEvents BarButtonRefresh As DevExpress.XtraBars.BarButtonItem
|
||||||
Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
|
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
|
End Class
|
||||||
|
|||||||
@ -214,30 +214,30 @@
|
|||||||
8P/Qn7tosvK/5TOR4kykOBMpzqPsfgBphQ1j4i+mWAAAAABJRU5ErkJggg==
|
8P/Qn7tosvK/5TOR4kykOBMpzqPsfgBphQ1j4i+mWAAAAABJRU5ErkJggg==
|
||||||
</value>
|
</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="BarButtonItem2.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
<data name="BarButtonRefresh.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
<value>
|
<value>
|
||||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
|
||||||
YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAJ3RFWHRUaXRsZQBSZWZyZXNo
|
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAndEVYdFRpdGxlAFJlZnJlc2g7UmVwZWF0O0JhcnM7
|
||||||
O1JlcGVhdDtCYXJzO1JpYmJvbjtSZWxvYWTNTfbpAAAA0klEQVQ4T6WSsQ3CQBAEjUQBNGDRgXOKsMhI
|
UmliYm9uO1JlbG9hZM1N9ukAAADSSURBVDhPpZKxDcJAEASNRAE0YNGBc4qwyEjIHSJHkNMEJZCSmYx+
|
||||||
yB0iR5DTBCWQkpmMfmji2X39nk7oHoEJRjrt3u2/fd+klP4iFH/Biv58Fy0YwQSeBdbU6OW+WsACHECq
|
aOLZff2eTugegQlGOu3e7b9936SU/iIUf8GK/nwXLRjBBJ4F1tTo5b5awAIcQKpwAxsQBqxADxhyAgNY
|
||||||
cAMbEAasQA8YcgIDWBdYP4BC2ihgXxoYYrrzO6CQUbpMDumaOUQNHui8Cf1JWjQsLCTwjI8mh4/XyxJ1
|
F1g/gELaKGBfGhhiuvM7oJBRukwO6Zo5RA0e6LwJ/UlaNCwsJPCMjyaHj9fLEnX1EH89roriIM3D5uLb
|
||||||
9RB/Pa6K4iDNw+bi2zB138A90+CP6qQ734fY5/kGPhKuSCHva9wBhdicDyB8JAqJ2ILcWwsg857yXELx
|
MHXfwD3T4I/qpDvfh9jn+QY+Eq5IIe9r3AGF2JwPIHwkConYgtxbCyDznvJcQvF7UvMC/+yHWnrFMzsA
|
||||||
e1LzAv/sh1p6xTM7AAAAAElFTkSuQmCC
|
AAAASUVORK5CYII=
|
||||||
</value>
|
</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="BarButtonItem2.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
<data name="BarButtonRefresh.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
<value>
|
<value>
|
||||||
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
|
||||||
YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAJ3RFWHRUaXRsZQBSZWZyZXNo
|
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAndEVYdFRpdGxlAFJlZnJlc2g7UmVwZWF0O0JhcnM7
|
||||||
O1JlcGVhdDtCYXJzO1JpYmJvbjtSZWxvYWTNTfbpAAABzklEQVRYR8WWPU7DUBCEUwSadEgUKBQUIOUE
|
UmliYm9uO1JlbG9hZM1N9ukAAAHOSURBVFhHxZY9TsNQEIRTBJp0SBQoFBQg5QTQJSfwVVLSJkJCHAFu
|
||||||
0CUn8FVS0iZCQhwBbuAD0HCAdNSpKCi4Ar2ZQd5o32Ze7BDxUnxKPG92d+S/50HTNEdFiiWRYkmkWBIp
|
4APQcIB01KkoKLgCvZlB3mjfZl7sEPFSfEo8b3Z35L/nQdM0R0WKJZFiSaRYEimWRIo5qoe3CZiDGqzB
|
||||||
lkSKOaqHtwmYgxqswXcL/1Pj2kTV5pBiBE3HYAk+QNMBPfSOVa+IFD1odAteQRzUBWumqqdHigYakAvw
|
dwv/U+PaRNXmkGIETcdgCT5A0wE99I5Vr4gUPWh0C15BHNQFa6aqp0eKBhqQC/AJ1JAuVmBnCCkSFJKq
|
||||||
CdSQLlZgZwgpEhSSqv29AhbiHSzADJy18D81rsUQPBPZyyFFgiIOZwMf4hHcKD/hGngBMcRS+cmWcF8/
|
/b0CFuIdLMAMnLXwPzWuxRA8E9nLIUWCIg5nAx/iEdwoP+EaeAExxFL5yZZwXz8PUWDDDQtxEv0ReEYg
|
||||||
D1Fgww0LcRL9EXhGIIbgjSmfjuQAw89hjMONynt3AS/PRLwcc+VNDmDKDTf2CcF7wtfWyrf5A0PXcKNX
|
huCNKZ+O5ADDz2GMw43Ke3cBL89EvBxz5U0OYMoNN/YJwXvC19bKt/kDQ9dwo1cI+Hhj+rq18pm573Aj
|
||||||
CPh4Y/q6tfKZue9wIwnB47Del+qg4gND/NZvGniwyHe7N8+ULwLf3pdxqwmBgRuLL1gonwLerhDJmUuK
|
CcHjsN6X6qDiA0P81m8aeLDId7s3z5QvAt/el3GrCYGBG4svWCifAt6uEMmZS4oNmLir+SI+UtkXUATe
|
||||||
DZi4q/kiPlLZF1AE3lyIio+69yaFBozcduPOx5fLSPk98JwCFYLDh9GfHHhQwC3VNyAM0fUqfgLXwIdI
|
XIiKj7r3JoUGjNx2487Hl8tI+T3wnAIVgsOH0Z8ceFDALdU3IAzR9Sp+AtfAh0hOu0eKBEX8BlDbcJ/N
|
||||||
TrtHigRF/AZQ23CfzegL+BByBpGigcIp4JYaQ/SBIS6B7G1I0YMGDPHXD5I71dMjxQgaHe+TzIOmx/ko
|
6Av4EHIGkaKBwinglhpD9IEhLoHsbUjRgwYM8dcPkjvV0yPFCBod75PMg6bH+Sj9T6RYEimWRIolkWI5
|
||||||
/U+kWBIplkSKJZFiOZrBD//k8vo54AqiAAAAAElFTkSuQmCC
|
msEP/+Ty+jngCqIAAAAASUVORK5CYII=
|
||||||
</value>
|
</value>
|
||||||
</data>
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@ -82,5 +82,7 @@ Public Class frmUserManager
|
|||||||
Await UpdateUserToGroupData()
|
Await UpdateUserToGroupData()
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
Private Sub OfficeNavigationBar1_ItemClick(sender As Object, e As DevExpress.XtraBars.Navigation.NavigationBarItemEventArgs) Handles OfficeNavigationBar1.ItemClick
|
||||||
|
|
||||||
|
End Sub
|
||||||
End Class
|
End Class
|
||||||
1
EDMI_ClientSuite/frmConfigService.Designer.vb
generated
1
EDMI_ClientSuite/frmConfigService.Designer.vb
generated
@ -110,6 +110,7 @@ Partial Class frmConfigService
|
|||||||
'
|
'
|
||||||
'txtPort
|
'txtPort
|
||||||
'
|
'
|
||||||
|
Me.txtPort.EditValue = "9000"
|
||||||
Me.txtPort.Location = New System.Drawing.Point(268, 32)
|
Me.txtPort.Location = New System.Drawing.Point(268, 32)
|
||||||
Me.txtPort.Name = "txtPort"
|
Me.txtPort.Name = "txtPort"
|
||||||
Me.txtPort.Properties.Mask.EditMask = "n0"
|
Me.txtPort.Properties.Mask.EditMask = "n0"
|
||||||
|
|||||||
@ -13,28 +13,33 @@
|
|||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Async Sub btnTest_Click(sender As Object, e As EventArgs) Handles btnTest.Click
|
Private Async Sub btnTest_Click(sender As Object, e As EventArgs) Handles btnTest.Click
|
||||||
Dim oIPAddress = txtIPAddress.Text
|
Try
|
||||||
Dim oPort = txtPort.Text
|
Dim oIPAddress = txtIPAddress.Text
|
||||||
Dim oEndpointURL = $"net.tcp://{oIPAddress}:{oPort}/DigitalData/Services/Main"
|
Dim oPort = txtPort.Text
|
||||||
Dim oResult As ClassService.ConnectionTestResult
|
Dim oEndpointURL = $"net.tcp://{oIPAddress}:{oPort}/DigitalData/Services/Main"
|
||||||
|
Dim oResult As ClassService.ConnectionTestResult
|
||||||
|
|
||||||
My.SysConfig.ServiceIP = oIPAddress
|
My.SysConfig.ServiceIP = oIPAddress
|
||||||
My.SysConfig.ServicePort = Integer.Parse(oPort)
|
My.SysConfig.ServicePort = Integer.Parse(oPort)
|
||||||
|
|
||||||
lblStatus.Text = "Verbindung wird hergestellt..."
|
lblStatus.Text = "Verbindung wird hergestellt..."
|
||||||
oResult = Await _Service.TestConnectionAsync()
|
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
|
End Sub
|
||||||
|
|
||||||
Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
|
Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
|
||||||
|
|||||||
@ -41,8 +41,12 @@ Public Class frmMain
|
|||||||
_Timer = New ClassTimer(My.LogConfig, Me, My.SysConfig.HeartbeatInterval)
|
_Timer = New ClassTimer(My.LogConfig, Me, My.SysConfig.HeartbeatInterval)
|
||||||
AddHandler _Timer.OnlineChanged, AddressOf HandleOnlineChanged
|
AddHandler _Timer.OnlineChanged, AddressOf HandleOnlineChanged
|
||||||
SetOnlineLabel()
|
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
|
LabelCurrentUser.Caption = My.Application.User.UserName
|
||||||
LabelCurrentMachine.Caption = My.Application.User.MachineName
|
LabelCurrentMachine.Caption = My.Application.User.MachineName
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user