[Freeswitch-trunk] [freeswitch-contrib] FreeSWITCH user-contributed scripts, etc branch master updated. java-esl-client-0.9.2-386-g48590ec
git at svn.freeswitch.org
git at svn.freeswitch.org
Wed Feb 2 20:43:16 MSK 2011
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 594536af195a45e9515ff1c40979a3f036934e49 (commit)
discards 4a414482ddc08fe77a42daab560a1bd860235154 (commit)
via 48590eca54e7c93ef987768a24a844dfd72986d1 (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 (594536af195a45e9515ff1c40979a3f036934e49)
\
N -- N -- N (48590eca54e7c93ef987768a24a844dfd72986d1)
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 48590eca54e7c93ef987768a24a844dfd72986d1
Author: Mitch Capper <mitch.capper at gmail.com>
Date: Wed Feb 2 09:42:55 2011 -0800
Added ability to remove focus to main window in broker, and made simplecontact base do this on escape in the box
diff --git a/mitchcapper/FSClient/Broker.cs b/mitchcapper/FSClient/Broker.cs
index e0098b7..0372d51 100644
--- a/mitchcapper/FSClient/Broker.cs
+++ b/mitchcapper/FSClient/Broker.cs
@@ -6,8 +6,8 @@ using System.Windows;
using System.Windows.Controls;
using System.Xml;
-using FreeSWITCH.Native;
-using FSClient.Controls;
+using FreeSWITCH.Native;
+using FSClient.Controls;
using Timer = System.Timers.Timer;
namespace FSClient {
@@ -229,7 +229,7 @@ namespace FSClient {
public void DialString(String str){
if (string.IsNullOrWhiteSpace(str))
return;
- MainWindow.get_instance().RemoveFocus();
+ MainWindowRemoveFocus();
if (str.StartsWith("#") && str.Length > 2) {
String acct_num = str.Substring(1, 1);
@@ -567,11 +567,14 @@ namespace FSClient {
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();
}
+ public void MainWindowRemoveFocus(){
+ MainWindow.get_instance().RemoveFocus();
+ }
private delegate void BroadcastEventDel(FSEvent evt);
BroadcastEventDel BroadcastHandler;
private void BroadcastEvent(FSEvent evt) {
diff --git a/mitchcapper/FSClient/SimpleContactPluginBase.cs b/mitchcapper/FSClient/SimpleContactPluginBase.cs
index bcf73d1..d2fbc41 100644
--- a/mitchcapper/FSClient/SimpleContactPluginBase.cs
+++ b/mitchcapper/FSClient/SimpleContactPluginBase.cs
@@ -1,5 +1,5 @@
using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
@@ -49,25 +49,25 @@ namespace FSClient
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);
+ 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);
- }
-
+ }
+
+ 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;
@@ -82,8 +82,8 @@ namespace FSClient
default_edit_value = DefaultEditValue(c);
}
else{
- SearchAutoCompleteEntry entry = item.DataContext as SearchAutoCompleteEntry ?? search_box.SelectedItem as SearchAutoCompleteEntry;
-
+ SearchAutoCompleteEntry entry = item.DataContext as SearchAutoCompleteEntry ?? search_box.SelectedItem as SearchAutoCompleteEntry;
+
if (entry == null)
return;
number = entry.number;
@@ -147,9 +147,10 @@ namespace FSClient
}
}
protected void search_box_PreviewKeyUp(object sender, KeyEventArgs e){
- if (e.Key == Key.Enter){
- call_current_contact();
- }
+ if (e.Key == Key.Enter)
+ call_current_contact();
+ else if (e.Key == Key.Escape)
+ Broker.get_instance().MainWindowRemoveFocus();
}
protected OurAutoCompleteBox search_box;
@@ -165,19 +166,19 @@ namespace FSClient
real_search_box.ContextMenu.Items.Add(item);
}
- search_box.PreviewKeyUp += search_box_PreviewKeyUp;
+ 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();
+ }
+ 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){
-----------------------------------------------------------------------
Summary of changes:
mitchcapper/FSClient/Broker.cs | 13 +++--
mitchcapper/FSClient/Setup/FSCore.wxs | 2 +-
mitchcapper/FSClient/SimpleContactPluginBase.cs | 65 ++++++++++++-----------
3 files changed, 42 insertions(+), 38 deletions(-)
hooks/post-receive
--
FreeSWITCH user-contributed scripts, etc
More information about the Freeswitch-trunk
mailing list