Fixed #32;

Minor code changes.

Author: dedepete

.gitignore

@@ -212,7 +212,6 @@ _Pvt_Extensions/
 ModelManifest.xml
 
 # Custom files
-/src/FreeLauncher/Properties/licenses.licx
 /FreeLauncher.sln.ide
 /FreeLauncher_Report.htm
 /FreeLauncher_Backup_*/

src/FreeLauncher/Localization.cs renamed to src/FreeLauncher/ApplicationLocalization.cs

@@ -1,6 +1,6 @@
 namespace FreeLauncher
 {
-    public class Localization
+    public class ApplicationLocalization
     {
         public string Name { get; set; } = "Русский";
         public string LanguageTag { get; set; } = "ru-RU";

src/FreeLauncher/Configuration.cs

@@ -17,8 +17,8 @@ public class Configuration
 
         public ApplicationArguments Arguments { get; private set; }
 
-        public Localization Localization { get; private set; }
-        public Dictionary<string, Localization> LocalizationsList { get; private set; }
+        public ApplicationLocalization Localization { get; private set; }
+        public Dictionary<string, ApplicationLocalization> LocalizationsList { get; private set; }
 
         public string McDirectory { get; private set; }
         public string McLauncher { get; private set; }
@@ -30,8 +30,8 @@ public class Configuration
         public Configuration(string[] args)
         {
             Arguments = new ApplicationArguments();
-            Localization = new Localization();
-            LocalizationsList = new Dictionary<string, Localization>();
+            Localization = new ApplicationLocalization();
+            LocalizationsList = new Dictionary<string, ApplicationLocalization>();
             Parser.Default.ParseArguments(args, Arguments);
             McDirectory = Arguments.WorkingDirectory ??
                 Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
@@ -47,7 +47,7 @@ public Configuration(string[] args)
 
         public void SetLocalization(string localizationName)
         {
-            Localization = string.IsNullOrEmpty(localizationName) ? new Localization() : LocalizationsList[localizationName];
+            Localization = string.IsNullOrEmpty(localizationName) ? new ApplicationLocalization() : LocalizationsList[localizationName];
         }
 
         public void SaveConfiguration()
@@ -69,7 +69,7 @@ private void LoadLocalization()
         {
             Assembly assembly = Assembly.GetExecutingAssembly();
             string s = new StreamReader(assembly.GetManifestResourceStream("FreeLauncher.Translations.en_UK.lang.json")).ReadToEnd();
-            LocalizationsList.Add(JObject.Parse(s)["LanguageTag"].ToString(), JsonConvert.DeserializeObject<Localization>(s));
+            LocalizationsList.Add(JObject.Parse(s)["LanguageTag"].ToString(), JsonConvert.DeserializeObject<ApplicationLocalization>(s));
             if (ApplicationConfiguration.SelectedLanguage == "en-UK") {
                 Localization = LocalizationsList["en-UK"];
             }
@@ -81,7 +81,7 @@ private void LoadLocalization()
                 .GetFiles("*.json", SearchOption.AllDirectories)
                 .Where(file => file.Name.Contains("lang"))
                 .Select(file => JObject.Parse(File.ReadAllText(file.FullName)))
-                .Select(jo => JsonConvert.DeserializeObject<Localization>(jo.ToString()))) {
+                .Select(jo => JsonConvert.DeserializeObject<ApplicationLocalization>(jo.ToString()))) {
                 if (LocalizationsList.ContainsKey(local.LanguageTag)) {
                     continue;
                 }

src/FreeLauncher/Forms/LauncherForm/LauncherForm.cs

@@ -113,7 +113,7 @@ public LauncherForm(Configuration configuration)
             AppendLog(new string('=', 12));
 
             if (_configuration.LocalizationsList.Count != 0) {
-                foreach (KeyValuePair<string, Localization> keyvalue in _configuration.LocalizationsList) {
+                foreach (KeyValuePair<string, ApplicationLocalization> keyvalue in _configuration.LocalizationsList) {
                     LangDropDownList.Items.Add(new RadListDataItem {
                         Text = $"{keyvalue.Value.Name} ({keyvalue.Key})",
                         Tag = keyvalue.Key
@@ -1037,7 +1037,7 @@ public LauncherFormOutput AddOutputPage()
 
         private void LoadLocalization()
         {
-            Localization localization = _configuration.Localization;
+            ApplicationLocalization localization = _configuration.Localization;
 
             News.Text = localization.NewsTabText;
             ConsolePage.Text = localization.ConsoleTabText;

src/FreeLauncher/Forms/ProfileForm/ProfileForm.cs

@@ -83,7 +83,7 @@ public ProfileForm(Profile profile, Configuration configuration)
 
         private void LoadLocalization()
         {
-            Localization localization = _configuration.Localization;
+            ApplicationLocalization localization = _configuration.Localization;
 
             MainProfileSettingsGroupBox.Text = localization.MainProfileSettingsGroup;
             VersionSettingsGroupBox.Text = localization.VersionSettingsGroup;

src/FreeLauncher/Forms/UsersForm/UsersForm.cs

@@ -151,7 +151,7 @@ private void TextBox_TextChanged(object sender, EventArgs e)
 
         private void LoadLocalization()
         {
-            Localization localization = _configuration.Localization;
+            ApplicationLocalization localization = _configuration.Localization;
             DeleteUserButton.Text = localization.RemoveSelectedUser;
             AddNewUserBox.Text = localization.AddNewUserBox;
             NicknameLabel.Text = localization.Nickname;

src/FreeLauncher/FreeLauncher.csproj

@@ -147,7 +147,7 @@
       <DependentUpon>UsersForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Java.cs" />
-    <Compile Include="Localization.cs" />
+    <Compile Include="ApplicationLocalization.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Configuration.cs" />
@@ -161,7 +161,7 @@
     <EmbeddedResource Include="Forms\UsersForm\UsersForm.resx">
       <DependentUpon>UsersForm.cs</DependentUpon>
     </EmbeddedResource>
-    <None Include="Properties\licenses.licx" />
+    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -249,5 +249,7 @@
       <ErrorText>Данный проект ссылается на пакеты NuGet, отсутствующие на этом компьютере. Используйте восстановление пакетов NuGet, чтобы скачать их.  Дополнительную информацию см. по адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Fody.2.0.6\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.2.0.6\build\dotnet\Fody.targets'))" />
+    <Error Condition="!Exists('..\..\packages\EmptyLicensesLicx.1.1.0\build\EmptyLicensesLicx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EmptyLicensesLicx.1.1.0\build\EmptyLicensesLicx.targets'))" />
   </Target>
+  <Import Project="..\..\packages\EmptyLicensesLicx.1.1.0\build\EmptyLicensesLicx.targets" Condition="Exists('..\..\packages\EmptyLicensesLicx.1.1.0\build\EmptyLicensesLicx.targets')" />
 </Project>

src/FreeLauncher/Properties/AssemblyInfo.cs

@@ -31,6 +31,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.9.1545")]
-[assembly: AssemblyFileVersion("0.1.9.1545")]
+[assembly: AssemblyVersion("0.1.9.1548")]
+[assembly: AssemblyFileVersion("0.1.9.1548")]
 [assembly: AssemblyInformationalVersion("%version3%_%branch%.%shorthash%")]

src/FreeLauncher/Properties/licenses.licx

@@ -2,6 +2,7 @@
 <packages>
   <package id="CommandLineParser" version="1.9.71" targetFramework="net45" />
   <package id="DotNetZip" version="1.10.1" targetFramework="net40" />
+  <package id="EmptyLicensesLicx" version="1.1.0" targetFramework="net45" developmentDependency="true" />
   <package id="Fody" version="2.0.6" targetFramework="net45" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
   <package id="Stamp.Fody" version="1.3.1" targetFramework="net45" developmentDependency="true" />