mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-02-16 13:15:03 +00:00
Notification ribbon; keyboard touchups
This commit is contained in:
@@ -545,6 +545,10 @@ namespace PepperDash.Essentials
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public const uint HeaderActiveCallsListVisible = 15066;
|
public const uint HeaderActiveCallsListVisible = 15066;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
/// 15067
|
||||||
|
/// </summary>
|
||||||
|
public const uint NotificationRibbonVisible = 15067;
|
||||||
|
/// <summary>
|
||||||
/// 15083 - Press for Call help desk on AC/VC
|
/// 15083 - Press for Call help desk on AC/VC
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public const uint HelpPageShowCallButtonPress = 15083;
|
public const uint HelpPageShowCallButtonPress = 15083;
|
||||||
|
|||||||
@@ -94,6 +94,11 @@ namespace PepperDash.Essentials
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public const uint SourceBackgroundOverlayTitle = 3914;
|
public const uint SourceBackgroundOverlayTitle = 3914;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 3915
|
||||||
|
/// </summary>
|
||||||
|
public const uint NotificationRibbonText = 3915;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 3922
|
/// 3922
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -125,6 +125,8 @@ namespace PepperDash.Essentials
|
|||||||
|
|
||||||
PepperDash.Essentials.UIDrivers.VC.EssentialsVideoCodecUiDriver VCDriver;
|
PepperDash.Essentials.UIDrivers.VC.EssentialsVideoCodecUiDriver VCDriver;
|
||||||
|
|
||||||
|
CTimer RibbonTimer;
|
||||||
|
|
||||||
public PepperDash.Essentials.Core.Touchpanels.Keyboards.HabaneroKeyboardController Keyboard { get; private set; }
|
public PepperDash.Essentials.Core.Touchpanels.Keyboards.HabaneroKeyboardController Keyboard { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -342,6 +344,39 @@ namespace PepperDash.Essentials
|
|||||||
base.Hide();
|
base.Hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Reveals a message on the notification ribbon until cleared
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="message">Text to display</param>
|
||||||
|
/// <param name="timeout">Time in ms to display. 0 to keep on screen</param>
|
||||||
|
public void ShowNotificationRibbon(string message, int timeout)
|
||||||
|
{
|
||||||
|
TriList.SetString(UIStringJoin.NotificationRibbonText, message);
|
||||||
|
TriList.SetBool(UIBoolJoin.NotificationRibbonVisible, true);
|
||||||
|
if (timeout > 0)
|
||||||
|
{
|
||||||
|
if (RibbonTimer != null)
|
||||||
|
RibbonTimer.Stop();
|
||||||
|
RibbonTimer = new CTimer(o => {
|
||||||
|
TriList.SetBool(UIBoolJoin.NotificationRibbonVisible, false);
|
||||||
|
RibbonTimer = null;
|
||||||
|
}, timeout);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Hides the notification ribbon
|
||||||
|
/// </summary>
|
||||||
|
public void HideNotificationRibbon()
|
||||||
|
{
|
||||||
|
TriList.SetBool(UIBoolJoin.NotificationRibbonVisible, false);
|
||||||
|
if (RibbonTimer != null)
|
||||||
|
{
|
||||||
|
RibbonTimer.Stop();
|
||||||
|
RibbonTimer = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// When the room is off, set the footer SRL
|
/// When the room is off, set the footer SRL
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -952,5 +987,7 @@ namespace PepperDash.Essentials
|
|||||||
{
|
{
|
||||||
PepperDash.Essentials.Core.Touchpanels.Keyboards.HabaneroKeyboardController Keyboard { get; }
|
PepperDash.Essentials.Core.Touchpanels.Keyboards.HabaneroKeyboardController Keyboard { get; }
|
||||||
JoinedSigInterlock PopupInterlock { get; }
|
JoinedSigInterlock PopupInterlock { get; }
|
||||||
|
void ShowNotificationRibbon(string message, int timeout);
|
||||||
|
void HideNotificationRibbon();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -131,13 +131,16 @@ namespace PepperDash.Essentials.UIDrivers.VC
|
|||||||
DialStringBuilder.Remove(0, DialStringBuilder.Length);
|
DialStringBuilder.Remove(0, DialStringBuilder.Length);
|
||||||
DialStringFeedback.FireUpdate();
|
DialStringFeedback.FireUpdate();
|
||||||
TriList.SetBool(UIBoolJoin.VCKeypadBackspaceVisible, false);
|
TriList.SetBool(UIBoolJoin.VCKeypadBackspaceVisible, false);
|
||||||
|
Parent.ShowNotificationRibbon("Connected", 2000);
|
||||||
break;
|
break;
|
||||||
case eCodecCallStatus.Connecting:
|
case eCodecCallStatus.Connecting:
|
||||||
// fire at SRL item
|
// fire at SRL item
|
||||||
Debug.Console(1, "*#* UI: Call Connecting {0}", call.Name);
|
Debug.Console(1, "*#* UI: Call Connecting {0}", call.Name);
|
||||||
|
Parent.ShowNotificationRibbon("Connecting", 0);
|
||||||
break;
|
break;
|
||||||
case eCodecCallStatus.Dialing:
|
case eCodecCallStatus.Dialing:
|
||||||
Debug.Console(1, "*#* UI: Call Dialing {0}", call.Name);
|
Debug.Console(1, "*#* UI: Call Dialing {0}", call.Name);
|
||||||
|
Parent.ShowNotificationRibbon("Dialing", 0);
|
||||||
break;
|
break;
|
||||||
case eCodecCallStatus.Disconnected:
|
case eCodecCallStatus.Disconnected:
|
||||||
Debug.Console(1, "*#* UI: Call Disconnecting {0}", call.Name);
|
Debug.Console(1, "*#* UI: Call Disconnecting {0}", call.Name);
|
||||||
@@ -146,6 +149,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
|
|||||||
KeypadMode = eKeypadMode.Dial;
|
KeypadMode = eKeypadMode.Dial;
|
||||||
DialStringBuilder.Remove(0, DialStringBuilder.Length);
|
DialStringBuilder.Remove(0, DialStringBuilder.Length);
|
||||||
DialStringFeedback.FireUpdate();
|
DialStringFeedback.FireUpdate();
|
||||||
|
Parent.ShowNotificationRibbon("Disonnected", 2000);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case eCodecCallStatus.Disconnecting:
|
case eCodecCallStatus.Disconnecting:
|
||||||
@@ -243,6 +247,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
|
|||||||
{
|
{
|
||||||
VCControlsInterlock.Show();
|
VCControlsInterlock.Show();
|
||||||
StagingBarInterlock.Show();
|
StagingBarInterlock.Show();
|
||||||
|
DialStringFeedback.FireUpdate();
|
||||||
base.Show();
|
base.Show();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -373,24 +378,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
|
|||||||
VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCDirectoryVisible);
|
VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCDirectoryVisible);
|
||||||
StagingButtonFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingDirectoryPress);
|
StagingButtonFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingDirectoryPress);
|
||||||
|
|
||||||
TriList.SetSigFalseAction(UIBoolJoin.CodecDirectorySearchTextPress, () =>
|
|
||||||
{
|
|
||||||
var kb = Parent.Keyboard;
|
|
||||||
kb.OutputFeedback.OutputChange += new EventHandler<EventArgs>(DirectoryKeyboardChange);
|
|
||||||
kb.HideAction += () =>
|
|
||||||
{
|
|
||||||
kb.OutputFeedback.OutputChange -= DirectoryKeyboardChange;
|
|
||||||
};
|
|
||||||
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
///
|
|
||||||
/// </summary>
|
|
||||||
void DirectoryKeyboardChange(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ShowRecents()
|
void ShowRecents()
|
||||||
@@ -470,6 +457,10 @@ namespace PepperDash.Essentials.UIDrivers.VC
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
string GetFormattedDialString(string ds)
|
string GetFormattedDialString(string ds)
|
||||||
{
|
{
|
||||||
|
if (DialStringBuilder.Length == 0 && !Codec.IsInCall)
|
||||||
|
{
|
||||||
|
return "Dial or touch to enter address";
|
||||||
|
}
|
||||||
if(Regex.Match(ds, @"^\d{4,7}$").Success) // 456-7890
|
if(Regex.Match(ds, @"^\d{4,7}$").Success) // 456-7890
|
||||||
return string.Format("{0}-{1}", ds.Substring(0, 3), ds.Substring(3));
|
return string.Format("{0}-{1}", ds.Substring(0, 3), ds.Substring(3));
|
||||||
if (Regex.Match(ds, @"^9\d{4,7}$").Success) // 456-7890
|
if (Regex.Match(ds, @"^9\d{4,7}$").Success) // 456-7890
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user