diff --git a/HLCt/Parts/START.SLDPRT b/HLCt/Parts/START.SLDPRT index 8377ac7..b25e890 100644 Binary files a/HLCt/Parts/START.SLDPRT and b/HLCt/Parts/START.SLDPRT differ diff --git a/HLCt/Parts/~$START.SLDPRT b/HLCt/Parts/~$START.SLDPRT deleted file mode 100644 index 214926b..0000000 Binary files a/HLCt/Parts/~$START.SLDPRT and /dev/null differ diff --git a/Wardrobe/GUI/AppForm.vb b/Wardrobe/GUI/AppForm.vb index b61996d..3fa3234 100644 --- a/Wardrobe/GUI/AppForm.vb +++ b/Wardrobe/GUI/AppForm.vb @@ -58,6 +58,11 @@ Public Class AppForm Panel_Start.Controls.Clear() Main_Menu.TopLevel = False Panel_Start.Controls.Add(Main_Menu) + Main_Menu.PictureBox_Settings.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Settings1 + Main_Menu.PictureBox_CreateOrder.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_CreateOrder1_01 + Main_Menu.PictureBox_Individual.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Individual1_01 + Main_Menu.PictureBox_Multiple.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Multiple1_01 + Main_Menu.Show() ' Get floor gratings database diff --git a/Wardrobe/GUI/Draw_Grating.vb b/Wardrobe/GUI/Draw_Grating.vb index 764b7cd..7763705 100644 --- a/Wardrobe/GUI/Draw_Grating.vb +++ b/Wardrobe/GUI/Draw_Grating.vb @@ -1,5 +1,5 @@ Public Class Draw_Grating - Private Shared guiPanelL, guiPanelW As Integer + Public Shared guiPanelL, guiPanelW As Integer Public Shared DirSymbolPoints As New List(Of Integer()) Private Shared ArrowSymbolPoints As New Dictionary(Of String, Integer()) @@ -33,7 +33,7 @@ Data.guiPanelMidY = guiPanelW / 2 Data.guiMaxDrawL = guiPanelL - 80 - Data.guiMaxDrawW = guiPanelW - 80 + Data.guiMaxDrawW = guiPanelW - 110 Data.drawAR = Data.guiMaxDrawL / Data.guiMaxDrawW @@ -160,7 +160,20 @@ e.Graphics.DrawLine(symPen, ArrowSymbolPoints("p" & i)(0), ArrowSymbolPoints("p" & i)(1), ArrowSymbolPoints("p" & i + 1)(0), ArrowSymbolPoints("p" & i + 1)(1)) Next + End Sub + Public Shared Sub Draw_ForExport(g As Graphics, fontSize As Integer) + Draw_Grating(g, fontSize) + + Dim textFont As Font = New Font("Microsoft Sans Serif", 12) + g.DrawString(Grating_Configurator.Label_Line_Grating.Text, textFont, Brushes.Black, + Grating_Configurator.Label_Line_Grating.Location) + g.DrawString(Grating_Configurator.Label_Line_Grid.Text, textFont, Brushes.Black, + Grating_Configurator.Label_Line_Grid.Location) + g.DrawString(Grating_Configurator.Label_Line_Beams.Text, textFont, Brushes.Black, + Grating_Configurator.Label_Line_Beams.Location) + g.DrawString(Grating_Configurator.Label_Line_AngleRecess.Text, textFont, Brushes.Black, + Grating_Configurator.Label_Line_AngleRecess.Location) End Sub Public Shared Sub Draw_Grating(g As Graphics, fontSize As Integer) @@ -234,6 +247,43 @@ Next + ' Draw grating grid for fill area + If AppForm.fillMode Then + Dim dashPen As Pen = New Pen(Color.DarkGray, 1) + dashPen.DashPattern = {6, 4} + + 'Vertical lines + Dim singleLength As Integer = Calculate_Fill_Grid.gratingLength / Data.scaleDiff + For i = 0 To Calculate_Fill_Grid.numOfHorizontal - 2 + Dim x As Integer = Data.grossAreaPoints.Rows(0)("GUI X") + singleLength * (i + 1) + + Dim y1 As Integer = Data.grossAreaPoints.Rows(0)("GUI Y") + Dim y2 As Integer = Data.grossAreaPoints.Rows(3)("GUI Y") + g.DrawLine(dashPen, x, y1, x, y2) + Next + + 'Horizontal lines + Dim singleWidth As Integer = 1000 / Data.scaleDiff 'Calculate_Fill_Grid.gratingWidth + For i = 0 To Calculate_Fill_Grid.numOfVertical - 2 + Dim y As Integer = Data.grossAreaPoints.Rows(0)("GUI Y") + singleWidth * (i + 1) + + Dim x1 As Integer = Data.grossAreaPoints.Rows(0)("GUI X") + Dim x2 As Integer = Data.grossAreaPoints.Rows(1)("GUI X") + g.DrawLine(dashPen, x1, y, x2, y) + Next + + 'Support beams + Dim supportPen As Pen = New Pen(Color.LightPink, 4) + For i = 0 To Calculate_Fill_Grid.supportBeamsDT.Rows.Count - 1 + If Calculate_Fill_Grid.supportBeamsDT.Rows(i)("TYPE") = "Extra" Then + Dim x As Integer = Data.grossAreaPoints.Rows(0)("GUI X") + Calculate_Fill_Grid.supportBeamsDT.Rows(i)("GLOBAL_OFFSET") / Data.scaleDiff + Dim y1 As Integer = Data.grossAreaPoints.Rows(0)("GUI Y") + Dim y2 As Integer = Data.grossAreaPoints.Rows(3)("GUI Y") + g.DrawLine(supportPen, x, y1, x, y2) + End If + Next + End If + ' Draw actual grating (black) Dim pen As Pen = New Pen(Color.Black, 2) For i = 0 To Data.gratingPoints.Rows.Count - 1 @@ -271,42 +321,13 @@ g.DrawLine(pen, pTemp1(0), pTemp1(1), pTemp2(0), pTemp2(1)) Next - ' Draw grating grid for fill area - If AppForm.fillMode Then - Dim dashPen As Pen = New Pen(Color.DarkGray, 1) - dashPen.DashPattern = {6, 4} - - 'Vertical lines - Dim singleLength As Integer = Calculate_Fill_Grid.gratingLength / Data.scaleDiff - For i = 0 To Calculate_Fill_Grid.numOfHorizontal - 2 - Dim x As Integer = Data.grossAreaPoints.Rows(0)("GUI X") + singleLength * (i + 1) - - Dim y1 As Integer = Data.grossAreaPoints.Rows(0)("GUI Y") - Dim y2 As Integer = Data.grossAreaPoints.Rows(3)("GUI Y") - g.DrawLine(dashPen, x, y1, x, y2) - Next - - 'Horizontal lines - Dim singleWidth As Integer = 1000 / Data.scaleDiff 'Calculate_Fill_Grid.gratingWidth - For i = 0 To Calculate_Fill_Grid.numOfVertical - 2 - Dim y As Integer = Data.grossAreaPoints.Rows(0)("GUI Y") + singleWidth * (i + 1) - - Dim x1 As Integer = Data.grossAreaPoints.Rows(0)("GUI X") - Dim x2 As Integer = Data.grossAreaPoints.Rows(1)("GUI X") - g.DrawLine(dashPen, x1, y, x2, y) - Next - - 'Support beams - Dim supportPen As Pen = New Pen(Color.LightPink, 4) - For i = 0 To Calculate_Fill_Grid.supportBeamsDT.Rows.Count - 1 - If Calculate_Fill_Grid.supportBeamsDT.Rows(i)("TYPE") = "Extra" Then - Dim x As Integer = Data.grossAreaPoints.Rows(0)("GUI X") + Calculate_Fill_Grid.supportBeamsDT.Rows(i)("GLOBAL_OFFSET") / Data.scaleDiff - Dim y1 As Integer = Data.grossAreaPoints.Rows(0)("GUI Y") - Dim y2 As Integer = Data.grossAreaPoints.Rows(3)("GUI Y") - g.DrawLine(supportPen, x, y1, x, y2) - End If - Next - - End If + ' Draw line explainations + g.DrawLine(New Pen(Color.Black, 2), 220, guiPanelW - 20, 250, guiPanelW - 20) ' Grating Line (full black) + Dim gridPen As Pen = New Pen(Color.DarkGray, 1) + gridPen.DashPattern = {6, 4} + g.DrawLine(gridPen, 400, guiPanelW - 20, 434, guiPanelW - 20) ' Grid Line (Dashed black) + g.DrawLine(New Pen(Color.LightPink, 4), 580, guiPanelW - 20, 610, guiPanelW - 20) ' Support beams Line (full pink) + g.DrawLine(penMes, 760, guiPanelW - 16, 792, guiPanelW - 16) ' Dimension help Line (Full gray) + g.DrawLine(Pendot, 760, guiPanelW - 24, 792, guiPanelW - 24) ' Angle recess help Line (dashed gray) End Sub End Class diff --git a/Wardrobe/GUI/Export.Designer.vb b/Wardrobe/GUI/Export.Designer.vb index 8d4fb37..d47bfb9 100644 --- a/Wardrobe/GUI/Export.Designer.vb +++ b/Wardrobe/GUI/Export.Designer.vb @@ -26,19 +26,18 @@ Partial Class Export Me.CheckBox_FrameDrawing = New System.Windows.Forms.CheckBox() Me.CheckBox_GratingDrawing = New System.Windows.Forms.CheckBox() Me.CheckBox_Instructions = New System.Windows.Forms.CheckBox() - Me.Button_Export = New System.Windows.Forms.Button() Me.Label1 = New System.Windows.Forms.Label() Me.CheckBox_3DModel_SW = New System.Windows.Forms.CheckBox() Me.CheckBox_3DModel_STEP = New System.Windows.Forms.CheckBox() Me.Label2 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() Me.CheckBox_Quote = New System.Windows.Forms.CheckBox() - Me.CheckBox_Quote_BOM = New System.Windows.Forms.CheckBox() - Me.CheckBox_Quote_Drawing = New System.Windows.Forms.CheckBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.Panel2 = New System.Windows.Forms.Panel() - Me.Button_Export2 = New System.Windows.Forms.Button() Me.Panel3 = New System.Windows.Forms.Panel() + Me.PictureBox_Export = New System.Windows.Forms.PictureBox() + Me.Panel3.SuspendLayout() + CType(Me.PictureBox_Export, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'CheckBox_3DModel @@ -47,10 +46,10 @@ Partial Class Export Me.CheckBox_3DModel.BackColor = System.Drawing.SystemColors.ControlDark Me.CheckBox_3DModel.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.CheckBox_3DModel.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.CheckBox_3DModel.Location = New System.Drawing.Point(28, 73) - Me.CheckBox_3DModel.Margin = New System.Windows.Forms.Padding(2) + Me.CheckBox_3DModel.Location = New System.Drawing.Point(37, 90) + Me.CheckBox_3DModel.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.CheckBox_3DModel.Name = "CheckBox_3DModel" - Me.CheckBox_3DModel.Size = New System.Drawing.Size(130, 21) + Me.CheckBox_3DModel.Size = New System.Drawing.Size(154, 24) Me.CheckBox_3DModel.TabIndex = 37 Me.CheckBox_3DModel.Text = "Grating + Frame" Me.CheckBox_3DModel.UseVisualStyleBackColor = False @@ -62,10 +61,10 @@ Partial Class Export Me.CheckBox_FrameDrawing.Enabled = False Me.CheckBox_FrameDrawing.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.CheckBox_FrameDrawing.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.CheckBox_FrameDrawing.Location = New System.Drawing.Point(190, 99) - Me.CheckBox_FrameDrawing.Margin = New System.Windows.Forms.Padding(2) + Me.CheckBox_FrameDrawing.Location = New System.Drawing.Point(253, 122) + Me.CheckBox_FrameDrawing.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.CheckBox_FrameDrawing.Name = "CheckBox_FrameDrawing" - Me.CheckBox_FrameDrawing.Size = New System.Drawing.Size(67, 21) + Me.CheckBox_FrameDrawing.Size = New System.Drawing.Size(79, 24) Me.CheckBox_FrameDrawing.TabIndex = 36 Me.CheckBox_FrameDrawing.Text = "Frame" Me.CheckBox_FrameDrawing.UseVisualStyleBackColor = False @@ -76,10 +75,10 @@ Partial Class Export Me.CheckBox_GratingDrawing.BackColor = System.Drawing.SystemColors.ControlDark Me.CheckBox_GratingDrawing.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.CheckBox_GratingDrawing.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.CheckBox_GratingDrawing.Location = New System.Drawing.Point(190, 73) - Me.CheckBox_GratingDrawing.Margin = New System.Windows.Forms.Padding(2) + Me.CheckBox_GratingDrawing.Location = New System.Drawing.Point(253, 90) + Me.CheckBox_GratingDrawing.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.CheckBox_GratingDrawing.Name = "CheckBox_GratingDrawing" - Me.CheckBox_GratingDrawing.Size = New System.Drawing.Size(74, 21) + Me.CheckBox_GratingDrawing.Size = New System.Drawing.Size(86, 24) Me.CheckBox_GratingDrawing.TabIndex = 35 Me.CheckBox_GratingDrawing.Text = "Grating" Me.CheckBox_GratingDrawing.UseVisualStyleBackColor = False @@ -90,37 +89,23 @@ Partial Class Export Me.CheckBox_Instructions.BackColor = System.Drawing.SystemColors.ControlDark Me.CheckBox_Instructions.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.CheckBox_Instructions.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.CheckBox_Instructions.Location = New System.Drawing.Point(321, 73) - Me.CheckBox_Instructions.Margin = New System.Windows.Forms.Padding(2) + Me.CheckBox_Instructions.Location = New System.Drawing.Point(428, 90) + Me.CheckBox_Instructions.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.CheckBox_Instructions.Name = "CheckBox_Instructions" - Me.CheckBox_Instructions.Size = New System.Drawing.Size(163, 21) + Me.CheckBox_Instructions.Size = New System.Drawing.Size(196, 24) Me.CheckBox_Instructions.TabIndex = 33 Me.CheckBox_Instructions.Text = "Assembly Instructions" Me.CheckBox_Instructions.UseVisualStyleBackColor = False ' - 'Button_Export - ' - Me.Button_Export.BackColor = System.Drawing.SystemColors.ControlDark - Me.Button_Export.FlatAppearance.BorderSize = 0 - Me.Button_Export.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Export.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button_Export.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Button_Export.Location = New System.Drawing.Point(202, 241) - Me.Button_Export.Name = "Button_Export" - Me.Button_Export.Size = New System.Drawing.Size(93, 35) - Me.Button_Export.TabIndex = 38 - Me.Button_Export.Text = "Export" - Me.Button_Export.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button_Export.UseVisualStyleBackColor = False - ' 'Label1 ' Me.Label1.AutoSize = True Me.Label1.BackColor = System.Drawing.SystemColors.ControlDark Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(25, 43) + Me.Label1.Location = New System.Drawing.Point(33, 53) + Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(85, 17) + Me.Label1.Size = New System.Drawing.Size(100, 20) Me.Label1.TabIndex = 39 Me.Label1.Text = "3D-Models" ' @@ -132,10 +117,10 @@ Partial Class Export Me.CheckBox_3DModel_SW.CheckState = System.Windows.Forms.CheckState.Checked Me.CheckBox_3DModel_SW.Enabled = False Me.CheckBox_3DModel_SW.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.CheckBox_3DModel_SW.Location = New System.Drawing.Point(44, 99) - Me.CheckBox_3DModel_SW.Margin = New System.Windows.Forms.Padding(2) + Me.CheckBox_3DModel_SW.Location = New System.Drawing.Point(59, 122) + Me.CheckBox_3DModel_SW.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.CheckBox_3DModel_SW.Name = "CheckBox_3DModel_SW" - Me.CheckBox_3DModel_SW.Size = New System.Drawing.Size(80, 17) + Me.CheckBox_3DModel_SW.Size = New System.Drawing.Size(101, 21) Me.CheckBox_3DModel_SW.TabIndex = 40 Me.CheckBox_3DModel_SW.Text = "SolidWorks" Me.CheckBox_3DModel_SW.UseVisualStyleBackColor = False @@ -146,10 +131,10 @@ Partial Class Export Me.CheckBox_3DModel_STEP.AutoSize = True Me.CheckBox_3DModel_STEP.BackColor = System.Drawing.SystemColors.ControlDark Me.CheckBox_3DModel_STEP.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.CheckBox_3DModel_STEP.Location = New System.Drawing.Point(44, 120) - Me.CheckBox_3DModel_STEP.Margin = New System.Windows.Forms.Padding(2) + Me.CheckBox_3DModel_STEP.Location = New System.Drawing.Point(59, 148) + Me.CheckBox_3DModel_STEP.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.CheckBox_3DModel_STEP.Name = "CheckBox_3DModel_STEP" - Me.CheckBox_3DModel_STEP.Size = New System.Drawing.Size(54, 17) + Me.CheckBox_3DModel_STEP.Size = New System.Drawing.Size(66, 21) Me.CheckBox_3DModel_STEP.TabIndex = 41 Me.CheckBox_3DModel_STEP.Text = "STEP" Me.CheckBox_3DModel_STEP.UseVisualStyleBackColor = False @@ -160,9 +145,10 @@ Partial Class Export Me.Label2.AutoSize = True Me.Label2.BackColor = System.Drawing.SystemColors.ControlDark Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(187, 43) + Me.Label2.Location = New System.Drawing.Point(249, 53) + Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(74, 17) + Me.Label2.Size = New System.Drawing.Size(88, 20) Me.Label2.TabIndex = 42 Me.Label2.Text = "Drawings" ' @@ -171,9 +157,10 @@ Partial Class Export Me.Label3.AutoSize = True Me.Label3.BackColor = System.Drawing.SystemColors.ControlDark Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(318, 43) + Me.Label3.Location = New System.Drawing.Point(424, 53) + Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(49, 17) + Me.Label3.Size = New System.Drawing.Size(56, 20) Me.Label3.TabIndex = 43 Me.Label3.Text = "Other" ' @@ -183,105 +170,77 @@ Partial Class Export Me.CheckBox_Quote.BackColor = System.Drawing.SystemColors.ControlDark Me.CheckBox_Quote.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.CheckBox_Quote.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.CheckBox_Quote.Location = New System.Drawing.Point(321, 99) - Me.CheckBox_Quote.Margin = New System.Windows.Forms.Padding(2) + Me.CheckBox_Quote.Location = New System.Drawing.Point(428, 122) + Me.CheckBox_Quote.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.CheckBox_Quote.Name = "CheckBox_Quote" - Me.CheckBox_Quote.Size = New System.Drawing.Size(66, 21) + Me.CheckBox_Quote.Size = New System.Drawing.Size(76, 24) Me.CheckBox_Quote.TabIndex = 44 Me.CheckBox_Quote.Text = "Quote" Me.CheckBox_Quote.UseVisualStyleBackColor = False ' - 'CheckBox_Quote_BOM - ' - Me.CheckBox_Quote_BOM.AutoSize = True - Me.CheckBox_Quote_BOM.BackColor = System.Drawing.SystemColors.ControlDark - Me.CheckBox_Quote_BOM.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.CheckBox_Quote_BOM.Location = New System.Drawing.Point(337, 146) - Me.CheckBox_Quote_BOM.Margin = New System.Windows.Forms.Padding(2) - Me.CheckBox_Quote_BOM.Name = "CheckBox_Quote_BOM" - Me.CheckBox_Quote_BOM.Size = New System.Drawing.Size(50, 17) - Me.CheckBox_Quote_BOM.TabIndex = 46 - Me.CheckBox_Quote_BOM.Text = "BOM" - Me.CheckBox_Quote_BOM.UseVisualStyleBackColor = False - Me.CheckBox_Quote_BOM.Visible = False - ' - 'CheckBox_Quote_Drawing - ' - Me.CheckBox_Quote_Drawing.AutoSize = True - Me.CheckBox_Quote_Drawing.BackColor = System.Drawing.SystemColors.ControlDark - Me.CheckBox_Quote_Drawing.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.CheckBox_Quote_Drawing.Location = New System.Drawing.Point(337, 125) - Me.CheckBox_Quote_Drawing.Margin = New System.Windows.Forms.Padding(2) - Me.CheckBox_Quote_Drawing.Name = "CheckBox_Quote_Drawing" - Me.CheckBox_Quote_Drawing.Size = New System.Drawing.Size(65, 17) - Me.CheckBox_Quote_Drawing.TabIndex = 45 - Me.CheckBox_Quote_Drawing.Text = "Drawing" - Me.CheckBox_Quote_Drawing.UseVisualStyleBackColor = False - Me.CheckBox_Quote_Drawing.Visible = False - ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.SystemColors.ActiveCaptionText - Me.Panel1.Location = New System.Drawing.Point(180, 40) + Me.Panel1.Location = New System.Drawing.Point(240, 49) + Me.Panel1.Margin = New System.Windows.Forms.Padding(4) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1, 180) + Me.Panel1.Size = New System.Drawing.Size(1, 222) Me.Panel1.TabIndex = 49 ' 'Panel2 ' Me.Panel2.BackColor = System.Drawing.SystemColors.ActiveCaptionText - Me.Panel2.Location = New System.Drawing.Point(311, 40) + Me.Panel2.Location = New System.Drawing.Point(415, 49) + Me.Panel2.Margin = New System.Windows.Forms.Padding(4) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(1, 180) + Me.Panel2.Size = New System.Drawing.Size(1, 222) Me.Panel2.TabIndex = 50 ' - 'Button_Export2 - ' - Me.Button_Export2.BackColor = System.Drawing.SystemColors.ControlDark - Me.Button_Export2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Export - Me.Button_Export2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_Export2.FlatAppearance.BorderSize = 0 - Me.Button_Export2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Export2.Location = New System.Drawing.Point(211, 247) - Me.Button_Export2.Name = "Button_Export2" - Me.Button_Export2.Size = New System.Drawing.Size(29, 23) - Me.Button_Export2.TabIndex = 51 - Me.Button_Export2.UseVisualStyleBackColor = False - ' 'Panel3 ' Me.Panel3.BackColor = System.Drawing.SystemColors.ControlDark - Me.Panel3.Location = New System.Drawing.Point(12, 12) + Me.Panel3.Controls.Add(Me.PictureBox_Export) + Me.Panel3.Location = New System.Drawing.Point(16, 15) + Me.Panel3.Margin = New System.Windows.Forms.Padding(4) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(478, 276) + Me.Panel3.Size = New System.Drawing.Size(637, 340) Me.Panel3.TabIndex = 52 ' + 'PictureBox_Export + ' + Me.PictureBox_Export.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Export1_01 + Me.PictureBox_Export.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox_Export.Location = New System.Drawing.Point(251, 275) + Me.PictureBox_Export.Name = "PictureBox_Export" + Me.PictureBox_Export.Size = New System.Drawing.Size(122, 50) + Me.PictureBox_Export.TabIndex = 0 + Me.PictureBox_Export.TabStop = False + ' 'Export ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.SystemColors.ControlDarkDark - Me.ClientSize = New System.Drawing.Size(500, 300) - Me.Controls.Add(Me.Button_Export2) + Me.ClientSize = New System.Drawing.Size(667, 369) Me.Controls.Add(Me.Panel2) Me.Controls.Add(Me.Panel1) - Me.Controls.Add(Me.CheckBox_Quote_BOM) - Me.Controls.Add(Me.CheckBox_Quote_Drawing) Me.Controls.Add(Me.CheckBox_Quote) Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.CheckBox_3DModel_STEP) Me.Controls.Add(Me.CheckBox_3DModel_SW) Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.Button_Export) Me.Controls.Add(Me.CheckBox_3DModel) Me.Controls.Add(Me.CheckBox_FrameDrawing) Me.Controls.Add(Me.CheckBox_GratingDrawing) Me.Controls.Add(Me.CheckBox_Instructions) Me.Controls.Add(Me.Panel3) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None + Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "Export" Me.Text = "Export" + Me.Panel3.ResumeLayout(False) + CType(Me.PictureBox_Export, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -291,17 +250,14 @@ Partial Class Export Friend WithEvents CheckBox_FrameDrawing As CheckBox Friend WithEvents CheckBox_GratingDrawing As CheckBox Friend WithEvents CheckBox_Instructions As CheckBox - Friend WithEvents Button_Export As Button Friend WithEvents Label1 As Label Friend WithEvents CheckBox_3DModel_SW As CheckBox Friend WithEvents CheckBox_3DModel_STEP As CheckBox Friend WithEvents Label2 As Label Friend WithEvents Label3 As Label Friend WithEvents CheckBox_Quote As CheckBox - Friend WithEvents CheckBox_Quote_BOM As CheckBox - Friend WithEvents CheckBox_Quote_Drawing As CheckBox Friend WithEvents Panel1 As Panel Friend WithEvents Panel2 As Panel - Friend WithEvents Button_Export2 As Button Friend WithEvents Panel3 As Panel + Friend WithEvents PictureBox_Export As PictureBox End Class diff --git a/Wardrobe/GUI/Export.vb b/Wardrobe/GUI/Export.vb index a318fa8..72d1e20 100644 --- a/Wardrobe/GUI/Export.vb +++ b/Wardrobe/GUI/Export.vb @@ -1,5 +1,4 @@ Public Class Export - Private Sub CheckBox_3DModel_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox_3DModel.CheckedChanged If User_Input.add3DGrating = True Then User_Input.add3DGrating = False @@ -47,18 +46,13 @@ Private Sub CheckBox_Quote_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox_Quote.CheckedChanged If User_Input.addQuote = True Then User_Input.addQuote = False - CheckBox_Quote_BOM.Visible = False - CheckBox_Quote_Drawing.Visible = False Else User_Input.addQuote = True - CheckBox_Quote_BOM.Visible = True - CheckBox_Quote_Drawing.Visible = True End If End Sub - ' ---------------------------------- Export to SW ---------------------------------- - ' --- When export to SW button is pressed --- - Private Sub Button_Export_SW_Click(sender As Object, e As EventArgs) Handles Button_Export.Click + ' ---------------------------------- Export Button ---------------------------------- + Private Sub Button_Export_SW_Click(sender As Object, e As EventArgs) Handles PictureBox_Export.Click If AppForm.fillMode Then Calculate_Fill_Grid.Calculate_Grid() @@ -147,12 +141,19 @@ End If If User_Input.addQuote = True Then - GUI_Export.Generate_Quote() 'FIXA + GUI_Export.Generate_Quote() End If - Me.Close() End Sub + Private Sub PictureBox_Export_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox_Export.MouseEnter + PictureBox_Export.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Export2_01 + PictureBox_Export.Cursor = Cursors.Hand + End Sub + Private Sub PictureBox_Export_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox_Export.MouseLeave + PictureBox_Export.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Export1_01 + PictureBox_Export.Cursor = Cursors.Default + End Sub End Class \ No newline at end of file diff --git a/Wardrobe/GUI/Grating_Configurator.Designer.vb b/Wardrobe/GUI/Grating_Configurator.Designer.vb index 1faa8dd..ccbcbc3 100644 --- a/Wardrobe/GUI/Grating_Configurator.Designer.vb +++ b/Wardrobe/GUI/Grating_Configurator.Designer.vb @@ -24,10 +24,9 @@ Partial Class Grating_Configurator Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Grating_Configurator)) Me.Panel_Data = New System.Windows.Forms.Panel() + Me.PictureBox_CalculateGrid = New System.Windows.Forms.PictureBox() + Me.PictureBox_ExportMenu = New System.Windows.Forms.PictureBox() Me.CheckBox_CutFrame = New System.Windows.Forms.CheckBox() - Me.Button_Calculate2 = New System.Windows.Forms.Button() - Me.Button_Calculate = New System.Windows.Forms.Button() - Me.Button_ExportMenu2 = New System.Windows.Forms.Button() Me.PictureBox_ConfigType = New System.Windows.Forms.PictureBox() Me.Label_ConfigType = New System.Windows.Forms.Label() Me.CheckBox_Frames = New System.Windows.Forms.CheckBox() @@ -40,7 +39,6 @@ Partial Class Grating_Configurator Me.Label5 = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() - Me.Button_ExportMenu = New System.Windows.Forms.Button() Me.Label_Heading = New System.Windows.Forms.Label() Me.Label_Material = New System.Windows.Forms.Label() Me.Label_Mesh = New System.Windows.Forms.Label() @@ -64,9 +62,15 @@ Partial Class Grating_Configurator Me.Button_Angle_Corner = New System.Windows.Forms.Button() Me.Label_Recesses = New System.Windows.Forms.Label() Me.Panel_Grating = New System.Windows.Forms.Panel() + Me.Label_Line_AngleRecess = New System.Windows.Forms.Label() + Me.Label_Line_Beams = New System.Windows.Forms.Label() + Me.Label_Line_Grid = New System.Windows.Forms.Label() + Me.Label_Line_Grating = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.Panel_Data.SuspendLayout() + CType(Me.PictureBox_CalculateGrid, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox_ExportMenu, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox_ConfigType, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel_Recesses.SuspendLayout() Me.Panel_Grating.SuspendLayout() @@ -75,10 +79,9 @@ Partial Class Grating_Configurator 'Panel_Data ' Me.Panel_Data.BackColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.Panel_Data.Controls.Add(Me.PictureBox_CalculateGrid) + Me.Panel_Data.Controls.Add(Me.PictureBox_ExportMenu) Me.Panel_Data.Controls.Add(Me.CheckBox_CutFrame) - Me.Panel_Data.Controls.Add(Me.Button_Calculate2) - Me.Panel_Data.Controls.Add(Me.Button_Calculate) - Me.Panel_Data.Controls.Add(Me.Button_ExportMenu2) Me.Panel_Data.Controls.Add(Me.PictureBox_ConfigType) Me.Panel_Data.Controls.Add(Me.Label_ConfigType) Me.Panel_Data.Controls.Add(Me.CheckBox_Frames) @@ -91,7 +94,6 @@ Partial Class Grating_Configurator Me.Panel_Data.Controls.Add(Me.Label5) Me.Panel_Data.Controls.Add(Me.Label4) Me.Panel_Data.Controls.Add(Me.Label3) - Me.Panel_Data.Controls.Add(Me.Button_ExportMenu) Me.Panel_Data.Controls.Add(Me.Label_Heading) Me.Panel_Data.Controls.Add(Me.Label_Material) Me.Panel_Data.Controls.Add(Me.Label_Mesh) @@ -109,72 +111,50 @@ Partial Class Grating_Configurator Me.Panel_Data.Location = New System.Drawing.Point(0, 0) Me.Panel_Data.Margin = New System.Windows.Forms.Padding(0) Me.Panel_Data.Name = "Panel_Data" - Me.Panel_Data.Size = New System.Drawing.Size(315, 772) + Me.Panel_Data.Size = New System.Drawing.Size(420, 950) Me.Panel_Data.TabIndex = 0 ' + 'PictureBox_CalculateGrid + ' + Me.PictureBox_CalculateGrid.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_UpdateGrid1_01 + Me.PictureBox_CalculateGrid.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox_CalculateGrid.Location = New System.Drawing.Point(147, 708) + Me.PictureBox_CalculateGrid.Name = "PictureBox_CalculateGrid" + Me.PictureBox_CalculateGrid.Size = New System.Drawing.Size(186, 43) + Me.PictureBox_CalculateGrid.TabIndex = 43 + Me.PictureBox_CalculateGrid.TabStop = False + ' + 'PictureBox_ExportMenu + ' + Me.PictureBox_ExportMenu.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_ExportMenu1_01 + Me.PictureBox_ExportMenu.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox_ExportMenu.Location = New System.Drawing.Point(101, 823) + Me.PictureBox_ExportMenu.Name = "PictureBox_ExportMenu" + Me.PictureBox_ExportMenu.Size = New System.Drawing.Size(214, 50) + Me.PictureBox_ExportMenu.TabIndex = 42 + Me.PictureBox_ExportMenu.TabStop = False + ' 'CheckBox_CutFrame ' Me.CheckBox_CutFrame.AutoSize = True Me.CheckBox_CutFrame.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.CheckBox_CutFrame.Location = New System.Drawing.Point(110, 589) - Me.CheckBox_CutFrame.Margin = New System.Windows.Forms.Padding(2) + Me.CheckBox_CutFrame.Location = New System.Drawing.Point(147, 725) + Me.CheckBox_CutFrame.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.CheckBox_CutFrame.Name = "CheckBox_CutFrame" - Me.CheckBox_CutFrame.Size = New System.Drawing.Size(98, 17) + Me.CheckBox_CutFrame.Size = New System.Drawing.Size(129, 21) Me.CheckBox_CutFrame.TabIndex = 41 Me.CheckBox_CutFrame.Text = "Pre-Cut Frames" Me.CheckBox_CutFrame.UseVisualStyleBackColor = True Me.CheckBox_CutFrame.Visible = False ' - 'Button_Calculate2 - ' - Me.Button_Calculate2.BackColor = System.Drawing.Color.Transparent - Me.Button_Calculate2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.undo_arrow1 - Me.Button_Calculate2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_Calculate2.Enabled = False - Me.Button_Calculate2.FlatAppearance.BorderSize = 0 - Me.Button_Calculate2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Calculate2.Location = New System.Drawing.Point(110, 580) - Me.Button_Calculate2.Name = "Button_Calculate2" - Me.Button_Calculate2.Size = New System.Drawing.Size(29, 33) - Me.Button_Calculate2.TabIndex = 40 - Me.Button_Calculate2.UseVisualStyleBackColor = False - ' - 'Button_Calculate - ' - Me.Button_Calculate.BackColor = System.Drawing.Color.Transparent - Me.Button_Calculate.Enabled = False - Me.Button_Calculate.FlatAppearance.BorderSize = 0 - Me.Button_Calculate.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Calculate.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button_Calculate.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Button_Calculate.Location = New System.Drawing.Point(110, 580) - Me.Button_Calculate.Name = "Button_Calculate" - Me.Button_Calculate.Size = New System.Drawing.Size(135, 33) - Me.Button_Calculate.TabIndex = 39 - Me.Button_Calculate.Text = "Calculate Grid" - Me.Button_Calculate.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button_Calculate.UseVisualStyleBackColor = False - ' - 'Button_ExportMenu2 - ' - Me.Button_ExportMenu2.BackColor = System.Drawing.Color.Transparent - Me.Button_ExportMenu2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Export - Me.Button_ExportMenu2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_ExportMenu2.FlatAppearance.BorderSize = 0 - Me.Button_ExportMenu2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_ExportMenu2.Location = New System.Drawing.Point(87, 700) - Me.Button_ExportMenu2.Name = "Button_ExportMenu2" - Me.Button_ExportMenu2.Size = New System.Drawing.Size(41, 33) - Me.Button_ExportMenu2.TabIndex = 38 - Me.Button_ExportMenu2.UseVisualStyleBackColor = False - ' 'PictureBox_ConfigType ' - Me.PictureBox_ConfigType.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Individual_Icon + Me.PictureBox_ConfigType.BackgroundImage = CType(resources.GetObject("PictureBox_ConfigType.BackgroundImage"), System.Drawing.Image) Me.PictureBox_ConfigType.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox_ConfigType.Location = New System.Drawing.Point(225, 36) + Me.PictureBox_ConfigType.Location = New System.Drawing.Point(300, 44) + Me.PictureBox_ConfigType.Margin = New System.Windows.Forms.Padding(4) Me.PictureBox_ConfigType.Name = "PictureBox_ConfigType" - Me.PictureBox_ConfigType.Size = New System.Drawing.Size(40, 31) + Me.PictureBox_ConfigType.Size = New System.Drawing.Size(53, 38) Me.PictureBox_ConfigType.TabIndex = 37 Me.PictureBox_ConfigType.TabStop = False ' @@ -183,9 +163,10 @@ Partial Class Grating_Configurator Me.Label_ConfigType.AutoSize = True Me.Label_ConfigType.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label_ConfigType.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label_ConfigType.Location = New System.Drawing.Point(23, 52) + Me.Label_ConfigType.Location = New System.Drawing.Point(31, 64) + Me.Label_ConfigType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_ConfigType.Name = "Label_ConfigType" - Me.Label_ConfigType.Size = New System.Drawing.Size(123, 17) + Me.Label_ConfigType.Size = New System.Drawing.Size(142, 20) Me.Label_ConfigType.TabIndex = 36 Me.Label_ConfigType.Text = "- Single Grating" ' @@ -193,10 +174,10 @@ Partial Class Grating_Configurator ' Me.CheckBox_Frames.AutoSize = True Me.CheckBox_Frames.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.CheckBox_Frames.Location = New System.Drawing.Point(110, 537) - Me.CheckBox_Frames.Margin = New System.Windows.Forms.Padding(2) + Me.CheckBox_Frames.Location = New System.Drawing.Point(147, 661) + Me.CheckBox_Frames.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.CheckBox_Frames.Name = "CheckBox_Frames" - Me.CheckBox_Frames.Size = New System.Drawing.Size(82, 17) + Me.CheckBox_Frames.Size = New System.Drawing.Size(106, 21) Me.CheckBox_Frames.TabIndex = 35 Me.CheckBox_Frames.Text = "Add Frames" Me.CheckBox_Frames.UseVisualStyleBackColor = True @@ -206,9 +187,10 @@ Partial Class Grating_Configurator Me.Label_Frame.AutoSize = True Me.Label_Frame.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label_Frame.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label_Frame.Location = New System.Drawing.Point(23, 559) + Me.Label_Frame.Location = New System.Drawing.Point(31, 688) + Me.Label_Frame.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Frame.Name = "Label_Frame" - Me.Label_Frame.Size = New System.Drawing.Size(81, 17) + Me.Label_Frame.Size = New System.Drawing.Size(99, 20) Me.Label_Frame.TabIndex = 34 Me.Label_Frame.Text = "Frame WxH" ' @@ -218,18 +200,20 @@ Partial Class Grating_Configurator Me.ComboBox_Frame.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Frame.Enabled = False Me.ComboBox_Frame.FormattingEnabled = True - Me.ComboBox_Frame.Location = New System.Drawing.Point(110, 559) + Me.ComboBox_Frame.Location = New System.Drawing.Point(147, 688) + Me.ComboBox_Frame.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Frame.Name = "ComboBox_Frame" - Me.ComboBox_Frame.Size = New System.Drawing.Size(155, 21) + Me.ComboBox_Frame.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Frame.TabIndex = 33 ' 'TextBox_Width ' Me.TextBox_Width.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.TextBox_Width.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.TextBox_Width.Location = New System.Drawing.Point(110, 465) + Me.TextBox_Width.Location = New System.Drawing.Point(147, 572) + Me.TextBox_Width.Margin = New System.Windows.Forms.Padding(4) Me.TextBox_Width.Name = "TextBox_Width" - Me.TextBox_Width.Size = New System.Drawing.Size(155, 20) + Me.TextBox_Width.Size = New System.Drawing.Size(206, 22) Me.TextBox_Width.TabIndex = 26 ' 'ComboBox_Width @@ -237,9 +221,10 @@ Partial Class Grating_Configurator Me.ComboBox_Width.BackColor = System.Drawing.SystemColors.ScrollBar Me.ComboBox_Width.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Width.FormattingEnabled = True - Me.ComboBox_Width.Location = New System.Drawing.Point(110, 465) + Me.ComboBox_Width.Location = New System.Drawing.Point(147, 572) + Me.ComboBox_Width.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Width.Name = "ComboBox_Width" - Me.ComboBox_Width.Size = New System.Drawing.Size(155, 21) + Me.ComboBox_Width.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Width.TabIndex = 25 ' 'Label7 @@ -247,9 +232,10 @@ Partial Class Grating_Configurator Me.Label7.AutoSize = True Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label7.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label7.Location = New System.Drawing.Point(269, 402) + Me.Label7.Location = New System.Drawing.Point(359, 495) + Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(23, 13) + Me.Label7.Size = New System.Drawing.Size(30, 17) Me.Label7.TabIndex = 24 Me.Label7.Text = "mm" ' @@ -258,9 +244,10 @@ Partial Class Grating_Configurator Me.Label_WidthUnit.AutoSize = True Me.Label_WidthUnit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label_WidthUnit.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label_WidthUnit.Location = New System.Drawing.Point(269, 468) + Me.Label_WidthUnit.Location = New System.Drawing.Point(359, 576) + Me.Label_WidthUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_WidthUnit.Name = "Label_WidthUnit" - Me.Label_WidthUnit.Size = New System.Drawing.Size(23, 13) + Me.Label_WidthUnit.Size = New System.Drawing.Size(30, 17) Me.Label_WidthUnit.TabIndex = 23 Me.Label_WidthUnit.Text = "mm" ' @@ -269,9 +256,10 @@ Partial Class Grating_Configurator Me.Label5.AutoSize = True Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label5.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label5.Location = New System.Drawing.Point(269, 328) + Me.Label5.Location = New System.Drawing.Point(359, 404) + Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(23, 13) + Me.Label5.Size = New System.Drawing.Size(30, 17) Me.Label5.TabIndex = 22 Me.Label5.Text = "mm" ' @@ -280,9 +268,10 @@ Partial Class Grating_Configurator Me.Label4.AutoSize = True Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label4.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label4.Location = New System.Drawing.Point(269, 281) + Me.Label4.Location = New System.Drawing.Point(359, 346) + Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(23, 13) + Me.Label4.Size = New System.Drawing.Size(30, 17) Me.Label4.TabIndex = 21 Me.Label4.Text = "mm" ' @@ -291,35 +280,22 @@ Partial Class Grating_Configurator Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label3.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label3.Location = New System.Drawing.Point(269, 237) + Me.Label3.Location = New System.Drawing.Point(359, 292) + Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(23, 13) + Me.Label3.Size = New System.Drawing.Size(30, 17) Me.Label3.TabIndex = 20 Me.Label3.Text = "mm" ' - 'Button_ExportMenu - ' - Me.Button_ExportMenu.BackColor = System.Drawing.Color.Transparent - Me.Button_ExportMenu.FlatAppearance.BorderSize = 0 - Me.Button_ExportMenu.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_ExportMenu.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button_ExportMenu.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Button_ExportMenu.Location = New System.Drawing.Point(87, 700) - Me.Button_ExportMenu.Name = "Button_ExportMenu" - Me.Button_ExportMenu.Size = New System.Drawing.Size(134, 33) - Me.Button_ExportMenu.TabIndex = 18 - Me.Button_ExportMenu.Text = "Export Menu" - Me.Button_ExportMenu.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button_ExportMenu.UseVisualStyleBackColor = False - ' 'Label_Heading ' Me.Label_Heading.AutoSize = True Me.Label_Heading.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label_Heading.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label_Heading.Location = New System.Drawing.Point(22, 25) + Me.Label_Heading.Location = New System.Drawing.Point(29, 31) + Me.Label_Heading.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Heading.Name = "Label_Heading" - Me.Label_Heading.Size = New System.Drawing.Size(166, 20) + Me.Label_Heading.Size = New System.Drawing.Size(198, 25) Me.Label_Heading.TabIndex = 15 Me.Label_Heading.Text = "Grating Parameters" ' @@ -328,9 +304,10 @@ Partial Class Grating_Configurator Me.Label_Material.AutoSize = True Me.Label_Material.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label_Material.ForeColor = System.Drawing.Color.White - Me.Label_Material.Location = New System.Drawing.Point(46, 143) + Me.Label_Material.Location = New System.Drawing.Point(61, 176) + Me.Label_Material.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Material.Name = "Label_Material" - Me.Label_Material.Size = New System.Drawing.Size(58, 17) + Me.Label_Material.Size = New System.Drawing.Size(69, 20) Me.Label_Material.TabIndex = 14 Me.Label_Material.Text = "Material" ' @@ -339,9 +316,10 @@ Partial Class Grating_Configurator Me.Label_Mesh.AutoSize = True Me.Label_Mesh.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label_Mesh.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label_Mesh.Location = New System.Drawing.Point(31, 233) + Me.Label_Mesh.Location = New System.Drawing.Point(41, 287) + Me.Label_Mesh.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Mesh.Name = "Label_Mesh" - Me.Label_Mesh.Size = New System.Drawing.Size(73, 17) + Me.Label_Mesh.Size = New System.Drawing.Size(88, 20) Me.Label_Mesh.TabIndex = 13 Me.Label_Mesh.Text = "Mesh Size" ' @@ -350,9 +328,10 @@ Partial Class Grating_Configurator Me.Label_Height.AutoSize = True Me.Label_Height.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label_Height.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label_Height.Location = New System.Drawing.Point(55, 279) + Me.Label_Height.Location = New System.Drawing.Point(73, 343) + Me.Label_Height.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Height.Name = "Label_Height" - Me.Label_Height.Size = New System.Drawing.Size(49, 17) + Me.Label_Height.Size = New System.Drawing.Size(58, 20) Me.Label_Height.TabIndex = 12 Me.Label_Height.Text = "Height" ' @@ -361,9 +340,10 @@ Partial Class Grating_Configurator Me.Label_Thickness.AutoSize = True Me.Label_Thickness.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label_Thickness.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label_Thickness.Location = New System.Drawing.Point(32, 324) + Me.Label_Thickness.Location = New System.Drawing.Point(43, 399) + Me.Label_Thickness.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Thickness.Name = "Label_Thickness" - Me.Label_Thickness.Size = New System.Drawing.Size(72, 17) + Me.Label_Thickness.Size = New System.Drawing.Size(85, 20) Me.Label_Thickness.TabIndex = 11 Me.Label_Thickness.Text = "Thickness" ' @@ -372,9 +352,10 @@ Partial Class Grating_Configurator Me.Label_Width.AutoSize = True Me.Label_Width.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label_Width.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label_Width.Location = New System.Drawing.Point(60, 465) + Me.Label_Width.Location = New System.Drawing.Point(80, 572) + Me.Label_Width.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Width.Name = "Label_Width" - Me.Label_Width.Size = New System.Drawing.Size(44, 17) + Me.Label_Width.Size = New System.Drawing.Size(52, 20) Me.Label_Width.TabIndex = 10 Me.Label_Width.Text = "Width" ' @@ -383,9 +364,10 @@ Partial Class Grating_Configurator Me.Label_Length.AutoSize = True Me.Label_Length.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label_Length.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label_Length.Location = New System.Drawing.Point(52, 398) + Me.Label_Length.Location = New System.Drawing.Point(69, 490) + Me.Label_Length.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Length.Name = "Label_Length" - Me.Label_Length.Size = New System.Drawing.Size(52, 17) + Me.Label_Length.Size = New System.Drawing.Size(60, 20) Me.Label_Length.TabIndex = 9 Me.Label_Length.Text = "Length" ' @@ -394,9 +376,10 @@ Partial Class Grating_Configurator Me.Label_Type.AutoSize = True Me.Label_Type.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label_Type.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label_Type.Location = New System.Drawing.Point(64, 101) + Me.Label_Type.Location = New System.Drawing.Point(85, 124) + Me.Label_Type.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Type.Name = "Label_Type" - Me.Label_Type.Size = New System.Drawing.Size(40, 16) + Me.Label_Type.Size = New System.Drawing.Size(45, 20) Me.Label_Type.TabIndex = 8 Me.Label_Type.Text = "Type" ' @@ -404,9 +387,10 @@ Partial Class Grating_Configurator ' Me.TextBox_Length.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.TextBox_Length.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.TextBox_Length.Location = New System.Drawing.Point(110, 398) + Me.TextBox_Length.Location = New System.Drawing.Point(147, 490) + Me.TextBox_Length.Margin = New System.Windows.Forms.Padding(4) Me.TextBox_Length.Name = "TextBox_Length" - Me.TextBox_Length.Size = New System.Drawing.Size(155, 20) + Me.TextBox_Length.Size = New System.Drawing.Size(206, 22) Me.TextBox_Length.TabIndex = 7 ' 'ComboBox_Mesh @@ -414,9 +398,10 @@ Partial Class Grating_Configurator Me.ComboBox_Mesh.BackColor = System.Drawing.SystemColors.ScrollBar Me.ComboBox_Mesh.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Mesh.FormattingEnabled = True - Me.ComboBox_Mesh.Location = New System.Drawing.Point(110, 233) + Me.ComboBox_Mesh.Location = New System.Drawing.Point(147, 287) + Me.ComboBox_Mesh.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Mesh.Name = "ComboBox_Mesh" - Me.ComboBox_Mesh.Size = New System.Drawing.Size(155, 21) + Me.ComboBox_Mesh.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Mesh.TabIndex = 6 ' 'ComboBox_Thickness @@ -424,9 +409,10 @@ Partial Class Grating_Configurator Me.ComboBox_Thickness.BackColor = System.Drawing.SystemColors.ScrollBar Me.ComboBox_Thickness.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Thickness.FormattingEnabled = True - Me.ComboBox_Thickness.Location = New System.Drawing.Point(110, 323) + Me.ComboBox_Thickness.Location = New System.Drawing.Point(147, 398) + Me.ComboBox_Thickness.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Thickness.Name = "ComboBox_Thickness" - Me.ComboBox_Thickness.Size = New System.Drawing.Size(155, 21) + Me.ComboBox_Thickness.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Thickness.TabIndex = 3 ' 'ComboBox_Height @@ -434,9 +420,10 @@ Partial Class Grating_Configurator Me.ComboBox_Height.BackColor = System.Drawing.SystemColors.ScrollBar Me.ComboBox_Height.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Height.FormattingEnabled = True - Me.ComboBox_Height.Location = New System.Drawing.Point(110, 278) + Me.ComboBox_Height.Location = New System.Drawing.Point(147, 342) + Me.ComboBox_Height.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Height.Name = "ComboBox_Height" - Me.ComboBox_Height.Size = New System.Drawing.Size(155, 21) + Me.ComboBox_Height.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Height.TabIndex = 2 ' 'ComboBox_Material @@ -444,9 +431,10 @@ Partial Class Grating_Configurator Me.ComboBox_Material.BackColor = System.Drawing.SystemColors.ScrollBar Me.ComboBox_Material.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Material.FormattingEnabled = True - Me.ComboBox_Material.Location = New System.Drawing.Point(110, 142) + Me.ComboBox_Material.Location = New System.Drawing.Point(147, 175) + Me.ComboBox_Material.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Material.Name = "ComboBox_Material" - Me.ComboBox_Material.Size = New System.Drawing.Size(155, 21) + Me.ComboBox_Material.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Material.TabIndex = 1 ' 'ComboBox_Type @@ -454,9 +442,10 @@ Partial Class Grating_Configurator Me.ComboBox_Type.BackColor = System.Drawing.SystemColors.ScrollBar Me.ComboBox_Type.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Type.FormattingEnabled = True - Me.ComboBox_Type.Location = New System.Drawing.Point(110, 101) + Me.ComboBox_Type.Location = New System.Drawing.Point(147, 124) + Me.ComboBox_Type.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Type.Name = "ComboBox_Type" - Me.ComboBox_Type.Size = New System.Drawing.Size(155, 21) + Me.ComboBox_Type.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Type.TabIndex = 0 ' 'Panel_Recesses @@ -470,8 +459,9 @@ Partial Class Grating_Configurator Me.Panel_Recesses.Controls.Add(Me.Button_Angle_Corner) Me.Panel_Recesses.Controls.Add(Me.Label_Recesses) Me.Panel_Recesses.Location = New System.Drawing.Point(0, 0) + Me.Panel_Recesses.Margin = New System.Windows.Forms.Padding(4) Me.Panel_Recesses.Name = "Panel_Recesses" - Me.Panel_Recesses.Size = New System.Drawing.Size(1395, 120) + Me.Panel_Recesses.Size = New System.Drawing.Size(1860, 148) Me.Panel_Recesses.TabIndex = 1 ' 'Button_Radius @@ -483,9 +473,10 @@ Partial Class Grating_Configurator Me.Button_Radius.FlatAppearance.BorderColor = System.Drawing.Color.Black Me.Button_Radius.FlatAppearance.BorderSize = 0 Me.Button_Radius.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Radius.Location = New System.Drawing.Point(675, 25) + Me.Button_Radius.Location = New System.Drawing.Point(900, 31) + Me.Button_Radius.Margin = New System.Windows.Forms.Padding(4) Me.Button_Radius.Name = "Button_Radius" - Me.Button_Radius.Size = New System.Drawing.Size(70, 70) + Me.Button_Radius.Size = New System.Drawing.Size(93, 86) Me.Button_Radius.TabIndex = 22 Me.Button_Radius.UseVisualStyleBackColor = False ' @@ -497,9 +488,10 @@ Partial Class Grating_Configurator Me.Button_Square_Middle.FlatAppearance.BorderColor = System.Drawing.Color.Black Me.Button_Square_Middle.FlatAppearance.BorderSize = 0 Me.Button_Square_Middle.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Square_Middle.Location = New System.Drawing.Point(885, 25) + Me.Button_Square_Middle.Location = New System.Drawing.Point(1180, 31) + Me.Button_Square_Middle.Margin = New System.Windows.Forms.Padding(4) Me.Button_Square_Middle.Name = "Button_Square_Middle" - Me.Button_Square_Middle.Size = New System.Drawing.Size(70, 70) + Me.Button_Square_Middle.Size = New System.Drawing.Size(93, 86) Me.Button_Square_Middle.TabIndex = 21 Me.Button_Square_Middle.UseVisualStyleBackColor = False ' @@ -508,12 +500,14 @@ Partial Class Grating_Configurator Me.Button_Angle_Side.BackColor = System.Drawing.Color.Transparent Me.Button_Angle_Side.BackgroundImage = Global.Wardrobe.My.Resources.Resources.RadiusMiddle Me.Button_Angle_Side.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button_Angle_Side.Enabled = False Me.Button_Angle_Side.FlatAppearance.BorderColor = System.Drawing.Color.Black Me.Button_Angle_Side.FlatAppearance.BorderSize = 0 Me.Button_Angle_Side.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Angle_Side.Location = New System.Drawing.Point(990, 25) + Me.Button_Angle_Side.Location = New System.Drawing.Point(1320, 31) + Me.Button_Angle_Side.Margin = New System.Windows.Forms.Padding(4) Me.Button_Angle_Side.Name = "Button_Angle_Side" - Me.Button_Angle_Side.Size = New System.Drawing.Size(70, 70) + Me.Button_Angle_Side.Size = New System.Drawing.Size(93, 86) Me.Button_Angle_Side.TabIndex = 19 Me.Button_Angle_Side.UseVisualStyleBackColor = False ' @@ -525,9 +519,10 @@ Partial Class Grating_Configurator Me.Button_Square_Side.FlatAppearance.BorderColor = System.Drawing.Color.Black Me.Button_Square_Side.FlatAppearance.BorderSize = 0 Me.Button_Square_Side.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Square_Side.Location = New System.Drawing.Point(780, 25) + Me.Button_Square_Side.Location = New System.Drawing.Point(1040, 31) + Me.Button_Square_Side.Margin = New System.Windows.Forms.Padding(4) Me.Button_Square_Side.Name = "Button_Square_Side" - Me.Button_Square_Side.Size = New System.Drawing.Size(70, 70) + Me.Button_Square_Side.Size = New System.Drawing.Size(93, 86) Me.Button_Square_Side.TabIndex = 20 Me.Button_Square_Side.UseVisualStyleBackColor = False ' @@ -539,9 +534,10 @@ Partial Class Grating_Configurator Me.Button_Square_Corner.FlatAppearance.BorderColor = System.Drawing.Color.Black Me.Button_Square_Corner.FlatAppearance.BorderSize = 0 Me.Button_Square_Corner.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Square_Corner.Location = New System.Drawing.Point(570, 25) + Me.Button_Square_Corner.Location = New System.Drawing.Point(760, 31) + Me.Button_Square_Corner.Margin = New System.Windows.Forms.Padding(4) Me.Button_Square_Corner.Name = "Button_Square_Corner" - Me.Button_Square_Corner.Size = New System.Drawing.Size(70, 70) + Me.Button_Square_Corner.Size = New System.Drawing.Size(93, 86) Me.Button_Square_Corner.TabIndex = 18 Me.Button_Square_Corner.UseVisualStyleBackColor = False ' @@ -553,9 +549,10 @@ Partial Class Grating_Configurator Me.Button_Angle_Corner.FlatAppearance.BorderColor = System.Drawing.Color.Black Me.Button_Angle_Corner.FlatAppearance.BorderSize = 0 Me.Button_Angle_Corner.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Angle_Corner.Location = New System.Drawing.Point(465, 25) + Me.Button_Angle_Corner.Location = New System.Drawing.Point(620, 31) + Me.Button_Angle_Corner.Margin = New System.Windows.Forms.Padding(4) Me.Button_Angle_Corner.Name = "Button_Angle_Corner" - Me.Button_Angle_Corner.Size = New System.Drawing.Size(70, 70) + Me.Button_Angle_Corner.Size = New System.Drawing.Size(93, 86) Me.Button_Angle_Corner.TabIndex = 17 Me.Button_Angle_Corner.UseVisualStyleBackColor = False ' @@ -564,29 +561,80 @@ Partial Class Grating_Configurator Me.Label_Recesses.AutoSize = True Me.Label_Recesses.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label_Recesses.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label_Recesses.Location = New System.Drawing.Point(343, 25) + Me.Label_Recesses.Location = New System.Drawing.Point(457, 31) + Me.Label_Recesses.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Recesses.Name = "Label_Recesses" - Me.Label_Recesses.Size = New System.Drawing.Size(88, 20) + Me.Label_Recesses.Size = New System.Drawing.Size(106, 25) Me.Label_Recesses.TabIndex = 16 Me.Label_Recesses.Text = "Recesses" ' 'Panel_Grating ' Me.Panel_Grating.BackColor = System.Drawing.Color.White + Me.Panel_Grating.Controls.Add(Me.Label_Line_AngleRecess) + Me.Panel_Grating.Controls.Add(Me.Label_Line_Beams) + Me.Panel_Grating.Controls.Add(Me.Label_Line_Grid) + Me.Panel_Grating.Controls.Add(Me.Label_Line_Grating) Me.Panel_Grating.Controls.Add(Me.Label2) Me.Panel_Grating.Controls.Add(Me.Label1) - Me.Panel_Grating.Location = New System.Drawing.Point(315, 120) + Me.Panel_Grating.Location = New System.Drawing.Point(420, 148) + Me.Panel_Grating.Margin = New System.Windows.Forms.Padding(4) Me.Panel_Grating.Name = "Panel_Grating" - Me.Panel_Grating.Size = New System.Drawing.Size(1080, 652) + Me.Panel_Grating.Size = New System.Drawing.Size(1440, 802) Me.Panel_Grating.TabIndex = 2 ' + 'Label_Line_AngleRecess + ' + Me.Label_Line_AngleRecess.AutoSize = True + Me.Label_Line_AngleRecess.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.8!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label_Line_AngleRecess.Location = New System.Drawing.Point(741, 586) + Me.Label_Line_AngleRecess.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label_Line_AngleRecess.Name = "Label_Line_AngleRecess" + Me.Label_Line_AngleRecess.Size = New System.Drawing.Size(112, 17) + Me.Label_Line_AngleRecess.TabIndex = 5 + Me.Label_Line_AngleRecess.Text = "Dimension Lines" + ' + 'Label_Line_Beams + ' + Me.Label_Line_Beams.AutoSize = True + Me.Label_Line_Beams.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.8!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label_Line_Beams.Location = New System.Drawing.Point(571, 586) + Me.Label_Line_Beams.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label_Line_Beams.Name = "Label_Line_Beams" + Me.Label_Line_Beams.Size = New System.Drawing.Size(105, 17) + Me.Label_Line_Beams.TabIndex = 4 + Me.Label_Line_Beams.Text = "Support Beams" + ' + 'Label_Line_Grid + ' + Me.Label_Line_Grid.AutoSize = True + Me.Label_Line_Grid.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.8!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label_Line_Grid.Location = New System.Drawing.Point(435, 586) + Me.Label_Line_Grid.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label_Line_Grid.Name = "Label_Line_Grid" + Me.Label_Line_Grid.Size = New System.Drawing.Size(86, 17) + Me.Label_Line_Grid.TabIndex = 3 + Me.Label_Line_Grid.Text = "Grating Grid" + ' + 'Label_Line_Grating + ' + Me.Label_Line_Grating.AutoSize = True + Me.Label_Line_Grating.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.8!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label_Line_Grating.Location = New System.Drawing.Point(276, 586) + Me.Label_Line_Grating.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label_Line_Grating.Name = "Label_Line_Grating" + Me.Label_Line_Grating.Size = New System.Drawing.Size(104, 17) + Me.Label_Line_Grating.TabIndex = 2 + Me.Label_Line_Grating.Text = "Grating Outline" + ' 'Label2 ' Me.Label2.AutoSize = True Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.8!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(64, 625) + Me.Label2.Location = New System.Drawing.Point(85, 769) + Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(13, 13) + Me.Label2.Size = New System.Drawing.Size(16, 17) Me.Label2.TabIndex = 1 Me.Label2.Text = "L" ' @@ -594,26 +642,30 @@ Partial Class Grating_Configurator ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.8!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(13, 575) + Me.Label1.Location = New System.Drawing.Point(17, 708) + Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(18, 13) + Me.Label1.Size = New System.Drawing.Size(21, 17) Me.Label1.TabIndex = 0 Me.Label1.Text = "W" ' 'Grating_Configurator ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.SystemColors.Control - Me.ClientSize = New System.Drawing.Size(1167, 718) + Me.ClientSize = New System.Drawing.Size(1556, 884) Me.Controls.Add(Me.Panel_Data) Me.Controls.Add(Me.Panel_Recesses) Me.Controls.Add(Me.Panel_Grating) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None + Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "Grating_Configurator" Me.Text = "Individual" Me.Panel_Data.ResumeLayout(False) Me.Panel_Data.PerformLayout() + CType(Me.PictureBox_CalculateGrid, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox_ExportMenu, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox_ConfigType, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel_Recesses.ResumeLayout(False) Me.Panel_Recesses.PerformLayout() @@ -646,7 +698,6 @@ Partial Class Grating_Configurator Friend WithEvents Button_Angle_Corner As Button Friend WithEvents Label_Recesses As Label Friend WithEvents Panel_Grating As Panel - Friend WithEvents Button_ExportMenu As Button Friend WithEvents Label2 As Label Friend WithEvents Label1 As Label Friend WithEvents Label3 As Label @@ -662,8 +713,11 @@ Partial Class Grating_Configurator Friend WithEvents CheckBox_Frames As CheckBox Friend WithEvents Label_ConfigType As Label Friend WithEvents PictureBox_ConfigType As PictureBox - Friend WithEvents Button_ExportMenu2 As Button - Friend WithEvents Button_Calculate2 As Button - Friend WithEvents Button_Calculate As Button Friend WithEvents CheckBox_CutFrame As CheckBox + Friend WithEvents PictureBox_ExportMenu As PictureBox + Friend WithEvents PictureBox_CalculateGrid As PictureBox + Friend WithEvents Label_Line_AngleRecess As Label + Friend WithEvents Label_Line_Beams As Label + Friend WithEvents Label_Line_Grid As Label + Friend WithEvents Label_Line_Grating As Label End Class diff --git a/Wardrobe/GUI/Grating_Configurator.resx b/Wardrobe/GUI/Grating_Configurator.resx index 49ef412..2c87a9f 100644 --- a/Wardrobe/GUI/Grating_Configurator.resx +++ b/Wardrobe/GUI/Grating_Configurator.resx @@ -118,6 +118,372 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + L0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9D + ULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0 + +/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8 + AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAA + AAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAA + AOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADs + MwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME + 9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUy + BEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRF + u88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvP + DwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8A + AAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAA + AMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADA + PkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5D + UC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1Av + Q1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQ + tPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7 + /AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wA + AAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAA + AADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA + 7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwz + BPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1 + MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIE + RbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7 + zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88P + AAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAA + AADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAA + wD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+ + Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQ + L0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9D + ULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0 + +/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8 + AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAA + AAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAA + AOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADs + MwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME + 9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUy + BEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRF + u88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvP + DwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8A + AAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAA + AMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADA + PkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5D + UC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1Av + Q1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQ + tPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7 + /AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wA + AAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAA + AADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA + 7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwz + BPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1 + MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIE + RbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7 + zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88P + AAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAA + AADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAA + wD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+ + Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQ + L0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9D + ULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0 + +/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8 + AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAA + AAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAA + AOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADs + MwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME + 9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUy + BEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRF + u88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvP + DwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8A + AAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAA + AMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADA + PkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5D + UC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1Av + Q1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQ + tPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7 + /AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wA + AAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAA + AADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA + 7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwz + BPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1 + MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIE + RbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7 + zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88P + AAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAA + AADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAA + wD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+ + Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQ + L0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9D + ULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0 + +/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8 + AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAA + AAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAA + AOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADs + MwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME + 9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUy + BEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRF + u88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvP + DwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8A + AAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAA + AMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADA + PkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5D + UC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1Av + Q1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQ + tPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7 + /AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wA + AAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAA + AADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA + 7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwz + BPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1 + MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIE + RbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7 + zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88P + AAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAA + AADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAA + wD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+ + Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQ + L0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9D + ULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0 + +/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8 + AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAA + AAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAA + AOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADs + MwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME + 9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUy + BEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRF + u88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvP + DwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8A + AAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAA + AMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADA + PkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5D + UC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1Av + Q1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQ + tPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7 + /AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wA + AAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAA + AADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA + 7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwz + BPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1 + MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIE + RbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7 + zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88P + AAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAA + AADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAA + wD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+ + Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQ + L0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9D + ULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0 + +/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8 + AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAA + AAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAA + AOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADs + MwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME + 9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUy + BEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRF + u88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvP + DwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8A + AAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAA + AMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADA + PkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5D + UC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1Av + Q1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQ + tPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7 + /AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wA + AAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAA + AADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA + 7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwz + BPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1 + MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIE + RbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7 + zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88P + AAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAA + AADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAA + wD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+ + Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQ + L0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9D + ULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0 + +/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8 + AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAA + AAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAA + AOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADs + MwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME + 9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUy + BEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRF + u88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvP + DwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8A + AAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAA + AMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADA + PkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5D + UC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1Av + Q1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQ + tPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7 + /AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wA + AAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAA + AADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA + 7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwz + BPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1 + MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIE + RbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7 + zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88P + AAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAA + AADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAA + wD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+ + Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQ + L0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9D + ULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0 + +/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8 + AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAA + AAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAA + AOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADs + MwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME + 9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUy + BEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRF + u88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvP + DwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8A + AAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAA + AMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADA + PkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5D + UC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1Av + Q1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQ + tPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7 + /AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wA + AAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAA + AADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA + 7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwz + BPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1 + MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIE + RbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7 + zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88P + AAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAA + AADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAA + wD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+ + Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQ + L0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9D + ULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0 + +/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8 + AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAA + AAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAA + AOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADs + MwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME + 9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUy + BEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRF + u88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvP + DwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8A + AAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAA + AMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADA + PkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5D + UC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1Av + Q1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQ + tPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7 + /AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wA + AAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAA + AADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA + 7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwz + BPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIERbvPDwAAAADAPkNQL0NQtPv8AAAAAADsMwT1 + MgRFu88PAAAAAMA+Q1AvQ1C0+/wAAAAAAOwzBPUyBEW7zw8AAAAAwD5DUC9DULT7/AAAAAAA7DME9TIE + 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 + Po8vo4Cxtsl4cswAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAAfQAAAH0CAYAAADL1t+KAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAu diff --git a/Wardrobe/GUI/Grating_Configurator.vb b/Wardrobe/GUI/Grating_Configurator.vb index 25c03dd..112967c 100644 --- a/Wardrobe/GUI/Grating_Configurator.vb +++ b/Wardrobe/GUI/Grating_Configurator.vb @@ -10,6 +10,9 @@ Public Class Grating_Configurator ' --- Initialize GUI (form) size and position --- Private Sub Init_Form() + PictureBox_CalculateGrid.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_UpdateGrid1_01 + PictureBox_ExportMenu.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_ExportMenu1_01 + Me.Width = AppForm.Width Me.Height = AppForm.Height @@ -26,7 +29,7 @@ Public Class Grating_Configurator Me.ComboBox_Width.Enabled = False Me.TextBox_Width.Enabled = False Me.TextBox_Length.Enabled = False - Me.Button_ExportMenu.Enabled = False + Me.PictureBox_ExportMenu.Enabled = False Me.Button_Angle_Corner.Enabled = False Me.Button_Angle_Side.Enabled = False @@ -34,16 +37,20 @@ Public Class Grating_Configurator Me.Button_Square_Side.Enabled = False Me.Button_Square_Middle.Enabled = False - Button_ExportMenu.Top = 720 - Button_ExportMenu2.Top = 720 + PictureBox_ExportMenu.Top = 715 + + Label_Line_Grating.Location = New Point(260, Draw_Grating.guiPanelW - 27) + Label_Line_Grid.Location = New Point(444, Draw_Grating.guiPanelW - 27) + Label_Line_Beams.Location = New Point(620, Draw_Grating.guiPanelW - 27) + Label_Line_AngleRecess.Location = New Point(802, Draw_Grating.guiPanelW - 27) + End Sub Private Sub Init_Individual() Label_ConfigType.Text = "- Single Grating" PictureBox_ConfigType.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Individual_Icon - Button_Calculate.Visible = False - Button_Calculate2.Visible = False + PictureBox_CalculateGrid.Visible = False Label_Width.Top = 465 TextBox_Width.Top = 465 @@ -72,17 +79,13 @@ Public Class Grating_Configurator Me.ComboBox_Width.Visible = True Me.TextBox_Width.Visible = False - - 'CheckBox_3DModel.Checked = True - 'CheckBox_3DModel.Enabled = False End Sub Private Sub Init_Multiple() Label_ConfigType.Text = "- Fill Area" PictureBox_ConfigType.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Fill_Icon - Button_Calculate.Visible = True - Button_Calculate2.Visible = True + PictureBox_CalculateGrid.Visible = True Label_Width.Top = 440 TextBox_Width.Top = 440 @@ -345,15 +348,21 @@ Public Class Grating_Configurator End Sub - ' ---------------------------------- Calculate ---------------------------------- - ' --- When calculate button is pressed --- - Public Sub Button_Calculate_Click(sender As Object, e As EventArgs) Handles Button_Calculate.Click + ' ---------------------------------- Calculate Grid Button ---------------------------------- + Public Sub Button_Calculate_Click(sender As Object, e As EventArgs) Handles PictureBox_CalculateGrid.Click Calculate_Fill_Grid.Calculate_Grid() End Sub + Private Sub PictureBox_CalculateGrid_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox_CalculateGrid.MouseEnter + PictureBox_CalculateGrid.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_UpdateGrid2_01 + PictureBox_CalculateGrid.Cursor = Cursors.Hand + End Sub + Private Sub PictureBox_CalculateGrid_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox_CalculateGrid.MouseLeave + PictureBox_CalculateGrid.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_UpdateGrid1_01 + PictureBox_CalculateGrid.Cursor = Cursors.Default + End Sub - ' ---------------------------------- Export GUI ---------------------------------- - ' --- When export GUI button is pressed --- - Private Sub Button_Export_GUI_Click(sender As Object, e As EventArgs) Handles Button_ExportMenu.Click + ' ---------------------------------- Export Menu Button ---------------------------------- + Private Sub Button_Export_GUI_Click(sender As Object, e As EventArgs) Handles PictureBox_ExportMenu.Click If User_Input.addFrame = True Then Export.CheckBox_3DModel.Text = "Grating + Frame" Else @@ -362,8 +371,17 @@ Public Class Grating_Configurator Export.StartPosition = FormStartPosition.Manual Export.Location = New Point(500, 250) + Export.PictureBox_Export.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Export1_01 Export.ShowDialog() End Sub + Private Sub PictureBox_ExportMenu_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox_ExportMenu.MouseEnter + PictureBox_ExportMenu.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_ExportMenu2_01 + PictureBox_ExportMenu.Cursor = Cursors.Hand + End Sub + Private Sub PictureBox_ExportMenu_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox_ExportMenu.MouseLeave + PictureBox_ExportMenu.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_ExportMenu1_01 + PictureBox_ExportMenu.Cursor = Cursors.Default + End Sub End Class \ No newline at end of file diff --git a/Wardrobe/GUI/Main_Menu.Designer.vb b/Wardrobe/GUI/Main_Menu.Designer.vb index 067b368..3872f7f 100644 --- a/Wardrobe/GUI/Main_Menu.Designer.vb +++ b/Wardrobe/GUI/Main_Menu.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class Main_Menu 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,182 +20,149 @@ Partial Class Main_Menu '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.Button_Settings = New System.Windows.Forms.Button() - Me.Button_Multiple = New System.Windows.Forms.Button() - Me.Button_Individual = New System.Windows.Forms.Button() - Me.Button_Order = New System.Windows.Forms.Button() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Main_Menu)) Me.Label_SettingsError = New System.Windows.Forms.Label() - Me.Button_Multiple2 = New System.Windows.Forms.Button() - Me.Button_Individual2 = New System.Windows.Forms.Button() - Me.Button_Order2 = New System.Windows.Forms.Button() - Me.Button_Settings2 = New System.Windows.Forms.Button() + Me.PictureBox_Settings = New System.Windows.Forms.PictureBox() + Me.PictureBox_CreateOrder = New System.Windows.Forms.PictureBox() + Me.PictureBox_Individual = New System.Windows.Forms.PictureBox() + Me.PictureBox_Multiple = New System.Windows.Forms.PictureBox() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.Label1 = New System.Windows.Forms.Label() + Me.Label2 = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + CType(Me.PictureBox_Settings, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox_CreateOrder, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox_Individual, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox_Multiple, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'Button_Settings - ' - Me.Button_Settings.BackColor = System.Drawing.Color.Transparent - Me.Button_Settings.FlatAppearance.BorderSize = 0 - Me.Button_Settings.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Settings.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button_Settings.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Button_Settings.Location = New System.Drawing.Point(47, 44) - Me.Button_Settings.Margin = New System.Windows.Forms.Padding(2) - Me.Button_Settings.Name = "Button_Settings" - Me.Button_Settings.Size = New System.Drawing.Size(115, 41) - Me.Button_Settings.TabIndex = 5 - Me.Button_Settings.Text = "Settings" - Me.Button_Settings.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button_Settings.UseVisualStyleBackColor = False - ' - 'Button_Multiple - ' - Me.Button_Multiple.BackColor = System.Drawing.Color.Transparent - Me.Button_Multiple.Enabled = False - Me.Button_Multiple.FlatAppearance.BorderSize = 0 - Me.Button_Multiple.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Multiple.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button_Multiple.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Button_Multiple.Location = New System.Drawing.Point(435, 309) - Me.Button_Multiple.Name = "Button_Multiple" - Me.Button_Multiple.Size = New System.Drawing.Size(132, 67) - Me.Button_Multiple.TabIndex = 4 - Me.Button_Multiple.Text = "Multiple" - Me.Button_Multiple.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button_Multiple.UseVisualStyleBackColor = False - ' - 'Button_Individual - ' - Me.Button_Individual.BackColor = System.Drawing.Color.Transparent - Me.Button_Individual.Enabled = False - Me.Button_Individual.FlatAppearance.BorderSize = 0 - Me.Button_Individual.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Individual.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button_Individual.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Button_Individual.Location = New System.Drawing.Point(435, 179) - Me.Button_Individual.Name = "Button_Individual" - Me.Button_Individual.Size = New System.Drawing.Size(142, 67) - Me.Button_Individual.TabIndex = 3 - Me.Button_Individual.Text = "Individual" - Me.Button_Individual.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button_Individual.UseVisualStyleBackColor = False - ' - 'Button_Order - ' - Me.Button_Order.BackColor = System.Drawing.Color.Transparent - Me.Button_Order.Enabled = False - Me.Button_Order.FlatAppearance.BorderSize = 0 - Me.Button_Order.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Order.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button_Order.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Button_Order.Location = New System.Drawing.Point(107, 248) - Me.Button_Order.Name = "Button_Order" - Me.Button_Order.Size = New System.Drawing.Size(151, 65) - Me.Button_Order.TabIndex = 7 - Me.Button_Order.Text = "Create Order" - Me.Button_Order.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button_Order.UseVisualStyleBackColor = False - ' 'Label_SettingsError ' Me.Label_SettingsError.AutoSize = True Me.Label_SettingsError.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label_SettingsError.ForeColor = System.Drawing.Color.Red - Me.Label_SettingsError.Location = New System.Drawing.Point(175, 56) - Me.Label_SettingsError.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.Label_SettingsError.Location = New System.Drawing.Point(188, 48) Me.Label_SettingsError.Name = "Label_SettingsError" - Me.Label_SettingsError.Size = New System.Drawing.Size(112, 17) + Me.Label_SettingsError.Size = New System.Drawing.Size(133, 20) Me.Label_SettingsError.TabIndex = 8 Me.Label_SettingsError.Text = "Update Settings!" ' - 'Button_Multiple2 + 'PictureBox_Settings ' - Me.Button_Multiple2.BackColor = System.Drawing.Color.Transparent - Me.Button_Multiple2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Fill_Icon - Me.Button_Multiple2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_Multiple2.Enabled = False - Me.Button_Multiple2.FlatAppearance.BorderSize = 0 - Me.Button_Multiple2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Multiple2.Location = New System.Drawing.Point(445, 309) - Me.Button_Multiple2.Name = "Button_Multiple2" - Me.Button_Multiple2.Size = New System.Drawing.Size(49, 67) - Me.Button_Multiple2.TabIndex = 12 - Me.Button_Multiple2.UseVisualStyleBackColor = False + Me.PictureBox_Settings.BackgroundImage = CType(resources.GetObject("PictureBox_Settings.BackgroundImage"), System.Drawing.Image) + Me.PictureBox_Settings.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox_Settings.Location = New System.Drawing.Point(49, 42) + Me.PictureBox_Settings.Name = "PictureBox_Settings" + Me.PictureBox_Settings.Size = New System.Drawing.Size(123, 30) + Me.PictureBox_Settings.TabIndex = 13 + Me.PictureBox_Settings.TabStop = False ' - 'Button_Individual2 + 'PictureBox_CreateOrder ' - Me.Button_Individual2.BackColor = System.Drawing.Color.Transparent - Me.Button_Individual2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Individual_Icon - Me.Button_Individual2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_Individual2.Enabled = False - Me.Button_Individual2.FlatAppearance.BorderSize = 0 - Me.Button_Individual2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Individual2.Location = New System.Drawing.Point(445, 179) - Me.Button_Individual2.Name = "Button_Individual2" - Me.Button_Individual2.Size = New System.Drawing.Size(49, 67) - Me.Button_Individual2.TabIndex = 11 - Me.Button_Individual2.UseVisualStyleBackColor = False + Me.PictureBox_CreateOrder.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_CreateOrder1_01 + Me.PictureBox_CreateOrder.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox_CreateOrder.Enabled = False + Me.PictureBox_CreateOrder.Location = New System.Drawing.Point(134, 311) + Me.PictureBox_CreateOrder.Name = "PictureBox_CreateOrder" + Me.PictureBox_CreateOrder.Size = New System.Drawing.Size(222, 60) + Me.PictureBox_CreateOrder.TabIndex = 14 + Me.PictureBox_CreateOrder.TabStop = False ' - 'Button_Order2 + 'PictureBox_Individual ' - Me.Button_Order2.BackColor = System.Drawing.Color.Transparent - Me.Button_Order2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.copy_line - Me.Button_Order2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_Order2.Enabled = False - Me.Button_Order2.FlatAppearance.BorderSize = 0 - Me.Button_Order2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Order2.Location = New System.Drawing.Point(107, 256) - Me.Button_Order2.Name = "Button_Order2" - Me.Button_Order2.Size = New System.Drawing.Size(55, 49) - Me.Button_Order2.TabIndex = 10 - Me.Button_Order2.UseVisualStyleBackColor = False + Me.PictureBox_Individual.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Individual1_01 + Me.PictureBox_Individual.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox_Individual.Enabled = False + Me.PictureBox_Individual.Location = New System.Drawing.Point(560, 220) + Me.PictureBox_Individual.Name = "PictureBox_Individual" + Me.PictureBox_Individual.Size = New System.Drawing.Size(288, 84) + Me.PictureBox_Individual.TabIndex = 15 + Me.PictureBox_Individual.TabStop = False ' - 'Button_Settings2 + 'PictureBox_Multiple ' - Me.Button_Settings2.BackColor = System.Drawing.Color.Transparent - Me.Button_Settings2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.setting - Me.Button_Settings2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_Settings2.FlatAppearance.BorderSize = 0 - Me.Button_Settings2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Settings2.Location = New System.Drawing.Point(47, 44) - Me.Button_Settings2.Margin = New System.Windows.Forms.Padding(2) - Me.Button_Settings2.Name = "Button_Settings2" - Me.Button_Settings2.Size = New System.Drawing.Size(54, 41) - Me.Button_Settings2.TabIndex = 9 - Me.Button_Settings2.UseVisualStyleBackColor = False + Me.PictureBox_Multiple.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Multiple1_01 + Me.PictureBox_Multiple.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox_Multiple.Enabled = False + Me.PictureBox_Multiple.Location = New System.Drawing.Point(560, 389) + Me.PictureBox_Multiple.Name = "PictureBox_Multiple" + Me.PictureBox_Multiple.Size = New System.Drawing.Size(288, 84) + Me.PictureBox_Multiple.TabIndex = 16 + Me.PictureBox_Multiple.TabStop = False + ' + 'Panel1 + ' + Me.Panel1.BackColor = System.Drawing.Color.Black + Me.Panel1.Location = New System.Drawing.Point(476, 121) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(1, 400) + Me.Panel1.TabIndex = 17 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 18.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.Label1.Location = New System.Drawing.Point(554, 126) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(266, 36) + Me.Label1.TabIndex = 18 + Me.Label1.Text = "Configure Gratings" + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(917, 531) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(121, 17) + Me.Label2.TabIndex = 19 + Me.Label2.Text = "By: Måns Olander" + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(942, 548) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(92, 17) + Me.Label3.TabIndex = 20 + Me.Label3.Text = "Anton Lüning" ' 'Main_Menu ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.ClientSize = New System.Drawing.Size(800, 500) - Me.Controls.Add(Me.Button_Multiple2) - Me.Controls.Add(Me.Button_Individual2) - Me.Controls.Add(Me.Button_Order2) - Me.Controls.Add(Me.Button_Settings2) + Me.ClientSize = New System.Drawing.Size(1067, 615) + Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.Label2) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.Panel1) + Me.Controls.Add(Me.PictureBox_Multiple) + Me.Controls.Add(Me.PictureBox_Individual) + Me.Controls.Add(Me.PictureBox_CreateOrder) + Me.Controls.Add(Me.PictureBox_Settings) Me.Controls.Add(Me.Label_SettingsError) - Me.Controls.Add(Me.Button_Order) - Me.Controls.Add(Me.Button_Settings) - Me.Controls.Add(Me.Button_Multiple) - Me.Controls.Add(Me.Button_Individual) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None - Me.Margin = New System.Windows.Forms.Padding(2) + Me.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.Name = "Main_Menu" Me.Text = "Main_Menu" + CType(Me.PictureBox_Settings, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox_CreateOrder, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox_Individual, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox_Multiple, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - - Friend WithEvents Button_Settings As Button - Friend WithEvents Button_Multiple As Button - Friend WithEvents Button_Individual As Button - Friend WithEvents Button_Order As Button Friend WithEvents Label_SettingsError As Label - Friend WithEvents Button_Settings2 As Button - Friend WithEvents Button_Order2 As Button - Friend WithEvents Button_Individual2 As Button - Friend WithEvents Button_Multiple2 As Button + Friend WithEvents PictureBox_Settings As PictureBox + Friend WithEvents PictureBox_CreateOrder As PictureBox + Friend WithEvents PictureBox_Individual As PictureBox + Friend WithEvents PictureBox_Multiple As PictureBox + Friend WithEvents Panel1 As Panel + Friend WithEvents Label1 As Label + Friend WithEvents Label2 As Label + Friend WithEvents Label3 As Label End Class diff --git a/Wardrobe/GUI/Main_Menu.resx b/Wardrobe/GUI/Main_Menu.resx index 1af7de1..c7ac5e6 100644 --- a/Wardrobe/GUI/Main_Menu.resx +++ b/Wardrobe/GUI/Main_Menu.resx @@ -117,4 +117,133 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + 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 + + \ No newline at end of file diff --git a/Wardrobe/GUI/Main_Menu.vb b/Wardrobe/GUI/Main_Menu.vb index 5e9d675..83ede7e 100644 --- a/Wardrobe/GUI/Main_Menu.vb +++ b/Wardrobe/GUI/Main_Menu.vb @@ -49,7 +49,29 @@ Public Class Main_Menu Settings.folderPaths.Add("object_" & Data.objectNum & "_guide", Settings.folderPaths("object_" & Data.objectNum) & "\Placement Guides") System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_guide")) End Sub - Private Sub Button_Individual_Click(sender As Object, e As EventArgs) Handles Button_Individual.Click + + + ' ---------------------------------- Create Order Button ---------------------------------- + Private Sub Button_Order_Click(sender As Object, e As EventArgs) Handles PictureBox_CreateOrder.Click + PictureBox_Individual.Enabled = True + PictureBox_Multiple.Enabled = True + + Settings.folderPaths.Add("order", Settings.exportFolder & "\Order " & GUI_Export.Get_RandomNumber(10000, 99999)) + System.IO.Directory.CreateDirectory(Settings.folderPaths("order")) + + Data.objectNum = 0 + End Sub + Private Sub PictureBox_CreateOrder_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox_CreateOrder.MouseEnter + PictureBox_CreateOrder.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_CreateOrder2_01 + PictureBox_CreateOrder.Cursor = Cursors.Hand + End Sub + Private Sub PictureBox_CreateOrder_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox_CreateOrder.MouseLeave + PictureBox_CreateOrder.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_CreateOrder1_01 + PictureBox_CreateOrder.Cursor = Cursors.Default + End Sub + + ' ---------------------------------- Create Individual Button ---------------------------------- + Private Sub Button_Individual_Click(sender As Object, e As EventArgs) Handles PictureBox_Individual.Click If AppForm.fillMode = True Then Grating_Configurator.Panel_Data.Controls.RemoveByKey("Label_Max_Load") RemoveHandler Grating_Configurator.Panel_Data.Controls("TextBox_Max_Load").KeyPress, AddressOf Grating_Configurator.TextBox_Max_Load_KeyPress @@ -79,8 +101,17 @@ Public Class Main_Menu Data.objectNum += 1 Generate_Folders() End Sub + Private Sub PictureBox_Individual_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox_Individual.MouseEnter + PictureBox_Individual.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Individual2_01 + PictureBox_Individual.Cursor = Cursors.Hand + End Sub + Private Sub PictureBox_Individual_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox_Individual.MouseLeave + PictureBox_Individual.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Individual1_01 + PictureBox_Individual.Cursor = Cursors.Default + End Sub - Private Sub Button_Multiple_Click(sender As Object, e As EventArgs) Handles Button_Multiple.Click + ' ---------------------------------- Create Multiple Button ---------------------------------- + Private Sub Button_Multiple_Click(sender As Object, e As EventArgs) Handles PictureBox_Multiple.Click AppForm.fillMode = True AppForm.Panel_Start.Controls.Clear() Grating_Configurator.TopLevel = False @@ -96,27 +127,33 @@ Public Class Main_Menu Data.objectNum += 1 Generate_Folders() End Sub + Private Sub PictureBox_Multiple_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox_Multiple.MouseEnter + PictureBox_Multiple.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Multiple2_01 + PictureBox_Multiple.Cursor = Cursors.Hand + End Sub + Private Sub PictureBox_Multiple_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox_Multiple.MouseLeave + PictureBox_Multiple.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Multiple1_01 + PictureBox_Multiple.Cursor = Cursors.Default + End Sub - ' ---------------------------------- Settings ---------------------------------- - ' --- Settings button clicked --- - Private Sub Button_Settings_Click(sender As Object, e As EventArgs) Handles Button_Settings.Click + ' ---------------------------------- Settings Button ---------------------------------- + Private Sub Button_Settings_Click(sender As Object, e As EventArgs) Handles PictureBox_Settings.Click AppForm.Panel_Start.Controls.Clear() Settings.TopLevel = False AppForm.Panel_Start.Controls.Add(Settings) - AppForm.Width = 800 - AppForm.Height = 500 + AppForm.Width = 440 + AppForm.Height = 550 Settings.Init_Settings() Settings.Show() End Sub - - Private Sub Button_Order_Click(sender As Object, e As EventArgs) Handles Button_Order.Click - Button_Individual.Enabled = True - Button_Multiple.Enabled = True - - Settings.folderPaths.Add("order", Settings.exportFolder & "\Order " & GUI_Export.Get_RandomNumber(10000, 99999)) - System.IO.Directory.CreateDirectory(Settings.folderPaths("order")) - - Data.objectNum = 0 + Private Sub PictureBox_Settings_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox_Settings.MouseEnter + PictureBox_Settings.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Settings2 + PictureBox_Settings.Cursor = Cursors.Hand End Sub + Private Sub PictureBox_Settings_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox_Settings.MouseLeave + PictureBox_Settings.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Settings1 + PictureBox_Settings.Cursor = Cursors.Default + End Sub + End Class \ No newline at end of file diff --git a/Wardrobe/GUI/Settings.Designer.vb b/Wardrobe/GUI/Settings.Designer.vb index f641c5c..225f736 100644 --- a/Wardrobe/GUI/Settings.Designer.vb +++ b/Wardrobe/GUI/Settings.Designer.vb @@ -22,8 +22,6 @@ Partial Class Settings 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.Button_KB = New System.Windows.Forms.Button() - Me.Button_FilePath = New System.Windows.Forms.Button() Me.Label_Name = New System.Windows.Forms.Label() Me.TextBox_Name = New System.Windows.Forms.TextBox() Me.Label_UserData = New System.Windows.Forms.Label() @@ -37,49 +35,25 @@ Partial Class Settings Me.Label_KB_Updated = New System.Windows.Forms.Label() Me.Label_File_Path = New System.Windows.Forms.Label() Me.CheckBox_NoSW = New System.Windows.Forms.CheckBox() - Me.Button_Save = New System.Windows.Forms.Button() - Me.Button_KB2 = New System.Windows.Forms.Button() - Me.Button_FilePath2 = New System.Windows.Forms.Button() - Me.Button_save2 = New System.Windows.Forms.Button() + Me.PictureBox_FilePath = New System.Windows.Forms.PictureBox() + Me.PictureBox_UpdateKB = New System.Windows.Forms.PictureBox() + Me.PictureBox_Save = New System.Windows.Forms.PictureBox() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.Panel2 = New System.Windows.Forms.Panel() + Me.Panel3 = New System.Windows.Forms.Panel() + CType(Me.PictureBox_FilePath, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox_UpdateKB, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox_Save, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'Button_KB - ' - Me.Button_KB.BackColor = System.Drawing.Color.Transparent - Me.Button_KB.FlatAppearance.BorderSize = 0 - Me.Button_KB.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_KB.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button_KB.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Button_KB.Location = New System.Drawing.Point(40, 162) - Me.Button_KB.Name = "Button_KB" - Me.Button_KB.Size = New System.Drawing.Size(224, 68) - Me.Button_KB.TabIndex = 0 - Me.Button_KB.Text = "Update Knowledge Base" - Me.Button_KB.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button_KB.UseVisualStyleBackColor = False - ' - 'Button_FilePath - ' - Me.Button_FilePath.BackColor = System.Drawing.Color.Transparent - Me.Button_FilePath.FlatAppearance.BorderSize = 0 - Me.Button_FilePath.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_FilePath.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button_FilePath.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Button_FilePath.Location = New System.Drawing.Point(40, 48) - Me.Button_FilePath.Name = "Button_FilePath" - Me.Button_FilePath.Size = New System.Drawing.Size(174, 68) - Me.Button_FilePath.TabIndex = 1 - Me.Button_FilePath.Text = "Update File Path" - Me.Button_FilePath.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button_FilePath.UseVisualStyleBackColor = False - ' 'Label_Name ' Me.Label_Name.AutoSize = True Me.Label_Name.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label_Name.Location = New System.Drawing.Point(56, 331) + Me.Label_Name.Location = New System.Drawing.Point(75, 396) + Me.Label_Name.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Name.Name = "Label_Name" - Me.Label_Name.Size = New System.Drawing.Size(38, 13) + Me.Label_Name.Size = New System.Drawing.Size(49, 17) Me.Label_Name.TabIndex = 2 Me.Label_Name.Text = "Name:" ' @@ -88,19 +62,21 @@ Partial Class Settings Me.TextBox_Name.BackColor = System.Drawing.SystemColors.ScrollBar Me.TextBox_Name.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.TextBox_Name.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.TextBox_Name.Location = New System.Drawing.Point(143, 328) + Me.TextBox_Name.Location = New System.Drawing.Point(191, 393) + Me.TextBox_Name.Margin = New System.Windows.Forms.Padding(4) Me.TextBox_Name.Name = "TextBox_Name" - Me.TextBox_Name.Size = New System.Drawing.Size(171, 21) + Me.TextBox_Name.Size = New System.Drawing.Size(227, 24) Me.TextBox_Name.TabIndex = 3 ' 'Label_UserData ' Me.Label_UserData.AutoSize = True - Me.Label_UserData.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label_UserData.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label_UserData.Location = New System.Drawing.Point(55, 284) + Me.Label_UserData.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label_UserData.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.Label_UserData.Location = New System.Drawing.Point(73, 345) + Me.Label_UserData.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_UserData.Name = "Label_UserData" - Me.Label_UserData.Size = New System.Drawing.Size(181, 20) + Me.Label_UserData.Size = New System.Drawing.Size(242, 29) Me.Label_UserData.TabIndex = 4 Me.Label_UserData.Text = "Sales Representative" ' @@ -109,18 +85,20 @@ Partial Class Settings Me.TextBox_Phone.BackColor = System.Drawing.SystemColors.ScrollBar Me.TextBox_Phone.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.TextBox_Phone.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.TextBox_Phone.Location = New System.Drawing.Point(143, 369) + Me.TextBox_Phone.Location = New System.Drawing.Point(191, 443) + Me.TextBox_Phone.Margin = New System.Windows.Forms.Padding(4) Me.TextBox_Phone.Name = "TextBox_Phone" - Me.TextBox_Phone.Size = New System.Drawing.Size(171, 21) + Me.TextBox_Phone.Size = New System.Drawing.Size(227, 24) Me.TextBox_Phone.TabIndex = 6 ' 'Label_Tel ' Me.Label_Tel.AutoSize = True Me.Label_Tel.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label_Tel.Location = New System.Drawing.Point(56, 372) + Me.Label_Tel.Location = New System.Drawing.Point(75, 447) + Me.Label_Tel.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Tel.Name = "Label_Tel" - Me.Label_Tel.Size = New System.Drawing.Size(81, 13) + Me.Label_Tel.Size = New System.Drawing.Size(107, 17) Me.Label_Tel.TabIndex = 5 Me.Label_Tel.Text = "Phone Number:" ' @@ -129,18 +107,20 @@ Partial Class Settings Me.TextBox_Mail.BackColor = System.Drawing.SystemColors.ScrollBar Me.TextBox_Mail.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.TextBox_Mail.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.TextBox_Mail.Location = New System.Drawing.Point(143, 411) + Me.TextBox_Mail.Location = New System.Drawing.Point(191, 495) + Me.TextBox_Mail.Margin = New System.Windows.Forms.Padding(4) Me.TextBox_Mail.Name = "TextBox_Mail" - Me.TextBox_Mail.Size = New System.Drawing.Size(171, 21) + Me.TextBox_Mail.Size = New System.Drawing.Size(227, 24) Me.TextBox_Mail.TabIndex = 8 ' 'Label_Mail ' Me.Label_Mail.AutoSize = True Me.Label_Mail.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Label_Mail.Location = New System.Drawing.Point(56, 414) + Me.Label_Mail.Location = New System.Drawing.Point(75, 499) + Me.Label_Mail.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Mail.Name = "Label_Mail" - Me.Label_Mail.Size = New System.Drawing.Size(29, 13) + Me.Label_Mail.Size = New System.Drawing.Size(37, 17) Me.Label_Mail.TabIndex = 7 Me.Label_Mail.Text = "Mail:" ' @@ -148,9 +128,10 @@ Partial Class Settings ' Me.Label_Name_Needed.AutoSize = True Me.Label_Name_Needed.ForeColor = System.Drawing.Color.Red - Me.Label_Name_Needed.Location = New System.Drawing.Point(320, 331) + Me.Label_Name_Needed.Location = New System.Drawing.Point(427, 396) + Me.Label_Name_Needed.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Name_Needed.Name = "Label_Name_Needed" - Me.Label_Name_Needed.Size = New System.Drawing.Size(45, 13) + Me.Label_Name_Needed.Size = New System.Drawing.Size(58, 17) Me.Label_Name_Needed.TabIndex = 10 Me.Label_Name_Needed.Text = "Needed" ' @@ -158,9 +139,10 @@ Partial Class Settings ' Me.Label_Phone_Needed.AutoSize = True Me.Label_Phone_Needed.ForeColor = System.Drawing.Color.Red - Me.Label_Phone_Needed.Location = New System.Drawing.Point(320, 374) + Me.Label_Phone_Needed.Location = New System.Drawing.Point(427, 449) + Me.Label_Phone_Needed.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Phone_Needed.Name = "Label_Phone_Needed" - Me.Label_Phone_Needed.Size = New System.Drawing.Size(45, 13) + Me.Label_Phone_Needed.Size = New System.Drawing.Size(58, 17) Me.Label_Phone_Needed.TabIndex = 11 Me.Label_Phone_Needed.Text = "Needed" ' @@ -168,116 +150,117 @@ Partial Class Settings ' Me.Label_Mail_Needed.AutoSize = True Me.Label_Mail_Needed.ForeColor = System.Drawing.Color.Red - Me.Label_Mail_Needed.Location = New System.Drawing.Point(320, 416) + Me.Label_Mail_Needed.Location = New System.Drawing.Point(427, 501) + Me.Label_Mail_Needed.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Mail_Needed.Name = "Label_Mail_Needed" - Me.Label_Mail_Needed.Size = New System.Drawing.Size(45, 13) + Me.Label_Mail_Needed.Size = New System.Drawing.Size(58, 17) Me.Label_Mail_Needed.TabIndex = 12 Me.Label_Mail_Needed.Text = "Needed" ' 'Label_KB_Updated ' Me.Label_KB_Updated.AutoSize = True - Me.Label_KB_Updated.Location = New System.Drawing.Point(301, 190) + Me.Label_KB_Updated.BackColor = System.Drawing.SystemColors.ScrollBar + Me.Label_KB_Updated.Location = New System.Drawing.Point(68, 273) + Me.Label_KB_Updated.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_KB_Updated.Name = "Label_KB_Updated" - Me.Label_KB_Updated.Size = New System.Drawing.Size(0, 13) + Me.Label_KB_Updated.Size = New System.Drawing.Size(0, 17) Me.Label_KB_Updated.TabIndex = 13 ' 'Label_File_Path ' Me.Label_File_Path.AutoSize = True - Me.Label_File_Path.Location = New System.Drawing.Point(252, 76) + Me.Label_File_Path.BackColor = System.Drawing.SystemColors.ScrollBar + Me.Label_File_Path.Location = New System.Drawing.Point(68, 106) + Me.Label_File_Path.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_File_Path.Name = "Label_File_Path" - Me.Label_File_Path.Size = New System.Drawing.Size(0, 13) + Me.Label_File_Path.Size = New System.Drawing.Size(0, 17) Me.Label_File_Path.TabIndex = 14 ' 'CheckBox_NoSW ' Me.CheckBox_NoSW.AutoSize = True Me.CheckBox_NoSW.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.CheckBox_NoSW.Location = New System.Drawing.Point(49, 139) + Me.CheckBox_NoSW.Location = New System.Drawing.Point(65, 172) + Me.CheckBox_NoSW.Margin = New System.Windows.Forms.Padding(4) Me.CheckBox_NoSW.Name = "CheckBox_NoSW" - Me.CheckBox_NoSW.Size = New System.Drawing.Size(140, 17) + Me.CheckBox_NoSW.Size = New System.Drawing.Size(179, 21) Me.CheckBox_NoSW.TabIndex = 15 Me.CheckBox_NoSW.Text = "Run without SolidWorks" Me.CheckBox_NoSW.UseVisualStyleBackColor = True ' - 'Button_Save + 'PictureBox_FilePath ' - Me.Button_Save.BackColor = System.Drawing.Color.Transparent - Me.Button_Save.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_Save.FlatAppearance.BorderSize = 0 - Me.Button_Save.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Silver - Me.Button_Save.FlatAppearance.MouseOverBackColor = System.Drawing.Color.DarkGray - Me.Button_Save.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Save.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button_Save.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Button_Save.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button_Save.Location = New System.Drawing.Point(654, 377) - Me.Button_Save.Name = "Button_Save" - Me.Button_Save.Size = New System.Drawing.Size(101, 53) - Me.Button_Save.TabIndex = 9 - Me.Button_Save.Text = "Save" - Me.Button_Save.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button_Save.UseVisualStyleBackColor = False + Me.PictureBox_FilePath.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_FilePath1_01 + Me.PictureBox_FilePath.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox_FilePath.Location = New System.Drawing.Point(65, 34) + Me.PictureBox_FilePath.Name = "PictureBox_FilePath" + Me.PictureBox_FilePath.Size = New System.Drawing.Size(283, 62) + Me.PictureBox_FilePath.TabIndex = 16 + Me.PictureBox_FilePath.TabStop = False ' - 'Button_KB2 + 'PictureBox_UpdateKB ' - Me.Button_KB2.BackColor = System.Drawing.Color.Transparent - Me.Button_KB2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.undo_arrow - Me.Button_KB2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_KB2.FlatAppearance.BorderSize = 0 - Me.Button_KB2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_KB2.Location = New System.Drawing.Point(49, 176) - Me.Button_KB2.Name = "Button_KB2" - Me.Button_KB2.Size = New System.Drawing.Size(42, 40) - Me.Button_KB2.TabIndex = 19 - Me.Button_KB2.UseVisualStyleBackColor = False + Me.PictureBox_UpdateKB.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_UpdateKB1_01 + Me.PictureBox_UpdateKB.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox_UpdateKB.Location = New System.Drawing.Point(65, 200) + Me.PictureBox_UpdateKB.Name = "PictureBox_UpdateKB" + Me.PictureBox_UpdateKB.Size = New System.Drawing.Size(402, 62) + Me.PictureBox_UpdateKB.TabIndex = 17 + Me.PictureBox_UpdateKB.TabStop = False ' - 'Button_FilePath2 + 'PictureBox_Save ' - Me.Button_FilePath2.BackColor = System.Drawing.Color.Transparent - Me.Button_FilePath2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.folder_search - Me.Button_FilePath2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_FilePath2.FlatAppearance.BorderSize = 0 - Me.Button_FilePath2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_FilePath2.Location = New System.Drawing.Point(49, 66) - Me.Button_FilePath2.Name = "Button_FilePath2" - Me.Button_FilePath2.Size = New System.Drawing.Size(42, 32) - Me.Button_FilePath2.TabIndex = 18 - Me.Button_FilePath2.UseVisualStyleBackColor = False + Me.PictureBox_Save.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_SaveSettings1_01 + Me.PictureBox_Save.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox_Save.Location = New System.Drawing.Point(245, 573) + Me.PictureBox_Save.Name = "PictureBox_Save" + Me.PictureBox_Save.Size = New System.Drawing.Size(110, 45) + Me.PictureBox_Save.TabIndex = 18 + Me.PictureBox_Save.TabStop = False ' - 'Button_save2 + 'Panel1 ' - Me.Button_save2.BackColor = System.Drawing.Color.Transparent - Me.Button_save2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Save_settings - Me.Button_save2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_save2.FlatAppearance.BorderSize = 0 - Me.Button_save2.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent - Me.Button_save2.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent - Me.Button_save2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_save2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button_save2.Location = New System.Drawing.Point(663, 387) - Me.Button_save2.Name = "Button_save2" - Me.Button_save2.Size = New System.Drawing.Size(43, 36) - Me.Button_save2.TabIndex = 7 - Me.Button_save2.UseVisualStyleBackColor = False + Me.Panel1.BackColor = System.Drawing.Color.Black + Me.Panel1.Location = New System.Drawing.Point(65, 152) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(450, 1) + Me.Panel1.TabIndex = 19 + ' + 'Panel2 + ' + Me.Panel2.BackColor = System.Drawing.Color.Black + Me.Panel2.Location = New System.Drawing.Point(65, 323) + Me.Panel2.Name = "Panel2" + Me.Panel2.Size = New System.Drawing.Size(450, 1) + Me.Panel2.TabIndex = 20 + ' + 'Panel3 + ' + Me.Panel3.BackColor = System.Drawing.Color.Black + Me.Panel3.Location = New System.Drawing.Point(65, 555) + Me.Panel3.Name = "Panel3" + Me.Panel3.Size = New System.Drawing.Size(450, 1) + Me.Panel3.TabIndex = 21 ' 'Settings ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.ClientSize = New System.Drawing.Size(800, 500) - Me.Controls.Add(Me.Button_KB2) - Me.Controls.Add(Me.Button_FilePath2) - Me.Controls.Add(Me.Button_save2) + Me.ClientSize = New System.Drawing.Size(600, 650) + Me.Controls.Add(Me.Panel3) + Me.Controls.Add(Me.Panel2) + Me.Controls.Add(Me.Panel1) + Me.Controls.Add(Me.PictureBox_Save) + Me.Controls.Add(Me.PictureBox_UpdateKB) + Me.Controls.Add(Me.PictureBox_FilePath) Me.Controls.Add(Me.CheckBox_NoSW) Me.Controls.Add(Me.Label_File_Path) Me.Controls.Add(Me.Label_KB_Updated) Me.Controls.Add(Me.Label_Mail_Needed) Me.Controls.Add(Me.Label_Phone_Needed) Me.Controls.Add(Me.Label_Name_Needed) - Me.Controls.Add(Me.Button_Save) Me.Controls.Add(Me.TextBox_Mail) Me.Controls.Add(Me.Label_Mail) Me.Controls.Add(Me.TextBox_Phone) @@ -285,18 +268,17 @@ Partial Class Settings Me.Controls.Add(Me.Label_UserData) Me.Controls.Add(Me.TextBox_Name) Me.Controls.Add(Me.Label_Name) - Me.Controls.Add(Me.Button_FilePath) - Me.Controls.Add(Me.Button_KB) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None + Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "Settings" Me.Text = "Settings" + CType(Me.PictureBox_FilePath, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox_UpdateKB, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox_Save, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - - Friend WithEvents Button_KB As Button - Friend WithEvents Button_FilePath As Button Friend WithEvents Label_Name As Label Friend WithEvents TextBox_Name As TextBox Friend WithEvents Label_UserData As Label @@ -304,14 +286,16 @@ Partial Class Settings Friend WithEvents Label_Tel As Label Friend WithEvents TextBox_Mail As TextBox Friend WithEvents Label_Mail As Label - Friend WithEvents Button_Save As Button Friend WithEvents Label_Name_Needed As Label Friend WithEvents Label_Phone_Needed As Label Friend WithEvents Label_Mail_Needed As Label Friend WithEvents Label_KB_Updated As Label Friend WithEvents Label_File_Path As Label Friend WithEvents CheckBox_NoSW As CheckBox - Friend WithEvents Button_save2 As Button - Friend WithEvents Button_FilePath2 As Button - Friend WithEvents Button_KB2 As Button + Friend WithEvents PictureBox_FilePath As PictureBox + Friend WithEvents PictureBox_UpdateKB As PictureBox + Friend WithEvents PictureBox_Save As PictureBox + Friend WithEvents Panel1 As Panel + Friend WithEvents Panel2 As Panel + Friend WithEvents Panel3 As Panel End Class diff --git a/Wardrobe/GUI/Settings.vb b/Wardrobe/GUI/Settings.vb index bfd8e93..6eebb87 100644 --- a/Wardrobe/GUI/Settings.vb +++ b/Wardrobe/GUI/Settings.vb @@ -20,6 +20,10 @@ Public Class Settings Public Sub Init_Settings() + PictureBox_FilePath.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_FilePath1_01 + PictureBox_UpdateKB.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_UpdateKB1_01 + PictureBox_Save.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_SaveSettings1_01 + Dim appData As String() = System.IO.File.ReadAllLines(AppForm.appDataPath & "\SavedData.txt") appDataList.Clear() @@ -56,26 +60,18 @@ Public Class Settings Private Sub CheckBox_NoSW_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox_NoSW.CheckedChanged If CheckBox_NoSW.Checked = True Then withoutSW = True - Button_KB.Enabled = False + PictureBox_UpdateKB.Enabled = False Label_KB_Updated.Text = "" Else withoutSW = False - Button_KB.Enabled = True + PictureBox_UpdateKB.Enabled = True Label_KB_Updated.Text = "Last Updated: " & KBUpdateTime Label_KB_Updated.ForeColor = Color.Black End If End Sub - Private Sub Button_KB_Click(sender As Object, e As EventArgs) Handles Button_KB.Click - adminClass.updateDatabase() 'Update KB - Dim timeNow As Date = Date.Now - KBUpdateTime = timeNow.ToString() - Label_KB_Updated.Text = "Last Updated: " & KBUpdateTime - - Update_AppData(KBUpdateTimeHead, KBUpdateTime) - End Sub - - Private Sub Button_FilePath_Click(sender As Object, e As EventArgs) Handles Button_FilePath.Click + ' ---------------------------------- Update File Path Button ---------------------------------- + Private Sub Button_FilePath_Click(sender As Object, e As EventArgs) Handles PictureBox_FilePath.Click Dim ofd As FolderBrowserDialog = New FolderBrowserDialog If ofd.ShowDialog() <> DialogResult.Cancel Then Settings.exportFolder = ofd.SelectedPath @@ -84,8 +80,37 @@ Public Class Settings Label_File_Path.Text = exportFolder End If End Sub + Private Sub PictureBox_FilePath_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox_FilePath.MouseEnter + PictureBox_FilePath.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_FilePath2_01 + PictureBox_FilePath.Cursor = Cursors.Hand + End Sub + Private Sub PictureBox_FilePath_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox_FilePath.MouseLeave + PictureBox_FilePath.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_FilePath1_01 + PictureBox_FilePath.Cursor = Cursors.Default + End Sub - Private Sub Button_Save_Click(sender As Object, e As EventArgs) Handles Button_Save.Click + ' ---------------------------------- Update KB Button ---------------------------------- + Private Sub Button_KB_Click(sender As Object, e As EventArgs) Handles PictureBox_UpdateKB.Click + adminClass.updateDatabase() 'Update KB + + Dim timeNow As Date = Date.Now + KBUpdateTime = timeNow.ToString() + Label_KB_Updated.Text = "Last Updated: " & KBUpdateTime + + Update_AppData(KBUpdateTimeHead, KBUpdateTime) + End Sub + Private Sub PictureBox_UpdateKB_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox_UpdateKB.MouseEnter + PictureBox_UpdateKB.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_UpdateKB2_01 + PictureBox_UpdateKB.Cursor = Cursors.Hand + End Sub + Private Sub PictureBox_UpdateKB_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox_UpdateKB.MouseLeave + PictureBox_UpdateKB.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_UpdateKB1_01 + PictureBox_UpdateKB.Cursor = Cursors.Default + End Sub + + + ' ---------------------------------- Save Button ---------------------------------- + Private Sub Button_Save_Click(sender As Object, e As EventArgs) Handles PictureBox_Save.Click System.IO.File.WriteAllLines(AppForm.appDataPath & "\SavedData.txt", appDataList.ToArray()) Check_Settings() @@ -93,26 +118,27 @@ Public Class Settings AppForm.Panel_Start.Controls.Clear() Main_Menu.TopLevel = False AppForm.Panel_Start.Controls.Add(Main_Menu) + AppForm.Width = 800 + AppForm.Height = 500 + Main_Menu.Show() End Sub - - Private Sub Button_save2_Click(sender As Object, e As EventArgs) Handles Button_save2.Click - System.IO.File.WriteAllLines(AppForm.appDataPath & "\SavedData.txt", appDataList.ToArray()) - - Check_Settings() - - AppForm.Panel_Start.Controls.Clear() - Main_Menu.TopLevel = False - AppForm.Panel_Start.Controls.Add(Main_Menu) - Main_Menu.Show() + Private Sub PictureBox_Save_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox_Save.MouseEnter + PictureBox_Save.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_SaveSettings2_01 + PictureBox_Save.Cursor = Cursors.Hand End Sub + Private Sub PictureBox_Save_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox_Save.MouseLeave + PictureBox_Save.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_SaveSettings1_01 + PictureBox_Save.Cursor = Cursors.Default + End Sub + Public Sub Check_Settings() If SRName <> "" AndAlso SRPhone <> "" AndAlso SRMail <> "" AndAlso exportFolder <> "" Then - Main_Menu.Button_Order.Enabled = True + Main_Menu.PictureBox_CreateOrder.Enabled = True Main_Menu.Label_SettingsError.Visible = False Else - Main_Menu.Button_Order.Enabled = False + Main_Menu.PictureBox_CreateOrder.Enabled = False Main_Menu.Label_SettingsError.Visible = True End If diff --git a/Wardrobe/Gratings Data/User_Input.vb b/Wardrobe/Gratings Data/User_Input.vb index 082cb25..ec17e9a 100644 --- a/Wardrobe/Gratings Data/User_Input.vb +++ b/Wardrobe/Gratings Data/User_Input.vb @@ -434,9 +434,8 @@ Private Shared Sub Enable_Buttons() If AppForm.fillMode Then If Grating_Configurator.TextBox_Width.Text <> "" AndAlso Grating_Configurator.TextBox_Length.Text <> "" Then - Grating_Configurator.Button_ExportMenu.Enabled = True - Grating_Configurator.Button_Calculate.Enabled = True - Grating_Configurator.Button_Calculate2.Enabled = True + Grating_Configurator.PictureBox_ExportMenu.Enabled = True + Grating_Configurator.PictureBox_CalculateGrid.Enabled = True Grating_Configurator.Button_Angle_Corner.Enabled = True Grating_Configurator.Button_Angle_Side.Enabled = True @@ -449,7 +448,7 @@ End If Else If Grating_Configurator.ComboBox_Width.Text <> "" AndAlso Grating_Configurator.TextBox_Length.Text <> "" Then - Grating_Configurator.Button_ExportMenu.Enabled = True + Grating_Configurator.PictureBox_ExportMenu.Enabled = True Grating_Configurator.Button_Angle_Corner.Enabled = True Grating_Configurator.Button_Angle_Side.Enabled = True diff --git a/Wardrobe/My Project/Resources.Designer.vb b/Wardrobe/My Project/Resources.Designer.vb index a7764be..ecee95c 100644 --- a/Wardrobe/My Project/Resources.Designer.vb +++ b/Wardrobe/My Project/Resources.Designer.vb @@ -70,36 +70,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Looks up a localized resource of type System.Drawing.Bitmap. - ''' - Friend ReadOnly Property AngleSide() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("AngleSide", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - ''' - ''' Looks up a localized resource of type System.Drawing.Bitmap. - ''' - Friend ReadOnly Property copy_line() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("copy-line", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - ''' - ''' Looks up a localized resource of type System.Drawing.Bitmap. - ''' - Friend ReadOnly Property Export() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Export", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' @@ -113,9 +83,199 @@ Namespace My.Resources ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' - Friend ReadOnly Property folder_search() As System.Drawing.Bitmap + Friend ReadOnly Property Icon_CreateOrder1_01() As System.Drawing.Bitmap Get - Dim obj As Object = ResourceManager.GetObject("folder-search", resourceCulture) + Dim obj As Object = ResourceManager.GetObject("Icon_CreateOrder1_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_CreateOrder2_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_CreateOrder2_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_Export1_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_Export1_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_Export2_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_Export2_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_ExportMenu1_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_ExportMenu1_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_ExportMenu2_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_ExportMenu2_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_FilePath1_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_FilePath1_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_FilePath2_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_FilePath2_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_Individual1_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_Individual1_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_Individual2_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_Individual2_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_Multiple1_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_Multiple1_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_Multiple2_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_Multiple2_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_SaveSettings1_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_SaveSettings1_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_SaveSettings2_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_SaveSettings2_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_Settings1() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_Settings1", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_Settings2() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_Settings2", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_UpdateGrid1_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_UpdateGrid1_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_UpdateGrid2_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_UpdateGrid2_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_UpdateKB1_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_UpdateKB1_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_UpdateKB2_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_UpdateKB2_01", resourceCulture) Return CType(obj,System.Drawing.Bitmap) End Get End Property @@ -150,26 +310,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Looks up a localized resource of type System.Drawing.Bitmap. - ''' - Friend ReadOnly Property Save_settings() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Save-settings", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - ''' - ''' Looks up a localized resource of type System.Drawing.Bitmap. - ''' - Friend ReadOnly Property setting() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("setting", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' @@ -199,25 +339,5 @@ Namespace My.Resources Return CType(obj,System.Drawing.Bitmap) End Get End Property - - ''' - ''' Looks up a localized resource of type System.Drawing.Bitmap. - ''' - Friend ReadOnly Property undo_arrow() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("undo-arrow", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - ''' - ''' Looks up a localized resource of type System.Drawing.Bitmap. - ''' - Friend ReadOnly Property undo_arrow1() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("undo-arrow1", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property End Module End Namespace diff --git a/Wardrobe/My Project/Resources.resx b/Wardrobe/My Project/Resources.resx index c8afd28..f0c8750 100644 --- a/Wardrobe/My Project/Resources.resx +++ b/Wardrobe/My Project/Resources.resx @@ -118,14 +118,14 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\Individual_Icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\SquareSide.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\folder-search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\SquareMiddle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\setting.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\RadiusMiddle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Radius.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -133,37 +133,73 @@ ..\Resources\AngleCorner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Save-settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\SquareCorner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\AngleSide.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Fill_Icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\undo-arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Icon_CreateOrder1-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Export.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Icon_CreateOrder2-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\SquareMiddle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Icon_Export1-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\copy-line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Icon_Export2-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\undo-arrow1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Icon_ExportMenu1-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\SquareSide.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Icon_ExportMenu2-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\RadiusMiddle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Icon_FilePath1-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon_FilePath2-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon_Individual1-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon_Individual2-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon_Multiple1-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon_Multiple2-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon_SaveSettings1-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon_SaveSettings2-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon_Settings1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon_Settings2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon_UpdateGrid1-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon_UpdateGrid2-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon_UpdateKB1-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon_UpdateKB2-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Individual_Icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Wardrobe/Quote_Export/GUI_Export.vb b/Wardrobe/Quote_Export/GUI_Export.vb index c2da436..7c3f779 100644 --- a/Wardrobe/Quote_Export/GUI_Export.vb +++ b/Wardrobe/Quote_Export/GUI_Export.vb @@ -25,7 +25,7 @@ Public Class GUI_Export Dim gratingImg As New Bitmap(Grating_Configurator.Panel_Grating.Width - 1, Grating_Configurator.Panel_Grating.Height - 1) Dim graphicImg As Graphics = Graphics.FromImage(gratingImg) - Draw_Grating.Draw_Grating(graphicImg, 12) + Draw_Grating.Draw_ForExport(graphicImg, 12) gratingImg.Save(Settings.folderPaths("object_" & Data.objectNum & "_quote") & "\GUI.png", Imaging.ImageFormat.Png) diff --git a/Wardrobe/Recess Functions/Corner_Angle.vb b/Wardrobe/Recess Functions/Corner_Angle.vb index a38e88e..720f465 100644 --- a/Wardrobe/Recess Functions/Corner_Angle.vb +++ b/Wardrobe/Recess Functions/Corner_Angle.vb @@ -50,7 +50,7 @@ End Try If value1 > 0 AndAlso value2 > 0 Then - If Grating_Configurator.Panel_Grating.Controls.Count = 2 Then + If Grating_Configurator.Panel_Grating.Controls.Count = 6 Then For i = 0 To Data.gratingPoints.Rows.Count - 1 If Data.gratingPoints.Rows(i)("RECESS OK") Then Dim pointButton As New Button With { @@ -78,7 +78,7 @@ Next End If - ElseIf Grating_Configurator.Panel_Grating.Controls.Count > 2 Then + ElseIf Grating_Configurator.Panel_Grating.Controls.Count > 6 Then For i = 0 To Data.gratingPoints.Rows.Count - 1 If Data.gratingPoints.Rows(i)("RECESS OK") Then Dim buttonName As String = Data.gratingPoints.Rows(i)("NAME") & "_Button" diff --git a/Wardrobe/Recess Functions/Corner_Rectangle.vb b/Wardrobe/Recess Functions/Corner_Rectangle.vb index 23a03d4..c841282 100644 --- a/Wardrobe/Recess Functions/Corner_Rectangle.vb +++ b/Wardrobe/Recess Functions/Corner_Rectangle.vb @@ -50,7 +50,7 @@ End Try If value1 > 0 AndAlso value2 > 0 Then - If Grating_Configurator.Panel_Grating.Controls.Count = 2 Then + If Grating_Configurator.Panel_Grating.Controls.Count = 6 Then For i = 0 To Data.gratingPoints.Rows.Count - 1 If Data.gratingPoints.Rows(i)("RECESS OK") Then Dim pointButton As New Button With { @@ -78,7 +78,7 @@ Next End If - ElseIf Grating_Configurator.Panel_Grating.Controls.Count > 2 Then + ElseIf Grating_Configurator.Panel_Grating.Controls.Count > 6 Then For i = 0 To Data.gratingPoints.Rows.Count - 1 If Data.gratingPoints.Rows(i)("RECESS OK") Then Dim buttonName As String = Data.gratingPoints.Rows(i)("NAME") & "_Button" diff --git a/Wardrobe/Recess Functions/Middle_Rectangle.vb b/Wardrobe/Recess Functions/Middle_Rectangle.vb index 1064fd9..d36845b 100644 --- a/Wardrobe/Recess Functions/Middle_Rectangle.vb +++ b/Wardrobe/Recess Functions/Middle_Rectangle.vb @@ -61,7 +61,7 @@ End Try If middleSquareValues(0) > 0 AndAlso middleSquareValues(1) > 0 AndAlso middleSquareValues(2) > 0 AndAlso middleSquareValues(3) > 0 Then - If Grating_Configurator.Panel_Grating.Controls.Count = 2 Then + If Grating_Configurator.Panel_Grating.Controls.Count = 6 Then Dim middleButton As New Button With { .Width = middleSquareValues(0) / Data.scaleDiff, .Height = middleSquareValues(1) / Data.scaleDiff, @@ -88,7 +88,7 @@ Grating_Configurator.Panel_Grating.Controls("Button_Middle").Top = Data.grossAreaPoints.Rows(3)("GUI Y") - (middleSquareValues(3) + middleSquareValues(1)) / Data.scaleDiff End If - ElseIf Grating_Configurator.Panel_Grating.Controls.Count > 2 Then + ElseIf Grating_Configurator.Panel_Grating.Controls.Count > 6 Then RemoveHandler Grating_Configurator.Panel_Grating.Controls("Button_Middle").Click, AddressOf MiddleButton_Click Grating_Configurator.Panel_Grating.Controls.RemoveByKey("Button_Middle") End If diff --git a/Wardrobe/Recess Functions/Side_Rectangle.vb b/Wardrobe/Recess Functions/Side_Rectangle.vb index 2dd62ce..2ac42f6 100644 --- a/Wardrobe/Recess Functions/Side_Rectangle.vb +++ b/Wardrobe/Recess Functions/Side_Rectangle.vb @@ -56,7 +56,7 @@ End Try If sideSquareValues(0) > 0 AndAlso sideSquareValues(1) > 0 AndAlso sideSquareValues(2) > 0 Then - If Grating_Configurator.Panel_Grating.Controls.Count = 2 Then + If Grating_Configurator.Panel_Grating.Controls.Count = 6 Then For i = 1 To 4 Dim sidePoints As New List(Of String) If i = 1 Then @@ -82,7 +82,7 @@ Next Else ' Update button size and position - For i = 2 To Grating_Configurator.Panel_Grating.Controls.Count - 1 + For i = 6 To Grating_Configurator.Panel_Grating.Controls.Count - 1 Dim buttonSide As Integer = CInt(Grating_Configurator.Panel_Grating.Controls(i).Name.Split("_")(1)) If buttonSide = 1 Then Grating_Configurator.Panel_Grating.Controls(i).Width = sideSquareValues(0) / (Data.scaleDiff) @@ -102,10 +102,10 @@ End If - ElseIf Grating_Configurator.Panel_Grating.Controls.Count > 2 Then - For i = 2 To Grating_Configurator.Panel_Grating.Controls.Count - 1 - RemoveHandler Grating_Configurator.Panel_Grating.Controls(2).Click, AddressOf SideButton_Click - Grating_Configurator.Panel_Grating.Controls.RemoveAt(2) + ElseIf Grating_Configurator.Panel_Grating.Controls.Count > 6 Then + For i = 6 To Grating_Configurator.Panel_Grating.Controls.Count - 1 + RemoveHandler Grating_Configurator.Panel_Grating.Controls(6).Click, AddressOf SideButton_Click + Grating_Configurator.Panel_Grating.Controls.RemoveAt(6) Next End If End Sub @@ -138,9 +138,9 @@ Dim sidePressed As Integer = CInt(sender.Name.Split("_")(1)) ' Remove point buttons - For i = 2 To Grating_Configurator.Panel_Grating.Controls.Count - 1 - RemoveHandler Grating_Configurator.Panel_Grating.Controls(2).Click, AddressOf SideButton_Click - Grating_Configurator.Panel_Grating.Controls.RemoveAt(2) + For i = 6 To Grating_Configurator.Panel_Grating.Controls.Count - 1 + RemoveHandler Grating_Configurator.Panel_Grating.Controls(6).Click, AddressOf SideButton_Click + Grating_Configurator.Panel_Grating.Controls.RemoveAt(6) Next Dim sidePoints As New List(Of Integer) diff --git a/Wardrobe/Resources/Icon_CreateOrder1-01.png b/Wardrobe/Resources/Icon_CreateOrder1-01.png new file mode 100644 index 0000000..4001030 Binary files /dev/null and b/Wardrobe/Resources/Icon_CreateOrder1-01.png differ diff --git a/Wardrobe/Resources/Icon_CreateOrder2-01.png b/Wardrobe/Resources/Icon_CreateOrder2-01.png new file mode 100644 index 0000000..c821b67 Binary files /dev/null and b/Wardrobe/Resources/Icon_CreateOrder2-01.png differ diff --git a/Wardrobe/Resources/Icon_Export1-01.png b/Wardrobe/Resources/Icon_Export1-01.png new file mode 100644 index 0000000..02aca7d Binary files /dev/null and b/Wardrobe/Resources/Icon_Export1-01.png differ diff --git a/Wardrobe/Resources/Icon_Export2-01.png b/Wardrobe/Resources/Icon_Export2-01.png new file mode 100644 index 0000000..c3a0bf1 Binary files /dev/null and b/Wardrobe/Resources/Icon_Export2-01.png differ diff --git a/Wardrobe/Resources/Icon_ExportMenu1-01.png b/Wardrobe/Resources/Icon_ExportMenu1-01.png new file mode 100644 index 0000000..c6e695b Binary files /dev/null and b/Wardrobe/Resources/Icon_ExportMenu1-01.png differ diff --git a/Wardrobe/Resources/Icon_ExportMenu2-01.png b/Wardrobe/Resources/Icon_ExportMenu2-01.png new file mode 100644 index 0000000..20ff88b Binary files /dev/null and b/Wardrobe/Resources/Icon_ExportMenu2-01.png differ diff --git a/Wardrobe/Resources/Icon_FilePath1-01.png b/Wardrobe/Resources/Icon_FilePath1-01.png new file mode 100644 index 0000000..3204ffa Binary files /dev/null and b/Wardrobe/Resources/Icon_FilePath1-01.png differ diff --git a/Wardrobe/Resources/Icon_FilePath2-01.png b/Wardrobe/Resources/Icon_FilePath2-01.png new file mode 100644 index 0000000..6b71cfa Binary files /dev/null and b/Wardrobe/Resources/Icon_FilePath2-01.png differ diff --git a/Wardrobe/Resources/Icon_Individual1-01.png b/Wardrobe/Resources/Icon_Individual1-01.png new file mode 100644 index 0000000..dc0a17b Binary files /dev/null and b/Wardrobe/Resources/Icon_Individual1-01.png differ diff --git a/Wardrobe/Resources/Icon_Individual2-01.png b/Wardrobe/Resources/Icon_Individual2-01.png new file mode 100644 index 0000000..f9bd821 Binary files /dev/null and b/Wardrobe/Resources/Icon_Individual2-01.png differ diff --git a/Wardrobe/Resources/Icon_Multiple1-01.png b/Wardrobe/Resources/Icon_Multiple1-01.png new file mode 100644 index 0000000..44d5247 Binary files /dev/null and b/Wardrobe/Resources/Icon_Multiple1-01.png differ diff --git a/Wardrobe/Resources/Icon_Multiple2-01.png b/Wardrobe/Resources/Icon_Multiple2-01.png new file mode 100644 index 0000000..33783be Binary files /dev/null and b/Wardrobe/Resources/Icon_Multiple2-01.png differ diff --git a/Wardrobe/Resources/Icon_SaveSettings1-01.png b/Wardrobe/Resources/Icon_SaveSettings1-01.png new file mode 100644 index 0000000..98b81d9 Binary files /dev/null and b/Wardrobe/Resources/Icon_SaveSettings1-01.png differ diff --git a/Wardrobe/Resources/Icon_SaveSettings2-01.png b/Wardrobe/Resources/Icon_SaveSettings2-01.png new file mode 100644 index 0000000..0ced570 Binary files /dev/null and b/Wardrobe/Resources/Icon_SaveSettings2-01.png differ diff --git a/Wardrobe/Resources/Icon_Settings1.png b/Wardrobe/Resources/Icon_Settings1.png new file mode 100644 index 0000000..bf148c2 Binary files /dev/null and b/Wardrobe/Resources/Icon_Settings1.png differ diff --git a/Wardrobe/Resources/Icon_Settings2.png b/Wardrobe/Resources/Icon_Settings2.png new file mode 100644 index 0000000..719fbc3 Binary files /dev/null and b/Wardrobe/Resources/Icon_Settings2.png differ diff --git a/Wardrobe/Resources/Icon_UpdateGrid1-01.png b/Wardrobe/Resources/Icon_UpdateGrid1-01.png new file mode 100644 index 0000000..a0ab50a Binary files /dev/null and b/Wardrobe/Resources/Icon_UpdateGrid1-01.png differ diff --git a/Wardrobe/Resources/Icon_UpdateGrid2-01.png b/Wardrobe/Resources/Icon_UpdateGrid2-01.png new file mode 100644 index 0000000..c565a13 Binary files /dev/null and b/Wardrobe/Resources/Icon_UpdateGrid2-01.png differ diff --git a/Wardrobe/Resources/Icon_UpdateKB1-01.png b/Wardrobe/Resources/Icon_UpdateKB1-01.png new file mode 100644 index 0000000..0ad642e Binary files /dev/null and b/Wardrobe/Resources/Icon_UpdateKB1-01.png differ diff --git a/Wardrobe/Resources/Icon_UpdateKB2-01.png b/Wardrobe/Resources/Icon_UpdateKB2-01.png new file mode 100644 index 0000000..7d7b614 Binary files /dev/null and b/Wardrobe/Resources/Icon_UpdateKB2-01.png differ diff --git a/Wardrobe/Resources/Save-settings1.png b/Wardrobe/Resources/Save-settings1.png new file mode 100644 index 0000000..a9d1fcb Binary files /dev/null and b/Wardrobe/Resources/Save-settings1.png differ diff --git a/Wardrobe/Resources/undo-arrow11.png b/Wardrobe/Resources/undo-arrow11.png new file mode 100644 index 0000000..d4df03e Binary files /dev/null and b/Wardrobe/Resources/undo-arrow11.png differ diff --git a/Wardrobe/Resources/undo-arrow2.png b/Wardrobe/Resources/undo-arrow2.png new file mode 100644 index 0000000..d4df03e Binary files /dev/null and b/Wardrobe/Resources/undo-arrow2.png differ diff --git a/Wardrobe/Wardrobe.vbproj b/Wardrobe/Wardrobe.vbproj index 320cf68..1178047 100644 --- a/Wardrobe/Wardrobe.vbproj +++ b/Wardrobe/Wardrobe.vbproj @@ -159,9 +159,9 @@ VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb My.Resources Designer + Resources.Designer.vb @@ -256,12 +256,6 @@ - - - - - - @@ -271,5 +265,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file