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 b9b45fc..1bb372d 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 @@ -312,31 +312,31 @@ this.con_GroupBox_3.Controls.Add(this.con_check_3rd_srs); this.con_GroupBox_3.Location = new System.Drawing.Point(12, 246); this.con_GroupBox_3.Name = "con_GroupBox_3"; - this.con_GroupBox_3.Size = new System.Drawing.Size(324, 68); + this.con_GroupBox_3.Size = new System.Drawing.Size(324, 118); this.con_GroupBox_3.TabIndex = 6; this.con_GroupBox_3.TabStop = false; this.con_GroupBox_3.Text = "Integration settings"; // // con_txt_3rd_lotatc // - this.con_txt_3rd_lotatc.Location = new System.Drawing.Point(123, 39); + this.con_txt_3rd_lotatc.Location = new System.Drawing.Point(6, 91); this.con_txt_3rd_lotatc.Name = "con_txt_3rd_lotatc"; - this.con_txt_3rd_lotatc.Size = new System.Drawing.Size(190, 20); + this.con_txt_3rd_lotatc.Size = new System.Drawing.Size(307, 20); this.con_txt_3rd_lotatc.TabIndex = 4; this.con_txt_3rd_lotatc.MouseClick += new System.Windows.Forms.MouseEventHandler(this.con_txt_3rd_lotatc_Click); // // con_txt_3rd_srs // - this.con_txt_3rd_srs.Location = new System.Drawing.Point(123, 16); + this.con_txt_3rd_srs.Location = new System.Drawing.Point(6, 42); this.con_txt_3rd_srs.Name = "con_txt_3rd_srs"; - this.con_txt_3rd_srs.Size = new System.Drawing.Size(190, 20); + this.con_txt_3rd_srs.Size = new System.Drawing.Size(307, 20); this.con_txt_3rd_srs.TabIndex = 3; this.con_txt_3rd_srs.MouseClick += new System.Windows.Forms.MouseEventHandler(this.con_txt_3rd_srs_Click); // // con_check_3rd_lotatc // this.con_check_3rd_lotatc.AutoSize = true; - this.con_check_3rd_lotatc.Location = new System.Drawing.Point(6, 42); + this.con_check_3rd_lotatc.Location = new System.Drawing.Point(6, 72); this.con_check_3rd_lotatc.Name = "con_check_3rd_lotatc"; this.con_check_3rd_lotatc.Size = new System.Drawing.Size(100, 17); this.con_check_3rd_lotatc.TabIndex = 1; @@ -461,7 +461,7 @@ // this.label13.AutoSize = true; this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label13.Location = new System.Drawing.Point(57, 431); + this.label13.Location = new System.Drawing.Point(64, 427); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(74, 25); this.label13.TabIndex = 19; @@ -471,7 +471,7 @@ // this.label14.AutoSize = true; this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label14.Location = new System.Drawing.Point(59, 456); + this.label14.Location = new System.Drawing.Point(66, 452); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(88, 13); this.label14.TabIndex = 20; @@ -481,7 +481,7 @@ // this.con_img_logo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.con_img_logo.Image = global::Perun_v1.Properties.Resources.perun_logo; - this.con_img_logo.Location = new System.Drawing.Point(6, 431); + this.con_img_logo.Location = new System.Drawing.Point(13, 427); this.con_img_logo.Name = "con_img_logo"; this.con_img_logo.Size = new System.Drawing.Size(45, 41); this.con_img_logo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -620,7 +620,7 @@ // con_GroupBox_5 // this.con_GroupBox_5.Controls.Add(this.con_check_minimize_to_tray); - this.con_GroupBox_5.Location = new System.Drawing.Point(13, 320); + this.con_GroupBox_5.Location = new System.Drawing.Point(13, 370); this.con_GroupBox_5.Name = "con_GroupBox_5"; this.con_GroupBox_5.Size = new System.Drawing.Size(323, 46); this.con_GroupBox_5.TabIndex = 26; 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 46d6e8b..dc7479b 100644 --- a/02_Windows_App/Perun_v1/02_Forms/form_Main.cs +++ b/02_Windows_App/Perun_v1/02_Forms/form_Main.cs @@ -409,6 +409,30 @@ namespace Perun_v1 { // Sends app to system tray trayIconMain.Visible = true; + + // For instances 1-5 we have prepared special icons + switch (Globals.AppInstanceID) + { + case 1: + trayIconMain.Icon = Perun_v1.Properties.Resources.perun_logo_1; + break; + case 2: + trayIconMain.Icon = Perun_v1.Properties.Resources.perun_logo_2; + break; + case 3: + trayIconMain.Icon = Perun_v1.Properties.Resources.perun_logo_3; + break; + case 4: + trayIconMain.Icon = Perun_v1.Properties.Resources.perun_logo_4; + break; + case 5: + trayIconMain.Icon = Perun_v1.Properties.Resources.perun_logo_5; + break; + default: + break; + } + + this.WindowState = FormWindowState.Minimized; this.ShowInTaskbar = false; } diff --git a/02_Windows_App/Perun_v1/03_Resources/perun_logo_1.ico b/02_Windows_App/Perun_v1/03_Resources/perun_logo_1.ico new file mode 100644 index 0000000..0889dbd Binary files /dev/null and b/02_Windows_App/Perun_v1/03_Resources/perun_logo_1.ico differ diff --git a/02_Windows_App/Perun_v1/03_Resources/perun_logo_2.ico b/02_Windows_App/Perun_v1/03_Resources/perun_logo_2.ico new file mode 100644 index 0000000..696a1a5 Binary files /dev/null and b/02_Windows_App/Perun_v1/03_Resources/perun_logo_2.ico differ diff --git a/02_Windows_App/Perun_v1/03_Resources/perun_logo_3.ico b/02_Windows_App/Perun_v1/03_Resources/perun_logo_3.ico new file mode 100644 index 0000000..8bbc22f Binary files /dev/null and b/02_Windows_App/Perun_v1/03_Resources/perun_logo_3.ico differ diff --git a/02_Windows_App/Perun_v1/03_Resources/perun_logo_4.ico b/02_Windows_App/Perun_v1/03_Resources/perun_logo_4.ico new file mode 100644 index 0000000..7199449 Binary files /dev/null and b/02_Windows_App/Perun_v1/03_Resources/perun_logo_4.ico differ diff --git a/02_Windows_App/Perun_v1/03_Resources/perun_logo_5.ico b/02_Windows_App/Perun_v1/03_Resources/perun_logo_5.ico new file mode 100644 index 0000000..ca02f44 Binary files /dev/null and b/02_Windows_App/Perun_v1/03_Resources/perun_logo_5.ico differ diff --git a/02_Windows_App/Perun_v1/Perun_v1.csproj b/02_Windows_App/Perun_v1/Perun_v1.csproj index 8f6a9cb..0c1af4b 100644 --- a/02_Windows_App/Perun_v1/Perun_v1.csproj +++ b/02_Windows_App/Perun_v1/Perun_v1.csproj @@ -62,7 +62,8 @@ - 03_Resources\perun_logo.ico + + 2ACE4C8C2C325A04CA5986B1CD76744B4B03755D @@ -206,7 +207,8 @@ - + + @@ -214,6 +216,17 @@ - + + + + + + + + + + + + \ No newline at end of file diff --git a/02_Windows_App/Perun_v1/Properties/Resources.Designer.cs b/02_Windows_App/Perun_v1/Properties/Resources.Designer.cs index f3d5c91..73ef024 100644 --- a/02_Windows_App/Perun_v1/Properties/Resources.Designer.cs +++ b/02_Windows_App/Perun_v1/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Ten kod został wygenerowany przez narzędzie. +// Wersja wykonawcza:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Zmiany w tym pliku mogą spowodować nieprawidłowe zachowanie i zostaną utracone, jeśli +// kod zostanie ponownie wygenerowany. // //------------------------------------------------------------------------------ @@ -13,12 +13,12 @@ namespace Perun_v1.Properties { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// Klasa zasobu wymagająca zdefiniowania typu do wyszukiwania zlokalizowanych ciągów itd. /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. + // Ta klasa została automatycznie wygenerowana za pomocą klasy StronglyTypedResourceBuilder + // przez narzędzie, takie jak ResGen lub Visual Studio. + // Aby dodać lub usunąć składową, edytuj plik ResX, a następnie ponownie uruchom narzędzie ResGen + // z opcją /str lub ponownie utwórz projekt VS. [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -33,7 +33,7 @@ namespace Perun_v1.Properties { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Zwraca buforowane wystąpienie ResourceManager używane przez tę klasę. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ namespace Perun_v1.Properties { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Przesłania właściwość CurrentUICulture bieżącego wątku dla wszystkich + /// przypadków przeszukiwania zasobów za pomocą tej klasy zasobów wymagającej zdefiniowania typu. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ namespace Perun_v1.Properties { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Wyszukuje zlokalizowany zasób typu System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap perun_logo { get { @@ -71,7 +71,67 @@ namespace Perun_v1.Properties { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Wyszukuje zlokalizowany zasób typu System.Drawing.Icon podobny do zasobu (Ikona). + /// + internal static System.Drawing.Icon perun_logo_1 { + get { + object obj = ResourceManager.GetObject("perun_logo_1", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Wyszukuje zlokalizowany zasób typu System.Drawing.Icon podobny do zasobu (Ikona). + /// + internal static System.Drawing.Icon perun_logo_2 { + get { + object obj = ResourceManager.GetObject("perun_logo_2", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Wyszukuje zlokalizowany zasób typu System.Drawing.Icon podobny do zasobu (Ikona). + /// + internal static System.Drawing.Icon perun_logo_3 { + get { + object obj = ResourceManager.GetObject("perun_logo_3", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Wyszukuje zlokalizowany zasób typu System.Drawing.Icon podobny do zasobu (Ikona). + /// + internal static System.Drawing.Icon perun_logo_4 { + get { + object obj = ResourceManager.GetObject("perun_logo_4", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Wyszukuje zlokalizowany zasób typu System.Drawing.Icon podobny do zasobu (Ikona). + /// + internal static System.Drawing.Icon perun_logo_5 { + get { + object obj = ResourceManager.GetObject("perun_logo_5", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Wyszukuje zlokalizowany zasób typu System.Drawing.Icon podobny do zasobu (Ikona). + /// + internal static System.Drawing.Icon perun_logo_def { + get { + object obj = ResourceManager.GetObject("perun_logo_def", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Wyszukuje zlokalizowany zasób typu System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap status_connected { get { @@ -81,7 +141,7 @@ namespace Perun_v1.Properties { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Wyszukuje zlokalizowany zasób typu System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap status_connected_error { get { @@ -91,7 +151,7 @@ namespace Perun_v1.Properties { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Wyszukuje zlokalizowany zasób typu System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap status_disconnected { get { @@ -101,7 +161,7 @@ namespace Perun_v1.Properties { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Wyszukuje zlokalizowany zasób typu System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap status_disconnected_error { get { diff --git a/02_Windows_App/Perun_v1/Properties/Resources.resx b/02_Windows_App/Perun_v1/Properties/Resources.resx index 6d2bfc3..ebd156d 100644 --- a/02_Windows_App/Perun_v1/Properties/Resources.resx +++ b/02_Windows_App/Perun_v1/Properties/Resources.resx @@ -121,6 +121,24 @@ ..\03_Resources\perun_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\03_Resources\perun_logo_1.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\03_Resources\perun_logo_2.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\03_Resources\perun_logo_3.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\03_Resources\perun_logo_4.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\03_Resources\perun_logo_5.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\03_Resources\perun_logo.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\03_Resources\status-connected.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a