提交 6eaf4a00 authored 作者: Mitch Capper's avatar Mitch Capper

Added check voicemail to right click on accounts, fixed right click xfer for incoming call bubbles

上级 2c9d7b11
...@@ -199,6 +199,14 @@ namespace FSClient { ...@@ -199,6 +199,14 @@ namespace FSClient {
state = "NOREG"; state = "NOREG";
} }
private static Regex sip_regex; private static Regex sip_regex;
public void CheckVoicemail(){
String url = getCheckVoicemailURL();
if (String.IsNullOrWhiteSpace(url)){
MessageBox.Show("No url specified to check voicemail, edit account first.");
return;
}
CreateCall(getCheckVoicemailURL());
}
public void CreateCall(String number) { public void CreateCall(String number) {
if (!enabled) if (!enabled)
return; return;
......
...@@ -72,9 +72,10 @@ namespace FSClient { ...@@ -72,9 +72,10 @@ namespace FSClient {
private void XFERContextMenuOpened(object sender, RoutedEventArgs e){ private void XFERContextMenuOpened(object sender, RoutedEventArgs e){
ContextMenu menu = sender as ContextMenu; ContextMenu menu = sender as ContextMenu;
Call call = menu.DataContext as Call;
menu.Items.Clear(); menu.Items.Clear();
if (XFERMenuOpenedHandler != null) if (XFERMenuOpenedHandler != null)
XFERMenuOpenedHandler(Call.active_call, menu); XFERMenuOpenedHandler(call == null ? Call.active_call : call, menu);
} }
private void init_us() { private void init_us() {
......
...@@ -29,6 +29,7 @@ namespace FSClient { ...@@ -29,6 +29,7 @@ namespace FSClient {
call.PropertyChanged += prop_changed; call.PropertyChanged += prop_changed;
btnSendVoicemail.Visibility = call.CanSendToVoicemail() ? Visibility.Visible : Visibility.Hidden; btnSendVoicemail.Visibility = call.CanSendToVoicemail() ? Visibility.Visible : Visibility.Hidden;
btnTransfer.ContextMenu = Broker.get_instance().XFERContextMenu(); btnTransfer.ContextMenu = Broker.get_instance().XFERContextMenu();
btnTransfer.DataContext = call;
if (Broker.get_instance().IncomingKeyboardFocus) if (Broker.get_instance().IncomingKeyboardFocus)
DelayedFunction.DelayedCall("BubbleTop", MakeUsTop, 500); DelayedFunction.DelayedCall("BubbleTop", MakeUsTop, 500);
Show(); Show();
......
...@@ -177,6 +177,7 @@ ...@@ -177,6 +177,7 @@
<StackPanel Orientation="Horizontal" Name="AccountStackPanel" Margin="2,1"> <StackPanel Orientation="Horizontal" Name="AccountStackPanel" Margin="2,1">
<StackPanel.ContextMenu> <StackPanel.ContextMenu>
<ContextMenu> <ContextMenu>
<MenuItem Header="Check Voicemail" Click="AccountCheckVoicemail_Click"/>
<MenuItem Header="Set Default Account" Click="AccountSetDefault_Click"/> <MenuItem Header="Set Default Account" Click="AccountSetDefault_Click"/>
<MenuItem Header="Edit Account" Click="AccountEdit_Click"/> <MenuItem Header="Edit Account" Click="AccountEdit_Click"/>
<MenuItem Header="Delete Account" Click="AccountDelete_Click"/> <MenuItem Header="Delete Account" Click="AccountDelete_Click"/>
......
...@@ -922,5 +922,12 @@ namespace FSClient { ...@@ -922,5 +922,12 @@ namespace FSClient {
Account account = ((FrameworkElement)e.OriginalSource).DataContext as Account; Account account = ((FrameworkElement)e.OriginalSource).DataContext as Account;
account.ReloadAccount(); account.ReloadAccount();
} }
private void AccountCheckVoicemail_Click(object sender, RoutedEventArgs e) {
if (!broker.fully_loaded)
return;
Account account = ((FrameworkElement)e.OriginalSource).DataContext as Account;
account.CheckVoicemail();
}
} }
} }
...@@ -51,5 +51,5 @@ using System.Windows; ...@@ -51,5 +51,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.3.3")] [assembly: AssemblyVersion("1.2.3.4")]
[assembly: AssemblyFileVersion("1.2.3.3")] [assembly: AssemblyFileVersion("1.2.3.4")]
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑!
请 注册 或者 后发表评论