diff --git a/CutToLength/CutToLength.csproj b/CutToLength/CutToLength.csproj
index 8b0b61f..e41da39 100644
--- a/CutToLength/CutToLength.csproj
+++ b/CutToLength/CutToLength.csproj
@@ -33,9 +33,8 @@
4
-
- ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll
- True
+
+ ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll
diff --git a/CutToLength/MainForm.Designer.cs b/CutToLength/MainForm.Designer.cs
index 4cfda46..ca33a3a 100644
--- a/CutToLength/MainForm.Designer.cs
+++ b/CutToLength/MainForm.Designer.cs
@@ -29,11 +29,15 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
+ this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.lengthDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.quantityDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.TotalLength = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.itemBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
@@ -46,14 +50,10 @@
this.textBox1 = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
- this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.lengthDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.quantityDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.itemBindingSource = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.itemBindingSource)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
this.toolStrip1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.itemBindingSource)).BeginInit();
this.SuspendLayout();
//
// dataGridView1
@@ -83,6 +83,31 @@
this.dataGridView1.Size = new System.Drawing.Size(763, 361);
this.dataGridView1.TabIndex = 5;
//
+ // nameDataGridViewTextBoxColumn
+ //
+ this.nameDataGridViewTextBoxColumn.DataPropertyName = "Name";
+ this.nameDataGridViewTextBoxColumn.HeaderText = "Name";
+ this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn";
+ this.nameDataGridViewTextBoxColumn.Width = 200;
+ //
+ // lengthDataGridViewTextBoxColumn
+ //
+ this.lengthDataGridViewTextBoxColumn.DataPropertyName = "Length";
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+ this.lengthDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
+ this.lengthDataGridViewTextBoxColumn.HeaderText = "Length";
+ this.lengthDataGridViewTextBoxColumn.Name = "lengthDataGridViewTextBoxColumn";
+ this.lengthDataGridViewTextBoxColumn.Width = 120;
+ //
+ // quantityDataGridViewTextBoxColumn
+ //
+ this.quantityDataGridViewTextBoxColumn.DataPropertyName = "Quantity";
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+ this.quantityDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2;
+ this.quantityDataGridViewTextBoxColumn.HeaderText = "Qty";
+ this.quantityDataGridViewTextBoxColumn.Name = "quantityDataGridViewTextBoxColumn";
+ this.quantityDataGridViewTextBoxColumn.Width = 50;
+ //
// TotalLength
//
this.TotalLength.DataPropertyName = "TotalLength";
@@ -94,6 +119,10 @@
this.TotalLength.Name = "TotalLength";
this.TotalLength.ReadOnly = true;
//
+ // itemBindingSource
+ //
+ this.itemBindingSource.DataSource = typeof(CutToLength.UIItem);
+ //
// label1
//
this.label1.AutoSize = true;
@@ -221,40 +250,11 @@
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("Segoe UI Semibold", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label4.ForeColor = System.Drawing.Color.Blue;
- this.label4.Location = new System.Drawing.Point(333, 76);
+ this.label4.Location = new System.Drawing.Point(336, 76);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(70, 17);
+ this.label4.Size = new System.Drawing.Size(67, 17);
this.label4.TabIndex = 0;
- this.label4.Text = "Kerf width";
- //
- // nameDataGridViewTextBoxColumn
- //
- this.nameDataGridViewTextBoxColumn.DataPropertyName = "Name";
- this.nameDataGridViewTextBoxColumn.HeaderText = "Name";
- this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn";
- this.nameDataGridViewTextBoxColumn.Width = 200;
- //
- // lengthDataGridViewTextBoxColumn
- //
- this.lengthDataGridViewTextBoxColumn.DataPropertyName = "Length";
- dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
- this.lengthDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
- this.lengthDataGridViewTextBoxColumn.HeaderText = "Length";
- this.lengthDataGridViewTextBoxColumn.Name = "lengthDataGridViewTextBoxColumn";
- this.lengthDataGridViewTextBoxColumn.Width = 120;
- //
- // quantityDataGridViewTextBoxColumn
- //
- this.quantityDataGridViewTextBoxColumn.DataPropertyName = "Quantity";
- dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
- this.quantityDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2;
- this.quantityDataGridViewTextBoxColumn.HeaderText = "Qty";
- this.quantityDataGridViewTextBoxColumn.Name = "quantityDataGridViewTextBoxColumn";
- this.quantityDataGridViewTextBoxColumn.Width = 50;
- //
- // itemBindingSource
- //
- this.itemBindingSource.DataSource = typeof(CutToLength.UIItem);
+ this.label4.Text = "Cut width";
//
// MainForm
//
@@ -276,10 +276,10 @@
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Cut To Length";
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.itemBindingSource)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.itemBindingSource)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/CutToLength/packages.config b/CutToLength/packages.config
index 7ee8c10..466ab76 100644
--- a/CutToLength/packages.config
+++ b/CutToLength/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file