From 0fcf91fc13cb5bf87c5cc9326257354784321a0a Mon Sep 17 00:00:00 2001 From: STAM Date: Sun, 8 Mar 2020 02:37:54 +0300 Subject: [PATCH] ui fixes --- .../Properties/translations/MenuItems.Designer.cs | 11 ++++++++++- .../Properties/translations/MenuItems.resx | 5 ++++- .../Properties/translations/MenuItems.ru.resx | 9 ++++++--- src/UniversalValveToolbox/UI/FormAddons.Designer.cs | 7 +++++-- src/UniversalValveToolbox/UI/FormMain.cs | 7 ++++++- ...Profiles.Designer.cs => FormProjects.Designer.cs} | 12 ++++++------ .../UI/{FormProfiles.cs => FormProjects.cs} | 4 ++-- .../UI/{FormProfiles.resx => FormProjects.resx} | 0 .../UI/FormSettings.Designer.cs | 12 ------------ .../UniversalValveToolbox.csproj | 10 +++++----- 10 files changed, 44 insertions(+), 33 deletions(-) rename src/UniversalValveToolbox/UI/{FormProfiles.Designer.cs => FormProjects.Designer.cs} (98%) rename src/UniversalValveToolbox/UI/{FormProfiles.cs => FormProjects.cs} (98%) rename src/UniversalValveToolbox/UI/{FormProfiles.resx => FormProjects.resx} (100%) diff --git a/src/UniversalValveToolbox/Properties/translations/MenuItems.Designer.cs b/src/UniversalValveToolbox/Properties/translations/MenuItems.Designer.cs index 0eed1ae..da09288 100644 --- a/src/UniversalValveToolbox/Properties/translations/MenuItems.Designer.cs +++ b/src/UniversalValveToolbox/Properties/translations/MenuItems.Designer.cs @@ -88,7 +88,7 @@ namespace UniversalValveToolbox.Properties.translations { } /// - /// Looks up a localized string similar to GitHub Link. + /// Looks up a localized string similar to Sources on GitHub (link). /// internal static string itmGitHubLink { get { @@ -96,6 +96,15 @@ namespace UniversalValveToolbox.Properties.translations { } } + /// + /// Looks up a localized string similar to Report Issue, Bug, Feature Request, etc (link). + /// + internal static string itmGitHubReport { + get { + return ResourceManager.GetString("itmGitHubReport", resourceCulture); + } + } + /// /// Looks up a localized string similar to Open Settings. /// diff --git a/src/UniversalValveToolbox/Properties/translations/MenuItems.resx b/src/UniversalValveToolbox/Properties/translations/MenuItems.resx index 407d9d4..e01f10c 100644 --- a/src/UniversalValveToolbox/Properties/translations/MenuItems.resx +++ b/src/UniversalValveToolbox/Properties/translations/MenuItems.resx @@ -127,7 +127,10 @@ Edit Addons - GitHub Link + Sources on GitHub (link) + + + Report Issue, Bug, Feature Request, etc (link) Open Settings diff --git a/src/UniversalValveToolbox/Properties/translations/MenuItems.ru.resx b/src/UniversalValveToolbox/Properties/translations/MenuItems.ru.resx index 614c038..8f989b8 100644 --- a/src/UniversalValveToolbox/Properties/translations/MenuItems.ru.resx +++ b/src/UniversalValveToolbox/Properties/translations/MenuItems.ru.resx @@ -124,15 +124,18 @@ Редактор Проектов - Редактор Плагинов + Редактор Дополнений - Ссылка на GitHub + Исходный код на GitHub (ссылка) + + + Сообщить об ошибке, создать запрос, и тд (ссылка) Открыть Настройки - Run Project + Запуск Проекта \ No newline at end of file diff --git a/src/UniversalValveToolbox/UI/FormAddons.Designer.cs b/src/UniversalValveToolbox/UI/FormAddons.Designer.cs index db25827..9226338 100644 --- a/src/UniversalValveToolbox/UI/FormAddons.Designer.cs +++ b/src/UniversalValveToolbox/UI/FormAddons.Designer.cs @@ -100,7 +100,7 @@ // buttonNew // this.buttonNew.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.buttonNew.Location = new System.Drawing.Point(408, 52); + this.buttonNew.Location = new System.Drawing.Point(408, 63); this.buttonNew.Name = "buttonNew"; this.buttonNew.Size = new System.Drawing.Size(75, 23); this.buttonNew.TabIndex = 9; @@ -222,7 +222,7 @@ // // buttonApply // - this.buttonApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonApply.Location = new System.Drawing.Point(408, 382); this.buttonApply.Name = "buttonApply"; this.buttonApply.Size = new System.Drawing.Size(75, 23); @@ -233,6 +233,9 @@ // // engineCheckedListBox // + this.engineCheckedListBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.engineCheckedListBox.CheckOnClick = true; this.engineCheckedListBox.FormattingEnabled = true; this.engineCheckedListBox.Location = new System.Drawing.Point(15, 182); diff --git a/src/UniversalValveToolbox/UI/FormMain.cs b/src/UniversalValveToolbox/UI/FormMain.cs index acfc235..8827b0b 100644 --- a/src/UniversalValveToolbox/UI/FormMain.cs +++ b/src/UniversalValveToolbox/UI/FormMain.cs @@ -95,6 +95,7 @@ namespace UniversalValveToolbox { ListViewItem listViewItemEditPlugins = new ListViewItem(Properties.translations.MenuItems.itmEditPlugins, 4); ListViewItem listViewItemAbout = new ListViewItem(Properties.translations.MenuItems.itmAbout, 5); ListViewItem listViewItemGitHubLink = new ListViewItem(Properties.translations.MenuItems.itmGitHubLink, 0); + ListViewItem listViewItemGitHubReport = new ListViewItem(Properties.translations.MenuItems.itmGitHubReport, 0); //add item to category(group) listViewItemSettings.Group = listViewGroupSettings; @@ -103,6 +104,7 @@ namespace UniversalValveToolbox { listViewItemAbout.Group = listViewGroupSupport; listViewItemGitHubLink.Group = listViewGroupSupport; + listViewItemGitHubReport.Group = listViewGroupSupport; //draw items and categories in forms listView.Groups.AddRange(new ListViewGroup[] { @@ -124,6 +126,7 @@ namespace UniversalValveToolbox { listViewItemEditConfigurations, listViewItemEditPlugins, listViewItemGitHubLink, + listViewItemGitHubReport, listViewItemAbout }); } @@ -359,7 +362,7 @@ namespace UniversalValveToolbox { this.OpenSettings(); } else if (selectItemText == Properties.translations.MenuItems.itmEditConfigurations) { - var frmProfiles = new FormProfiles(); + var frmProfiles = new FormProjects(); if (frmProfiles.ShowDialog() == DialogResult.OK) { Application.Restart(); } @@ -376,6 +379,8 @@ namespace UniversalValveToolbox { } else if (selectItemText == Properties.translations.MenuItems.itmGitHubLink) { Process.Start("https://github.com/EpicMorg/UniversalValveToolbox"); + } else if (selectItemText == Properties.translations.MenuItems.itmGitHubReport) { + Process.Start("https://github.com/EpicMorg/UniversalValveToolbox/issues/new/choose"); } } diff --git a/src/UniversalValveToolbox/UI/FormProfiles.Designer.cs b/src/UniversalValveToolbox/UI/FormProjects.Designer.cs similarity index 98% rename from src/UniversalValveToolbox/UI/FormProfiles.Designer.cs rename to src/UniversalValveToolbox/UI/FormProjects.Designer.cs index 753a2f4..a033425 100644 --- a/src/UniversalValveToolbox/UI/FormProfiles.Designer.cs +++ b/src/UniversalValveToolbox/UI/FormProjects.Designer.cs @@ -1,7 +1,7 @@ using System; namespace UniversalValveToolbox { - partial class FormProfiles { + partial class FormProjects { /// /// Required designer variable. /// @@ -25,7 +25,7 @@ namespace UniversalValveToolbox { /// the contents of this method with the code editor. /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormProfiles)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormProjects)); this.comboBox_Mod = new System.Windows.Forms.ComboBox(); this.buttonOK = new System.Windows.Forms.Button(); this.buttonCancel = new System.Windows.Forms.Button(); @@ -84,7 +84,7 @@ namespace UniversalValveToolbox { // buttonNew // this.buttonNew.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.buttonNew.Location = new System.Drawing.Point(413, 52); + this.buttonNew.Location = new System.Drawing.Point(413, 63); this.buttonNew.Name = "buttonNew"; this.buttonNew.Size = new System.Drawing.Size(75, 23); this.buttonNew.TabIndex = 7; @@ -192,7 +192,7 @@ namespace UniversalValveToolbox { // // buttonApply // - this.buttonApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonApply.Location = new System.Drawing.Point(413, 225); this.buttonApply.Name = "buttonApply"; this.buttonApply.Size = new System.Drawing.Size(75, 23); @@ -219,7 +219,7 @@ namespace UniversalValveToolbox { this.labelArgs.TabIndex = 29; this.labelArgs.Text = "Arguments:"; // - // FormProfiles + // FormProjects // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -243,7 +243,7 @@ namespace UniversalValveToolbox { this.Controls.Add(this.comboBox_Mod); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MinimumSize = new System.Drawing.Size(516, 259); - this.Name = "FormProfiles"; + this.Name = "FormProjects"; this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Edit Projects"; diff --git a/src/UniversalValveToolbox/UI/FormProfiles.cs b/src/UniversalValveToolbox/UI/FormProjects.cs similarity index 98% rename from src/UniversalValveToolbox/UI/FormProfiles.cs rename to src/UniversalValveToolbox/UI/FormProjects.cs index b1deeae..230ca12 100644 --- a/src/UniversalValveToolbox/UI/FormProfiles.cs +++ b/src/UniversalValveToolbox/UI/FormProjects.cs @@ -9,7 +9,7 @@ using UniversalValveToolbox.Model.ViewModel; using UniversalValveToolbox.Utils; namespace UniversalValveToolbox { - public partial class FormProfiles : Form { + public partial class FormProjects : Form { private bool needRestart = false; private DataProvider dataProvider = new DataProvider(); @@ -17,7 +17,7 @@ namespace UniversalValveToolbox { private FormProjectViewModel model; - public FormProfiles() { + public FormProjects() { InitializeComponent(); model = new FormProjectViewModel(dataProvider.Projects, dataProvider.Engines); diff --git a/src/UniversalValveToolbox/UI/FormProfiles.resx b/src/UniversalValveToolbox/UI/FormProjects.resx similarity index 100% rename from src/UniversalValveToolbox/UI/FormProfiles.resx rename to src/UniversalValveToolbox/UI/FormProjects.resx diff --git a/src/UniversalValveToolbox/UI/FormSettings.Designer.cs b/src/UniversalValveToolbox/UI/FormSettings.Designer.cs index a6cdade..09cb91f 100644 --- a/src/UniversalValveToolbox/UI/FormSettings.Designer.cs +++ b/src/UniversalValveToolbox/UI/FormSettings.Designer.cs @@ -31,7 +31,6 @@ this.comboBoxLang = new System.Windows.Forms.ComboBox(); this.comboBoxTheme = new System.Windows.Forms.ComboBox(); this.label6 = new System.Windows.Forms.Label(); - this.elementHost1 = new System.Windows.Forms.Integration.ElementHost(); this.SuspendLayout(); // // labelDivider @@ -110,21 +109,11 @@ this.label6.TabIndex = 31; this.label6.Text = "Theme:"; // - // elementHost1 - // - this.elementHost1.Location = new System.Drawing.Point(12, 93); - this.elementHost1.Name = "elementHost1"; - this.elementHost1.Size = new System.Drawing.Size(287, 176); - this.elementHost1.TabIndex = 33; - this.elementHost1.Text = "elementHost1"; - this.elementHost1.Child = null; - // // FormSettings // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(311, 319); - this.Controls.Add(this.elementHost1); this.Controls.Add(this.comboBoxTheme); this.Controls.Add(this.label6); this.Controls.Add(this.comboBoxLang); @@ -154,6 +143,5 @@ private System.Windows.Forms.ComboBox comboBoxLang; private System.Windows.Forms.ComboBox comboBoxTheme; private System.Windows.Forms.Label label6; - private System.Windows.Forms.Integration.ElementHost elementHost1; } } \ No newline at end of file diff --git a/src/UniversalValveToolbox/UniversalValveToolbox.csproj b/src/UniversalValveToolbox/UniversalValveToolbox.csproj index 1572945..a0d898f 100644 --- a/src/UniversalValveToolbox/UniversalValveToolbox.csproj +++ b/src/UniversalValveToolbox/UniversalValveToolbox.csproj @@ -96,11 +96,11 @@ FormAddons.cs - + Form - - FormProfiles.cs + + FormProjects.cs Form @@ -181,8 +181,8 @@ FormAddons.cs - - FormProfiles.cs + + FormProjects.cs FormMain.cs