提交 4340a934 authored 作者: Mitch Capper's avatar Mitch Capper

Prevent focusing on accounts box, added option to sofia failure to retry right…

Prevent focusing on accounts box, added option to sofia failure to retry right then, increment version, prevent crash for enabling an account in options
上级 9aa5eda9
......@@ -166,7 +166,7 @@
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Foreground="{DynamicResource GridTitleFGColor}" Text="Accounts" Margin="5,0,0,0" FontWeight="Bold" FontSize="13.333" Background="{DynamicResource GridTitleBGColor}" />
<Button x:Name="btnAccountAdd" Grid.Row="0" Content="Add" HorizontalAlignment="Right" Height="18" AutomationProperties.Name="Add New Account" TabIndex="80" Click="btnAccountAdd_Click" FontSize="11" />
<ItemsControl Name="itemsAccounts" Grid.Row="1" Background="{DynamicResource GridBodyBGColor}" Foreground="{DynamicResource RowFGColor}" BorderBrush="{DynamicResource GridBorderColor}" AlternationCount="2" AutomationProperties.Name="Accounts List" TabIndex="100">
<ItemsControl Name="itemsAccounts" Grid.Row="1" Background="{DynamicResource GridBodyBGColor}" Foreground="{DynamicResource RowFGColor}" BorderBrush="{DynamicResource GridBorderColor}" AlternationCount="2" AutomationProperties.Name="Accounts List" TabIndex="100" IsTabStop="False">
<ItemsControl.ContextMenu>
<ContextMenu>
<MenuItem Header="Add Account" Click="AccountNew_Click" Name="menuAccountNew" />
......@@ -184,7 +184,7 @@
</ContextMenu>
</StackPanel.ContextMenu>
<TextBlock Text="{Binding gateway_id}" Width="10" Margin="2,2" />
<CheckBox IsChecked="{Binding enabled, Mode=OneWay}" Margin="2,2" Name="AccountCheckBox" Checked="AccountCheckBox_Checked" Unchecked="AccountCheckBox_Checked">
<CheckBox IsChecked="{Binding enabled, Mode=TwoWay}" Margin="2,2" Name="AccountCheckBox" Checked="AccountCheckBox_Checked" Unchecked="AccountCheckBox_Checked">
<AutomationProperties.Name>
<MultiBinding StringFormat="Account {0} State: {1}">
<Binding Path="name" />
......
......@@ -902,7 +902,6 @@ namespace FSClient {
if (!broker.fully_loaded)
return;
Account account = ((FrameworkElement)e.OriginalSource).DataContext as Account;
account.enabled = !account.enabled;
account.ReloadAccount();
}
}
......
......@@ -51,5 +51,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0.9")]
[assembly: AssemblyFileVersion("1.2.0.9")]
[assembly: AssemblyVersion("1.2.3.1")]
[assembly: AssemblyFileVersion("1.2.3.1")]
......@@ -172,8 +172,10 @@ namespace FSClient {
String tls_port_msg = "";
if (FieldValue.GetByName(values, "tls").value == "true")
tls_port_msg += " and tls bind port (" + FieldValue.GetByName(values, "tls-sip-port").value + ")";
MessageBox.Show("Warning the master sofia profile was not able to load and the phone will most likely _not_ work, make sure the local bind port (" + FieldValue.GetByName(values, "sip-port").value + ")" + tls_port_msg + " is free(set under the Advanced tab of in the sofia settings) and FSClient is allowed through your firewall, otherwise check the freeswitch.log for more details. You can try reloading the sofia profile by editing the sofia settings and clicking save to see if fixed.");
var message_res = MessageBox.Show("Warning the master sofia profile was not able to load and the phone will most likely _not_ work, make sure the local bind port (" + FieldValue.GetByName(values, "sip-port").value + ")" + tls_port_msg + " is free(set under the Advanced tab of in the sofia settings) and FSClient is allowed through your firewall, otherwise check the freeswitch.log for more details. This can sometimes happen when you lose network connection. You can try reloading the sofia profile by editing the sofia settings and clicking save to see if fixed. Do you want to try and reload sofia now?","Sofia Profile Not Loaded",MessageBoxButton.YesNo);
master_profile_ok = false;
if (message_res == MessageBoxResult.Yes)
reload_config(RELOAD_CONFIG_MODE.HARD);
return false;
}
if (res.Contains("<context>public</context>") == false){
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑!
请 注册 或者 后发表评论