Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormGraveerInstellingen.vb =================================================================== diff -u -r1947 -r1948 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormGraveerInstellingen.vb (.../FormGraveerInstellingen.vb) (revision 1947) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormGraveerInstellingen.vb (.../FormGraveerInstellingen.vb) (revision 1948) @@ -19,9 +19,57 @@ Private Sub ToonInstellingen() Try - ListBoxGraveerInstellingen.DataSource = _graveerInstellingenRepo.GraveerInstellingen + BindingSourceGraveerInstellingen.DataSource = _graveerInstellingenRepo.GraveerInstellingen + StelBindingsIn() Catch ex As Exception - ToonError(ex, $"Fout met laden van graveer instellingen{vbNewLine}{ex.Message}") + ToonError(ex, "Fout met laden van graveer instellingen") End Try End Sub + + Private Sub BindingSourceGraveerInstellingen_CurrentChanged(sender As Object, e As EventArgs) Handles BindingSourceGraveerInstellingen.CurrentChanged + StelBindingsIn() + End Sub + + Private Sub StelBindingsIn() + Try + TextBoxKleur.DataBindings.Clear() + TextBoxMateriaalHoogte.DataBindings.Clear() + TextBoxGraveerVermogen.DataBindings.Clear() + TextBoxGraveerSnelheid.DataBindings.Clear() + TextBoxppi.DataBindings.Clear() + + TextBoxKleur.DataBindings.Add(New Binding("Text", BindingSourceGraveerInstellingen.Current, "Kleur")) + TextBoxMateriaalHoogte.DataBindings.Add(New Binding("Text", BindingSourceGraveerInstellingen.Current, "MateriaalHoogte")) + TextBoxGraveerVermogen.DataBindings.Add(New Binding("Text", BindingSourceGraveerInstellingen.Current, "Graveervermogen")) + TextBoxGraveerSnelheid.DataBindings.Add(New Binding("Text", BindingSourceGraveerInstellingen.Current, "Graveersnelheid")) + TextBoxppi.DataBindings.Add(New Binding("Text", BindingSourceGraveerInstellingen.Current, "Ppi")) + Catch ex As Exception + ToonError(ex, "TextBox binding is mislukt") + End Try + End Sub + + Private Sub ButtonVoegToe_Click(sender As Object, e As EventArgs) Handles ButtonVoegToe.Click + Try + BindingSourceGraveerInstellingen.AddNew() + Catch ex As Exception + ToonError(ex) + End Try + End Sub + + Private Sub ButtonWis_Click(sender As Object, e As EventArgs) Handles ButtonWis.Click + Try + BindingSourceGraveerInstellingen.RemoveCurrent() + Catch ex As Exception + ToonError(ex) + End Try + End Sub + + Private Sub ButtonOpslaan_Click(sender As Object, e As EventArgs) Handles ButtonOpslaan.Click + Try + _graveerInstellingenRepo.GraveerInstellingen = BindingSourceGraveerInstellingen.DataSource + Me.Close() + Catch ex As Exception + ToonError(ex) + End Try + End Sub End Class \ No newline at end of file Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Domein/GraveerInstellingenRepository.vb =================================================================== diff -u -r1946 -r1948 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Domein/GraveerInstellingenRepository.vb (.../GraveerInstellingenRepository.vb) (revision 1946) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Domein/GraveerInstellingenRepository.vb (.../GraveerInstellingenRepository.vb) (revision 1948) @@ -44,8 +44,9 @@ Private Sub SlaOp(nieuweInstellingen As List(Of GraveerInstelling)) Try - Dim stream = New FileStream(_configs.GraveerInstellingenXmlPad, FileMode.OpenOrCreate) - _graveerinstellingen = _xmlMapper.GetData(Of List(Of GraveerInstelling))(stream) + Dim stream = New FileStream(_configs.GraveerInstellingenXmlPad, FileMode.Create) + _xmlMapper.WriteData(stream, nieuweInstellingen) + _graveerinstellingen = nieuweInstellingen Catch ex As Exception Throw New Exception($"Kon nieuwe graveer instellingen niet opslaan.{vbNewLine}{ex.Message}") End Try Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormGraveerInstellingen.Designer.vb =================================================================== diff -u -r1947 -r1948 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormGraveerInstellingen.Designer.vb (.../FormGraveerInstellingen.Designer.vb) (revision 1947) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormGraveerInstellingen.Designer.vb (.../FormGraveerInstellingen.Designer.vb) (revision 1948) @@ -22,30 +22,203 @@ 'Do not modify it using the code editor. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FormGraveerInstellingen)) Me.ListBoxGraveerInstellingen = New System.Windows.Forms.ListBox() + Me.BindingSourceGraveerInstellingen = New System.Windows.Forms.BindingSource(Me.components) + Me.TextBoxKleur = New System.Windows.Forms.TextBox() + Me.TextBoxMateriaalHoogte = New System.Windows.Forms.TextBox() + Me.TextBoxGraveerVermogen = New System.Windows.Forms.TextBox() + Me.TextBoxGraveerSnelheid = New System.Windows.Forms.TextBox() + Me.TextBoxppi = New System.Windows.Forms.TextBox() + Me.Label3 = New System.Windows.Forms.Label() + Me.Label4 = New System.Windows.Forms.Label() + Me.Label5 = New System.Windows.Forms.Label() + Me.Label6 = New System.Windows.Forms.Label() + Me.Label7 = New System.Windows.Forms.Label() + Me.ButtonOpslaan = New System.Windows.Forms.Button() + Me.ButtonVoegToe = New System.Windows.Forms.Button() + Me.ButtonWis = New System.Windows.Forms.Button() + CType(Me.BindingSourceGraveerInstellingen,System.ComponentModel.ISupportInitialize).BeginInit Me.SuspendLayout ' 'ListBoxGraveerInstellingen ' + Me.ListBoxGraveerInstellingen.DataSource = Me.BindingSourceGraveerInstellingen + Me.ListBoxGraveerInstellingen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.ListBoxGraveerInstellingen.FormattingEnabled = true - Me.ListBoxGraveerInstellingen.Location = New System.Drawing.Point(13, 13) + Me.ListBoxGraveerInstellingen.ItemHeight = 20 + Me.ListBoxGraveerInstellingen.Location = New System.Drawing.Point(25, 23) Me.ListBoxGraveerInstellingen.Name = "ListBoxGraveerInstellingen" - Me.ListBoxGraveerInstellingen.Size = New System.Drawing.Size(120, 95) + Me.ListBoxGraveerInstellingen.Size = New System.Drawing.Size(117, 204) Me.ListBoxGraveerInstellingen.TabIndex = 0 ' + 'BindingSourceGraveerInstellingen + ' + ' + 'TextBoxKleur + ' + Me.TextBoxKleur.Font = New System.Drawing.Font("Microsoft Sans Serif", 12!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.TextBoxKleur.Location = New System.Drawing.Point(296, 66) + Me.TextBoxKleur.Name = "TextBoxKleur" + Me.TextBoxKleur.Size = New System.Drawing.Size(146, 26) + Me.TextBoxKleur.TabIndex = 1 + ' + 'TextBoxMateriaalHoogte + ' + Me.TextBoxMateriaalHoogte.Font = New System.Drawing.Font("Microsoft Sans Serif", 12!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.TextBoxMateriaalHoogte.Location = New System.Drawing.Point(296, 98) + Me.TextBoxMateriaalHoogte.Name = "TextBoxMateriaalHoogte" + Me.TextBoxMateriaalHoogte.Size = New System.Drawing.Size(146, 26) + Me.TextBoxMateriaalHoogte.TabIndex = 2 + ' + 'TextBoxGraveerVermogen + ' + Me.TextBoxGraveerVermogen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.TextBoxGraveerVermogen.Location = New System.Drawing.Point(296, 130) + Me.TextBoxGraveerVermogen.Name = "TextBoxGraveerVermogen" + Me.TextBoxGraveerVermogen.Size = New System.Drawing.Size(146, 26) + Me.TextBoxGraveerVermogen.TabIndex = 3 + ' + 'TextBoxGraveerSnelheid + ' + Me.TextBoxGraveerSnelheid.Font = New System.Drawing.Font("Microsoft Sans Serif", 12!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.TextBoxGraveerSnelheid.Location = New System.Drawing.Point(296, 162) + Me.TextBoxGraveerSnelheid.Name = "TextBoxGraveerSnelheid" + Me.TextBoxGraveerSnelheid.Size = New System.Drawing.Size(146, 26) + Me.TextBoxGraveerSnelheid.TabIndex = 4 + ' + 'TextBoxppi + ' + Me.TextBoxppi.Font = New System.Drawing.Font("Microsoft Sans Serif", 12!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.TextBoxppi.Location = New System.Drawing.Point(296, 194) + Me.TextBoxppi.Name = "TextBoxppi" + Me.TextBoxppi.Size = New System.Drawing.Size(146, 26) + Me.TextBoxppi.TabIndex = 5 + ' + 'Label3 + ' + Me.Label3.AutoSize = true + Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10!) + Me.Label3.Location = New System.Drawing.Point(175, 72) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(45, 17) + Me.Label3.TabIndex = 8 + Me.Label3.Text = "Kleur:" + ' + 'Label4 + ' + Me.Label4.AutoSize = true + Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 10!) + Me.Label4.Location = New System.Drawing.Point(175, 168) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(67, 17) + Me.Label4.TabIndex = 9 + Me.Label4.Text = "Snelheid:" + ' + 'Label5 + ' + Me.Label5.AutoSize = true + Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 10!) + Me.Label5.Location = New System.Drawing.Point(175, 104) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(118, 17) + Me.Label5.TabIndex = 10 + Me.Label5.Text = "Materiaal hoogte:" + ' + 'Label6 + ' + Me.Label6.AutoSize = true + Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 10!) + Me.Label6.Location = New System.Drawing.Point(175, 136) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(77, 17) + Me.Label6.TabIndex = 11 + Me.Label6.Text = "Vermogen:" + ' + 'Label7 + ' + Me.Label7.AutoSize = true + Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 10!) + Me.Label7.Location = New System.Drawing.Point(175, 200) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(32, 17) + Me.Label7.TabIndex = 12 + Me.Label7.Text = "Ppi:" + ' + 'ButtonOpslaan + ' + Me.ButtonOpslaan.Font = New System.Drawing.Font("Microsoft Sans Serif", 12!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.ButtonOpslaan.Location = New System.Drawing.Point(296, 232) + Me.ButtonOpslaan.Name = "ButtonOpslaan" + Me.ButtonOpslaan.Size = New System.Drawing.Size(146, 32) + Me.ButtonOpslaan.TabIndex = 13 + Me.ButtonOpslaan.Text = "Opslaan" + Me.ButtonOpslaan.UseVisualStyleBackColor = true + ' + 'ButtonVoegToe + ' + Me.ButtonVoegToe.Font = New System.Drawing.Font("Microsoft Sans Serif", 10!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.ButtonVoegToe.ForeColor = System.Drawing.Color.DarkOliveGreen + Me.ButtonVoegToe.Location = New System.Drawing.Point(25, 233) + Me.ButtonVoegToe.Name = "ButtonVoegToe" + Me.ButtonVoegToe.Size = New System.Drawing.Size(117, 32) + Me.ButtonVoegToe.TabIndex = 14 + Me.ButtonVoegToe.Text = "Voeg toe" + Me.ButtonVoegToe.UseVisualStyleBackColor = true + ' + 'ButtonWis + ' + Me.ButtonWis.Font = New System.Drawing.Font("Microsoft Sans Serif", 10!) + Me.ButtonWis.ForeColor = System.Drawing.Color.Maroon + Me.ButtonWis.Location = New System.Drawing.Point(296, 23) + Me.ButtonWis.Name = "ButtonWis" + Me.ButtonWis.Size = New System.Drawing.Size(146, 32) + Me.ButtonWis.TabIndex = 15 + Me.ButtonWis.Text = "Wis" + Me.ButtonWis.UseVisualStyleBackColor = true + ' 'FormGraveerInstellingen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(800, 450) + Me.ClientSize = New System.Drawing.Size(464, 281) + Me.Controls.Add(Me.ButtonWis) + Me.Controls.Add(Me.ButtonVoegToe) + Me.Controls.Add(Me.ButtonOpslaan) + Me.Controls.Add(Me.Label7) + Me.Controls.Add(Me.Label6) + Me.Controls.Add(Me.Label5) + Me.Controls.Add(Me.Label4) + Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.TextBoxppi) + Me.Controls.Add(Me.TextBoxGraveerSnelheid) + Me.Controls.Add(Me.TextBoxGraveerVermogen) + Me.Controls.Add(Me.TextBoxMateriaalHoogte) + Me.Controls.Add(Me.TextBoxKleur) Me.Controls.Add(Me.ListBoxGraveerInstellingen) Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon) Me.Name = "FormGraveerInstellingen" Me.Text = "Graveer instellingen" + CType(Me.BindingSourceGraveerInstellingen,System.ComponentModel.ISupportInitialize).EndInit Me.ResumeLayout(false) + Me.PerformLayout End Sub Friend WithEvents ListBoxGraveerInstellingen As ListBox + Friend WithEvents TextBoxKleur As TextBox + Friend WithEvents TextBoxMateriaalHoogte As TextBox + Friend WithEvents TextBoxGraveerVermogen As TextBox + Friend WithEvents TextBoxGraveerSnelheid As TextBox + Friend WithEvents TextBoxppi As TextBox + Friend WithEvents BindingSourceGraveerInstellingen As BindingSource + Friend WithEvents Label3 As Label + Friend WithEvents Label4 As Label + Friend WithEvents Label5 As Label + Friend WithEvents Label6 As Label + Friend WithEvents Label7 As Label + Friend WithEvents ButtonOpslaan As Button + Friend WithEvents ButtonVoegToe As Button + Friend WithEvents ButtonWis As Button End Class Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Laser Gravering.vbproj =================================================================== diff -u -r1947 -r1948 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Laser Gravering.vbproj (.../Laser Gravering.vbproj) (revision 1947) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Laser Gravering.vbproj (.../Laser Gravering.vbproj) (revision 1948) @@ -27,8 +27,8 @@ false false true - 2 - 1.10.0.%2a + 0 + 2.0.0.%2a false true true Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/ConfigXml/Configs.vb =================================================================== diff -u -r1944 -r1948 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/ConfigXml/Configs.vb (.../Configs.vb) (revision 1944) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Configs/ConfigXml/Configs.vb (.../Configs.vb) (revision 1948) @@ -60,7 +60,7 @@ 'Controleert lege velden nog eens ControleerConfigs() - Dim fs = New FileStream(_padNaarHoofdconfigBestand, FileMode.OpenOrCreate) + Dim fs = New FileStream(_padNaarHoofdconfigBestand, FileMode.Create) _xmlMapper.WriteData(fs, _configData) Catch ex As Exception 'Configs resetten Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormConfigsWijzigen.vb =================================================================== diff -u -r1947 -r1948 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormConfigsWijzigen.vb (.../FormConfigsWijzigen.vb) (revision 1947) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormConfigsWijzigen.vb (.../FormConfigsWijzigen.vb) (revision 1948) @@ -50,7 +50,7 @@ TextBoxJobControlExePad.Text = If(_configs.JobControlExePad, String.Empty) TextBoxGraveerInstellingenXmlPad.Text = If(_configs.GraveerInstellingenXmlPad, String.Empty) Catch ex As Exception - ToonError(ex, $"Fout met opvullen van config controls{vbNewLine}{ex.Message}") + ToonError(ex, $"Fout met opvullen van config controls") End Try End Sub Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Mappers/XmlMapper.vb =================================================================== diff -u -r1922 -r1948 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Mappers/XmlMapper.vb (.../XmlMapper.vb) (revision 1922) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Mappers/XmlMapper.vb (.../XmlMapper.vb) (revision 1948) @@ -13,7 +13,7 @@ Public Sub WriteData(Of T)(writer As Stream, item As T) Implements IXmlMapper.WriteData Try Dim serializer As New XmlSerializer(GetType(T)) - 'New FileStream(getPath(), FileMode.OpenOrCreate) + 'New FileStream(getPath(), FileMode.Create) serializer.Serialize(writer, item) writer.Close() Catch ex As Exception Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormGraveerInstellingen.resx =================================================================== diff -u -r1947 -r1948 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormGraveerInstellingen.resx (.../FormGraveerInstellingen.resx) (revision 1947) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormGraveerInstellingen.resx (.../FormGraveerInstellingen.resx) (revision 1948) @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 +