This commit is contained in:
Jonathan Jenne 2019-01-30 14:40:05 +01:00
parent afb2f1f658
commit 1ae788f52e
12 changed files with 144 additions and 91 deletions

View File

@ -76,7 +76,8 @@
<remove invariant="FirebirdSql.Data.FirebirdClient" /> <remove invariant="FirebirdSql.Data.FirebirdClient" />
<add name="FirebirdClient Data Provider" invariant="FirebirdSql.Data.FirebirdClient" description=".NET Framework Data Provider for Firebird" type="FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient" /> <add name="FirebirdClient Data Provider" invariant="FirebirdSql.Data.FirebirdClient" description=".NET Framework Data Provider for Firebird" type="FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient" />
</DbProviderFactories> </DbProviderFactories>
</system.data><userSettings> </system.data>
<userSettings>
<EDMI_ClientSuite.My.MySettings> <EDMI_ClientSuite.My.MySettings>
<setting name="ICMServiceAddress" serializeAs="String"> <setting name="ICMServiceAddress" serializeAs="String">
<value /> <value />

View File

@ -38,8 +38,10 @@ Public Class ClassInit
Return ConnectionTestResult.Successful Return ConnectionTestResult.Successful
Catch ex As EndpointNotFoundException Catch ex As EndpointNotFoundException
_Logger.Error(ex)
Return ConnectionTestResult.NotFound Return ConnectionTestResult.NotFound
Catch ex As Exception Catch ex As Exception
_Logger.Error(ex)
Return ConnectionTestResult.Unknown Return ConnectionTestResult.Unknown
End Try End Try
End Function) End Function)

View File

@ -368,7 +368,7 @@
<LastGenOutput>Application.Designer.vb</LastGenOutput> <LastGenOutput>Application.Designer.vb</LastGenOutput>
</None> </None>
<None Include="My Project\Settings.settings"> <None Include="My Project\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>PublicSettingsSingleFileGenerator</Generator>
<CustomToolNamespace>My</CustomToolNamespace> <CustomToolNamespace>My</CustomToolNamespace>
<LastGenOutput>Settings.Designer.vb</LastGenOutput> <LastGenOutput>Settings.Designer.vb</LastGenOutput>
</None> </None>

View File

@ -17,7 +17,7 @@ Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _ <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"), _ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class MySettings Partial Public NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase Inherits Global.System.Configuration.ApplicationSettingsBase
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)

View File

@ -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.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.Docking.DockManager, 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.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.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

View File

@ -55,6 +55,7 @@ Partial Class frmMain
Me.DockPanelProcessManager = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanelProcessManager = New DevExpress.XtraBars.Docking.DockPanel()
Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer() Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer()
Me.ProcessManagerOverview = New EDMI_ClientSuite.ProcessManagerOverview() Me.ProcessManagerOverview = New EDMI_ClientSuite.ProcessManagerOverview()
Me.BarButtonConnectionSettings = New DevExpress.XtraBars.BarButtonItem()
CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.MainMenu, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MainMenu, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.DocumentManager, 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.ApplicationButtonDropDownControl = Me.MainMenu
Me.RibbonControl.ExpandCollapseItem.Id = 0 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.Location = New System.Drawing.Point(0, 0)
Me.RibbonControl.MaxItemId = 14 Me.RibbonControl.MaxItemId = 15
Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.Name = "RibbonControl"
Me.RibbonControl.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategoryEntityDesigner}) Me.RibbonControl.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategoryEntityDesigner})
Me.RibbonControl.PageHeaderItemLinks.Add(Me.SkinDropDownButtonItem1) Me.RibbonControl.PageHeaderItemLinks.Add(Me.SkinDropDownButtonItem1)
@ -85,6 +86,7 @@ Partial Class frmMain
' '
Me.MainMenu.ItemLinks.Add(Me.BarButtonExit) Me.MainMenu.ItemLinks.Add(Me.BarButtonExit)
Me.MainMenu.ItemLinks.Add(Me.BarButtonUserSettings) Me.MainMenu.ItemLinks.Add(Me.BarButtonUserSettings)
Me.MainMenu.ItemLinks.Add(Me.BarButtonConnectionSettings)
Me.MainMenu.Name = "MainMenu" Me.MainMenu.Name = "MainMenu"
Me.MainMenu.Ribbon = Me.RibbonControl Me.MainMenu.Ribbon = Me.RibbonControl
' '
@ -97,7 +99,7 @@ Partial Class frmMain
' '
'BarButtonUserSettings 'BarButtonUserSettings
' '
Me.BarButtonUserSettings.Caption = "Einstellungen" Me.BarButtonUserSettings.Caption = "Benutzereinstellungen"
Me.BarButtonUserSettings.Id = 2 Me.BarButtonUserSettings.Id = 2
Me.BarButtonUserSettings.ImageOptions.Image = CType(resources.GetObject("BarButtonUserSettings.ImageOptions.Image"), System.Drawing.Image) Me.BarButtonUserSettings.ImageOptions.Image = CType(resources.GetObject("BarButtonUserSettings.ImageOptions.Image"), System.Drawing.Image)
Me.BarButtonUserSettings.Name = "BarButtonUserSettings" Me.BarButtonUserSettings.Name = "BarButtonUserSettings"
@ -153,8 +155,8 @@ Partial Class frmMain
' '
Me.BarButtonEntityDesigner.Caption = "Entitäten Designer" Me.BarButtonEntityDesigner.Caption = "Entitäten Designer"
Me.BarButtonEntityDesigner.Id = 12 Me.BarButtonEntityDesigner.Id = 12
Me.BarButtonEntityDesigner.ImageOptions.Image = CType(resources.GetObject("BarButtonItem2.ImageOptions.Image"), System.Drawing.Image) Me.BarButtonEntityDesigner.ImageOptions.Image = CType(resources.GetObject("BarButtonEntityDesigner.ImageOptions.Image"), System.Drawing.Image)
Me.BarButtonEntityDesigner.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.LargeImage"), System.Drawing.Image) Me.BarButtonEntityDesigner.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonEntityDesigner.ImageOptions.LargeImage"), System.Drawing.Image)
Me.BarButtonEntityDesigner.Name = "BarButtonEntityDesigner" Me.BarButtonEntityDesigner.Name = "BarButtonEntityDesigner"
' '
'BarButtonDeleteControl 'BarButtonDeleteControl
@ -330,6 +332,13 @@ Partial Class frmMain
Me.ProcessManagerOverview.Size = New System.Drawing.Size(337, 163) Me.ProcessManagerOverview.Size = New System.Drawing.Size(337, 163)
Me.ProcessManagerOverview.TabIndex = 0 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 'frmMain
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) 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 RibbonPageControlActions As DevExpress.XtraBars.Ribbon.RibbonPage
Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents BarButtonDeleteControl As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonDeleteControl As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonConnectionSettings As DevExpress.XtraBars.BarButtonItem
End Class End Class

View File

@ -226,6 +226,21 @@
dtfHMz5dSt6ZNvr+lL/8g/B3GBfUiNgEYWy5pBTVTbw5RrbgGG7HsuXqPDI2h0CXkH5Pxf+Y/WQCb+NP dtfHMz5dSt6ZNvr+lL/8g/B3GBfUiNgEYWy5pBTVTbw5RrbgGG7HsuXqPDI2h0CXkH5Pxf+Y/WQCb+NP
Mb4aY8tC94/UKNQYHaPfUeHfZj4Wkwm8jf8RNOkYVGhsr4wX/UNYHAzzX2JQy7PWC0aGAAAAAElFTkSu Mb4aY8tC94/UKNQYHaPfUeHfZj4Wkwm8jf8RNOkYVGhsr4wX/UNYHAzzX2JQy7PWC0aGAAAAAElFTkSu
QmCC QmCC
</value>
</data>
<data name="BarButtonItem2.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAALXRFWHRUaXRsZQBEQjtTb3Vy
Y2U7U3RvcjtkYXRhc291cmNlO0RhdGFiYXNlO0VkaXQo9rqcAAABpUlEQVRYR8WVMU7DQBBFU9Aj0XED
CgokKKgRlJBrUCKqFCAFjkDHTZBoKNIilI5LQBOkFEgs/yE7cnZmQ7xexcWTnNn5/08cjzMIIfSKW9wk
bnGTuMXPyXWTbXEirsSjeBbv4kN8V3BNjTN66EWDduHlZbnFSrAvbsWrCJmgxQMvN8stqnkopsIzzQGv
oZdlClAJPKMuTL0sUwA1zyJxCWZelimAmueRuARzL8sUgOZIXIJWA/T+E/T+EPa+hiNxIUq9iPAaeVmm
AGrmGXgTd+JU5L6K0eKBV/YafokX8SAuxZnYEztiq4JrapzRQy8atLVP72t442WZAqj5JxJ3ZXx+/zQQ
hyJUcJ0coOQGeOGLIVIDlFrDONwMkRqgxBqmvvnS59QAXdfwWOap2w6LO5IaoMsaHsl4VXgN58XXcNUD
1+QvHFID5Pwbtg6H1ABtN2CMrjL3QmuWwtGYcJBhmzXMCgd0JhxkCuuuYVY4kGXCAdOKXXEgWMXUGmJW
h8TBdd2EA1kmPAeZNcPWCge0xiwHmcWh/4YDWmOWg8yaA6wVDiGEwS9IKlJjkp5nnAAAAABJRU5ErkJg
gg==
</value> </value>
</data> </data>
<data name="LabelCurrentUser.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="LabelCurrentUser.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -340,52 +355,52 @@
</data> </data>
<data name="BarButtonDashboard.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="BarButtonDashboard.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAC3RFWHRUaXRsZQBIb21lOx50 dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEhvbWU7HnRkOAAAANRJREFUOE+d
ZDgAAADUSURBVDhPnZE9DoJAEIWxtfFkJl7AOwCNHQlmW6O30cTCRlAvY/zDdpw3YcgusLCx+GB4O+9L kT0OgkAQhbG18WQmXsA7AI0dCWZbo7fRxMJGUC9j/MN2nDdhyC6wsLH4YHg770vIRsYYHxNmw+SazdcH
yEbGGB8TZsPkms3XBwL6DZqhBcpbBstAJKECu3xkynrOuZyNCdrlKTNjHAm/m85YWc8gKVZmJxIrbwRD AvoNmqEFylsGy0AkoQK7fGTKes65nI0J2uUpM2McCb+bzlhZzyApVmYnEitvBENlRSSMI8EjpKx0JAhx
ZUUkjCPBI6SsdCQIcVUIwFBZgUT3MwRLZl8HuqQLbezzE7PQAL/hLFTXhB5FKnwuSZ8AHecWnIU3l+7n VQjAUFmBRPczBEtmXwe6pAtt7PMTs9AAv+EsVNeEHkUqfC5JnwAd5xachTeX7udUeJW9ApkjIhLsEPP3
VHiVvQKZIyIS7BDz9xbTs0yF6hp3BNrzCjwEC8bwCoLpCP6Doh9wyB/S6rhfgQAAAABJRU5ErkJggg== FtOzTIXqGncE2vMKPAQLxvAKgukI/oOiH3DIH9LquF+BAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="BarButtonDashboard.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="BarButtonDashboard.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAC3RFWHRUaXRsZQBIb21lOx50 dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEhvbWU7HnRkOAAAATpJREFUWEft
ZDgAAAE6SURBVFhH7ZLNDcIwDEZBzMUIcO8CDMAIVSfgR+KEhIAZYADm4cIVEeyqrpzETts0lEsPT22+ ks0NwjAMRkHMxQhw7wIMwAhVJ+BH4oSEgBlgAObhwhUR7KqunMRO2zSUSw9Pbb7a+R4SE2PMX6lfiqKI
2vkeEhNjzF+pX4qiiGFaIX0LkkJgBpyBA9BZoq8All8BU9FZoo+AWy5KLPK74VBOxApo5UQt8QsBqXwH YVohfQuSQmAGnIED0FmirwCWXwFT0Vmij4BbLkos8rvhUE7ECmjlRC3xCwGpfAecnKyUgNJXSgGtHH8t
nJyslIDSV0oBrRx/LX7zJJb5bc4lILPu7CIQKuczQQk48ztbC0jlW0D6xwcl4N2abyPQpZxQJeBpzTYJ fvMklvltziUgs+7sIhAq5zNBCTjzO1sLSOVbQPrHByXg3ZpvI9ClnFAl4GnNNgnElBOiBGDthgT6lBON
xJQTogRg7YYE+pQTjRKaQIpyIighCaQsJ1QJSeDChpC+5YQksZcEVsCHDaUoJ1CC7n0DmSSAoMQGwEF+ EppAinIiKCEJpCwnVAlJ4MKGkL7lhCSxlwRWwIcNpSgnUILufQOZJICgxAbAQX4BQZc0oe0egQzPmgAf
AUGXNKHtHoEMz5oAH3azMn8+1kFwxtmpd/nZE+DQsJRLpRyccfcQLfcCZBQYBUICbXD3EC33AqS6SPwW drMyfz7WQXDG2al3+dkT4NCwlEulHJxx9xAt9wJkFBgFQgJtcPcQLfcCpLpI/BbLKBAjkBy3B/GCoRHD
yygQI5ActwfxgqERwyERw+Ewky+3HJlMr7zcTAAAAABJRU5ErkJggg== IRHD4TCTL7ccmUyvvNxMAAAAAElFTkSuQmCC
</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="BarButtonEntityDesigner.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAADXRFWHRUaXRsZQBXaXphcmQ7 dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAANdEVYdFRpdGxlAFdpemFyZDvJJTcGAAABNUlEQVQ4
ySU3BgAAATVJREFUOE+lk81Kw0AURoOv1Bdw5c6HKCiIPwh9ABcSxIUE1KUrdyriSsuAgmIUBBHcuBJ3 T6WTzUrDQBRGg6/UF3DlzocoKIg/CH0AFxLEhQTUpSt3KuJKy4CCYhQEEdy4Enc12DRU24WITebz3ukk
Ndg0VNuFiE3m897pJM4k0yB44Esmyb1nZkLiAfhXioHv+6iJ1OeG2cyxBAVS6sEv/DwIgpeyxOscNKco ziTTIHjgSybJvWdmQuIB+FeKge/7qInU54bZzLEEBVLqwS/8PAiCl7LE6xw0pygzMku5DqNBhPhiQ41N
MzJLuQ6jQYT4YkONTfQE32WJOpDgMTpZRhLu4vVoHnTNxRYsMENYgp1YLKF3voJ+2ELnsAmZjbjIiUsQ 9ATfZYk6kOAxOllGEu7i9WgedM3FFiwwQ1iCnVgsoXe+gn7YQuewCZmNuMiJSxDEYhH9m5bK2+mC2kb2
xGIR/ZuWytvpgtpG9jXkwgqWgJqnKWlyuVoIeDXR8RyS621ayfjdmJQFm5R2V6ypmbttWsndHkT4gOdo NeTCCpaAmqcpaXK5Wgh4NdHxHJLrbVrJ+N2YlAWblHZXrKmZu21ayd0eRPiA52jAhRUqWxhHone1pV7i
wIUVKlsYR6J3taVe4tntExdgdl04JU4B30w/P/B+v6+auJlxSSYKFPojqpPUCwxySZ5c8mcBM0lCVAWu 2e0TF2B2XTglTgHfTD8/8H6/r5q4mXFJJgoU+iOqk9QLDHJJnlzyZwEzSUJUBa4wZYnGFpihIlcaFBYY
MGWJxhaYoSJXGhQWGD8TvB9sYiYvp9hqZQAAAABJRU5ErkJggg== PxO8H2xiJi+n2GplAAAAAElFTkSuQmCC
</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="BarButtonEntityDesigner.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAADXRFWHRUaXRsZQBXaXphcmQ7 dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAANdEVYdFRpdGxlAFdpemFyZDvJJTcGAAACOklEQVRY
ySU3BgAAAjpJREFUWEfFlE1LW0EUht2U4i/oX3DXhav+BaH/wE0Fq6G1opsq3Uk2IsFNt6HgqoVSWzV+ R8WUTUtbQRSG3ZTiL+hfcNeFq/4Fof/ATQWrobWimyrdSTYiwU23oeCqhVJbNX5gq6JuWoTabSUWqU2u
YKuiblqE2m0lFqlNriYmCCaSmOT4niQj9+N478w13r7wMHdOZuY8XCa3i4j+K2IxSsRilIjFKBGLing8 JiYIJpKY5PieJCP343jvzDXevvAwd05m5jxcJreLiP4rYjFKxGKUiMUoEYuKeDxOhvwFfYD3epB6iEUF
Tob8BX2A93qQeohFBTZh0A+vTyQSV8lksg9T91mOuUIsKsIIpNNpUSIyAY4kcWeBSu53++n22Ne7JbQE NmHQD69PJBJXyWSyD1P3WY65Qiwqwgik02lRIjIBjiRxZ4FK7nf76fbY17sltASO3z/rB49sNWpUy1Tc
jt8/6wePbDVqVMtU3Juj4w8DPPWNXYDTlqiyhK7ACqiBDRArH32n7JdxOknFCHMs8Y9bgKMk8JvnYjKO m6PjDwM89Y1dgNOWqLKErsAKqIENECsffafsl3E6ScUIcyzxj1uAoyTwm+diMo4Jmkxws9y3V2QtDVN2
CZpMcLPct1dkLQ1TdmGI8ngu7I5rC/iQwRJHP8YxQZMnmU+DzYZudAT8whKIox/jmKDJA3BZ2BnzCPAb YYjyeC7sjmsL+JDBEkc/xjFBkyeZT4PNhm50BPzCEoijH+OYoMkDcFnYGfMI8Bsp/nhHjXoNS82jKzBo
Kf54R416DUvNoyswaC0Oe5orWCK3MU31ygWWmyVQAM17QCm/OSo2Z/Jbo3SyHCMrNUG1izy26cdXAI0f LQ57mitYIrcxTfXKBZabJVAAzXtAKb85KjZn8lujdLIcIys1QbWLPLbpx1cAjR+C/dPVF5RbH7m5eIrT
gv3T1ReUWx+5uXiK07WXxHfDSk3S+a+PVC38wTazBAk8BjMgCebBNmgoAf4GVM4OsZTo6dRqczSN1h2w tZfEd8NKTdL5r49ULfzBNrMECTwGMyAJ5sE2aCgB/gZUzg6xlOjp1GpzNI3WHbADgbcW/yW/4o1sz6LU
A4G3Fv8lv+KNbM+i1MpB5rwpwaNJwgh0W8tvKPv5OV3+++loGkbCWICpFo9w81/je1zHtPX6w0qEEgBU ykHmvCnBo0nCCHRby28o+/k5Xf776WgaRsJYgKkWj3DzX+N7XMe09frDSoQSAFQrnfHQjLupiUQogfYm
K53x0Iy7qYlEKIH2JkfCSnRMgGNvyqPCT6KjAhx38yCJjgtwTCTuRYCjKxFaIAhOkIRtraeHp3AbODCI R8JKdEyAY2/Ko8JPoqMCHHfzIImOC3BMJO5FgKMrEVogCE6QhG2tp4encBs4MIheIIn0SucpxKIEDtJB
XiCJ9ErnKcSiBA7SQZRwn2VHLErgIF3cEpG+AYWS4FE8rwV1XQOqvYU8ut/neQAAAABJRU5ErkJggg== lHCfZUcsSuAgXdwSkb4BhZLgUTyvBXVdA6q9hTy63+d5AAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="BarButtonDeleteControl.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="BarButtonDeleteControl.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

View File

@ -108,4 +108,10 @@ Public Class frmMain
frm.Show() frm.Show()
RibbonPageCategoryEntityDesigner.Visible = True RibbonPageCategoryEntityDesigner.Visible = True
End Sub 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 End Class

View File

@ -22,24 +22,19 @@ Partial Class frmServiceConfig
'Das Bearbeiten mit dem Code-Editor ist nicht möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _ <System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.txtIPAddress = New System.Windows.Forms.TextBox()
Me.btnCancel = New System.Windows.Forms.Button() Me.btnCancel = New System.Windows.Forms.Button()
Me.btnTest = 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.Label1 = New System.Windows.Forms.Label()
Me.Label2 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label()
Me.Label3 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label()
Me.lblStatus = 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() 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 'btnCancel
' '
Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
@ -52,21 +47,13 @@ Partial Class frmServiceConfig
' '
'btnTest '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.Name = "btnTest"
Me.btnTest.Size = New System.Drawing.Size(109, 23) Me.btnTest.Size = New System.Drawing.Size(109, 23)
Me.btnTest.TabIndex = 2 Me.btnTest.TabIndex = 2
Me.btnTest.Text = "Verbindungstest" Me.btnTest.Text = "Verbindungstest"
Me.btnTest.UseVisualStyleBackColor = True 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 'Label1
' '
Me.Label1.AutoSize = True Me.Label1.AutoSize = True
@ -88,7 +75,7 @@ Partial Class frmServiceConfig
'Label3 'Label3
' '
Me.Label3.AutoSize = True 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.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(42, 13) Me.Label3.Size = New System.Drawing.Size(42, 13)
Me.Label3.TabIndex = 4 Me.Label3.TabIndex = 4
@ -96,20 +83,39 @@ Partial Class frmServiceConfig
' '
'lblStatus 'lblStatus
' '
Me.lblStatus.AutoSize = True Me.lblStatus.Location = New System.Drawing.Point(12, 68)
Me.lblStatus.Location = New System.Drawing.Point(9, 96)
Me.lblStatus.Name = "lblStatus" 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.TabIndex = 4
Me.lblStatus.Text = "Nicht verbunden" Me.lblStatus.Text = "Nicht verbunden"
' '
'lblURL 'btnOK
' '
Me.lblURL.Location = New System.Drawing.Point(12, 59) Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.Cancel
Me.lblURL.Name = "lblURL" Me.btnOK.Location = New System.Drawing.Point(257, 124)
Me.lblURL.ReadOnly = True Me.btnOK.Name = "btnOK"
Me.lblURL.Size = New System.Drawing.Size(401, 21) Me.btnOK.Size = New System.Drawing.Size(75, 23)
Me.lblURL.TabIndex = 0 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 'frmServiceConfig
' '
@ -118,29 +124,32 @@ Partial Class frmServiceConfig
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.btnCancel Me.CancelButton = Me.btnCancel
Me.ClientSize = New System.Drawing.Size(425, 159) 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.lblStatus)
Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.Label3)
Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.Label2)
Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.Label1)
Me.Controls.Add(Me.btnTest) Me.Controls.Add(Me.btnTest)
Me.Controls.Add(Me.btnOK)
Me.Controls.Add(Me.btnCancel) Me.Controls.Add(Me.btnCancel)
Me.Controls.Add(Me.txtPort) Me.MaximizeBox = False
Me.Controls.Add(Me.lblURL) Me.MinimizeBox = False
Me.Controls.Add(Me.txtIPAddress)
Me.Name = "frmServiceConfig" Me.Name = "frmServiceConfig"
Me.Text = "Dienst Kommunikation konfigurieren" 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.ResumeLayout(False)
Me.PerformLayout() Me.PerformLayout()
End Sub End Sub
Friend WithEvents txtIPAddress As TextBox
Friend WithEvents btnCancel As Button Friend WithEvents btnCancel As Button
Friend WithEvents btnTest As Button Friend WithEvents btnTest As Button
Friend WithEvents txtPort As TextBox
Friend WithEvents Label1 As Label Friend WithEvents Label1 As Label
Friend WithEvents Label2 As Label Friend WithEvents Label2 As Label
Friend WithEvents Label3 As Label Friend WithEvents Label3 As Label
Friend WithEvents lblStatus 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 End Class

View File

@ -5,10 +5,6 @@ Public Class frmServiceConfig
Private Sub frmServiceConfig_Load(sender As Object, e As EventArgs) Handles Me.Load Private Sub frmServiceConfig_Load(sender As Object, e As EventArgs) Handles Me.Load
_Init = New ClassInit() _Init = New ClassInit()
If _Init.TestConnectionURLExists() Then
lblURL.Text = My.Settings.ICMServiceAddress
End If
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
@ -22,7 +18,6 @@ Public Class frmServiceConfig
If oResult = ConnectionTestResult.Successful Then If oResult = ConnectionTestResult.Successful Then
My.Settings.ICMServiceAddress = oEndpointURL My.Settings.ICMServiceAddress = oEndpointURL
lblURL.Text = oEndpointURL
'My.Settings.Save() 'My.Settings.Save()
lblStatus.Text = "Verbindung hergestellt." lblStatus.Text = "Verbindung hergestellt."
Else Else
@ -34,4 +29,9 @@ Public Class frmServiceConfig
End Select End Select
End If End If
End Sub End Sub
Private Sub btnDelete_Click(sender As Object, e As EventArgs)
My.Settings.ICMServiceAddress = String.Empty
My.Settings.Save()
End Sub
End Class End Class

View File

@ -14,7 +14,7 @@ Public NotInheritable Class frmSplash
Private _CurrentRetry As Integer = 0 Private _CurrentRetry As Integer = 0
Private Const SLEEP_TIME = 600 Private Const SLEEP_TIME = 600
Private Const INIT_STEPS = 2 Private Const INIT_STEPS = 4
Private Const MAX_RETRIES = 10 Private Const MAX_RETRIES = 10
Private Const OPEN_TIMEOUT = 10 Private Const OPEN_TIMEOUT = 10
@ -73,6 +73,15 @@ Public NotInheritable Class frmSplash
Thread.Sleep(SLEEP_TIME) Thread.Sleep(SLEEP_TIME)
' TODO: Initialize Usersettings and populate My.Application.User ' 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 End Sub
Private Sub bw_ProgressChanged(sender As Object, e As System.ComponentModel.ProgressChangedEventArgs) Private Sub bw_ProgressChanged(sender As Object, e As System.ComponentModel.ProgressChangedEventArgs)

View File

@ -4,7 +4,7 @@ Imports NLog.Config
Imports NLog.Targets Imports NLog.Targets
''' <module>LogConfig</module> ''' <module>LogConfig</module>
''' <version>0.0.0.5</version> ''' <version>0.0.0.6</version>
''' <date>02.10.2018</date> ''' <date>02.10.2018</date>
''' <summary> ''' <summary>
''' Module that writes file-logs to different locations: ''' Module that writes file-logs to different locations: