February 2011 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[freeswitch] FreeSWITCH Source branch master updated. git2svn-syncpoint-master-1686-g89c5f3b
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH Source". The branch, master has been updated via 89c5f3bf8226bf605336b66e7761fd9f753d935a (commit) from 83dea0ee45a1eed53fe6c7bcac96410229c2fe3c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 89c5f3bf8226bf605336b66e7761fd9f753d935a Author: Brian West <brian(a)freeswitch.org> Date: Wed Feb 2 11:04:39 2011 -0600 FS-3023 diff --git a/src/include/switch_cpp.h b/src/include/switch_cpp.h index 0bd2a8b..f4a0922 100644 --- a/src/include/switch_cpp.h +++ b/src/include/switch_cpp.h @@ -68,6 +68,10 @@ Note that the first parameter to the new operator is implicitly handled by c++.. SWITCH_DECLARE(void) consoleLog(char *level_str, char *msg); SWITCH_DECLARE(void) consoleCleanLog(char *msg); +SWITCH_DECLARE(bool) email(char *to, char *from, char *headers = NULL, char *body = NULL, + char *file = NULL, char *convert_cmd = NULL, char *convert_ext = NULL); + + class CoreSession; class IVRMenu { diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.cxx index e91de6d..71e9f99 100644 --- a/src/mod/languages/mod_managed/freeswitch_wrap.cxx +++ b/src/mod/languages/mod_managed/freeswitch_wrap.cxx @@ -33352,6 +33352,30 @@ SWIGEXPORT void SWIGSTDCALL CSharp_consoleCleanLog(char * jarg1) { } +SWIGEXPORT unsigned int SWIGSTDCALL CSharp_email(char * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7) { + unsigned int jresult ; + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) NULL ; + char *arg4 = (char *) NULL ; + char *arg5 = (char *) NULL ; + char *arg6 = (char *) NULL ; + char *arg7 = (char *) NULL ; + bool result; + + arg1 = (char *)jarg1; + arg2 = (char *)jarg2; + arg3 = (char *)jarg3; + arg4 = (char *)jarg4; + arg5 = (char *)jarg5; + arg6 = (char *)jarg6; + arg7 = (char *)jarg7; + result = (bool)email(arg1,arg2,arg3,arg4,arg5,arg6,arg7); + jresult = result; + return jresult; +} + + SWIGEXPORT void * SWIGSTDCALL CSharp_new_IvrMenu(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, int jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16) { void * jresult ; IVRMenu *arg1 = (IVRMenu *) 0 ; diff --git a/src/mod/languages/mod_managed/managed/swig.cs b/src/mod/languages/mod_managed/managed/swig.cs index 1f02c3f..c640199 100644 --- a/src/mod/languages/mod_managed/managed/swig.cs +++ b/src/mod/languages/mod_managed/managed/swig.cs @@ -5364,6 +5364,11 @@ public class freeswitch { freeswitchPINVOKE.consoleCleanLog(msg); } + public static bool email(string to, string from, string headers, string body, string file, string convert_cmd, string convert_ext) { + bool ret = freeswitchPINVOKE.email(to, from, headers, body, file, convert_cmd, convert_ext); + return ret; + } + public static void console_log(string level_str, string msg) { freeswitchPINVOKE.console_log(level_str, msg); } @@ -13588,6 +13593,9 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_consoleCleanLog")] public static extern void consoleCleanLog(string jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_email")] + public static extern bool email(string jarg1, string jarg2, string jarg3, string jarg4, string jarg5, string jarg6, string jarg7); + [DllImport("mod_managed", EntryPoint="CSharp_new_IvrMenu")] public static extern IntPtr new_IvrMenu(HandleRef jarg1, string jarg2, string jarg3, string jarg4, string jarg5, string jarg6, string jarg7, string jarg8, string jarg9, string jarg10, int jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16); diff --git a/src/switch_cpp.cpp b/src/switch_cpp.cpp index bbcd05d..c62946b 100644 --- a/src/switch_cpp.cpp +++ b/src/switch_cpp.cpp @@ -1195,6 +1195,13 @@ SWITCH_DECLARE(void) console_clean_log(char *msg) switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN,SWITCH_LOG_DEBUG, "%s", switch_str_nil(msg)); } +SWITCH_DECLARE(bool) email(char *to, char *from, char *headers, char *body, char *file, char *convert_cmd, char *convert_ext) +{ + if (switch_simple_email(to, from, headers, body, file, convert_cmd, convert_ext) == SWITCH_TRUE) { + return true; + } + return false; +} SWITCH_DECLARE(void) msleep(unsigned ms) { ----------------------------------------------------------------------- Summary of changes: src/include/switch_cpp.h | 4 +++ src/mod/languages/mod_managed/freeswitch_wrap.cxx | 24 +++++++++++++++++++++ src/mod/languages/mod_managed/managed/swig.cs | 8 +++++++ src/switch_cpp.cpp | 7 ++++++ 4 files changed, 43 insertions(+), 0 deletions(-) hooks/post-receive -- FreeSWITCH Source

1 0

[freeswitch] FreeSWITCH Source branch master updated. git2svn-syncpoint-master-1685-g83dea0e
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH Source". The branch, master has been updated via 83dea0ee45a1eed53fe6c7bcac96410229c2fe3c (commit) from 10d696ebacedde5416e99f03911c928eea8889d1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 83dea0ee45a1eed53fe6c7bcac96410229c2fe3c Author: Anthony Minessale <anthm(a)freeswitch.org> Date: Wed Feb 2 10:53:33 2011 -0600 FS-3024 diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c index 35311c9..2db2a0d 100644 --- a/src/switch_core_sqldb.c +++ b/src/switch_core_sqldb.c @@ -1409,9 +1409,13 @@ static void core_event_handler(switch_event_t *event) } break; case SWITCH_EVENT_CHANNEL_UNBRIDGE: - new_sql() = switch_mprintf("delete from calls where (caller_uuid='%s' or callee_uuid='%q') and hostname='%q'", - switch_event_get_header_nil(event, "caller-unique-id"), switch_core_get_variable("hostname")); - break; + { + char *uuid = switch_event_get_header_nil(event, "caller-unique-id"); + + new_sql() = switch_mprintf("delete from calls where (caller_uuid='%q' or callee_uuid='%q') and hostname='%q'", + uuid, uuid, switch_core_get_variable("hostname")); + break; + } case SWITCH_EVENT_SHUTDOWN: new_sql() = switch_mprintf("delete from channels where hostname='%q';" "delete from interfaces where hostname='%q';" ----------------------------------------------------------------------- Summary of changes: src/switch_core_sqldb.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) hooks/post-receive -- FreeSWITCH Source

1 0

[freeswitch-contrib] FreeSWITCH user-contributed scripts, etc branch master updated. java-esl-client-0.9.2-387-g594536a
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH user-contributed scripts, etc". The branch, master has been updated via 594536af195a45e9515ff1c40979a3f036934e49 (commit) via 3f2c531df509383cd93d9ae4379bfb656a969c7e (commit) via fc1ff4f95853eb0a66db9b3658f596c19f8e66c4 (commit) from 4a414482ddc08fe77a42daab560a1bd860235154 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 594536af195a45e9515ff1c40979a3f036934e49 Merge: 4a41448 3f2c531 Author: Jeff Lenk <jeff(a)jefflenk.com> Date: Wed Feb 2 09:29:16 2011 -0600 Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib commit 3f2c531df509383cd93d9ae4379bfb656a969c7e Merge: fc1ff4f 4277bdb Author: Mitch Capper <mitch.capper(a)gmail.com> Date: Tue Feb 1 22:29:18 2011 -0800 Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib commit fc1ff4f95853eb0a66db9b3658f596c19f8e66c4 Author: Mitch Capper <mitch.capper(a)gmail.com> Date: Tue Feb 1 22:28:48 2011 -0800 Minor text changes to make things clearer diff --git a/mitchcapper/FSClient/README.txt b/mitchcapper/FSClient/README.txt index 6863643..68288a3 100644 --- a/mitchcapper/FSClient/README.txt +++ b/mitchcapper/FSClient/README.txt @@ -22,7 +22,7 @@ Plugins There are two native headset plugins provided for Jabra and Plantronics headsets. If you do not have one of these you can still leave the plugin in the directory it will not harm anything. If you do have one of these headsets you will then be able to select the headset in the options. This will automatically open/close the audio link, support muting and buttons, caller id, etc in the headset. You may need the runtime/sdk for the headset installed for it to work. Contact Plugins - There is one contact plugin provided by default, SimpleXML. This plugin allows you to attach a name/alias to a phone number so future calls show this information for the number. Right click and click edit on a call to edit the name/alias. The plugin stores all the names in an xml file in the AppData\Local folder for the app. Note you cannot have more than one contact plugin in the plugins folder or else only the first will be used. There are two ways to write a contact plugin, you can inherit from the SimpleContactPluginBase or IContactPlugin classes. SimpleContactPluginBase is just a base class that inherits from IContactPlugin to make things a bit easier. It uses basically the same interface as SimpleXML but you could replace SimpleXML with something to tie it to outlook, a ldap address book etc. + There is one contact plugin provided by default, SimpleXML. This plugin allows you to attach a name/alias to a phone number so future calls show this information for the number. Right click and click edit on a call to edit the name/alias. Control +F or click in the contact search box on the bottom right, search by name right click for options. The plugin stores all the names in an xml file in the AppData\Local folder for the app. Note you cannot have more than one contact plugin in the plugins folder or else only the first will be used. There are two ways to write a contact plugin, you can inherit from the SimpleContactPluginBase or IContactPlugin classes. SimpleContactPluginBase is just a base class that inherits from IContactPlugin to make things a bit easier. It uses basically the same interface as SimpleXML but you could replace SimpleXML with something to tie it to outlook, a ldap address book etc. Plugin Development FSClient was made to make it easy to extend through plugins. The two plugin types supported are noted above. Writing a plugin is exceptionally easy, you simply inherit the base interface fill in a few functions and are good to go. Use the above for examples. As for how easy, well the SimpleXML Contact Plugin was written in under an hour and under 100 lines of code. Writing plugins is easiest in a .net language (although you can write them in any language). FSClient will try to load any plugins in the plugin dir. diff --git a/mitchcapper/FSClient/Sofia.cs b/mitchcapper/FSClient/Sofia.cs index 15fd750..f33d963 100644 --- a/mitchcapper/FSClient/Sofia.cs +++ b/mitchcapper/FSClient/Sofia.cs @@ -126,7 +126,7 @@ namespace FSClient { master_profile_ok = true; String res = Utils.api_exec("sofia", "status profile softphone"); if (res.Trim() == "Invalid Profile!") { - 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 + ") is free(set under the Advanced tab of in the sofia settings), otherwise check the freeswitch.log for more details. You can try reloading the sofia profile by editing the sofia settings and clicking save."); + 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 + ") 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."); master_profile_ok = false; } diff --git a/mitchcapper/FSClient/TODO.txt b/mitchcapper/FSClient/TODO.txt index 7e3f1fb..4e65bb3 100644 --- a/mitchcapper/FSClient/TODO.txt +++ b/mitchcapper/FSClient/TODO.txt @@ -1,4 +1,2 @@ -Better address book integration. Right now the integration is pretty lame to say the least, you cannot lookup contacts or do much in the way of editing them. I think a nice interm solution would be a control + f support to find a contact to atleast make outgoing calls. Right now contact plugins can add right click menus but maybe making a more central way for them to add right click options so they don't have to do so much work would be better. -Volume control / gain. Right now you can use the system volume to adjust things but it would be nice to have this built into the GUI and also have a gain option. Gain would require changes to portaudio to support it most likely (although should be decently simple) or using set_audio_level. -- Partially implemented now with the ability to set audio levels on a call by right clicking on it. Plugin control, ability to enable or disable plugins from the options menu. Figure out a way to sort codecs, a draggable combo box may work well. \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: mitchcapper/FSClient/README.txt | 2 +- mitchcapper/FSClient/Sofia.cs | 2 +- mitchcapper/FSClient/TODO.txt | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) hooks/post-receive -- FreeSWITCH user-contributed scripts, etc

1 0

[freeswitch-contrib] FreeSWITCH user-contributed scripts, etc branch master updated. java-esl-client-0.9.2-384-g4a41448
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH user-contributed scripts, etc". The branch, master has been updated discards 3f2c531df509383cd93d9ae4379bfb656a969c7e (commit) discards fc1ff4f95853eb0a66db9b3658f596c19f8e66c4 (commit) via 4a414482ddc08fe77a42daab560a1bd860235154 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (3f2c531df509383cd93d9ae4379bfb656a969c7e) \ N -- N -- N (4a414482ddc08fe77a42daab560a1bd860235154) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4a414482ddc08fe77a42daab560a1bd860235154 Author: Jeff Lenk <jeff(a)jefflenk.com> Date: Wed Feb 2 09:28:49 2011 -0600 Fix installation problem - with non English locales diff --git a/mitchcapper/FSClient/Setup/FSCore.wxs b/mitchcapper/FSClient/Setup/FSCore.wxs index ac22889..b59f5f8 100644 --- a/mitchcapper/FSClient/Setup/FSCore.wxs +++ b/mitchcapper/FSClient/Setup/FSCore.wxs @@ -18,7 +18,7 @@ <Component Id="cmp3900B358BC2FB69DF2C42DDE35C5BBB2" Guid="*"> <File Id="fil322A57E96A97A8179B75065ABF94F809" KeyPath="yes" Source="$(var.FSClient.TargetDir)\FreeSwitch.dll" /> <CreateFolder Directory="INSTALLLOCATION"> - <Permission User="Authenticated Users" GenericAll="yes" /> + <Permission User="Users" GenericAll="yes" /> </CreateFolder> </Component> <Component Id="cmp3CD83BDDE0C679AC83F36ABCCC44B85F" Guid="*"> ----------------------------------------------------------------------- Summary of changes: mitchcapper/FSClient/README.txt | 2 +- mitchcapper/FSClient/Setup/FSCore.wxs | 2 +- mitchcapper/FSClient/Sofia.cs | 2 +- mitchcapper/FSClient/TODO.txt | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- FreeSWITCH user-contributed scripts, etc

1 0

[freeswitch-contrib] FreeSWITCH user-contributed scripts, etc branch master updated. java-esl-client-0.9.2-385-g3f2c531
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH user-contributed scripts, etc". The branch, master has been updated via 3f2c531df509383cd93d9ae4379bfb656a969c7e (commit) via 4277bdbadddb4bd6bd034812a4f59db60bd6e2aa (commit) from fc1ff4f95853eb0a66db9b3658f596c19f8e66c4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3f2c531df509383cd93d9ae4379bfb656a969c7e Merge: fc1ff4f 4277bdb Author: Mitch Capper <mitch.capper(a)gmail.com> Date: Tue Feb 1 22:29:18 2011 -0800 Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib commit 4277bdbadddb4bd6bd034812a4f59db60bd6e2aa Author: Jeff Lenk <jeff(a)jefflenk.com> Date: Tue Feb 1 23:15:44 2011 -0600 add dependency for new file diff --git a/mitchcapper/FSClient/Setup/FSClient.wxs b/mitchcapper/FSClient/Setup/FSClient.wxs index 68d0886..ba6960a 100644 --- a/mitchcapper/FSClient/Setup/FSClient.wxs +++ b/mitchcapper/FSClient/Setup/FSClient.wxs @@ -4,6 +4,7 @@ <ComponentGroup Id="FSClientComp"> <ComponentRef Id="cmp98E16C7E23D449F3BC0ECF003543C3F9"/> <ComponentRef Id="cmp32DB946E4669A895FAC4826678D1CE7A"/> + <ComponentRef Id="cmpD17CBE22A3B94CCE9CF46B849289D40D"/> </ComponentGroup> <DirectoryRef Id="INSTALLLOCATION"> <Component Id="cmp98E16C7E23D449F3BC0ECF003543C3F9" Guid="*"> @@ -12,6 +13,9 @@ <Component Id="cmp32DB946E4669A895FAC4826678D1CE7A" Guid="*"> <File Id="filE4CB78ABCF2AE91B89FB0446A607E70C" KeyPath="yes" Source="$(var.FSClient.TargetDir)\WPFToolkit.dll" /> </Component> + <Component Id="cmpD17CBE22A3B94CCE9CF46B849289D40D" Guid="*"> + <File Id="fil00037BE15D6A4893973045263EA4B117" KeyPath="yes" Source="$(var.FSClient.TargetDir)\System.Windows.Controls.Input.Toolkit.dll" /> + </Component> </DirectoryRef> </Fragment> </Wix> \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: mitchcapper/FSClient/Setup/FSClient.wxs | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) hooks/post-receive -- FreeSWITCH user-contributed scripts, etc

1 0

[freeswitch-contrib] FreeSWITCH user-contributed scripts, etc branch master updated. java-esl-client-0.9.2-383-gfc1ff4f
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH user-contributed scripts, etc". The branch, master has been updated discards 4277bdbadddb4bd6bd034812a4f59db60bd6e2aa (commit) via fc1ff4f95853eb0a66db9b3658f596c19f8e66c4 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (4277bdbadddb4bd6bd034812a4f59db60bd6e2aa) \ N -- N -- N (fc1ff4f95853eb0a66db9b3658f596c19f8e66c4) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fc1ff4f95853eb0a66db9b3658f596c19f8e66c4 Author: Mitch Capper <mitch.capper(a)gmail.com> Date: Tue Feb 1 22:28:48 2011 -0800 Minor text changes to make things clearer diff --git a/mitchcapper/FSClient/README.txt b/mitchcapper/FSClient/README.txt index 6863643..68288a3 100644 --- a/mitchcapper/FSClient/README.txt +++ b/mitchcapper/FSClient/README.txt @@ -22,7 +22,7 @@ Plugins There are two native headset plugins provided for Jabra and Plantronics headsets. If you do not have one of these you can still leave the plugin in the directory it will not harm anything. If you do have one of these headsets you will then be able to select the headset in the options. This will automatically open/close the audio link, support muting and buttons, caller id, etc in the headset. You may need the runtime/sdk for the headset installed for it to work. Contact Plugins - There is one contact plugin provided by default, SimpleXML. This plugin allows you to attach a name/alias to a phone number so future calls show this information for the number. Right click and click edit on a call to edit the name/alias. The plugin stores all the names in an xml file in the AppData\Local folder for the app. Note you cannot have more than one contact plugin in the plugins folder or else only the first will be used. There are two ways to write a contact plugin, you can inherit from the SimpleContactPluginBase or IContactPlugin classes. SimpleContactPluginBase is just a base class that inherits from IContactPlugin to make things a bit easier. It uses basically the same interface as SimpleXML but you could replace SimpleXML with something to tie it to outlook, a ldap address book etc. + There is one contact plugin provided by default, SimpleXML. This plugin allows you to attach a name/alias to a phone number so future calls show this information for the number. Right click and click edit on a call to edit the name/alias. Control +F or click in the contact search box on the bottom right, search by name right click for options. The plugin stores all the names in an xml file in the AppData\Local folder for the app. Note you cannot have more than one contact plugin in the plugins folder or else only the first will be used. There are two ways to write a contact plugin, you can inherit from the SimpleContactPluginBase or IContactPlugin classes. SimpleContactPluginBase is just a base class that inherits from IContactPlugin to make things a bit easier. It uses basically the same interface as SimpleXML but you could replace SimpleXML with something to tie it to outlook, a ldap address book etc. Plugin Development FSClient was made to make it easy to extend through plugins. The two plugin types supported are noted above. Writing a plugin is exceptionally easy, you simply inherit the base interface fill in a few functions and are good to go. Use the above for examples. As for how easy, well the SimpleXML Contact Plugin was written in under an hour and under 100 lines of code. Writing plugins is easiest in a .net language (although you can write them in any language). FSClient will try to load any plugins in the plugin dir. diff --git a/mitchcapper/FSClient/Sofia.cs b/mitchcapper/FSClient/Sofia.cs index 15fd750..f33d963 100644 --- a/mitchcapper/FSClient/Sofia.cs +++ b/mitchcapper/FSClient/Sofia.cs @@ -126,7 +126,7 @@ namespace FSClient { master_profile_ok = true; String res = Utils.api_exec("sofia", "status profile softphone"); if (res.Trim() == "Invalid Profile!") { - 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 + ") is free(set under the Advanced tab of in the sofia settings), otherwise check the freeswitch.log for more details. You can try reloading the sofia profile by editing the sofia settings and clicking save."); + 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 + ") 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."); master_profile_ok = false; } diff --git a/mitchcapper/FSClient/TODO.txt b/mitchcapper/FSClient/TODO.txt index 7e3f1fb..4e65bb3 100644 --- a/mitchcapper/FSClient/TODO.txt +++ b/mitchcapper/FSClient/TODO.txt @@ -1,4 +1,2 @@ -Better address book integration. Right now the integration is pretty lame to say the least, you cannot lookup contacts or do much in the way of editing them. I think a nice interm solution would be a control + f support to find a contact to atleast make outgoing calls. Right now contact plugins can add right click menus but maybe making a more central way for them to add right click options so they don't have to do so much work would be better. -Volume control / gain. Right now you can use the system volume to adjust things but it would be nice to have this built into the GUI and also have a gain option. Gain would require changes to portaudio to support it most likely (although should be decently simple) or using set_audio_level. -- Partially implemented now with the ability to set audio levels on a call by right clicking on it. Plugin control, ability to enable or disable plugins from the options menu. Figure out a way to sort codecs, a draggable combo box may work well. \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: mitchcapper/FSClient/README.txt | 2 +- mitchcapper/FSClient/Setup/FSClient.wxs | 4 ---- mitchcapper/FSClient/Sofia.cs | 2 +- mitchcapper/FSClient/TODO.txt | 2 -- 4 files changed, 2 insertions(+), 8 deletions(-) hooks/post-receive -- FreeSWITCH user-contributed scripts, etc

1 0

[freeswitch-contrib] FreeSWITCH user-contributed scripts, etc branch master updated. java-esl-client-0.9.2-383-g4277bdb
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH user-contributed scripts, etc". The branch, master has been updated via 4277bdbadddb4bd6bd034812a4f59db60bd6e2aa (commit) from 5247b0c1000e9aa6e642cdd238396d679d7c6bb3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4277bdbadddb4bd6bd034812a4f59db60bd6e2aa Author: Jeff Lenk <jeff(a)jefflenk.com> Date: Tue Feb 1 23:15:44 2011 -0600 add dependency for new file diff --git a/mitchcapper/FSClient/Setup/FSClient.wxs b/mitchcapper/FSClient/Setup/FSClient.wxs index 68d0886..ba6960a 100644 --- a/mitchcapper/FSClient/Setup/FSClient.wxs +++ b/mitchcapper/FSClient/Setup/FSClient.wxs @@ -4,6 +4,7 @@ <ComponentGroup Id="FSClientComp"> <ComponentRef Id="cmp98E16C7E23D449F3BC0ECF003543C3F9"/> <ComponentRef Id="cmp32DB946E4669A895FAC4826678D1CE7A"/> + <ComponentRef Id="cmpD17CBE22A3B94CCE9CF46B849289D40D"/> </ComponentGroup> <DirectoryRef Id="INSTALLLOCATION"> <Component Id="cmp98E16C7E23D449F3BC0ECF003543C3F9" Guid="*"> @@ -12,6 +13,9 @@ <Component Id="cmp32DB946E4669A895FAC4826678D1CE7A" Guid="*"> <File Id="filE4CB78ABCF2AE91B89FB0446A607E70C" KeyPath="yes" Source="$(var.FSClient.TargetDir)\WPFToolkit.dll" /> </Component> + <Component Id="cmpD17CBE22A3B94CCE9CF46B849289D40D" Guid="*"> + <File Id="fil00037BE15D6A4893973045263EA4B117" KeyPath="yes" Source="$(var.FSClient.TargetDir)\System.Windows.Controls.Input.Toolkit.dll" /> + </Component> </DirectoryRef> </Fragment> </Wix> \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: mitchcapper/FSClient/Setup/FSClient.wxs | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) hooks/post-receive -- FreeSWITCH user-contributed scripts, etc

1 0

[freeswitch] FreeSWITCH Source branch master updated. git2svn-syncpoint-master-1684-g10d696e
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH Source". The branch, master has been updated via 10d696ebacedde5416e99f03911c928eea8889d1 (commit) from 43dd776c3616f3735bd8b73d965f81e9d16dab79 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 10d696ebacedde5416e99f03911c928eea8889d1 Author: Andrew Thompson <andrew(a)hijacked.us> Date: Wed Feb 2 00:01:38 2011 -0500 Added conference UUID to xml_list diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 12b3193..961a140 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -3778,6 +3778,7 @@ static void conference_xlist(conference_obj_t *conference, switch_xml_t x_confer switch_xml_set_attr_d(x_conference, "member-count", ival); switch_snprintf(i, sizeof(i), "%u", conference->rate); switch_xml_set_attr_d(x_conference, "rate", ival); + switch_xml_set_attr_d(x_conference, "uuid", conference->uuid_str); if (switch_test_flag(conference, CFLAG_LOCKED)) { switch_xml_set_attr_d(x_conference, "locked", "true"); ----------------------------------------------------------------------- Summary of changes: .../applications/mod_conference/mod_conference.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) hooks/post-receive -- FreeSWITCH Source

1 0

[freeswitch-contrib] FreeSWITCH user-contributed scripts, etc branch master updated. java-esl-client-0.9.2-382-g5247b0c
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH user-contributed scripts, etc". The branch, master has been updated via 5247b0c1000e9aa6e642cdd238396d679d7c6bb3 (commit) from 09778f943674b470c51a636aa8e3e3b22589708e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5247b0c1000e9aa6e642cdd238396d679d7c6bb3 Author: Mitch Capper <mitch.capper(a)gmail.com> Date: Tue Feb 1 20:27:15 2011 -0800 Make sure to hide the contact search box if no contact plugin supports it diff --git a/mitchcapper/FSClient/IContactPlugin.cs b/mitchcapper/FSClient/IContactPlugin.cs index b064ff6..c1a1c24 100644 --- a/mitchcapper/FSClient/IContactPlugin.cs +++ b/mitchcapper/FSClient/IContactPlugin.cs @@ -5,9 +5,9 @@ using System.ComponentModel; using System.IO; using System.Reflection; using System.Windows; -using System.Windows.Controls; -using FSClient.Controls; - +using System.Windows.Controls; +using FSClient.Controls; + namespace FSClient { public class ContactPluginManager : IDisposable { private bool IsTypeOf(Type to_check, Type of) { @@ -36,19 +36,24 @@ namespace FSClient { } private void ContactInit(){ IContactPlugin plugin = plugins[0]; - ContactMenuItems = plugin.ContactRightClickMenu(); + ContactMenuItems = plugin.ContactRightClickMenu(); OurAutoCompleteBox box = Broker.get_instance().GetContactSearchBox(); - if (!plugin.HandleSearchBox(box)) - box.Visibility = Visibility.Collapsed; + if (plugin.HandleSearchBox(box)) + box.Visibility = Visibility.Visible; } private void HandleError(IContactPlugin plugin, Exception e) { Utils.PluginLog("Contact Plugin Manager", "Plugin \"" + plugin.ProviderName() + "\" had an error Due to: " + e.Message); } - public ContactPluginManager() { - - + public ContactPluginManager() { + OurAutoCompleteBox box = Broker.get_instance().GetContactSearchBox(); + Application.Current.Dispatcher.BeginInvoke((Action) (() => { + box.Visibility = Visibility.Collapsed; + })); + + + String plugin_dir = Utils.plugins_dir(); string[] dlls; try { @@ -161,7 +166,7 @@ namespace FSClient { public abstract IEnumerable<MenuItem> ContactRightClickMenu(); public abstract void Initialize(); public abstract void Terminate(); - public abstract string ProviderName(); + public abstract string ProviderName(); public abstract bool HandleSearchBox(OurAutoCompleteBox box); } ----------------------------------------------------------------------- Summary of changes: mitchcapper/FSClient/IContactPlugin.cs | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) hooks/post-receive -- FreeSWITCH user-contributed scripts, etc

1 0

[freeswitch-contrib] FreeSWITCH user-contributed scripts, etc branch master updated. java-esl-client-0.9.2-381-g09778f9
by git＠svn.freeswitch.org 02 Feb '11

02 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH user-contributed scripts, etc". The branch, master has been updated via 09778f943674b470c51a636aa8e3e3b22589708e (commit) from 007d9a09df8e52d540e46eb009b44f69121fc275 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 09778f943674b470c51a636aa8e3e3b22589708e Author: Mitch Capper <mitch.capper(a)gmail.com> Date: Tue Feb 1 20:04:51 2011 -0800 Made NO_FS a bit more robust Moved broker to have an actuall make call function so other things can place calls Added Contact Search Box support, it is a bit hacky to say the least..... diff --git a/mitchcapper/FSClient/Broker.cs b/mitchcapper/FSClient/Broker.cs index 924d714..e0098b7 100644 --- a/mitchcapper/FSClient/Broker.cs +++ b/mitchcapper/FSClient/Broker.cs @@ -6,7 +6,8 @@ using System.Windows; using System.Windows.Controls; using System.Xml; -using FreeSWITCH.Native; +using FreeSWITCH.Native; +using FSClient.Controls; using Timer = System.Timers.Timer; namespace FSClient { @@ -70,6 +71,8 @@ namespace FSClient { try {//it would be better if this was in the init function but it seems some dll load errors won't be caught if it is. #if ! NO_FS fs_core_init(); +#else + fs_inited = false; #endif if (FreeswitchLoaded != null) FreeswitchLoaded(this, null); @@ -82,14 +85,16 @@ namespace FSClient { Environment.Exit(-1); } +#if ! NO_FS DelayedFunction.DelayedCall("SofiaProfileCheck", sofia.sofia_profile_check, 100); +#endif } private void initContactManager() { contact_plugin_manager = new ContactPluginManager(); } - + #region Text Input @@ -118,8 +123,10 @@ namespace FSClient { if (Call.active_call != null && Call.active_call.state == Call.CALL_STATE.Answered) Call.active_call.send_dtmf(key.ToString()); else { +#if ! NO_FS PortAudio.PlayDTMF(key, null, true); DelayedFunction.DelayedCall("PortAudioLastDigitHitStreamClose", close_streams, 5000); +#endif } } private void close_streams() { @@ -219,6 +226,26 @@ namespace FSClient { //OffHook = true; //Utils.bgapi_exec("pa", "play tone_stream://%(10000,0,350,440);loops=20"); } + public void DialString(String str){ + if (string.IsNullOrWhiteSpace(str)) + return; + MainWindow.get_instance().RemoveFocus(); + + if (str.StartsWith("#") && str.Length > 2) { + String acct_num = str.Substring(1, 1); + str = str.Substring(2); + Account acct = (from a in Account.accounts where a.guid == acct_num select a).SingleOrDefault(); + if (acct != null) { + acct.CreateCall(str); + return; + } + } + if (Account.default_account == null) { + MessageBox.Show("no default account, make sure you have added one or more accounts (right click in the account area to add) and they are enabled (checked)"); + return; + } + Account.default_account.CreateCall(str); + } public void TalkPressed() { if (Call.active_call != null) { if (Call.active_call.state == Call.CALL_STATE.Ringing && Call.active_call.is_outgoing == false) @@ -228,22 +255,8 @@ namespace FSClient { } else { if (String.IsNullOrEmpty(cur_dial_str)) DialTone(); - else { - if (cur_dial_str.StartsWith("#") && cur_dial_str.Length > 2) { - String acct_num = cur_dial_str.Substring(1, 1); - cur_dial_str = cur_dial_str.Substring(2); - Account acct = (from a in Account.accounts where a.guid == acct_num select a).SingleOrDefault(); - if (acct != null) { - acct.CreateCall(cur_dial_str); - cur_dial_str = ""; - return; - } - } - if (Account.default_account == null) { - MessageBox.Show("no default account, make sure you have added one or more accounts (right click in the account area to add) and they are enabled (checked)"); - return; - } - Account.default_account.CreateCall(cur_dial_str); + else{ + DialString(cur_dial_str); cur_dial_str = ""; } } @@ -548,12 +561,16 @@ namespace FSClient { sofia.reload_config(mode); } public static EventHandler<EventArgs> FreeswitchLoaded; - public static EventHandler<FSEvent> NewEvent; + public static EventHandler<FSEvent> NewEvent; private void event_handler(FreeSWITCH.EventBinding.EventBindingArgs args) { if (BroadcastHandler == null) BroadcastHandler = new BroadcastEventDel(BroadcastEvent); Application.Current.Dispatcher.BeginInvoke(BroadcastHandler, new object[] { new FSEvent(args.EventObj) }); + } + + public OurAutoCompleteBox GetContactSearchBox() { + return MainWindow.get_instance().GetContactSearchBox(); } private delegate void BroadcastEventDel(FSEvent evt); BroadcastEventDel BroadcastHandler; @@ -587,7 +604,7 @@ namespace FSClient { private bool is_inited; private bool fs_inited; private static IDisposable event_bind; - + private void fs_core_init() { fs_inited = true; freeswitch.switch_core_set_globals(); diff --git a/mitchcapper/FSClient/Controls/OurAutoCompleteBox.cs b/mitchcapper/FSClient/Controls/OurAutoCompleteBox.cs new file mode 100644 index 0000000..edc358f --- /dev/null +++ b/mitchcapper/FSClient/Controls/OurAutoCompleteBox.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows.Controls; + +namespace FSClient.Controls { + public class OurAutoCompleteBox : AutoCompleteBox { + + private TextBox the_textbox; + private void find_textbox(){ + if (the_textbox != null) + return; + the_textbox = Template.FindName("Text", this) as TextBox; + } + public TextBox GetActualTextbox() { + find_textbox(); + return the_textbox; + } + public bool TextBoxHasFocus(){ + find_textbox(); + if (the_textbox == null) + return false; + return the_textbox.IsFocused; + } + public void TextBoxFocus(){ + find_textbox(); + if (the_textbox != null) + the_textbox.Focus(); + } + } +} diff --git a/mitchcapper/FSClient/FSClient.csproj b/mitchcapper/FSClient/FSClient.csproj index f4e250c..b12ef37 100644 --- a/mitchcapper/FSClient/FSClient.csproj +++ b/mitchcapper/FSClient/FSClient.csproj @@ -68,6 +68,10 @@ <Reference Include="System.configuration" /> <Reference Include="System.Data" /> <Reference Include="System.Drawing" /> + <Reference Include="System.Windows.Controls.Input.Toolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>C:\Program Files (x86)\WPF Toolkit\v3.5.50211.1\System.Windows.Controls.Input.Toolkit.dll</HintPath> + </Reference> <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xaml" /> <Reference Include="System.Xml"> @@ -91,6 +95,7 @@ <Compile Include="Account.cs" /> <Compile Include="Broker.cs" /> <Compile Include="Call.cs" /> + <Compile Include="Controls\OurAutoCompleteBox.cs" /> <Compile Include="Controls\PhonePadButton.xaml.cs"> <DependentUpon>PhonePadButton.xaml</DependentUpon> </Compile> diff --git a/mitchcapper/FSClient/IContactPlugin.cs b/mitchcapper/FSClient/IContactPlugin.cs index 4d59e57..b064ff6 100644 --- a/mitchcapper/FSClient/IContactPlugin.cs +++ b/mitchcapper/FSClient/IContactPlugin.cs @@ -5,7 +5,9 @@ using System.ComponentModel; using System.IO; using System.Reflection; using System.Windows; -using System.Windows.Controls; +using System.Windows.Controls; +using FSClient.Controls; + namespace FSClient { public class ContactPluginManager : IDisposable { private bool IsTypeOf(Type to_check, Type of) { @@ -15,6 +17,9 @@ namespace FSClient { return true; return IsTypeOf(to_check.BaseType, of); } + + public static IEnumerable<MenuItem> ContactMenuItems { get; set; } + private List<IContactPlugin> plugins = new List<IContactPlugin>(); public void RegisterPlugin(IContactPlugin plugin) { if (plugins.Count > 0) @@ -22,13 +27,24 @@ namespace FSClient { try { plugins.Add(plugin); plugin.Initialize(); + Application.Current.Dispatcher.BeginInvoke((Action)ContactInit); + + } catch (Exception e) { HandleError(plugin, e); } } + private void ContactInit(){ + IContactPlugin plugin = plugins[0]; + ContactMenuItems = plugin.ContactRightClickMenu(); + OurAutoCompleteBox box = Broker.get_instance().GetContactSearchBox(); + if (!plugin.HandleSearchBox(box)) + box.Visibility = Visibility.Collapsed; + } private void HandleError(IContactPlugin plugin, Exception e) { Utils.PluginLog("Contact Plugin Manager", "Plugin \"" + plugin.ProviderName() + "\" had an error Due to: " + e.Message); - } + + } public ContactPluginManager() { @@ -62,17 +78,17 @@ namespace FSClient { Utils.PluginLog("Contact Plugin Manager", "Error creating contact plugin from dll \"" + dll + "\" of: " + e.Message); } } - Call.calls.CollectionChanged += calls_CollectionChanged; - Call.CallRightClickMenuShowing += calls_RightClickMenuShowing; - } - - private void calls_RightClickMenuShowing(object sender, Call.CallRightClickEventArgs e){ - if (plugins.Count == 0) - return; - plugins[0].CallRightClickMenu(e.call, e.menu); - } - - + Call.calls.CollectionChanged += calls_CollectionChanged; + Call.CallRightClickMenuShowing += calls_RightClickMenuShowing; + } + + private void calls_RightClickMenuShowing(object sender, Call.CallRightClickEventArgs e){ + if (plugins.Count == 0) + return; + plugins[0].CallRightClickMenu(e.call, e.menu); + } + + private void calls_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e) { //We want to background resolve things incase a plugin does something that takes awhile if (e.NewItems == null || plugins.Count != 1) return; @@ -140,11 +156,13 @@ namespace FSClient { public abstract class IContactPlugin { public delegate void NumberResolved(String DisplayName); - public abstract void ResolveNumber(String number, NumberResolved on_resolved); + public abstract void ResolveNumber(String number, NumberResolved on_resolved); public abstract void CallRightClickMenu(Call call, ContextMenu menu); + public abstract IEnumerable<MenuItem> ContactRightClickMenu(); public abstract void Initialize(); public abstract void Terminate(); - public abstract string ProviderName(); + public abstract string ProviderName(); + public abstract bool HandleSearchBox(OurAutoCompleteBox box); } } diff --git a/mitchcapper/FSClient/MainWindow.xaml b/mitchcapper/FSClient/MainWindow.xaml index cf42a50..5e1eb04 100644 --- a/mitchcapper/FSClient/MainWindow.xaml +++ b/mitchcapper/FSClient/MainWindow.xaml @@ -1,9 +1,7 @@ <Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:ours="clr-namespace:FSClient.Controls" - - xmlns:toolkit="http://schemas.microsoft.com/wpf/2008/toolkit" xmlns:local="clr-namespace:FSClient" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" x:Class="FSClient.MainWindow" + xmlns:ours="clr-namespace:FSClient.Controls" xmlns:local="clr-namespace:FSClient" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:Controls="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Input.Toolkit" mc:Ignorable="d" x:Class="FSClient.MainWindow" Title="FSClient" Height="319" Width="666" WindowStyle="SingleBorderWindow" ResizeMode="CanMinimize" Closing="Window_Closing" Icon="phone.ico"> <Window.Resources> <local:DurationTimeConverter x:Key="DurationTimeConverter"/> @@ -174,15 +172,27 @@ </StackPanel> </Border> - <Button Content="Options" HorizontalAlignment="Left" x:Name="btnOptions" Width="75" Click="btnOptions_Click" Style="{DynamicResource GlassButtonStyle}" Height="20" Canvas.Left="349" Canvas.Top="266" d:LayoutOverrides="VerticalAlignment" /> + <Button Content="Options" HorizontalAlignment="Left" x:Name="btnOptions" Width="50" Click="btnOptions_Click" Style="{DynamicResource GlassButtonStyle}" Height="20" Canvas.Left="374" Canvas.Top="266" d:LayoutOverrides="VerticalAlignment" /> </Canvas> <Button Canvas.Left="283" Canvas.Top="21" Content="Send To Voicemail" FontWeight="Bold" Foreground="#FFF5E200" Height="20" Name="btnSendVoicemail" Style="{DynamicResource GlassButtonStyle}" Width="120" Visibility="Hidden" Click="btnSendVoicemail_Click" /> + + <ours:OurAutoCompleteBox Canvas.Left="435" Text="Contact Search" Canvas.Top="265" Height="22" Width="164.553" Opacity="0.8" x:Name="txtSearchBox" FilterMode="Contains" GotKeyboardFocus="txtSearchBox_GotKeyboardFocus" LostKeyboardFocus="txtSearchBox_LostKeyboardFocus" DropDownClosing="txtSearchBox_DropDownClosing"> + <ours:OurAutoCompleteBox.ItemTemplate> + <DataTemplate> + + <TextBlock Text="{Binding}"> + <TextBlock.ContextMenu> + <ContextMenu x:Name="contactSearchConextMenu" ItemsSource="{Binding Path=(local:ContactPluginManager.ContactMenuItems)}" IsEnabled="true" Closed="contactSearchConextMenu_Closed" Loaded="contactSearchConextMenu_Loaded" /> + </TextBlock.ContextMenu> + </TextBlock> + </DataTemplate> + </ours:OurAutoCompleteBox.ItemTemplate> + </ours:OurAutoCompleteBox> <Control x:Name="busyAnimation" Style="{StaticResource BusyAnimationStyle}" Width="{Binding Path=ActualWidth, ElementName=mainControl}" - Height="{Binding Path=ActualHeight, ElementName=mainControl}" + Height="{Binding Path=ActualHeight, ElementName=mainControl}" d:IsHidden="True" /> - </Canvas> </Window> diff --git a/mitchcapper/FSClient/MainWindow.xaml.cs b/mitchcapper/FSClient/MainWindow.xaml.cs index bd80d6b..2dd780b 100644 --- a/mitchcapper/FSClient/MainWindow.xaml.cs +++ b/mitchcapper/FSClient/MainWindow.xaml.cs @@ -1,396 +1,458 @@ -using System; -using System.ComponentModel; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Input; -using System.Windows.Media; -namespace FSClient { - public partial class MainWindow : Window { - private Broker broker; - public MainWindow() { - _instance = this; - - InitializeComponent(); - - gridCalls.DataContext = Call.calls; - - - gridCalls.LoadingRow += gridCalls_LoadingRow; - gridAccounts.DataContext = Account.accounts; - - this.Loaded += MainWindow_Loaded; - - - } - - private void ActiveCallChanged(object sender, Call.ActiveCallChangedArgs e) { - Dispatcher.BeginInvoke((Action)(() => { - CurrentCallInfo.DataContext = Call.active_call; - if (Call.active_call == null) - CurrentCallInfo.Visibility = Visibility.Hidden; - else - CurrentCallInfo.Visibility = Visibility.Visible; - })); - } - private void CallStateChanged(object sender, Call.CallPropertyEventArgs e) { - gridCalls.Items.SortDescriptions.Clear(); - gridCalls.Items.SortDescriptions.Add(new SortDescription("sort_order", ListSortDirection.Descending)); - } - void accounts_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e) { - if (e.NewItems == null) - return; - foreach (Account acct in e.NewItems) { - acct.PropertyChanged += acct_PropertyChanged; - } - } - - void acct_PropertyChanged(object sender, PropertyChangedEventArgs e) { - if (e.PropertyName == "gateway_id") { - gridAccounts.Items.SortDescriptions.Clear(); - gridAccounts.Items.SortDescriptions.Add(new SortDescription("gateway_id", ListSortDirection.Ascending)); - } - } - - - - - void gridCalls_LoadingRow(object sender, DataGridRowEventArgs e) { - e.Row.SetResourceReference(ToolTipProperty, "mainCallTooltip"); - last_tip = e.Row.ToolTip as ToolTip; +using System; +using System.ComponentModel; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Input; +using System.Windows.Media; +using FSClient.Controls; + +namespace FSClient { + public partial class MainWindow : Window { + private Broker broker; + public MainWindow() { + _instance = this; + + InitializeComponent(); + + gridCalls.DataContext = Call.calls; + + + gridCalls.LoadingRow += gridCalls_LoadingRow; + gridAccounts.DataContext = Account.accounts; + + this.Loaded += MainWindow_Loaded; + + + } + + private void ActiveCallChanged(object sender, Call.ActiveCallChangedArgs e) { + Dispatcher.BeginInvoke((Action)(() => { + CurrentCallInfo.DataContext = Call.active_call; + if (Call.active_call == null) + CurrentCallInfo.Visibility = Visibility.Hidden; + else + CurrentCallInfo.Visibility = Visibility.Visible; + })); + } + private void CallStateChanged(object sender, Call.CallPropertyEventArgs e) { + gridCalls.Items.SortDescriptions.Clear(); + gridCalls.Items.SortDescriptions.Add(new SortDescription("sort_order", ListSortDirection.Descending)); + } + void accounts_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e) { + if (e.NewItems == null) + return; + foreach (Account acct in e.NewItems) { + acct.PropertyChanged += acct_PropertyChanged; + } + } + + void acct_PropertyChanged(object sender, PropertyChangedEventArgs e) { + if (e.PropertyName == "gateway_id") { + gridAccounts.Items.SortDescriptions.Clear(); + gridAccounts.Items.SortDescriptions.Add(new SortDescription("gateway_id", ListSortDirection.Ascending)); + } + } + + + + + void gridCalls_LoadingRow(object sender, DataGridRowEventArgs e) { + e.Row.SetResourceReference(ToolTipProperty, "mainCallTooltip"); Call c = e.Row.DataContext as Call; - last_row = e.Row; if (c == null) - return; - e.Row.ContextMenu = c.CallRightClickMenu(); - - } - private ToolTip last_tip; - private DataGridRow last_row; - public void SetDialStr(string str) { - Dispatcher.BeginInvoke((Action)(() => { - txtNumber.Text = str; - })); - } - - private void CanEndChanged(object sender, bool data) { - Dispatcher.BeginInvoke((Action)(() => { - btnHangup.IsEnabled = broker.CanEnd; - })); - } - private void SpeakerActiveChanged(object sender, bool data) { - Dispatcher.BeginInvoke((Action)(() => { - btnSpeaker.Foreground = data ? enabled_brush : disabled_brush; - })); - } - private void MuteChanged(object sender, bool data) { - Dispatcher.BeginInvoke((Action)(() => { - btnMute.Foreground = data ? enabled_brush : disabled_brush; - })); - } - private void DNDChanged(object sender, bool data) { - Dispatcher.BeginInvoke((Action)(() => { - btnDND.Foreground = data ? enabled_brush : disabled_brush; - Title = "FSClient " + (data ? " - DND" : ""); - })); - } - private void CallActiveChanged(object sender, bool data) { - Dispatcher.BeginInvoke((Action)(() => { - btnHold.IsEnabled = broker.call_active; - btnTransfer.IsEnabled = broker.call_active; - })); - - } - - - - #region TextInput - - private enum TEXT_INPUT_MODE { NUMBERS_ONLY, FULL }; - - private TEXT_INPUT_MODE text_mode = TEXT_INPUT_MODE.NUMBERS_ONLY; - private void simple_text_mode_char_convert(char c) { - if (c == '*' || c == '#' || (c >= '0' && c <= '9')){ - broker.handle_key_action(c); - return; - } - switch (Char.ToUpper(c)) { - case 'A': - case 'B': - case 'C': - broker.handle_key_action('2'); - break; - case 'D': - case 'E': - case 'F': - broker.handle_key_action('3'); - break; - case 'G': - case 'H': - case 'I': - broker.handle_key_action('4'); - break; - case 'J': - case 'K': - case 'L': - broker.handle_key_action('5'); - break; - case 'M': - case 'N': - case 'O': - broker.handle_key_action('6'); - break; - case 'P': - case 'Q': - case 'R': - case 'S': - broker.handle_key_action('7'); - break; - case 'T': - case 'U': - case 'V': - broker.handle_key_action('8'); - break; - case 'W': - case 'X': - case 'Y': - case 'Z': - broker.handle_key_action('9'); - break; - } - } - void MainWindow_PreviewTextInput(object sender, TextCompositionEventArgs e) { - if (!broker.fully_loaded) - return; - char[] chars = e.Text.ToCharArray(); - char[] sys_chars = e.ControlText.ToCharArray(); - foreach (Char c in sys_chars) { - if (c == 22) //paste - { - String clipboard = Clipboard.GetText(); - char[] tmp = new char[chars.Length + clipboard.Length]; - chars.CopyTo(tmp, 0); - clipboard.ToCharArray().CopyTo(tmp, chars.Length); - chars = tmp; - } - } - - e.Handled = false; - foreach (Char c in chars) { - bool handled = true; - if (c > 32 && c < 127) { - if (text_mode == TEXT_INPUT_MODE.NUMBERS_ONLY || (Call.active_call != null && Call.active_call.state == Call.CALL_STATE.Answered) ) - simple_text_mode_char_convert(c); - else - broker.handle_key_action(c); - - } - else if (c == '\b') - broker.handle_special_action(Broker.KEYBOARD_ACTION.Backspace); - else if (c == '\r') - broker.handle_special_action(Broker.KEYBOARD_ACTION.Enter); - else if (c == 27) - broker.handle_special_action(Broker.KEYBOARD_ACTION.Escape); - else - handled = false; - if (handled) - e.Handled = true; - } - } - void MainWindow_PreviewKeyDown(object sender, KeyEventArgs e) { - if (!broker.fully_loaded) - return; - - if (e.Key == Key.Return){ - broker.handle_special_action(Broker.KEYBOARD_ACTION.Enter); - e.Handled = true; - } - } - #endregion - private static MainWindow _instance; - public static MainWindow get_instance() { - return _instance; - } - - private void DialStrChanged(object sender, string data) { - SetDialStr(broker.cur_dial_str); - } - private void CallRingingChanged(object sender, bool data) { - Dispatcher.Invoke((Action)(() => { - if (data && Call.active_call != null && Call.active_call.CanSendToVoicemail()) - btnSendVoicemail.Visibility = Visibility.Visible; - else - btnSendVoicemail.Visibility = Visibility.Hidden; - })); - } - void MainWindow_Loaded(object sender, RoutedEventArgs e) { - PreviewTextInput += MainWindow_PreviewTextInput; - PreviewKeyDown += MainWindow_PreviewKeyDown; //return must be handled seperately as buttons are triggered on down it seems - Call.CallStateChanged += CallStateChanged; - Call.ActiveCallChanged += ActiveCallChanged; - Account.accounts.CollectionChanged += accounts_CollectionChanged; - Broker.FreeswitchLoaded += new EventHandler<EventArgs>(FreeswitchLoaded); - broker = Broker.get_instance(); - - broker.cur_dial_strChanged += DialStrChanged; - broker.call_activeChanged += CallActiveChanged; - broker.active_call_ringingChanged += CallRingingChanged; - broker.MutedChanged += MuteChanged; - broker.DNDChanged += DNDChanged; - broker.CanEndChanged += CanEndChanged; - broker.UseNumberOnlyInputChanged += UseNumberOnlyInputChanged; - UseNumberOnlyInputChanged(null, false);//trigger an update - broker.SpeakerphoneActiveChanged += SpeakerActiveChanged; - CurrentCallInfo.Visibility = Visibility.Hidden; - Windows.systray_icon_setup(); - } - - private void FreeswitchLoaded(object sender, EventArgs e){ - Dispatcher.BeginInvoke((Action)(() => - { - busyAnimation.Visibility = Visibility.Hidden; - })); - } - - - - private void UseNumberOnlyInputChanged(object sender, bool data){ - text_mode = broker.UseNumberOnlyInput ? TEXT_INPUT_MODE.NUMBERS_ONLY : TEXT_INPUT_MODE.FULL; - } - - public void BringToFront() { - Show(); - BringIntoView(); - WindowState = WindowState.Normal; - Topmost = true; - Topmost = false; - } - private void btnCall_Click(object sender, RoutedEventArgs e) { - broker.TalkPressed(); - - } - - private void btnOptions_Click(object sender, RoutedEventArgs e) { - Options opt = new Options(); - opt.ShowDialog(); - } - - private void btnHangup_Click(object sender, RoutedEventArgs e) { - broker.HangupPressed(); - } - - private void gridCalls_MouseDoubleClick(object sender, MouseButtonEventArgs e) { - FrameworkElement elem = e.OriginalSource as FrameworkElement; - if (elem == null) - return; - Call call = elem.DataContext as Call; - if (call == null) - return; - call.DefaultAction(); - } - - SolidColorBrush enabled_brush = new SolidColorBrush(Colors.Yellow); - SolidColorBrush disabled_brush = new SolidColorBrush(Colors.White); - private void btnMute_Click(object sender, RoutedEventArgs e) { - broker.Muted = !broker.Muted; - } - - private void btnDND_Click(object sender, RoutedEventArgs e) { - broker.DND = !broker.DND; - } - private void gridAccounts_MouseUp(object sender, MouseButtonEventArgs e) { - FrameworkElement elem = e.OriginalSource as FrameworkElement; - if (elem == null) - return; - Account account = elem.DataContext as Account; - if (account == null) - return; - DependencyObject dep = elem; - while (dep != null && !(dep is DataGridCell)) { - dep = VisualTreeHelper.GetParent(dep); - } - DataGridCell cell = dep as DataGridCell; - if (cell == null) - return; - - if (cell.Column.SortMemberPath == "enabled") { - account.enabled = !account.enabled; - account.ReloadAccount(); - } - } - - private void Window_Closing(object sender, CancelEventArgs e) { - try{ - Windows.systray_icon_remove(); - broker.Dispose(); - } - catch { } - } - - private void btnSpeaker_Click(object sender, RoutedEventArgs e) { - broker.SpeakerphoneActive = !broker.SpeakerphoneActive; - } - - - private void AccountNew_Click(object sender, RoutedEventArgs e) { - Account acct = new Account(); - Account.AddAccount(acct); - acct.edit(); - - } - - private void AccountEdit_Click(object sender, RoutedEventArgs e) { - Account acct = gridAccounts.SelectedItem as Account; - if (acct == null) - return; - acct.edit(); - } - - private void AccountSetDefault_Click(object sender, RoutedEventArgs e) { - Account acct = gridAccounts.SelectedItem as Account; - if (acct == null) - return; - acct.is_default_account = true; - } - - private void AccountDelete_Click(object sender, RoutedEventArgs e) { - Account acct = gridAccounts.SelectedItem as Account; - if (acct == null) - return; - Account.accounts.Remove(acct); - } - - - private void gridAccounts_ContextMenuOpening(object sender, ContextMenuEventArgs e) { - menuAccountDelete.IsEnabled = menuAccountEdit.IsEnabled = menuAccountSetDefault.IsEnabled = gridAccounts.SelectedItem != null; - } - - private void btnDialpad_Click(object sender, RoutedEventArgs e) { - Button btn = sender as Button; - if (btn != null) - broker.handle_key_action(btn.Content.ToString()[0]); - Controls.PhonePadButton btn2 = sender as Controls.PhonePadButton; - if (btn2 != null) - broker.handle_key_action(btn2.Number[0]); - - } - - private void btnHold_Click(object sender, RoutedEventArgs e) { - if (Call.active_call != null) - Call.active_call.hold(); - } - - private void btnSendVoicemail_Click(object sender, RoutedEventArgs e) { - if (Call.active_call != null) - Call.active_call.SendToVoicemail(); - } - - private void btnTransfer_Click(object sender, RoutedEventArgs e) { - if (Call.active_call != null) - Call.active_call.TransferPrompt(); - - - } - - - } -} + return; + e.Row.ContextMenu = c.CallRightClickMenu(); + + } + public void SetDialStr(string str) { + Dispatcher.BeginInvoke((Action)(() => { + txtNumber.Text = str; + })); + } + + private void CanEndChanged(object sender, bool data) { + Dispatcher.BeginInvoke((Action)(() => { + btnHangup.IsEnabled = broker.CanEnd; + })); + } + private void SpeakerActiveChanged(object sender, bool data) { + Dispatcher.BeginInvoke((Action)(() => { + btnSpeaker.Foreground = data ? enabled_brush : disabled_brush; + })); + } + private void MuteChanged(object sender, bool data) { + Dispatcher.BeginInvoke((Action)(() => { + btnMute.Foreground = data ? enabled_brush : disabled_brush; + })); + } + private void DNDChanged(object sender, bool data) { + Dispatcher.BeginInvoke((Action)(() => { + btnDND.Foreground = data ? enabled_brush : disabled_brush; + Title = "FSClient " + (data ? " - DND" : ""); + })); + } + private void CallActiveChanged(object sender, bool data) { + Dispatcher.BeginInvoke((Action)(() => { + btnHold.IsEnabled = broker.call_active; + btnTransfer.IsEnabled = broker.call_active; + })); + + } + + + + #region TextInput + + private enum TEXT_INPUT_MODE { NUMBERS_ONLY, FULL }; + + private TEXT_INPUT_MODE text_mode = TEXT_INPUT_MODE.NUMBERS_ONLY; + private void simple_text_mode_char_convert(char c) { + if (c == '*' || c == '#' || (c >= '0' && c <= '9')) { + broker.handle_key_action(c); + return; + } + switch (Char.ToUpper(c)) { + case 'A': + case 'B': + case 'C': + broker.handle_key_action('2'); + break; + case 'D': + case 'E': + case 'F': + broker.handle_key_action('3'); + break; + case 'G': + case 'H': + case 'I': + broker.handle_key_action('4'); + break; + case 'J': + case 'K': + case 'L': + broker.handle_key_action('5'); + break; + case 'M': + case 'N': + case 'O': + broker.handle_key_action('6'); + break; + case 'P': + case 'Q': + case 'R': + case 'S': + broker.handle_key_action('7'); + break; + case 'T': + case 'U': + case 'V': + broker.handle_key_action('8'); + break; + case 'W': + case 'X': + case 'Y': + case 'Z': + broker.handle_key_action('9'); + break; + } + } + + private bool text_interception_enabled = true; + void MainWindow_PreviewTextInput(object sender, TextCompositionEventArgs e) { + if (!broker.fully_loaded) + return; + if (!text_interception_enabled) { + e.Handled = false; + return; + } + char[] chars = e.Text.ToCharArray(); + char[] sys_chars = e.ControlText.ToCharArray(); + foreach (Char c in sys_chars) { + if (c == 22) //paste / control + v + { + String clipboard = Clipboard.GetText(); + char[] tmp = new char[chars.Length + clipboard.Length]; + chars.CopyTo(tmp, 0); + clipboard.ToCharArray().CopyTo(tmp, chars.Length); + chars = tmp; + } + else if (c == 6){ // control + f + txtSearchBox.TextBoxFocus(); + } + } + + e.Handled = false; + foreach (Char c in chars) { + bool handled = true; + if (c > 32 && c < 127) { + if (text_mode == TEXT_INPUT_MODE.NUMBERS_ONLY || (Call.active_call != null && Call.active_call.state == Call.CALL_STATE.Answered)) + simple_text_mode_char_convert(c); + else + broker.handle_key_action(c); + + } + else if (c == '\b') + broker.handle_special_action(Broker.KEYBOARD_ACTION.Backspace); + else if (c == '\r') + broker.handle_special_action(Broker.KEYBOARD_ACTION.Enter); + else if (c == 27) + broker.handle_special_action(Broker.KEYBOARD_ACTION.Escape); + else + handled = false; + if (handled) + e.Handled = true; + } + } + void MainWindow_PreviewKeyDown(object sender, KeyEventArgs e) { + if (!broker.fully_loaded) + return; + if (!text_interception_enabled) { + e.Handled = false; + return; + } + + if (e.Key == Key.Return) { + broker.handle_special_action(Broker.KEYBOARD_ACTION.Enter); + e.Handled = true; + } + } + #endregion + private static MainWindow _instance; + public static MainWindow get_instance() { + return _instance; + } + + private void DialStrChanged(object sender, string data) { + SetDialStr(broker.cur_dial_str); + } + private void CallRingingChanged(object sender, bool data) { + Dispatcher.Invoke((Action)(() => { + if (data && Call.active_call != null && Call.active_call.CanSendToVoicemail()) + btnSendVoicemail.Visibility = Visibility.Visible; + else + btnSendVoicemail.Visibility = Visibility.Hidden; + })); + } + void MainWindow_Loaded(object sender, RoutedEventArgs e) { + PreviewTextInput += MainWindow_PreviewTextInput; + PreviewKeyDown += MainWindow_PreviewKeyDown; //return must be handled seperately as buttons are triggered on down it seems + MouseUp += MainWindow_MouseUp; + + Call.CallStateChanged += CallStateChanged; + Call.ActiveCallChanged += ActiveCallChanged; + Account.accounts.CollectionChanged += accounts_CollectionChanged; + Broker.FreeswitchLoaded += FreeswitchLoaded; + broker = Broker.get_instance(); + + broker.cur_dial_strChanged += DialStrChanged; + broker.call_activeChanged += CallActiveChanged; + broker.active_call_ringingChanged += CallRingingChanged; + broker.MutedChanged += MuteChanged; + broker.DNDChanged += DNDChanged; + broker.CanEndChanged += CanEndChanged; + broker.UseNumberOnlyInputChanged += UseNumberOnlyInputChanged; + UseNumberOnlyInputChanged(null, false);//trigger an update + broker.SpeakerphoneActiveChanged += SpeakerActiveChanged; + CurrentCallInfo.Visibility = Visibility.Hidden; + Windows.systray_icon_setup(); + } + + void MainWindow_MouseUp(object sender, MouseButtonEventArgs e) { + if (txtSearchBox.TextBoxHasFocus()){ + DependencyObject parent = e.OriginalSource as UIElement; + while (parent != null && !(parent is OurAutoCompleteBox)) + parent = VisualTreeHelper.GetParent(parent); + if (parent == null) + RemoveFocus(); + } + + } + + public void RemoveFocus(){ + btnMute.Focus(); //should really divert focus a better way + } + + + + private void FreeswitchLoaded(object sender, EventArgs e) { + Dispatcher.BeginInvoke((Action)(() => { + busyAnimation.Visibility = Visibility.Hidden; + })); + } + + + + private void UseNumberOnlyInputChanged(object sender, bool data) { + text_mode = broker.UseNumberOnlyInput ? TEXT_INPUT_MODE.NUMBERS_ONLY : TEXT_INPUT_MODE.FULL; + } + + public void BringToFront() { + Show(); + BringIntoView(); + WindowState = WindowState.Normal; + Topmost = true; + Topmost = false; + } + private void btnCall_Click(object sender, RoutedEventArgs e) { + broker.TalkPressed(); + + } + + private void btnOptions_Click(object sender, RoutedEventArgs e) { + Options opt = new Options(); + opt.ShowDialog(); + } + + private void btnHangup_Click(object sender, RoutedEventArgs e) { + broker.HangupPressed(); + } + + private void gridCalls_MouseDoubleClick(object sender, MouseButtonEventArgs e) { + FrameworkElement elem = e.OriginalSource as FrameworkElement; + if (elem == null) + return; + Call call = elem.DataContext as Call; + if (call == null) + return; + call.DefaultAction(); + } + + SolidColorBrush enabled_brush = new SolidColorBrush(Colors.Yellow); + SolidColorBrush disabled_brush = new SolidColorBrush(Colors.White); + private void btnMute_Click(object sender, RoutedEventArgs e) { + broker.Muted = !broker.Muted; + } + + private void btnDND_Click(object sender, RoutedEventArgs e) { + broker.DND = !broker.DND; + } + private void gridAccounts_MouseUp(object sender, MouseButtonEventArgs e) { + FrameworkElement elem = e.OriginalSource as FrameworkElement; + if (elem == null) + return; + Account account = elem.DataContext as Account; + if (account == null) + return; + DependencyObject dep = elem; + while (dep != null && !(dep is DataGridCell)) { + dep = VisualTreeHelper.GetParent(dep); + } + DataGridCell cell = dep as DataGridCell; + if (cell == null) + return; + + if (cell.Column.SortMemberPath == "enabled") { + account.enabled = !account.enabled; + account.ReloadAccount(); + } + } + + private void Window_Closing(object sender, CancelEventArgs e) { + try { + Windows.systray_icon_remove(); + broker.Dispose(); + } + catch{ } + } + + private void btnSpeaker_Click(object sender, RoutedEventArgs e) { + broker.SpeakerphoneActive = !broker.SpeakerphoneActive; + } + + + private void AccountNew_Click(object sender, RoutedEventArgs e) { + Account acct = new Account(); + Account.AddAccount(acct); + acct.edit(); + + } + + private void AccountEdit_Click(object sender, RoutedEventArgs e) { + Account acct = gridAccounts.SelectedItem as Account; + if (acct == null) + return; + acct.edit(); + } + + private void AccountSetDefault_Click(object sender, RoutedEventArgs e) { + Account acct = gridAccounts.SelectedItem as Account; + if (acct == null) + return; + acct.is_default_account = true; + } + + private void AccountDelete_Click(object sender, RoutedEventArgs e) { + Account acct = gridAccounts.SelectedItem as Account; + if (acct == null) + return; + Account.accounts.Remove(acct); + } + + + private void gridAccounts_ContextMenuOpening(object sender, ContextMenuEventArgs e) { + menuAccountDelete.IsEnabled = menuAccountEdit.IsEnabled = menuAccountSetDefault.IsEnabled = gridAccounts.SelectedItem != null; + } + + private void btnDialpad_Click(object sender, RoutedEventArgs e) { + Button btn = sender as Button; + if (btn != null) + broker.handle_key_action(btn.Content.ToString()[0]); + PhonePadButton btn2 = sender as PhonePadButton; + if (btn2 != null) + broker.handle_key_action(btn2.Number[0]); + + } + + private void btnHold_Click(object sender, RoutedEventArgs e) { + if (Call.active_call != null) + Call.active_call.hold(); + } + + private void btnSendVoicemail_Click(object sender, RoutedEventArgs e) { + if (Call.active_call != null) + Call.active_call.SendToVoicemail(); + } + + private void btnTransfer_Click(object sender, RoutedEventArgs e) { + if (Call.active_call != null) + Call.active_call.TransferPrompt(); + + + } + #region ContactSearchBox + public OurAutoCompleteBox GetContactSearchBox() { + return txtSearchBox; + } + + private void txtSearchBox_GotKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e) { + text_interception_enabled = false; + txtSearchBox.Opacity = 1; + if (txtSearchBox.Text == "Contact Search") + txtSearchBox.Text = ""; + } + + private void txtSearchBox_LostKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e) { + text_interception_enabled = true; + txtSearchBox.Opacity = 0.8; + + if (String.IsNullOrWhiteSpace(txtSearchBox.Text)) + txtSearchBox.Text = "Contact Search"; + } + + private bool ContactMenuOpen; + private void contactSearchConextMenu_Closed(object sender, RoutedEventArgs e) { + ContactMenuOpen = false; + txtSearchBox.IsDropDownOpen = false; + } + + private void contactSearchConextMenu_Loaded(object sender, RoutedEventArgs e) { + ContactMenuOpen = true; + } + + private void txtSearchBox_DropDownClosing(object sender, RoutedPropertyChangingEventArgs<bool> e) { + if (ContactMenuOpen) + e.Cancel = true; + } + #endregion + } +} diff --git a/mitchcapper/FSClient/SimpleContactPluginBase.cs b/mitchcapper/FSClient/SimpleContactPluginBase.cs index 6a92a79..bcf73d1 100644 --- a/mitchcapper/FSClient/SimpleContactPluginBase.cs +++ b/mitchcapper/FSClient/SimpleContactPluginBase.cs @@ -1,6 +1,10 @@ using System; -using System.Collections.Generic; +using System.Collections.Generic; +using System.Linq; +using System.Windows; using System.Windows.Controls; +using System.Windows.Input; +using FSClient.Controls; namespace FSClient { @@ -8,9 +12,9 @@ namespace FSClient { protected abstract void _TryResolveNewNumber(string number, NumberResolved on_resolved); protected abstract void LoadDatabase(ref Dictionary<string, string> number_to_alias_db); - protected abstract void UpdateDatabase(string number, string alias); - - + protected abstract void UpdateDatabase(string number, string alias); + + protected virtual void ModifyRightClickMenu(Call call, ContextMenu menu) { return; @@ -30,26 +34,65 @@ namespace FSClient return ""; } - protected Dictionary<string, string> number_to_alias = new Dictionary<string, string>(); - + protected Dictionary<string, string> number_to_alias = new Dictionary<string, string>(); + public override void CallRightClickMenu(Call call, ContextMenu menu) { MenuItem item = new MenuItem(); item.Click += item_Click; item.Header = "Edit Contact"; - menu.Items.Add(item); + menu.Items.Add(item); ModifyRightClickMenu(call, menu); } - protected void item_Click(object sender, System.Windows.RoutedEventArgs e) + public override IEnumerable<MenuItem> ContactRightClickMenu(){ + List<MenuItem> items = new List<MenuItem>(); + MenuItem item = new MenuItem(); + item.Click += item_Click; + item.Header = "Edit Contact"; + items.Add(item); + item = new MenuItem(); + item.Click +=contact_call_click; + item.Header = "Call"; + items.Add(item); + return items; + } + + private void contact_call_click(object sender, RoutedEventArgs e){ + MenuItem item = sender as MenuItem; + if (item == null) + return; + + SearchAutoCompleteEntry entry = item.DataContext as SearchAutoCompleteEntry ?? search_box.SelectedItem as SearchAutoCompleteEntry; + if (entry == null) + return; + Broker.get_instance().DialString(entry.number); + } + + protected void item_Click(object sender, RoutedEventArgs e) { MenuItem item = sender as MenuItem; if (item == null) return; + String number; + String default_edit_value; + Call c = item.DataContext as Call; - if (c == null) - return; - String number = NormalizeNumber(c.other_party_number); - String alias = InputBox.GetInput("Editing Contact", "Edit alias for number: " + number, DefaultEditValue(c)); + if (c != null){ + number = c.other_party_number; + default_edit_value = DefaultEditValue(c); + } + else{ + SearchAutoCompleteEntry entry = item.DataContext as SearchAutoCompleteEntry ?? search_box.SelectedItem as SearchAutoCompleteEntry; + + if (entry == null) + return; + number = entry.number; + default_edit_value = entry.alias; + } + + String orig_number = number; + number = NormalizeNumber(number); + String alias = InputBox.GetInput("Editing Contact", "Edit alias for number: " + number, default_edit_value); alias = IsValidAlias(alias); if (alias == null) return; @@ -58,11 +101,12 @@ namespace FSClient foreach (Call call in Call.calls) { - if (c.other_party_number == call.other_party_number) - c.other_party_name = alias; + if (orig_number == call.other_party_number || number == call.other_party_number) + call.other_party_name = alias; } UpdateDatabase(number, alias); + refresh_search_box(); } public override void ResolveNumber(string number, NumberResolved on_resolved) { @@ -78,8 +122,69 @@ namespace FSClient public override void Initialize() { LoadDatabase(ref number_to_alias); + + refresh_search_box(); + } + 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); + } + protected class SearchAutoCompleteEntry{ + public string number; + public string alias; + public string display_name; + public SearchAutoCompleteEntry(String number, String alias){ + this.number = number; + this.alias = alias; + if (String.IsNullOrWhiteSpace(alias) || number == alias) + display_name = number; + else + display_name = alias + " - " + number; + } + public override string ToString(){ + return display_name; + } + } + protected void search_box_PreviewKeyUp(object sender, KeyEventArgs e){ + if (e.Key == Key.Enter){ + call_current_contact(); + } + } + protected OurAutoCompleteBox search_box; + private TextBox real_search_box; + public override bool HandleSearchBox(OurAutoCompleteBox box) { + search_box = box; + + real_search_box = search_box.GetActualTextbox(); + real_search_box.ContextMenu = new ContextMenu(); + real_search_box.ContextMenuOpening += search_box_ContextMenuOpening; + + foreach (MenuItem item in ContactRightClickMenu()){ + real_search_box.ContextMenu.Items.Add(item); + } + + search_box.PreviewKeyUp += search_box_PreviewKeyUp; + search_box.MouseDoubleClick += search_box_MouseDoubleClick; + if (number_to_alias.Count > 0) + refresh_search_box(); + return true; + } + protected void call_current_contact(){ + SearchAutoCompleteEntry entry = search_box.SelectedItem as SearchAutoCompleteEntry; + if (entry != null) + Broker.get_instance().DialString(entry.number); + } + void search_box_MouseDoubleClick(object sender, MouseButtonEventArgs e){ + call_current_contact(); } + void search_box_ContextMenuOpening(object sender, ContextMenuEventArgs e){ + if (search_box.SelectedItem == null) + real_search_box.ContextMenu.Visibility = Visibility.Hidden; + else + real_search_box.ContextMenu.Visibility = Visibility.Visible; + } } } ----------------------------------------------------------------------- Summary of changes: mitchcapper/FSClient/Broker.cs | 57 +- .../FSClient/Controls/OurAutoCompleteBox.cs | 32 + mitchcapper/FSClient/FSClient.csproj | 5 + mitchcapper/FSClient/IContactPlugin.cs | 48 +- mitchcapper/FSClient/MainWindow.xaml | 22 +- mitchcapper/FSClient/MainWindow.xaml.cs | 850 +++++++++++--------- mitchcapper/FSClient/SimpleContactPluginBase.cs | 133 +++- 7 files changed, 698 insertions(+), 449 deletions(-) create mode 100644 mitchcapper/FSClient/Controls/OurAutoCompleteBox.cs hooks/post-receive -- FreeSWITCH user-contributed scripts, etc

1 0