diff --git a/Wardrobe/GUI/AppForm.vb b/Wardrobe/GUI/AppForm.vb index 3fa3234..1902ee3 100644 --- a/Wardrobe/GUI/AppForm.vb +++ b/Wardrobe/GUI/AppForm.vb @@ -29,6 +29,11 @@ Public Class AppForm End If Next + Main_Menu.PictureBox_Settings.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Settings1 + Main_Menu.PictureBox_CreateOrder.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_CreateOrder3_01 + Main_Menu.PictureBox_Individual.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Individual3_01 + Main_Menu.PictureBox_Multiple.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Multiple3_01 + Settings.Check_Settings() @@ -58,10 +63,6 @@ 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() diff --git a/Wardrobe/GUI/Grating_Configurator.vb b/Wardrobe/GUI/Grating_Configurator.vb index 112967c..16a25eb 100644 --- a/Wardrobe/GUI/Grating_Configurator.vb +++ b/Wardrobe/GUI/Grating_Configurator.vb @@ -10,8 +10,8 @@ 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 + PictureBox_CalculateGrid.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_UpdateGrid3_01 + PictureBox_ExportMenu.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_ExportMenu3_01 Me.Width = AppForm.Width Me.Height = AppForm.Height diff --git a/Wardrobe/GUI/Main_Menu.vb b/Wardrobe/GUI/Main_Menu.vb index 83ede7e..45de0c8 100644 --- a/Wardrobe/GUI/Main_Menu.vb +++ b/Wardrobe/GUI/Main_Menu.vb @@ -54,7 +54,9 @@ Public Class Main_Menu ' ---------------------------------- Create Order Button ---------------------------------- Private Sub Button_Order_Click(sender As Object, e As EventArgs) Handles PictureBox_CreateOrder.Click PictureBox_Individual.Enabled = True + PictureBox_Individual.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Individual1_01 PictureBox_Multiple.Enabled = True + PictureBox_Multiple.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Multiple1_01 Settings.folderPaths.Add("order", Settings.exportFolder & "\Order " & GUI_Export.Get_RandomNumber(10000, 99999)) System.IO.Directory.CreateDirectory(Settings.folderPaths("order")) diff --git a/Wardrobe/GUI/Settings.Designer.vb b/Wardrobe/GUI/Settings.Designer.vb index 225f736..56afee1 100644 --- a/Wardrobe/GUI/Settings.Designer.vb +++ b/Wardrobe/GUI/Settings.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class Settings 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,7 +20,7 @@ Partial Class Settings '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.Label_Name = New System.Windows.Forms.Label() Me.TextBox_Name = New System.Windows.Forms.TextBox() @@ -35,15 +35,15 @@ 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.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() + Me.PictureBox_Save = New System.Windows.Forms.PictureBox() + Me.PictureBox_UpdateKB = New System.Windows.Forms.PictureBox() + Me.PictureBox_FilePath = New System.Windows.Forms.PictureBox() CType(Me.PictureBox_Save, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox_UpdateKB, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox_FilePath, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'Label_Name @@ -189,36 +189,6 @@ Partial Class Settings Me.CheckBox_NoSW.Text = "Run without SolidWorks" Me.CheckBox_NoSW.UseVisualStyleBackColor = True ' - 'PictureBox_FilePath - ' - 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 - ' - 'PictureBox_UpdateKB - ' - 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 - ' - 'PictureBox_Save - ' - 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 - ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.Black @@ -243,6 +213,36 @@ Partial Class Settings Me.Panel3.Size = New System.Drawing.Size(450, 1) Me.Panel3.TabIndex = 21 ' + 'PictureBox_Save + ' + 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 + ' + 'PictureBox_UpdateKB + ' + 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 + ' + 'PictureBox_FilePath + ' + 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 + ' 'Settings ' Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) @@ -272,9 +272,9 @@ Partial Class Settings 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() + CType(Me.PictureBox_UpdateKB, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox_FilePath, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/Wardrobe/GUI/Settings.vb b/Wardrobe/GUI/Settings.vb index 6eebb87..b8655a0 100644 --- a/Wardrobe/GUI/Settings.vb +++ b/Wardrobe/GUI/Settings.vb @@ -61,10 +61,12 @@ Public Class Settings If CheckBox_NoSW.Checked = True Then withoutSW = True PictureBox_UpdateKB.Enabled = False + PictureBox_UpdateKB.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_UpdateKB3_01 Label_KB_Updated.Text = "" Else withoutSW = False PictureBox_UpdateKB.Enabled = True + PictureBox_UpdateKB.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_UpdateKB1_01 Label_KB_Updated.Text = "Last Updated: " & KBUpdateTime Label_KB_Updated.ForeColor = Color.Black End If @@ -136,9 +138,13 @@ Public Class Settings Public Sub Check_Settings() If SRName <> "" AndAlso SRPhone <> "" AndAlso SRMail <> "" AndAlso exportFolder <> "" Then Main_Menu.PictureBox_CreateOrder.Enabled = True + Main_Menu.PictureBox_CreateOrder.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_CreateOrder1_01 + Main_Menu.Label_SettingsError.Visible = False Else Main_Menu.PictureBox_CreateOrder.Enabled = False + Main_Menu.PictureBox_CreateOrder.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_CreateOrder3_01 + 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 ec17e9a..be81684 100644 --- a/Wardrobe/Gratings Data/User_Input.vb +++ b/Wardrobe/Gratings Data/User_Input.vb @@ -435,7 +435,10 @@ If AppForm.fillMode Then If Grating_Configurator.TextBox_Width.Text <> "" AndAlso Grating_Configurator.TextBox_Length.Text <> "" Then Grating_Configurator.PictureBox_ExportMenu.Enabled = True + Grating_Configurator.PictureBox_ExportMenu.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_ExportMenu1_01 + Grating_Configurator.PictureBox_CalculateGrid.Enabled = True + Grating_Configurator.PictureBox_CalculateGrid.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_UpdateGrid1_01 Grating_Configurator.Button_Angle_Corner.Enabled = True Grating_Configurator.Button_Angle_Side.Enabled = True @@ -449,6 +452,7 @@ Else If Grating_Configurator.ComboBox_Width.Text <> "" AndAlso Grating_Configurator.TextBox_Length.Text <> "" Then Grating_Configurator.PictureBox_ExportMenu.Enabled = True + Grating_Configurator.PictureBox_ExportMenu.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_ExportMenu1_01 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 ecee95c..59c2a47 100644 --- a/Wardrobe/My Project/Resources.Designer.vb +++ b/Wardrobe/My Project/Resources.Designer.vb @@ -100,6 +100,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_CreateOrder3_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_CreateOrder3_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' @@ -140,6 +150,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_ExportMenu3_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_ExportMenu3_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' @@ -180,6 +200,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_Individual3_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_Individual3_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' @@ -200,6 +230,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_Multiple3_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_Multiple3_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' @@ -260,6 +300,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_UpdateGrid3_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_UpdateGrid3_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' @@ -280,6 +330,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Icon_UpdateKB3_01() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Icon_UpdateKB3_01", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' diff --git a/Wardrobe/My Project/Resources.resx b/Wardrobe/My Project/Resources.resx index f0c8750..9647a90 100644 --- a/Wardrobe/My Project/Resources.resx +++ b/Wardrobe/My Project/Resources.resx @@ -202,4 +202,22 @@ ..\Resources\Individual_Icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Icon_CreateOrder3-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon_ExportMenu3-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon_Individual3-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon_Multiple3-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon_UpdateGrid3-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon_UpdateKB3-01.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/Resources/Icon_CreateOrder3-01.png b/Wardrobe/Resources/Icon_CreateOrder3-01.png new file mode 100644 index 0000000..046758d Binary files /dev/null and b/Wardrobe/Resources/Icon_CreateOrder3-01.png differ diff --git a/Wardrobe/Resources/Icon_ExportMenu3-01.png b/Wardrobe/Resources/Icon_ExportMenu3-01.png new file mode 100644 index 0000000..e8b5749 Binary files /dev/null and b/Wardrobe/Resources/Icon_ExportMenu3-01.png differ diff --git a/Wardrobe/Resources/Icon_Individual3-01.png b/Wardrobe/Resources/Icon_Individual3-01.png new file mode 100644 index 0000000..d9dd306 Binary files /dev/null and b/Wardrobe/Resources/Icon_Individual3-01.png differ diff --git a/Wardrobe/Resources/Icon_Multiple3-01.png b/Wardrobe/Resources/Icon_Multiple3-01.png new file mode 100644 index 0000000..a996136 Binary files /dev/null and b/Wardrobe/Resources/Icon_Multiple3-01.png differ diff --git a/Wardrobe/Resources/Icon_UpdateGrid3-01.png b/Wardrobe/Resources/Icon_UpdateGrid3-01.png new file mode 100644 index 0000000..d2b1168 Binary files /dev/null and b/Wardrobe/Resources/Icon_UpdateGrid3-01.png differ diff --git a/Wardrobe/Resources/Icon_UpdateKB3-01.png b/Wardrobe/Resources/Icon_UpdateKB3-01.png new file mode 100644 index 0000000..399ba4e Binary files /dev/null and b/Wardrobe/Resources/Icon_UpdateKB3-01.png differ diff --git a/Wardrobe/Wardrobe.vbproj b/Wardrobe/Wardrobe.vbproj index 1178047..553b3c2 100644 --- a/Wardrobe/Wardrobe.vbproj +++ b/Wardrobe/Wardrobe.vbproj @@ -340,5 +340,23 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file