From e32a94f81968c438cf72015380d615a59802356e Mon Sep 17 00:00:00 2001 From: hbeham Date: Sat, 16 Feb 2019 11:34:49 +0100 Subject: [PATCH] context menu entry "Add Channel" had no function. Now using same icon and function as the "Add Channels" button --- source/ChanSort/MainForm.Designer.cs | 7 +++++++ source/ChanSort/MainForm.cs | 7 +++++++ source/ChanSort/MainForm.resx | 10 ++-------- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/source/ChanSort/MainForm.Designer.cs b/source/ChanSort/MainForm.Designer.cs index 16d938b..aa60efe 100644 --- a/source/ChanSort/MainForm.Designer.cs +++ b/source/ChanSort/MainForm.Designer.cs @@ -216,6 +216,7 @@ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pnlEditControls)).BeginInit(); this.pnlEditControls.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.globalImageCollection1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.grpInputList)).BeginInit(); this.grpInputList.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gridRight)).BeginInit(); @@ -453,6 +454,10 @@ this.btnToggleLock.Name = "btnToggleLock"; this.btnToggleLock.Click += new System.EventHandler(this.btnToggleLock_Click); // + // globalImageCollection1 + // + this.globalImageCollection1.ParentControl = this; + // // btnToggleFavE // resources.ApplyResources(this.btnToggleFavE, "btnToggleFavE"); @@ -1238,6 +1243,7 @@ this.miAddChannel.ImageOptions.ImageIndex = ((int)(resources.GetObject("miAddChannel.ImageOptions.ImageIndex"))); this.miAddChannel.ItemShortcut = new DevExpress.XtraBars.BarShortcut((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Add)); this.miAddChannel.Name = "miAddChannel"; + this.miAddChannel.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miAddChannel_ItemClick); // // miRemove // @@ -2064,6 +2070,7 @@ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pnlEditControls)).EndInit(); this.pnlEditControls.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.globalImageCollection1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.grpInputList)).EndInit(); this.grpInputList.ResumeLayout(false); this.grpInputList.PerformLayout(); diff --git a/source/ChanSort/MainForm.cs b/source/ChanSort/MainForm.cs index 8be4084..90a47cc 100644 --- a/source/ChanSort/MainForm.cs +++ b/source/ChanSort/MainForm.cs @@ -2396,6 +2396,7 @@ namespace ChanSort.Ui try { this.btnAdd.ImageIndex = this.rbInsertSwap.Checked ? 38 : this.rbInsertAfter.Checked ? 39 : 40; + this.miAddChannel.ImageIndex = this.btnAdd.ImageIndex; if (this.CurrentChannelList == null) return; @@ -2714,6 +2715,11 @@ namespace ChanSort.Ui #region Edit menu + private void miAddChannel_ItemClick(object sender, ItemClickEventArgs e) + { + this.TryExecute(this.AddChannels); + } + private void miMoveDown_ItemClick(object sender, ItemClickEventArgs e) { this.TryExecute(() => this.MoveChannels(false)); @@ -3073,5 +3079,6 @@ namespace ChanSort.Ui } #endregion + } } \ No newline at end of file diff --git a/source/ChanSort/MainForm.resx b/source/ChanSort/MainForm.resx index d0a28de..75f3613 100644 --- a/source/ChanSort/MainForm.resx +++ b/source/ChanSort/MainForm.resx @@ -477,7 +477,7 @@ &Add channels - 26 + 40 &Remove channels @@ -1249,7 +1249,7 @@ globalImageCollection1 - ChanSort.Ui.GlobalImageCollection, ChanSort, Version=1.0.6980.23278, Culture=neutral, PublicKeyToken=null + ChanSort.Ui.GlobalImageCollection, ChanSort, Version=1.0.6986.20519, Culture=neutral, PublicKeyToken=null gviewRight @@ -1965,12 +1965,6 @@ DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v18.2, Version=18.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 02/10/2019 13:13:51 - - - 16, 16 - 257, 5