diff --git a/ChanSort/MainForm.Designer.cs b/ChanSort/MainForm.Designer.cs index 215c2b5..9f3549b 100644 --- a/ChanSort/MainForm.Designer.cs +++ b/ChanSort/MainForm.Designer.cs @@ -152,9 +152,17 @@ this.miCharsetForm = new DevExpress.XtraBars.BarButtonItem(); this.miIsoCharSets = new DevExpress.XtraBars.BarListItem(); this.miShowWarningsAfterLoad = new DevExpress.XtraBars.BarCheckItem(); - this.barSubItem3 = new DevExpress.XtraBars.BarSubItem(); - this.miGotoInputSource = new DevExpress.XtraBars.BarButtonItem(); - this.miGotoFavList = new DevExpress.XtraBars.BarButtonItem(); + this.mnuAccessibility = new DevExpress.XtraBars.BarSubItem(); + this.mnuGotoChannelList = new DevExpress.XtraBars.BarSubItem(); + this.mnuInputSource = new DevExpress.XtraBars.BarLinkContainerItem(); + this.mnuGotoFavList = new DevExpress.XtraBars.BarSubItem(); + this.mnuFavList = new DevExpress.XtraBars.BarLinkContainerItem(); + this.miSelectFavList0 = new DevExpress.XtraBars.BarButtonItem(); + this.miSelectFavListA = new DevExpress.XtraBars.BarButtonItem(); + this.miSelectFavListB = new DevExpress.XtraBars.BarButtonItem(); + this.miSelectFavListC = new DevExpress.XtraBars.BarButtonItem(); + this.miSelectFavListD = new DevExpress.XtraBars.BarButtonItem(); + this.miSelectFavListE = new DevExpress.XtraBars.BarButtonItem(); this.miGotoLeftFilter = new DevExpress.XtraBars.BarButtonItem(); this.miGotoLeftList = new DevExpress.XtraBars.BarButtonItem(); this.miRightListFilter = new DevExpress.XtraBars.BarButtonItem(); @@ -182,11 +190,13 @@ this.cbCloseGap = new DevExpress.XtraEditors.CheckEdit(); this.tabChannelList = new DevExpress.XtraTab.XtraTabControl(); this.pageEmpty = new DevExpress.XtraTab.XtraTabPage(); - this.mnuContext = new DevExpress.XtraBars.PopupMenu(this.components); + this.popupContext = new DevExpress.XtraBars.PopupMenu(this.components); this.timerEditDelay = new System.Windows.Forms.Timer(this.components); this.grpSubList = new DevExpress.XtraEditors.GroupControl(); this.tabSubList = new DevExpress.XtraTab.XtraTabControl(); this.pageProgNr = new DevExpress.XtraTab.XtraTabPage(); + this.popupInputSource = new DevExpress.XtraBars.PopupMenu(this.components); + this.popupFavList = new DevExpress.XtraBars.PopupMenu(this.components); ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit(); this.splitContainerControl1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.grpOutputList)).BeginInit(); @@ -216,11 +226,13 @@ ((System.ComponentModel.ISupportInitialize)(this.cbCloseGap.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabChannelList)).BeginInit(); this.tabChannelList.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.mnuContext)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.popupContext)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.grpSubList)).BeginInit(); this.grpSubList.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tabSubList)).BeginInit(); this.tabSubList.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.popupInputSource)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.popupFavList)).BeginInit(); this.SuspendLayout(); // // splitContainerControl1 @@ -434,47 +446,47 @@ // // btnToggleFavE // - this.btnToggleFavE.ImageList = this.globalImageCollection1; resources.ApplyResources(this.btnToggleFavE, "btnToggleFavE"); + this.btnToggleFavE.ImageList = this.globalImageCollection1; this.btnToggleFavE.Name = "btnToggleFavE"; this.btnToggleFavE.Tag = ""; this.btnToggleFavE.Click += new System.EventHandler(this.btnToggleFav_Click); // // btnToggleFavD // - this.btnToggleFavD.ImageList = this.globalImageCollection1; resources.ApplyResources(this.btnToggleFavD, "btnToggleFavD"); + this.btnToggleFavD.ImageList = this.globalImageCollection1; this.btnToggleFavD.Name = "btnToggleFavD"; this.btnToggleFavD.Click += new System.EventHandler(this.btnToggleFav_Click); // // btnToggleFavC // - this.btnToggleFavC.ImageList = this.globalImageCollection1; resources.ApplyResources(this.btnToggleFavC, "btnToggleFavC"); + this.btnToggleFavC.ImageList = this.globalImageCollection1; this.btnToggleFavC.Name = "btnToggleFavC"; this.btnToggleFavC.Click += new System.EventHandler(this.btnToggleFav_Click); // // btnToggleFavB // - this.btnToggleFavB.ImageList = this.globalImageCollection1; resources.ApplyResources(this.btnToggleFavB, "btnToggleFavB"); + this.btnToggleFavB.ImageList = this.globalImageCollection1; this.btnToggleFavB.Name = "btnToggleFavB"; this.btnToggleFavB.Click += new System.EventHandler(this.btnToggleFav_Click); // // btnToggleFavA // - this.btnToggleFavA.ImageList = this.globalImageCollection1; resources.ApplyResources(this.btnToggleFavA, "btnToggleFavA"); + this.btnToggleFavA.ImageList = this.globalImageCollection1; this.btnToggleFavA.Name = "btnToggleFavA"; this.btnToggleFavA.Click += new System.EventHandler(this.btnToggleFav_Click); // // btnClearLeftFilter // + resources.ApplyResources(this.btnClearLeftFilter, "btnClearLeftFilter"); this.btnClearLeftFilter.Appearance.Font = ((System.Drawing.Font)(resources.GetObject("btnClearLeftFilter.Appearance.Font"))); this.btnClearLeftFilter.Appearance.Options.UseFont = true; this.btnClearLeftFilter.ImageIndex = 28; this.btnClearLeftFilter.ImageList = this.globalImageCollection1; - resources.ApplyResources(this.btnClearLeftFilter, "btnClearLeftFilter"); this.btnClearLeftFilter.Name = "btnClearLeftFilter"; this.btnClearLeftFilter.Click += new System.EventHandler(this.btnClearLeftFilter_Click); // @@ -854,11 +866,11 @@ // // btnClearRightFilter // + resources.ApplyResources(this.btnClearRightFilter, "btnClearRightFilter"); this.btnClearRightFilter.Appearance.Font = ((System.Drawing.Font)(resources.GetObject("btnClearRightFilter.Appearance.Font"))); this.btnClearRightFilter.Appearance.Options.UseFont = true; this.btnClearRightFilter.ImageIndex = 28; this.btnClearRightFilter.ImageList = this.globalImageCollection1; - resources.ApplyResources(this.btnClearRightFilter, "btnClearRightFilter"); this.btnClearRightFilter.Name = "btnClearRightFilter"; this.btnClearRightFilter.Click += new System.EventHandler(this.btnClearRightFilter_Click); // @@ -934,9 +946,7 @@ this.miAddFromRefList, this.miPrint, this.miRenumFavByPrNr, - this.barSubItem3, - this.miGotoInputSource, - this.miGotoFavList, + this.mnuAccessibility, this.miGotoLeftFilter, this.miGotoLeftList, this.miRightListFilter, @@ -950,9 +960,19 @@ this.miFavBUnset, this.miFavCUnset, this.miFavDUnset, - this.miFavEUnset}); + this.miFavEUnset, + this.miSelectFavList0, + this.miSelectFavListA, + this.miSelectFavListB, + this.miSelectFavListC, + this.miSelectFavListD, + this.miSelectFavListE, + this.mnuGotoChannelList, + this.mnuInputSource, + this.mnuGotoFavList, + this.mnuFavList}); this.barManager1.MainMenu = this.bar1; - this.barManager1.MaxItemId = 83; + this.barManager1.MaxItemId = 93; this.barManager1.ShowFullMenus = true; // // bar1 @@ -980,7 +1000,7 @@ new DevExpress.XtraBars.LinkPersistInfo(this.miTvSettings), new DevExpress.XtraBars.LinkPersistInfo(this.mnuOptions, true), new DevExpress.XtraBars.LinkPersistInfo(this.barSubItem1), - new DevExpress.XtraBars.LinkPersistInfo(this.barSubItem3, true), + new DevExpress.XtraBars.LinkPersistInfo(this.mnuAccessibility, true), new DevExpress.XtraBars.LinkPersistInfo(this.mnuHelp), new DevExpress.XtraBars.LinkPersistInfo(this.miAbout)}); this.bar1.OptionsBar.AllowQuickCustomization = false; @@ -1523,36 +1543,117 @@ this.miShowWarningsAfterLoad.Id = 54; this.miShowWarningsAfterLoad.Name = "miShowWarningsAfterLoad"; // - // barSubItem3 + // mnuAccessibility // - resources.ApplyResources(this.barSubItem3, "barSubItem3"); - this.barSubItem3.Id = 64; - this.barSubItem3.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { - new DevExpress.XtraBars.LinkPersistInfo(this.miGotoInputSource), - new DevExpress.XtraBars.LinkPersistInfo(this.miGotoFavList), + resources.ApplyResources(this.mnuAccessibility, "mnuAccessibility"); + this.mnuAccessibility.Id = 64; + this.mnuAccessibility.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { + new DevExpress.XtraBars.LinkPersistInfo(this.mnuGotoChannelList), + new DevExpress.XtraBars.LinkPersistInfo(this.mnuGotoFavList), new DevExpress.XtraBars.LinkPersistInfo(this.miGotoLeftFilter), new DevExpress.XtraBars.LinkPersistInfo(this.miGotoLeftList), new DevExpress.XtraBars.LinkPersistInfo(this.miRightListFilter), new DevExpress.XtraBars.LinkPersistInfo(this.miGotoRightList)}); - this.barSubItem3.Name = "barSubItem3"; + this.mnuAccessibility.Name = "mnuAccessibility"; // - // miGotoInputSource + // mnuGotoChannelList // - resources.ApplyResources(this.miGotoInputSource, "miGotoInputSource"); - this.miGotoInputSource.CategoryGuid = new System.Guid("9cf38b78-167f-4d95-b848-8a3c913209c4"); - this.miGotoInputSource.Id = 65; - this.miGotoInputSource.ItemShortcut = new DevExpress.XtraBars.BarShortcut(System.Windows.Forms.Keys.F1); - this.miGotoInputSource.Name = "miGotoInputSource"; - this.miGotoInputSource.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miGotoInputSource_ItemClick); + resources.ApplyResources(this.mnuGotoChannelList, "mnuGotoChannelList"); + this.mnuGotoChannelList.CategoryGuid = new System.Guid("9cf38b78-167f-4d95-b848-8a3c913209c4"); + this.mnuGotoChannelList.Id = 89; + this.mnuGotoChannelList.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { + new DevExpress.XtraBars.LinkPersistInfo(this.mnuInputSource)}); + this.mnuGotoChannelList.Name = "mnuGotoChannelList"; // - // miGotoFavList + // mnuInputSource // - resources.ApplyResources(this.miGotoFavList, "miGotoFavList"); - this.miGotoFavList.CategoryGuid = new System.Guid("9cf38b78-167f-4d95-b848-8a3c913209c4"); - this.miGotoFavList.Id = 66; - this.miGotoFavList.ItemShortcut = new DevExpress.XtraBars.BarShortcut((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F1)); - this.miGotoFavList.Name = "miGotoFavList"; - this.miGotoFavList.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miGotoFavList_ItemClick); + resources.ApplyResources(this.mnuInputSource, "mnuInputSource"); + this.mnuInputSource.CategoryGuid = new System.Guid("9cf38b78-167f-4d95-b848-8a3c913209c4"); + this.mnuInputSource.Id = 90; + this.mnuInputSource.Name = "mnuInputSource"; + // + // mnuGotoFavList + // + resources.ApplyResources(this.mnuGotoFavList, "mnuGotoFavList"); + this.mnuGotoFavList.CategoryGuid = new System.Guid("9cf38b78-167f-4d95-b848-8a3c913209c4"); + this.mnuGotoFavList.Id = 91; + this.mnuGotoFavList.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { + new DevExpress.XtraBars.LinkPersistInfo(this.mnuFavList)}); + this.mnuGotoFavList.Name = "mnuGotoFavList"; + // + // mnuFavList + // + resources.ApplyResources(this.mnuFavList, "mnuFavList"); + this.mnuFavList.CategoryGuid = new System.Guid("9cf38b78-167f-4d95-b848-8a3c913209c4"); + this.mnuFavList.Id = 92; + this.mnuFavList.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { + new DevExpress.XtraBars.LinkPersistInfo(this.miSelectFavList0), + new DevExpress.XtraBars.LinkPersistInfo(this.miSelectFavListA), + new DevExpress.XtraBars.LinkPersistInfo(this.miSelectFavListB), + new DevExpress.XtraBars.LinkPersistInfo(this.miSelectFavListC), + new DevExpress.XtraBars.LinkPersistInfo(this.miSelectFavListD), + new DevExpress.XtraBars.LinkPersistInfo(this.miSelectFavListE)}); + this.mnuFavList.Name = "mnuFavList"; + // + // miSelectFavList0 + // + resources.ApplyResources(this.miSelectFavList0, "miSelectFavList0"); + this.miSelectFavList0.Id = 83; + this.miSelectFavList0.ItemShortcut = new DevExpress.XtraBars.BarShortcut(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Alt) + | System.Windows.Forms.Keys.D0)); + this.miSelectFavList0.Name = "miSelectFavList0"; + this.miSelectFavList0.Tag = "0"; + this.miSelectFavList0.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miSelectFavList_ItemClick); + // + // miSelectFavListA + // + resources.ApplyResources(this.miSelectFavListA, "miSelectFavListA"); + this.miSelectFavListA.Id = 84; + this.miSelectFavListA.ItemShortcut = new DevExpress.XtraBars.BarShortcut(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Alt) + | System.Windows.Forms.Keys.D1)); + this.miSelectFavListA.Name = "miSelectFavListA"; + this.miSelectFavListA.Tag = "1"; + this.miSelectFavListA.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miSelectFavList_ItemClick); + // + // miSelectFavListB + // + resources.ApplyResources(this.miSelectFavListB, "miSelectFavListB"); + this.miSelectFavListB.Id = 85; + this.miSelectFavListB.ItemShortcut = new DevExpress.XtraBars.BarShortcut(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Alt) + | System.Windows.Forms.Keys.D2)); + this.miSelectFavListB.Name = "miSelectFavListB"; + this.miSelectFavListB.Tag = "2"; + this.miSelectFavListB.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miSelectFavList_ItemClick); + // + // miSelectFavListC + // + resources.ApplyResources(this.miSelectFavListC, "miSelectFavListC"); + this.miSelectFavListC.Id = 86; + this.miSelectFavListC.ItemShortcut = new DevExpress.XtraBars.BarShortcut(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Alt) + | System.Windows.Forms.Keys.D3)); + this.miSelectFavListC.Name = "miSelectFavListC"; + this.miSelectFavListC.Tag = "3"; + this.miSelectFavListC.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miSelectFavList_ItemClick); + // + // miSelectFavListD + // + resources.ApplyResources(this.miSelectFavListD, "miSelectFavListD"); + this.miSelectFavListD.Id = 87; + this.miSelectFavListD.ItemShortcut = new DevExpress.XtraBars.BarShortcut(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Alt) + | System.Windows.Forms.Keys.D4)); + this.miSelectFavListD.Name = "miSelectFavListD"; + this.miSelectFavListD.Tag = "4"; + this.miSelectFavListD.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miSelectFavList_ItemClick); + // + // miSelectFavListE + // + resources.ApplyResources(this.miSelectFavListE, "miSelectFavListE"); + this.miSelectFavListE.Id = 88; + this.miSelectFavListE.ItemShortcut = new DevExpress.XtraBars.BarShortcut(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Alt) + | System.Windows.Forms.Keys.D5)); + this.miSelectFavListE.Name = "miSelectFavListE"; + this.miSelectFavListE.Tag = "5"; + this.miSelectFavListE.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miSelectFavList_ItemClick); // // miGotoLeftFilter // @@ -1773,9 +1874,9 @@ this.pageEmpty.Name = "pageEmpty"; resources.ApplyResources(this.pageEmpty, "pageEmpty"); // - // mnuContext + // popupContext // - this.mnuContext.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { + this.popupContext.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(this.miMoveUp), new DevExpress.XtraBars.LinkPersistInfo(this.miMoveDown), new DevExpress.XtraBars.LinkPersistInfo(this.miAddChannel), @@ -1791,8 +1892,8 @@ new DevExpress.XtraBars.LinkPersistInfo(this.miSkipOff), new DevExpress.XtraBars.LinkPersistInfo(this.miHideOn, true), new DevExpress.XtraBars.LinkPersistInfo(this.miHideOff)}); - this.mnuContext.Manager = this.barManager1; - this.mnuContext.Name = "mnuContext"; + this.popupContext.Manager = this.barManager1; + this.popupContext.Name = "popupContext"; // // timerEditDelay // @@ -1820,6 +1921,24 @@ this.pageProgNr.Name = "pageProgNr"; resources.ApplyResources(this.pageProgNr, "pageProgNr"); // + // popupInputSource + // + this.popupInputSource.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { + new DevExpress.XtraBars.LinkPersistInfo(this.mnuInputSource)}); + this.popupInputSource.Manager = this.barManager1; + this.popupInputSource.MenuCaption = "Select input source"; + this.popupInputSource.Name = "popupInputSource"; + this.popupInputSource.ShowCaption = true; + // + // popupFavList + // + this.popupFavList.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { + new DevExpress.XtraBars.LinkPersistInfo(this.mnuFavList)}); + this.popupFavList.Manager = this.barManager1; + this.popupFavList.MenuCaption = "Select program or favorite list"; + this.popupFavList.Name = "popupFavList"; + this.popupFavList.ShowCaption = true; + // // MainForm // resources.ApplyResources(this, "$this"); @@ -1866,11 +1985,13 @@ ((System.ComponentModel.ISupportInitialize)(this.cbCloseGap.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabChannelList)).EndInit(); this.tabChannelList.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.mnuContext)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.popupContext)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.grpSubList)).EndInit(); this.grpSubList.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.tabSubList)).EndInit(); this.tabSubList.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.popupInputSource)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.popupFavList)).EndInit(); this.ResumeLayout(false); } @@ -1949,7 +2070,7 @@ private DevExpress.XtraGrid.Columns.GridColumn colIndex1; private DevExpress.XtraGrid.Columns.GridColumn colUid1; private DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit repositoryItemCheckedComboBoxEdit1; - private DevExpress.XtraBars.PopupMenu mnuContext; + private DevExpress.XtraBars.PopupMenu popupContext; private DevExpress.XtraBars.BarSubItem miEdit; private DevExpress.XtraBars.BarButtonItem miRemove; private DevExpress.XtraBars.BarButtonItem miLockOn; @@ -2016,9 +2137,7 @@ private DevExpress.XtraBars.BarButtonItem miPrint; private DevExpress.XtraGrid.Columns.GridColumn colProvider; private DevExpress.XtraBars.BarButtonItem miRenumFavByPrNr; - private DevExpress.XtraBars.BarSubItem barSubItem3; - private DevExpress.XtraBars.BarButtonItem miGotoInputSource; - private DevExpress.XtraBars.BarButtonItem miGotoFavList; + private DevExpress.XtraBars.BarSubItem mnuAccessibility; private DevExpress.XtraBars.BarButtonItem miGotoLeftFilter; private DevExpress.XtraBars.BarButtonItem miGotoLeftList; private DevExpress.XtraBars.BarButtonItem miRightListFilter; @@ -2033,6 +2152,18 @@ private DevExpress.XtraBars.BarButtonItem miFavCUnset; private DevExpress.XtraBars.BarButtonItem miFavDUnset; private DevExpress.XtraBars.BarButtonItem miFavEUnset; + private DevExpress.XtraBars.PopupMenu popupInputSource; + private DevExpress.XtraBars.PopupMenu popupFavList; + private DevExpress.XtraBars.BarButtonItem miSelectFavList0; + private DevExpress.XtraBars.BarButtonItem miSelectFavListA; + private DevExpress.XtraBars.BarButtonItem miSelectFavListB; + private DevExpress.XtraBars.BarButtonItem miSelectFavListC; + private DevExpress.XtraBars.BarButtonItem miSelectFavListD; + private DevExpress.XtraBars.BarButtonItem miSelectFavListE; + private DevExpress.XtraBars.BarSubItem mnuGotoChannelList; + private DevExpress.XtraBars.BarLinkContainerItem mnuInputSource; + private DevExpress.XtraBars.BarSubItem mnuGotoFavList; + private DevExpress.XtraBars.BarLinkContainerItem mnuFavList; private DevExpress.XtraSplashScreen.SplashScreenManager splashScreenManager1; } } diff --git a/ChanSort/MainForm.cs b/ChanSort/MainForm.cs index add6028..2bec83c 100644 --- a/ChanSort/MainForm.cs +++ b/ChanSort/MainForm.cs @@ -25,7 +25,7 @@ namespace ChanSort.Ui { public partial class MainForm : XtraForm { - public const string AppVersion = "v2014-07-08"; + public const string AppVersion = "v2014-07-11"; private const int MaxMruEntries = 10; @@ -266,7 +266,19 @@ namespace ChanSort.Ui private void FillChannelListCombo() { this.tabChannelList.TabPages.Clear(); + + var itemList = new List(); + foreach(BarItemLink link in this.mnuInputSource.ItemLinks) + itemList.Add(link.Item); + foreach (BarItem item in itemList) + { + this.barManager1.Items.Remove(item); + item.Dispose(); + } + this.mnuInputSource.ClearLinks(); + XtraTabPage firstNonEmpty = null; + int i = 0; foreach (var list in this.dataRoot.ChannelLists) { if (list.Channels.Count == 0) @@ -275,6 +287,12 @@ namespace ChanSort.Ui tab.Tag = list; if (firstNonEmpty == null && list.Count > 0) firstNonEmpty = tab; + var item = new BarButtonItem(this.barManager1, list.Caption); + item.ItemShortcut = new BarShortcut((Keys) ((int)(Keys.Alt | Keys.D1) + i)); + item.Tag = i; + item.ItemClick += this.miInputSource_ItemClick; + this.mnuInputSource.AddItem(item); + ++i; } if (tabChannelList.TabPages.Count > 0) @@ -331,7 +349,7 @@ namespace ChanSort.Ui this.subListIndex = 0; } this.grpSubList.Visible = this.dataRoot.SortedFavorites; - this.miGotoFavList.Enabled = this.dataRoot.SortedFavorites; + this.mnuFavList.Enabled = this.dataRoot.SortedFavorites; this.colOutFav.OptionsColumn.AllowEdit = !this.dataRoot.SortedFavorites; this.colFavorites.OptionsColumn.AllowEdit = !this.dataRoot.SortedFavorites; } @@ -1304,6 +1322,8 @@ namespace ChanSort.Ui this.miTvSettings.Enabled = this.currentTvSerializer != null && this.currentTvSerializer.Features.DeviceSettings; this.miCleanupChannels.Enabled = this.currentTvSerializer != null && this.currentTvSerializer.Features.CleanUpChannelData; + this.mnuFavList.Enabled = this.grpSubList.Visible; + this.txtSetSlot.Enabled = mayEdit; } #endregion @@ -1555,24 +1575,17 @@ namespace ChanSort.Ui #region ProcessCmdKey() protected override bool ProcessCmdKey(ref Message msg, Keys keyData) { - // select input source - if (keyData >= (Keys.Alt | Keys.D1) && keyData <= (Keys.Alt | Keys.D9)) + if (keyData == Keys.F1) { - int index = (int) keyData - (int) (Keys.Alt | Keys.D1); - if (index < this.tabChannelList.TabPages.Count) - this.tabChannelList.SelectedTabPageIndex = index; + this.popupInputSource.ShowPopup(this.tabChannelList.PointToScreen(new Point(0, this.tabChannelList.Height))); return true; } - // select program or fav list - if (keyData >= (Keys.Alt | Keys.Control | Keys.D0) && keyData <= (Keys.Alt | Keys.Control | Keys.D5)) + if (keyData == (Keys.F1 | Keys.Shift)) { - int index = (int)keyData - (int)(Keys.Alt | Keys.Control | Keys.D0); - if (index < this.tabSubList.TabPages.Count) - this.tabSubList.SelectedTabPageIndex = index; + this.popupFavList.ShowPopup(this.tabSubList.PointToScreen(new Point(0, this.tabSubList.Height))); return true; } - return base.ProcessCmdKey(ref msg, keyData); } #endregion @@ -1795,14 +1808,20 @@ namespace ChanSort.Ui #region Accessibility menu - private void miGotoInputSource_ItemClick(object sender, ItemClickEventArgs e) + private void miInputSource_ItemClick(object sender, ItemClickEventArgs e) { - TryExecute(this.tabChannelList.Select); + this.tabChannelList.SelectedTabPageIndex = (int) e.Item.Tag; } - private void miGotoFavList_ItemClick(object sender, ItemClickEventArgs e) + private void miSelectFavList_ItemClick(object sender, ItemClickEventArgs e) { - TryExecute(this.tabSubList.Select); + try + { + int idx = Convert.ToInt32(e.Item.Tag); + if (this.grpSubList.Visible && idx < this.tabSubList.TabPages.Count) + this.tabSubList.SelectedTabPageIndex = idx; + } + catch (Exception ex) { HandleException(ex); } } private void miGotoLeftFilter_ItemClick(object sender, ItemClickEventArgs e) @@ -2174,7 +2193,7 @@ namespace ChanSort.Ui this.lastFocusedGrid = this.gviewLeft; this.UpdateMenu(); if (e.MenuType == GridMenuType.Row && e.HitInfo.InRow && this.gviewLeft.IsDataRow(e.HitInfo.RowHandle)) - this.mnuContext.ShowPopup(this.gridLeft.PointToScreen(e.Point)); + this.popupContext.ShowPopup(this.gridLeft.PointToScreen(e.Point)); } #endregion @@ -2310,7 +2329,7 @@ namespace ChanSort.Ui this.lastFocusedGrid = this.gviewRight; this.UpdateMenu(); if (e.MenuType == GridMenuType.Row) - this.mnuContext.ShowPopup(this.gridRight.PointToScreen(e.Point)); + this.popupContext.ShowPopup(this.gridRight.PointToScreen(e.Point)); } #endregion @@ -2468,5 +2487,6 @@ namespace ChanSort.Ui } #endregion + } } diff --git a/ChanSort/MainForm.de.resx b/ChanSort/MainForm.de.resx index cc0d10e..c40829d 100644 --- a/ChanSort/MainForm.de.resx +++ b/ChanSort/MainForm.de.resx @@ -259,20 +259,38 @@ Eventuelle Warnungen nach dem Laden einer TV-Datei automatisch anzeigen - + Einga&behilfe - + + Öffnet ein Menü zur Auswahl der Eingangsquelle. Dieses kann auch direkt mit der F1-Taste aufgerufen werden. + + &Eingangsquelle auswählen - - Mit Alt+1 bis Alt+9 kann direkt eine Eingangsquelle ausgewählt werden + + Öffnet ein Menü zur Auswahl der Programm- oder Favoritenliste. Dieses Menü kann auch direkt über die Umschalt+F1 Tastenkombination geöffnet werden. - - &Favoritenliste auswählen + + Program-/&Favoritenliste auswählen - - Mit Ctrl+Alt+0 bis Ctrl+Alt+5 kann zwischen der Programmliste und den Favoritenlisten gewechselt werden + + Programmliste + + + Favoriten A + + + Favoriten B + + + Favoriten C + + + Favoriten D + + + Favoriten E Filterzeile in der &linken Liste @@ -394,21 +412,57 @@ ChanSort {0} - Senderlisten-Editor für Samsung, LG, Panasonic und Toshiba TVs + + Kindersicherung bei markierten Sendern ein/ausschalten + Kindersicherung + + Favorit E umschalten + + + Favorit D umschalten + + + Favorit C umschalten + + + Favorit B umschalten + + + Favorit A umschalten + + + Entfernt den Suchfilter von der sortierten Senderliste + Filter entfernen + + Markierte Sender fortlaufend nummerieren + - Markierte Sender neu nummerieren + Markierte Sender fortlaufend nummerieren + + + Markierte Sender nach unten verschieben Markierte Sender nach unten verschieben + + Markierte Sender nach oben verschieben + Markierte Sender nach oben verschieben + + Markierte Sender aus sortierter Liste entfernen + + + Markierte Sender aus sortierter Liste entfernen + Sortierte Sender (.csv) @@ -478,20 +532,32 @@ F5: Filter | F6: Liste | Eingabe: übernehmen + + Sender aus sortierter Liste entfernen + Sender aus sortierter Liste entfernen + + Aller derzeit nicht sortierten Sender ans Ende der Liste anhängen + << Alle hinzufügen Aller derzeit nicht sortierten Sender ans Ende der Liste anhängen + + Entfernt den Suchfilter von der vollständigen Senderliste + Filter entfernen + + Markierte Sender in die sortierte liste übernehmen + - Markierte Sender übernehmen + Markierte Sender in die sortierte liste übernehmen Alle Sender diff --git a/ChanSort/MainForm.resx b/ChanSort/MainForm.resx index 16df330..353a93b 100644 --- a/ChanSort/MainForm.resx +++ b/ChanSort/MainForm.resx @@ -554,20 +554,44 @@ Show warnings after loading file - + &Accessibility - - &Input source selection + + Opens a submenu for the input source selection. This menu can be directly activated with the F1 key - - Press Alt+1 to Alt+9 to select a specific input source + + Select &input source - - &Favorite list selection + + mnuInputSource - - Press Ctrl+Alt+0 to Ctrl+Alt+5 to switch between program and favorite lists + + Opens a submenu for the program of favorite list selection. This menu can be directly activated with the Shift+F1 key + + + Select program/&favorite list + + + mnuFavList + + + Program list + + + Favorites A + + + Favorites B + + + Favorites C + + + Favorites D + + + Favorites E &Left list filter @@ -1617,22 +1641,70 @@ DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - barSubItem3 + + mnuAccessibility - + DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - miGotoInputSource + + mnuGotoChannelList - + + DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + mnuInputSource + + + DevExpress.XtraBars.BarLinkContainerItem, DevExpress.XtraBars.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + mnuGotoFavList + + + DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + mnuFavList + + + DevExpress.XtraBars.BarLinkContainerItem, DevExpress.XtraBars.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + miSelectFavList0 + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - miGotoFavList + + miSelectFavListA - + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + miSelectFavListB + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + miSelectFavListC + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + miSelectFavListD + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + miSelectFavListE + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -1707,10 +1779,10 @@ DevExpress.XtraSplashScreen.SplashScreenManager, DevExpress.XtraEditors.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - mnuContext + + popupContext - + DevExpress.XtraBars.PopupMenu, DevExpress.XtraBars.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -1719,6 +1791,18 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + popupInputSource + + + DevExpress.XtraBars.PopupMenu, DevExpress.XtraBars.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + popupFavList + + + DevExpress.XtraBars.PopupMenu, DevExpress.XtraBars.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + MainForm @@ -1726,7 +1810,7 @@ DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v13.2, Version=13.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - 07/08/2014 22:14:23 + 07/11/2014 10:05:49 16, 16 @@ -1740,6 +1824,9 @@ 15 + + Toggle parental lock + Parental lock @@ -1755,6 +1842,9 @@ 0 + + Toggle Favorite E + 232, 5 @@ -1779,6 +1869,9 @@ 1 + + Toggle Favorite D + 207, 5 @@ -1803,6 +1896,9 @@ 2 + + Toggle Favorite C + 182, 5 @@ -1827,6 +1923,9 @@ 3 + + Toggle Favorite B + 157, 5 @@ -1851,6 +1950,9 @@ 4 + + Toggle Favorite A + 132, 5 @@ -1875,6 +1977,9 @@ 5 + + Remove channel filter criteria from sorted channel list + Tahoma, 8.25pt, style=Strikeout @@ -1915,7 +2020,7 @@ 8 - 1-999 + Renumber selected channels sequentially Renumber selected channels @@ -1942,7 +2047,7 @@ 6 - v + Move selected channel down Move selected channels down @@ -1969,7 +2074,7 @@ 5 - ^ + Move selected channel up Move selected channels up @@ -1996,7 +2101,7 @@ 2 - X + Remove selected channels from sorted list Remove selected channels @@ -2446,7 +2551,7 @@ 6 - X + Remove selected channels from sorted list Remove selected channels from sorted list @@ -2463,6 +2568,12 @@ 0 + + Append all currently unsorted channels at the end of the list + + + + 71, 5 @@ -2490,6 +2601,9 @@ 1 + + Remove channel filter criteria from complete channel list + Tahoma, 8.25pt, style=Strikeout @@ -2530,7 +2644,7 @@ 4 - << + Add selected channels to sorted list Add selected channels to sorted list @@ -2625,10 +2739,16 @@ 194, 17 - + 781, 17 - 900, 17 + 911, 17 + + + 1042, 17 + + + 1196, 17 \ No newline at end of file diff --git a/readme.txt b/readme.txt index 38caedd..6aea429 100644 --- a/readme.txt +++ b/readme.txt @@ -1,9 +1,7 @@ -Version v2014-07-08 ======================================================= +Version v2014-07-11 ======================================================= Changes: -- added Accessibility menu and hotkeys to directly select the input source - (Alt+1 to Alt+9) and the program/favorite lists (Ctrl+Alt+0, ...) -- addes support for LG LH250C +- improved accessibility support (channel list and prog/fav list selection) The complete change log can be found at the end of this document @@ -117,6 +115,9 @@ OTHER DEALINGS IN THE SOFTWARE. Change log ================================================================ +2014-07-11 +- improved accessibility support (channel list and prog/fav list selection) + 2014-07-08 - added Accessibility menu and hotkeys to directly select the input source (Alt+1 to Alt+9) and the program/favorite lists (Ctrl+Alt+0, ...)