via: 3fda7b4ada645ac361dac8e55ac7cafe94ae7287 (commit)
via: 0405d1fb7209050a0fa1cc0718c0aeee61191a95 (commit)
via: 7896938aefaf21adc42a01b4d8e9dd3d42ffbc82 (commit)
via: 9c0deb98bbc4aa6a9e5e6f792e911b550f4db83f (commit)
via: 0bff16bee499925e83339750a0ce5c1386fc0048 (commit)
via: 9858ca1c2a2fda5d56f268a6e359e207eedde6ab (commit)
from: 3d9d46652b597fd6360129de9c986491a58c5610 (commit)
= COMMIT LOG ===========================================================
committer: Raymond Chandler
comments:
Merge branch 'master' of git.freeswitch.org:freeswitch-contrib
committer: Jeff Lenk
comments:
change version of installer required
diff --git a/mitchcapper/FSClient/Setup/Product.wxs b/mitchcapper/FSClient/Setup/Product.wxs
index 073c9f0..0ab94b7 100644
--- a/mitchcapper/FSClient/Setup/Product.wxs
+++ b/mitchcapper/FSClient/Setup/Product.wxs
@@ -13,7 +13,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
<Product Id="f20f4348-01f9-457f-9112-60edb77761f4" Name="$(var.ProductName)" Language="1033" Version="1.0.0.0" Manufacturer="FreeSWITCH" UpgradeCode="7668faef-2ab3-4079-a986-07a33739b42e">
- <Package InstallerVersion="200" Compressed="yes" />
+ <Package InstallerVersion="300" Compressed="yes" />
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
committer: Mitch Capper
comments:
Make accounts default to 0 last rather than after 1, add a proper remove account function and kill it out of sofia first, don't add a new account if a user clicks cancel.
diff --git a/mitchcapper/FSClient/Account.cs b/mitchcapper/FSClient/Account.cs
index d987ced..59f0197 100644
--- a/mitchcapper/FSClient/Account.cs
+++ b/mitchcapper/FSClient/Account.cs
@@ -125,7 +125,11 @@ namespace FSClient {
account.guid = "";
account.guid = old_guid;
}
-
+ public static void RemoveAccount(Account account){
+ account.KillGateway();
+ accounts.Remove(account);
+ ReloadSofia();
+ }
public static void create_gateway_nodes(XmlNode gateways_node) {
foreach (Account account in accounts) {
@@ -170,9 +174,10 @@ namespace FSClient {
_guid.PropertyChanged += (s, e) => {
if (!guid_ok(this, _guid.value) || String.IsNullOrEmpty(_guid.value)) {
- for (int i = 0; i < 10; i++) {
- if (guid_ok(this, i.ToString())) {
- _guid.value = i.ToString();
+ for (int i = 1; i <= 10; i++){
+ int val = i == 10 ? 0 : i; // want 0 checked last.
+ if (guid_ok(this, val.ToString())) {
+ _guid.value = val.ToString();
return;
}
}
@@ -329,13 +334,16 @@ namespace FSClient {
KillGateway();
ReloadSofia();
}
- public void edit() {
+ public bool edit() {
current_editing_account = this;
GenericEditor editor = new GenericEditor();
editor.Init("Editing Account", values);
editor.ShowDialog();
if (editor.DialogResult == true)
ReloadAccount();
+ else
+ return false;
+ return true;
}
}
}
diff --git a/mitchcapper/FSClient/Broker.cs b/mitchcapper/FSClient/Broker.cs
index b774695..58d6d91 100644
--- a/mitchcapper/FSClient/Broker.cs
+++ b/mitchcapper/FSClient/Broker.cs
@@ -228,7 +228,7 @@ namespace FSClient {
}
public void DialString(String str){
if (string.IsNullOrWhiteSpace(str))
- return;
+ return;
MainWindowRemoveFocus(true);
if (str.StartsWith("#") && str.Length > 2) {
@@ -572,8 +572,8 @@ namespace FSClient {
public OurAutoCompleteBox GetContactSearchBox() {
return MainWindow.get_instance().GetContactSearchBox();
}
- public void MainWindowRemoveFocus(bool ResetContactSearchText=false){
- MainWindow.get_instance().RemoveFocus(ResetContactSearchText);
+ public void MainWindowRemoveFocus(bool ResetContactSearchText=false){
+ MainWindow.get_instance().RemoveFocus(ResetContactSearchText);
}
private delegate void BroadcastEventDel(FSEvent evt);
BroadcastEventDel BroadcastHandler;
diff --git a/mitchcapper/FSClient/MainWindow.xaml.cs b/mitchcapper/FSClient/MainWindow.xaml.cs
index 2201cf0..1ea68a4 100644
--- a/mitchcapper/FSClient/MainWindow.xaml.cs
+++ b/mitchcapper/FSClient/MainWindow.xaml.cs
@@ -365,7 +365,8 @@ namespace FSClient {
private void AccountNew_Click(object sender, RoutedEventArgs e) {
Account acct = new Account();
Account.AddAccount(acct);
- acct.edit();
+ if (!acct.edit())
+ Account.RemoveAccount(acct);
}
@@ -387,7 +388,7 @@ namespace FSClient {
Account acct = gridAccounts.SelectedItem as Account;
if (acct == null)
return;
- Account.accounts.Remove(acct);
+ Account.RemoveAccount(acct);
}
committer: Mitch Capper
comments:
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib
committer: Mitch Capper
comments:
I cannot spell the word balloons.
diff --git a/mitchcapper/FSClient/Broker.cs b/mitchcapper/FSClient/Broker.cs
index 0195525..b774695 100644
--- a/mitchcapper/FSClient/Broker.cs
+++ b/mitchcapper/FSClient/Broker.cs
@@ -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 {
diff --git a/mitchcapper/FSClient/Options.xaml b/mitchcapper/FSClient/Options.xaml
index 992af17..7fc4ba9 100644
--- a/mitchcapper/FSClient/Options.xaml
+++ b/mitchcapper/FSClient/Options.xaml
@@ -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>
diff --git a/mitchcapper/FSClient/Options.xaml.cs b/mitchcapper/FSClient/Options.xaml.cs
index 11fcd70..fb7c1f3 100644
--- a/mitchcapper/FSClient/Options.xaml.cs
+++ b/mitchcapper/FSClient/Options.xaml.cs
@@ -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;
diff --git a/mitchcapper/FSClient/Properties/Settings.Designer.cs b/mitchcapper/FSClient/Properties/Settings.Designer.cs
index fa47b05..84e25f5 100644
--- a/mitchcapper/FSClient/Properties/Settings.Designer.cs
+++ b/mitchcapper/FSClient/Properties/Settings.Designer.cs
@@ -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;
}
}
diff --git a/mitchcapper/FSClient/Properties/Settings.settings b/mitchcapper/FSClient/Properties/Settings.settings
index e74d6ce..74ba8e9 100644
--- a/mitchcapper/FSClient/Properties/Settings.settings
+++ b/mitchcapper/FSClient/Properties/Settings.settings
@@ -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">
diff --git a/mitchcapper/FSClient/SimpleContactPluginBase.cs b/mitchcapper/FSClient/SimpleContactPluginBase.cs
index 4575f30..3c1b33b 100644
--- a/mitchcapper/FSClient/SimpleContactPluginBase.cs
+++ b/mitchcapper/FSClient/SimpleContactPluginBase.cs
@@ -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;
diff --git a/mitchcapper/FSClient/app.config b/mitchcapper/FSClient/app.config
index 27ee233..292f672 100644
--- a/mitchcapper/FSClient/app.config
+++ b/mitchcapper/FSClient/app.config
@@ -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">
Summary of changes: mitchcapper/FSClient/Account.cs | 28 +++++++++++------ mitchcapper/FSClient/Broker.cs | 14 ++++---- mitchcapper/FSClient/DelayedFunction.cs | 10 ++++-- mitchcapper/FSClient/GenericEditor.xaml.cs | 9 ++--- mitchcapper/FSClient/MainWindow.xaml.cs | 5 ++- mitchcapper/FSClient/Options.xaml | 2 +- mitchcapper/FSClient/Options.xaml.cs | 4 +- .../FSClient/Properties/Settings.Designer.cs | 6 ++-- mitchcapper/FSClient/Properties/Settings.settings | 2 +- mitchcapper/FSClient/README.txt | 32 +------------------- mitchcapper/FSClient/Setup/Product.wxs | 2 +- mitchcapper/FSClient/SimpleContactPluginBase.cs | 4 +- mitchcapper/FSClient/TODO.txt | 2 - mitchcapper/FSClient/Windows.cs | 7 ++-- mitchcapper/FSClient/app.config | 2 +- 15 files changed, 54 insertions(+), 75 deletions(-) delete mode 100644 mitchcapper/FSClient/TODO.txt
this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email
For more info, see http://blog.chomperstomp.com/?p=630
--
FreeSWITCH user-contributed scripts, etc