Add new icon to forms of application

AppDiagnostic/AppDiagnostic.csproj

@@ -76,6 +76,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
@@ -97,5 +98,8 @@
       <Name>SharedComponents</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\TBF_icon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

AppDiagnostic/MainForm.cs

@@ -29,6 +29,8 @@ namespace AppDiagnostic
 
         public MainForm()
         {
+            this.Icon = Properties.Resources.TBF_icon;
+
             InitializeComponent();
 
             // Inicializujeme LogAdapter a priradíme ho k memoListView

AppDiagnostic/Properties/Resources.Designer.cs

@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AppDiagnostic.Properties
+namespace AppDiagnostic.Properties {
-{
+    using System;
-
+    
-
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,53 +19,55 @@ namespace AppDiagnostic.Properties
     // 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.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
+    internal class Resources {
-    {
+        
-
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
+        internal Resources() {
-        {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
+        internal static global::System.Resources.ResourceManager ResourceManager {
-        {
+            get {
-            get
+                if (object.ReferenceEquals(resourceMan, null)) {
-            {
-                if ((resourceMan == null))
-                {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AppDiagnostic.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
+        internal static global::System.Globalization.CultureInfo Culture {
-        {
+            get {
-            get
-            {
                 return resourceCulture;
             }
-            set
+            set {
-            {
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        internal static System.Drawing.Icon TBF_icon {
+            get {
+                object obj = ResourceManager.GetObject("TBF_icon", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
     }
 }

AppDiagnostic/Properties/Resources.resx

@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
@@ -68,9 +69,10 @@
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="name" use="required" type="xsd:string" />
               <xsd:attribute name="type" type="xsd:string" />
               <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
@@ -85,9 +87,10 @@
                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -109,9 +112,13 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="TBF_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TBF_icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

Results/Forms/BatchResultsDlg.cs

@@ -49,6 +49,8 @@ namespace Results.Forms
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             firstEnabledControl = null;
             lastSizeChange = DateTime.Now;
             nrGroups = 1;

Results/Forms/ManualEntryConfigDlg.cs

@@ -24,7 +24,10 @@ namespace Results.Forms
 		public ManualEntryConfigDlg()
 		{
 			InitializeComponent();
-			manualEntryConfigCtrl.Unlocked = true;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            manualEntryConfigCtrl.Unlocked = true;
 		}
 
 

Results/Forms/MoreWMResultsDlg.cs

@@ -25,6 +25,8 @@ namespace Results.Forms
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             Localize();
 
             ShowAllResults(wm);

Results/Forms/ResultsConfigDlg.cs

@@ -35,7 +35,10 @@ namespace Results.Forms
 		public ResultsConfigDlg()
 		{
 			InitializeComponent();
-			resultsConfigCtrl.Unlocked = true;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            resultsConfigCtrl.Unlocked = true;
 		}
 
 

Results/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace Results.Properties {
     // 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.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -69,5 +69,15 @@ namespace Results.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        internal static System.Drawing.Icon TBF_icon {
+            get {
+                object obj = ResourceManager.GetObject("TBF_icon", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
     }
 }

Results/Properties/Resources.resx

@@ -121,4 +121,7 @@
   <data name="Headpic" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Headpic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="TBF_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TBF_icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

Results/Results.csproj

@@ -256,6 +256,7 @@
   <ItemGroup>
     <Content Include="Entities\PurchaseEntities\createPurchaseTables.sql" />
     <Content Include="Entities\PurchaseEntities\ImportPurchaseOrderTestData.sql" />
+    <None Include="Resources\TBF_icon.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

SharedComponents/obj/Debug/net472/SharedComponents.GeneratedMSBuildEditorConfig.editorconfig

@@ -1,5 +1,8 @@
 is_global = true
 build_property.RootNamespace = SharedComponents
-build_property.ProjectDir = C:\Users\micha\git\tbf\SharedComponents\
+build_property.ProjectDir = C:\Sensus projects\LocalBranch_start_at_19.2.2026\tbf-exchange260123\tbf\SharedComponents\
 build_property.EnableComHosting = 
 build_property.EnableGeneratedComInterfaceComImportInterop = 
+build_property.CsWinRTUseWindowsUIXamlProjections = false
+build_property.EffectiveAnalysisLevelStyle = 
+build_property.EnableCodeStyleSeverity = 

SharedComponents/obj/SharedComponents.csproj.nuget.g.props

@@ -5,11 +5,12 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\micha\.nuget\packages\</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\MFRNIAK\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">7.0.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.14.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\micha\.nuget\packages\" />
+    <SourceRoot Include="C:\Users\MFRNIAK\.nuget\packages\" />
+    <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
   </ItemGroup>
 </Project>

SharedDatabase/Forms/DoubleLoginDlg.cs

@@ -44,6 +44,8 @@ namespace SharedDatabase.Forms
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             loginStatePictureBox1.Image = Properties.Resources.questionMark;
             loginStatePictureBox2.Image = Properties.Resources.questionMark;
             authorizedUser1 = null;

SharedDatabase/Forms/EditSelectedUser.cs

@@ -31,6 +31,9 @@ namespace SharedDatabase.Forms
         public EditSelectedUser()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             this.toolTip1.SetToolTip(this.txtName, string.Format(Strings.max_0_alphanum_chars, 20));
             oriGroupMember = new bool[(displayedGroups != null) ? displayedGroups.Count : 0];
             okBtn.Enabled = false;

SharedDatabase/Forms/LoginDlg.cs

@@ -45,6 +45,8 @@ namespace SharedDatabase.Forms
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             oriBackColor = BackColor;
         }
 

SharedDatabase/Forms/PasswordChangeDlg.cs

@@ -22,6 +22,8 @@ namespace SharedDatabase.Forms
         public PasswordChangeDlg()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
         }
 
         /// <summary>
@@ -30,6 +32,9 @@ namespace SharedDatabase.Forms
         public PasswordChangeDlg(string predefinedUser)
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             userNameTextBox.Text = predefinedUser;
         }
 

SharedDatabase/Forms/PlainLoginDlg.cs

@@ -46,6 +46,8 @@ namespace SharedDatabase.Forms
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             oriBackColor = BackColor;
         }
 

SharedDatabase/Forms/TripleLoginDlg.cs

@@ -46,6 +46,8 @@ namespace SharedDatabase.Forms
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             loginStatePictureBox1.Image = Properties.Resources.questionMark;
             loginStatePictureBox2.Image = Properties.Resources.questionMark;
             loginStatePictureBox3.Image = Properties.Resources.questionMark;

SharedDatabase/Forms/UserManagementDlg.cs

@@ -35,6 +35,9 @@ namespace SharedDatabase.Forms
         public UserManagementDlg(NHibernate.ISession session, bool showLocalExtensions)
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             this.session = session;
             this.showExtensions = showLocalExtensions;
             if (showLocalExtensions) copyFromRemoteButton.Visible = true;

SharedDatabase/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace SharedDatabase.Properties {
     // 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.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -89,5 +89,15 @@ namespace SharedDatabase.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        internal static System.Drawing.Icon TBF_icon {
+            get {
+                object obj = ResourceManager.GetObject("TBF_icon", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
     }
 }

SharedDatabase/Properties/Resources.resx

@@ -127,4 +127,7 @@
   <data name="rejected" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Pictures\rejected.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="TBF_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TBF_icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

SharedDatabase/SharedDatabase.csproj

@@ -221,6 +221,9 @@
     <None Include="Pictures\questionMark.bmp" />
     <None Include="Pictures\rejected.bmp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\TBF_icon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

TBF/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace TBF.Properties {
     // 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.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -150,6 +150,16 @@ namespace TBF.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        internal static System.Drawing.Icon TBF_icon {
+            get {
+                object obj = ResourceManager.GetObject("TBF_icon", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

TBF/Properties/Resources.resx

@@ -208,4 +208,7 @@
   <data name="TControl_XL_idle" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Rig\Modbus\TempControl\Pictures\TControl-XL-idle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="TBF_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TBF_icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

TBF/Rig/DataEntry/Combined/CycleBeginningForm.cs

@@ -57,6 +57,9 @@ namespace TBF.Rig.DataEntry.Combined
         public CycleBeginningForm(int compoundWaterMetersCount, bool remarksEnabled)
 		{
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             ControlBox = false;
 
             TextBoxesCount = 3;

TBF/Rig/DataEntry/Combined/CycleEndForm.cs

@@ -33,7 +33,10 @@ namespace TBF.Rig.DataEntry.Combined
         public CycleEndForm()
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			MainStateText = new string[TBF.Data.CompoundWMsCount];
 			AuxStateText = new string[TBF.Data.CompoundWMsCount];

TBF/Rig/DataEntry/Combined/TestStartEndForm.cs

@@ -56,7 +56,10 @@ namespace TBF.Rig.DataEntry.Combined
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 3;
 

TBF/Rig/DataEntry/HeatMeters12/CycleBeginningForm.cs

@@ -49,7 +49,10 @@ namespace TBF.Rig.DataEntry.HeatMeters12
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 			
 			labels = new Label[] { label1,  label2,  label3,  label4,  label5,  label6,
 					               label7,  label8,  label9,  label10, label11, label12 };

TBF/Rig/DataEntry/HeatMeters12/CycleEndForm.cs

@@ -29,7 +29,10 @@ namespace TBF.Rig.DataEntry.HeatMeters12
         public CycleEndForm(int waterMetersCount)
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			this.WaterMetersCount = waterMetersCount;
 			EndStateText = new string[WaterMetersCount];

TBF/Rig/DataEntry/HeatMeters12/TestStartEndForm.cs

@@ -61,7 +61,10 @@ namespace TBF.Rig.DataEntry.HeatMeters12
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 12;
 

TBF/Rig/DataEntry/HeatMeters6/CycleBeginningForm.cs

@@ -49,7 +49,10 @@ namespace TBF.Rig.DataEntry.HeatMeters6
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 			
 			labels = new Label[] { label1,  label2,  label3,  label4,  label5,  label6 };
 			comboBoxes = new ComboBox[] { comboBox1,  comboBox2,  comboBox3,  comboBox4,  comboBox5,  comboBox6 };

TBF/Rig/DataEntry/HeatMeters6/CycleEndForm.cs

@@ -29,7 +29,10 @@ namespace TBF.Rig.DataEntry.HeatMeters6
         public CycleEndForm(int waterMetersCount)
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			this.WaterMetersCount = waterMetersCount;
 			EndStateText = new string[WaterMetersCount];

TBF/Rig/DataEntry/HeatMeters6/TestStartEndForm.cs

@@ -61,7 +61,10 @@ namespace TBF.Rig.DataEntry.HeatMeters6
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 6;
 

TBF/Rig/DataEntry/PoseidonCmd/CycleBeginningForm.cs

@@ -40,7 +40,10 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
             preselectedOrder = null;
 
 			completed = false;

TBF/Rig/DataEntry/PoseidonCmd/TestStartEndForm.cs

@@ -51,7 +51,10 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 48;
 

TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs

@@ -133,6 +133,9 @@ namespace TBF.Rig.DataEntry.S620
 		public FormForMechanicalMetersWithTracing()
 		{
 			InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             ControlBox = false;
             oriBackColor = BackColor;
             ManageCheckGroupBox(batchesCheckBox, batchesGroupBox);

TBF/Rig/DataEntry/S620/TestStartEndForm.cs

@@ -54,7 +54,10 @@ namespace TBF.Rig.DataEntry.S620
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 48;
 

TBF/Rig/DataEntry/Single/CycleBeginningForm.cs

@@ -37,7 +37,10 @@ namespace TBF.Rig.DataEntry.Single
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = 24;
 			labels = new Label[]

TBF/Rig/DataEntry/Single/CycleEndForm.cs

@@ -35,7 +35,10 @@ namespace TBF.Rig.DataEntry.Single
         public CycleEndForm()
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
             labels = new Label[]
 				{

TBF/Rig/DataEntry/Single/TestStartEndForm.cs

@@ -58,7 +58,10 @@ namespace TBF.Rig.DataEntry.Single
 		public TestStartEndForm(int waterMetersCount, int lineSize)
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
             WaterMetersCount = waterMetersCount;
 

TBF/Rig/DataEntry/Standard12/CycleBeginningForm.cs

@@ -50,7 +50,10 @@ namespace TBF.Rig.DataEntry.Standard12
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 			
 			labels = new Label[] { label1,  label2,  label3,  label4,  label5,  label6,
 					               label7,  label8,  label9,  label10, label11, label12 };

TBF/Rig/DataEntry/Standard12/CycleEndForm.cs

@@ -34,7 +34,10 @@ namespace TBF.Rig.DataEntry.Standard12
         public CycleEndForm()
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
             labels = new Label[]
 				{

TBF/Rig/DataEntry/Standard12/TestStartEndForm.cs

@@ -51,7 +51,10 @@ namespace TBF.Rig.DataEntry.Standard12
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 12;
 

TBF/Rig/DataEntry/Standard24/AdvancedFixedStartTestForm.cs

@@ -51,7 +51,10 @@ namespace TBF.Rig.DataEntry.Standard24
 		public AdvancedFixedStartTestForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 24;
 

TBF/Rig/DataEntry/Standard24/CycleBeginningForm.cs

@@ -37,7 +37,10 @@ namespace TBF.Rig.DataEntry.Standard24
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = 24;
 			labels = new Label[]

TBF/Rig/DataEntry/Standard24/CycleEndForm.cs

@@ -35,7 +35,10 @@ namespace TBF.Rig.DataEntry.Standard24
         public CycleEndForm()
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
             labels = new Label[]
 				{

TBF/Rig/DataEntry/Standard24/TestStartEndForm.cs

@@ -64,7 +64,10 @@ namespace TBF.Rig.DataEntry.Standard24
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 24;
 

TBF/Rig/DataEntry/Standard48/CycleBeginningForm.cs

@@ -37,7 +37,10 @@ namespace TBF.Rig.DataEntry.Standard48
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = 48;
 			labels = new Label[]

TBF/Rig/DataEntry/Standard48/CycleEndForm.cs

@@ -29,7 +29,10 @@ namespace TBF.Rig.DataEntry.Standard48
         public CycleEndForm(int waterMetersCount)
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			this.WaterMetersCount = waterMetersCount;
 			EndStateText = new string[WaterMetersCount];

TBF/Rig/DataEntry/Standard48/TestStartEndForm.cs

@@ -54,7 +54,10 @@ namespace TBF.Rig.DataEntry.Standard48
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 48;
 

TBF/Rig/DataEntry/Standard6/CycleBeginningForm.cs

@@ -40,7 +40,10 @@ namespace TBF.Rig.DataEntry.Standard6
         public CycleBeginningForm(int waterMetersCount, bool remarksEnabled)
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
             comboBoxes = new ComboBox[] { comboBox1, comboBox2, comboBox3, comboBox4, comboBox5, comboBox6 };
             checkBoxes = new CheckBox[] { checkBox1, checkBox2, checkBox3, checkBox4, checkBox5, checkBox6 };

TBF/Rig/DataEntry/Standard6/CycleEndForm.cs

@@ -38,7 +38,10 @@ namespace TBF.Rig.DataEntry.Standard6
         public CycleEndForm()
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
             labels = new Label[] { label1,  label2,  label3,  label4,  label5,  label6 };
             stateBoxes = new TextBox[] { textBox1,  textBox2,  textBox3,  textBox4,  textBox5,  textBox6 };

TBF/Rig/DataEntry/Standard6/TestStartEndForm.cs

@@ -46,7 +46,10 @@ namespace TBF.Rig.DataEntry.Standard6
 		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			endStates = false;
 			this.WaterMetersCount = waterMetersCount;

TBF/Rig/DataEntry/StandardCamera/CycleBeginningForm.cs

@@ -37,7 +37,10 @@ namespace TBF.Rig.DataEntry.StandardCamera
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = 24;
 			labels = new Label[]

TBF/Rig/DataEntry/StandardCamera/CycleEndForm.cs

@@ -35,7 +35,10 @@ namespace TBF.Rig.DataEntry.StandardCamera
         public CycleEndForm()
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
             labels = new Label[]
 				{

TBF/Rig/DataEntry/StandardCamera/TestStartEndForm.cs

@@ -96,7 +96,10 @@ namespace TBF.Rig.DataEntry.StandardCamera
         public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			labels = new Label[]
 				{

TBF/Rig/DataEntry/StandartCameraPurchaseOrder/CycleBeginningForm.cs

@@ -57,6 +57,9 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
         public CycleBeginningForm()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             ControlBox = false;
 
             textBoxesCount = 48;

TBF/Rig/DataEntry/StandartCameraPurchaseOrder/CycleEndForm.cs

@@ -35,7 +35,10 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
         public CycleEndForm()
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
             labels = new Label[]
 				{

TBF/Rig/DataEntry/StandartCameraPurchaseOrder/TestStartEndForm.cs

@@ -96,7 +96,10 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
         public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			labels = new Label[]
 				{

TBF/Rig/DataEntry/Uni/CycleBgEnForm.cs

@@ -68,7 +68,10 @@ namespace TBF.Rig.DataEntry.Uni
 		public CycleBgEnForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 			completed = false;
 			StartForceCloseHandler();
 		}

TBF/Rig/DataEntry/Uni/TestStartEndForm.cs

@@ -121,7 +121,10 @@ namespace TBF.Rig.DataEntry.Uni
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
             imageProcessingThread = null;
             completed = false;
 			StartForceCloseHandler();

TBF/Rig/DataEntry/iPerl/CycleBeginningForm.cs

@@ -39,7 +39,10 @@ namespace TBF.Rig.DataEntry.iPerl
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			completed = false;
 			StartForceCloseHandler();

TBF/Rig/DataEntry/iPerl/TestStartEndForm.cs

@@ -50,7 +50,10 @@ namespace TBF.Rig.DataEntry.iPerl
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 48;
 

TBF/Rig/Modbus/QuidoRS/ConfirmationForm.cs

@@ -22,7 +22,10 @@ namespace TBF.Rig.Modbus.QuidoRS
 		{
 			InitializeComponent();
 
-			Localize();
+            this.Icon = Properties.Resources.TBF_icon;
+
+
+            Localize();
 			messageLabel.Text = message;
             BackColor = backgroundColor;
 

TBF/Rig/Network/Camera/CJMS11/TerminalDlg.cs

@@ -11,12 +11,18 @@ namespace TBF.Rig.Network.Camera.CJMS11
 		public TerminalDlg()
 		{
 			InitializeComponent();
-		}
 
-		public TerminalDlg(string name, TelnetClient telnet)
+            this.Icon = Properties.Resources.TBF_icon;
+
+        }
+
+        public TerminalDlg(string name, TelnetClient telnet)
 		{
 			InitializeComponent();
-			Text = name;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            Text = name;
 			this.telnet = telnet;
 		}
 

TBF/Rig/Network/Camera/CLP1611/TerminalDlg.cs

@@ -11,12 +11,18 @@ namespace TBF.Rig.Network.Camera.CLP1611
 		public TerminalDlg()
 		{
 			InitializeComponent();
-		}
 
-		public TerminalDlg(string name, TelnetClient telnet)
+            this.Icon = Properties.Resources.TBF_icon;
+
+        }
+
+        public TerminalDlg(string name, TelnetClient telnet)
 		{
 			InitializeComponent();
-			Text = name;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            Text = name;
 			this.telnet = telnet;
 		}
 

TBF/Rig/Network/Camera/Display/DisplayForm.cs

@@ -73,7 +73,10 @@ namespace TBF.Rig.Network.Camera.Display
         {
 			InitializeComponent();
 
-			this.imageFileNames = imageFileNames;
+            this.Icon = Properties.Resources.TBF_icon;
+
+
+            this.imageFileNames = imageFileNames;
 			this.imagesCount = (imageFileNames == null) ? 0 : imageFileNames.Length;
 
             groupBoxes = new GroupBox[] { groupBox1, groupBox2, groupBox3, groupBox4, groupBox5, groupBox6,

TBF/Rig/Operations/AskYesNoForm.cs

@@ -21,6 +21,9 @@ namespace TBF.Rig.Operations
 		public AskYesNoForm(string question)
 		{
 			InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             ControlBox = false;
 
 			Localize();

TBF/Rig/Operations/LargeMessageBoxForm.cs

@@ -21,9 +21,12 @@ namespace TBF.Rig.Operations
 		public LargeMessageBoxForm(string message, Color backgroundColor)
 		{
 			InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             //ControlBox = false;
 
-			Localize();
+            Localize();
 			messageLabel.Text = message;
             BackColor = backgroundColor;
 

TBF/Rig/Operations/MessageBoxForm.cs

@@ -21,9 +21,12 @@ namespace TBF.Rig.Operations
 		public MessageBoxForm(string message, Color backgroundColor)
 		{
 			InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             //ControlBox = false;
 
-			Localize();
+            Localize();
 			messageLabel.Text = message;
             BackColor = backgroundColor;
 

TBF/Rig/Output/HeaderFooterDlg.cs

@@ -17,6 +17,9 @@ namespace TBF.Rig.Output
         public HeaderFooterDlg()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
         }
 
         public HeaderFooterDlg(bool isHeader, string text)

TBF/Rig/Output/Printers/GroupPrinting/Single/PrinterTestBenchComponentSelectorDlg.cs

@@ -30,8 +30,11 @@ namespace TBF.Rig.Output.Printers.GroupPrinting.Single
         public PrinterTestBenchComponentSelectorDlg()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
         }
-        
+
         private void LoadFormPosition()
         {
             LocalSettings ls = Program.LocalSettings;

TBF/Rig/RegisterReaders/KPackE/DataEntryForRadio/CycleBeginningForm.cs

@@ -37,7 +37,10 @@ namespace TBF.Rig.RegisterReaders.KPackE.DataEntryForRadio
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = 48;
 			labels = new Label[]

TBF/Rig/RegisterReaders/KPackE/DataEntryForRadio/TestStartEndForm.cs

@@ -55,7 +55,10 @@ namespace TBF.Rig.RegisterReaders.KPackE.DataEntryForRadio
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 48;
 

TBF/Rig/TestMethods/Adjustment/WMErrorsForm.cs

@@ -63,7 +63,10 @@ namespace TBF.Rig.TestMethods.Adjustment
         public WMErrorsForm()
         {
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			completed = false;
 

TBF/Rig/TestMethods/Adjustment/WMErrorsForm12.cs

@@ -46,7 +46,10 @@ namespace TBF.Rig.TestMethods.Adjustment
 		public WMErrorsForm12()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = MaxWMsCount;
 

TBF/Rig/TestMethods/Adjustment/WMErrorsForm24.cs

@@ -45,7 +45,10 @@ namespace TBF.Rig.TestMethods.Adjustment
 		public WMErrorsForm24()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = MaxWMsCount;
 

TBF/Rig/TestMethods/Adjustment/WMErrorsForm48.cs

@@ -45,7 +45,10 @@ namespace TBF.Rig.TestMethods.Adjustment
 		public WMErrorsForm48()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = MaxWMsCount;
 

TBF/Rig/TestMethods/Endurance/CycleDlg.cs

@@ -47,7 +47,10 @@ namespace TBF.Rig.TestMethods.Endurance
 
 			InitializeComponent();
 
-			/// SharedDlgButtons configuration
+            this.Icon = Properties.Resources.TBF_icon;
+
+
+            /// SharedDlgButtons configuration
             sharedButtons.ParentForm = this;
 			sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.Metrologists };
 			sharedButtons.OptionalButtons = SharedButtons.Buttons.Add |

TBF/Rig/TestMethods/ManualEntry/ManualEntryForm.cs

@@ -41,6 +41,9 @@ namespace TBF.Rig.TestMethods.ManualEntry
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
+
             groupBoxes = new GroupBox[] { groupBox1, groupBox2, groupBox3, groupBox4, groupBox5, groupBox6, groupBox7 };
             labels = new Label[] { label1, label2, label3, label4, label5, label6, label7 };
             textBoxes = new TextBox[] { textBox1, textBox2, textBox3, textBox4, textBox5, textBox6, textBox7 };

TBF/Rig/TestMethods/PulsesTest/WMPulsesForm.cs

@@ -57,7 +57,10 @@ namespace TBF.Rig.TestMethods.PulsesTest
         public WMPulsesForm()
         {
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			completed = false;
             minPulsesCount = 1;            /// Must be >0 so that initially the indication is RED

TBF/Rig/TestMethods/PulsesTest/WMPulsesForm12.cs

@@ -44,7 +44,10 @@ namespace TBF.Rig.TestMethods.PulsesTest
 		public WMPulsesForm12()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = MaxWMsCount;
 

TBF/Rig/TestMethods/PulsesTest/WMPulsesForm24.cs

@@ -44,7 +44,10 @@ namespace TBF.Rig.TestMethods.PulsesTest
 		public WMPulsesForm24()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = MaxWMsCount;
 

TBF/Rig/TestMethods/PulsesTestManual/ManualPulsesForm.cs

@@ -56,7 +56,10 @@ namespace TBF.Rig.TestMethods.PulsesTestManual
         public ManualPulsesForm()
         {
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			completed = false;
 

TBF/Rig/TestMethods/PulsesTestManual/ManualPulsesForm12.cs

@@ -49,7 +49,10 @@ namespace TBF.Rig.TestMethods.PulsesTestManual
 		public ManualPulsesForm12()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = MaxWMsCount;
 

TBF/Rig/TestMethods/PulsesTestManual/ManualPulsesForm24.cs

@@ -50,7 +50,10 @@ namespace TBF.Rig.TestMethods.PulsesTestManual
 		public ManualPulsesForm24()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = MaxWMsCount;
 

TBF/Rig/TestMethods/S640Communication/S640CommForm.cs

@@ -144,6 +144,8 @@ namespace TBF.Rig.TestMethods.S640Communication
 		{
 			InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             labels = new Label[UIBoxesCount]
 			{
 				wmLabel1,  wmLabel2,  wmLabel3,  wmLabel4,  wmLabel5,  wmLabel6,  wmLabel7,

TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationFormTestMethod.cs

@@ -211,6 +211,9 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
 		public iPerlCommunicationFormTestMethod()
 		{
 			InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
         }
 
         /// <summary>

TBF/Rig/Uni/SharedDialogs/SmartMetersCommunication/SmartCommunicationForm.cs

@@ -277,6 +277,8 @@ namespace TBF.Rig.Uni.SharedDialogs.SmartMetersCommunication
 		public SmartCommunicationForm()
 		{
 			InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
         }
 
         /// <summary>

TBF/Rig/Various/CoverTest/CoverTestForm.cs

@@ -24,6 +24,9 @@ namespace TBF.Rig.Various.CoverTest
         public CoverTestForm(string message, GID[] bypassLevel, ILog bypassLog)
 		{
 			InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             ControlBox = false;
 
             this.message = message;

TBF/Rig/Various/ManualLevelMsrmnt/WaterLevelForm.cs

@@ -27,7 +27,10 @@ namespace TBF.Rig.Various.ManualLevelMsrmnt
 		public WaterLevelForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 			Level_mm = 0;
 			completed = false;
 			StartForceCloseHandler();

TBF/TBF.csproj

@@ -101,6 +101,9 @@
   <PropertyGroup>
     <SignManifests>false</SignManifests>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>TBF_icon.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Castle.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll</HintPath>
@@ -1456,7 +1459,9 @@
     <Compile Include="Rig\Scales\MettlerToledo\Factory.cs" />
     <Compile Include="Rig\Scales\MettlerToledo\GetSerNumOp.cs" />
     <Compile Include="Rig\Scales\MettlerToledo\ReadStableMassOp.cs" />
-    <Compile Include="Rig\Scales\MettlerToledo\SerialPortDevice.cs" />
+    <Compile Include="Rig\Scales\MettlerToledo\SerialPortDevice.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Rig\Scales\MettlerToledo\SerialPortDeviceFake.cs" />
     <Compile Include="Rig\Scales\MettlerToledo\SetUnitsOp.cs" />
     <Compile Include="Rig\Scales\MettlerToledo\TaringOp.cs" />
@@ -3978,6 +3983,7 @@
     <None Include="Resources\qrcode-48x48.png" />
     <Content Include="Resources\switch-off.png" />
     <Content Include="Resources\switch-on.png" />
+    <None Include="Resources\TBF_icon.ico" />
     <Content Include="Rig\Modbus\TempControl\Pictures\TControl-L-both.png" />
     <Content Include="Rig\Modbus\TempControl\Pictures\TControl-L-cooling.png" />
     <Content Include="Rig\Modbus\TempControl\Pictures\TControl-L-heating.png" />
@@ -4000,6 +4006,7 @@
     <Content Include="SampleConfig\log4netConfig.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="TBF_icon.ico" />
     <Content Include="x64\SQLite.Interop.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

TBF/UI/Bench/Components/ComponentParametersDlg.cs

@@ -40,6 +40,9 @@ namespace TBF.UI.Bench.Components
         ComponentParametersDlg()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
         }
 
         /// <summary>

TBF/UI/Bench/Components/ComponentsManagerDlg.cs

@@ -72,6 +72,8 @@ namespace TBF.UI.Bench.Components
 
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             flags = CfgUpdateFlags.None;
 
             selectComponentTypeDlg = new SelectComponentClassDlg();