display the input language on the notification bar when trigger key is pressed

Change-Id: Ieee4c7c0a81f80e9d34c9187ee93b544f99819d6

diff --git a/configure.ac b/configure.ac
index e758954..2c15fb9 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script
 #AC_INIT(scim, 1.4.7, suzhe@tsinghua.org.cn)
-AC_INIT(isf, 2.4.6205, isf@samsung.com)
+AC_INIT(isf, 2.4.6207, isf@samsung.com)
 AC_CONFIG_SRCDIR([ism/src/scim.h])
 m4_pattern_allow([^AS_])
 
@@ -11,7 +11,7 @@ m4_pattern_allow([^AS_])
 # ISF version
 ISF_MAJOR_VERSION=2
 ISF_MINOR_VERSION=4
-ISF_MICRO_VERSION=6205
+ISF_MICRO_VERSION=6207
 
 ISF_VERSION=$ISF_MAJOR_VERSION.$ISF_MINOR_VERSION.$ISF_MICRO_VERSION
 

diff --git a/ism/extras/efl_immodule/isf_imf_context.cpp b/ism/extras/efl_immodule/isf_imf_context.cpp
index 8c28cc6..97ad0a9 100644 (file)
--- a/ism/extras/efl_immodule/isf_imf_context.cpp
+++ b/ism/extras/efl_immodule/isf_imf_context.cpp
@@ -231,6 +231,7 @@ static void     reload_config_callback                  (const ConfigPointer
 
 static void     fallback_commit_string_cb               (IMEngineInstanceBase   *si,
                                                          const WideString       &str);
+static void     _display_input_language                 (EcoreIMFContextISF *ic);
 
 /* Local variables declaration */
 static String                                           _language;
@@ -2391,17 +2392,20 @@ filter_hotkeys (EcoreIMFContextISF *ic, const KeyEvent &key)
             LOGE ("SCIM_FRONTEND_HOTKEY_TRIGGER. Turn off input context");
             turn_off_ic (ic);
         }
+        _display_input_language (ic);
         ret = true;
     } else if (hotkey_action == SCIM_FRONTEND_HOTKEY_ON) {
         if (!ic->impl->is_on) {
             LOGE ("SCIM_FRONTEND_HOTKEY_ON. Turn on input context");
             turn_on_ic (ic);
+            _display_input_language (ic);
         }
         ret = true;
     } else if (hotkey_action == SCIM_FRONTEND_HOTKEY_OFF) {
         if (ic->impl->is_on) {
             LOGE ("SCIM_FRONTEND_HOTKEY_OFF. Turn off input context");
             turn_off_ic (ic);
+            _display_input_language (ic);
         }
         ret = true;
     } else if (hotkey_action == SCIM_FRONTEND_HOTKEY_NEXT_FACTORY) {
@@ -2798,6 +2802,22 @@ _popup_message (const char *_ptext)
 }
 
 static void
+_display_input_language (EcoreIMFContextISF *ic)
+{
+    IMEngineFactoryPointer sf;
+
+    if (ic && ic->impl) {
+        if (ic->impl->is_on) {
+            sf = _backend->get_factory (ic->impl->si->get_factory_uuid ());
+            _popup_message (scim_get_language_name (sf->get_language ()).c_str ());
+        }
+        else {
+            _popup_message (scim_get_language_name ("en").c_str());
+        }
+    }
+}
+
+static void
 open_next_factory (EcoreIMFContextISF *ic)
 {
     SCIM_DEBUG_FRONTEND(2) << __FUNCTION__ << " context=" << ic->id << "\n";

diff --git a/packaging/isf.spec b/packaging/isf.spec
index cdf587f..ce6350c 100755 (executable)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -3,7 +3,7 @@
 
 Name:       isf
 Summary:    Input Service Framework
-Version:    2.4.6205
+Version:    2.4.6207
 Release:    1
 Group:      System Environment/Libraries
 License:    LGPL

diff --git a/releasenote.txt b/releasenote.txt
index a65b1ac..4a16361 100644 (file)
--- a/releasenote.txt
+++ b/releasenote.txt
@@ -1,3 +1,13 @@
+ISF 2.4.6207 :
+ 1. [setting] on_pause on_resume function update
+ 2. Set app privilege for scim process
+ 3. change trigger hotkey to shift+space according to H/W keyboard UI guide
+ 4. Check hardware keyboard when update ISE information
+ 5. [isf-panel-efl] Update candidate window resize
+ 6. [isf-panel-efl ] Added code for sending GEOMETRY_EVENT when there is a change
+ 7. [immodule] display the language on the notification bar when trigger key is pressed.
+
+
 ISF 2.4.6205 :
  1. Launch initial ISE when active soft ISE is removed