This commit is contained in:
STAM 2020-03-08 02:37:54 +03:00
parent 5e3b6a19b4
commit 0fcf91fc13
10 changed files with 44 additions and 33 deletions

View File

@ -88,7 +88,7 @@ namespace UniversalValveToolbox.Properties.translations {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to GitHub Link. /// Looks up a localized string similar to Sources on GitHub (link).
/// </summary> /// </summary>
internal static string itmGitHubLink { internal static string itmGitHubLink {
get { get {
@ -96,6 +96,15 @@ namespace UniversalValveToolbox.Properties.translations {
} }
} }
/// <summary>
/// Looks up a localized string similar to Report Issue, Bug, Feature Request, etc (link).
/// </summary>
internal static string itmGitHubReport {
get {
return ResourceManager.GetString("itmGitHubReport", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Open Settings. /// Looks up a localized string similar to Open Settings.
/// </summary> /// </summary>

View File

@ -127,7 +127,10 @@
<value>Edit Addons</value> <value>Edit Addons</value>
</data> </data>
<data name="itmGitHubLink" xml:space="preserve"> <data name="itmGitHubLink" xml:space="preserve">
<value>GitHub Link</value> <value>Sources on GitHub (link)</value>
</data>
<data name="itmGitHubReport" xml:space="preserve">
<value>Report Issue, Bug, Feature Request, etc (link)</value>
</data> </data>
<data name="itmOpenSettings" xml:space="preserve"> <data name="itmOpenSettings" xml:space="preserve">
<value>Open Settings</value> <value>Open Settings</value>

View File

@ -124,15 +124,18 @@
<value>Редактор Проектов</value> <value>Редактор Проектов</value>
</data> </data>
<data name="itmEditPlugins" xml:space="preserve"> <data name="itmEditPlugins" xml:space="preserve">
<value>Редактор Плагинов</value> <value>Редактор Дополнений</value>
</data> </data>
<data name="itmGitHubLink" xml:space="preserve"> <data name="itmGitHubLink" xml:space="preserve">
<value>Ссылка на GitHub</value> <value>Исходный код на GitHub (ссылка)</value>
</data>
<data name="itmGitHubReport" xml:space="preserve">
<value>Сообщить об ошибке, создать запрос, и тд (ссылка)</value>
</data> </data>
<data name="itmOpenSettings" xml:space="preserve"> <data name="itmOpenSettings" xml:space="preserve">
<value>Открыть Настройки</value> <value>Открыть Настройки</value>
</data> </data>
<data name="itmRunProject" xml:space="preserve"> <data name="itmRunProject" xml:space="preserve">
<value>Run Project</value> <value>Запуск Проекта</value>
</data> </data>
</root> </root>

View File

@ -100,7 +100,7 @@
// buttonNew // buttonNew
// //
this.buttonNew.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 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.Name = "buttonNew";
this.buttonNew.Size = new System.Drawing.Size(75, 23); this.buttonNew.Size = new System.Drawing.Size(75, 23);
this.buttonNew.TabIndex = 9; this.buttonNew.TabIndex = 9;
@ -222,7 +222,7 @@
// //
// buttonApply // 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.Location = new System.Drawing.Point(408, 382);
this.buttonApply.Name = "buttonApply"; this.buttonApply.Name = "buttonApply";
this.buttonApply.Size = new System.Drawing.Size(75, 23); this.buttonApply.Size = new System.Drawing.Size(75, 23);
@ -233,6 +233,9 @@
// //
// engineCheckedListBox // 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.CheckOnClick = true;
this.engineCheckedListBox.FormattingEnabled = true; this.engineCheckedListBox.FormattingEnabled = true;
this.engineCheckedListBox.Location = new System.Drawing.Point(15, 182); this.engineCheckedListBox.Location = new System.Drawing.Point(15, 182);

View File

@ -95,6 +95,7 @@ namespace UniversalValveToolbox {
ListViewItem listViewItemEditPlugins = new ListViewItem(Properties.translations.MenuItems.itmEditPlugins, 4); ListViewItem listViewItemEditPlugins = new ListViewItem(Properties.translations.MenuItems.itmEditPlugins, 4);
ListViewItem listViewItemAbout = new ListViewItem(Properties.translations.MenuItems.itmAbout, 5); ListViewItem listViewItemAbout = new ListViewItem(Properties.translations.MenuItems.itmAbout, 5);
ListViewItem listViewItemGitHubLink = new ListViewItem(Properties.translations.MenuItems.itmGitHubLink, 0); ListViewItem listViewItemGitHubLink = new ListViewItem(Properties.translations.MenuItems.itmGitHubLink, 0);
ListViewItem listViewItemGitHubReport = new ListViewItem(Properties.translations.MenuItems.itmGitHubReport, 0);
//add item to category(group) //add item to category(group)
listViewItemSettings.Group = listViewGroupSettings; listViewItemSettings.Group = listViewGroupSettings;
@ -103,6 +104,7 @@ namespace UniversalValveToolbox {
listViewItemAbout.Group = listViewGroupSupport; listViewItemAbout.Group = listViewGroupSupport;
listViewItemGitHubLink.Group = listViewGroupSupport; listViewItemGitHubLink.Group = listViewGroupSupport;
listViewItemGitHubReport.Group = listViewGroupSupport;
//draw items and categories in forms //draw items and categories in forms
listView.Groups.AddRange(new ListViewGroup[] { listView.Groups.AddRange(new ListViewGroup[] {
@ -124,6 +126,7 @@ namespace UniversalValveToolbox {
listViewItemEditConfigurations, listViewItemEditConfigurations,
listViewItemEditPlugins, listViewItemEditPlugins,
listViewItemGitHubLink, listViewItemGitHubLink,
listViewItemGitHubReport,
listViewItemAbout listViewItemAbout
}); });
} }
@ -359,7 +362,7 @@ namespace UniversalValveToolbox {
this.OpenSettings(); this.OpenSettings();
} }
else if (selectItemText == Properties.translations.MenuItems.itmEditConfigurations) { else if (selectItemText == Properties.translations.MenuItems.itmEditConfigurations) {
var frmProfiles = new FormProfiles(); var frmProfiles = new FormProjects();
if (frmProfiles.ShowDialog() == DialogResult.OK) { if (frmProfiles.ShowDialog() == DialogResult.OK) {
Application.Restart(); Application.Restart();
} }
@ -376,6 +379,8 @@ namespace UniversalValveToolbox {
} }
else if (selectItemText == Properties.translations.MenuItems.itmGitHubLink) { else if (selectItemText == Properties.translations.MenuItems.itmGitHubLink) {
Process.Start("https://github.com/EpicMorg/UniversalValveToolbox"); Process.Start("https://github.com/EpicMorg/UniversalValveToolbox");
} else if (selectItemText == Properties.translations.MenuItems.itmGitHubReport) {
Process.Start("https://github.com/EpicMorg/UniversalValveToolbox/issues/new/choose");
} }
} }

View File

@ -1,7 +1,7 @@
using System; using System;
namespace UniversalValveToolbox { namespace UniversalValveToolbox {
partial class FormProfiles { partial class FormProjects {
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.
/// </summary> /// </summary>
@ -25,7 +25,7 @@ namespace UniversalValveToolbox {
/// the contents of this method with the code editor. /// the contents of this method with the code editor.
/// </summary> /// </summary>
private void InitializeComponent() { 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.comboBox_Mod = new System.Windows.Forms.ComboBox();
this.buttonOK = new System.Windows.Forms.Button(); this.buttonOK = new System.Windows.Forms.Button();
this.buttonCancel = new System.Windows.Forms.Button(); this.buttonCancel = new System.Windows.Forms.Button();
@ -84,7 +84,7 @@ namespace UniversalValveToolbox {
// buttonNew // buttonNew
// //
this.buttonNew.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 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.Name = "buttonNew";
this.buttonNew.Size = new System.Drawing.Size(75, 23); this.buttonNew.Size = new System.Drawing.Size(75, 23);
this.buttonNew.TabIndex = 7; this.buttonNew.TabIndex = 7;
@ -192,7 +192,7 @@ namespace UniversalValveToolbox {
// //
// buttonApply // 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.Location = new System.Drawing.Point(413, 225);
this.buttonApply.Name = "buttonApply"; this.buttonApply.Name = "buttonApply";
this.buttonApply.Size = new System.Drawing.Size(75, 23); this.buttonApply.Size = new System.Drawing.Size(75, 23);
@ -219,7 +219,7 @@ namespace UniversalValveToolbox {
this.labelArgs.TabIndex = 29; this.labelArgs.TabIndex = 29;
this.labelArgs.Text = "Arguments:"; this.labelArgs.Text = "Arguments:";
// //
// FormProfiles // FormProjects
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@ -243,7 +243,7 @@ namespace UniversalValveToolbox {
this.Controls.Add(this.comboBox_Mod); this.Controls.Add(this.comboBox_Mod);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MinimumSize = new System.Drawing.Size(516, 259); this.MinimumSize = new System.Drawing.Size(516, 259);
this.Name = "FormProfiles"; this.Name = "FormProjects";
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Edit Projects"; this.Text = "Edit Projects";

View File

@ -9,7 +9,7 @@ using UniversalValveToolbox.Model.ViewModel;
using UniversalValveToolbox.Utils; using UniversalValveToolbox.Utils;
namespace UniversalValveToolbox { namespace UniversalValveToolbox {
public partial class FormProfiles : Form { public partial class FormProjects : Form {
private bool needRestart = false; private bool needRestart = false;
private DataProvider dataProvider = new DataProvider(); private DataProvider dataProvider = new DataProvider();
@ -17,7 +17,7 @@ namespace UniversalValveToolbox {
private FormProjectViewModel model; private FormProjectViewModel model;
public FormProfiles() { public FormProjects() {
InitializeComponent(); InitializeComponent();
model = new FormProjectViewModel(dataProvider.Projects, dataProvider.Engines); model = new FormProjectViewModel(dataProvider.Projects, dataProvider.Engines);

View File

@ -31,7 +31,6 @@
this.comboBoxLang = new System.Windows.Forms.ComboBox(); this.comboBoxLang = new System.Windows.Forms.ComboBox();
this.comboBoxTheme = new System.Windows.Forms.ComboBox(); this.comboBoxTheme = new System.Windows.Forms.ComboBox();
this.label6 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label();
this.elementHost1 = new System.Windows.Forms.Integration.ElementHost();
this.SuspendLayout(); this.SuspendLayout();
// //
// labelDivider // labelDivider
@ -110,21 +109,11 @@
this.label6.TabIndex = 31; this.label6.TabIndex = 31;
this.label6.Text = "Theme:"; 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 // FormSettings
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(311, 319); this.ClientSize = new System.Drawing.Size(311, 319);
this.Controls.Add(this.elementHost1);
this.Controls.Add(this.comboBoxTheme); this.Controls.Add(this.comboBoxTheme);
this.Controls.Add(this.label6); this.Controls.Add(this.label6);
this.Controls.Add(this.comboBoxLang); this.Controls.Add(this.comboBoxLang);
@ -154,6 +143,5 @@
private System.Windows.Forms.ComboBox comboBoxLang; private System.Windows.Forms.ComboBox comboBoxLang;
private System.Windows.Forms.ComboBox comboBoxTheme; private System.Windows.Forms.ComboBox comboBoxTheme;
private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label6;
private System.Windows.Forms.Integration.ElementHost elementHost1;
} }
} }

View File

@ -96,11 +96,11 @@
<Compile Include="UI\FormAddons.Designer.cs"> <Compile Include="UI\FormAddons.Designer.cs">
<DependentUpon>FormAddons.cs</DependentUpon> <DependentUpon>FormAddons.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="UI\FormProfiles.cs"> <Compile Include="UI\FormProjects.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="UI\FormProfiles.Designer.cs"> <Compile Include="UI\FormProjects.Designer.cs">
<DependentUpon>FormProfiles.cs</DependentUpon> <DependentUpon>FormProjects.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="UI\FormMain.cs"> <Compile Include="UI\FormMain.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
@ -181,8 +181,8 @@
<EmbeddedResource Include="UI\FormAddons.resx"> <EmbeddedResource Include="UI\FormAddons.resx">
<DependentUpon>FormAddons.cs</DependentUpon> <DependentUpon>FormAddons.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="UI\FormProfiles.resx"> <EmbeddedResource Include="UI\FormProjects.resx">
<DependentUpon>FormProfiles.cs</DependentUpon> <DependentUpon>FormProjects.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="UI\FormMain.resx"> <EmbeddedResource Include="UI\FormMain.resx">
<DependentUpon>FormMain.cs</DependentUpon> <DependentUpon>FormMain.cs</DependentUpon>