Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Domein/GraveerInstellingenRepository.vb =================================================================== diff -u -r1948 -r2178 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Domein/GraveerInstellingenRepository.vb (.../GraveerInstellingenRepository.vb) (revision 1948) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Domein/GraveerInstellingenRepository.vb (.../GraveerInstellingenRepository.vb) (revision 2178) @@ -1,8 +1,12 @@ Imports System.IO +Imports System.Reflection Imports System.Security.Cryptography.X509Certificates +Imports System.Xml +Imports System.Xml.Schema Public Interface IGraveerInstellingenRepository Property GraveerInstellingen() As List(Of GraveerInstelling) + Property GraveerInstellingenDataTable() As DataTable End Interface Public Class GraveerInstellingenRepository @@ -12,6 +16,7 @@ Private ReadOnly _configs As IConfigsClass Private _graveerinstellingen As List(Of GraveerInstelling) + Private _graveerinstellingenDataTable As DataTable Public Sub New(xmlMapper As IXmlMapper, configs As IConfigsClass) Me._xmlMapper = xmlMapper @@ -29,6 +34,17 @@ End Set End Property + Public Property GraveerInstellingenDataTable() As DataTable Implements IGraveerInstellingenRepository.GraveerInstellingenDataTable + Get + If _graveerinstellingenDataTable Is Nothing Then LaadDataTable() + Return _graveerinstellingenDataTable + End Get + Set + 'ControleerNieuweInstellingen(Value) + SlaOpDataTable(Value) + End Set + End Property + Private Sub Laad() Try Dim stream = New FileStream(_configs.GraveerInstellingenXmlPad, FileMode.Open, FileAccess.Read, FileShare.Read) @@ -38,6 +54,32 @@ End Try End Sub + Private Sub LaadDataTable() + Try + Dim dataTable = New DataTable() + dataTable.ReadXml("D:\Lasergravering\Configs\graveerinstellingen_nieuw.xml") + _graveerinstellingenDataTable = dataTable + Catch ex As Exception + Throw New Exception($"Kon graveer instellingen niet laden.{vbNewLine}{ex.Message}") + End Try + End Sub + + Private Function ConverteerNaarDataTable(Of T)(ByVal list As IList(Of T)) As DataTable + Dim table As New DataTable() + Dim fields() As PropertyInfo = GetType(T).GetProperties() + For Each field As PropertyInfo In fields + table.Columns.Add(field.Name, field.PropertyType) + Next + For Each item As T In list + Dim row As DataRow = table.NewRow() + For Each field As PropertyInfo In fields + row(field.Name) = field.GetValue(item) + Next + table.Rows.Add(row) + Next + Return table + End Function + Private Shared Sub ControleerNieuweInstellingen(graveerInstellings As List(Of GraveerInstelling)) 'TODO controle voorzien End Sub @@ -52,4 +94,14 @@ End Try End Sub + Private Sub SlaOpDataTable(nieuweInstellingen As DataTable) + Try + Dim stream = New FileStream(_configs.GraveerInstellingenXmlPad, FileMode.Create) + _xmlMapper.WriteData(stream, nieuweInstellingen) + _graveerinstellingenDataTable = nieuweInstellingen + Catch ex As Exception + Throw New Exception($"Kon nieuwe graveer instellingen niet opslaan.{vbNewLine}{ex.Message}") + End Try + End Sub + End Class Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormVoegUitzonderingToe.resx =================================================================== diff -u --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormVoegUitzonderingToe.resx (revision 0) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormVoegUitzonderingToe.resx (revision 2178) @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormGraveerInstellingen.resx =================================================================== diff -u -r1948 -r2178 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormGraveerInstellingen.resx (.../FormGraveerInstellingen.resx) (revision 1948) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormGraveerInstellingen.resx (.../FormGraveerInstellingen.resx) (revision 2178) @@ -117,8 +117,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 238, 19 + - 17, 17 + 18, 17 Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Domein/GraveerInstelling.vb =================================================================== diff -u -r1950 -r2178 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Domein/GraveerInstelling.vb (.../GraveerInstelling.vb) (revision 1950) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Domein/GraveerInstelling.vb (.../GraveerInstelling.vb) (revision 2178) @@ -1,12 +1,13 @@ Public Class GraveerInstelling Public Property Kleur As String + Public Property LogoID As String Public Property MateriaalHoogte As String Public Property Graveervermogen As String Public Property Graveersnelheid As String Public Property Ppi As String Public Overrides Function ToString() As String - If String.IsNullOrEmpty(Kleur) then Return "Nieuw" - Return Kleur + If String.IsNullOrEmpty(LogoID) Then Return "Standaard" + Return LogoID End Function End Class \ No newline at end of file Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Laser Gravering.vbproj =================================================================== diff -u -r2166 -r2178 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Laser Gravering.vbproj (.../Laser Gravering.vbproj) (revision 2166) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Laser Gravering.vbproj (.../Laser Gravering.vbproj) (revision 2178) @@ -176,6 +176,12 @@ Form + + FormVoegUitzonderingToe.vb + + + Form + ExceptionScherm.vb @@ -247,6 +253,9 @@ FormHoofdscherm.vb + + FormVoegUitzonderingToe.vb + ExceptionScherm.vb Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormHoofdscherm.vb =================================================================== diff -u -r1963 -r2178 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormHoofdscherm.vb (.../FormHoofdscherm.vb) (revision 1963) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormHoofdscherm.vb (.../FormHoofdscherm.vb) (revision 2178) @@ -151,6 +151,10 @@ End Try End Sub + Private Sub TestToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TestToolStripMenuItem.Click + + End Sub + #End Region End Class \ No newline at end of file Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtDetailsScherm.vb =================================================================== diff -u -r1928 -r2178 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtDetailsScherm.vb (.../LaserOpdrachtDetailsScherm.vb) (revision 1928) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtDetailsScherm.vb (.../LaserOpdrachtDetailsScherm.vb) (revision 2178) @@ -58,4 +58,12 @@ _subScherm.HandleException(Me, ex) End Try End Sub + + Private Sub TableLayoutPanel1_Paint(sender As Object, e As PaintEventArgs) Handles TableLayoutPanel1.Paint + + End Sub + + Private Sub Label1_Click(sender As Object, e As EventArgs) Handles Label1.Click + + End Sub End Class Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormVoegUitzonderingToe.vb =================================================================== diff -u --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormVoegUitzonderingToe.vb (revision 0) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormVoegUitzonderingToe.vb (revision 2178) @@ -0,0 +1,13 @@ +Public Class FormVoegUitzonderingToe + Private Sub FormVoegUitzonderingToe_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + End Sub + + Private Sub ButtonOK_Click(sender As Object, e As EventArgs) Handles ButtonOK.Click + Me.DialogResult = DialogResult.OK + End Sub + + Private Sub ButtonAnnuleer_Click(sender As Object, e As EventArgs) Handles ButtonAnnuleer.Click + Me.DialogResult = DialogResult.Cancel + End Sub +End Class \ No newline at end of file Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Domein/LaseropdrachtController.vb =================================================================== diff -u -r1941 -r2178 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Domein/LaseropdrachtController.vb (.../LaseropdrachtController.vb) (revision 1941) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Domein/LaseropdrachtController.vb (.../LaseropdrachtController.vb) (revision 2178) @@ -54,8 +54,7 @@ 'Configureer het proces, start het op en wacht tot wanneer het script (proces) klaar is ' Graveer instelling opzoeken aan de hand van de kleur - Dim graveerInstelling = _graveerInstellingenRepository.GraveerInstellingen.Find(Function(x) x.Kleur = _laserOpdracht.LadeKleur) - If IsNothing(graveerInstelling) Then Throw New Exception($"Er is nog geen configuratie voor kleur '{_laserOpdracht.LadeKleur}'") + Dim graveerInstelling = GeefGraveerInstellingen() 'Graveer instelling attributen splitsen in een string tussen aanhalingstekens Dim graveerInstellingString = $"""{graveerInstelling.MateriaalHoogte}"" " & @@ -91,4 +90,11 @@ End Try End Sub + Private Function GeefGraveerInstellingen() As GraveerInstelling + Dim graveerInstelling = _graveerInstellingenRepository.GraveerInstellingen.Find(Function(x) x.Kleur = _laserOpdracht.LadeKleur) + + If IsNothing(graveerInstelling) Then Throw New Exception($"Er is nog geen configuratie voor kleur '{_laserOpdracht.LadeKleur}'") + + Return graveerInstelling + End Function End Class Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtDetailsScherm.Designer.vb =================================================================== diff -u -r1925 -r2178 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtDetailsScherm.Designer.vb (.../LaserOpdrachtDetailsScherm.Designer.vb) (revision 1925) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtDetailsScherm.Designer.vb (.../LaserOpdrachtDetailsScherm.Designer.vb) (revision 2178) @@ -33,129 +33,129 @@ Me.TextBoxLadeKleur = New System.Windows.Forms.TextBox() Me.TextBoxBestandsnaam = New System.Windows.Forms.TextBox() Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel() - Me.Label1 = New System.Windows.Forms.Label() Me.TextBoxProductID = New System.Windows.Forms.TextBox() - Me.TableLayoutPanel1.SuspendLayout - Me.SuspendLayout + Me.Label1 = New System.Windows.Forms.Label() + Me.TableLayoutPanel1.SuspendLayout() + Me.SuspendLayout() ' 'Label6 ' - Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.Label6.AutoSize = true - Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.Label6.Location = New System.Drawing.Point(3, 349) + Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label6.AutoSize = True + Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label6.Location = New System.Drawing.Point(3, 344) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(204, 31) Me.Label6.TabIndex = 83 Me.Label6.Text = "Bestandsnaam:" ' 'Label5 ' - Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.Label5.AutoSize = true - Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.Label5.Location = New System.Drawing.Point(3, 292) + Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label5.AutoSize = True + Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label5.Location = New System.Drawing.Point(3, 277) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(204, 31) Me.Label5.TabIndex = 82 Me.Label5.Text = "Lade kleur:" ' 'TextBoxKortTekst ' - Me.TextBoxKortTekst.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.TextBoxKortTekst.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.TextBoxKortTekst.Location = New System.Drawing.Point(213, 115) + Me.TextBoxKortTekst.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.TextBoxKortTekst.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBoxKortTekst.Location = New System.Drawing.Point(213, 68) Me.TextBoxKortTekst.Name = "TextBoxKortTekst" - Me.TextBoxKortTekst.ReadOnly = true + Me.TextBoxKortTekst.ReadOnly = True Me.TextBoxKortTekst.Size = New System.Drawing.Size(653, 53) Me.TextBoxKortTekst.TabIndex = 71 ' 'Label4 ' - Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.Label4.AutoSize = true - Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.Label4.Location = New System.Drawing.Point(3, 236) + Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label4.AutoSize = True + Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label4.Location = New System.Drawing.Point(3, 212) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(204, 31) Me.Label4.TabIndex = 81 Me.Label4.Text = "Referentie:" ' 'TextBoxLogoID ' - Me.TextBoxLogoID.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.TextBoxLogoID.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.TextBoxLogoID.Location = New System.Drawing.Point(213, 171) + Me.TextBoxLogoID.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.TextBoxLogoID.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBoxLogoID.Location = New System.Drawing.Point(213, 133) Me.TextBoxLogoID.Name = "TextBoxLogoID" - Me.TextBoxLogoID.ReadOnly = true + Me.TextBoxLogoID.ReadOnly = True Me.TextBoxLogoID.Size = New System.Drawing.Size(653, 53) Me.TextBoxLogoID.TabIndex = 72 ' 'Label3 ' - Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.Label3.AutoSize = true - Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.Label3.Location = New System.Drawing.Point(3, 180) + Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label3.AutoSize = True + Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label3.Location = New System.Drawing.Point(3, 147) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(204, 31) Me.Label3.TabIndex = 80 Me.Label3.Text = "Logo ID:" ' 'TextBoxReferentie ' - Me.TextBoxReferentie.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.TextBoxReferentie.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.TextBoxReferentie.Location = New System.Drawing.Point(213, 227) + Me.TextBoxReferentie.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.TextBoxReferentie.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBoxReferentie.Location = New System.Drawing.Point(213, 198) Me.TextBoxReferentie.Name = "TextBoxReferentie" - Me.TextBoxReferentie.ReadOnly = true + Me.TextBoxReferentie.ReadOnly = True Me.TextBoxReferentie.Size = New System.Drawing.Size(653, 53) Me.TextBoxReferentie.TabIndex = 73 ' 'Label2 ' Me.Label2.Anchor = System.Windows.Forms.AnchorStyles.Left - Me.Label2.AutoSize = true - Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.Label2.Location = New System.Drawing.Point(3, 124) + Me.Label2.AutoSize = True + Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label2.Location = New System.Drawing.Point(3, 82) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(138, 31) Me.Label2.TabIndex = 79 Me.Label2.Text = "Kort tekst:" ' 'TextBoxLadeKleur ' - Me.TextBoxLadeKleur.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.TextBoxLadeKleur.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.TextBoxLadeKleur.Location = New System.Drawing.Point(213, 283) + Me.TextBoxLadeKleur.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.TextBoxLadeKleur.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBoxLadeKleur.Location = New System.Drawing.Point(213, 263) Me.TextBoxLadeKleur.Name = "TextBoxLadeKleur" - Me.TextBoxLadeKleur.ReadOnly = true + Me.TextBoxLadeKleur.ReadOnly = True Me.TextBoxLadeKleur.Size = New System.Drawing.Size(653, 53) Me.TextBoxLadeKleur.TabIndex = 74 ' 'TextBoxBestandsnaam ' - Me.TextBoxBestandsnaam.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.TextBoxBestandsnaam.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.TextBoxBestandsnaam.Location = New System.Drawing.Point(213, 339) + Me.TextBoxBestandsnaam.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.TextBoxBestandsnaam.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBoxBestandsnaam.Location = New System.Drawing.Point(213, 328) Me.TextBoxBestandsnaam.Name = "TextBoxBestandsnaam" - Me.TextBoxBestandsnaam.ReadOnly = true + Me.TextBoxBestandsnaam.ReadOnly = True Me.TextBoxBestandsnaam.Size = New System.Drawing.Size(653, 53) Me.TextBoxBestandsnaam.TabIndex = 77 ' 'TableLayoutPanel1 ' - Me.TableLayoutPanel1.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.TableLayoutPanel1.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.TableLayoutPanel1.ColumnCount = 2 - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 210!)) - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100!)) + Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 210.0!)) + Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) Me.TableLayoutPanel1.Controls.Add(Me.TextBoxLogoID, 1, 2) Me.TableLayoutPanel1.Controls.Add(Me.Label6, 0, 5) Me.TableLayoutPanel1.Controls.Add(Me.TextBoxReferentie, 1, 3) @@ -180,28 +180,28 @@ Me.TableLayoutPanel1.Size = New System.Drawing.Size(869, 394) Me.TableLayoutPanel1.TabIndex = 84 ' + 'TextBoxProductID + ' + Me.TextBoxProductID.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.TextBoxProductID.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBoxProductID.Location = New System.Drawing.Point(213, 3) + Me.TextBoxProductID.Name = "TextBoxProductID" + Me.TextBoxProductID.ReadOnly = True + Me.TextBoxProductID.Size = New System.Drawing.Size(653, 53) + Me.TextBoxProductID.TabIndex = 70 + ' 'Label1 ' Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.Left - Me.Label1.AutoSize = true - Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.Label1.Location = New System.Drawing.Point(3, 68) + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.Location = New System.Drawing.Point(3, 17) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(151, 31) Me.Label1.TabIndex = 78 Me.Label1.Text = "Product ID:" ' - 'TextBoxProductID - ' - Me.TextBoxProductID.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.TextBoxProductID.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.TextBoxProductID.Location = New System.Drawing.Point(213, 59) - Me.TextBoxProductID.Name = "TextBoxProductID" - Me.TextBoxProductID.ReadOnly = true - Me.TextBoxProductID.Size = New System.Drawing.Size(653, 53) - Me.TextBoxProductID.TabIndex = 70 - ' 'LaserOpdrachtDetailsScherm ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormVoegUitzonderingToe.Designer.vb =================================================================== diff -u --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormVoegUitzonderingToe.Designer.vb (revision 0) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormVoegUitzonderingToe.Designer.vb (revision 2178) @@ -0,0 +1,91 @@ + _ +Partial Class FormVoegUitzonderingToe + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.TextBoxLogoID = New System.Windows.Forms.TextBox() + Me.Label3 = New System.Windows.Forms.Label() + Me.ButtonOK = New System.Windows.Forms.Button() + Me.ButtonAnnuleer = New System.Windows.Forms.Button() + Me.SuspendLayout() + ' + 'TextBoxLogoID + ' + Me.TextBoxLogoID.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBoxLogoID.Location = New System.Drawing.Point(12, 40) + Me.TextBoxLogoID.Name = "TextBoxLogoID" + Me.TextBoxLogoID.Size = New System.Drawing.Size(217, 26) + Me.TextBoxLogoID.TabIndex = 2 + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.Label3.Location = New System.Drawing.Point(12, 20) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(190, 17) + Me.Label3.TabIndex = 9 + Me.Label3.Text = "Logo ID van de uitzondering:" + ' + 'ButtonOK + ' + Me.ButtonOK.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ButtonOK.ForeColor = System.Drawing.Color.DarkGreen + Me.ButtonOK.Location = New System.Drawing.Point(12, 90) + Me.ButtonOK.Name = "ButtonOK" + Me.ButtonOK.Size = New System.Drawing.Size(99, 32) + Me.ButtonOK.TabIndex = 14 + Me.ButtonOK.Text = "OK" + Me.ButtonOK.UseVisualStyleBackColor = True + ' + 'ButtonAnnuleer + ' + Me.ButtonAnnuleer.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ButtonAnnuleer.ForeColor = System.Drawing.Color.Maroon + Me.ButtonAnnuleer.Location = New System.Drawing.Point(131, 90) + Me.ButtonAnnuleer.Name = "ButtonAnnuleer" + Me.ButtonAnnuleer.Size = New System.Drawing.Size(98, 32) + Me.ButtonAnnuleer.TabIndex = 15 + Me.ButtonAnnuleer.Text = "Annuleer" + Me.ButtonAnnuleer.UseVisualStyleBackColor = True + ' + 'FormVoegUitzonderingToe + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(241, 134) + Me.Controls.Add(Me.ButtonAnnuleer) + Me.Controls.Add(Me.ButtonOK) + Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.TextBoxLogoID) + Me.Name = "FormVoegUitzonderingToe" + Me.Text = "Geef Logo ID" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents TextBoxLogoID As TextBox + Friend WithEvents Label3 As Label + Friend WithEvents ButtonOK As Button + Friend WithEvents ButtonAnnuleer As Button +End Class Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtOpzoekSelecteerStatus.vb =================================================================== diff -u -r1938 -r2178 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtOpzoekSelecteerStatus.vb (.../LaserOpdrachtOpzoekSelecteerStatus.vb) (revision 1938) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtOpzoekSelecteerStatus.vb (.../LaserOpdrachtOpzoekSelecteerStatus.vb) (revision 2178) @@ -53,4 +53,8 @@ _subScherm.HandleException(Me, ex) End Try End Sub + + Private Sub LabelOpzoekFeedbackKleur_Click(sender As Object, e As EventArgs) Handles LabelOpzoekFeedbackKleur.Click + + End Sub End Class Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormGraveerInstellingen.Designer.vb =================================================================== diff -u -r1949 -r2178 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormGraveerInstellingen.Designer.vb (.../FormGraveerInstellingen.Designer.vb) (revision 1949) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormGraveerInstellingen.Designer.vb (.../FormGraveerInstellingen.Designer.vb) (revision 2178) @@ -1,9 +1,9 @@ - _ + Partial Class FormGraveerInstellingen Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,11 +20,12 @@ 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. '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.BindingSourceUniekeKleuren = New System.Windows.Forms.BindingSource(Me.components) Me.BindingSourceGraveerInstellingen = New System.Windows.Forms.BindingSource(Me.components) Me.TextBoxKleur = New System.Windows.Forms.TextBox() Me.TextBoxMateriaalHoogte = New System.Windows.Forms.TextBox() @@ -39,150 +40,180 @@ 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 + Me.ListBoxLogoIDs = New System.Windows.Forms.ListBox() + Me.ButtonVoegToeUitzondering = New System.Windows.Forms.Button() + CType(Me.BindingSourceUniekeKleuren, System.ComponentModel.ISupportInitialize).BeginInit() + 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.DataSource = Me.BindingSourceUniekeKleuren + Me.ListBoxGraveerInstellingen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ListBoxGraveerInstellingen.FormattingEnabled = True Me.ListBoxGraveerInstellingen.ItemHeight = 20 Me.ListBoxGraveerInstellingen.Location = New System.Drawing.Point(25, 23) Me.ListBoxGraveerInstellingen.Name = "ListBoxGraveerInstellingen" Me.ListBoxGraveerInstellingen.Size = New System.Drawing.Size(117, 204) Me.ListBoxGraveerInstellingen.TabIndex = 0 ' + 'BindingSourceUniekeKleuren + ' + ' '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.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBoxKleur.Location = New System.Drawing.Point(457, 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.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBoxMateriaalHoogte.Location = New System.Drawing.Point(457, 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.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBoxGraveerVermogen.Location = New System.Drawing.Point(457, 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.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBoxGraveerSnelheid.Location = New System.Drawing.Point(457, 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.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBoxppi.Location = New System.Drawing.Point(457, 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.AutoSize = True + Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.Label3.Location = New System.Drawing.Point(336, 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.AutoSize = True + Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.Label4.Location = New System.Drawing.Point(336, 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.AutoSize = True + Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.Label5.Location = New System.Drawing.Point(336, 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.AutoSize = True + Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.Label6.Location = New System.Drawing.Point(336, 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.AutoSize = True + Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.Label7.Location = New System.Drawing.Point(336, 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.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ButtonOpslaan.Location = New System.Drawing.Point(457, 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 + 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.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.ButtonVoegToe.ForeColor = System.Drawing.Color.DarkGreen 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 + Me.ButtonVoegToe.Text = "Voeg kleur toe" + Me.ButtonVoegToe.UseVisualStyleBackColor = True ' 'ButtonWis ' - Me.ButtonWis.Font = New System.Drawing.Font("Microsoft Sans Serif", 10!) + Me.ButtonWis.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.ButtonWis.ForeColor = System.Drawing.Color.Maroon - Me.ButtonWis.Location = New System.Drawing.Point(296, 23) + Me.ButtonWis.Location = New System.Drawing.Point(457, 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 + Me.ButtonWis.UseVisualStyleBackColor = True ' + 'ListBoxLogoIDs + ' + Me.ListBoxLogoIDs.DataSource = Me.BindingSourceGraveerInstellingen + Me.ListBoxLogoIDs.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ListBoxLogoIDs.FormattingEnabled = True + Me.ListBoxLogoIDs.ItemHeight = 20 + Me.ListBoxLogoIDs.Location = New System.Drawing.Point(157, 23) + Me.ListBoxLogoIDs.Name = "ListBoxLogoIDs" + Me.ListBoxLogoIDs.Size = New System.Drawing.Size(164, 204) + Me.ListBoxLogoIDs.TabIndex = 16 + ' + 'ButtonVoegToeUitzondering + ' + Me.ButtonVoegToeUitzondering.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ButtonVoegToeUitzondering.ForeColor = System.Drawing.Color.DarkGreen + Me.ButtonVoegToeUitzondering.Location = New System.Drawing.Point(157, 233) + Me.ButtonVoegToeUitzondering.Name = "ButtonVoegToeUitzondering" + Me.ButtonVoegToeUitzondering.Size = New System.Drawing.Size(164, 32) + Me.ButtonVoegToeUitzondering.TabIndex = 17 + Me.ButtonVoegToeUitzondering.Text = "Voeg uitzondering toe" + Me.ButtonVoegToeUitzondering.UseVisualStyleBackColor = True + ' 'FormGraveerInstellingen ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(464, 281) + Me.ClientSize = New System.Drawing.Size(615, 281) + Me.Controls.Add(Me.ButtonVoegToeUitzondering) + Me.Controls.Add(Me.ListBoxLogoIDs) Me.Controls.Add(Me.ButtonWis) Me.Controls.Add(Me.ButtonVoegToe) Me.Controls.Add(Me.ButtonOpslaan) @@ -197,16 +228,18 @@ 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.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 + CType(Me.BindingSourceUniekeKleuren, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.BindingSourceGraveerInstellingen, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() -End Sub + End Sub Friend WithEvents ListBoxGraveerInstellingen As ListBox + Friend WithEvents ListBoxLogoIDs As ListBox Friend WithEvents TextBoxKleur As TextBox Friend WithEvents TextBoxMateriaalHoogte As TextBox Friend WithEvents TextBoxGraveerVermogen As TextBox @@ -221,4 +254,6 @@ Friend WithEvents ButtonOpslaan As Button Friend WithEvents ButtonVoegToe As Button Friend WithEvents ButtonWis As Button + Friend WithEvents ButtonVoegToeUitzondering As Button + Friend WithEvents BindingSourceUniekeKleuren As BindingSource End Class Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormHoofdscherm.Designer.vb =================================================================== diff -u -r1963 -r2178 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormHoofdscherm.Designer.vb (.../FormHoofdscherm.Designer.vb) (revision 1963) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormHoofdscherm.Designer.vb (.../FormHoofdscherm.Designer.vb) (revision 2178) @@ -29,19 +29,19 @@ Me.GraveerInstellingenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.OverToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.SluitToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.HandleidingToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.LogToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.FlowLayoutPanelSchermen = New System.Windows.Forms.FlowLayoutPanel() 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 + Me.MenuStrip1.SuspendLayout() + CType(Me.FileSystemWatcher1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() ' 'MenuStrip1 ' Me.MenuStrip1.BackColor = System.Drawing.Color.Silver - Me.MenuStrip1.Font = New System.Drawing.Font("Segoe UI", 15!) + Me.MenuStrip1.Font = New System.Drawing.Font("Segoe UI", 15.0!) 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" @@ -52,7 +52,7 @@ 'TestToolStripMenuItem ' Me.TestToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.InstellingenToolStripMenuItem, Me.GraveerInstellingenToolStripMenuItem, Me.OverToolStripMenuItem1, Me.SluitToolStripMenuItem}) - Me.TestToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 15!) + Me.TestToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 15.0!) Me.TestToolStripMenuItem.Name = "TestToolStripMenuItem" Me.TestToolStripMenuItem.Size = New System.Drawing.Size(81, 32) Me.TestToolStripMenuItem.Text = "Opties" @@ -81,44 +81,44 @@ Me.SluitToolStripMenuItem.Size = New System.Drawing.Size(257, 32) Me.SluitToolStripMenuItem.Text = "Sluit" ' + 'HandleidingToolStripMenuItem + ' + Me.HandleidingToolStripMenuItem.Name = "HandleidingToolStripMenuItem" + 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" + ' 'FlowLayoutPanelSchermen ' - Me.FlowLayoutPanelSchermen.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.FlowLayoutPanelSchermen.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.FlowLayoutPanelSchermen.Location = New System.Drawing.Point(12, 75) Me.FlowLayoutPanelSchermen.Name = "FlowLayoutPanelSchermen" Me.FlowLayoutPanelSchermen.Size = New System.Drawing.Size(1660, 775) Me.FlowLayoutPanelSchermen.TabIndex = 72 ' 'FileSystemWatcher1 ' - Me.FileSystemWatcher1.EnableRaisingEvents = true + Me.FileSystemWatcher1.EnableRaisingEvents = True Me.FileSystemWatcher1.SynchronizingObject = Me ' 'CheckBoxVisualiseer ' - Me.CheckBoxVisualiseer.AutoSize = true - Me.CheckBoxVisualiseer.Font = New System.Drawing.Font("Microsoft Sans Serif", 11!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.CheckBoxVisualiseer.AutoSize = True + Me.CheckBoxVisualiseer.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.CheckBoxVisualiseer.Location = New System.Drawing.Point(12, 47) Me.CheckBoxVisualiseer.Name = "CheckBoxVisualiseer" Me.CheckBoxVisualiseer.Size = New System.Drawing.Size(109, 22) Me.CheckBoxVisualiseer.TabIndex = 73 Me.CheckBoxVisualiseer.Text = "Visualiseer" - Me.CheckBoxVisualiseer.UseVisualStyleBackColor = true + Me.CheckBoxVisualiseer.UseVisualStyleBackColor = True ' - 'HandleidingToolStripMenuItem - ' - Me.HandleidingToolStripMenuItem.Name = "HandleidingToolStripMenuItem" - 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!) Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormGraveerInstellingen.vb =================================================================== diff -u -r1958 -r2178 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormGraveerInstellingen.vb (.../FormGraveerInstellingen.vb) (revision 1958) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormGraveerInstellingen.vb (.../FormGraveerInstellingen.vb) (revision 2178) @@ -1,38 +1,66 @@ -Imports System.Runtime.Remoting.Messaging +Imports System.Reflection +Imports System.Runtime.Remoting.Messaging Imports Autofac Imports Laser_Gravering.Util Public Class FormGraveerInstellingen Private _graveerInstellingenRepo As IGraveerInstellingenRepository + + Private alleGraveerInstellingen As List(Of GraveerInstelling) + + Private zichtbareGraveerInstellingen As List(Of GraveerInstelling) + Private Sub FormGraveerInstellingen_Load(sender As Object, e As EventArgs) Handles MyBase.Load ' Kan geen dependency injection doen via constructor in een WinForm Try Using scope = My.MyApplication.Container.BeginLifetimeScope() _graveerInstellingenRepo = scope.Resolve(Of IGraveerInstellingenRepository)() + alleGraveerInstellingen = _graveerInstellingenRepo.GraveerInstellingen End Using Catch ex As Exception ToonError(ex) End Try - ToonInstellingen() - End Sub - - Private Sub ToonInstellingen() Try - Dim graveerinstellingen = _graveerInstellingenRepo.GraveerInstellingen - graveerinstellingen.Sort(Function(x,y) String.Compare(x.Kleur,y.Kleur)) - BindingSourceGraveerInstellingen.DataSource = graveerinstellingen + ToonUniekeKleuren() + ToonGraveerInstellingen() StelBindingsIn() Catch ex As Exception 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() + Private Sub ToonUniekeKleuren() + Try + Dim uniekeKleuren = GeefUniekeKleuren() + BindingSourceUniekeKleuren.DataSource = uniekeKleuren + Catch ex As Exception + ToonError(ex, "Kon de unieke kleuren van de graveerinstellingen niet bepalen") + End Try End Sub + Private Sub ToonGraveerInstellingen(Optional positie As Integer = 0) + Try + zichtbareGraveerInstellingen = alleGraveerInstellingen.Where(Function(x) x.Kleur = BindingSourceUniekeKleuren.Current).ToList() + BindingSourceGraveerInstellingen.DataSource = zichtbareGraveerInstellingen + + If positie > 0 Then + BindingSourceGraveerInstellingen.Position = positie + End If + Catch ex As Exception + ToonError(ex, $"Kon de graveerinstellingen voor kleur '{BindingSourceUniekeKleuren.Current}' niet bepalen") + End Try + End Sub + + Private Function GeefUniekeKleuren() As List(Of String) + Dim graveerInstellingen = _graveerInstellingenRepo.GraveerInstellingen + Dim UniekeKleuren = graveerInstellingen.Select(Function(x) x.Kleur).Distinct().ToList() + UniekeKleuren.Sort() + + Return UniekeKleuren + End Function + Private Sub StelBindingsIn() Try TextBoxKleur.DataBindings.Clear() @@ -53,26 +81,96 @@ Private Sub ButtonVoegToe_Click(sender As Object, e As EventArgs) Handles ButtonVoegToe.Click Try - BindingSourceGraveerInstellingen.AddNew() + Dim positie = BindingSourceUniekeKleuren.Add("Nieuw") + MaakNieuweGraveerInstelling("Nieuw") + + BindingSourceUniekeKleuren.Position = positie Catch ex As Exception ToonError(ex) End Try End Sub + Private Sub ButtonVoegToeUitzondering_Click(sender As Object, e As EventArgs) Handles ButtonVoegToeUitzondering.Click + Try + Dim uitzonderingForm = New FormVoegUitzonderingToe() + + If uitzonderingForm.ShowDialog() = DialogResult.OK Then + Dim nieuwLogoID = uitzonderingForm.TextBoxLogoID.Text + MaakNieuweGraveerInstelling(, nieuwLogoID) + ToonGraveerInstellingen(zichtbareGraveerInstellingen.Count + 1) + End If + + uitzonderingForm.Dispose() + Catch ex As Exception + ToonError(ex) + End Try + End Sub + + Private Sub MaakNieuweGraveerInstelling(Optional kleur As String = "", Optional logoID As String = "") + Dim nieuweGraveerInstelling = New GraveerInstelling() + + If String.IsNullOrEmpty(kleur) Then + nieuweGraveerInstelling.Kleur = BindingSourceUniekeKleuren.Current + Else + nieuweGraveerInstelling.Kleur = kleur + End If + nieuweGraveerInstelling.LogoID = logoID + + alleGraveerInstellingen.Add(nieuweGraveerInstelling) + End Sub + Private Sub ButtonWis_Click(sender As Object, e As EventArgs) Handles ButtonWis.Click Try - BindingSourceGraveerInstellingen.RemoveCurrent() + alleGraveerInstellingen.Remove(BindingSourceGraveerInstellingen.Current) + Dim graveerInstellingenVoorHuidigeKleur = alleGraveerInstellingen.Where(Function(x) x.Kleur = BindingSourceUniekeKleuren.Current).ToList() + + If graveerInstellingenVoorHuidigeKleur.Count = 0 Then + BindingSourceUniekeKleuren.RemoveCurrent() + End If + + ToonGraveerInstellingen() Catch ex As Exception ToonError(ex) End Try End Sub Private Sub ButtonOpslaan_Click(sender As Object, e As EventArgs) Handles ButtonOpslaan.Click Try + ' Alle graveerinstellingen moeten worden opgeslagen, hiervoor moet (tijdelijk) de datasource worden aangepast + BindingSourceGraveerInstellingen.DataSource = alleGraveerInstellingen _graveerInstellingenRepo.GraveerInstellingen = BindingSourceGraveerInstellingen.DataSource - Me.Close() + + Close() Catch ex As Exception ToonError(ex) End Try End Sub + + Private Sub ListBoxGraveerInstellingen_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBoxGraveerInstellingen.SelectedIndexChanged + ToonGraveerInstellingen() + End Sub + + Private Sub BindingSourceGraveerInstellingen_CurrentChanged(sender As Object, e As EventArgs) Handles BindingSourceGraveerInstellingen.CurrentChanged + StelBindingsIn() + End Sub + + Private Sub ListBoxUniekeKleuren_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBoxLogoIDs.SelectedIndexChanged + + End Sub + + Private Sub BindingSourceUniekeKleuren_CurrentChanged(sender As Object, e As EventArgs) + + End Sub + + Private Sub TextBoxMateriaalHoogte_TextChanged(sender As Object, e As EventArgs) Handles TextBoxMateriaalHoogte.TextChanged + + End Sub + + Private Sub BindingSourceGraveerInstellingenVoorKleur_CurrentChanged(sender As Object, e As EventArgs) + + End Sub + + Private Sub BindingSourceUniekeKleuren_CurrentChanged_1(sender As Object, e As EventArgs) Handles BindingSourceUniekeKleuren.CurrentChanged + + End Sub End Class \ No newline at end of file