diff --git a/02_Windows_App/Perun_v1/02_Forms/form_Main.Designer.cs b/02_Windows_App/Perun_v1/02_Forms/form_Main.Designer.cs index 5c3d5ad..b7cfce9 100644 --- a/02_Windows_App/Perun_v1/02_Forms/form_Main.Designer.cs +++ b/02_Windows_App/Perun_v1/02_Forms/form_Main.Designer.cs @@ -427,7 +427,6 @@ // // con_img_lotATC // - this.con_img_lotATC.Image = global::Perun_v1.Properties.Resources.status_disconnected; this.con_img_lotATC.Location = new System.Drawing.Point(292, 335); this.con_img_lotATC.Name = "con_img_lotATC"; this.con_img_lotATC.Size = new System.Drawing.Size(29, 28); @@ -437,7 +436,6 @@ // // con_img_srs // - this.con_img_srs.Image = global::Perun_v1.Properties.Resources.status_disconnected; this.con_img_srs.Location = new System.Drawing.Point(207, 335); this.con_img_srs.Name = "con_img_srs"; this.con_img_srs.Size = new System.Drawing.Size(29, 28); @@ -447,7 +445,6 @@ // // con_img_dcs // - this.con_img_dcs.Image = global::Perun_v1.Properties.Resources.status_disconnected; this.con_img_dcs.Location = new System.Drawing.Point(122, 335); this.con_img_dcs.Name = "con_img_dcs"; this.con_img_dcs.Size = new System.Drawing.Size(29, 28); @@ -458,7 +455,6 @@ // con_img_db // this.con_img_db.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.con_img_db.Image = global::Perun_v1.Properties.Resources.status_disconnected; this.con_img_db.Location = new System.Drawing.Point(37, 335); this.con_img_db.Name = "con_img_db"; this.con_img_db.Size = new System.Drawing.Size(29, 28); diff --git a/02_Windows_App/Perun_v1/02_Forms/form_Main.cs b/02_Windows_App/Perun_v1/02_Forms/form_Main.cs index 74d6634..243b2c3 100644 --- a/02_Windows_App/Perun_v1/02_Forms/form_Main.cs +++ b/02_Windows_App/Perun_v1/02_Forms/form_Main.cs @@ -68,6 +68,12 @@ namespace Perun_v1 con_check_3rd_lotatc.Checked = true; } } + + // Initialize controls + con_img_db.Image = (Image)Properties.Resources.ResourceManager.GetObject("status_disconnected"); + con_img_dcs.Image = (Image)Properties.Resources.ResourceManager.GetObject("status_disconnected"); + con_img_lotATC.Image = (Image)Properties.Resources.ResourceManager.GetObject("status_disconnected"); + con_img_srs.Image = (Image)Properties.Resources.ResourceManager.GetObject("status_disconnected"); } public form_Main() diff --git a/02_Windows_App/Perun_v1/02_Forms/form_Main.resx b/02_Windows_App/Perun_v1/02_Forms/form_Main.resx index b2f7f0f..d3bd974 100644 --- a/02_Windows_App/Perun_v1/02_Forms/form_Main.resx +++ b/02_Windows_App/Perun_v1/02_Forms/form_Main.resx @@ -419,6 +419,9 @@ 687, 19 + + 26 + AAABAAEAQD8AAAEAIAAgQQAAFgAAACgAAABAAAAAfgAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA diff --git a/02_Windows_App/Perun_v1/Perun_v1.csproj b/02_Windows_App/Perun_v1/Perun_v1.csproj index 61e91ee..319ede4 100644 --- a/02_Windows_App/Perun_v1/Perun_v1.csproj +++ b/02_Windows_App/Perun_v1/Perun_v1.csproj @@ -182,17 +182,10 @@ - - + - - - - - - diff --git a/02_Windows_App/Perun_v1/Properties/Resources.resx b/02_Windows_App/Perun_v1/Properties/Resources.resx index 143a6d2..49c3998 100644 --- a/02_Windows_App/Perun_v1/Properties/Resources.resx +++ b/02_Windows_App/Perun_v1/Properties/Resources.resx @@ -122,7 +122,7 @@ ..\Resources\status-connected.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\status-connectedx.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\status-connected-error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\status-disconnected.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/02_Windows_App/Perun_v1/Resources/ico_db.png b/02_Windows_App/Perun_v1/Resources/ico_db.png deleted file mode 100644 index fb78464..0000000 Binary files a/02_Windows_App/Perun_v1/Resources/ico_db.png and /dev/null differ diff --git a/02_Windows_App/Perun_v1/Resources/ico_error.png b/02_Windows_App/Perun_v1/Resources/ico_error.png deleted file mode 100644 index cd9246a..0000000 Binary files a/02_Windows_App/Perun_v1/Resources/ico_error.png and /dev/null differ diff --git a/02_Windows_App/Perun_v1/Resources/ico_game.png b/02_Windows_App/Perun_v1/Resources/ico_game.png deleted file mode 100644 index d906fde..0000000 Binary files a/02_Windows_App/Perun_v1/Resources/ico_game.png and /dev/null differ diff --git a/02_Windows_App/Perun_v1/Resources/ico_lotatc.png b/02_Windows_App/Perun_v1/Resources/ico_lotatc.png deleted file mode 100644 index 7826b4c..0000000 Binary files a/02_Windows_App/Perun_v1/Resources/ico_lotatc.png and /dev/null differ diff --git a/02_Windows_App/Perun_v1/Resources/ico_srs.png b/02_Windows_App/Perun_v1/Resources/ico_srs.png deleted file mode 100644 index 4b2d5fa..0000000 Binary files a/02_Windows_App/Perun_v1/Resources/ico_srs.png and /dev/null differ diff --git a/02_Windows_App/Perun_v1/Resources/img_db.png b/02_Windows_App/Perun_v1/Resources/img_db.png deleted file mode 100644 index 3e9d6ed..0000000 Binary files a/02_Windows_App/Perun_v1/Resources/img_db.png and /dev/null differ diff --git a/02_Windows_App/Perun_v1/Resources/status-connectedx.png b/02_Windows_App/Perun_v1/Resources/status-connected-error.png similarity index 100% rename from 02_Windows_App/Perun_v1/Resources/status-connectedx.png rename to 02_Windows_App/Perun_v1/Resources/status-connected-error.png diff --git a/02_Windows_App/Perun_v1/Resources/status-disconnected-game.png b/02_Windows_App/Perun_v1/Resources/status-disconnected-game.png deleted file mode 100644 index c7f9b17..0000000 Binary files a/02_Windows_App/Perun_v1/Resources/status-disconnected-game.png and /dev/null differ