rpms/scim-bridge/devel scim-bridge-0.4.15-hotkey-help.patch, NONE, 1.1 scim-bridge.spec, 1.57, 1.58

[Huang Peng (phuang)]

Author: phuang

Update of /cvs/pkgs/rpms/scim-bridge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20102

Modified Files:
	scim-bridge.spec 
Added Files:
	scim-bridge-0.4.15-hotkey-help.patch 
Log Message:
Resolves: rhbz#199389 (Add global hotkey list in help window.)


scim-bridge-0.4.15-hotkey-help.patch:

--- NEW FILE scim-bridge-0.4.15-hotkey-help.patch ---
diff -up scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp.hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp
--- scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp.hotkey-help	2007-11-07 18:48:45.000000000 +0800
+++ scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp	2008-03-07 15:21:25.000000000 +0800
@@ -60,6 +60,8 @@ static unsigned int imengine_id = 0;
 
 static bool on_the_spot_enabled = true;
 
+static String help_hotkeys = "";
+
 /* 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,17 @@ void ScimBridgeAgentIMContext::set_on_th
 }
 
 
+void ScimBridgeAgentIMContext::set_help_hotkeys (const String &hotkey_str)
+{
+    help_hotkeys = hotkey_str;
+}
+
+String ScimBridgeAgentIMContext::get_help_hotkeys ()
+{
+    return help_hotkeys;
+}
+
+
 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)
@@ -917,7 +931,9 @@ void ScimBridgeAgentIMContextImpl::panel
 {
     String help =  String (_ ("Smart Common Input Method platform ")) +
         String (SCIM_VERSION) +
-        String (_ ("\n(C) 2002-2005 James Su <suzhe at tsinghua.org.cn>\n\n"));
+        String (_ ("\n(C) 2002-2005 James Su <suzhe at tsinghua.org.cn>\n\n")) +
+        help_hotkeys +
+        String ("\n\n");
 
         IMEngineFactoryPointer factory = scim_backend->get_factory (get_imengine ()->get_factory_uuid ());
         if (factory.null ()) factory = fallback_imengine_factory;
diff -up scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h.hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h
--- scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h.hotkey-help	2007-06-02 11:33:48.000000000 +0800
+++ scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h	2008-03-07 15:19:12.000000000 +0800
@@ -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 () {}
diff -up scim-bridge-0.4.15/agent/scim-bridge-agent.cpp.hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent.cpp
--- scim-bridge-0.4.15/agent/scim-bridge-agent.cpp.hotkey-help	2008-02-24 08:08:43.000000000 +0800
+++ scim-bridge-0.4.15/agent/scim-bridge-agent.cpp	2008-03-07 15:22:27.000000000 +0800
@@ -529,6 +529,23 @@ void ScimBridgeAgentImpl::slot_reload_co
     scim_global_config_flush ();
 
     scim_keyboard_layout = scim_get_default_keyboard_layout ();
+
+    String help_hotkeys;
+
+    help_hotkeys = String (_ ("\nGlobal Hotkeys:")) +
+        String (_ ("\n\nTrigger: ")) +
+        scim_config->read (String ("/Hotkeys/FrontEnd/Trigger"), String ("Unable to be loaded.")) +
+        String (_ ("\n\nTurn on: ")) +
+        scim_config->read (String ("/Hotkeys/FrontEnd/On"), String ("Unable to be loaded.")) +
+        String (_ ("\n\nTurn off: ")) +
+        scim_config->read (String ("/Hotkeys/FrontEnd/Off"), String ("Unable to be loaded.")) +
+        String (_ ("\n\nNext input method: ")) +
+        scim_config->read (String ("/Hotkeys/FrontEnd/NextFactory"), String ("Unable to be loaded.")) +
+        String (_ ("\n\nPrevious input method: ")) +
+        scim_config->read (String ("/Hotkeys/FrontEnd/PreviousFactory"), String ("Unable to be loaded."));
+        String (_ ("\n\nShow input method menu: ")) +
+        scim_config->read (String ("/Hotkeys/FrontEnd/ShowFactoryMenu"), String ("Unable to be loaded."));
+        ScimBridgeAgentIMContext::set_help_hotkeys (help_hotkeys);
 }
 
 


Index: scim-bridge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/devel/scim-bridge.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- scim-bridge.spec	4 Mar 2008 05:04:51 -0000	1.57
+++ scim-bridge.spec	7 Mar 2008 07:27:27 -0000	1.58
@@ -5,7 +5,7 @@
 
 Name:           scim-bridge
 Version:        0.4.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SCIM Bridge Gtk IM module
 
 Group:          System Environment/Libraries
@@ -24,6 +24,7 @@
 Requires:       scim >= 1.4.6
 
 Patch0:         scim-bridge-0.4.15-fix-gdm.patch
+Patch1:         scim-bridge-0.4.15-hotkey-help.patch
 
 
 %description
@@ -71,6 +72,7 @@
 %prep
 %setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}}
 %patch0 -p1 -b .0-fix-gdm
+%patch1 -p1 -b .1-hotkey-help
 
 %if %{snapshot}
 mkdir m4
@@ -141,6 +143,9 @@
 
 
 %changelog
+* Fri Mar 07 2008 Caius Chance <cchance at redhat.com> - 0.4.15-2
+- Resolves: rhbz#199389 (Add global hotkey list in help window.)
+
 * Tue Mar 04 2008 Huang Peng <phuang at redhat.com> - 0.4.15-1
 - Update to 0.4.15.
 - Let scim-bridge gtkim context can work with gtkplug widget #251787.