- Drag&Drop inside left list and from right to left list

(only available when the left list is sorted by "New Pr#")
- Simplified menu/tool bar
- FIX: Moving multiple channels down now works correctly
- FIX: +/- keys no longer open the cell-editor after moving a channel
- Editor for "New Pr#" no longer opens when pressing non-numeric keys
- Move up/down is now disabled when left list is not sorted by "New Pr#"
This commit is contained in:
hbeham
2013-06-23 14:58:44 +02:00
parent 7835e2ff69
commit 42396aff6e
12 changed files with 1017 additions and 1036 deletions

View File

@@ -1 +1,3 @@
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

View File

@@ -64,32 +64,49 @@
//
// 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
@@ -112,11 +129,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
@@ -133,30 +150,48 @@
//
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
//
this.grpSetup.Controls.Add(this.cbAutoChannelUpdate);
resources.ApplyResources(this.grpSetup, "grpSetup");
this.grpSetup.Controls.Add(this.cbAutoChannelUpdate);
this.grpSetup.Name = "grpSetup";
//
// grpInformation
//
this.grpInformation.Controls.Add(this.labelControl4);
resources.ApplyResources(this.grpInformation, "grpInformation");
this.grpInformation.Controls.Add(this.labelControl4);
this.grpInformation.Name = "grpInformation";
//
// labelControl4
@@ -167,15 +202,22 @@
// lblHotelMenuAutoDetect
//
resources.ApplyResources(this.lblHotelMenuAutoDetect, "lblHotelMenuAutoDetect");
this.lblHotelMenuAutoDetect.Appearance.ForeColor = ((System.Drawing.Color)(resources.GetObject("labelControl5.Appearance.ForeColor")));
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;
this.Appearance.Options.UseBackColor = true;
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;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnCancel;
this.Controls.Add(this.lblHotelMenuAutoDetect);

View File

@@ -117,65 +117,12 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="cbHbbTv.Properties.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="cbHbbTv.Properties.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="cbHbbTv.Properties.AutoHeight" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbHbbTv.Properties.Caption" xml:space="preserve">
<value>HbbTV aktivieren (funktioniert nur mit den Ländereinstellungen DEU, FRA, NED und ESP)</value>
</data>
<data name="cbHbbTv.Properties.DisplayValueChecked" xml:space="preserve">
<value />
</data>
<data name="cbHbbTv.Properties.DisplayValueGrayed" xml:space="preserve">
<value />
</data>
<data name="cbHbbTv.Properties.DisplayValueUnchecked" xml:space="preserve">
<value />
</data>
<data name="cbCustomCountry.Properties.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="cbCustomCountry.Properties.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="cbCustomCountry.Properties.AutoHeight" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbCustomCountry.Properties.Caption" xml:space="preserve">
<value>Eigene Werte erlauben (auf eigene Gefahr!)</value>
</data>
<data name="cbCustomCountry.Properties.DisplayValueChecked" xml:space="preserve">
<value />
</data>
<data name="cbCustomCountry.Properties.DisplayValueGrayed" xml:space="preserve">
<value />
</data>
<data name="cbCustomCountry.Properties.DisplayValueUnchecked" xml:space="preserve">
<value />
</data>
<data name="comboBoxEdit1.Properties.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="comboBoxEdit1.Properties.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="comboBoxEdit1.Properties.AutoHeight" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="comboBoxEdit1.Properties.NullValuePrompt" xml:space="preserve">
<value />
</data>
<data name="comboBoxEdit1.Properties.NullValuePromptShowForEmptyValue" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="labelControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>27, 13</value>
@@ -183,14 +130,14 @@
<data name="labelControl1.Text" xml:space="preserve">
<value>Land:</value>
</data>
<data name="grpSettings.Text" xml:space="preserve">
<value>OPTION Menü</value>
</data>
<data name="btnCancel.Text" xml:space="preserve">
<value>Abbrechen</value>
</data>
<data name="grpHotelMode.Text" xml:space="preserve">
<value>Hotel Modus</value>
</data>
<data name="labelControl3.Text" xml:space="preserve">
<value>HINWEIS: Bei aktivem Hotel-Modus kann man in der EPG nicht zum gewählten Sender wechseln und die Funktion "Werkseinstellungen" ist gesperrt.</value>
<value>HINWEIS: Bei aktivem Hotel-Modus kann man im EPG nicht zum gewählten Sender wechseln und die Funktion "Werkseinstellungen" ist gesperrt.</value>
</data>
<data name="labelControl2.Size" type="System.Drawing.Size, System.Drawing">
<value>341, 13</value>
@@ -198,127 +145,21 @@
<data name="labelControl2.Text" xml:space="preserve">
<value>Die folgenden Einstellungen funktionieren nur bei aktivem Hotel-Modus:</value>
</data>
<data name="cbDtvUpdate.Properties.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="cbDtvUpdate.Properties.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="cbDtvUpdate.Properties.AutoHeight" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbDtvUpdate.Properties.Caption" xml:space="preserve">
<value>D-TV Senderliste automatisch aktualisieren (empfohlen: AUS)</value>
</data>
<data name="cbDtvUpdate.Properties.DisplayValueChecked" xml:space="preserve">
<value />
</data>
<data name="cbDtvUpdate.Properties.DisplayValueGrayed" xml:space="preserve">
<value />
</data>
<data name="cbDtvUpdate.Properties.DisplayValueUnchecked" xml:space="preserve">
<value />
</data>
<data name="cbHotelMode.Properties.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="cbHotelMode.Properties.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="cbHotelMode.Properties.AutoHeight" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbHotelMode.Properties.Caption" xml:space="preserve">
<value>Hotel Modus aktivieren (empfohlen: EIN)</value>
</data>
<data name="cbHotelMode.Properties.DisplayValueChecked" xml:space="preserve">
<value />
</data>
<data name="cbHotelMode.Properties.DisplayValueGrayed" xml:space="preserve">
<value />
</data>
<data name="cbHotelMode.Properties.DisplayValueUnchecked" xml:space="preserve">
<value />
</data>
<data name="grpHotelMode.Text" xml:space="preserve">
<value>Hotel Modus</value>
</data>
<data name="cbAutoChannelUpdate.Properties.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="cbAutoChannelUpdate.Properties.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="cbAutoChannelUpdate.Properties.AutoHeight" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbAutoChannelUpdate.Properties.Caption" xml:space="preserve">
<value>Senderliste automatisch aktualisieren (empfohlen: AUS)</value>
</data>
<data name="cbAutoChannelUpdate.Properties.DisplayValueChecked" xml:space="preserve">
<value />
</data>
<data name="cbAutoChannelUpdate.Properties.DisplayValueGrayed" xml:space="preserve">
<value />
</data>
<data name="cbAutoChannelUpdate.Properties.DisplayValueUnchecked" xml:space="preserve">
<value />
</data>
<data name="groupControl1.Text" xml:space="preserve">
<value>EINST. Menü</value>
<data name="grpSetup.Text" xml:space="preserve">
<value>EINST. Menu</value>
</data>
<data name="labelControl4.Text" xml:space="preserve">
<value>Das Dateiformat Ihres TV-Modells wird nicht vollständig unterstützt. Deshalb sind viele Einstellungen in diesem Dialog gesperrt.</value>
</data>
<data name="textEdit1.Properties.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="textEdit1.Properties.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="textEdit1.Properties.AutoHeight" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<assembly alias="DevExpress.XtraEditors.v12.2" name="DevExpress.XtraEditors.v12.2, Version=12.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="textEdit1.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v12.2">
<value>Default</value>
</data>
<data name="textEdit1.Properties.Mask.BeepOnError" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="textEdit1.Properties.Mask.EditMask" xml:space="preserve">
<value />
</data>
<data name="textEdit1.Properties.Mask.IgnoreMaskBlank" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="textEdit1.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v12.2">
<value>None</value>
</data>
<data name="textEdit1.Properties.Mask.PlaceHolder" type="System.Char, mscorlib" xml:space="preserve">
<value>_</value>
</data>
<data name="textEdit1.Properties.Mask.SaveLiteral" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="textEdit1.Properties.Mask.ShowPlaceHolders" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="textEdit1.Properties.Mask.UseMaskAsDisplayFormat" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="textEdit1.Properties.NullValuePrompt" xml:space="preserve">
<value />
</data>
<data name="textEdit1.Properties.NullValuePromptShowForEmptyValue" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="TvSettingsForm.Appearance.GradientMode" type="System.Drawing.Drawing2D.LinearGradientMode, System.Drawing">
<value>Horizontal</value>
</data>
<data name="TvSettingsForm.Appearance.Image" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="$this.Text" xml:space="preserve">
<value>TV Einstellungen</value>
</data>

File diff suppressed because it is too large Load Diff