edits

src/UniversalValveToolbox/UI/FormAbout.Designer.cs

@@ -38,8 +38,8 @@
             this.linkLabelIconSite = new System.Windows.Forms.LinkLabel();
             this.label1 = new System.Windows.Forms.Label();
             this.groupBox = new System.Windows.Forms.GroupBox();
-            this.linkLabelFP = new System.Windows.Forms.LinkLabel();
             this.linkLabelTI = new System.Windows.Forms.LinkLabel();
+            this.linkLabelFP = new System.Windows.Forms.LinkLabel();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLogo)).BeginInit();
             this.groupBox.SuspendLayout();
             this.SuspendLayout();
@@ -142,17 +142,6 @@
             this.groupBox.TabStop = false;
             this.groupBox.Text = "Icons by:";
             // 
-            // linkLabelFP
-            // 
-            this.linkLabelFP.AutoSize = true;
-            this.linkLabelFP.Location = new System.Drawing.Point(79, 21);
-            this.linkLabelFP.Name = "linkLabelFP";
-            this.linkLabelFP.Size = new System.Drawing.Size(42, 13);
-            this.linkLabelFP.TabIndex = 28;
-            this.linkLabelFP.TabStop = true;
-            this.linkLabelFP.Text = "Freepik";
-            this.linkLabelFP.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelFP_LinkClicked);
-            // 
             // linkLabelTI
             // 
             this.linkLabelTI.AutoSize = true;
@@ -164,6 +153,17 @@
             this.linkLabelTI.Text = "Those Icons";
             this.linkLabelTI.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelTI_LinkClicked);
             // 
+            // linkLabelFP
+            // 
+            this.linkLabelFP.AutoSize = true;
+            this.linkLabelFP.Location = new System.Drawing.Point(79, 21);
+            this.linkLabelFP.Name = "linkLabelFP";
+            this.linkLabelFP.Size = new System.Drawing.Size(42, 13);
+            this.linkLabelFP.TabIndex = 28;
+            this.linkLabelFP.TabStop = true;
+            this.linkLabelFP.Text = "Freepik";
+            this.linkLabelFP.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelFP_LinkClicked);
+            // 
             // FormAbout
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

src/UniversalValveToolbox/UI/FormAbout.cs

@@ -6,9 +6,9 @@ namespace UniversalValveToolbox {
     public partial class FormAbout : Form {
         public FormAbout() {
             InitializeComponent();
-            labelVersion.Text = VersionHelper.AssemblyVersion;
+            labelVersion.Text = Utils.VersionHelper.AssemblyVersion;
-            labelTitle.Text = VersionHelper.AssemblyTitle;
+            labelTitle.Text = Utils.VersionHelper.AssemblyTitle;
-            labelCopy.Text = VersionHelper.AssemblyCopyright;
+            labelCopy.Text = Utils.VersionHelper.AssemblyCopyright;
         }
 
         private void FormAbout_Load(object sender, EventArgs e) {

src/UniversalValveToolbox/UI/FormMain.cs

@@ -2,8 +2,8 @@
 using System;
 using System.Diagnostics;
 using System.Windows.Forms;
-using UniversalValveToolbox.Util;
+using UniversalValveToolbox.Utils;
-using UniversalValveToolbox.Util.Dto;
+using UniversalValveToolbox.Utils.Dto;
 
 namespace UniversalValveToolbox {
     public partial class FormMain : Form {

src/UniversalValveToolbox/UI/FormSettings.cs

@@ -1,7 +1,7 @@
 using kasthack.binding.wf;
 using System;
 using System.Windows.Forms;
-using UniversalValveToolbox.Util.Dto;
+using UniversalValveToolbox.Utils.Dto;
 
 namespace UniversalValveToolbox {
     public partial class FormSettings : Form {

src/UniversalValveToolbox/UniversalValveToolbox.csproj

@@ -60,34 +60,34 @@
     <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Form\FormAbout.cs">
+    <Compile Include="UI\FormAbout.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form\FormAbout.Designer.cs">
+    <Compile Include="UI\FormAbout.Designer.cs">
       <DependentUpon>FormAbout.cs</DependentUpon>
     </Compile>
-    <Compile Include="Form\FormAddons.cs">
+    <Compile Include="UI\FormAddons.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form\FormAddons.Designer.cs">
+    <Compile Include="UI\FormAddons.Designer.cs">
       <DependentUpon>FormAddons.cs</DependentUpon>
     </Compile>
-    <Compile Include="Form\FormProfiles.cs">
+    <Compile Include="UI\FormProfiles.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form\FormProfiles.Designer.cs">
+    <Compile Include="UI\FormProfiles.Designer.cs">
       <DependentUpon>FormProfiles.cs</DependentUpon>
     </Compile>
-    <Compile Include="Form\FormMain.cs">
+    <Compile Include="UI\FormMain.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form\FormMain.Designer.cs">
+    <Compile Include="UI\FormMain.Designer.cs">
       <DependentUpon>FormMain.cs</DependentUpon>
     </Compile>
-    <Compile Include="Form\FormSettings.cs">
+    <Compile Include="UI\FormSettings.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form\FormSettings.Designer.cs">
+    <Compile Include="UI\FormSettings.Designer.cs">
       <DependentUpon>FormSettings.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
@@ -117,21 +117,21 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>MessageBoxes.resx</DependentUpon>
     </Compile>
-    <Compile Include="Util\JsonReader.cs" />
+    <Compile Include="Utils\JsonReader.cs" />
-    <Compile Include="Util\VersionHelper.cs" />
+    <Compile Include="Utils\VersionHelper.cs" />
-    <EmbeddedResource Include="Form\FormAbout.resx">
+    <EmbeddedResource Include="UI\FormAbout.resx">
       <DependentUpon>FormAbout.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Form\FormAddons.resx">
+    <EmbeddedResource Include="UI\FormAddons.resx">
       <DependentUpon>FormAddons.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Form\FormProfiles.resx">
+    <EmbeddedResource Include="UI\FormProfiles.resx">
       <DependentUpon>FormProfiles.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Form\FormMain.resx">
+    <EmbeddedResource Include="UI\FormMain.resx">
       <DependentUpon>FormMain.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Form\FormSettings.resx">
+    <EmbeddedResource Include="UI\FormSettings.resx">
       <DependentUpon>FormSettings.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">

src/UniversalValveToolbox/Utils/JsonReader.cs

@@ -1,16 +1,13 @@
-using Newtonsoft.Json;
+using System;
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
-using UniversalValveToolbox.Util.Dto;
+using UniversalValveToolbox.Utils.Dto;
+using Newtonsoft.Json;
 
-namespace UniversalValveToolbox.Util {
+namespace UniversalValveToolbox.Utils {
     class DataManager {
         private readonly string SettingsPath = Path.Combine(Application.StartupPath, "json", "settings.json");
 
@@ -23,7 +20,7 @@ namespace UniversalValveToolbox.Util {
     }
 }
 
-namespace UniversalValveToolbox.Util.Dto {
+namespace UniversalValveToolbox.Utils.Dto {
     public class Addon : BaseModel {
         private int[] engine;
 

src/UniversalValveToolbox/Utils/VersionHelper.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Reflection;
 
-namespace UniversalValveToolbox {
+namespace UniversalValveToolbox.Utils {
-    class VersionHelper {
+    internal static class VersionHelper {
         public static string AssemblyVersion {
             get {
                 return " " + Assembly.GetExecutingAssembly().GetName().Version.ToString();

src/UniversalValveToolbox/json/settings.json

@@ -1,6 +1,11 @@
 {
   "DefaultProject": null,
   "AvalibleEnginies": null,
-  "Language": "Россиян",
+  "Language": [
+    {
+      "selected": "en-US",
+      "available": [ "en-US", "ru-RU" ]
+    }
+  ],
   "Theme": null
 }