diff --git a/EDMI_ClientSuite/App.config b/EDMI_ClientSuite/App.config index cf3cc8b8..28991ba1 100644 --- a/EDMI_ClientSuite/App.config +++ b/EDMI_ClientSuite/App.config @@ -76,7 +76,8 @@ - + + diff --git a/EDMI_ClientSuite/ClassInit.vb b/EDMI_ClientSuite/ClassInit.vb index 84f1c36b..0a34ee9a 100644 --- a/EDMI_ClientSuite/ClassInit.vb +++ b/EDMI_ClientSuite/ClassInit.vb @@ -38,8 +38,10 @@ Public Class ClassInit Return ConnectionTestResult.Successful Catch ex As EndpointNotFoundException + _Logger.Error(ex) Return ConnectionTestResult.NotFound Catch ex As Exception + _Logger.Error(ex) Return ConnectionTestResult.Unknown End Try End Function) diff --git a/EDMI_ClientSuite/EDMI_ClientSuite.vbproj b/EDMI_ClientSuite/EDMI_ClientSuite.vbproj index e4571d7a..4936cbb5 100644 --- a/EDMI_ClientSuite/EDMI_ClientSuite.vbproj +++ b/EDMI_ClientSuite/EDMI_ClientSuite.vbproj @@ -368,7 +368,7 @@ Application.Designer.vb - SettingsSingleFileGenerator + PublicSettingsSingleFileGenerator My Settings.Designer.vb diff --git a/EDMI_ClientSuite/My Project/Settings.Designer.vb b/EDMI_ClientSuite/My Project/Settings.Designer.vb index 4c923afa..cf0fa946 100644 --- a/EDMI_ClientSuite/My Project/Settings.Designer.vb +++ b/EDMI_ClientSuite/My Project/Settings.Designer.vb @@ -17,7 +17,7 @@ Namespace My _ - Partial Friend NotInheritable Class MySettings + Partial Public NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) diff --git a/EDMI_ClientSuite/My Project/licenses.licx b/EDMI_ClientSuite/My Project/licenses.licx index 8c262734..d96f8e6c 100644 --- a/EDMI_ClientSuite/My Project/licenses.licx +++ b/EDMI_ClientSuite/My Project/licenses.licx @@ -1,6 +1,7 @@ -DevExpress.XtraBars.Docking.DockManager, 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.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.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.XtraBars.Docking.DockManager, 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.XtraEditors.TextEdit, DevExpress.XtraEditors.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.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.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 diff --git a/EDMI_ClientSuite/frmMain.Designer.vb b/EDMI_ClientSuite/frmMain.Designer.vb index a2dcb50c..da9147d1 100644 --- a/EDMI_ClientSuite/frmMain.Designer.vb +++ b/EDMI_ClientSuite/frmMain.Designer.vb @@ -55,6 +55,7 @@ Partial Class frmMain Me.DockPanelProcessManager = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer() Me.ProcessManagerOverview = New EDMI_ClientSuite.ProcessManagerOverview() + Me.BarButtonConnectionSettings = New DevExpress.XtraBars.BarButtonItem() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MainMenu, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DocumentManager, System.ComponentModel.ISupportInitialize).BeginInit() @@ -71,9 +72,9 @@ Partial Class frmMain ' Me.RibbonControl.ApplicationButtonDropDownControl = Me.MainMenu Me.RibbonControl.ExpandCollapseItem.Id = 0 - Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.BarButtonExit, Me.BarButtonUserSettings, Me.LabelCurrentUser, Me.LabelCurrentMachine, Me.LabelCurrentVersion, Me.BarButtonItem1, Me.BarButtonDock1, Me.SkinDropDownButtonItem1, Me.BarButtonDashboard, Me.BarButtonEntityDesigner, Me.BarButtonDeleteControl}) + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.BarButtonExit, Me.BarButtonUserSettings, Me.LabelCurrentUser, Me.LabelCurrentMachine, Me.LabelCurrentVersion, Me.BarButtonItem1, Me.BarButtonDock1, Me.SkinDropDownButtonItem1, Me.BarButtonDashboard, Me.BarButtonEntityDesigner, Me.BarButtonDeleteControl, Me.BarButtonConnectionSettings}) Me.RibbonControl.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl.MaxItemId = 14 + Me.RibbonControl.MaxItemId = 15 Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategoryEntityDesigner}) Me.RibbonControl.PageHeaderItemLinks.Add(Me.SkinDropDownButtonItem1) @@ -85,6 +86,7 @@ Partial Class frmMain ' Me.MainMenu.ItemLinks.Add(Me.BarButtonExit) Me.MainMenu.ItemLinks.Add(Me.BarButtonUserSettings) + Me.MainMenu.ItemLinks.Add(Me.BarButtonConnectionSettings) Me.MainMenu.Name = "MainMenu" Me.MainMenu.Ribbon = Me.RibbonControl ' @@ -97,7 +99,7 @@ Partial Class frmMain ' 'BarButtonUserSettings ' - Me.BarButtonUserSettings.Caption = "Einstellungen" + Me.BarButtonUserSettings.Caption = "Benutzereinstellungen" Me.BarButtonUserSettings.Id = 2 Me.BarButtonUserSettings.ImageOptions.Image = CType(resources.GetObject("BarButtonUserSettings.ImageOptions.Image"), System.Drawing.Image) Me.BarButtonUserSettings.Name = "BarButtonUserSettings" @@ -153,8 +155,8 @@ Partial Class frmMain ' Me.BarButtonEntityDesigner.Caption = "Entitäten Designer" Me.BarButtonEntityDesigner.Id = 12 - Me.BarButtonEntityDesigner.ImageOptions.Image = CType(resources.GetObject("BarButtonItem2.ImageOptions.Image"), System.Drawing.Image) - Me.BarButtonEntityDesigner.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonEntityDesigner.ImageOptions.Image = CType(resources.GetObject("BarButtonEntityDesigner.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonEntityDesigner.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonEntityDesigner.ImageOptions.LargeImage"), System.Drawing.Image) Me.BarButtonEntityDesigner.Name = "BarButtonEntityDesigner" ' 'BarButtonDeleteControl @@ -330,6 +332,13 @@ Partial Class frmMain Me.ProcessManagerOverview.Size = New System.Drawing.Size(337, 163) Me.ProcessManagerOverview.TabIndex = 0 ' + 'BarButtonConnectionSettings + ' + Me.BarButtonConnectionSettings.Caption = "Verbindungseinstellungen" + Me.BarButtonConnectionSettings.Id = 14 + Me.BarButtonConnectionSettings.ImageOptions.Image = CType(resources.GetObject("BarButtonItem2.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonConnectionSettings.Name = "BarButtonConnectionSettings" + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -393,4 +402,5 @@ Partial Class frmMain Friend WithEvents RibbonPageControlActions As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonDeleteControl As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonConnectionSettings As DevExpress.XtraBars.BarButtonItem End Class diff --git a/EDMI_ClientSuite/frmMain.resx b/EDMI_ClientSuite/frmMain.resx index a62b3c60..11b50c42 100644 --- a/EDMI_ClientSuite/frmMain.resx +++ b/EDMI_ClientSuite/frmMain.resx @@ -226,6 +226,21 @@ dtfHMz5dSt6ZNvr+lL/8g/B3GBfUiNgEYWy5pBTVTbw5RrbgGG7HsuXqPDI2h0CXkH5Pxf+Y/WQCb+NP Mb4aY8tC94/UKNQYHaPfUeHfZj4Wkwm8jf8RNOkYVGhsr4wX/UNYHAzzX2JQy7PWC0aGAAAAAElFTkSu QmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAALXRFWHRUaXRsZQBEQjtTb3Vy + Y2U7U3RvcjtkYXRhc291cmNlO0RhdGFiYXNlO0VkaXQo9rqcAAABpUlEQVRYR8WVMU7DQBBFU9Aj0XED + CgokKKgRlJBrUCKqFCAFjkDHTZBoKNIilI5LQBOkFEgs/yE7cnZmQ7xexcWTnNn5/08cjzMIIfSKW9wk + bnGTuMXPyXWTbXEirsSjeBbv4kN8V3BNjTN66EWDduHlZbnFSrAvbsWrCJmgxQMvN8stqnkopsIzzQGv + oZdlClAJPKMuTL0sUwA1zyJxCWZelimAmueRuARzL8sUgOZIXIJWA/T+E/T+EPa+hiNxIUq9iPAaeVmm + AGrmGXgTd+JU5L6K0eKBV/YafokX8SAuxZnYEztiq4JrapzRQy8atLVP72t442WZAqj5JxJ3ZXx+/zQQ + hyJUcJ0coOQGeOGLIVIDlFrDONwMkRqgxBqmvvnS59QAXdfwWOap2w6LO5IaoMsaHsl4VXgN58XXcNUD + 1+QvHFID5Pwbtg6H1ABtN2CMrjL3QmuWwtGYcJBhmzXMCgd0JhxkCuuuYVY4kGXCAdOKXXEgWMXUGmJW + h8TBdd2EA1kmPAeZNcPWCge0xiwHmcWh/4YDWmOWg8yaA6wVDiGEwS9IKlJjkp5nnAAAAABJRU5ErkJg + gg== @@ -340,52 +355,52 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAC3RFWHRUaXRsZQBIb21lOx50 - ZDgAAADUSURBVDhPnZE9DoJAEIWxtfFkJl7AOwCNHQlmW6O30cTCRlAvY/zDdpw3YcgusLCx+GB4O+9L - yEbGGB8TZsPkms3XBwL6DZqhBcpbBstAJKECu3xkynrOuZyNCdrlKTNjHAm/m85YWc8gKVZmJxIrbwRD - ZUUkjCPBI6SsdCQIcVUIwFBZgUT3MwRLZl8HuqQLbezzE7PQAL/hLFTXhB5FKnwuSZ8AHecWnIU3l+7n - VHiVvQKZIyIS7BDz9xbTs0yF6hp3BNrzCjwEC8bwCoLpCP6Doh9wyB/S6rhfgQAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEhvbWU7HnRkOAAAANRJREFUOE+d + kT0OgkAQhbG18WQmXsA7AI0dCWZbo7fRxMJGUC9j/MN2nDdhyC6wsLH4YHg770vIRsYYHxNmw+SazdcH + AvoNmqEFylsGy0AkoQK7fGTKes65nI0J2uUpM2McCb+bzlhZzyApVmYnEitvBENlRSSMI8EjpKx0JAhx + VQjAUFmBRPczBEtmXwe6pAtt7PMTs9AAv+EsVNeEHkUqfC5JnwAd5xachTeX7udUeJW9ApkjIhLsEPP3 + FtOzTIXqGncE2vMKPAQLxvAKgukI/oOiH3DIH9LquF+BAAAAAElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAC3RFWHRUaXRsZQBIb21lOx50 - ZDgAAAE6SURBVFhH7ZLNDcIwDEZBzMUIcO8CDMAIVSfgR+KEhIAZYADm4cIVEeyqrpzETts0lEsPT22+ - 2vkeEhNjzF+pX4qiiGFaIX0LkkJgBpyBA9BZoq8All8BU9FZoo+AWy5KLPK74VBOxApo5UQt8QsBqXwH - nJyslIDSV0oBrRx/LX7zJJb5bc4lILPu7CIQKuczQQk48ztbC0jlW0D6xwcl4N2abyPQpZxQJeBpzTYJ - xJQTogRg7YYE+pQTjRKaQIpyIighCaQsJ1QJSeDChpC+5YQksZcEVsCHDaUoJ1CC7n0DmSSAoMQGwEF+ - AUGXNKHtHoEMz5oAH3azMn8+1kFwxtmpd/nZE+DQsJRLpRyccfcQLfcCZBQYBUICbXD3EC33AqS6SPwW - yygQI5ActwfxgqERwyERw+Ewky+3HJlMr7zcTAAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEhvbWU7HnRkOAAAATpJREFUWEft + ks0NwjAMRkHMxQhw7wIMwAhVJ+BH4oSEgBlgAObhwhUR7KqunMRO2zSUSw9Pbb7a+R4SE2PMX6lfiqKI + YVohfQuSQmAGnIED0FmirwCWXwFT0Vmij4BbLkos8rvhUE7ECmjlRC3xCwGpfAecnKyUgNJXSgGtHH8t + fvMklvltziUgs+7sIhAq5zNBCTjzO1sLSOVbQPrHByXg3ZpvI9ClnFAl4GnNNgnElBOiBGDthgT6lBON + EppAinIiKCEJpCwnVAlJ4MKGkL7lhCSxlwRWwIcNpSgnUILufQOZJICgxAbAQX4BQZc0oe0egQzPmgAf + drMyfz7WQXDG2al3+dkT4NCwlEulHJxx9xAt9wJkFBgFQgJtcPcQLfcCpLpI/BbLKBAjkBy3B/GCoRHD + IRHD4TCTL7ccmUyvvNxMAAAAAElFTkSuQmCC - + - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAADXRFWHRUaXRsZQBXaXphcmQ7 - ySU3BgAAATVJREFUOE+lk81Kw0AURoOv1Bdw5c6HKCiIPwh9ABcSxIUE1KUrdyriSsuAgmIUBBHcuBJ3 - Ndg0VNuFiE3m897pJM4k0yB44Esmyb1nZkLiAfhXioHv+6iJ1OeG2cyxBAVS6sEv/DwIgpeyxOscNKco - MzJLuQ6jQYT4YkONTfQE32WJOpDgMTpZRhLu4vVoHnTNxRYsMENYgp1YLKF3voJ+2ELnsAmZjbjIiUsQ - xGIR/ZuWytvpgtpG9jXkwgqWgJqnKWlyuVoIeDXR8RyS621ayfjdmJQFm5R2V6ypmbttWsndHkT4gOdo - wIUVKlsYR6J3taVe4tntExdgdl04JU4B30w/P/B+v6+auJlxSSYKFPojqpPUCwxySZ5c8mcBM0lCVAWu - MGWJxhaYoSJXGhQWGD8TvB9sYiYvp9hqZQAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAANdEVYdFRpdGxlAFdpemFyZDvJJTcGAAABNUlEQVQ4 + T6WTzUrDQBRGg6/UF3DlzocoKIg/CH0AFxLEhQTUpSt3KuJKy4CCYhQEEdy4Enc12DRU24WITebz3ukk + ziTTIHjgSybJvWdmQuIB+FeKge/7qInU54bZzLEEBVLqwS/8PAiCl7LE6xw0pygzMku5DqNBhPhiQ41N + 9ATfZYk6kOAxOllGEu7i9WgedM3FFiwwQ1iCnVgsoXe+gn7YQuewCZmNuMiJSxDEYhH9m5bK2+mC2kb2 + NeTCCpaAmqcpaXK5Wgh4NdHxHJLrbVrJ+N2YlAWblHZXrKmZu21ayd0eRPiA52jAhRUqWxhHone1pV7i + 2e0TF2B2XTglTgHfTD8/8H6/r5q4mXFJJgoU+iOqk9QLDHJJnlzyZwEzSUJUBa4wZYnGFpihIlcaFBYY + PxO8H2xiJi+n2GplAAAAAElFTkSuQmCC - + - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAADXRFWHRUaXRsZQBXaXphcmQ7 - ySU3BgAAAjpJREFUWEfFlE1LW0EUht2U4i/oX3DXhav+BaH/wE0Fq6G1opsq3Uk2IsFNt6HgqoVSWzV+ - YKuiblqE2m0lFqlNriYmCCaSmOT4niQj9+N478w13r7wMHdOZuY8XCa3i4j+K2IxSsRilIjFKBGLing8 - Tob8BX2A93qQeohFBTZh0A+vTyQSV8lksg9T91mOuUIsKsIIpNNpUSIyAY4kcWeBSu53++n22Ne7JbQE - jt8/6wePbDVqVMtU3Juj4w8DPPWNXYDTlqiyhK7ACqiBDRArH32n7JdxOknFCHMs8Y9bgKMk8JvnYjKO - CZpMcLPct1dkLQ1TdmGI8ngu7I5rC/iQwRJHP8YxQZMnmU+DzYZudAT8whKIox/jmKDJA3BZ2BnzCPAb - Kf54R416DUvNoyswaC0Oe5orWCK3MU31ygWWmyVQAM17QCm/OSo2Z/Jbo3SyHCMrNUG1izy26cdXAI0f - gv3T1ReUWx+5uXiK07WXxHfDSk3S+a+PVC38wTazBAk8BjMgCebBNmgoAf4GVM4OsZTo6dRqczSN1h2w - A4G3Fv8lv+KNbM+i1MpB5rwpwaNJwgh0W8tvKPv5OV3+++loGkbCWICpFo9w81/je1zHtPX6w0qEEgBU - K53x0Iy7qYlEKIH2JkfCSnRMgGNvyqPCT6KjAhx38yCJjgtwTCTuRYCjKxFaIAhOkIRtraeHp3AbODCI - XiCJ9ErnKcSiBA7SQZRwn2VHLErgIF3cEpG+AYWS4FE8rwV1XQOqvYU8ut/neQAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAANdEVYdFRpdGxlAFdpemFyZDvJJTcGAAACOklEQVRY + R8WUTUtbQRSG3ZTiL+hfcNeFq/4Fof/ATQWrobWimyrdSTYiwU23oeCqhVJbNX5gq6JuWoTabSUWqU2u + JiYIJpKY5PieJCP343jvzDXevvAwd05m5jxcJreLiP4rYjFKxGKUiMUoEYuKeDxOhvwFfYD3epB6iEUF + NmHQD69PJBJXyWSyD1P3WY65Qiwqwgik02lRIjIBjiRxZ4FK7nf76fbY17sltASO3z/rB49sNWpUy1Tc + m6PjDwM89Y1dgNOWqLKErsAKqIENECsffafsl3E6ScUIcyzxj1uAoyTwm+diMo4Jmkxws9y3V2QtDVN2 + YYjyeC7sjmsL+JDBEkc/xjFBkyeZT4PNhm50BPzCEoijH+OYoMkDcFnYGfMI8Bsp/nhHjXoNS82jKzBo + LQ57mitYIrcxTfXKBZabJVAAzXtAKb85KjZn8lujdLIcIys1QbWLPLbpx1cAjR+C/dPVF5RbH7m5eIrT + tZfEd8NKTdL5r49ULfzBNrMECTwGMyAJ5sE2aCgB/gZUzg6xlOjp1GpzNI3WHbADgbcW/yW/4o1sz6LU + ykHmvCnBo0nCCHRby28o+/k5Xf776WgaRsJYgKkWj3DzX+N7XMe09frDSoQSAFQrnfHQjLupiUQogfYm + R8JKdEyAY2/Ko8JPoqMCHHfzIImOC3BMJO5FgKMrEVogCE6QhG2tp4encBs4MIheIIn0SucpxKIEDtJB + lHCfZUcsSuAgXdwSkb4BhZLgUTyvBXVdA6q9hTy63+d5AAAAAElFTkSuQmCC diff --git a/EDMI_ClientSuite/frmMain.vb b/EDMI_ClientSuite/frmMain.vb index f83dfda3..909cc805 100644 --- a/EDMI_ClientSuite/frmMain.vb +++ b/EDMI_ClientSuite/frmMain.vb @@ -108,4 +108,10 @@ Public Class frmMain frm.Show() RibbonPageCategoryEntityDesigner.Visible = True End Sub + + Private Sub BarButtonConnectionSettings_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonConnectionSettings.ItemClick + Dim frm As New frmServiceConfig() + frm.MdiParent = DocumentManager.MdiParent + frm.Show() + End Sub End Class \ No newline at end of file diff --git a/EDMI_ClientSuite/frmServiceConfig.Designer.vb b/EDMI_ClientSuite/frmServiceConfig.Designer.vb index 307237ce..c4b3a8e4 100644 --- a/EDMI_ClientSuite/frmServiceConfig.Designer.vb +++ b/EDMI_ClientSuite/frmServiceConfig.Designer.vb @@ -22,24 +22,19 @@ Partial Class frmServiceConfig 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Me.txtIPAddress = New System.Windows.Forms.TextBox() Me.btnCancel = New System.Windows.Forms.Button() Me.btnTest = New System.Windows.Forms.Button() - Me.txtPort = New System.Windows.Forms.TextBox() Me.Label1 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() Me.lblStatus = New System.Windows.Forms.Label() - Me.lblURL = New System.Windows.Forms.TextBox() + Me.btnOK = New System.Windows.Forms.Button() + Me.txtIPAddress = New DevExpress.XtraEditors.TextEdit() + Me.txtPort = New DevExpress.XtraEditors.TextEdit() + CType(Me.txtIPAddress.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtPort.Properties, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'txtIPAddress - ' - Me.txtIPAddress.Location = New System.Drawing.Point(12, 32) - Me.txtIPAddress.Name = "txtIPAddress" - Me.txtIPAddress.Size = New System.Drawing.Size(250, 21) - Me.txtIPAddress.TabIndex = 0 - ' 'btnCancel ' Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel @@ -52,21 +47,13 @@ Partial Class frmServiceConfig ' 'btnTest ' - Me.btnTest.Location = New System.Drawing.Point(223, 124) + Me.btnTest.Location = New System.Drawing.Point(12, 124) Me.btnTest.Name = "btnTest" Me.btnTest.Size = New System.Drawing.Size(109, 23) Me.btnTest.TabIndex = 2 Me.btnTest.Text = "Verbindungstest" Me.btnTest.UseVisualStyleBackColor = True ' - 'txtPort - ' - Me.txtPort.Location = New System.Drawing.Point(268, 32) - Me.txtPort.Name = "txtPort" - Me.txtPort.Size = New System.Drawing.Size(145, 21) - Me.txtPort.TabIndex = 0 - Me.txtPort.Text = "9000" - ' 'Label1 ' Me.Label1.AutoSize = True @@ -88,7 +75,7 @@ Partial Class frmServiceConfig 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(9, 83) + Me.Label3.Location = New System.Drawing.Point(12, 55) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(42, 13) Me.Label3.TabIndex = 4 @@ -96,20 +83,39 @@ Partial Class frmServiceConfig ' 'lblStatus ' - Me.lblStatus.AutoSize = True - Me.lblStatus.Location = New System.Drawing.Point(9, 96) + Me.lblStatus.Location = New System.Drawing.Point(12, 68) Me.lblStatus.Name = "lblStatus" - Me.lblStatus.Size = New System.Drawing.Size(86, 13) + Me.lblStatus.Size = New System.Drawing.Size(401, 53) Me.lblStatus.TabIndex = 4 Me.lblStatus.Text = "Nicht verbunden" ' - 'lblURL + 'btnOK ' - Me.lblURL.Location = New System.Drawing.Point(12, 59) - Me.lblURL.Name = "lblURL" - Me.lblURL.ReadOnly = True - Me.lblURL.Size = New System.Drawing.Size(401, 21) - Me.lblURL.TabIndex = 0 + Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.Cancel + Me.btnOK.Location = New System.Drawing.Point(257, 124) + Me.btnOK.Name = "btnOK" + Me.btnOK.Size = New System.Drawing.Size(75, 23) + Me.btnOK.TabIndex = 1 + Me.btnOK.Text = "OK" + Me.btnOK.UseVisualStyleBackColor = True + ' + 'txtIPAddress + ' + Me.txtIPAddress.Location = New System.Drawing.Point(12, 32) + Me.txtIPAddress.Name = "txtIPAddress" + Me.txtIPAddress.Properties.Mask.EditMask = "\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" + Me.txtIPAddress.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.RegEx + Me.txtIPAddress.Size = New System.Drawing.Size(250, 20) + Me.txtIPAddress.TabIndex = 6 + ' + 'txtPort + ' + Me.txtPort.Location = New System.Drawing.Point(268, 32) + Me.txtPort.Name = "txtPort" + Me.txtPort.Properties.Mask.EditMask = "n0" + Me.txtPort.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.Numeric + Me.txtPort.Size = New System.Drawing.Size(145, 20) + Me.txtPort.TabIndex = 7 ' 'frmServiceConfig ' @@ -118,29 +124,32 @@ Partial Class frmServiceConfig Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.CancelButton = Me.btnCancel Me.ClientSize = New System.Drawing.Size(425, 159) + Me.Controls.Add(Me.txtPort) + Me.Controls.Add(Me.txtIPAddress) Me.Controls.Add(Me.lblStatus) Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.btnTest) + Me.Controls.Add(Me.btnOK) Me.Controls.Add(Me.btnCancel) - Me.Controls.Add(Me.txtPort) - Me.Controls.Add(Me.lblURL) - Me.Controls.Add(Me.txtIPAddress) + Me.MaximizeBox = False + Me.MinimizeBox = False Me.Name = "frmServiceConfig" Me.Text = "Dienst Kommunikation konfigurieren" + CType(Me.txtIPAddress.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtPort.Properties, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - - Friend WithEvents txtIPAddress As TextBox Friend WithEvents btnCancel As Button Friend WithEvents btnTest As Button - Friend WithEvents txtPort As TextBox Friend WithEvents Label1 As Label Friend WithEvents Label2 As Label Friend WithEvents Label3 As Label Friend WithEvents lblStatus As Label - Friend WithEvents lblURL As TextBox + Friend WithEvents btnOK As Button + Friend WithEvents txtIPAddress As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtPort As DevExpress.XtraEditors.TextEdit End Class diff --git a/EDMI_ClientSuite/frmServiceConfig.vb b/EDMI_ClientSuite/frmServiceConfig.vb index 45161233..9345ce5c 100644 --- a/EDMI_ClientSuite/frmServiceConfig.vb +++ b/EDMI_ClientSuite/frmServiceConfig.vb @@ -5,10 +5,6 @@ Public Class frmServiceConfig Private Sub frmServiceConfig_Load(sender As Object, e As EventArgs) Handles Me.Load _Init = New ClassInit() - - If _Init.TestConnectionURLExists() Then - lblURL.Text = My.Settings.ICMServiceAddress - End If End Sub Private Async Sub btnTest_Click(sender As Object, e As EventArgs) Handles btnTest.Click @@ -22,7 +18,6 @@ Public Class frmServiceConfig If oResult = ConnectionTestResult.Successful Then My.Settings.ICMServiceAddress = oEndpointURL - lblURL.Text = oEndpointURL 'My.Settings.Save() lblStatus.Text = "Verbindung hergestellt." Else @@ -34,4 +29,9 @@ Public Class frmServiceConfig End Select End If End Sub + + Private Sub btnDelete_Click(sender As Object, e As EventArgs) + My.Settings.ICMServiceAddress = String.Empty + My.Settings.Save() + End Sub End Class \ No newline at end of file diff --git a/EDMI_ClientSuite/frmSplash.vb b/EDMI_ClientSuite/frmSplash.vb index 0ccd18b7..fb9db005 100644 --- a/EDMI_ClientSuite/frmSplash.vb +++ b/EDMI_ClientSuite/frmSplash.vb @@ -14,7 +14,7 @@ Public NotInheritable Class frmSplash Private _CurrentRetry As Integer = 0 Private Const SLEEP_TIME = 600 - Private Const INIT_STEPS = 2 + Private Const INIT_STEPS = 4 Private Const MAX_RETRIES = 10 Private Const OPEN_TIMEOUT = 10 @@ -73,6 +73,15 @@ Public NotInheritable Class frmSplash Thread.Sleep(SLEEP_TIME) ' TODO: Initialize Usersettings and populate My.Application.User + + _Worker.ReportProgress(SetProgress(2), "Initializing User Settings..") + Thread.Sleep(SLEEP_TIME) + + _Worker.ReportProgress(SetProgress(3), "Connecting to mainframe..") + Thread.Sleep(SLEEP_TIME) + + _Worker.ReportProgress(SetProgress(4), "Setting up neural network..") + Thread.Sleep(SLEEP_TIME) End Sub Private Sub bw_ProgressChanged(sender As Object, e As System.ComponentModel.ProgressChangedEventArgs) diff --git a/Modules.Logging/LogConfig.vb b/Modules.Logging/LogConfig.vb index 45c17238..7c8ed6c8 100644 --- a/Modules.Logging/LogConfig.vb +++ b/Modules.Logging/LogConfig.vb @@ -4,7 +4,7 @@ Imports NLog.Config Imports NLog.Targets ''' LogConfig -''' 0.0.0.5 +''' 0.0.0.6 ''' 02.10.2018 ''' ''' Module that writes file-logs to different locations: