From 2b3c67ec5145c5763c28f6ad863962a41e5beec2 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Thu, 16 Feb 2012 01:59:44 +0100 Subject: [PATCH] cec-config-gui: added implementations for "wake devices" and "standby devices" --- src/cec-config-gui/AsyncForm.cs | 18 ++++++ src/cec-config-gui/CecConfigGUI.Designer.cs | 4 ++ src/cec-config-gui/CecConfigGUI.cs | 62 +++++++++++++++++---- 3 files changed, 74 insertions(+), 10 deletions(-) diff --git a/src/cec-config-gui/AsyncForm.cs b/src/cec-config-gui/AsyncForm.cs index ab9afdd..5898ce5 100644 --- a/src/cec-config-gui/AsyncForm.cs +++ b/src/cec-config-gui/AsyncForm.cs @@ -59,6 +59,24 @@ namespace CecConfigGui } } + delegate void SetCheckboxItemCheckedCallback(CheckedListBox control, int index, bool val); + public void SetCheckboxItemChecked(CheckedListBox control, int index, bool val) + { + if (control.InvokeRequired) + { + SetCheckboxItemCheckedCallback d = new SetCheckboxItemCheckedCallback(SetCheckboxItemChecked); + try + { + this.Invoke(d, new object[] { control, index, val }); + } + catch (Exception) { } + } + else + { + control.SetItemChecked(index, val); + } + } + delegate void SetProgressValueCallback(ProgressBar control, int val); public void SetProgressValue(ProgressBar control, int val) { diff --git a/src/cec-config-gui/CecConfigGUI.Designer.cs b/src/cec-config-gui/CecConfigGUI.Designer.cs index 2c0f909..ca42375 100644 --- a/src/cec-config-gui/CecConfigGUI.Designer.cs +++ b/src/cec-config-gui/CecConfigGUI.Designer.cs @@ -682,6 +682,8 @@ // cbLogDebug // this.cbLogDebug.AutoSize = true; + this.cbLogDebug.Checked = true; + this.cbLogDebug.CheckState = System.Windows.Forms.CheckState.Checked; this.cbLogDebug.Location = new System.Drawing.Point(269, 336); this.cbLogDebug.Name = "cbLogDebug"; this.cbLogDebug.Size = new System.Drawing.Size(58, 17); @@ -692,6 +694,8 @@ // cbLogTraffic // this.cbLogTraffic.AutoSize = true; + this.cbLogTraffic.Checked = true; + this.cbLogTraffic.CheckState = System.Windows.Forms.CheckState.Checked; this.cbLogTraffic.Location = new System.Drawing.Point(207, 336); this.cbLogTraffic.Name = "cbLogTraffic"; this.cbLogTraffic.Size = new System.Drawing.Size(56, 17); diff --git a/src/cec-config-gui/CecConfigGUI.cs b/src/cec-config-gui/CecConfigGUI.cs index 2bafae8..80b4e6e 100644 --- a/src/cec-config-gui/CecConfigGUI.cs +++ b/src/cec-config-gui/CecConfigGUI.cs @@ -330,8 +330,8 @@ namespace CecConfigGui SetControlEnabled(cbActivateSource, val); SetControlEnabled(cbPowerOffScreensaver, val); SetControlEnabled(cbPowerOffOnStandby, val); - SetControlEnabled(cbWakeDevices, false); // TODO not implemented yet - SetControlEnabled(cbPowerOffDevices, false); // TODO not implemented yet + SetControlEnabled(cbWakeDevices, val); + SetControlEnabled(cbPowerOffDevices, val); SetControlEnabled(cbVendorOverride, val); SetControlEnabled(cbVendorId, val && cbVendorOverride.Checked); SetControlEnabled(bClose, val); @@ -512,6 +512,8 @@ namespace CecConfigGui Config.ActivateSource = cbActivateSource.Checked; Config.PowerOffScreensaver = cbPowerOffScreensaver.Checked; Config.PowerOffOnStandby = cbPowerOffOnStandby.Checked; + Config.WakeDevices = WakeDevices; + Config.PowerOffDevices = PowerOffDevices; if (!Lib.CanPersistConfiguration()) { @@ -565,18 +567,18 @@ namespace CecConfigGui output.AppendLine(""); output.AppendLine(""); output.AppendLine(""); - output.AppendLine(""); + output.AppendLine(""); output.Append(""); output.Append(""); output.AppendLine(""); @@ -722,7 +724,7 @@ namespace CecConfigGui List deviceList = new List(); foreach (CecLogicalAddress activeDevice in activeDevices.Addresses) { - if (activeDevice != CecLogicalAddress.Unregistered) + if (activeDevice != CecLogicalAddress.Unknown) deviceList.Add(string.Format("{0,1:X} : {1}", (int)activeDevice, Lib.ToString(activeDevice))); } deviceList.Add(string.Format("{0,1:X} : {1}", (int)CecLogicalAddress.Broadcast, Lib.ToString(CecLogicalAddress.Broadcast))); @@ -765,7 +767,12 @@ namespace CecConfigGui return retval; } - switch (this.cbCommandDestination.Text.Substring(0, 1).ToLower()) + return GetLogicalAddressFromString(this.cbCommandDestination.Text); + } + + private CecLogicalAddress GetLogicalAddressFromString(string name) + { + switch (name.Substring(0, 1).ToLower()) { case "0": return CecLogicalAddress.Tv; @@ -1003,6 +1010,11 @@ namespace CecConfigGui SetCheckboxChecked(cbPowerOffScreensaver, Config.PowerOffScreensaver); SetCheckboxChecked(cbPowerOffOnStandby, Config.PowerOffOnStandby); UpdateSelectedDevice(); + + for (int iPtr = 0; iPtr < 15; iPtr++) + SetCheckboxItemChecked(cbWakeDevices, iPtr, Config.WakeDevices.IsSet((CecLogicalAddress)iPtr)); + for (int iPtr = 0; iPtr < 15; iPtr++) + SetCheckboxItemChecked(cbPowerOffDevices, iPtr, Config.PowerOffDevices.IsSet((CecLogicalAddress)iPtr)); return 1; } @@ -1019,7 +1031,11 @@ namespace CecConfigGui public int ReceiveLogMessage(CecLogMessage message) { - AddLogMessage(message); + try + { + AddLogMessage(message); + } + catch (Exception) { } return 1; } #endregion @@ -1101,6 +1117,32 @@ namespace CecConfigGui private string Log = string.Empty; private DeviceInformation UpdatingInfoPanel = null; private bool DeviceChangeWarningDisplayed = false; + public CecLogicalAddresses WakeDevices + { + get + { + CecLogicalAddresses addr = new CecLogicalAddresses(); + foreach (object item in this.cbWakeDevices.CheckedItems) + { + string c = item as string; + addr.Set(GetLogicalAddressFromString(c)); + } + return addr; + } + } + public CecLogicalAddresses PowerOffDevices + { + get + { + CecLogicalAddresses addr = new CecLogicalAddresses(); + foreach (object item in this.cbPowerOffDevices.CheckedItems) + { + string c = item as string; + addr.Set(GetLogicalAddressFromString(c)); + } + return addr; + } + } #endregion } -- 2.34.1