diff --git a/Luncher/Forms/Launcher/Launcher.cs b/Luncher/Forms/Launcher/Launcher.cs index f66869f..a926346 100644 --- a/Luncher/Forms/Launcher/Launcher.cs +++ b/Luncher/Forms/Launcher/Launcher.cs @@ -11,6 +11,7 @@ using System.Threading; using System.Windows.Forms; using Ionic.Zip; +using Luncher.Localization; using Luncher.Properties; using Luncher.YaDra4il; using Newtonsoft.Json.Linq; @@ -220,7 +221,7 @@ private void UpdateUserProfiles() public Dictionary LogTab(string text, string profilename) { - var report = new RadPageViewPage {Text = @"Log: " + profilename}; + var report = new RadPageViewPage {Text = string.Format("{0} ({1})", Localization_LauncherForm.Launcher_LogTab_GameOutputText, profilename)}; var killprocess = new RadButton { Text = Resources.Launcher_ShowLogTab_Завершить, Anchor = (AnchorStyles.Right | AnchorStyles.Top) }; var panel = new RadPanel {Text = text, Dock = DockStyle.Top}; panel.Size = new Size(panel.Size.Width, 60); diff --git a/Luncher/Forms/MainForm/MainForm.cs b/Luncher/Forms/MainForm/MainForm.cs index 2411005..af1a36f 100644 --- a/Luncher/Forms/MainForm/MainForm.cs +++ b/Luncher/Forms/MainForm/MainForm.cs @@ -63,7 +63,11 @@ private void MainForm_Load(object sender, EventArgs e) { { "d|directory=", "minecraft custom {PATH}.", - v => Program.Minecraft = v + v => + { + Program.Minecraft = v; + WriteLog("Setting Minecraft directory: " + Program.Minecraft); + } }, }; try @@ -77,7 +81,6 @@ private void MainForm_Load(object sender, EventArgs e) Program.Minecraft = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\.minecraft"; } - WriteLog("Setting Minecraft directory: " + Program.Minecraft); } else Program.Minecraft = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @@ -322,8 +325,7 @@ private void CheckApplicationUpdate() var openUrlButton = new RadButtonElement("Получить обновление"); openUrlButton.Click += delegate { - Process.Start( - @"https://docs.google.com/spreadsheet/ccc?key=0AlHr5lFJzStndHpHVEFORHBYUGd6eXEtQjQ2Y1ZIaWc&usp=sharing"); + Process.Start(@"http://goo.gl/YWCrAl"); alert.Hide(); Application.Exit(); }; @@ -339,7 +341,7 @@ private void CheckApplicationUpdate() } catch (Exception ex) { - WriteLog("Во время проверки обновлений возникла ошибка:\n" + ex); + WriteLog("Во время проверки обновлений возникла ошибка:\n" + ex.Message + "\nPlease, head to http://vk.com/sesmc for actual news"); CheckVersions(); } } diff --git a/Luncher/Forms/ProfileForm/ProfileForm.cs b/Luncher/Forms/ProfileForm/ProfileForm.cs index ac98b00..7316003 100644 --- a/Luncher/Forms/ProfileForm/ProfileForm.cs +++ b/Luncher/Forms/ProfileForm/ProfileForm.cs @@ -117,8 +117,8 @@ private void GetParams(string pName) if ((json.allowedReleaseTypes as JArray).ToList().Contains("old_beta")) EnableBeta.ToggleState = Telerik.WinControls.Enumerations.ToggleState.On; } - ResX.Text = json.resolution != null ? json.resolution.width : @"480"; - ResY.Text = json.resolution != null ? json.resolution.height : @"854"; + ResX.Text = json.resolution != null ? json.resolution.width : @"854"; + ResY.Text = json.resolution != null ? json.resolution.height : @"480"; if (json.gameDir != null) { Gamedir.Text = json.gameDir; diff --git a/Luncher/Localization/Localization.LauncherForm.Designer.cs b/Luncher/Localization/Localization.LauncherForm.Designer.cs new file mode 100644 index 0000000..e38c133 --- /dev/null +++ b/Luncher/Localization/Localization.LauncherForm.Designer.cs @@ -0,0 +1,72 @@ +//------------------------------------------------------------------------------ +// +// Этот код создан программой. +// Исполняемая версия:4.0.30319.34014 +// +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. +// +//------------------------------------------------------------------------------ + +namespace Luncher.Localization { + using System; + + + /// + /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. + /// + // Этот класс создан автоматически классом StronglyTypedResourceBuilder + // с помощью такого средства, как ResGen или Visual Studio. + // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen + // с параметром /str или перестройте свой проект VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Localization_LauncherForm { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Localization_LauncherForm() { + } + + /// + /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Luncher.Localization.Localization.LauncherForm", typeof(Localization_LauncherForm).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Перезаписывает свойство CurrentUICulture текущего потока для всех + /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Ищет локализованную строку, похожую на Вывод игры. + /// + internal static string Launcher_LogTab_GameOutputText { + get { + return ResourceManager.GetString("Launcher_LogTab_GameOutputText", resourceCulture); + } + } + } +} diff --git a/Luncher/Localization/Localization.LauncherForm.be.resx b/Luncher/Localization/Localization.LauncherForm.be.resx new file mode 100644 index 0000000..e4949d3 --- /dev/null +++ b/Luncher/Localization/Localization.LauncherForm.be.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Выснова гульні + + \ No newline at end of file diff --git a/Luncher/Localization/Localization.LauncherForm.en.resx b/Luncher/Localization/Localization.LauncherForm.en.resx new file mode 100644 index 0000000..258d452 --- /dev/null +++ b/Luncher/Localization/Localization.LauncherForm.en.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Game Output + + \ No newline at end of file diff --git a/Luncher/Localization/Localization.LauncherForm.resx b/Luncher/Localization/Localization.LauncherForm.resx new file mode 100644 index 0000000..35bd8b2 --- /dev/null +++ b/Luncher/Localization/Localization.LauncherForm.resx @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Вывод игры + + \ No newline at end of file diff --git a/Luncher/Localization/Localization.LauncherForm.ru.resx b/Luncher/Localization/Localization.LauncherForm.ru.resx new file mode 100644 index 0000000..2b4961d --- /dev/null +++ b/Luncher/Localization/Localization.LauncherForm.ru.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Вывод игры + + \ No newline at end of file diff --git a/Luncher/Localization/Localization.LauncherForm.uk.resx b/Luncher/Localization/Localization.LauncherForm.uk.resx new file mode 100644 index 0000000..02c0f63 --- /dev/null +++ b/Luncher/Localization/Localization.LauncherForm.uk.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Виведення гри + + \ No newline at end of file diff --git a/Luncher/Luncher.csproj b/Luncher/Luncher.csproj index a58fde3..d5bd81f 100644 --- a/Luncher/Luncher.csproj +++ b/Luncher/Luncher.csproj @@ -137,6 +137,11 @@ True Localization.MainForm.resx + + True + True + Localization.LauncherForm.resx + Form @@ -224,6 +229,14 @@ + + + + ResXFileCodeGenerator + Localization.LauncherForm.Designer.cs + + + @@ -287,7 +300,7 @@ - + diff --git a/Luncher/MinecraftProcess.cs b/Luncher/MinecraftProcess.cs index 7ae8629..11d329d 100644 --- a/Luncher/MinecraftProcess.cs +++ b/Luncher/MinecraftProcess.cs @@ -58,7 +58,7 @@ public MinecraftProcess(object mainForm, string assetsPath, string libraries, st dynamic profileSJson = JObject.Parse(File.ReadAllText(nativesFolder + @"\" + LastVersionId + ".json")); MainClass = profileSJson.mainClass; Arg = profileSJson.minecraftArguments + - (ip != null ? string.Format(" --server {0} --port {1}", ip, (port ?? "25565")) : string.Empty); + (ip != null ? string.Format(" --server {0} --port {1}", ip, (port ?? "25565")) : string.Empty) + (json.resolution != null ? " --width " + json.resolution.width + " --height " + json.resolution.height : null); libraries += string.Format(";{0}\\{1}.jar", nativesFolder, LastVersionId); if (_launcherVisibilityOnGameClose != 1) { diff --git a/Luncher/Properties/AssemblyInfo.cs b/Luncher/Properties/AssemblyInfo.cs index bf1ad04..6434d96 100644 --- a/Luncher/Properties/AssemblyInfo.cs +++ b/Luncher/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ // Можно задать все значения или принять номера сборки и редакции по умолчанию // используя "*", как показано ниже: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.4.5.2003")] -[assembly: AssemblyFileVersion("1.4.5.2003")] +[assembly: AssemblyVersion("1.4.6.2015")] +[assembly: AssemblyFileVersion("1.4.6.2015")] [assembly: NeutralResourcesLanguageAttribute("ru-RU")]