From bef7465dfcd1ce72c60c16cd8b818d80bdb18017 Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Thu, 11 Apr 2013 01:09:23 +0900 Subject: [PATCH] Modified to use ise-engine-default forcefully for some layouts --- packaging/ise-default.spec | 2 +- src/common.cpp | 2 +- src/include/ise.h | 4 +++- src/ise.cpp | 9 +++++++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/packaging/ise-default.spec b/packaging/ise-default.spec index b1feaf6..3df067d 100644 --- a/packaging/ise-default.spec +++ b/packaging/ise-default.spec @@ -1,6 +1,6 @@ Name: ise-default Summary: Tizen keyboard -Version: 0.7.5 +Version: 0.7.6 Release: 1 Group: TO BE / FILLED IN License: TO BE / FILLED IN diff --git a/src/common.cpp b/src/common.cpp index 2fe4534..19c54b7 100644 --- a/src/common.cpp +++ b/src/common.cpp @@ -292,7 +292,7 @@ void CISECommon::run(const sclchar *uuid, const scim::ConfigPointer &config, con Ecore_X_Window xwindow = elm_win_xwindow_get(m_main_window); char xid[255]; snprintf(xid, 255, "%d", xwindow); - scim::Property prop (xid, "XID", "ICON", "TIP"); + scim::Property prop (xid, "XID", "", ""); scim::PropertyList props; props.push_back (prop); m_helper_agent.register_properties (props); diff --git a/src/include/ise.h b/src/include/ise.h index 7193ad0..66270ce 100644 --- a/src/include/ise.h +++ b/src/include/ise.h @@ -29,12 +29,14 @@ #include "languages.h" -#define ISE_VERSION "0.7.5-1" +#define ISE_VERSION "0.7.6-1" #define LOCALEDIR "/usr/share/locale" #define PRIMARY_LATIN_LANGUAGE "English" #define MAIN_ENTRY_XML_PATH "/usr/share/isf/ise/ise-default/720x1280/default/sdk/main_entry.xml" +#define DEFAULT_KEYBOARD_ISE_UUID "d75857a5-4148-4745-89e2-1da7ddaf7999" + //#define INPUT_MODE_NATIVE MAX_INPUT_MODE /* Native mode. It will distinguish to the current user language */ //#define ISE_RELEASE_AUTOCOMMIT_BLOCK_INTERVAL 1300 diff --git a/src/ise.cpp b/src/ise.cpp index 658a1ef..abaad67 100644 --- a/src/ise.cpp +++ b/src/ise.cpp @@ -251,6 +251,15 @@ ise_set_layout(sclu32 layout) g_keyboard_state.need_reset = TRUE; } g_keyboard_state.layout = layout; + + if (layout == ISE_LAYOUT_STYLE_PHONENUMBER || + layout == ISE_LAYOUT_STYLE_IP || + layout == ISE_LAYOUT_STYLE_MONTH || + layout == ISE_LAYOUT_STYLE_NUMBERONLY) { + if (g_ise_common) { + g_ise_common->set_keyboard_ise_by_uuid(DEFAULT_KEYBOARD_ISE_UUID); + } + } } } -- 2.7.4