From b898b856b7575fe0d63d24b0ec1553d591e175e8 Mon Sep 17 00:00:00 2001 From: Horst Beham Date: Wed, 17 Feb 2021 10:02:42 +0100 Subject: [PATCH] - UI: added search button (because it is not obvious that the top row of the table is a search/filter row) --- source/ChanSort/MainForm.Designer.cs | 35 +++++++++----- source/ChanSort/MainForm.cs | 10 ++++ source/ChanSort/MainForm.resx | 71 ++++++++++++++++++++-------- source/changelog.md | 23 ++++----- 4 files changed, 98 insertions(+), 41 deletions(-) diff --git a/source/ChanSort/MainForm.Designer.cs b/source/ChanSort/MainForm.Designer.cs index f1be54d..bcfa57c 100644 --- a/source/ChanSort/MainForm.Designer.cs +++ b/source/ChanSort/MainForm.Designer.cs @@ -104,6 +104,7 @@ this.colDebug = new DevExpress.XtraGrid.Columns.GridColumn(); this.lblHotkeyRight = new DevExpress.XtraEditors.LabelControl(); this.panelControl3 = new DevExpress.XtraEditors.PanelControl(); + this.btnSearch = new DevExpress.XtraEditors.SimpleButton(); this.lblPredefinedList = new DevExpress.XtraEditors.LabelControl(); this.btnRemoveRight = new DevExpress.XtraEditors.SimpleButton(); this.btnAddAll = new DevExpress.XtraEditors.SimpleButton(); @@ -150,12 +151,12 @@ this.miCzech = new DevExpress.XtraBars.BarButtonItem(); this.miGerman = new DevExpress.XtraBars.BarButtonItem(); this.miSpanish = new DevExpress.XtraBars.BarButtonItem(); + this.miHungarian = new DevExpress.XtraBars.BarButtonItem(); this.miPolski = new DevExpress.XtraBars.BarButtonItem(); this.miPortuguese = new DevExpress.XtraBars.BarButtonItem(); this.miRomanian = new DevExpress.XtraBars.BarButtonItem(); this.miRussian = new DevExpress.XtraBars.BarButtonItem(); this.miTurkish = new DevExpress.XtraBars.BarButtonItem(); - this.miHungarian = new DevExpress.XtraBars.BarButtonItem(); this.mnuCharset = new DevExpress.XtraBars.BarSubItem(); this.miCharsetForm = new DevExpress.XtraBars.BarButtonItem(); this.miUtf8Charset = new DevExpress.XtraBars.BarButtonItem(); @@ -944,6 +945,7 @@ // // panelControl3 // + this.panelControl3.Controls.Add(this.btnSearch); this.panelControl3.Controls.Add(this.lblPredefinedList); this.panelControl3.Controls.Add(this.btnRemoveRight); this.panelControl3.Controls.Add(this.btnAddAll); @@ -952,6 +954,16 @@ resources.ApplyResources(this.panelControl3, "panelControl3"); this.panelControl3.Name = "panelControl3"; // + // btnSearch + // + resources.ApplyResources(this.btnSearch, "btnSearch"); + this.btnSearch.Appearance.FontStyleDelta = ((System.Drawing.FontStyle)(resources.GetObject("btnSearch.Appearance.FontStyleDelta"))); + this.btnSearch.Appearance.Options.UseFont = true; + this.btnSearch.ImageOptions.ImageIndex = ((int)(resources.GetObject("btnSearch.ImageOptions.ImageIndex"))); + this.btnSearch.ImageOptions.ImageList = this.globalImageCollection1; + this.btnSearch.Name = "btnSearch"; + this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); + // // lblPredefinedList // this.lblPredefinedList.Appearance.Font = ((System.Drawing.Font)(resources.GetObject("lblPredefinedList.Appearance.Font"))); @@ -1542,6 +1554,16 @@ this.miSpanish.Tag = "es-ES"; this.miSpanish.DownChanged += new DevExpress.XtraBars.ItemClickEventHandler(this.miLanguage_DownChanged); // + // miHungarian + // + this.miHungarian.ButtonStyle = DevExpress.XtraBars.BarButtonStyle.Check; + resources.ApplyResources(this.miHungarian, "miHungarian"); + this.miHungarian.Id = 111; + this.miHungarian.ImageOptions.ImageIndex = ((int)(resources.GetObject("miHungarian.ImageOptions.ImageIndex"))); + this.miHungarian.Name = "miHungarian"; + this.miHungarian.Tag = "hu-HU"; + this.miHungarian.DownChanged += new DevExpress.XtraBars.ItemClickEventHandler(this.miLanguage_DownChanged); + // // miPolski // this.miPolski.ButtonStyle = DevExpress.XtraBars.BarButtonStyle.Check; @@ -1592,16 +1614,6 @@ this.miTurkish.Tag = "tr-TR"; this.miTurkish.DownChanged += new DevExpress.XtraBars.ItemClickEventHandler(this.miLanguage_DownChanged); // - // miHungarian - // - this.miHungarian.ButtonStyle = DevExpress.XtraBars.BarButtonStyle.Check; - resources.ApplyResources(this.miHungarian, "miHungarian"); - this.miHungarian.Id = 111; - this.miHungarian.ImageOptions.ImageIndex = ((int)(resources.GetObject("miHungarian.ImageOptions.ImageIndex"))); - this.miHungarian.Name = "miHungarian"; - this.miHungarian.Tag = "hu-HU"; - this.miHungarian.DownChanged += new DevExpress.XtraBars.ItemClickEventHandler(this.miLanguage_DownChanged); - // // mnuCharset // resources.ApplyResources(this.mnuCharset, "mnuCharset"); @@ -2393,6 +2405,7 @@ private DevExpress.XtraBars.BarButtonItem miUtf16BigEndian; private DevExpress.XtraBars.BarButtonItem miUtf16LittleEndian; private DevExpress.XtraBars.BarButtonItem miHungarian; + private DevExpress.XtraEditors.SimpleButton btnSearch; } } diff --git a/source/ChanSort/MainForm.cs b/source/ChanSort/MainForm.cs index 54ba1d1..df2732a 100644 --- a/source/ChanSort/MainForm.cs +++ b/source/ChanSort/MainForm.cs @@ -3297,6 +3297,16 @@ namespace ChanSort.Ui #endregion + #region btnSearch_Click + private void btnSearch_Click(object sender, EventArgs e) + { + this.gviewRight.FocusedRowHandle = GridControl.AutoFilterRowHandle; + this.gviewRight.FocusedColumn = colName; + this.gridRight.Focus(); + this.gviewRight.ShowEditor(); + } + #endregion + #region btnRemoveLeft_Click, btnRemoveRight_Click private void btnRemoveLeft_Click(object sender, EventArgs e) diff --git a/source/ChanSort/MainForm.resx b/source/ChanSort/MainForm.resx index 43e0bfe..45fe2c0 100644 --- a/source/ChanSort/MainForm.resx +++ b/source/ChanSort/MainForm.resx @@ -279,7 +279,7 @@ gridLeft - ChanSort.XGridControl, ChanSort, Version=1.0.7665.29929, Culture=neutral, PublicKeyToken=null + ChanSort.XGridControl, ChanSort, Version=1.0.7718.18008, Culture=neutral, PublicKeyToken=null grpOutputList @@ -489,7 +489,7 @@ &Add channels - 40 + 39 &Remove channels @@ -1229,7 +1229,7 @@ gviewLeft - ChanSort.XGridView, ChanSort, Version=1.0.7665.29929, Culture=neutral, PublicKeyToken=null + ChanSort.XGridView, ChanSort, Version=1.0.7718.18008, Culture=neutral, PublicKeyToken=null colIndex1 @@ -1313,13 +1313,13 @@ globalImageCollection1 - ChanSort.Ui.GlobalImageCollection, ChanSort, Version=1.0.7665.29929, Culture=neutral, PublicKeyToken=null + ChanSort.Ui.GlobalImageCollection, ChanSort, Version=1.0.7718.18008, Culture=neutral, PublicKeyToken=null gviewRight - ChanSort.XGridView, ChanSort, Version=1.0.7665.29929, Culture=neutral, PublicKeyToken=null + ChanSort.XGridView, ChanSort, Version=1.0.7718.18008, Culture=neutral, PublicKeyToken=null colIndex @@ -1771,6 +1771,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v20.1, Version=20.1.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + miHungarian + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v20.1, Version=20.1.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + miPolski @@ -1801,12 +1807,6 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v20.1, Version=20.1.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - miHungarian - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v20.1, Version=20.1.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - mnuCharset @@ -2066,7 +2066,7 @@ DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v20.1, Version=20.1.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - 12/26/2020 17:01:09 + 02/17/2021 10:00:22 16, 16 @@ -2891,7 +2891,7 @@ gridRight - ChanSort.XGridControl, ChanSort, Version=1.0.7665.29929, Culture=neutral, PublicKeyToken=null + ChanSort.XGridControl, ChanSort, Version=1.0.7718.18008, Culture=neutral, PublicKeyToken=null grpInputList @@ -2929,11 +2929,44 @@ 1 + + Search for a channel + + + Strikeout + + + 18 + + + 270, 5 + + + 23, 23 + + + 9 + + + Search channel by name + + + btnSearch + + + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v20.1, Version=20.1.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + panelControl3 + + + 0 + Tahoma, 12pt, style=Bold - 291, 7 + 419, 5 372, 19 @@ -2960,7 +2993,7 @@ panelControl3 - 0 + 1 11 @@ -2990,7 +3023,7 @@ panelControl3 - 1 + 2 Append all currently unsorted channels at the end of the list @@ -3020,7 +3053,7 @@ panelControl3 - 2 + 3 Remove channel filter criteria from complete channel list @@ -3056,7 +3089,7 @@ panelControl3 - 3 + 4 39 @@ -3086,7 +3119,7 @@ panelControl3 - 4 + 5 Top diff --git a/source/changelog.md b/source/changelog.md index a188cb3..8b4a881 100644 --- a/source/changelog.md +++ b/source/changelog.md @@ -3,34 +3,35 @@ ChanSort Change Log 2021-02-17 - Panasonic: fixed error reading lists with channels that refer to non-existing transponders -- Philips ChannelMap_45: incrementing fav list version number when saving and setting the last_watched_channel_id to +- Philips ChannelMap\_45: incrementing fav list version number when saving and setting the last\_watched\_channel\_id to the first channel in the fav list (ensuring that the channel is actually present in the list) +- UI: added search button (because it is not obvious that the top row of the table is a search/filter row) 2021-02-09 - Sony: fixed incorrect checksum error for Android based TVs which use CR+LF as line separators (normally only LF is used) - Philips: show info that it may be necessary to unplug and reboot the TV after the import -- Philips ChannelMap_45: show info when there are checksum errors, which indicate that TV's internal list is broken +- Philips ChannelMap\_45: show info when there are checksum errors, which indicate that TV's internal list is broken and a rescan is required in order to properly export/import the list. 2021-02-08 - Philips: lists with a chanLst.bin file show information about file format version and TV model under File / Information -- Philips ChannelMap_45: fixed handling of favorite lists (allow up to 8 lists, empty ones get removed automatically) -- Philips ChannelMap_45: no longer prompting to reorder channels sequentially (to close gaps). +- Philips ChannelMap\_45: fixed handling of favorite lists (allow up to 8 lists, empty ones get removed automatically) +- Philips ChannelMap\_45: no longer prompting to reorder channels sequentially (to close gaps). (This feature caused DVB-C/T list to only contain odd numbers and DVB-S to contain only even numbers, when both exist) -- Philips ChannelMap_45: added display for service type (TV/radio), encryption, sat frequency polarity -- Philips ChannelMap_45: fixed display of DVB-C/T frequency +- Philips ChannelMap\_45: added display for service type (TV/radio), encryption, sat frequency polarity +- Philips ChannelMap\_45: fixed display of DVB-C/T frequency - Philips Repair\chanLst.bin (1.x): fixed sat frequency display for transponders with vertical polarity 2021-02-05 - Philips ChannelMap_100 and later: keeping original indentation in XML files and original number of bytes for hex-encoded Unicode names (channel name, fav list names) - Philips ChannelMap_110: setting the "UserReorderChannel" flag in the file to 1 -- Philips ChannelMap_45: fixed error when channel names did not match between tv.db and Cable/Terrestrial/SatelliteDb.bin +- Philips ChannelMap\_45: fixed error when channel names did not match between tv.db and Cable/Terrestrial/SatelliteDb.bin 2021-01-31 -- Philips ChannelMap_45: fixed bug writting "channel edited" indicator to the wrong location inside the file -- Philips ChannelMap_45: fixed display of wrong frequency -- Philips ChannelMap_45: added support for favorite lists +- Philips ChannelMap\_45: fixed bug writting "channel edited" indicator to the wrong location inside the file +- Philips ChannelMap\_45: fixed display of wrong frequency +- Philips ChannelMap\_45: added support for favorite lists 2021-01-24 - fixed issues with applying reference lists (especially .m3u) @@ -40,7 +41,7 @@ ChanSort Change Log - SatcoDX (*.sdx format used by ITT, Telefunken, Silva-Schneider, ...): minor bug fixes 2021-01-17 -- Philips: added support for ChannelMap_45 format +- Philips: added support for ChannelMap\_45 format - Philips: fixed display of symbol rate and frequency (off by factor 1000 depending of list and DVB source) - Philips: fixed special characters in channel names (e.g. german umlauts) - Philips: "ServiceType" now only shows "TV" or "Radio". There is no information about HD/SD in the file.