提交 aad20cb8 authored 作者: Mitch Capper's avatar Mitch Capper

I cannot spell the word balloons.

上级 2ce0326f
......@@ -46,7 +46,7 @@ namespace FSClient {
Account.LoadSettings();
IncomingBallons = Properties.Settings.Default.IncomingBallons;
IncomingBalloons = Properties.Settings.Default.IncomingBalloons;
IncomingTopMost = Properties.Settings.Default.FrontOnIncoming;
ClearDTMFS = Properties.Settings.Default.ClearDTMFS;
UseNumberOnlyInput = Properties.Settings.Default.UseNumberOnlyInput;
......@@ -306,7 +306,7 @@ namespace FSClient {
try {
SaveAudioSettings();
Account.SaveSettings();
Properties.Settings.Default.IncomingBallons = IncomingBallons;
Properties.Settings.Default.IncomingBalloons = IncomingBalloons;
Properties.Settings.Default.FrontOnIncoming = IncomingTopMost;
Properties.Settings.Default.ClearDTMFS = ClearDTMFS;
Properties.Settings.Default.UseNumberOnlyInput = UseNumberOnlyInput;
......@@ -389,7 +389,7 @@ namespace FSClient {
if (IncomingTopMost) {
MainWindow.get_instance().BringToFront();
}
if (IncomingBallons && !DND) {
if (IncomingBalloons && !DND) {
IncomingCallNotification.ShowCallNotification(args.call);
if (Call.active_call != args.call && Call.active_call != null)
HandleCallWaiting(null, args.call);
......@@ -404,7 +404,7 @@ namespace FSClient {
}
#region properties
public bool IncomingBallons;
public bool IncomingBalloons;
public bool IncomingTopMost;
public bool UseNumberOnlyInput {
......
......@@ -45,7 +45,7 @@
<ComboBox Height="23" Grid.Row="6" Grid.Column="1" Name="comboRingDevice" Width="340" />
<StackPanel Grid.Row="7" Grid.Column="1" Grid.RowSpan="3">
<CheckBox x:Name="chkIncomingFront" Content="Bring To Front On Incoming Calls" VerticalAlignment="Center" FontWeight="Bold" FontSize="13.333" />
<CheckBox x:Name="chkIncomingBallons" Content="Show Incoming Call Notification Ballons" VerticalAlignment="Center" FontWeight="Bold" FontSize="13.333" />
<CheckBox x:Name="chkIncomingBalloons" Content="Show Incoming Call Notification Balloons" VerticalAlignment="Center" FontWeight="Bold" FontSize="13.333" />
<CheckBox x:Name="chkClearDTMFS" Content="Clear Key Presses In Call Stats On Disconnect" VerticalAlignment="Center" FontWeight="Bold" FontSize="13.333" />
<CheckBox x:Name="chkUseNumbers" Content="Only Allow Numerical Input While Dialing" VerticalAlignment="Center" FontWeight="Bold" FontSize="13.333" />
</StackPanel>
......
......@@ -31,7 +31,7 @@ namespace FSClient {
comboSpeakerInput.SelectedItem = broker.SpeakerInDev;
comboSpeakerOutput.SelectedItem = broker.SpeakerOutDev;
comboRingDevice.SelectedItem = broker.RingDev;
chkIncomingBallons.IsChecked = broker.IncomingBallons;
chkIncomingBalloons.IsChecked = broker.IncomingBalloons;
chkIncomingFront.IsChecked = broker.IncomingTopMost;
chkClearDTMFS.IsChecked = broker.ClearDTMFS;
chkUseNumbers.IsChecked = broker.UseNumberOnlyInput;
......@@ -51,7 +51,7 @@ namespace FSClient {
broker.SetSpeakerDevs(indev == null ? "" : indev.name, outdev == null ? "" : outdev.name);
outdev = comboRingDevice.SelectedItem as PortAudio.AudioDevice;
broker.SetRingDev(outdev == null ? "" : outdev.name);
broker.IncomingBallons = chkIncomingBallons.IsChecked == true;
broker.IncomingBalloons = chkIncomingBalloons.IsChecked == true;
broker.IncomingTopMost = chkIncomingFront.IsChecked == true;
broker.ClearDTMFS = chkClearDTMFS.IsChecked == true;
broker.UseNumberOnlyInput = chkUseNumbers.IsChecked == true;
......
......@@ -120,12 +120,12 @@ namespace FSClient.Properties {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool IncomingBallons {
public bool IncomingBalloons {
get {
return ((bool)(this["IncomingBallons"]));
return ((bool)(this["IncomingBalloons"]));
}
set {
this["IncomingBallons"] = value;
this["IncomingBalloons"] = value;
}
}
......
......@@ -26,7 +26,7 @@
<Setting Name="FrontOnIncoming" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="IncomingBallons" Type="System.Boolean" Scope="User">
<Setting Name="IncomingBalloons" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="HeadsetDevice" Type="System.String" Scope="User">
......
......@@ -127,8 +127,8 @@ namespace FSClient
}
protected void refresh_search_box(){
if (search_box == null)
return;
search_box.ItemsSource = from c in number_to_alias select new SearchAutoCompleteEntry(c.Key,c.Value);
return;
search_box.ItemsSource = from c in number_to_alias orderby c.Value,c.Key select new SearchAutoCompleteEntry(c.Key, c.Value);
}
protected class SearchAutoCompleteEntry{
public string number;
......
......@@ -25,7 +25,7 @@
<setting name="FrontOnIncoming" serializeAs="String">
<value>True</value>
</setting>
<setting name="IncomingBallons" serializeAs="String">
<setting name="IncomingBalloons" serializeAs="String">
<value>True</value>
</setting>
<setting name="HeadsetDevice" serializeAs="String">
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑!
请 注册 或者 后发表评论