diff --git a/CHANGELOG.md b/CHANGELOG.md index 5deb42fc05..bfef116d43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file. - [CLI] Add versions table option to ckan show command (#3414 by: HebaruSan; reviewed: DasSkelett) - [Multiple] Override provides prompt with relationship property, check first recommendation in any_of group (#3426, #3436 by: HebaruSan; reviewed: DasSkelett) - [GUI] Add user guide and Discord to GUI help menu (#3437 by: HebaruSan; reviewed: DasSkelett) +- [GUI] Label ordering buttons (#3416 by: HebaruSan; reviewed: DasSkelett) ### Bugfixes diff --git a/GUI/Dialogs/EditLabelsDialog.Designer.cs b/GUI/Dialogs/EditLabelsDialog.Designer.cs index 670cba97f4..e634e2f17b 100644 --- a/GUI/Dialogs/EditLabelsDialog.Designer.cs +++ b/GUI/Dialogs/EditLabelsDialog.Designer.cs @@ -51,6 +51,8 @@ private void InitializeComponent() this.SaveButton = new System.Windows.Forms.Button(); this.CancelEditButton = new System.Windows.Forms.Button(); this.DeleteButton = new System.Windows.Forms.Button(); + this.MoveUpButton = new System.Windows.Forms.Button(); + this.MoveDownButton = new System.Windows.Forms.Button(); this.EditDetailsPanel.SuspendLayout(); this.SuspendLayout(); // @@ -121,17 +123,45 @@ private void InitializeComponent() this.EditDetailsPanel.Controls.Add(this.SaveButton); this.EditDetailsPanel.Controls.Add(this.CancelEditButton); this.EditDetailsPanel.Controls.Add(this.DeleteButton); + this.EditDetailsPanel.Controls.Add(this.MoveUpButton); + this.EditDetailsPanel.Controls.Add(this.MoveDownButton); this.EditDetailsPanel.Location = new System.Drawing.Point(135, 43); this.EditDetailsPanel.Name = "EditDetailsPanel"; this.EditDetailsPanel.Size = new System.Drawing.Size(350, 350); this.EditDetailsPanel.TabIndex = 1; this.EditDetailsPanel.Visible = false; // + // MoveUpButton + // + this.MoveUpButton.Anchor = ((System.Windows.Forms.AnchorStyles)(System.Windows.Forms.AnchorStyles.Bottom + | System.Windows.Forms.AnchorStyles.Left)); + this.MoveUpButton.Location = new System.Drawing.Point(3, 0); + this.MoveUpButton.Name = "MoveUpButton"; + this.MoveUpButton.Size = new System.Drawing.Size(18, 23); + this.MoveUpButton.TabIndex = 0; + this.MoveUpButton.Text = "▴"; + this.MoveUpButton.UseVisualStyleBackColor = true; + this.MoveUpButton.Click += new System.EventHandler(this.MoveUpButton_Click); + resources.ApplyResources(this.MoveUpButton, "MoveUpButton"); + // + // MoveDownButton + // + this.MoveDownButton.Anchor = ((System.Windows.Forms.AnchorStyles)(System.Windows.Forms.AnchorStyles.Bottom + | System.Windows.Forms.AnchorStyles.Left)); + this.MoveDownButton.Location = new System.Drawing.Point(3, 25); + this.MoveDownButton.Name = "MoveDownButton"; + this.MoveDownButton.Size = new System.Drawing.Size(18, 23); + this.MoveDownButton.TabIndex = 0; + this.MoveDownButton.Text = "▾"; + this.MoveDownButton.UseVisualStyleBackColor = true; + this.MoveDownButton.Click += new System.EventHandler(this.MoveDownButton_Click); + resources.ApplyResources(this.MoveDownButton, "MoveDownButton"); + // // NameLabel // this.NameLabel.AutoSize = true; this.NameLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)); - this.NameLabel.Location = new System.Drawing.Point(10, 13); + this.NameLabel.Location = new System.Drawing.Point(38, 13); this.NameLabel.Name = "NameLabel"; this.NameLabel.Size = new System.Drawing.Size(75, 23); resources.ApplyResources(this.NameLabel, "NameLabel"); @@ -139,7 +169,7 @@ private void InitializeComponent() // NameTextBox // this.NameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)); - this.NameTextBox.Location = new System.Drawing.Point(90, 10); + this.NameTextBox.Location = new System.Drawing.Point(118, 10); this.NameTextBox.Name = "NameTextBox"; this.NameTextBox.Size = new System.Drawing.Size(125, 23); resources.ApplyResources(this.NameTextBox, "NameTextBox"); @@ -148,7 +178,7 @@ private void InitializeComponent() // this.ColorLabel.AutoSize = true; this.ColorLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)); - this.ColorLabel.Location = new System.Drawing.Point(10, 43); + this.ColorLabel.Location = new System.Drawing.Point(38, 43); this.ColorLabel.Name = "ColorLabel"; this.ColorLabel.Size = new System.Drawing.Size(75, 23); resources.ApplyResources(this.ColorLabel, "ColorLabel"); @@ -158,7 +188,7 @@ private void InitializeComponent() this.ColorButton.Anchor = ((System.Windows.Forms.AnchorStyles)(System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)); this.ColorButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.ColorButton.Location = new System.Drawing.Point(90, 40); + this.ColorButton.Location = new System.Drawing.Point(118, 40); this.ColorButton.Name = "ColorButton"; this.ColorButton.Size = new System.Drawing.Size(50, 20); this.ColorButton.UseVisualStyleBackColor = false; @@ -169,7 +199,7 @@ private void InitializeComponent() // this.InstanceNameLabel.AutoSize = true; this.InstanceNameLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)); - this.InstanceNameLabel.Location = new System.Drawing.Point(10, 73); + this.InstanceNameLabel.Location = new System.Drawing.Point(38, 73); this.InstanceNameLabel.Name = "InstanceNameLabel"; this.InstanceNameLabel.Size = new System.Drawing.Size(75, 23); resources.ApplyResources(this.InstanceNameLabel, "InstanceNameLabel"); @@ -178,7 +208,7 @@ private void InitializeComponent() // this.InstanceNameComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)); this.InstanceNameComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.InstanceNameComboBox.Location = new System.Drawing.Point(90, 70); + this.InstanceNameComboBox.Location = new System.Drawing.Point(118, 70); this.InstanceNameComboBox.Name = "InstanceNameComboBox"; this.InstanceNameComboBox.Size = new System.Drawing.Size(125, 23); resources.ApplyResources(this.InstanceNameComboBox, "InstanceNameComboBox"); @@ -186,7 +216,7 @@ private void InitializeComponent() // HideFromOtherFiltersCheckBox // this.HideFromOtherFiltersCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)(System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)); - this.HideFromOtherFiltersCheckBox.Location = new System.Drawing.Point(90, 100); + this.HideFromOtherFiltersCheckBox.Location = new System.Drawing.Point(118, 100); this.HideFromOtherFiltersCheckBox.Name = "HideFromOtherFiltersCheckBox"; this.HideFromOtherFiltersCheckBox.Size = new System.Drawing.Size(200, 23); resources.ApplyResources(this.HideFromOtherFiltersCheckBox, "HideFromOtherFiltersCheckBox"); @@ -194,7 +224,7 @@ private void InitializeComponent() // NotifyOnChangesCheckBox // this.NotifyOnChangesCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)(System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)); - this.NotifyOnChangesCheckBox.Location = new System.Drawing.Point(90, 130); + this.NotifyOnChangesCheckBox.Location = new System.Drawing.Point(118, 130); this.NotifyOnChangesCheckBox.Name = "NotifyOnChangesCheckBox"; this.NotifyOnChangesCheckBox.Size = new System.Drawing.Size(200, 23); resources.ApplyResources(this.NotifyOnChangesCheckBox, "NotifyOnChangesCheckBox"); @@ -202,7 +232,7 @@ private void InitializeComponent() // RemoveOnChangesCheckBox // this.RemoveOnChangesCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)(System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)); - this.RemoveOnChangesCheckBox.Location = new System.Drawing.Point(90, 160); + this.RemoveOnChangesCheckBox.Location = new System.Drawing.Point(118, 160); this.RemoveOnChangesCheckBox.Name = "RemoveOnChangesCheckBox"; this.RemoveOnChangesCheckBox.Size = new System.Drawing.Size(200, 23); resources.ApplyResources(this.RemoveOnChangesCheckBox, "RemoveOnChangesCheckBox"); @@ -210,7 +240,7 @@ private void InitializeComponent() // AlertOnInstallCheckBox // this.AlertOnInstallCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)(System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)); - this.AlertOnInstallCheckBox.Location = new System.Drawing.Point(90, 190); + this.AlertOnInstallCheckBox.Location = new System.Drawing.Point(118, 190); this.AlertOnInstallCheckBox.Name = "AlertOnInstallCheckBox"; this.AlertOnInstallCheckBox.Size = new System.Drawing.Size(200, 23); resources.ApplyResources(this.AlertOnInstallCheckBox, "AlertOnInstallCheckBox"); @@ -218,7 +248,7 @@ private void InitializeComponent() // RemoveOnInstallCheckBox // this.RemoveOnInstallCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)(System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)); - this.RemoveOnInstallCheckBox.Location = new System.Drawing.Point(90, 220); + this.RemoveOnInstallCheckBox.Location = new System.Drawing.Point(118, 220); this.RemoveOnInstallCheckBox.Name = "RemoveOnInstallCheckBox"; this.RemoveOnInstallCheckBox.Size = new System.Drawing.Size(200, 23); resources.ApplyResources(this.RemoveOnInstallCheckBox, "RemoveOnInstallCheckBox"); @@ -226,7 +256,7 @@ private void InitializeComponent() // HoldVersionCheckBox // this.HoldVersionCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)(System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)); - this.HoldVersionCheckBox.Location = new System.Drawing.Point(90, 250); + this.HoldVersionCheckBox.Location = new System.Drawing.Point(118, 250); this.HoldVersionCheckBox.Name = "HoldVersionCheckBox"; this.HoldVersionCheckBox.Size = new System.Drawing.Size(200, 23); resources.ApplyResources(this.HoldVersionCheckBox, "HoldVersionCheckBox"); @@ -235,7 +265,7 @@ private void InitializeComponent() // this.SaveButton.Anchor = ((System.Windows.Forms.AnchorStyles)(System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)); - this.SaveButton.Location = new System.Drawing.Point(10, 320); + this.SaveButton.Location = new System.Drawing.Point(38, 320); this.SaveButton.Name = "SaveButton"; this.SaveButton.Size = new System.Drawing.Size(75, 23); this.SaveButton.TabIndex = 0; @@ -247,7 +277,7 @@ private void InitializeComponent() // this.CancelEditButton.Anchor = ((System.Windows.Forms.AnchorStyles)(System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)); - this.CancelEditButton.Location = new System.Drawing.Point(90, 320); + this.CancelEditButton.Location = new System.Drawing.Point(118, 320); this.CancelEditButton.Name = "CancelEditButton"; this.CancelEditButton.Size = new System.Drawing.Size(75, 23); this.CancelEditButton.TabIndex = 0; @@ -259,7 +289,7 @@ private void InitializeComponent() // this.DeleteButton.Anchor = ((System.Windows.Forms.AnchorStyles)(System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)); - this.DeleteButton.Location = new System.Drawing.Point(170, 320); + this.DeleteButton.Location = new System.Drawing.Point(198, 320); this.DeleteButton.Name = "DeleteButton"; this.DeleteButton.Size = new System.Drawing.Size(75, 23); this.DeleteButton.TabIndex = 0; @@ -323,5 +353,7 @@ private void InitializeComponent() private System.Windows.Forms.Button SaveButton; private System.Windows.Forms.Button CancelEditButton; private System.Windows.Forms.Button DeleteButton; + private System.Windows.Forms.Button MoveUpButton; + private System.Windows.Forms.Button MoveDownButton; } } diff --git a/GUI/Dialogs/EditLabelsDialog.cs b/GUI/Dialogs/EditLabelsDialog.cs index 78d2c868d7..9894c19ffc 100644 --- a/GUI/Dialogs/EditLabelsDialog.cs +++ b/GUI/Dialogs/EditLabelsDialog.cs @@ -17,15 +17,17 @@ public EditLabelsDialog(IUser user, GameInstanceManager manager, ModuleLabelList .Concat(manager.Instances.Keys).ToArray(); LoadTree(); - this.ToolTip.SetToolTip(NameTextBox, Properties.Resources.EditLabelsToolTipName); - this.ToolTip.SetToolTip(ColorButton, Properties.Resources.EditLabelsToolTipColor); - this.ToolTip.SetToolTip(InstanceNameComboBox, Properties.Resources.EditLabelsToolTipInstance); - this.ToolTip.SetToolTip(HideFromOtherFiltersCheckBox, Properties.Resources.EditLabelsToolTipHide); - this.ToolTip.SetToolTip(NotifyOnChangesCheckBox, Properties.Resources.EditLabelsToolTipNotifyOnChanges); - this.ToolTip.SetToolTip(RemoveOnChangesCheckBox, Properties.Resources.EditLabelsToolTipRemoveOnChanges); - this.ToolTip.SetToolTip(AlertOnInstallCheckBox, Properties.Resources.EditLabelsToolTipAlertOnInstall); - this.ToolTip.SetToolTip(RemoveOnInstallCheckBox, Properties.Resources.EditLabelsToolTipRemoveOnInstall); - this.ToolTip.SetToolTip(HoldVersionCheckBox, Properties.Resources.EditLabelsToolTipHoldVersion); + ToolTip.SetToolTip(NameTextBox, Properties.Resources.EditLabelsToolTipName); + ToolTip.SetToolTip(ColorButton, Properties.Resources.EditLabelsToolTipColor); + ToolTip.SetToolTip(InstanceNameComboBox, Properties.Resources.EditLabelsToolTipInstance); + ToolTip.SetToolTip(HideFromOtherFiltersCheckBox, Properties.Resources.EditLabelsToolTipHide); + ToolTip.SetToolTip(NotifyOnChangesCheckBox, Properties.Resources.EditLabelsToolTipNotifyOnChanges); + ToolTip.SetToolTip(RemoveOnChangesCheckBox, Properties.Resources.EditLabelsToolTipRemoveOnChanges); + ToolTip.SetToolTip(AlertOnInstallCheckBox, Properties.Resources.EditLabelsToolTipAlertOnInstall); + ToolTip.SetToolTip(RemoveOnInstallCheckBox, Properties.Resources.EditLabelsToolTipRemoveOnInstall); + ToolTip.SetToolTip(HoldVersionCheckBox, Properties.Resources.EditLabelsToolTipHoldVersion); + ToolTip.SetToolTip(MoveUpButton, Properties.Resources.EditLabelsToolTipMoveUp); + ToolTip.SetToolTip(MoveDownButton, Properties.Resources.EditLabelsToolTipMoveDown); } private void LoadTree() @@ -34,7 +36,8 @@ private void LoadTree() LabelSelectionTree.Nodes.Clear(); var groups = this.labels.Labels .GroupBy(l => l.InstanceName) - .OrderBy(g => g.Key); + .OrderBy(g => g.Key == null) + .ThenBy(g => g.Key); foreach (var group in groups) { string groupName = string.IsNullOrEmpty(group.Key) @@ -42,8 +45,7 @@ private void LoadTree() : group.Key; LabelSelectionTree.Nodes.Add(new TreeNode( groupName, - group.OrderBy(mlbl => mlbl.Name) - .Select(mlbl => new TreeNode(mlbl.Name) + group.Select(mlbl => new TreeNode(mlbl.Name) { // Windows's TreeView has a bug where the node's visual // width is based on the owning TreeView.Font rather @@ -56,6 +58,16 @@ private void LoadTree() .ToArray() )); } + EnableDisableUpDownButtons(); + if (currentlyEditing != null) + { + LabelSelectionTree.BeforeSelect -= LabelSelectionTree_BeforeSelect; + // Select the new node representing the label we're editing + LabelSelectionTree.SelectedNode = LabelSelectionTree.Nodes.Cast() + .SelectMany(nd => nd.Nodes.Cast()) + .FirstOrDefault(nd => nd.Tag as ModuleLabel == currentlyEditing); + LabelSelectionTree.BeforeSelect += LabelSelectionTree_BeforeSelect; + } LabelSelectionTree.ExpandAll(); LabelSelectionTree.EndUpdate(); } @@ -171,12 +183,70 @@ private void StartEdit(ModuleLabel lbl) HoldVersionCheckBox.Checked = lbl.HoldVersion; DeleteButton.Enabled = labels.Labels.Contains(lbl); + EnableDisableUpDownButtons(); EditDetailsPanel.Visible = true; EditDetailsPanel.BringToFront(); NameTextBox.Focus(); } + private void EnableDisableUpDownButtons() + { + if (currentlyEditing == null) + { + MoveUpButton.Enabled = MoveDownButton.Enabled = false; + } + else + { + var group = labels.Labels + .Where(lbl => lbl.InstanceName == currentlyEditing.InstanceName) + .ToList(); + int groupIndex = group.IndexOf(currentlyEditing); + MoveUpButton.Enabled = groupIndex > 0; + MoveDownButton.Enabled = groupIndex >= 0 && groupIndex < group.Count - 1; + } + } + + private void MoveUpButton_Click(object sender, EventArgs e) + { + if (currentlyEditing != null) + { + var group = labels.Labels + .Where(lbl => lbl.InstanceName == currentlyEditing.InstanceName) + .ToList(); + int groupIndex = group.IndexOf(currentlyEditing); + if (groupIndex > 0) + { + // Swap with previous node + int mainIndex = Array.IndexOf(labels.Labels, currentlyEditing); + int prevIndex = Array.IndexOf(labels.Labels, group[groupIndex - 1]); + labels.Labels[mainIndex] = labels.Labels[prevIndex]; + labels.Labels[prevIndex] = currentlyEditing; + LoadTree(); + } + } + } + + private void MoveDownButton_Click(object sender, EventArgs e) + { + if (currentlyEditing != null) + { + var group = labels.Labels + .Where(lbl => lbl.InstanceName == currentlyEditing.InstanceName) + .ToList(); + int groupIndex = group.IndexOf(currentlyEditing); + if (groupIndex >= 0 && groupIndex < group.Count - 1) + { + // Swap with next node + int mainIndex = Array.IndexOf(labels.Labels, currentlyEditing); + int nextIndex = Array.IndexOf(labels.Labels, group[groupIndex + 1]); + labels.Labels[mainIndex] = labels.Labels[nextIndex]; + labels.Labels[nextIndex] = currentlyEditing; + LoadTree(); + } + } + } + private bool TryCloseEdit() { if (HasChanges()) @@ -202,12 +272,6 @@ private bool TrySave(out string errMsg) { if (EditingValid(out errMsg)) { - if (!labels.Labels.Contains(currentlyEditing)) - { - labels.Labels = labels.Labels - .Concat(new ModuleLabel[] { currentlyEditing }) - .ToArray(); - } currentlyEditing.Name = NameTextBox.Text; currentlyEditing.Color = ColorButton.BackColor; currentlyEditing.InstanceName = @@ -220,6 +284,14 @@ private bool TrySave(out string errMsg) currentlyEditing.AlertOnInstall = AlertOnInstallCheckBox.Checked; currentlyEditing.RemoveOnInstall = RemoveOnInstallCheckBox.Checked; currentlyEditing.HoldVersion = HoldVersionCheckBox.Checked; + if (!labels.Labels.Contains(currentlyEditing)) + { + labels.Labels = labels.Labels + .Concat(new ModuleLabel[] { currentlyEditing }) + .OrderBy(l => l.InstanceName == null) + .ThenBy(l => l.InstanceName) + .ToArray(); + } EditDetailsPanel.Visible = false; currentlyEditing = null; diff --git a/GUI/Labels/ModuleLabelList.cs b/GUI/Labels/ModuleLabelList.cs index a807ae9cfd..f2d2747e4e 100644 --- a/GUI/Labels/ModuleLabelList.cs +++ b/GUI/Labels/ModuleLabelList.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Drawing; +using System.Runtime.Serialization; using Newtonsoft.Json; namespace CKAN @@ -63,6 +64,15 @@ public static ModuleLabelList Load(string path) } } + [OnDeserialized] + private void OnDeserialized(StreamingContext context) + { + // false < true + Labels = Labels.OrderBy(l => l.InstanceName == null) + .ThenBy(l => l.InstanceName) + .ToArray(); + } + public bool Save(string path) { try diff --git a/GUI/Properties/Resources.Designer.cs b/GUI/Properties/Resources.Designer.cs index 3e1c9d6cd2..5d3d27db7e 100644 --- a/GUI/Properties/Resources.Designer.cs +++ b/GUI/Properties/Resources.Designer.cs @@ -79,26 +79,6 @@ internal static System.Drawing.Bitmap apply { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap arrow_forward { - get { - object obj = ResourceManager.GetObject("arrow_forward", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap arrow_upward { - get { - object obj = ResourceManager.GetObject("arrow_upward", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -903,6 +883,12 @@ internal static string EditLabelsToolTipRemoveOnInstall { internal static string EditLabelsToolTipHoldVersion { get { return (string)(ResourceManager.GetObject("EditLabelsToolTipHoldVersion", resourceCulture)); } } + internal static string EditLabelsToolTipMoveUp { + get { return (string)(ResourceManager.GetObject("EditLabelsToolTipMoveUp", resourceCulture)); } + } + internal static string EditLabelsToolTipMoveDown { + get { return (string)(ResourceManager.GetObject("EditLabelsToolTipMoveDown", resourceCulture)); } + } internal static string MainLabelsUpdateMessage { get { return (string)(ResourceManager.GetObject("MainLabelsUpdateMessage", resourceCulture)); } } diff --git a/GUI/Properties/Resources.ja-JP.resx b/GUI/Properties/Resources.ja-JP.resx index c66f321518..b7f5609495 100644 --- a/GUI/Properties/Resources.ja-JP.resx +++ b/GUI/Properties/Resources.ja-JP.resx @@ -119,29 +119,8 @@ - ..\..\assets\ckan.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\apply.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\ksp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a CKAN metadata (*.ckan)|*.ckan Modリストのエクスポート - ..\Resources\update.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\backward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\filter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\forward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\textClear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\star.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\thumbup.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\smile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\alert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_forward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_upward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\triToggleYes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\triToggleNo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\triToggleBoth.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a バージョン {0} Build metadata file 新しいインスタンスの名前を入力してください。 diff --git a/GUI/Properties/Resources.resx b/GUI/Properties/Resources.resx index ddd6f6b240..2c78267e55 100644 --- a/GUI/Properties/Resources.resx +++ b/GUI/Properties/Resources.resx @@ -125,8 +125,6 @@ ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - CKAN metadata (*.ckan)|*.ckan - Export Mod List ..\Resources\update.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\backward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\filter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -137,11 +135,11 @@ ..\Resources\info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\smile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\alert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_forward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_upward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\triToggleYes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\triToggleNo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\triToggleBoth.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + CKAN metadata (*.ckan)|*.ckan + Export Mod List Version {0} Build metadata file Please enter a name for the new instance. @@ -384,6 +382,8 @@ Do you want to allow CKAN to do this? If you click no you won't see this message If checked, the change set screen will alert you if this mod is about to be installed If checked, modules will be removed from this label if they are installed If checked, modules will not be upgraded + Move up + Move down Some of your watched mods have updated: {0} diff --git a/GUI/Resources/arrow_forward.png b/GUI/Resources/arrow_forward.png deleted file mode 100644 index 47148c2ccd..0000000000 Binary files a/GUI/Resources/arrow_forward.png and /dev/null differ diff --git a/GUI/Resources/arrow_upward.png b/GUI/Resources/arrow_upward.png deleted file mode 100644 index d30a33a463..0000000000 Binary files a/GUI/Resources/arrow_upward.png and /dev/null differ