diff --git a/PepperDashEssentials/PepperDashEssentials.suo b/PepperDashEssentials/PepperDashEssentials.suo index 88a40cfd..1a98b839 100644 Binary files a/PepperDashEssentials/PepperDashEssentials.suo and b/PepperDashEssentials/PepperDashEssentials.suo differ diff --git a/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.csproj b/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.csproj index 0407da46..8d255acf 100644 --- a/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.csproj +++ b/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.csproj @@ -154,6 +154,9 @@ + + + @@ -162,7 +165,7 @@ - + diff --git a/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo b/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo index 78e649ed..274eac88 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo and b/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo differ diff --git a/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-02-22 09-20-03).log b/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-02-22 09-20-03).log new file mode 100644 index 00000000..00f7fc78 --- /dev/null +++ b/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-02-22 09-20-03).log @@ -0,0 +1,126 @@ +2/22/2017 9:20:03 AM, Info: Initializing SIMPLSharp Services... +2/22/2017 9:20:03 AM, Info: ProjectInfo successfully initialized. +2/22/2017 1:08:29 PM, Info: Saving project information... +2/22/2017 1:08:29 PM, Info: Saving project information... +2/22/2017 1:08:29 PM, Info: Saving project information... +2/22/2017 1:13:29 PM, Info: Saving project information... +2/22/2017 1:13:29 PM, Info: Saving project information... +2/22/2017 1:13:29 PM, Info: Saving project information... +2/22/2017 1:18:29 PM, Info: Saving project information... +2/22/2017 1:18:29 PM, Info: Saving project information... +2/22/2017 1:18:29 PM, Info: Saving project information... +2/22/2017 1:23:29 PM, Info: Saving project information... +2/22/2017 1:23:29 PM, Info: Saving project information... +2/22/2017 1:23:29 PM, Info: Saving project information... +2/22/2017 1:28:29 PM, Info: Saving project information... +2/22/2017 1:28:29 PM, Info: Saving project information... +2/22/2017 1:28:29 PM, Info: Saving project information... +2/22/2017 1:33:29 PM, Info: Saving project information... +2/22/2017 1:33:29 PM, Info: Saving project information... +2/22/2017 1:33:29 PM, Info: Saving project information... +2/22/2017 1:38:29 PM, Info: Saving project information... +2/22/2017 1:38:29 PM, Info: Saving project information... +2/22/2017 1:38:29 PM, Info: Saving project information... +2/22/2017 1:43:29 PM, Info: Saving project information... +2/22/2017 1:43:29 PM, Info: Saving project information... +2/22/2017 1:43:29 PM, Info: Saving project information... +2/22/2017 1:48:29 PM, Info: Saving project information... +2/22/2017 1:48:29 PM, Info: Saving project information... +2/22/2017 1:48:29 PM, Info: Saving project information... +2/22/2017 1:53:29 PM, Info: Saving project information... +2/22/2017 1:53:29 PM, Info: Saving project information... +2/22/2017 1:53:29 PM, Info: Saving project information... +2/22/2017 1:58:29 PM, Info: Saving project information... +2/22/2017 1:58:29 PM, Info: Saving project information... +2/22/2017 1:58:29 PM, Info: Saving project information... +2/22/2017 2:03:29 PM, Info: Saving project information... +2/22/2017 2:03:29 PM, Info: Saving project information... +2/22/2017 2:03:29 PM, Info: Saving project information... +2/22/2017 2:08:29 PM, Info: Saving project information... +2/22/2017 2:08:29 PM, Info: Saving project information... +2/22/2017 2:08:29 PM, Info: Saving project information... +2/22/2017 2:13:29 PM, Info: Saving project information... +2/22/2017 2:13:29 PM, Info: Saving project information... +2/22/2017 2:13:29 PM, Info: Saving project information... +2/22/2017 2:18:29 PM, Info: Saving project information... +2/22/2017 2:18:29 PM, Info: Saving project information... +2/22/2017 2:18:29 PM, Info: Saving project information... +2/22/2017 2:23:29 PM, Info: Saving project information... +2/22/2017 2:23:29 PM, Info: Saving project information... +2/22/2017 2:23:29 PM, Info: Saving project information... +2/22/2017 2:28:29 PM, Info: Saving project information... +2/22/2017 2:28:29 PM, Info: Saving project information... +2/22/2017 2:28:29 PM, Info: Saving project information... +2/22/2017 2:33:29 PM, Info: Saving project information... +2/22/2017 2:33:29 PM, Info: Saving project information... +2/22/2017 2:33:29 PM, Info: Saving project information... +2/22/2017 2:38:29 PM, Info: Saving project information... +2/22/2017 2:38:29 PM, Info: Saving project information... +2/22/2017 2:38:29 PM, Info: Saving project information... +2/22/2017 2:43:29 PM, Info: Saving project information... +2/22/2017 2:43:29 PM, Info: Saving project information... +2/22/2017 2:43:29 PM, Info: Saving project information... +2/22/2017 2:48:29 PM, Info: Saving project information... +2/22/2017 2:48:29 PM, Info: Saving project information... +2/22/2017 2:48:29 PM, Info: Saving project information... +2/22/2017 2:53:29 PM, Info: Saving project information... +2/22/2017 2:53:29 PM, Info: Saving project information... +2/22/2017 2:53:29 PM, Info: Saving project information... +2/22/2017 2:58:29 PM, Info: Saving project information... +2/22/2017 2:58:29 PM, Info: Saving project information... +2/22/2017 2:58:29 PM, Info: Saving project information... +2/22/2017 3:03:29 PM, Info: Saving project information... +2/22/2017 3:03:29 PM, Info: Saving project information... +2/22/2017 3:03:29 PM, Info: Saving project information... +2/22/2017 3:08:29 PM, Info: Saving project information... +2/22/2017 3:08:29 PM, Info: Saving project information... +2/22/2017 3:08:29 PM, Info: Saving project information... +2/22/2017 3:13:29 PM, Info: Saving project information... +2/22/2017 3:13:29 PM, Info: Saving project information... +2/22/2017 3:13:29 PM, Info: Saving project information... +2/22/2017 3:18:29 PM, Info: Saving project information... +2/22/2017 3:18:29 PM, Info: Saving project information... +2/22/2017 3:18:29 PM, Info: Saving project information... +2/22/2017 3:23:29 PM, Info: Saving project information... +2/22/2017 3:23:29 PM, Info: Saving project information... +2/22/2017 3:23:29 PM, Info: Saving project information... +2/22/2017 3:28:29 PM, Info: Saving project information... +2/22/2017 3:28:29 PM, Info: Saving project information... +2/22/2017 3:28:29 PM, Info: Saving project information... +2/22/2017 3:33:29 PM, Info: Saving project information... +2/22/2017 3:33:29 PM, Info: Saving project information... +2/22/2017 3:33:29 PM, Info: Saving project information... +2/22/2017 3:38:29 PM, Info: Saving project information... +2/22/2017 3:38:29 PM, Info: Saving project information... +2/22/2017 3:38:29 PM, Info: Saving project information... +2/22/2017 3:43:29 PM, Info: Saving project information... +2/22/2017 3:43:29 PM, Info: Saving project information... +2/22/2017 3:43:29 PM, Info: Saving project information... +2/22/2017 3:48:29 PM, Info: Saving project information... +2/22/2017 3:48:29 PM, Info: Saving project information... +2/22/2017 3:48:29 PM, Info: Saving project information... +2/22/2017 3:53:29 PM, Info: Saving project information... +2/22/2017 3:53:29 PM, Info: Saving project information... +2/22/2017 3:53:29 PM, Info: Saving project information... +2/22/2017 3:58:29 PM, Info: Saving project information... +2/22/2017 3:58:29 PM, Info: Saving project information... +2/22/2017 3:58:29 PM, Info: Saving project information... +2/22/2017 4:01:29 PM, Info: Saving project information... +2/22/2017 4:01:29 PM, Info: Saving project information... +2/22/2017 4:01:29 PM, Info: Saving project information... +2/22/2017 4:01:29 PM, Info: Saving project information... +2/22/2017 4:01:29 PM, Info: Saving project information... +2/22/2017 4:01:29 PM, Info: Saving project information... +2/22/2017 4:01:33 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +2/22/2017 4:01:34 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +2/22/2017 4:01:35 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +2/22/2017 4:01:36 PM, Info: Saving project information... +2/22/2017 4:10:42 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +2/22/2017 4:10:43 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +2/22/2017 4:10:43 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +2/22/2017 4:10:44 PM, Info: Saving project information... +2/22/2017 4:13:18 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +2/22/2017 4:13:18 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +2/22/2017 4:13:18 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +2/22/2017 4:13:20 PM, Info: Saving project information... +2/22/2017 5:37:25 PM, Info: Terminating SIMPLSharp Services diff --git a/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-02-23 08-42-27).log b/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-02-23 08-42-27).log new file mode 100644 index 00000000..57c4043d --- /dev/null +++ b/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-02-23 08-42-27).log @@ -0,0 +1,68 @@ +2/23/2017 8:42:27 AM, Info: Initializing SIMPLSharp Services... +2/23/2017 8:42:27 AM, Info: ProjectInfo successfully initialized. +2/23/2017 8:49:33 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +2/23/2017 8:49:34 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +2/23/2017 8:49:34 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +2/23/2017 8:49:36 AM, Info: Saving project information... +2/23/2017 8:55:41 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +2/23/2017 8:55:42 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +2/23/2017 8:55:42 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +2/23/2017 8:55:43 AM, Info: Saving project information... +2/23/2017 8:57:56 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +2/23/2017 8:57:56 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +2/23/2017 8:57:56 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +2/23/2017 8:57:58 AM, Info: Saving project information... +2/23/2017 9:12:05 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +2/23/2017 9:12:06 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +2/23/2017 9:12:06 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +2/23/2017 9:12:08 AM, Info: Saving project information... +2/23/2017 9:28:52 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +2/23/2017 9:28:53 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +2/23/2017 9:28:53 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +2/23/2017 9:28:54 AM, Exception: The process cannot access the file 'C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz' because it is being used by another process. + at System.IO.__Error.WinIOError(Int32 errorCode, String maybeFullPath) + at System.IO.File.Delete(String path) + at Crestron.Tools.SIMPLSharp.Services.Utilities.Zipper.Zip(String zipFileName, Folder folderToZip) + at h.a(String A_0, IList`1 A_1, String A_2) +2/23/2017 9:32:21 AM, Info: Saving project information... +2/23/2017 9:32:21 AM, Info: Saving project information... +2/23/2017 9:32:21 AM, Info: Saving project information... +2/23/2017 9:35:44 AM, Info: Saving project information... +2/23/2017 9:35:44 AM, Info: Saving project information... +2/23/2017 9:35:44 AM, Info: Saving project information... +2/23/2017 9:35:44 AM, Info: Saving project information... +2/23/2017 9:35:44 AM, Info: Saving project information... +2/23/2017 9:35:44 AM, Info: Saving project information... +2/23/2017 9:35:46 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +2/23/2017 9:35:47 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +2/23/2017 9:35:47 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +2/23/2017 9:35:48 AM, Info: Saving project information... +2/23/2017 10:32:33 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +2/23/2017 10:32:34 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +2/23/2017 10:32:34 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +2/23/2017 10:32:35 AM, Info: Saving project information... +2/23/2017 10:35:50 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +2/23/2017 10:35:51 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +2/23/2017 10:35:51 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +2/23/2017 10:35:53 AM, Info: Saving project information... +2/23/2017 10:53:11 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +2/23/2017 10:53:12 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +2/23/2017 10:53:12 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +2/23/2017 10:53:13 AM, Info: Saving project information... +2/23/2017 10:54:13 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +2/23/2017 10:54:14 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +2/23/2017 10:54:14 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +2/23/2017 10:54:15 AM, Info: Saving project information... +2/23/2017 11:00:55 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +2/23/2017 11:00:56 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +2/23/2017 11:00:56 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +2/23/2017 11:00:57 AM, Info: Saving project information... +2/23/2017 11:12:54 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +2/23/2017 11:12:55 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +2/23/2017 11:12:55 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +2/23/2017 11:12:57 AM, Info: Saving project information... +2/23/2017 11:24:45 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +2/23/2017 11:24:45 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +2/23/2017 11:24:46 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +2/23/2017 11:24:47 AM, Info: Saving project information... +2/23/2017 11:56:58 AM, Info: Terminating SIMPLSharp Services diff --git a/PepperDashEssentials/PepperDashEssentials/UI Drivers/DualDisplayRouting.cs b/PepperDashEssentials/PepperDashEssentials/UI Drivers/DualDisplayRouting.cs index 5666f038..1aeb7a3c 100644 --- a/PepperDashEssentials/PepperDashEssentials/UI Drivers/DualDisplayRouting.cs +++ b/PepperDashEssentials/PepperDashEssentials/UI Drivers/DualDisplayRouting.cs @@ -1,231 +1,231 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.DeviceSupport; -using PepperDash.Core; -using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.SmartObjects; -using PepperDash.Essentials.Core.PageManagers; +//using System; +//using System.Collections.Generic; +//using System.Linq; +//using System.Text; +//using Crestron.SimplSharp; +//using Crestron.SimplSharpPro; +//using Crestron.SimplSharpPro.DeviceSupport; +//using PepperDash.Core; +//using PepperDash.Essentials.Core; +//using PepperDash.Essentials.Core.SmartObjects; +//using PepperDash.Essentials.Core.PageManagers; -namespace PepperDash.Essentials -{ - public class DualDisplaySimpleOrAdvancedRouting : PanelDriverBase - { - EssentialsPresentationPanelAvFunctionsDriver Parent; +//namespace PepperDash.Essentials +//{ +// public class DualDisplaySimpleOrAdvancedRouting : PanelDriverBase +// { +// EssentialsPresentationPanelAvFunctionsDriver Parent; - /// - /// Smart Object 3200 - /// - SubpageReferenceList SourcesSrl; +// /// +// /// Smart Object 3200 +// /// +// SubpageReferenceList SourcesSrl; - /// - /// For tracking feedback on last selected - /// - BoolInputSig LastSelectedSourceSig; +// /// +// /// For tracking feedback on last selected +// /// +// BoolInputSig LastSelectedSourceSig; - /// - /// The source that has been selected and is awaiting assignment to a display - /// - SourceListItem PendingSource; +// /// +// /// The source that has been selected and is awaiting assignment to a display +// /// +// SourceListItem PendingSource; - bool IsSharingModeAdvanced; +// bool IsSharingModeAdvanced; - public DualDisplaySimpleOrAdvancedRouting(EssentialsPresentationPanelAvFunctionsDriver parent) : base(parent.TriList) - { - Parent = parent; - SourcesSrl = new SubpageReferenceList(TriList, 3200, 3, 3, 3); +// public DualDisplaySimpleOrAdvancedRouting(EssentialsPresentationPanelAvFunctionsDriver parent) : base(parent.TriList) +// { +// Parent = parent; +// SourcesSrl = new SubpageReferenceList(TriList, 3200, 3, 3, 3); - TriList.SetSigFalseAction(UIBoolJoin.ToggleSharingModePress, ToggleSharingModePressed); +// TriList.SetSigFalseAction(UIBoolJoin.ToggleSharingModePress, ToggleSharingModePressed); - TriList.SetSigFalseAction(UIBoolJoin.Display1AudioButtonPressAndFb, Display1AudioPress); - TriList.SetSigFalseAction(UIBoolJoin.Display1ControlButtonPress, Display1ControlPress); - TriList.SetSigTrueAction(UIBoolJoin.Display1SelectPress, Display1Press); +// TriList.SetSigFalseAction(UIBoolJoin.Display1AudioButtonPressAndFb, Display1AudioPress); +// TriList.SetSigFalseAction(UIBoolJoin.Display1ControlButtonPress, Display1ControlPress); +// TriList.SetSigTrueAction(UIBoolJoin.Display1SelectPressAndFb, Display1Press); - TriList.SetSigFalseAction(UIBoolJoin.Display2AudioButtonPressAndFb, Display2AudioPress); - TriList.SetSigFalseAction(UIBoolJoin.Display2ControlButtonPress, Display2ControlPress); - TriList.SetSigTrueAction(UIBoolJoin.Display2SelectPress, Display2Press); - } +// TriList.SetSigFalseAction(UIBoolJoin.Display2AudioButtonPressAndFb, Display2AudioPress); +// TriList.SetSigFalseAction(UIBoolJoin.Display2ControlButtonPress, Display2ControlPress); +// TriList.SetSigTrueAction(UIBoolJoin.Display2SelectPressAndFb, Display2Press); +// } - /// - /// - /// - public override void Show() - { - TriList.BooleanInput[UIBoolJoin.ToggleSharingModeVisible].BoolValue = true; - TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = true; - if(IsSharingModeAdvanced) - TriList.BooleanInput[UIBoolJoin.DualDisplayPageVisible].BoolValue = true; - else - TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = true; - base.Show(); - } +// /// +// /// +// /// +// public override void Show() +// { +// TriList.BooleanInput[UIBoolJoin.ToggleSharingModeVisible].BoolValue = true; +// TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = true; +// if(IsSharingModeAdvanced) +// TriList.BooleanInput[UIBoolJoin.DualDisplayPageVisible].BoolValue = true; +// else +// TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = true; +// base.Show(); +// } - /// - /// - /// - //public override void Hide() - //{ - // TriList.BooleanInput[UIBoolJoin.ToggleSharingModeVisible].BoolValue = false; - // TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = false; - // if(IsSharingModeAdvanced) - // TriList.BooleanInput[UIBoolJoin.DualDisplayPageVisible].BoolValue = false; - // else - // TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false; - // base.Hide(); - //} +// /// +// /// +// /// +// //public override void Hide() +// //{ +// // TriList.BooleanInput[UIBoolJoin.ToggleSharingModeVisible].BoolValue = false; +// // TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = false; +// // if(IsSharingModeAdvanced) +// // TriList.BooleanInput[UIBoolJoin.DualDisplayPageVisible].BoolValue = false; +// // else +// // TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false; +// // base.Hide(); +// //} - public void SetCurrentRoomFromParent() - { - if (IsSharingModeAdvanced) - return; // add stuff here - else - SetupSourceListForSimpleRouting(); - } +// public void SetCurrentRoomFromParent() +// { +// if (IsSharingModeAdvanced) +// return; // add stuff here +// else +// SetupSourceListForSimpleRouting(); +// } - /// - /// - /// - void SetupSourceListForSimpleRouting() - { - // get the source list config and set up the source list - var config = ConfigReader.ConfigObject.SourceLists; - if (config.ContainsKey(Parent.CurrentRoom.SourceListKey)) - { - var srcList = config[Parent.CurrentRoom.SourceListKey] - .Values.ToList().OrderBy(s => s.Order); - // Setup sources list - uint i = 1; // counter for UI list - foreach (var srcConfig in srcList) - { - if (!srcConfig.IncludeInSourceList) // Skip sources marked this way - continue; +// /// +// /// +// /// +// void SetupSourceListForSimpleRouting() +// { +// // get the source list config and set up the source list +// var config = ConfigReader.ConfigObject.SourceLists; +// if (config.ContainsKey(Parent.CurrentRoom.SourceListKey)) +// { +// var srcList = config[Parent.CurrentRoom.SourceListKey] +// .Values.ToList().OrderBy(s => s.Order); +// // Setup sources list +// uint i = 1; // counter for UI list +// foreach (var srcConfig in srcList) +// { +// if (!srcConfig.IncludeInSourceList) // Skip sources marked this way +// continue; - var sourceKey = srcConfig.SourceKey; - var actualSource = DeviceManager.GetDeviceForKey(sourceKey) as Device; - if (actualSource == null) - { - Debug.Console(0, "Cannot assign missing source '{0}' to source UI list", - srcConfig.SourceKey); - continue; - } - var localSrcItem = srcConfig; // lambda scope below - var localIndex = i; - SourcesSrl.GetBoolFeedbackSig(i, 1).UserObject = new Action(b => - { - if (IsSharingModeAdvanced) - { - if (LastSelectedSourceSig != null) - LastSelectedSourceSig.BoolValue = false; - SourceListButtonPress(localSrcItem); - LastSelectedSourceSig = SourcesSrl.BoolInputSig(localIndex, 1); - LastSelectedSourceSig.BoolValue = true; - } - else - Parent.CurrentRoom.DoSourceToAllDestinationsRoute(localSrcItem); - }); - SourcesSrl.StringInputSig(i, 1).StringValue = srcConfig.PreferredName; - i++; +// var sourceKey = srcConfig.SourceKey; +// var actualSource = DeviceManager.GetDeviceForKey(sourceKey) as Device; +// if (actualSource == null) +// { +// Debug.Console(0, "Cannot assign missing source '{0}' to source UI list", +// srcConfig.SourceKey); +// continue; +// } +// var localSrcItem = srcConfig; // lambda scope below +// var localIndex = i; +// SourcesSrl.GetBoolFeedbackSig(i, 1).UserObject = new Action(b => +// { +// if (IsSharingModeAdvanced) +// { +// if (LastSelectedSourceSig != null) +// LastSelectedSourceSig.BoolValue = false; +// SourceListButtonPress(localSrcItem); +// LastSelectedSourceSig = SourcesSrl.BoolInputSig(localIndex, 1); +// LastSelectedSourceSig.BoolValue = true; +// } +// else +// Parent.CurrentRoom.DoSourceToAllDestinationsRoute(localSrcItem); +// }); +// SourcesSrl.StringInputSig(i, 1).StringValue = srcConfig.PreferredName; +// i++; - //var item = new SubpageReferenceListSourceItem(i++, SourcesSrl, srcConfig, - // b => { if (!b) UiSelectSource(localSrcConfig); }); - //SourcesSrl.AddItem(item); // add to the SRL - //item.RegisterForSourceChange(Parent.CurrentRoom); - } - SourcesSrl.Count = (ushort)(i - 1); - Parent.CurrentRoom.CurrentSingleSourceChange += CurrentRoom_CurrentSourceInfoChange; - Parent.CurrentRoom.CurrentDisplay1SourceChange += CurrentRoom_CurrentDisplay1SourceChange; - Parent.CurrentRoom.CurrentDisplay2SourceChange += CurrentRoom_CurrentDisplay2SourceChange; - } - } +// //var item = new SubpageReferenceListSourceItem(i++, SourcesSrl, srcConfig, +// // b => { if (!b) UiSelectSource(localSrcConfig); }); +// //SourcesSrl.AddItem(item); // add to the SRL +// //item.RegisterForSourceChange(Parent.CurrentRoom); +// } +// SourcesSrl.Count = (ushort)(i - 1); +// Parent.CurrentRoom.CurrentSingleSourceChange += CurrentRoom_CurrentSourceInfoChange; +// Parent.CurrentRoom.CurrentDisplay1SourceChange += CurrentRoom_CurrentDisplay1SourceChange; +// Parent.CurrentRoom.CurrentDisplay2SourceChange += CurrentRoom_CurrentDisplay2SourceChange; +// } +// } - void SetupSourceListForAdvancedRouting() - { +// void SetupSourceListForAdvancedRouting() +// { - } +// } - void CurrentRoom_CurrentSourceInfoChange(EssentialsRoomBase room, SourceListItem info, ChangeType type) - { +// void CurrentRoom_CurrentSourceInfoChange(EssentialsRoomBase room, SourceListItem info, ChangeType type) +// { - } +// } - void CurrentRoom_CurrentDisplay1SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type) - { - TriList.StringInput[UIStringJoin.Display1SourceLabel].StringValue = PendingSource.PreferredName; +// void CurrentRoom_CurrentDisplay1SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type) +// { +// TriList.StringInput[UIStringJoin.Display1SourceLabel].StringValue = PendingSource.PreferredName; - } +// } - void CurrentRoom_CurrentDisplay2SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type) - { - TriList.StringInput[UIStringJoin.Display2SourceLabel].StringValue = PendingSource.PreferredName; - } +// void CurrentRoom_CurrentDisplay2SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type) +// { +// TriList.StringInput[UIStringJoin.Display2SourceLabel].StringValue = PendingSource.PreferredName; +// } - /// - /// - /// - void ToggleSharingModePressed() - { - Hide(); - IsSharingModeAdvanced = !IsSharingModeAdvanced; - TriList.BooleanInput[UIBoolJoin.ToggleSharingModePress].BoolValue = IsSharingModeAdvanced; - Show(); - } +// /// +// /// +// /// +// void ToggleSharingModePressed() +// { +// Hide(); +// IsSharingModeAdvanced = !IsSharingModeAdvanced; +// TriList.BooleanInput[UIBoolJoin.ToggleSharingModePress].BoolValue = IsSharingModeAdvanced; +// Show(); +// } - public void SourceListButtonPress(SourceListItem item) - { - // start the timer - // show FB on potential source - TriList.BooleanInput[UIBoolJoin.Display1AudioButtonEnable].BoolValue = false; - TriList.BooleanInput[UIBoolJoin.Display1ControlButtonEnable].BoolValue = false; - TriList.BooleanInput[UIBoolJoin.Display2AudioButtonEnable].BoolValue = false; - TriList.BooleanInput[UIBoolJoin.Display2ControlButtonEnable].BoolValue = false; - PendingSource = item; - } +// public void SourceListButtonPress(SourceListItem item) +// { +// // start the timer +// // show FB on potential source +// TriList.BooleanInput[UIBoolJoin.Display1AudioButtonEnable].BoolValue = false; +// TriList.BooleanInput[UIBoolJoin.Display1ControlButtonEnable].BoolValue = false; +// TriList.BooleanInput[UIBoolJoin.Display2AudioButtonEnable].BoolValue = false; +// TriList.BooleanInput[UIBoolJoin.Display2ControlButtonEnable].BoolValue = false; +// PendingSource = item; +// } - void EnableAppropriateDisplayButtons() - { - TriList.BooleanInput[UIBoolJoin.Display1AudioButtonEnable].BoolValue = true; - TriList.BooleanInput[UIBoolJoin.Display1ControlButtonEnable].BoolValue = true; - TriList.BooleanInput[UIBoolJoin.Display2AudioButtonEnable].BoolValue = true; - TriList.BooleanInput[UIBoolJoin.Display2ControlButtonEnable].BoolValue = true; - if (LastSelectedSourceSig != null) - LastSelectedSourceSig.BoolValue = false; - } +// void EnableAppropriateDisplayButtons() +// { +// TriList.BooleanInput[UIBoolJoin.Display1AudioButtonEnable].BoolValue = true; +// TriList.BooleanInput[UIBoolJoin.Display1ControlButtonEnable].BoolValue = true; +// TriList.BooleanInput[UIBoolJoin.Display2AudioButtonEnable].BoolValue = true; +// TriList.BooleanInput[UIBoolJoin.Display2ControlButtonEnable].BoolValue = true; +// if (LastSelectedSourceSig != null) +// LastSelectedSourceSig.BoolValue = false; +// } - public void Display1Press() - { - EnableAppropriateDisplayButtons(); - Parent.CurrentRoom.SourceToDisplay1(PendingSource); - // Enable end meeting - } +// public void Display1Press() +// { +// EnableAppropriateDisplayButtons(); +// Parent.CurrentRoom.SourceToDisplay1(PendingSource); +// // Enable end meeting +// } - public void Display1AudioPress() - { +// public void Display1AudioPress() +// { - } +// } - public void Display1ControlPress() - { +// public void Display1ControlPress() +// { - } +// } - public void Display2Press() - { - EnableAppropriateDisplayButtons(); - Parent.CurrentRoom.SourceToDisplay2(PendingSource); - } +// public void Display2Press() +// { +// EnableAppropriateDisplayButtons(); +// Parent.CurrentRoom.SourceToDisplay2(PendingSource); +// } - public void Display2AudioPress() - { +// public void Display2AudioPress() +// { - } +// } - public void Display2ControlPress() - { +// public void Display2ControlPress() +// { - } - } -} \ No newline at end of file +// } +// } +//} \ No newline at end of file diff --git a/PepperDashEssentials/PepperDashEssentials/UI Drivers/EssentialsPresentationPanelAvFunctionsDriver.cs b/PepperDashEssentials/PepperDashEssentials/UI Drivers/EssentialsPresentationPanelAvFunctionsDriver.cs index 56e2a9fc..76210c08 100644 --- a/PepperDashEssentials/PepperDashEssentials/UI Drivers/EssentialsPresentationPanelAvFunctionsDriver.cs +++ b/PepperDashEssentials/PepperDashEssentials/UI Drivers/EssentialsPresentationPanelAvFunctionsDriver.cs @@ -193,11 +193,11 @@ namespace PepperDash.Essentials TriList.SetSigFalseAction(UIBoolJoin.Display1AudioButtonPressAndFb, Display1AudioPress); TriList.SetSigFalseAction(UIBoolJoin.Display1ControlButtonPress, Display1ControlPress); - TriList.SetSigTrueAction(UIBoolJoin.Display1SelectPress, Display1Press); + TriList.SetSigTrueAction(UIBoolJoin.Display1SelectPressAndFb, Display1Press); TriList.SetSigFalseAction(UIBoolJoin.Display2AudioButtonPressAndFb, Display2AudioPress); TriList.SetSigFalseAction(UIBoolJoin.Display2ControlButtonPress, Display2ControlPress); - TriList.SetSigTrueAction(UIBoolJoin.Display2SelectPress, Display2Press); + TriList.SetSigTrueAction(UIBoolJoin.Display2SelectPressAndFb, Display2Press); } /// @@ -391,16 +391,19 @@ namespace PepperDash.Essentials var localIndex = i; SourcesSrl.GetBoolFeedbackSig(i, 1).UserObject = new Action(b => { + if (b) return; + if (LastSelectedSourceSig != null) + LastSelectedSourceSig.BoolValue = false; + LastSelectedSourceSig = SourcesSrl.BoolInputSig(localIndex, 1); + LastSelectedSourceSig.BoolValue = true; if (IsSharingModeAdvanced) { - if (LastSelectedSourceSig != null) - LastSelectedSourceSig.BoolValue = false; PendingSource = localSrcItem; - LastSelectedSourceSig = SourcesSrl.BoolInputSig(localIndex, 1); - LastSelectedSourceSig.BoolValue = true; } else + { CurrentRoom.DoSourceToAllDestinationsRoute(localSrcItem); + } }); SourcesSrl.StringInputSig(i, 1).StringValue = srcConfig.PreferredName; i++; @@ -420,26 +423,26 @@ namespace PepperDash.Essentials /// void ToggleSharingModePressed() { + if (CurrentSourcePageManager != null) + CurrentSourcePageManager.Hide(); HideCurrentSharingMode(); IsSharingModeAdvanced = !IsSharingModeAdvanced; TriList.BooleanInput[UIBoolJoin.ToggleSharingModePress].BoolValue = IsSharingModeAdvanced; ShowCurrentSharingMode(); } - /// - /// - /// - void EnableAppropriateDisplayButtons() - { - if (LastSelectedSourceSig != null) - LastSelectedSourceSig.BoolValue = false; - } + ///// + ///// + ///// + //void EnableAppropriateDisplayButtons() + //{ + // if (LastSelectedSourceSig != null) + // LastSelectedSourceSig.BoolValue = false; + //} public void Display1Press() { - EnableAppropriateDisplayButtons(); CurrentRoom.SourceToDisplay1(PendingSource); - // Enable end meeting } public void Display1AudioPress() @@ -450,12 +453,12 @@ namespace PepperDash.Essentials public void Display1ControlPress() { - + var uiDev = CurrentRoom.Display1SourceInfo.SourceDevice as IUiDisplayInfo; + ShowSource(uiDev); } public void Display2Press() { - EnableAppropriateDisplayButtons(); CurrentRoom.SourceToDisplay2(PendingSource); } @@ -466,7 +469,8 @@ namespace PepperDash.Essentials public void Display2ControlPress() { - + var uiDev = CurrentRoom.Display2SourceInfo.SourceDevice as IUiDisplayInfo; + ShowSource(uiDev); } /// @@ -597,19 +601,34 @@ namespace PepperDash.Essentials { if (CurrentRoom.CurrentSingleSourceInfo == null) return; - var uiDev = CurrentRoom.CurrentSingleSourceInfo.SourceDevice as IUiDisplayInfo; - PageManager pm = null; + ShowSource(uiDev); + } + + void ShowSource(IUiDisplayInfo uiDev) + { + PageManager pm = null; // If we need a page manager, get an appropriate one if (uiDev != null) { TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false; + if (IsSharingModeAdvanced) + { + TriList.BooleanInput[UIBoolJoin.SourceBackgroundOverlayVisible].BoolValue = true; + TriList.SetSigFalseAction(UIBoolJoin.SourceBackgroundOverlayClosePress, new Action(() => + { + TriList.BooleanInput[UIBoolJoin.SourceBackgroundOverlayVisible].BoolValue = false; + if (CurrentSourcePageManager != null) + CurrentSourcePageManager.Hide(); + })); + } + + // Got an existing page manager, get it if (PageManagers.ContainsKey(uiDev)) pm = PageManagers[uiDev]; // Otherwise make an apporiate one else if (uiDev is ISetTopBoxControls) - //pm = new SetTopBoxMediumPageManager(uiDev as ISetTopBoxControls, TriList); pm = new SetTopBoxThreePanelPageManager(uiDev as ISetTopBoxControls, TriList); else if (uiDev is IDiscPlayerControls) pm = new DiscPlayerMediumPageManager(uiDev as IDiscPlayerControls, TriList); @@ -619,7 +638,7 @@ namespace PepperDash.Essentials CurrentSourcePageManager = pm; pm.Show(); } - } + } /// /// @@ -639,13 +658,13 @@ namespace PepperDash.Essentials "End Meeting Now", "Cancel", time, true, but => { + EndMeetingButtonSig.BoolValue = false; if (but != 2) { CurrentRoom.DoSourceToAllDestinationsRoute(null); } else ShareButtonSig.BoolValue = true; // restore Share fb - EndMeetingButtonSig.BoolValue = false; }); } @@ -745,7 +764,6 @@ namespace PepperDash.Essentials {} // add stuff here else SetupSourceList(); - TriList.StringInput[UIStringJoin.CurrentRoomName].StringValue = _CurrentRoom.Name; // Link up all the change events from the room @@ -762,70 +780,6 @@ namespace PepperDash.Essentials } } - /// - /// For room on/off changes - /// - void _CurrentRoom_OnFeedback_OutputChange(object sender, EventArgs e) - { - var value = _CurrentRoom.OnFeedback.BoolValue; - TriList.BooleanInput[UIBoolJoin.RoomIsOn].BoolValue = value; - if (value) - { - SetupActivityFooterWhenRoomOn(); - TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false; - } - else - { - HideCurrentSharingMode(); - SetupActivityFooterWhenRoomOff(); - TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = true; - } - } - - /// - /// - /// - void _CurrentRoom_CurrentDisplay1SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type) - { - var isSource = info != null; - TriList.BooleanInput[UIBoolJoin.Display1SelectPress].BoolValue = isSource; - if (type == ChangeType.DidChange) - { - TriList.StringInput[UIStringJoin.Display1SourceLabel].StringValue = - isSource ? info.PreferredName : ""; - if (!isSource) - return; - // enable audio and control buttons - var devConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key == info.SourceKey); - TriList.BooleanInput[UIBoolJoin.Display1AudioButtonEnable].BoolValue = - ConfigPropertiesHelpers.GetHasAudio(devConfig); - TriList.BooleanInput[UIBoolJoin.Display1ControlButtonEnable].BoolValue = - ConfigPropertiesHelpers.GetHasControls(devConfig); - } - } - - /// - /// - /// - void _CurrentRoom_CurrentDisplay2SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type) - { - var isSource = info != null; - TriList.BooleanInput[UIBoolJoin.Display2SelectPress].BoolValue = isSource; - if (type == ChangeType.DidChange) - { - TriList.StringInput[UIStringJoin.Display2SourceLabel].StringValue = - isSource ? info.PreferredName : ""; - if (!isSource) - return; - // enable audio and control buttons - var devConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key == info.SourceKey); - TriList.BooleanInput[UIBoolJoin.Display2AudioButtonEnable].BoolValue = - ConfigPropertiesHelpers.GetHasAudio(devConfig); - TriList.BooleanInput[UIBoolJoin.Display2ControlButtonEnable].BoolValue = - ConfigPropertiesHelpers.GetHasControls(devConfig); - } - } - /// /// Hides source for provided source info /// @@ -990,6 +944,43 @@ namespace PepperDash.Essentials RefreshAudioDeviceConnections(); } + /// + /// For room on/off changes + /// + void _CurrentRoom_OnFeedback_OutputChange(object sender, EventArgs e) + { + var value = _CurrentRoom.OnFeedback.BoolValue; + TriList.BooleanInput[UIBoolJoin.RoomIsOn].BoolValue = value; + if (value) + { + SetupActivityFooterWhenRoomOn(); + TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false; + } + else + { + HideCurrentSharingMode(); + SetupActivityFooterWhenRoomOff(); + TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = true; + if (LastSelectedSourceSig != null) + { + LastSelectedSourceSig.BoolValue = false; + LastSelectedSourceSig = null; + } + PendingSource = null; + } + + if (_CurrentRoom.HasAudioDialer) + { + TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = value; + TriList.BooleanInput[UIBoolJoin.VolumeSingleMute1Visible].BoolValue = false; + } + else + { + TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = false; + TriList.BooleanInput[UIBoolJoin.VolumeSingleMute1Visible].BoolValue = value; + } + } + /// /// Handles source change /// @@ -1001,5 +992,50 @@ namespace PepperDash.Essentials else RefreshSourceInfo(); } + + /// + /// + /// + void _CurrentRoom_CurrentDisplay1SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type) + { + if (type == ChangeType.DidChange) + { + var isSource = info != null; + TriList.BooleanInput[UIBoolJoin.Display1SelectPressAndFb].BoolValue = isSource; + TriList.StringInput[UIStringJoin.Display1SourceLabel].StringValue = + isSource ? info.PreferredName : ""; + if (!isSource) + return; + // enable audio and control buttons + var devConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key == info.SourceKey); + TriList.BooleanInput[UIBoolJoin.Display1AudioButtonEnable].BoolValue = + ConfigPropertiesHelpers.GetHasAudio(devConfig); + TriList.BooleanInput[UIBoolJoin.Display1ControlButtonEnable].BoolValue = + ConfigPropertiesHelpers.GetHasControls(devConfig); + } + } + + /// + /// + /// + void _CurrentRoom_CurrentDisplay2SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type) + { + if (type == ChangeType.DidChange) + { + var isSource = info != null; + TriList.BooleanInput[UIBoolJoin.Display2SelectPressAndFb].BoolValue = isSource; + TriList.StringInput[UIStringJoin.Display2SourceLabel].StringValue = + isSource ? info.PreferredName : ""; + if (!isSource) + return; + // enable audio and control buttons + var devConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key == info.SourceKey); + TriList.BooleanInput[UIBoolJoin.Display2AudioButtonEnable].BoolValue = + ConfigPropertiesHelpers.GetHasAudio(devConfig); + TriList.BooleanInput[UIBoolJoin.Display2ControlButtonEnable].BoolValue = + ConfigPropertiesHelpers.GetHasControls(devConfig); + } + } + } } \ No newline at end of file diff --git a/PepperDashEssentials/PepperDashEssentials/UI Drivers/UIJoins.cs b/PepperDashEssentials/PepperDashEssentials/UI Drivers/UIBoolJoin.cs similarity index 54% rename from PepperDashEssentials/PepperDashEssentials/UI Drivers/UIJoins.cs rename to PepperDashEssentials/PepperDashEssentials/UI Drivers/UIBoolJoin.cs index 2f1be68f..396fa0b5 100644 --- a/PepperDashEssentials/PepperDashEssentials/UI Drivers/UIJoins.cs +++ b/PepperDashEssentials/PepperDashEssentials/UI Drivers/UIBoolJoin.cs @@ -8,57 +8,133 @@ using Crestron.SimplSharpPro.DeviceSupport; namespace PepperDash.Essentials { - public class UISmartObjectJoin - { - public const uint StagingListSRL = 3200; - public const uint ActivityFooterSRL = 15022; - } - /// - /// + /// Where all UI element common joins are defined /// public class UIBoolJoin { + /// + /// 901 + /// public const uint VolumeUpPress = 901; + /// + /// 902 + /// public const uint VolumeDownPress = 902; + /// + /// 3811 + /// public const uint VolumeSingleMute1Visible = 3811; + /// + /// 3812 + /// public const uint VolumeSlider1Press = 3812; + /// + /// 3813 + /// public const uint Volume1ProgramMutePressAndFB = 3813; + /// + /// 3871 + /// public const uint VolumeDualMute1Visible = 3871; + /// + /// 3874 + /// public const uint Volume1SpeechMutePressAndFB = 3874; + /// + /// 3875 + /// public const uint Volume1BackerVisibility = 3875; + /// + /// 3821 + /// public const uint Volume2Visible = 3821; + /// + /// 3822 + /// public const uint VolumeSlider2Press = 3822; + /// + /// 3823 + /// public const uint Volume2MutePressAndFB = 3823; + /// + /// 3831 + /// public const uint Volume3Visible = 3831; + /// + /// 3832 + /// public const uint VolumeSlider3Press = 3832; + /// + /// 3833 + /// public const uint Volume3MutePressAndFB = 3833; + /// + /// 3841 + /// public const uint Volume4Visible = 3841; + /// + /// 3842 + /// public const uint VolumeSlider4Press = 3842; + /// + /// 3843 + /// public const uint Volume4MutePressAndFB = 3843; + /// + /// 3851 + /// public const uint Volume5Visible = 3851; + /// + /// 3852 + /// public const uint VolumeSlider5Press = 3852; + /// + /// 3853 + /// public const uint Volume5MutePressAndFB = 3853; + /// + /// 3861 + /// public const uint Volume6Visible = 3861; + /// + /// 3862 + /// public const uint VolumeSlider6Press = 3862; + /// + /// 3863 + /// public const uint Volume6MutePressAndFB = 3863; /// /// 3870 /// public const uint VolumesPageVisible = 3870; - + /// + /// 3999 + /// public const uint GenericModalVisible = 3999; - + /// + /// 12345 + /// public const uint AvNoControlsSubVisible = 12345; + /// + /// 15001 + /// public const uint StartPageVisible = 15001; /// /// 15002 Shows the start page in the source controls area of the screen /// public const uint TapToBeginVisible = 15002; + /// + /// 15003 Message text when no source is showing + /// public const uint SelectASourceVisible = 15003; + /// + /// 15004 + /// public const uint RoomIsOn = 15004; /// /// 15005 Shows always-on volume control subpage with only audio mute @@ -68,21 +144,69 @@ namespace PepperDash.Essentials /// 15006 Shows always-on volume control subpage with mic and audio mutes /// public const uint VolumeControlsDualMuteVisible = 15006; + /// + /// 15010 + /// public const uint ShowPanelSetupPress = 15010; + /// + /// 15011 + /// public const uint TopBarVisible = 15011; + /// + /// 15012 + /// public const uint StagingPageVisible = 15012; + /// + /// 15013 + /// public const uint PowerOffStep1Visible = 15013; + /// + /// 15014 + /// public const uint PowerOffStep2Visible = 15014; + /// + /// 15015 + /// public const uint ShowPowerOffPress = 15015; + /// + /// 15016 + /// public const uint PowerOffMorePress = 15016; + /// + /// 15017 + /// public const uint StagingPageAdditionalArrowsVisible = 15017; + /// + /// 15020 + /// public const uint PanelSetupVisible = 15020; + /// + /// 15021 + /// public const uint SourceWaitOverlayVisible = 15021; + /// + /// 15022 + /// public const uint ActivityFooterVisible = 15022; + /// + /// 15023 + /// public const uint LightsHeaderButtonVisible = 15023; + /// + /// 15024 + /// public const uint CallRightHeaderButtonVisible = 15024; + /// + /// 15025 + /// public const uint CallLeftHeaderButtonVisible = 15025; + /// + /// 15026 + /// public const uint LightsHeaderButtonPress = 15026; + /// + /// 15027 + /// public const uint CallHeaderButtonPress = 15027; /// /// 15028 The gear button in header @@ -96,40 +220,110 @@ namespace PepperDash.Essentials /// 15030 Visibility for room data popup /// public const uint RoomHeaderPageVisible = 15030; + /// + /// 15031 + /// public const uint AllRoomsOffPress = 15031; + /// + /// 15032 + /// public const uint DisplayPowerTogglePress = 15032; + /// + /// 15033 + /// public const uint PowerOffCancelPress = 15033; + /// + /// 15034 + /// public const uint PowerOffConfirmPress = 15034; + /// + /// 15035 + /// public const uint VolumeButtonPopupPress = 15035; + /// + /// 15035 + /// public const uint VolumeButtonPopupVisible = 15035; + /// + /// 15036 + /// public const uint VolumeGaugePopupVisible = 15036; + /// + /// 15040 + /// public const uint CallStatusPageVisible = 15040; + /// + /// 15041 + /// public const uint LightsPageVisible = 15041; /// /// 15042 Closes whichever interlocked modal is open /// public const uint InterlockedModalClosePress = 15042; + /// + /// 15043 Vis for modal backer for full-screen source + /// + public const uint SourceBackgroundOverlayVisible = 15043; + /// + /// 15044 Close button for source modal overlay + /// + public const uint SourceBackgroundOverlayClosePress = 15044; - public const uint Display1SelectPress = 15051; + + /// + /// 15051 + /// + public const uint Display1SelectPressAndFb = 15051; + /// + /// 15052 + /// public const uint Display1ControlButtonEnable = 15052; + /// + /// 15053 + /// public const uint Display1ControlButtonPress = 15053; + /// + /// 15054 + /// public const uint Display1AudioButtonEnable = 15054; + /// + /// 15055 + /// public const uint Display1AudioButtonPressAndFb = 15055; - public const uint Display2SelectPress = 15056; + /// + /// 15056 + /// + public const uint Display2SelectPressAndFb = 15056; + /// + /// 15057 + /// public const uint Display2ControlButtonEnable = 15057; + /// + /// 15058 + /// public const uint Display2ControlButtonPress = 15058; + /// + /// 15059 + /// public const uint Display2AudioButtonEnable = 15059; + /// + /// 15060 + /// public const uint Display2AudioButtonPressAndFb = 15060; /// /// 15061 Reveals the dual-display subpage /// public const uint DualDisplayPageVisible = 15061; + /// + /// 15062 Reveals the toggle switch for the sharing mode + /// public const uint ToggleSharingModeVisible = 15062; + /// + /// 15063 Press for the toggle mode switch + /// public const uint ToggleSharingModePress = 15063; - - /// /// 15085 Visibility join for help subpage /// @@ -139,63 +333,21 @@ namespace PepperDash.Essentials /// public const uint HelpPress = 15086; + /// + /// 15088 + /// public const uint DateOnlyVisible = 15088; + /// + /// 15089 + /// public const uint TimeOnlyVisible = 15089; + /// + /// 15090 + /// public const uint DateAndTimeVisible = 15090; + /// + /// 15091 + /// public const uint SetupFullDistrib = 15091; } - - /// - /// - /// - public class UIUshortJoin - { - //public const uint VolumeLevel = 3812; - public const uint VolumeSlider1Value = 3812; - public const uint VolumeSlider2Value = 3822; - public const uint VolumeSlider3Value = 3832; - public const uint VolumeSlider4Value = 3842; - public const uint VolumeSlider5Value = 3852; - public const uint VolumeSlider6Value = 3862; - - public const uint PresentationListCaretMode = 3922; - } - - /// - /// - /// - public class UIStringJoin - { - public const uint AdvancedVolumeSlider1Text = 3812; - public const uint AdvancedVolumeSlider2Text = 3822; - public const uint AdvancedVolumeSlider3Text = 3832; - public const uint AdvancedVolumeSlider4Text = 3842; - public const uint AdvancedVolumeSlider5Text = 3852; - public const uint AdvancedVolumeSlider6Text = 3862; - - public const uint CurrentRoomName = 3901; - public const uint CurrentSourceName = 3902; - public const uint CurrentSourceIcon = 3903; - public const uint PowerOffMessage = 3911; - public const uint StartPageMessage = 3912; - public const uint StartActivityText = 3913; - public const uint HelpMessage = 3922; - - /// - /// 3961 Name of source on display 1 - /// - public const uint Display1SourceLabel = 3961; - /// - /// 3962 Title above display 1 - /// - public const uint Display1TitleLabel = 3962; - /// - /// 3964 Name of source on display 2 - /// - public const uint Display2SourceLabel = 3964; - /// - /// 3965 Title above display 2 - /// - public const uint Display2TitleLabel = 3965; - } } \ No newline at end of file diff --git a/PepperDashEssentials/PepperDashEssentials/UI Drivers/UISmartObjectJoin.cs b/PepperDashEssentials/PepperDashEssentials/UI Drivers/UISmartObjectJoin.cs new file mode 100644 index 00000000..cc2e83c9 --- /dev/null +++ b/PepperDashEssentials/PepperDashEssentials/UI Drivers/UISmartObjectJoin.cs @@ -0,0 +1,14 @@ +namespace PepperDash.Essentials +{ + public class UISmartObjectJoin + { + /// + /// 3200 The staging, source-select list + /// + public const uint StagingListSRL = 3200; + /// + /// 15022 The main activity footer + /// + public const uint ActivityFooterSRL = 15022; + } +} \ No newline at end of file diff --git a/PepperDashEssentials/PepperDashEssentials/UI Drivers/UIStringlJoin.cs b/PepperDashEssentials/PepperDashEssentials/UI Drivers/UIStringlJoin.cs new file mode 100644 index 00000000..59be1d58 --- /dev/null +++ b/PepperDashEssentials/PepperDashEssentials/UI Drivers/UIStringlJoin.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Crestron.SimplSharp; +using Crestron.SimplSharpPro; +using Crestron.SimplSharpPro.DeviceSupport; + +namespace PepperDash.Essentials +{ + /// + /// + /// + public class UIStringJoin + { + /// + /// 3812 + /// + public const uint AdvancedVolumeSlider1Text = 3812; + /// + /// 3822 + /// + public const uint AdvancedVolumeSlider2Text = 3822; + /// + /// 3832 + /// + public const uint AdvancedVolumeSlider3Text = 3832; + /// + /// 3842 + /// + public const uint AdvancedVolumeSlider4Text = 3842; + /// + /// 3852 + /// + public const uint AdvancedVolumeSlider5Text = 3852; + /// + /// 3862 + /// + public const uint AdvancedVolumeSlider6Text = 3862; + + /// + /// 3901 + /// + public const uint CurrentRoomName = 3901; + /// + /// 3902 + /// + public const uint CurrentSourceName = 3902; + /// + /// 3903 + /// + public const uint CurrentSourceIcon = 3903; + /// + /// 3911 + /// + public const uint PowerOffMessage = 3911; + /// + /// 3912 + /// + public const uint StartPageMessage = 3912; + /// + /// 3913 + /// + public const uint StartActivityText = 3913; + /// + /// 3914 Title bar label for source overlay + /// + public const uint SourceBackgroundOverlayTitle = 3914; + + /// + /// 3922 + /// + public const uint HelpMessage = 3922; + + /// + /// 3961 Name of source on display 1 + /// + public const uint Display1SourceLabel = 3961; + /// + /// 3962 Title above display 1 + /// + public const uint Display1TitleLabel = 3962; + /// + /// 3964 Name of source on display 2 + /// + public const uint Display2SourceLabel = 3964; + /// + /// 3965 Title above display 2 + /// + public const uint Display2TitleLabel = 3965; + } +} \ No newline at end of file diff --git a/PepperDashEssentials/PepperDashEssentials/UI Drivers/UIUshortJoin.cs b/PepperDashEssentials/PepperDashEssentials/UI Drivers/UIUshortJoin.cs new file mode 100644 index 00000000..1d37dca4 --- /dev/null +++ b/PepperDashEssentials/PepperDashEssentials/UI Drivers/UIUshortJoin.cs @@ -0,0 +1,38 @@ +namespace PepperDash.Essentials +{ + /// + /// + /// + public class UIUshortJoin + { + /// + /// 3812 + /// + public const uint VolumeSlider1Value = 3812; + /// + /// 3822 + /// + public const uint VolumeSlider2Value = 3822; + /// + /// 3832 + /// + public const uint VolumeSlider3Value = 3832; + /// + /// 3842 + /// + public const uint VolumeSlider4Value = 3842; + /// + /// 3852 + /// + public const uint VolumeSlider5Value = 3852; + /// + /// 3862 + /// + public const uint VolumeSlider6Value = 3862; + + /// + /// 3922 + /// + public const uint PresentationListCaretMode = 3922; + } +} \ No newline at end of file diff --git a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.cpz b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.cpz index 7a394535..37b2bc1e 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.cpz and b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.cpz differ diff --git a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.dll b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.dll index 9fbcbe04..2c967344 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.dll and b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.dll differ diff --git a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.pdb b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.pdb index 5e627c2c..2b67b061 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.pdb and b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.pdb differ diff --git a/PepperDashEssentials/PepperDashEssentials/bin/PepperDash_Essentials_Core.dll b/PepperDashEssentials/PepperDashEssentials/bin/PepperDash_Essentials_Core.dll index 596552e5..3e2ee042 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/bin/PepperDash_Essentials_Core.dll and b/PepperDashEssentials/PepperDashEssentials/bin/PepperDash_Essentials_Core.dll differ diff --git a/PepperDashEssentials/PepperDashEssentials/bin/ProgramInfo.config b/PepperDashEssentials/PepperDashEssentials/bin/ProgramInfo.config index 0059dd8d..311c4dfd 100644 --- a/PepperDashEssentials/PepperDashEssentials/bin/ProgramInfo.config +++ b/PepperDashEssentials/PepperDashEssentials/bin/ProgramInfo.config @@ -10,8 +10,8 @@ - 2/21/2017 4:26:38 PM - 1.0.0.29597 + 2/23/2017 11:24:45 AM + 1.0.0.20541 Crestron.SIMPLSharp, Version=2.0.48.0, Culture=neutral, PublicKeyToken=812d080f93e2de10 diff --git a/PepperDashEssentials/PepperDashEssentials/bin/manifest.info b/PepperDashEssentials/PepperDashEssentials/bin/manifest.info index 50bf557e..051d7bbf 100644 --- a/PepperDashEssentials/PepperDashEssentials/bin/manifest.info +++ b/PepperDashEssentials/PepperDashEssentials/bin/manifest.info @@ -1,4 +1,4 @@ -MainAssembly=PepperDashEssentials.dll:b4fc9364cff33bfd2015356e1d0ff2f8 +MainAssembly=PepperDashEssentials.dll:0d60b85cbb6551a8c8fe5c704ca1a92c MainAssemblyMinFirmwareVersion=1.009.0029 MainAssemblyResource=SimplSharpData.dat:820b61c48c8a2cace82957eed4cc377c ü @@ -46,9 +46,9 @@ DependencySource=PepperDash_Core.dll:f8093aacbe4fa6cef78b7af4d978e897 DependencyPath=PepperDashEssentials.cpz:PepperDash_Core.dll DependencyMainAssembly=PepperDash_Core.dll:f8093aacbe4fa6cef78b7af4d978e897 ü -DependencySource=PepperDash_Essentials_Core.dll:256362de10256ebe743008bc9415648e +DependencySource=PepperDash_Essentials_Core.dll:34edba3e9b5cccd09cff7384b96d4aba DependencyPath=PepperDashEssentials.cpz:PepperDash_Essentials_Core.dll -DependencyMainAssembly=PepperDash_Essentials_Core.dll:256362de10256ebe743008bc9415648e +DependencyMainAssembly=PepperDash_Essentials_Core.dll:34edba3e9b5cccd09cff7384b96d4aba ü DependencySource=PepperDash_Essentials_Displays.dll:3135ef6b8f66b5b1bc5223aad3ef66e0 DependencyPath=PepperDashEssentials.cpz:PepperDash_Essentials_Displays.dll diff --git a/PepperDashEssentials/PepperDashEssentials/bin/manifest.ser b/PepperDashEssentials/PepperDashEssentials/bin/manifest.ser index c6f51c6e..e2048336 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/bin/manifest.ser and b/PepperDashEssentials/PepperDashEssentials/bin/manifest.ser differ diff --git a/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.dll b/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.dll index 9a9a8dd5..1d8d9b34 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.dll and b/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.dll differ diff --git a/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.pdb b/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.pdb index 1c642199..b6a5e01c 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.pdb and b/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.pdb differ diff --git a/PepperDashEssentials/PepperDashEssentials/obj/Debug/ResolveAssemblyReference.cache b/PepperDashEssentials/PepperDashEssentials/obj/Debug/ResolveAssemblyReference.cache index c731fe79..01142c15 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/obj/Debug/ResolveAssemblyReference.cache and b/PepperDashEssentials/PepperDashEssentials/obj/Debug/ResolveAssemblyReference.cache differ