diff --git a/src/UniversalValveToolbox/Form/FormAbout.Designer.cs b/src/UniversalValveToolbox/UI/FormAbout.Designer.cs
similarity index 100%
rename from src/UniversalValveToolbox/Form/FormAbout.Designer.cs
rename to src/UniversalValveToolbox/UI/FormAbout.Designer.cs
index 618ffcd..4ee1b92 100644
--- a/src/UniversalValveToolbox/Form/FormAbout.Designer.cs
+++ b/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);
diff --git a/src/UniversalValveToolbox/Form/FormAbout.cs b/src/UniversalValveToolbox/UI/FormAbout.cs
similarity index 82%
rename from src/UniversalValveToolbox/Form/FormAbout.cs
rename to src/UniversalValveToolbox/UI/FormAbout.cs
index edf10fe..255a928 100644
--- a/src/UniversalValveToolbox/Form/FormAbout.cs
+++ b/src/UniversalValveToolbox/UI/FormAbout.cs
@@ -6,9 +6,9 @@ namespace UniversalValveToolbox {
public partial class FormAbout : Form {
public FormAbout() {
InitializeComponent();
- labelVersion.Text = VersionHelper.AssemblyVersion;
- labelTitle.Text = VersionHelper.AssemblyTitle;
- labelCopy.Text = VersionHelper.AssemblyCopyright;
+ labelVersion.Text = Utils.VersionHelper.AssemblyVersion;
+ labelTitle.Text = Utils.VersionHelper.AssemblyTitle;
+ labelCopy.Text = Utils.VersionHelper.AssemblyCopyright;
}
private void FormAbout_Load(object sender, EventArgs e) {
diff --git a/src/UniversalValveToolbox/Form/FormAbout.resx b/src/UniversalValveToolbox/UI/FormAbout.resx
similarity index 100%
rename from src/UniversalValveToolbox/Form/FormAbout.resx
rename to src/UniversalValveToolbox/UI/FormAbout.resx
diff --git a/src/UniversalValveToolbox/Form/FormAddons.Designer.cs b/src/UniversalValveToolbox/UI/FormAddons.Designer.cs
similarity index 100%
rename from src/UniversalValveToolbox/Form/FormAddons.Designer.cs
rename to src/UniversalValveToolbox/UI/FormAddons.Designer.cs
diff --git a/src/UniversalValveToolbox/Form/FormAddons.cs b/src/UniversalValveToolbox/UI/FormAddons.cs
similarity index 100%
rename from src/UniversalValveToolbox/Form/FormAddons.cs
rename to src/UniversalValveToolbox/UI/FormAddons.cs
diff --git a/src/UniversalValveToolbox/Form/FormAddons.resx b/src/UniversalValveToolbox/UI/FormAddons.resx
similarity index 100%
rename from src/UniversalValveToolbox/Form/FormAddons.resx
rename to src/UniversalValveToolbox/UI/FormAddons.resx
diff --git a/src/UniversalValveToolbox/Form/FormMain.Designer.cs b/src/UniversalValveToolbox/UI/FormMain.Designer.cs
similarity index 100%
rename from src/UniversalValveToolbox/Form/FormMain.Designer.cs
rename to src/UniversalValveToolbox/UI/FormMain.Designer.cs
diff --git a/src/UniversalValveToolbox/Form/FormMain.cs b/src/UniversalValveToolbox/UI/FormMain.cs
similarity index 98%
rename from src/UniversalValveToolbox/Form/FormMain.cs
rename to src/UniversalValveToolbox/UI/FormMain.cs
index 3630e9c..de14441 100644
--- a/src/UniversalValveToolbox/Form/FormMain.cs
+++ b/src/UniversalValveToolbox/UI/FormMain.cs
@@ -2,8 +2,8 @@
using System;
using System.Diagnostics;
using System.Windows.Forms;
-using UniversalValveToolbox.Util;
-using UniversalValveToolbox.Util.Dto;
+using UniversalValveToolbox.Utils;
+using UniversalValveToolbox.Utils.Dto;
namespace UniversalValveToolbox {
public partial class FormMain : Form {
diff --git a/src/UniversalValveToolbox/Form/FormMain.resx b/src/UniversalValveToolbox/UI/FormMain.resx
similarity index 100%
rename from src/UniversalValveToolbox/Form/FormMain.resx
rename to src/UniversalValveToolbox/UI/FormMain.resx
diff --git a/src/UniversalValveToolbox/Form/FormProfiles.Designer.cs b/src/UniversalValveToolbox/UI/FormProfiles.Designer.cs
similarity index 100%
rename from src/UniversalValveToolbox/Form/FormProfiles.Designer.cs
rename to src/UniversalValveToolbox/UI/FormProfiles.Designer.cs
diff --git a/src/UniversalValveToolbox/Form/FormProfiles.cs b/src/UniversalValveToolbox/UI/FormProfiles.cs
similarity index 100%
rename from src/UniversalValveToolbox/Form/FormProfiles.cs
rename to src/UniversalValveToolbox/UI/FormProfiles.cs
diff --git a/src/UniversalValveToolbox/Form/FormProfiles.resx b/src/UniversalValveToolbox/UI/FormProfiles.resx
similarity index 100%
rename from src/UniversalValveToolbox/Form/FormProfiles.resx
rename to src/UniversalValveToolbox/UI/FormProfiles.resx
diff --git a/src/UniversalValveToolbox/Form/FormSettings.Designer.cs b/src/UniversalValveToolbox/UI/FormSettings.Designer.cs
similarity index 100%
rename from src/UniversalValveToolbox/Form/FormSettings.Designer.cs
rename to src/UniversalValveToolbox/UI/FormSettings.Designer.cs
diff --git a/src/UniversalValveToolbox/Form/FormSettings.cs b/src/UniversalValveToolbox/UI/FormSettings.cs
similarity index 96%
rename from src/UniversalValveToolbox/Form/FormSettings.cs
rename to src/UniversalValveToolbox/UI/FormSettings.cs
index 20b0655..04c5aa7 100644
--- a/src/UniversalValveToolbox/Form/FormSettings.cs
+++ b/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 {
diff --git a/src/UniversalValveToolbox/Form/FormSettings.resx b/src/UniversalValveToolbox/UI/FormSettings.resx
similarity index 100%
rename from src/UniversalValveToolbox/Form/FormSettings.resx
rename to src/UniversalValveToolbox/UI/FormSettings.resx
diff --git a/src/UniversalValveToolbox/UniversalValveToolbox.csproj b/src/UniversalValveToolbox/UniversalValveToolbox.csproj
index f3d4695..4329255 100644
--- a/src/UniversalValveToolbox/UniversalValveToolbox.csproj
+++ b/src/UniversalValveToolbox/UniversalValveToolbox.csproj
@@ -60,34 +60,34 @@
-
+
Form
-
+
FormAbout.cs
-
+
Form
-
+
FormAddons.cs
-
+
Form
-
+
FormProfiles.cs
-
+
Form
-
+
FormMain.cs
-
+
Form
-
+
FormSettings.cs
@@ -117,21 +117,21 @@
True
MessageBoxes.resx
-
-
-
+
+
+
FormAbout.cs
-
+
FormAddons.cs
-
+
FormProfiles.cs
-
+
FormMain.cs
-
+
FormSettings.cs
diff --git a/src/UniversalValveToolbox/Util/JsonReader.cs b/src/UniversalValveToolbox/Utils/JsonReader.cs
similarity index 96%
rename from src/UniversalValveToolbox/Util/JsonReader.cs
rename to src/UniversalValveToolbox/Utils/JsonReader.cs
index 8864fd3..b2a81f1 100644
--- a/src/UniversalValveToolbox/Util/JsonReader.cs
+++ b/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;
diff --git a/src/UniversalValveToolbox/Util/VersionHelper.cs b/src/UniversalValveToolbox/Utils/VersionHelper.cs
similarity index 96%
rename from src/UniversalValveToolbox/Util/VersionHelper.cs
rename to src/UniversalValveToolbox/Utils/VersionHelper.cs
index cd436d7..6a6fc8d 100644
--- a/src/UniversalValveToolbox/Util/VersionHelper.cs
+++ b/src/UniversalValveToolbox/Utils/VersionHelper.cs
@@ -1,8 +1,8 @@
using System;
using System.Reflection;
-namespace UniversalValveToolbox {
- class VersionHelper {
+namespace UniversalValveToolbox.Utils {
+ internal static class VersionHelper {
public static string AssemblyVersion {
get {
return " " + Assembly.GetExecutingAssembly().GetName().Version.ToString();
diff --git a/src/UniversalValveToolbox/json/settings.json b/src/UniversalValveToolbox/json/settings.json
index 9e91e31..4cce65b 100644
--- a/src/UniversalValveToolbox/json/settings.json
+++ b/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
}
\ No newline at end of file