diff --git a/ChanSort.Loader.LG/PresetProgramNrDialog.Designer.cs b/ChanSort.Loader.LG/PresetProgramNrDialog.Designer.cs index 980d3bb..3451a1a 100644 --- a/ChanSort.Loader.LG/PresetProgramNrDialog.Designer.cs +++ b/ChanSort.Loader.LG/PresetProgramNrDialog.Designer.cs @@ -43,68 +43,38 @@ // labelControl1 // resources.ApplyResources(this.labelControl1, "labelControl1"); - this.labelControl1.Appearance.DisabledImage = ((System.Drawing.Image)(resources.GetObject("labelControl1.Appearance.DisabledImage"))); - this.labelControl1.Appearance.GradientMode = ((System.Drawing.Drawing2D.LinearGradientMode)(resources.GetObject("labelControl1.Appearance.GradientMode"))); - this.labelControl1.Appearance.HoverImage = ((System.Drawing.Image)(resources.GetObject("labelControl1.Appearance.HoverImage"))); - this.labelControl1.Appearance.Image = ((System.Drawing.Image)(resources.GetObject("labelControl1.Appearance.Image"))); - this.labelControl1.Appearance.PressedImage = ((System.Drawing.Image)(resources.GetObject("labelControl1.Appearance.PressedImage"))); this.labelControl1.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.labelControl1.Name = "labelControl1"; // // labelControl3 // resources.ApplyResources(this.labelControl3, "labelControl3"); - this.labelControl3.Appearance.DisabledImage = ((System.Drawing.Image)(resources.GetObject("labelControl3.Appearance.DisabledImage"))); this.labelControl3.Appearance.Font = ((System.Drawing.Font)(resources.GetObject("labelControl3.Appearance.Font"))); - this.labelControl3.Appearance.GradientMode = ((System.Drawing.Drawing2D.LinearGradientMode)(resources.GetObject("labelControl3.Appearance.GradientMode"))); - this.labelControl3.Appearance.HoverImage = ((System.Drawing.Image)(resources.GetObject("labelControl3.Appearance.HoverImage"))); - this.labelControl3.Appearance.Image = ((System.Drawing.Image)(resources.GetObject("labelControl3.Appearance.Image"))); - this.labelControl3.Appearance.PressedImage = ((System.Drawing.Image)(resources.GetObject("labelControl3.Appearance.PressedImage"))); this.labelControl3.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.labelControl3.Name = "labelControl3"; // // labelControl4 // resources.ApplyResources(this.labelControl4, "labelControl4"); - this.labelControl4.Appearance.DisabledImage = ((System.Drawing.Image)(resources.GetObject("labelControl4.Appearance.DisabledImage"))); this.labelControl4.Appearance.Font = ((System.Drawing.Font)(resources.GetObject("labelControl4.Appearance.Font"))); - this.labelControl4.Appearance.GradientMode = ((System.Drawing.Drawing2D.LinearGradientMode)(resources.GetObject("labelControl4.Appearance.GradientMode"))); - this.labelControl4.Appearance.HoverImage = ((System.Drawing.Image)(resources.GetObject("labelControl4.Appearance.HoverImage"))); - this.labelControl4.Appearance.Image = ((System.Drawing.Image)(resources.GetObject("labelControl4.Appearance.Image"))); - this.labelControl4.Appearance.PressedImage = ((System.Drawing.Image)(resources.GetObject("labelControl4.Appearance.PressedImage"))); this.labelControl4.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.labelControl4.Name = "labelControl4"; // // labelControl5 // resources.ApplyResources(this.labelControl5, "labelControl5"); - this.labelControl5.Appearance.DisabledImage = ((System.Drawing.Image)(resources.GetObject("labelControl5.Appearance.DisabledImage"))); - this.labelControl5.Appearance.GradientMode = ((System.Drawing.Drawing2D.LinearGradientMode)(resources.GetObject("labelControl5.Appearance.GradientMode"))); - this.labelControl5.Appearance.HoverImage = ((System.Drawing.Image)(resources.GetObject("labelControl5.Appearance.HoverImage"))); - this.labelControl5.Appearance.Image = ((System.Drawing.Image)(resources.GetObject("labelControl5.Appearance.Image"))); - this.labelControl5.Appearance.PressedImage = ((System.Drawing.Image)(resources.GetObject("labelControl5.Appearance.PressedImage"))); this.labelControl5.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.labelControl5.Name = "labelControl5"; // // labelControl6 // resources.ApplyResources(this.labelControl6, "labelControl6"); - this.labelControl6.Appearance.DisabledImage = ((System.Drawing.Image)(resources.GetObject("labelControl6.Appearance.DisabledImage"))); - this.labelControl6.Appearance.GradientMode = ((System.Drawing.Drawing2D.LinearGradientMode)(resources.GetObject("labelControl6.Appearance.GradientMode"))); - this.labelControl6.Appearance.HoverImage = ((System.Drawing.Image)(resources.GetObject("labelControl6.Appearance.HoverImage"))); - this.labelControl6.Appearance.Image = ((System.Drawing.Image)(resources.GetObject("labelControl6.Appearance.Image"))); - this.labelControl6.Appearance.PressedImage = ((System.Drawing.Image)(resources.GetObject("labelControl6.Appearance.PressedImage"))); this.labelControl6.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.labelControl6.Name = "labelControl6"; // // labelControl7 // resources.ApplyResources(this.labelControl7, "labelControl7"); - this.labelControl7.Appearance.DisabledImage = ((System.Drawing.Image)(resources.GetObject("labelControl7.Appearance.DisabledImage"))); - this.labelControl7.Appearance.GradientMode = ((System.Drawing.Drawing2D.LinearGradientMode)(resources.GetObject("labelControl7.Appearance.GradientMode"))); - this.labelControl7.Appearance.HoverImage = ((System.Drawing.Image)(resources.GetObject("labelControl7.Appearance.HoverImage"))); - this.labelControl7.Appearance.Image = ((System.Drawing.Image)(resources.GetObject("labelControl7.Appearance.Image"))); - this.labelControl7.Appearance.PressedImage = ((System.Drawing.Image)(resources.GetObject("labelControl7.Appearance.PressedImage"))); this.labelControl7.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.labelControl7.Name = "labelControl7"; // @@ -124,11 +94,6 @@ // labelControl2 // resources.ApplyResources(this.labelControl2, "labelControl2"); - this.labelControl2.Appearance.DisabledImage = ((System.Drawing.Image)(resources.GetObject("labelControl2.Appearance.DisabledImage"))); - this.labelControl2.Appearance.GradientMode = ((System.Drawing.Drawing2D.LinearGradientMode)(resources.GetObject("labelControl2.Appearance.GradientMode"))); - this.labelControl2.Appearance.HoverImage = ((System.Drawing.Image)(resources.GetObject("labelControl2.Appearance.HoverImage"))); - this.labelControl2.Appearance.Image = ((System.Drawing.Image)(resources.GetObject("labelControl2.Appearance.Image"))); - this.labelControl2.Appearance.PressedImage = ((System.Drawing.Image)(resources.GetObject("labelControl2.Appearance.PressedImage"))); this.labelControl2.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.labelControl2.Name = "labelControl2"; // @@ -149,6 +114,7 @@ this.Controls.Add(this.labelControl3); this.Controls.Add(this.labelControl1); this.Name = "PresetProgramNrDialog"; + this.ShowInTaskbar = false; this.ResumeLayout(false); this.PerformLayout(); diff --git a/ChanSort.Loader.LG/PresetProgramNrDialog.de.resx b/ChanSort.Loader.LG/PresetProgramNrDialog.de.resx index 6aa0f48..26d3a5c 100644 --- a/ChanSort.Loader.LG/PresetProgramNrDialog.de.resx +++ b/ChanSort.Loader.LG/PresetProgramNrDialog.de.resx @@ -117,137 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - Horizontal - - - - - - - - - - Diese Datei enthält vordefinierte Programmnummern für Satellitenkanäle. Aufgrund von Eigenheiten der aktuellen LG Firmware können solche Listen nicht zuverlässig verändert werden. - - - - - Horizontal - - - - - - - - - - Die Bearbeitung der Satelliten-Senderliste wurde gesperrt! - - - - - Horizontal - - - - - - - - - - Um die Liste zu bearbeiten, muss ein sauberer Vollsuchlauf ausgeführt werden: - - - - - Horizontal - - - - - - - - - - - Behalten Sie eine Kopie dieser TLL-Datei, um sie eventuell später als Referenzdatei zu verwenden - - - - - Horizontal - - - - - - - - - - - Führen Sie einen automatischen Suchlauf mit den Optionen "Voll", "Keiner", "Blindsuche" aus - - - - - Horizontal - - - - - - - - - - - Führen Sie am TV die Funktion "Werkseinstellung" aus + 214, 13 Details hierzu gibt es auf der ChanSort Wiki - - - - - Horizontal - - - - - - - - - - - Speichern Sie die neue Liste auf USB und öffnen Sie sie mit ChanSort diff --git a/ChanSort.Loader.LG/PresetProgramNrDialog.resx b/ChanSort.Loader.LG/PresetProgramNrDialog.resx index 3205da2..2d00e34 100644 --- a/ChanSort.Loader.LG/PresetProgramNrDialog.resx +++ b/ChanSort.Loader.LG/PresetProgramNrDialog.resx @@ -117,407 +117,299 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 559, 13 - - - 3 - - - - 3 - - - True - - - 5 - - - - Save the new list to USB and open it with ChanSort - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 254, 224 - - - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - 0 + + + Top, Left, Right Vertical - - Tahoma, 8.25pt, style=Bold - - - - - - - - - - - - - Top, Left, Right - - - $this - - - 165, 13 - - - PresetProgramNrDialog - - - $this - - - - - - - - - Top, Left, Right - - - 11, 21 - - - Editing of the satellite channel list is disabled! - - - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - - - - This file contains preset program numbers for satellite channels. Due to issues with most recent LG firmwares such lists can no longer be modified reliably. - - - - - - labelControl3 - - - 559, 13 - - - - - - 30, 122 - - - $this - - - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Vertical + + + 10, 49 560, 26 - - 9, 199 + + + 0 - - Top, Left, Right + + This file contains preset program numbers for satellite channels. Due to issues with most recent LG firmwares such lists can no longer be modified reliably. - - 4 + + labelControl1 - - 9 + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - Top, Left, Right - - - - - - Vertical - - - - - - 29, 159 - - + $this - - labelControl5 - - - - 8 - - 541, 13 - - + Top, Left, Right + + Tahoma, 8.25pt, style=Bold + + + Vertical + + + 11, 21 + + + 559, 13 + + + 2 + + + Editing of the satellite channel list is disabled! + + + labelControl3 + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 7 + + + Top, Left, Right + + + Tahoma, 8.25pt, style=Bold + + + Vertical + + + 12, 88 + + + 559, 13 + + + 3 + + + To enable editing you must first run a clean full channel search: + + + labelControl4 + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 6 + + + Top, Left, Right + + + Vertical + 30, 105 - + + 541, 13 + + + 4 + + + - Keep a copy of the current TLL file if you want to use it as a reference list later + + + labelControl5 + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 5 + + + Top, Left, Right + + Vertical 30, 140 - - linkDetails - - - - - - Vertical - - - Bottom, Left - - - - - - - - - Horizontal - - - Horizontal - - - - Execute a Factory Reset on your TV - - - Vertical - - - See the ChanSort Wiki for details - - - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Horizontal - - - labelControl6 - - - 2 - - - 6, 13 - - - - - - Horizontal - - - - - + 541, 13 - - 12, 88 - - - $this - - - - - - $this - - - labelControl7 - - - - - - 7 - - - $this - - - - - - - Execute an automatic channel search with options "Full", "None" and "Blind search" - - - - - - 1 - - - 10, 49 - - - 584, 262 - - - 6 - - - labelControl4 - - - - - - 8 - - - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - - - - labelControl1 - - - 0 - - - - - - $this - - - Important Notice - - - - Keep a copy of the current TLL file if you want to use it as a reference list later - - - Vertical - - - CenterScreen - - - 7 - - - Horizontal - - - 6 - - - Ok - - - 2 - - - Horizontal - - - 541, 13 - - - - - - btnOk - - - Tahoma, 8.25pt, style=Bold - - - - 5 - - + + - Execute an automatic channel search with options "Full", "None" and "Blind search" - - 4 - - - $this - - - 75, 23 - - - - - - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - labelControl2 - - - To enable editing you must first run a clean full channel search: - - - Top, Left, Right - - - - - - 541, 13 + + labelControl6 DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + + $this + + + 4 + + Top, Left, Right - - Horizontal + + Vertical + + + 30, 122 + + + 541, 13 + + + 6 + + + - Execute a Factory Reset on your TV + + + labelControl7 + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 3 + + + True + + + 9, 199 + + + 165, 13 + + + 7 + + + See the ChanSort Wiki for details + + + linkDetails + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Bottom, Left + + + 254, 224 + + + 75, 23 + + + 8 + + + Ok + + + btnOk + + + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 1 + + + Top, Left, Right + + + Vertical + + + 29, 159 + + + 541, 13 + + + 9 + + + - Save the new list to USB and open it with ChanSort + + + labelControl2 DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + $this + + + 0 True - - de - + + 6, 13 + + + 584, 262 + + + CenterScreen + + + Important Notice + + + PresetProgramNrDialog + + + DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + \ No newline at end of file diff --git a/ChanSort.Loader.LG/TvSettingsForm.Designer.cs b/ChanSort.Loader.LG/TvSettingsForm.Designer.cs index 6ade42c..fbea31c 100644 --- a/ChanSort.Loader.LG/TvSettingsForm.Designer.cs +++ b/ChanSort.Loader.LG/TvSettingsForm.Designer.cs @@ -64,49 +64,32 @@ // // grpOption // - resources.ApplyResources(this.grpOption, "grpOption"); this.grpOption.Controls.Add(this.cbHbbTv); this.grpOption.Controls.Add(this.cbCustomCountry); this.grpOption.Controls.Add(this.comboBoxEdit1); this.grpOption.Controls.Add(this.labelControl1); + resources.ApplyResources(this.grpOption, "grpOption"); this.grpOption.Name = "grpOption"; // // cbHbbTv // resources.ApplyResources(this.cbHbbTv, "cbHbbTv"); this.cbHbbTv.Name = "cbHbbTv"; - this.cbHbbTv.Properties.AccessibleDescription = resources.GetString("cbHbbTv.Properties.AccessibleDescription"); - this.cbHbbTv.Properties.AccessibleName = resources.GetString("cbHbbTv.Properties.AccessibleName"); - this.cbHbbTv.Properties.AutoHeight = ((bool)(resources.GetObject("cbHbbTv.Properties.AutoHeight"))); this.cbHbbTv.Properties.Caption = resources.GetString("cbHbbTv.Properties.Caption"); - this.cbHbbTv.Properties.DisplayValueChecked = resources.GetString("cbHbbTv.Properties.DisplayValueChecked"); - this.cbHbbTv.Properties.DisplayValueGrayed = resources.GetString("cbHbbTv.Properties.DisplayValueGrayed"); - this.cbHbbTv.Properties.DisplayValueUnchecked = resources.GetString("cbHbbTv.Properties.DisplayValueUnchecked"); // // cbCustomCountry // resources.ApplyResources(this.cbCustomCountry, "cbCustomCountry"); this.cbCustomCountry.Name = "cbCustomCountry"; - this.cbCustomCountry.Properties.AccessibleDescription = resources.GetString("cbCustomCountry.Properties.AccessibleDescription"); - this.cbCustomCountry.Properties.AccessibleName = resources.GetString("cbCustomCountry.Properties.AccessibleName"); - this.cbCustomCountry.Properties.AutoHeight = ((bool)(resources.GetObject("cbCustomCountry.Properties.AutoHeight"))); this.cbCustomCountry.Properties.Caption = resources.GetString("cbCustomCountry.Properties.Caption"); - this.cbCustomCountry.Properties.DisplayValueChecked = resources.GetString("cbCustomCountry.Properties.DisplayValueChecked"); - this.cbCustomCountry.Properties.DisplayValueGrayed = resources.GetString("cbCustomCountry.Properties.DisplayValueGrayed"); - this.cbCustomCountry.Properties.DisplayValueUnchecked = resources.GetString("cbCustomCountry.Properties.DisplayValueUnchecked"); this.cbCustomCountry.CheckedChanged += new System.EventHandler(this.cbCustomCountry_CheckedChanged); // // comboBoxEdit1 // resources.ApplyResources(this.comboBoxEdit1, "comboBoxEdit1"); this.comboBoxEdit1.Name = "comboBoxEdit1"; - this.comboBoxEdit1.Properties.AccessibleDescription = resources.GetString("comboBoxEdit1.Properties.AccessibleDescription"); - this.comboBoxEdit1.Properties.AccessibleName = resources.GetString("comboBoxEdit1.Properties.AccessibleName"); - this.comboBoxEdit1.Properties.AutoHeight = ((bool)(resources.GetObject("comboBoxEdit1.Properties.AutoHeight"))); this.comboBoxEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("comboBoxEdit1.Properties.Buttons"))))}); - this.comboBoxEdit1.Properties.NullValuePrompt = resources.GetString("comboBoxEdit1.Properties.NullValuePrompt"); - this.comboBoxEdit1.Properties.NullValuePromptShowForEmptyValue = ((bool)(resources.GetObject("comboBoxEdit1.Properties.NullValuePromptShowForEmptyValue"))); this.comboBoxEdit1.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; // // labelControl1 @@ -129,11 +112,11 @@ // // grpHotelMode // - resources.ApplyResources(this.grpHotelMode, "grpHotelMode"); this.grpHotelMode.Controls.Add(this.labelControl3); this.grpHotelMode.Controls.Add(this.labelControl2); this.grpHotelMode.Controls.Add(this.cbDtvUpdate); this.grpHotelMode.Controls.Add(this.cbHotelMode); + resources.ApplyResources(this.grpHotelMode, "grpHotelMode"); this.grpHotelMode.Name = "grpHotelMode"; // // labelControl3 @@ -150,48 +133,30 @@ // resources.ApplyResources(this.cbDtvUpdate, "cbDtvUpdate"); this.cbDtvUpdate.Name = "cbDtvUpdate"; - this.cbDtvUpdate.Properties.AccessibleDescription = resources.GetString("cbDtvUpdate.Properties.AccessibleDescription"); - this.cbDtvUpdate.Properties.AccessibleName = resources.GetString("cbDtvUpdate.Properties.AccessibleName"); - this.cbDtvUpdate.Properties.AutoHeight = ((bool)(resources.GetObject("cbDtvUpdate.Properties.AutoHeight"))); this.cbDtvUpdate.Properties.Caption = resources.GetString("cbDtvUpdate.Properties.Caption"); - this.cbDtvUpdate.Properties.DisplayValueChecked = resources.GetString("cbDtvUpdate.Properties.DisplayValueChecked"); - this.cbDtvUpdate.Properties.DisplayValueGrayed = resources.GetString("cbDtvUpdate.Properties.DisplayValueGrayed"); - this.cbDtvUpdate.Properties.DisplayValueUnchecked = resources.GetString("cbDtvUpdate.Properties.DisplayValueUnchecked"); // // cbHotelMode // resources.ApplyResources(this.cbHotelMode, "cbHotelMode"); this.cbHotelMode.Name = "cbHotelMode"; - this.cbHotelMode.Properties.AccessibleDescription = resources.GetString("cbHotelMode.Properties.AccessibleDescription"); - this.cbHotelMode.Properties.AccessibleName = resources.GetString("cbHotelMode.Properties.AccessibleName"); - this.cbHotelMode.Properties.AutoHeight = ((bool)(resources.GetObject("cbHotelMode.Properties.AutoHeight"))); this.cbHotelMode.Properties.Caption = resources.GetString("cbHotelMode.Properties.Caption"); - this.cbHotelMode.Properties.DisplayValueChecked = resources.GetString("cbHotelMode.Properties.DisplayValueChecked"); - this.cbHotelMode.Properties.DisplayValueGrayed = resources.GetString("cbHotelMode.Properties.DisplayValueGrayed"); - this.cbHotelMode.Properties.DisplayValueUnchecked = resources.GetString("cbHotelMode.Properties.DisplayValueUnchecked"); // // cbAutoChannelUpdate // resources.ApplyResources(this.cbAutoChannelUpdate, "cbAutoChannelUpdate"); this.cbAutoChannelUpdate.Name = "cbAutoChannelUpdate"; - this.cbAutoChannelUpdate.Properties.AccessibleDescription = resources.GetString("cbAutoChannelUpdate.Properties.AccessibleDescription"); - this.cbAutoChannelUpdate.Properties.AccessibleName = resources.GetString("cbAutoChannelUpdate.Properties.AccessibleName"); - this.cbAutoChannelUpdate.Properties.AutoHeight = ((bool)(resources.GetObject("cbAutoChannelUpdate.Properties.AutoHeight"))); this.cbAutoChannelUpdate.Properties.Caption = resources.GetString("cbAutoChannelUpdate.Properties.Caption"); - this.cbAutoChannelUpdate.Properties.DisplayValueChecked = resources.GetString("cbAutoChannelUpdate.Properties.DisplayValueChecked"); - this.cbAutoChannelUpdate.Properties.DisplayValueGrayed = resources.GetString("cbAutoChannelUpdate.Properties.DisplayValueGrayed"); - this.cbAutoChannelUpdate.Properties.DisplayValueUnchecked = resources.GetString("cbAutoChannelUpdate.Properties.DisplayValueUnchecked"); // // grpSetup // - resources.ApplyResources(this.grpSetup, "grpSetup"); this.grpSetup.Controls.Add(this.cbAutoChannelUpdate); + resources.ApplyResources(this.grpSetup, "grpSetup"); this.grpSetup.Name = "grpSetup"; // // grpInformation // - resources.ApplyResources(this.grpInformation, "grpInformation"); this.grpInformation.Controls.Add(this.labelControl4); + resources.ApplyResources(this.grpInformation, "grpInformation"); this.grpInformation.Name = "grpInformation"; // // labelControl4 @@ -202,22 +167,15 @@ // lblHotelMenuAutoDetect // resources.ApplyResources(this.lblHotelMenuAutoDetect, "lblHotelMenuAutoDetect"); - this.lblHotelMenuAutoDetect.Appearance.DisabledImage = ((System.Drawing.Image)(resources.GetObject("lblHotelMenuAutoDetect.Appearance.DisabledImage"))); this.lblHotelMenuAutoDetect.Appearance.ForeColor = ((System.Drawing.Color)(resources.GetObject("lblHotelMenuAutoDetect.Appearance.ForeColor"))); - this.lblHotelMenuAutoDetect.Appearance.GradientMode = ((System.Drawing.Drawing2D.LinearGradientMode)(resources.GetObject("lblHotelMenuAutoDetect.Appearance.GradientMode"))); - this.lblHotelMenuAutoDetect.Appearance.HoverImage = ((System.Drawing.Image)(resources.GetObject("lblHotelMenuAutoDetect.Appearance.HoverImage"))); - this.lblHotelMenuAutoDetect.Appearance.Image = ((System.Drawing.Image)(resources.GetObject("lblHotelMenuAutoDetect.Appearance.Image"))); - this.lblHotelMenuAutoDetect.Appearance.PressedImage = ((System.Drawing.Image)(resources.GetObject("lblHotelMenuAutoDetect.Appearance.PressedImage"))); this.lblHotelMenuAutoDetect.Name = "lblHotelMenuAutoDetect"; this.lblHotelMenuAutoDetect.Click += new System.EventHandler(this.lblHotelMenuAutoDetect_Click); // // TvSettingsForm // this.AcceptButton = this.btnOk; - resources.ApplyResources(this, "$this"); - this.Appearance.GradientMode = ((System.Drawing.Drawing2D.LinearGradientMode)(resources.GetObject("TvSettingsForm.Appearance.GradientMode"))); - this.Appearance.Image = ((System.Drawing.Image)(resources.GetObject("TvSettingsForm.Appearance.Image"))); this.Appearance.Options.UseBackColor = true; + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.btnCancel; this.Controls.Add(this.lblHotelMenuAutoDetect); @@ -231,6 +189,7 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "TvSettingsForm"; + this.ShowInTaskbar = false; this.Load += new System.EventHandler(this.TvSettingsForm_Load); ((System.ComponentModel.ISupportInitialize)(this.grpOption)).EndInit(); this.grpOption.ResumeLayout(false); diff --git a/ChanSort.Loader.LG/TvSettingsForm.resx b/ChanSort.Loader.LG/TvSettingsForm.resx index 1327f19..1d88dfb 100644 --- a/ChanSort.Loader.LG/TvSettingsForm.resx +++ b/ChanSort.Loader.LG/TvSettingsForm.resx @@ -117,303 +117,32 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Top, Left, Right - - 72, 20 + + 12, 64 - - $this + + Enable HbbTV (only works with country settings DEU, FRA, NED and ESP) - - OPTION Menu - - - - Vertical - - - - - - 0, 248 - - - 480, 71 - - - - - - Automatic Channel Update (recommended: OFF) + + 456, 19 - - True - - - Your TV model's TLL file format is not fully supported. Therefore many features in this dialog are disabled. - - - - - - - 310, 413 - - - 117, 13 - - - lblHotelMenuAutoDetect - - - 1 - - - - - - labelControl3 - - - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - 2 - - - $this - - - 431, 19 - - - - - - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TV Settings - - + 3 - - labelControl4 - - - 480, 106 - - - Information - - - NOTE: When Hotel Mode is active, you can no longer activate a channel from inside the EPG and the "Factory Reset" function becomes disabled. - - - True - - - 6 - - - grpOption - - - 6, 13 - - - 3 - - - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - grpSetup - - - $this - - - True - - - $this - - - cbCustomCountry - - - Top, Left, Right - cbHbbTv - - grpHotelMode - - - The settings below are only effective when Hotel Mode is enabled - - - DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - grpInformation - - - 11, 29 - - - Ok - - - Top, Left, Right - - - - - - - - - 315, 13 - - - 0 - - - - - + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - $this - - - 39, 112 - - - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - - - - 480, 71 - - - 6 - - - allow custom value (at your own risk!) - - - - - - DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Top - - - Hotel Mode - - - btnCancel - - - 12, 32 - - - LightGray - - - Horizontal - - - 3 - - - Auto-Detect Hotel-Menu - - - TvSettingsForm - - - grpHotelMode - - - grpHotelMode - - - Top - - - - - - - - - grpInformation - - - comboBoxEdit1 - - - 2 - - - btnOk - - - 480, 151 - - - Top, Left, Right - - - - - - 2 - - - cbDtvUpdate - - - Bottom, Right - - - CenterParent - - - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - 72, 29 - - - - - - 456, 19 - - - Automatic D-TV channel update (recommended: OFF) - - - SETUP Menu - - - 11, 422 + + grpOption 0 @@ -421,305 +150,450 @@ Top, Left, Right - - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 150, 30 - - 7 - - - 0 - - - 0 - - - - - - 1 - - - Horizontal - - - 1 - - - labelControl1 - - - 2 - - - grpOption - - - grpHotelMode - - - Top, Left, Right - - - 0 - - - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - grpOption - - - grpHotelMode - - - 0, 142 - - - - - - 75, 23 - - - True - - - 12, 35 - - - - - - 0 - - - cbAutoChannelUpdate - - - Bottom, Left - - - 3 - - - - - - Cancel - - - Bottom, Right - - - DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - 0 - - - 5 - - - cbHotelMode - - - 1 - - - - - - 458, 26 - - - DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Enable Hotel Mode (recommended: ON) - - - 5 - - - 75, 23 - - - Top - - - Country: - - - - - - - - - Enable HbbTV (only works with country settings DEU, FRA, NED and ESP) - - - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - 41, 93 - - - 4 - - - grpSetup - - - 8 - - - - - - 10, 58 - - - - - - 3 - - - 1 - - - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Vertical - - - 6 - - - 458, 26 - - - DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - 12, 64 - - - 7 - - - True - - - - - - grpOption - - - 0, 71 - - - - - - Top - - - True + + allow custom value (at your own risk!) 320, 19 - - 480, 448 - 2 - + + cbCustomCountry + + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - + + grpOption - - 150, 30 + + 1 - - 43, 13 - - - $this + + 72, 29 Combo - - 456, 19 + + 72, 20 - - 0, 0 + + 1 - - False + + comboBoxEdit1 - - $this - - - 456, 19 - - - DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - - - - - - - - - - 12, 26 - - - 3 - - - + + DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grpOption - - + + 2 - - 5 + + 12, 32 + + + 43, 13 + + + 0 + + + Country: + + + labelControl1 + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + grpOption + + + 3 + + + Top + + + 0, 142 + + + 480, 106 + + + 0 + + + OPTION Menu + + + grpOption + + + DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 4 + + + Bottom, Right + + + 310, 413 + + + 75, 23 + + + 1 + + + Ok + + + btnOk + + + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 3 + + + Bottom, Right 395, 413 - - + + 75, 23 + + + 2 + + + Cancel + + + btnCancel + + + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 2 + + + + Vertical + + + 12, 26 + + + 458, 26 + + + 7 + + + NOTE: When Hotel Mode is active, you can no longer activate a channel from inside the EPG and the "Factory Reset" function becomes disabled. + + + labelControl3 + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + grpHotelMode + + + 0 + + + 41, 93 + + + 315, 13 + + + 6 + + + The settings below are only effective when Hotel Mode is enabled labelControl2 + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + grpHotelMode + + + 1 + + + Top, Left, Right + + + 39, 112 + + + Automatic D-TV channel update (recommended: OFF) + + + 431, 19 + + + 5 + + + cbDtvUpdate + + + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + grpHotelMode + + + 2 + + + Top, Left, Right + + + 10, 58 + + + Enable Hotel Mode (recommended: ON) + + + 456, 19 + 4 - - + + cbHotelMode + + + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + grpHotelMode + + + 3 + + + Top + + + 0, 248 + + + 480, 151 + + + 3 + + + Hotel Mode + + + grpHotelMode + + + DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 1 + + + Top, Left, Right + + + 12, 35 + + + Automatic Channel Update (recommended: OFF) + + + 456, 19 + + + 3 + + + cbAutoChannelUpdate + + + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + grpSetup + + + 0 + + + Top + + + 0, 71 + + + 480, 71 + + + 5 + + + SETUP Menu + + + grpSetup + + + DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 5 + + + Vertical + + + 11, 29 + + + 458, 26 + + + 8 + + + Your TV model's TLL file format is not fully supported. Therefore many features in this dialog are disabled. + + + labelControl4 + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + grpInformation + + + 0 + + + Top + + + 0, 0 + + + 480, 71 + + + 6 + + + Information + + + grpInformation + + + DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 6 + + + Bottom, Left + + + LightGray + + + 11, 422 + + + 117, 13 + + + 7 + + + Auto-Detect Hotel-Menu + + + lblHotelMenuAutoDetect + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 0 True + + 6, 13 + + + 480, 448 + + + CenterParent + + + TV Settings + + + TvSettingsForm + + + DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + \ No newline at end of file diff --git a/ChanSort.Loader.Panasonic/Serializer.cs b/ChanSort.Loader.Panasonic/Serializer.cs index fde5d6a..4bf97d3 100644 --- a/ChanSort.Loader.Panasonic/Serializer.cs +++ b/ChanSort.Loader.Panasonic/Serializer.cs @@ -369,9 +369,13 @@ namespace ChanSort.Loader.Panasonic private void CypherFile(string input, string output, bool encrypt) { byte[] fileContent = File.ReadAllBytes(input); + + if (!encrypt && this.CalcChecksum(fileContent, fileContent.Length) != 0) + throw new FileLoadException("Checksum validation failed"); + int chiffre = 0x0388; int step = 0; - for (int i = 0; i < fileContent.Length; i++) + for (int i = 0; i < fileContent.Length - 4; i++) { byte b = fileContent[i]; byte n = (byte) (b ^ (chiffre >> 8)); @@ -384,6 +388,10 @@ namespace ChanSort.Loader.Panasonic step = 0; } } + + if (encrypt) + this.UpdateChecksum(fileContent); + File.WriteAllBytes(output, fileContent); } #endregion @@ -392,7 +400,7 @@ namespace ChanSort.Loader.Panasonic private void RemoveHeader(string inputFile, string outputFile) { var data = File.ReadAllBytes(inputFile); - if (this.CalcPsdbChecksum(data, data.Length) != 0) + if (this.CalcChecksum(data, data.Length) != 0) throw new FileLoadException("Checksum validation failed"); int offset = 30 + (data[28] << 8) + data[29]; @@ -410,8 +418,8 @@ namespace ChanSort.Loader.Panasonic } #endregion - #region CalcPsdbChecksum() - private uint CalcPsdbChecksum(byte[] data, int length) + #region CalcChecksum() + private uint CalcChecksum(byte[] data, int length) { uint v = 0xffffffff; for (int i = 0; i < length; i++) @@ -426,7 +434,11 @@ namespace ChanSort.Loader.Panasonic #region CleanTempFile() private void CleanTempFile(object sender, EventArgs e) { - try { File.Delete(this.workFile);} + try + { + if (this.workFile != null) + File.Delete(this.workFile); + } catch { } } #endregion @@ -593,16 +605,22 @@ order by s.ntype,major_channel data[this.dbSizeOffset + 2] = (byte)(workFileSize >> 8); data[this.dbSizeOffset + 3] = (byte)(workFileSize); - uint checksum = this.CalcPsdbChecksum(data, data.Length - 4); - data[data.Length - 1] = (byte)(checksum & 0xFF); - data[data.Length - 2] = (byte)((checksum >> 8) & 0xFF); - data[data.Length - 3] = (byte)((checksum >> 16) & 0xFF); - data[data.Length - 4] = (byte)((checksum >> 24) & 0xFF); + this.UpdateChecksum(data); using (var stream = new FileStream(this.FileName, FileMode.Create, FileAccess.Write)) stream.Write(data, 0, data.Length); } + #endregion + #region UpdateChecksum() + private void UpdateChecksum(byte[] data) + { + uint checksum = this.CalcChecksum(data, data.Length - 4); + data[data.Length - 1] = (byte)(checksum & 0xFF); + data[data.Length - 2] = (byte)((checksum >> 8) & 0xFF); + data[data.Length - 3] = (byte)((checksum >> 16) & 0xFF); + data[data.Length - 4] = (byte)((checksum >> 24) & 0xFF); + } #endregion } } diff --git a/ChanSort/AboutForm.Designer.cs b/ChanSort/AboutForm.Designer.cs index b741ebd..6bfcdd6 100644 --- a/ChanSort/AboutForm.Designer.cs +++ b/ChanSort/AboutForm.Designer.cs @@ -29,7 +29,7 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutForm)); - this.labelControl1 = new DevExpress.XtraEditors.LabelControl(); + this.lblWebsite = new DevExpress.XtraEditors.LabelControl(); this.lnkDownload = new DevExpress.XtraEditors.HyperLinkEdit(); this.gcPlugins = new DevExpress.XtraGrid.GridControl(); this.gvPlugins = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -37,13 +37,13 @@ this.colDisplayText = new DevExpress.XtraGrid.Columns.GridColumn(); this.colFileTypes = new DevExpress.XtraGrid.Columns.GridColumn(); this.lnkEmail = new DevExpress.XtraEditors.HyperLinkEdit(); - this.labelControl2 = new DevExpress.XtraEditors.LabelControl(); - this.labelControl4 = new DevExpress.XtraEditors.LabelControl(); + this.lblAuthor = new DevExpress.XtraEditors.LabelControl(); + this.lblLicense = new DevExpress.XtraEditors.LabelControl(); this.lnkLicense = new DevExpress.XtraEditors.HyperLinkEdit(); - this.labelControl5 = new DevExpress.XtraEditors.LabelControl(); + this.lblCredits = new DevExpress.XtraEditors.LabelControl(); this.txtCredits = new DevExpress.XtraEditors.MemoEdit(); - this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton(); - this.labelControl3 = new DevExpress.XtraEditors.LabelControl(); + this.btnClose = new DevExpress.XtraEditors.SimpleButton(); + this.txtAuthor = new DevExpress.XtraEditors.LabelControl(); ((System.ComponentModel.ISupportInitialize)(this.lnkDownload.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gcPlugins)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvPlugins)).BeginInit(); @@ -52,10 +52,10 @@ ((System.ComponentModel.ISupportInitialize)(this.txtCredits.Properties)).BeginInit(); this.SuspendLayout(); // - // labelControl1 + // lblWebsite // - resources.ApplyResources(this.labelControl1, "labelControl1"); - this.labelControl1.Name = "labelControl1"; + resources.ApplyResources(this.lblWebsite, "lblWebsite"); + this.lblWebsite.Name = "lblWebsite"; // // lnkDownload // @@ -88,20 +88,17 @@ // // colPlugin // - resources.ApplyResources(this.colPlugin, "colPlugin"); this.colPlugin.FieldName = "PluginDll"; this.colPlugin.Name = "colPlugin"; this.colPlugin.UnboundType = DevExpress.Data.UnboundColumnType.String; // // colDisplayText // - resources.ApplyResources(this.colDisplayText, "colDisplayText"); this.colDisplayText.FieldName = "PluginName"; this.colDisplayText.Name = "colDisplayText"; // // colFileTypes // - resources.ApplyResources(this.colFileTypes, "colFileTypes"); this.colFileTypes.FieldName = "FileFilter"; this.colFileTypes.Name = "colFileTypes"; // @@ -114,15 +111,15 @@ this.lnkEmail.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; this.lnkEmail.OpenLink += new DevExpress.XtraEditors.Controls.OpenLinkEventHandler(this.lnkEmail_OpenLink); // - // labelControl2 + // lblAuthor // - resources.ApplyResources(this.labelControl2, "labelControl2"); - this.labelControl2.Name = "labelControl2"; + resources.ApplyResources(this.lblAuthor, "lblAuthor"); + this.lblAuthor.Name = "lblAuthor"; // - // labelControl4 + // lblLicense // - resources.ApplyResources(this.labelControl4, "labelControl4"); - this.labelControl4.Name = "labelControl4"; + resources.ApplyResources(this.lblLicense, "lblLicense"); + this.lblLicense.Name = "lblLicense"; // // lnkLicense // @@ -133,42 +130,43 @@ this.lnkLicense.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; this.lnkLicense.OpenLink += new DevExpress.XtraEditors.Controls.OpenLinkEventHandler(this.lnkLicense_OpenLink); // - // labelControl5 + // lblCredits // - resources.ApplyResources(this.labelControl5, "labelControl5"); - this.labelControl5.Name = "labelControl5"; + resources.ApplyResources(this.lblCredits, "lblCredits"); + this.lblCredits.Name = "lblCredits"; // // txtCredits // resources.ApplyResources(this.txtCredits, "txtCredits"); this.txtCredits.Name = "txtCredits"; // - // simpleButton1 + // btnClose // - resources.ApplyResources(this.simpleButton1, "simpleButton1"); - this.simpleButton1.DialogResult = System.Windows.Forms.DialogResult.OK; - this.simpleButton1.Name = "simpleButton1"; + resources.ApplyResources(this.btnClose, "btnClose"); + this.btnClose.DialogResult = System.Windows.Forms.DialogResult.OK; + this.btnClose.Name = "btnClose"; // - // labelControl3 + // txtAuthor // - resources.ApplyResources(this.labelControl3, "labelControl3"); - this.labelControl3.Name = "labelControl3"; + resources.ApplyResources(this.txtAuthor, "txtAuthor"); + this.txtAuthor.Name = "txtAuthor"; // // AboutForm // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.labelControl3); - this.Controls.Add(this.simpleButton1); + this.Controls.Add(this.txtAuthor); + this.Controls.Add(this.btnClose); this.Controls.Add(this.txtCredits); - this.Controls.Add(this.labelControl5); + this.Controls.Add(this.lblCredits); this.Controls.Add(this.lnkLicense); - this.Controls.Add(this.labelControl4); - this.Controls.Add(this.labelControl2); + this.Controls.Add(this.lblLicense); + this.Controls.Add(this.lblAuthor); this.Controls.Add(this.lnkEmail); this.Controls.Add(this.lnkDownload); - this.Controls.Add(this.labelControl1); + this.Controls.Add(this.lblWebsite); this.Name = "AboutForm"; + this.ShowInTaskbar = false; ((System.ComponentModel.ISupportInitialize)(this.lnkDownload.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gcPlugins)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvPlugins)).EndInit(); @@ -182,7 +180,7 @@ #endregion - private DevExpress.XtraEditors.LabelControl labelControl1; + private DevExpress.XtraEditors.LabelControl lblWebsite; private DevExpress.XtraEditors.HyperLinkEdit lnkDownload; private DevExpress.XtraGrid.GridControl gcPlugins; private DevExpress.XtraGrid.Views.Grid.GridView gvPlugins; @@ -190,12 +188,12 @@ private DevExpress.XtraGrid.Columns.GridColumn colDisplayText; private DevExpress.XtraGrid.Columns.GridColumn colFileTypes; private DevExpress.XtraEditors.HyperLinkEdit lnkEmail; - private DevExpress.XtraEditors.LabelControl labelControl2; - private DevExpress.XtraEditors.LabelControl labelControl4; + private DevExpress.XtraEditors.LabelControl lblAuthor; + private DevExpress.XtraEditors.LabelControl lblLicense; private DevExpress.XtraEditors.HyperLinkEdit lnkLicense; - private DevExpress.XtraEditors.LabelControl labelControl5; + private DevExpress.XtraEditors.LabelControl lblCredits; private DevExpress.XtraEditors.MemoEdit txtCredits; - private DevExpress.XtraEditors.SimpleButton simpleButton1; - private DevExpress.XtraEditors.LabelControl labelControl3; + private DevExpress.XtraEditors.SimpleButton btnClose; + private DevExpress.XtraEditors.LabelControl txtAuthor; } } \ No newline at end of file diff --git a/ChanSort/AboutForm.cs b/ChanSort/AboutForm.cs index f4bb3db..06c519f 100644 --- a/ChanSort/AboutForm.cs +++ b/ChanSort/AboutForm.cs @@ -11,7 +11,11 @@ namespace ChanSort.Ui InitializeComponent(); this.gcPlugins.DataSource = plugins; - this.txtCredits.Text = @"PDA-User: + this.txtCredits.Text = +@"Vitor Martins Augusto: +Portuguese translation + +PDA-User: Analysis of TLL file structure and extensive testing of ChanSort HellG: @@ -21,7 +25,8 @@ edank, JLevi, Oleg: For writing TLLview, TLLedit and edankTLL and making the source available Many more on lg-forum.com: -For providing example TLL files, error feedback and other helpful information"; +For providing example TLL files, error feedback and other helpful information +"; } private void lnkLicense_OpenLink(object sender, DevExpress.XtraEditors.Controls.OpenLinkEventArgs e) diff --git a/ChanSort/AboutForm.de.resx b/ChanSort/AboutForm.de.resx index 813c90d..017d63a 100644 --- a/ChanSort/AboutForm.de.resx +++ b/ChanSort/AboutForm.de.resx @@ -118,37 +118,19 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 81, 13 - - - Projektwebseite: - - - Beschreibung - - - Dateitypen - - - 78, 13 - - + Programmautor: - - 33, 13 - - + Lizenz: - - 60, 13 + + Projektwebseite: - + Referenzen: - + Schließen diff --git a/ChanSort/AboutForm.pt.resx b/ChanSort/AboutForm.pt.resx index ec6c42f..c88c267 100644 --- a/ChanSort/AboutForm.pt.resx +++ b/ChanSort/AboutForm.pt.resx @@ -117,46 +117,22 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 80, 13 - - - Versão atual: - - - Descrição - - - Tipos de ficheiro - - - 86, 13 - - - Fórum de discussão: - - - 41, 13 - - - Contacto: - - - Cumprimentos e obrigado - - - Extensões - - - + + + Autor: - - 151, 13 + + Licença: - - Caso esta aplicação seja do seu agrado: + + Website: + + + Cumprimentos e obrigado: + + + Fechar Sobre ChanSort diff --git a/ChanSort/AboutForm.resx b/ChanSort/AboutForm.resx index af3bfc4..2a7b249 100644 --- a/ChanSort/AboutForm.resx +++ b/ChanSort/AboutForm.resx @@ -117,30 +117,34 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Vertical + - + 12, 92 - - 78, 13 + + 90, 13 - + 0 - + Project website: - - labelControl1 + + lblWebsite - + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + $this - + 9 @@ -180,47 +184,11 @@ 0, 0 - - Plugin - - - True - - - 0 - - - 70 - - - Description - - - True - - - 1 - - - 246 - - - File types - - - True - - - 2 - - - 249 - - 562, 272 + 400, 200 - 3 + 0 gcPlugins @@ -255,52 +223,58 @@ 7 - + + Vertical + + 12, 12 - - 79, 13 + + 90, 13 - + 9 - + Program author: - - labelControl2 + + lblAuthor - + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + $this - + 6 - + + Vertical + + 12, 68 - - 39, 13 + + 90, 13 - + 10 - + License: - - labelControl4 + + lblLicense - + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + $this - + 5 @@ -333,28 +307,31 @@ 4 - + + Vertical + + 12, 116 - - 38, 13 + + 90, 13 - + 12 - + Credits: - - labelControl5 + + lblCredits - + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + $this - + 3 @@ -381,55 +358,55 @@ 2 - + Bottom, Left - + 12, 210 - + 75, 23 - + 14 - + Close - - simpleButton1 + + btnClose - + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + $this - + 1 - + 110, 12 - + 61, 13 - + 15 - + Horst Beham - - labelControl3 + + txtAuthor - + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + $this - + 0 diff --git a/ChanSort/ActionBox.Designer.cs b/ChanSort/ActionBox.Designer.cs index bd08e1b..a4c0e85 100644 --- a/ChanSort/ActionBox.Designer.cs +++ b/ChanSort/ActionBox.Designer.cs @@ -63,6 +63,7 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "ActionBoxDialog"; + this.ShowInTaskbar = false; ((System.ComponentModel.ISupportInitialize)(this.imageCollection1)).EndInit(); this.ResumeLayout(false); diff --git a/ChanSort/ActionBox.resx b/ChanSort/ActionBox.resx index 7cd780f..dcf11f7 100644 --- a/ChanSort/ActionBox.resx +++ b/ChanSort/ActionBox.resx @@ -170,8 +170,8 @@ cmVhbWVyAgAAAAlJbWFnZVNpemUERGF0YQQHE1N5c3RlbS5EcmF3aW5nLlNpemUDAAAAAgIAAAAF/P// /xNTeXN0ZW0uRHJhd2luZy5TaXplAgAAAAV3aWR0aAZoZWlnaHQAAAgIAwAAACAAAAAgAAAACQUAAAAP BQAAANo+AAACtgQAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAARnQU1BAADX+28z - GAEAAAAgY0hSTQAAbJsAAHJvAAD2rgAAhYMAAG73AADoQQAAMXQAABdsobYtmwAAAAlwSFlzAAALEQAA - CxEBf2RfkQAABCxJREFUWEfFlclLW1EUxl0UQSp0IRQKpd0Vuikthf4J3Rah4uymXblxJSIixgFnJSoO + GAEAAAAgY0hSTQAAbJsAAHJvAAD2rgAAhYMAAG73AADoQQAAMXQAABdsobYtmwAAAAlwSFlzAAALEAAA + CxABrSO9dQAABCxJREFUWEfFlclLW1EUxl0UQSp0IRQKpd0Vuikthf4J3Rah4uymXblxJSIixgFnJSoO iCgOqAtBpURUnFBRiVIHVERRcWhVNInGxFQUT893yw1vSF4cIr3wZbj3cc/vfuec+0KI6L9KN1FbW2vt 6Oiwtbe369TW1ibU0tIi1NzcfFxXV/ezurr6m3af20o3wYFci4uLND8/r9Lc3JyQ1Wql6elpmpycpNHR URoYGKCmpibq6+szr6yshGr3CyTdBE6KgLOzszoh+MzMjACYmJigkZERAcCOkcViwfoPhgrX7mkk3QQs @@ -191,7 +191,7 @@ JcXzWEpKSvodHx//MjIyMiIqKioshD9CWc944VV0dPRbhnjP+vgYiomJ+cAHfMex3iQkJLxITk4O/wuP oQEZbqZmUwAAAABJRU5ErkJggu0EAACJUE5HDQoaCgAAAA1JSERSAAAAIAAAACAIBgAAAHN6evQAAAAE Z0FNQQAA1/tvMxgBAAAAIGNIUk0AAGybAABybwAA9q4AAIWDAABu9wAA6EEAADF0AAAXbKG2LZsAAAAJ - cEhZcwAACxAAAAsQAa0jvXUAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAABD1J + cEhZcwAACw8AAAsPAZL5A6UAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAABD1J REFUWEfFlUlLXFEQhV0EIUTIQggEQrILZBMSAvkJ2QYh4uwmWblxJSIijjgrzvOsOIOK8ywqKipxQEUU FYdERdvWttU0ipU6F17zJp/aUXLh66bva6pOnVt1nxMR/Vc0G7m5uZM1NTWm6upqDVVVVYKKigpBeXn5 QV5e3s/s7Ozv6jh3RbPBiaxzc3M0MzOjYHp6WjA5OUnj4+M0OjpKg4OD1N3dTaWlpdTR0ZG2uLjorI53 @@ -212,7 +212,7 @@ vLy8fgUGBl48Fv7+/r99fHxeubm5ubq7uz914g9n5jk/eO3h4fGORXxgPj0Gnp6eH7nA95zrra+v78uA gACXvwrYNK14tLKNAAAAAElFTkSuQmCCnggAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p6 9AAAAARnQU1BAADX+28zGAEAAAAgY0hSTQAAbJsAAHJvAAD2rgAAhYMAAG73AADoQQAAMXQAABdsobYt - mwAAAAlwSFlzAAALEAAACxABrSO9dQAAABp0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKh + mwAAAAlwSFlzAAALDwAACw8BkvkDpQAAABp0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKh AAAH7klEQVRYR61VCVSU1xWeDjMQT22W40m1ilo1JkqIS6vWQ0xqUptjksbUGCsCsWn1aF0KSCSIsmtE FimL7DuyCVRARPZFIIKgbEcWQcQBVLZZmBlEFv367nOwDiFVUu853/nnX9673/2+++4IphKBgYGVCQkJ 0vj4eC3ExMRIo6Oj+4KCgqr9/f13aj5/8cGSqevq6lBTU6OFsrIyFBUVIScnB5GRkbh48aJ3Q0ODrmbZ @@ -361,7 +361,7 @@ irmtwWJOGDKJe2ghD7veFiTmXAj/j6VcSKKcC9gj50SxMs7n41KOaXlESjnXUEmTpVtO3kLrlPn6lIbC 8gHBHL8nBCaBc2ebRvzGLEPM06N/zcax/xeC2Z4zYZqPejxOCe6ezPN/sBAIfgUj9zzexZoZ2wAAAABJ RU5ErkJgggEHAACJUE5HDQoaCgAAAA1JSERSAAAAIAAAACAIBgAAAHN6evQAAAABc1JHQgCuzhzpAAAA - BGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwgAADsIBFShKgAAAAAd0SU1FB9gCDwcbCcW/Em8AAAAadEVY + BGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwQAADsEBuJFr7QAAAAd0SU1FB9gCDwcbCcW/Em8AAAAadEVY dFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAABl1JREFUWEftlnlMVFcUxl3S1q6JdoliE6tp Gtu01TR1BVvbamVxAYbZZFELyDLMxr4O28CALDMMyCKIDPsiIlBEccAuakSLS9sYpSo1ad27YFHTGt7X 8968Yq0DDrF/+iW/vDdn3j3n3HvPefdNeKzHehTNe3/hzHkLFroTQlt4e8Gid/mhjyaxVPjROvd1O0Se diff --git a/ChanSort/ChanSort.csproj b/ChanSort/ChanSort.csproj index 2a30441..8a2fdd8 100644 --- a/ChanSort/ChanSort.csproj +++ b/ChanSort/ChanSort.csproj @@ -145,6 +145,7 @@ AboutForm.cs + Designer AboutForm.cs diff --git a/ChanSort/MainForm.Designer.cs b/ChanSort/MainForm.Designer.cs index f981ac8..d088c02 100644 --- a/ChanSort/MainForm.Designer.cs +++ b/ChanSort/MainForm.Designer.cs @@ -148,9 +148,9 @@ this.barDockControlRight = new DevExpress.XtraBars.BarDockControl(); this.miMoveUp = new DevExpress.XtraBars.BarButtonItem(); this.miMoveDown = new DevExpress.XtraBars.BarButtonItem(); - this.labelControl2 = new DevExpress.XtraEditors.LabelControl(); + this.lblInsertMode = new DevExpress.XtraEditors.LabelControl(); this.txtSetSlot = new DevExpress.XtraEditors.ButtonEdit(); - this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); + this.lblSetProgramNr = new DevExpress.XtraEditors.LabelControl(); this.picDonate = new DevExpress.XtraEditors.PictureEdit(); this.defaultLookAndFeel1 = new DevExpress.LookAndFeel.DefaultLookAndFeel(this.components); this.splashScreenManager1 = new DevExpress.XtraSplashScreen.SplashScreenManager(this, typeof(global::ChanSort.Ui.WaitForm1), true, true); @@ -1410,10 +1410,10 @@ this.miMoveDown.Name = "miMoveDown"; this.miMoveDown.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.miMoveDown_ItemClick); // - // labelControl2 + // lblInsertMode // - resources.ApplyResources(this.labelControl2, "labelControl2"); - this.labelControl2.Name = "labelControl2"; + resources.ApplyResources(this.lblInsertMode, "lblInsertMode"); + this.lblInsertMode.Name = "lblInsertMode"; // // txtSetSlot // @@ -1427,11 +1427,11 @@ this.txtSetSlot.EditValueChanged += new System.EventHandler(this.txtSetSlot_EditValueChanged); this.txtSetSlot.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtSetSlot_KeyDown); // - // labelControl11 + // lblSetProgramNr // - this.labelControl11.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far; - resources.ApplyResources(this.labelControl11, "labelControl11"); - this.labelControl11.Name = "labelControl11"; + this.lblSetProgramNr.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far; + resources.ApplyResources(this.lblSetProgramNr, "lblSetProgramNr"); + this.lblSetProgramNr.Name = "lblSetProgramNr"; // // picDonate // @@ -1455,10 +1455,10 @@ this.grpTopPanel.Controls.Add(this.rbInsertAfter); this.grpTopPanel.Controls.Add(this.rbInsertBefore); this.grpTopPanel.Controls.Add(this.cbCloseGap); - this.grpTopPanel.Controls.Add(this.labelControl2); + this.grpTopPanel.Controls.Add(this.lblInsertMode); this.grpTopPanel.Controls.Add(this.picDonate); this.grpTopPanel.Controls.Add(this.tabChannelList); - this.grpTopPanel.Controls.Add(this.labelControl11); + this.grpTopPanel.Controls.Add(this.lblSetProgramNr); this.grpTopPanel.Controls.Add(this.txtSetSlot); resources.ApplyResources(this.grpTopPanel, "grpTopPanel"); this.grpTopPanel.Name = "grpTopPanel"; @@ -1469,6 +1469,7 @@ resources.ApplyResources(this.rbInsertSwap, "rbInsertSwap"); this.rbInsertSwap.MenuManager = this.barManager1; this.rbInsertSwap.Name = "rbInsertSwap"; + this.rbInsertSwap.Properties.AutoWidth = true; this.rbInsertSwap.Properties.Caption = resources.GetString("rbInsertSwap.Properties.Caption"); this.rbInsertSwap.Properties.CheckStyle = DevExpress.XtraEditors.Controls.CheckStyles.Radio; this.rbInsertSwap.Properties.GlyphAlignment = ((DevExpress.Utils.HorzAlignment)(resources.GetObject("rbInsertSwap.Properties.GlyphAlignment"))); @@ -1481,6 +1482,7 @@ resources.ApplyResources(this.rbInsertAfter, "rbInsertAfter"); this.rbInsertAfter.MenuManager = this.barManager1; this.rbInsertAfter.Name = "rbInsertAfter"; + this.rbInsertAfter.Properties.AutoWidth = true; this.rbInsertAfter.Properties.Caption = resources.GetString("rbInsertAfter.Properties.Caption"); this.rbInsertAfter.Properties.CheckStyle = DevExpress.XtraEditors.Controls.CheckStyles.Radio; this.rbInsertAfter.Properties.RadioGroupIndex = 1; @@ -1491,6 +1493,7 @@ resources.ApplyResources(this.rbInsertBefore, "rbInsertBefore"); this.rbInsertBefore.MenuManager = this.barManager1; this.rbInsertBefore.Name = "rbInsertBefore"; + this.rbInsertBefore.Properties.AutoWidth = true; this.rbInsertBefore.Properties.Caption = resources.GetString("rbInsertBefore.Properties.Caption"); this.rbInsertBefore.Properties.CheckStyle = DevExpress.XtraEditors.Controls.CheckStyles.Radio; this.rbInsertBefore.Properties.RadioGroupIndex = 1; @@ -1618,7 +1621,7 @@ private DevExpress.XtraEditors.LabelControl lblHotkeyLeft; private DevExpress.XtraEditors.LabelControl lblHotkeyRight; private DevExpress.XtraEditors.ButtonEdit txtSetSlot; - private DevExpress.XtraEditors.LabelControl labelControl11; + private DevExpress.XtraEditors.LabelControl lblSetProgramNr; private DevExpress.XtraGrid.Columns.GridColumn colEncrypted; private DevExpress.XtraBars.BarManager barManager1; private DevExpress.XtraBars.Bar bar1; @@ -1662,7 +1665,7 @@ private DevExpress.XtraEditors.PanelControl pnlEditControls; private DevExpress.XtraEditors.GroupControl grpTopPanel; private DevExpress.XtraEditors.PanelControl panelControl3; - private DevExpress.XtraEditors.LabelControl labelControl2; + private DevExpress.XtraEditors.LabelControl lblInsertMode; private DevExpress.XtraGrid.Columns.GridColumn colOutFav; private DevExpress.XtraEditors.SimpleButton btnRenum; private DevExpress.XtraGrid.Columns.GridColumn colIndex1; diff --git a/ChanSort/MainForm.cs b/ChanSort/MainForm.cs index d802b99..5120a68 100644 --- a/ChanSort/MainForm.cs +++ b/ChanSort/MainForm.cs @@ -24,7 +24,7 @@ namespace ChanSort.Ui { public partial class MainForm : XtraForm { - public const string AppVersion = "v2013-06-29"; + public const string AppVersion = "v2013-06-29.2"; private const int MaxMruEntries = 5; @@ -79,7 +79,7 @@ namespace ChanSort.Ui Thread.CurrentThread.CurrentUICulture = new CultureInfo(Settings.Default.Language); this.LookAndFeel.SetSkinStyle("Office 2010 Blue"); InitializeComponent(); - this.SetControlsEnabled(false); + //this.SetControlsEnabled(false); if (!Settings.Default.WindowSize.IsEmpty) this.Size = Settings.Default.WindowSize; this.title = string.Format(this.Text, AppVersion); @@ -235,7 +235,7 @@ namespace ChanSort.Ui this.gridLeft.DataSource = null; this.FillChannelListCombo(); - this.SetControlsEnabled(!this.dataRoot.IsEmpty); + //this.SetControlsEnabled(!this.dataRoot.IsEmpty); this.UpdateFavoritesEditor(this.dataRoot.SupportedFavorites); this.colName.OptionsColumn.AllowEdit = this.currentTvSerializer.Features.ChannelNameEdit; this.colOutName.OptionsColumn.AllowEdit = this.currentTvSerializer.Features.ChannelNameEdit; @@ -292,6 +292,11 @@ namespace ChanSort.Ui else this.tabChannelList.SelectedTabPage = firstNonEmpty; } + else + { + this.tabChannelList.TabPages.Add(this.pageEmpty); + this.currentChannelList = null; + } } #endregion diff --git a/ChanSort/MainForm.de.resx b/ChanSort/MainForm.de.resx index 1d66f4b..44e2e4f 100644 --- a/ChanSort/MainForm.de.resx +++ b/ChanSort/MainForm.de.resx @@ -315,25 +315,22 @@ Wenn aktiv, werden folgende Programmnummer automatisch vorgerückt - - 71, 13 - - + Einfügemodus: - Keine Datei geladen + Keine Senderlisten vorhanden - + Setze Pr#: - + Programplatz für Einfügen und Festlegen ChanSort {0} - Senderlisten-Editor für Samsung, LG und Toshiba TVs - + Kindersicherung diff --git a/ChanSort/MainForm.pt.resx b/ChanSort/MainForm.pt.resx index 5028158..92c78a6 100644 --- a/ChanSort/MainForm.pt.resx +++ b/ChanSort/MainForm.pt.resx @@ -86,11 +86,14 @@ F3: Filtro | F4: Lista | -: para cima | +: para baixo | DEL: remover + + Modo acrescentar: + - Acrescentar antes + Antes - Acrescentar depois + Depois Comutar @@ -241,9 +244,6 @@ Para baixo - - Modo: - Repor filtro @@ -262,10 +262,10 @@ Remover canais seleccionados - + Aplicar Pr#: - + Acrescentar e definar posição de canal @@ -331,6 +331,9 @@ Tipo serviço + + Sserviço ID + Operador @@ -338,7 +341,7 @@ F5: Filtro | F6: Lista | Entrada: aceitar - << Acrescentar todos (copiar lista de canais atual) + << Acrescentar todos Repor filtro @@ -349,4 +352,13 @@ Todos os canais + + No lista de canais + + + Parental lock + + + Parental lock + \ No newline at end of file diff --git a/ChanSort/MainForm.resx b/ChanSort/MainForm.resx index de4be9b..022545c 100644 --- a/ChanSort/MainForm.resx +++ b/ChanSort/MainForm.resx @@ -294,7 +294,7 @@ 1474, 599 - 218, 6 + 256, 6 475, 17 @@ -576,7 +576,7 @@ Default - 77, 19 + 48, 19 10 @@ -597,13 +597,13 @@ True - 153, 6 + 185, 6 after - 75, 19 + 47, 19 9 @@ -621,13 +621,13 @@ 1 - 82, 6 + 107, 6 before - 75, 19 + 55, 19 8 @@ -648,7 +648,7 @@ True - 496, 6 + 543, 6 Close gap when moving/deleting a channel @@ -674,28 +674,28 @@ 3 - + 7, 8 - + 62, 13 - + 2 - + Insert mode: - - labelControl2 + + lblInsertMode - + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + grpTopPanel - + 4 @@ -735,7 +735,7 @@ 632, 0 - No file loaded + No channel lists pageEmpty @@ -767,38 +767,38 @@ 6 - + Vertical - - 320, 8 + + 367, 8 - + 64, 13 - + 0 - + Set Pr#: - + Program number for insert and set operations - - labelControl11 + + lblSetProgramNr - + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + grpTopPanel - + 7 - 390, 5 + 437, 5 OK @@ -1431,7 +1431,7 @@ DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - 06/29/2013 11:11:06 + 06/29/2013 12:47:45 16, 16 @@ -1445,6 +1445,9 @@ 15 + + Parental lock + btnToggleLock diff --git a/readme.txt b/readme.txt index f6d95bb..9808419 100644 --- a/readme.txt +++ b/readme.txt @@ -1,9 +1,7 @@ -Version v2013-06-28.2 ==================================================== +Version v2013-06-29.2 ====================================================== Changes: -- FIX: Error saving Panasonic svl.db file (incorrect encryption) -- FIX: Error saving a Panasonic file after applying a reference list -- Improved experimental support for Panasonic channel lists +- FIX: Saving Pansonic svl.db now updates checksum correctly The complete change log can be found at the end of this document @@ -60,7 +58,7 @@ LG Panasonic ------- - Models with svl.bin/svl.db channel lists + Viera models with svl.bin or svl.db channel lists Toshiba ------- @@ -103,6 +101,14 @@ OTHER DEALINGS IN THE SOFTWARE. Change log ================================================================ +2013-06-29.2 +- FIX: Saving Pansonic svl.db now updates checksum correctly + +2013-06-29 +- Added Portuguese translation (thanks to Vitor Martins Augusto) +- FIX: saving Panasonic files after loading reference list with missing + channels + 2013-06-28.2 - FIX: Error saving Panasonic svl.db file (incorrect encryption) - FIX: Error saving a Panasonic file after applying a reference list