Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/ConfigXml/ConfigData.vb
===================================================================
diff -u -r1963 -r2015
--- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/ConfigXml/ConfigData.vb (.../ConfigData.vb) (revision 1963)
+++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/ConfigXml/ConfigData.vb (.../ConfigData.vb) (revision 2015)
@@ -1,10 +1,20 @@
-Public Class ConfigData
+Imports System.Reflection
+
+Public Class ConfigData
Public Property Scriptpad() As ConfigProperty
Public Property BestandenMapPad() As ConfigProperty
Public Property JobControlExePad() As ConfigProperty
Public Property GraveerInstellingenXmlPad() As ConfigProperty
Public Property HandleidingPad As ConfigProperty
Public Property LogPad() As ConfigProperty
+
+ sub New
+ ' Elke property initialiseren
+ Dim type = Me.GetType()
+ For Each prop As PropertyInfo In type.GetProperties()
+ If prop.CanWrite Then prop.SetValue(Me, New ConfigProperty())
+ Next
+ End sub
End Class
Public Class ConfigProperty
Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/ConfigXml/Configs.vb
===================================================================
diff -u -r1973 -r2015
--- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/ConfigXml/Configs.vb (.../Configs.vb) (revision 1973)
+++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/ConfigXml/Configs.vb (.../Configs.vb) (revision 2015)
@@ -86,7 +86,6 @@
Return ConverteerWaarde(Of String)(_configData.Scriptpad)
End Get
Set
- ConfigUtil.PrepareForSetProperty(_configData.Scriptpad)
ConfigUtil.StelNieuwFilePadIn(Value, _configData.Scriptpad)
End Set
End Property
@@ -96,7 +95,6 @@
Return ConverteerWaarde(Of String)(_configData.BestandenMapPad)
End Get
Set
- ConfigUtil.PrepareForSetProperty(_configData.BestandenMapPad)
ConfigUtil.StelNieuwFolderPadIn(Value, _configData.BestandenMapPad)
End Set
End Property
@@ -106,7 +104,6 @@
Return ConverteerWaarde(Of String)(_configData.JobControlExePad)
End Get
Set
- ConfigUtil.PrepareForSetProperty(_configData.JobControlExePad)
_configData.JobControlExePad.Waarde = Value
End Set
End Property
@@ -116,7 +113,6 @@
Return ConverteerWaarde(Of String)(_configData.GraveerInstellingenXmlPad)
End Get
Set
- ConfigUtil.PrepareForSetProperty(_configData.GraveerInstellingenXmlPad)
ConfigUtil.StelNieuwFilePadIn(Value, _configData.GraveerInstellingenXmlPad)
End Set
End Property
@@ -126,7 +122,6 @@
Return ConverteerWaarde(Of String)(_configData.HandleidingPad)
End Get
Set
- ConfigUtil.PrepareForSetProperty(_configData.HandleidingPad)
ConfigUtil.StelNieuwFilePadIn(Value, _configData.HandleidingPad)
End Set
End Property
@@ -136,18 +131,12 @@
Return ConverteerWaarde(Of String)(_configData.LogPad)
End Get
Set
- ConfigUtil.PrepareForSetProperty(_configData.LogPad)
ConfigUtil.StelNieuwFilePadIn(Value, _configData.LogPad)
End Set
End Property
Private Class ConfigUtil
- Public Shared Sub PrepareForSetProperty(ByRef configP As ConfigProperty)
- 'Initialiseren als property niet aanwezig was
- If IsNothing(configP) Then configP = New ConfigProperty()
- End Sub
-
Public Shared Sub StelNieuwFilePadIn(value As String, ByRef configP As ConfigProperty)
If Not IsNothing(value) AndAlso File.Exists(value) Then
configP.Waarde = value
Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Laser Gravering.vbproj
===================================================================
diff -u -r1973 -r2015
--- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Laser Gravering.vbproj (.../Laser Gravering.vbproj) (revision 1973)
+++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Laser Gravering.vbproj (.../Laser Gravering.vbproj) (revision 2015)
@@ -28,7 +28,7 @@
false
true
1
- 2.4.1.%2a
+ 2.4.2.%2a
false
true
true
Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormConfigsWijzigen.vb
===================================================================
diff -u -r1963 -r2015
--- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormConfigsWijzigen.vb (.../FormConfigsWijzigen.vb) (revision 1963)
+++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormConfigsWijzigen.vb (.../FormConfigsWijzigen.vb) (revision 2015)
@@ -47,6 +47,7 @@
If MessageBox.Show($"Er is een fout met een of meerdere configuraties: {vbNewLine}{invC.Message}") <> DialogResult.OK Then
Application.Exit()
End If
+ ToonConfigs()
End Try
End Sub