Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormHoofdscherm.Designer.vb
===================================================================
diff -u -r1962 -r1963
--- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormHoofdscherm.Designer.vb (.../FormHoofdscherm.Designer.vb) (revision 1962)
+++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormHoofdscherm.Designer.vb (.../FormHoofdscherm.Designer.vb) (revision 1963)
@@ -33,6 +33,7 @@
Me.FileSystemWatcher1 = New System.IO.FileSystemWatcher()
Me.CheckBoxVisualiseer = New System.Windows.Forms.CheckBox()
Me.HandleidingToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.LogToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.MenuStrip1.SuspendLayout
CType(Me.FileSystemWatcher1,System.ComponentModel.ISupportInitialize).BeginInit
Me.SuspendLayout
@@ -41,7 +42,7 @@
'
Me.MenuStrip1.BackColor = System.Drawing.Color.Silver
Me.MenuStrip1.Font = New System.Drawing.Font("Segoe UI", 15!)
- Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TestToolStripMenuItem, Me.HandleidingToolStripMenuItem})
+ Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TestToolStripMenuItem, Me.HandleidingToolStripMenuItem, Me.LogToolStripMenuItem})
Me.MenuStrip1.Location = New System.Drawing.Point(0, 0)
Me.MenuStrip1.Name = "MenuStrip1"
Me.MenuStrip1.Size = New System.Drawing.Size(1684, 36)
@@ -112,6 +113,12 @@
Me.HandleidingToolStripMenuItem.Size = New System.Drawing.Size(131, 32)
Me.HandleidingToolStripMenuItem.Text = "Handleiding"
'
+ 'LogToolStripMenuItem
+ '
+ Me.LogToolStripMenuItem.Name = "LogToolStripMenuItem"
+ Me.LogToolStripMenuItem.Size = New System.Drawing.Size(57, 32)
+ Me.LogToolStripMenuItem.Text = "Log"
+ '
'FormHoofdscherm
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
@@ -141,4 +148,5 @@
Friend WithEvents OverToolStripMenuItem1 As ToolStripMenuItem
Friend WithEvents GraveerInstellingenToolStripMenuItem As ToolStripMenuItem
Friend WithEvents HandleidingToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents LogToolStripMenuItem As ToolStripMenuItem
End Class
Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormConfigsWijzigen.Designer.vb
===================================================================
diff -u -r1962 -r1963
--- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormConfigsWijzigen.Designer.vb (.../FormConfigsWijzigen.Designer.vb) (revision 1962)
+++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormConfigsWijzigen.Designer.vb (.../FormConfigsWijzigen.Designer.vb) (revision 1963)
@@ -28,6 +28,9 @@
Me.ButtonAnnuleren = New System.Windows.Forms.Button()
Me.OpenFileDialog = New System.Windows.Forms.OpenFileDialog()
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+ Me.ButtonHandleidingPad = New System.Windows.Forms.Button()
+ Me.TextBoxHandleidingPad = New System.Windows.Forms.TextBox()
+ Me.Label5 = New System.Windows.Forms.Label()
Me.ButtonGraveerInstellingenXmlPad = New System.Windows.Forms.Button()
Me.TextBoxGraveerInstellingenXmlPad = New System.Windows.Forms.TextBox()
Me.Label4 = New System.Windows.Forms.Label()
@@ -40,9 +43,9 @@
Me.TextBoxScriptPad = New System.Windows.Forms.TextBox()
Me.Label1 = New System.Windows.Forms.Label()
Me.Label2 = New System.Windows.Forms.Label()
- Me.ButtonHandleidingPad = New System.Windows.Forms.Button()
- Me.TextBoxHandleidingPad = New System.Windows.Forms.TextBox()
- Me.Label5 = New System.Windows.Forms.Label()
+ Me.ButtonLog = New System.Windows.Forms.Button()
+ Me.TextBoxLog = New System.Windows.Forms.TextBox()
+ Me.Label6 = New System.Windows.Forms.Label()
Me.GroupBox1.SuspendLayout
Me.SuspendLayout
'
@@ -55,7 +58,7 @@
Me.ButtonOpslaan.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButtonOpslaan.Enabled = false
Me.ButtonOpslaan.Font = New System.Drawing.Font("Microsoft Sans Serif", 15!)
- Me.ButtonOpslaan.Location = New System.Drawing.Point(595, 374)
+ Me.ButtonOpslaan.Location = New System.Drawing.Point(595, 446)
Me.ButtonOpslaan.Name = "ButtonOpslaan"
Me.ButtonOpslaan.Size = New System.Drawing.Size(133, 39)
Me.ButtonOpslaan.TabIndex = 5
@@ -66,7 +69,7 @@
'
Me.ButtonAnnuleren.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButtonAnnuleren.Font = New System.Drawing.Font("Microsoft Sans Serif", 15!)
- Me.ButtonAnnuleren.Location = New System.Drawing.Point(754, 374)
+ Me.ButtonAnnuleren.Location = New System.Drawing.Point(754, 446)
Me.ButtonAnnuleren.Name = "ButtonAnnuleren"
Me.ButtonAnnuleren.Size = New System.Drawing.Size(133, 39)
Me.ButtonAnnuleren.TabIndex = 6
@@ -82,6 +85,9 @@
Me.GroupBox1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.GroupBox1.Controls.Add(Me.ButtonLog)
+ Me.GroupBox1.Controls.Add(Me.TextBoxLog)
+ Me.GroupBox1.Controls.Add(Me.Label6)
Me.GroupBox1.Controls.Add(Me.ButtonHandleidingPad)
Me.GroupBox1.Controls.Add(Me.TextBoxHandleidingPad)
Me.GroupBox1.Controls.Add(Me.Label5)
@@ -100,11 +106,40 @@
Me.GroupBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12!)
Me.GroupBox1.Location = New System.Drawing.Point(12, 12)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New System.Drawing.Size(890, 351)
+ Me.GroupBox1.Size = New System.Drawing.Size(890, 423)
Me.GroupBox1.TabIndex = 3
Me.GroupBox1.TabStop = false
Me.GroupBox1.Text = "Paden"
'
+ 'ButtonHandleidingPad
+ '
+ Me.ButtonHandleidingPad.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.ButtonHandleidingPad.Location = New System.Drawing.Point(838, 309)
+ Me.ButtonHandleidingPad.Name = "ButtonHandleidingPad"
+ Me.ButtonHandleidingPad.Size = New System.Drawing.Size(37, 26)
+ Me.ButtonHandleidingPad.TabIndex = 15
+ Me.ButtonHandleidingPad.Text = "..."
+ Me.ButtonHandleidingPad.UseVisualStyleBackColor = true
+ '
+ 'TextBoxHandleidingPad
+ '
+ Me.TextBoxHandleidingPad.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.TextBoxHandleidingPad.Location = New System.Drawing.Point(6, 309)
+ Me.TextBoxHandleidingPad.Name = "TextBoxHandleidingPad"
+ Me.TextBoxHandleidingPad.Size = New System.Drawing.Size(817, 26)
+ Me.TextBoxHandleidingPad.TabIndex = 14
+ '
+ 'Label5
+ '
+ Me.Label5.AutoSize = true
+ Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 10!)
+ Me.Label5.Location = New System.Drawing.Point(6, 289)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(115, 17)
+ Me.Label5.TabIndex = 13
+ Me.Label5.Text = "Handleiding pad:"
+ '
'ButtonGraveerInstellingenXmlPad
'
Me.ButtonGraveerInstellingenXmlPad.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
@@ -222,40 +257,40 @@
Me.Label2.TabIndex = 1
Me.Label2.Text = "Bestanden map pad:"
'
- 'ButtonHandleidingPad
+ 'ButtonLog
'
- Me.ButtonHandleidingPad.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.ButtonHandleidingPad.Location = New System.Drawing.Point(838, 309)
- Me.ButtonHandleidingPad.Name = "ButtonHandleidingPad"
- Me.ButtonHandleidingPad.Size = New System.Drawing.Size(37, 26)
- Me.ButtonHandleidingPad.TabIndex = 15
- Me.ButtonHandleidingPad.Text = "..."
- Me.ButtonHandleidingPad.UseVisualStyleBackColor = true
+ Me.ButtonLog.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.ButtonLog.Location = New System.Drawing.Point(838, 375)
+ Me.ButtonLog.Name = "ButtonLog"
+ Me.ButtonLog.Size = New System.Drawing.Size(37, 26)
+ Me.ButtonLog.TabIndex = 18
+ Me.ButtonLog.Text = "..."
+ Me.ButtonLog.UseVisualStyleBackColor = true
'
- 'TextBoxHandleidingPad
+ 'TextBoxLog
'
- Me.TextBoxHandleidingPad.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Me.TextBoxLog.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.TextBoxHandleidingPad.Location = New System.Drawing.Point(6, 309)
- Me.TextBoxHandleidingPad.Name = "TextBoxHandleidingPad"
- Me.TextBoxHandleidingPad.Size = New System.Drawing.Size(817, 26)
- Me.TextBoxHandleidingPad.TabIndex = 14
+ Me.TextBoxLog.Location = New System.Drawing.Point(6, 375)
+ Me.TextBoxLog.Name = "TextBoxLog"
+ Me.TextBoxLog.Size = New System.Drawing.Size(817, 26)
+ Me.TextBoxLog.TabIndex = 17
'
- 'Label5
+ 'Label6
'
- Me.Label5.AutoSize = true
- Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 10!)
- Me.Label5.Location = New System.Drawing.Point(6, 289)
- Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(115, 17)
- Me.Label5.TabIndex = 13
- Me.Label5.Text = "Handleiding pad:"
+ Me.Label6.AutoSize = true
+ Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 10!)
+ Me.Label6.Location = New System.Drawing.Point(6, 355)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(64, 17)
+ Me.Label6.TabIndex = 16
+ Me.Label6.Text = "Log pad:"
'
'FormConfigsWijzigen
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(913, 425)
+ Me.ClientSize = New System.Drawing.Size(913, 497)
Me.Controls.Add(Me.ButtonAnnuleren)
Me.Controls.Add(Me.ButtonOpslaan)
Me.Controls.Add(Me.GroupBox1)
@@ -287,4 +322,7 @@
Friend WithEvents ButtonHandleidingPad As Button
Friend WithEvents TextBoxHandleidingPad As TextBox
Friend WithEvents Label5 As Label
+ Friend WithEvents ButtonLog As Button
+ Friend WithEvents TextBoxLog As TextBox
+ Friend WithEvents Label6 As Label
End Class
Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormConfigsWijzigen.vb
===================================================================
diff -u -r1962 -r1963
--- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormConfigsWijzigen.vb (.../FormConfigsWijzigen.vb) (revision 1962)
+++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormConfigsWijzigen.vb (.../FormConfigsWijzigen.vb) (revision 1963)
@@ -72,6 +72,8 @@
TextBoxBestandenMapPad.Text = If(_configs.BestandenMapPad, String.Empty)
TextBoxJobControlExePad.Text = If(_configs.JobControlExePad, String.Empty)
TextBoxGraveerInstellingenXmlPad.Text = If(_configs.GraveerInstellingenXmlPad, String.Empty)
+ TextBoxHandleidingPad.Text = If(_configs.HandleidingPad, String.Empty)
+ TextBoxLog.Text = If(_configs.Logpad, String.Empty)
Catch ex As Exception
ToonError(ex, $"Fout met opvullen van config controls")
End Try
@@ -110,9 +112,19 @@
End If
End Sub
+ Private Sub ButtonLog_Click(sender As Object, e As EventArgs) Handles ButtonLog.Click
+ If OpenFileDialog.ShowDialog() = DialogResult.OK Then
+ TextBoxLog.Text = OpenFileDialog.FileName
+ End If
+ End Sub
+
#End Region
- Private Sub TextBox_TextChanged(sender As System.Object, e As System.EventArgs) Handles TextBoxScriptPad.TextChanged, TextBoxJobControlExePad.TextChanged, TextBoxGraveerInstellingenXmlPad.TextChanged, TextBoxBestandenMapPad.TextChanged, TextBoxHandleidingPad.TextChanged
+ Private Sub TextBox_TextChanged(sender As System.Object, e As System.EventArgs) Handles TextBoxScriptPad.TextChanged, _
+ TextBoxJobControlExePad.TextChanged, _
+ TextBoxGraveerInstellingenXmlPad.TextChanged, _
+ TextBoxBestandenMapPad.TextChanged, _
+ TextBoxHandleidingPad.TextChanged
ButtonOpslaan.Enabled = True
End Sub
@@ -123,6 +135,7 @@
_configs.JobControlExePad = TextBoxJobControlExePad.Text
_configs.GraveerInstellingenXmlPad = TextBoxGraveerInstellingenXmlPad.Text
_configs.HandleidingPad = TextBoxHandleidingPad.Text
+ _configs.Logpad = TextBoxLog.Text
_configs.OpslaanConfigs()
Me.Close()
@@ -134,4 +147,5 @@
Private Sub ButtonAnnuleren_Click(sender As System.Object, e As System.EventArgs) Handles ButtonAnnuleren.Click
Me.Close()
End Sub
+
End Class
\ No newline at end of file
Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Laser Gravering.vbproj
===================================================================
diff -u -r1962 -r1963
--- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Laser Gravering.vbproj (.../Laser Gravering.vbproj) (revision 1962)
+++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Laser Gravering.vbproj (.../Laser Gravering.vbproj) (revision 1963)
@@ -28,7 +28,7 @@
false
true
1
- 2.3.0.%2a
+ 2.4.0.%2a
false
true
true
Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/ConfigXml/ConfigData.vb
===================================================================
diff -u -r1961 -r1963
--- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/ConfigXml/ConfigData.vb (.../ConfigData.vb) (revision 1961)
+++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/ConfigXml/ConfigData.vb (.../ConfigData.vb) (revision 1963)
@@ -4,6 +4,7 @@
Public Property JobControlExePad() As ConfigProperty
Public Property GraveerInstellingenXmlPad() As ConfigProperty
Public Property HandleidingPad As ConfigProperty
+ Public Property LogPad() As ConfigProperty
End Class
Public Class ConfigProperty
Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/ConfigXml/Configs.vb
===================================================================
diff -u -r1961 -r1963
--- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/ConfigXml/Configs.vb (.../Configs.vb) (revision 1961)
+++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/ConfigXml/Configs.vb (.../Configs.vb) (revision 1963)
@@ -131,6 +131,16 @@
End Set
End Property
+ Public Property Logpad As String Implements IConfigsClass.Logpad
+ Get
+ 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)
Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/ConfigText/ConfigsClass.vb
===================================================================
diff -u -r1961 -r1963
--- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/ConfigText/ConfigsClass.vb (.../ConfigsClass.vb) (revision 1961)
+++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/ConfigText/ConfigsClass.vb (.../ConfigsClass.vb) (revision 1963)
@@ -166,6 +166,7 @@
End Property
Public Property HandleidingPad As String Implements IConfigsClass.HandleidingPad
+ Public Property Logpad As String Implements IConfigsClass.Logpad
#End Region
Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/IConfigsClass.vb
===================================================================
diff -u -r1961 -r1963
--- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/IConfigsClass.vb (.../IConfigsClass.vb) (revision 1961)
+++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/IConfigsClass.vb (.../IConfigsClass.vb) (revision 1963)
@@ -6,4 +6,5 @@
Property JobControlExePad As String
Property GraveerInstellingenXmlPad As String
Property HandleidingPad As String
+ Property Logpad As String
End Interface
\ No newline at end of file
Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormHoofdscherm.vb
===================================================================
diff -u -r1962 -r1963
--- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormHoofdscherm.vb (.../FormHoofdscherm.vb) (revision 1962)
+++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormHoofdscherm.vb (.../FormHoofdscherm.vb) (revision 1963)
@@ -125,16 +125,15 @@
FormGraveerInstellingen.ShowDialog()
End Sub
- Private Shared Sub SluitToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles SluitToolStripMenuItem.Click
- Application.Exit()
- End Sub
-
Private Sub OverToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles OverToolStripMenuItem1.Click
AboutBox.ShowDialog()
End Sub
+ Private Shared Sub SluitToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles SluitToolStripMenuItem.Click
+ Application.Exit()
+ End Sub
+
Private Sub HandleidingToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles HandleidingToolStripMenuItem.Click
- 'Dim pad As String = ControlChars.Quote & & ControlChars.Quote
Try
'pdf openen met de default reader
Process.Start(_configs.HandleidingPad)
@@ -143,6 +142,15 @@
End Try
End Sub
+ Private Sub LogToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LogToolStripMenuItem.Click
+ Try
+ 'pdf openen met de default reader
+ Process.Start(_configs.Logpad)
+ Catch ex As Exception
+ ToonError(ex)
+ End Try
+ End Sub
+
#End Region
End Class
\ No newline at end of file