Attachment 303115 Details for Bug 199389 – update patch with gettext macro'ed

[patch] update patch with gettext macro'ed

scim-bridge-0.4.15-bz199389.patch (text/plain), 5.54 KB, created by Caius Chance on 2008-04-21 07:02:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caius Chance

Created: 2008-04-21 07:02:18 UTC

Size: 5.54 KB

patch

obsolete

>diff -up scim-bridge-0.4.15/agent/scim-bridge-agent.cpp.1-bz199389 scim-bridge-0.4.15/agent/scim-bridge-agent.cpp
>--- scim-bridge-0.4.15/agent/scim-bridge-agent.cpp.1-bz199389	2008-02-24 10:08:43.000000000 +1000
>+++ scim-bridge-0.4.15/agent/scim-bridge-agent.cpp	2008-04-21 16:50:38.000000000 +1000
>@@ -96,6 +96,7 @@ class ScimBridgeAgentImpl: public ScimBr
>         void quit ();
>         void load_config ();
>         void save_config ();
>+        ConfigPointer get_config();
> 
>         void add_client_listener (ScimBridgeAgentClientListener *client_listener);
>         void remove_client_listener (ScimBridgeAgentClientListener *client_listener);
>@@ -529,6 +530,27 @@ void ScimBridgeAgentImpl::slot_reload_co
>     scim_global_config_flush ();
> 
>     scim_keyboard_layout = scim_get_default_keyboard_layout ();
>+
>+    // Hot key name, hot key config key.
>+    // ! Update hotkey_list_length according to updated list length.
>+    int hotkey_list_length = 6;
>+    String hotkey_list[][2] = {
>+        { _("Toggle on/off: "), "/Hotkeys/FrontEnd/Trigger" },
>+        { _("Turn on: "), "/Hotkeys/FrontEnd/On" },
>+        { _("Turn off: "), "/Hotkeys/FrontEnd/Off" },
>+        { _("Next input method: "), "/Hotkeys/FrontEnd/NextFactory" },
>+        { _("Previous input method: "), "/Hotkeys/FrontEnd/PreviousFactory" },
>+        { _("Show input method menu: "), "/Hotkeys/FrontEnd/ShowFactoryMenu" }
>+    };
>+                           
>+    // Undefined hot keys are hidden from help window.
>+    String help_hotkeys = "\nGlobal Hotkeys:";
>+    for ( int i = 0; i < hotkey_list_length; i++ ) {
>+        String tmp_hotkeys = scim_config->read (String (hotkey_list[i][1]), String (""));
>+        if ( tmp_hotkeys != "" )
>+            help_hotkeys +=  "\n" + hotkey_list[i][0] + tmp_hotkeys;
>+    }
>+    ScimBridgeAgentIMContext::set_help_hotkeys (help_hotkeys);
> }
> 
> 
>diff -up scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp.1-bz199389 scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp
>--- scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp.1-bz199389	2007-11-07 20:48:45.000000000 +1000
>+++ scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp	2008-04-21 16:48:35.000000000 +1000
>@@ -60,6 +60,8 @@ static unsigned int imengine_id = 0;
> 
> static bool on_the_spot_enabled = true;
> 
>+static String help_hotkeys = "abcde";
>+
> /* Class definition */
> class ScimBridgeAgentIMContextImpl: public ScimBridgeAgentIMContext
> {
>@@ -137,6 +139,7 @@ class ScimBridgeAgentIMContextImpl: publ
>         void alloc_imengine ();
>         void free_imengine ();
> 
>+
>     private:
> 
>         scim_bridge_imcontext_id_t id;
>@@ -273,6 +276,12 @@ void ScimBridgeAgentIMContext::set_on_th
> }
> 
> 
>+void ScimBridgeAgentIMContext::set_help_hotkeys (const String &hotkey_str)
>+{
>+    help_hotkeys = hotkey_str;
>+}
>+
>+
> ScimBridgeAgentIMContextImpl::ScimBridgeAgentIMContextImpl (ScimBridgeAgentClientListener *new_client_listener):
> client_listener (new_client_listener), imengine (NULL), enabled (false), preedit_mode (PREEDIT_ANY),
> preedit_shown (false), preedit_cursor_position (0)
>@@ -915,24 +924,27 @@ void ScimBridgeAgentIMContextImpl::panel
> 
> void ScimBridgeAgentIMContextImpl::panel_request_help ()
> {
>-    String help =  String (_ ("Smart Common Input Method platform ")) +
>-        String (SCIM_VERSION) +
>-        String (_ ("\n(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n\n"));
>+    String help =  String (_ ("SCIM Bridge")) +
>+    String (VERSION) +
>+    String (_ ("\n(C) 2006-2008 Ryo Dairiki <ryo-dairiki@users.sourceforge.net>\n")) +
>+    help_hotkeys +
>+    String ("\n\n");
> 
>-        IMEngineFactoryPointer factory = scim_backend->get_factory (get_imengine ()->get_factory_uuid ());
>-        if (factory.null ()) factory = fallback_imengine_factory;
>-            help += utf8_wcstombs (factory->get_name ());
>-            help += String (_ (":\n\n"));
>+    IMEngineFactoryPointer factory = scim_backend->get_factory (get_imengine ()->get_factory_uuid ());
>+    if (factory.null ()) factory = fallback_imengine_factory;
>+
>+    help += utf8_wcstombs (factory->get_name ());
>+    help += String (_ (":\n\n"));
> 
>-            help += utf8_wcstombs (factory->get_authors ());
>-            help += String (_ ("\n\n"));
>+    help += utf8_wcstombs (factory->get_authors ());
>+    help += String (_ ("\n\n"));
> 
>-            help += utf8_wcstombs (factory->get_help ());
>-            help += String (_ ("\n\n"));
>+    help += utf8_wcstombs (factory->get_help ());
>+    help += String (_ ("\n\n"));
> 
>-            help += utf8_wcstombs (factory->get_credits ());
>+    help += utf8_wcstombs (factory->get_credits ());
> 
>-            panel_listener->show_help (help);
>+    panel_listener->show_help (help);
> }
> 
> 
>diff -up scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h.1-bz199389 scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h
>--- scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h.1-bz199389	2007-06-02 13:33:48.000000000 +1000
>+++ scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h	2008-04-21 16:29:23.000000000 +1000
>@@ -130,6 +130,21 @@ class ScimBridgeAgentIMContext
>         static void set_enabled_by_default (bool enabled);
> 
>         /**
>+         * Get the hotkey help messages.
>+         *
>+         * @return help messages about hotkeys.
>+         */
>+        static scim::String get_help_hotkeys ();
>+
>+        /**
>+         * Set the hotkey help messages.
>+         *
>+         * @param hotkey_str Help message about hotkeys.
>+         *
>+         */
>+        static void set_help_hotkeys (const scim::String &hotkey_str);
>+
>+        /**
>          * Destructor.
>          */
>         virtual ~ScimBridgeAgentIMContext () {}

Actions: View | Diff

Attachments on bug 199389: 297144 | 297145 | 297146 | 303112 | 303115 | 303116 | 303231 | 309559 | 310009