Change the hanja mode label to "Hanja Lock" and show its status with icon.

 * #1936449
   https://sourceforge.net/tracker/?func=detail&atid=650539&aid=1936449&group_id=108454

git-svn-id: https://scim.svn.sourceforge.net/svnroot/scim/scim-hangul/trunk@243 1ec84b21-7132-0410-a32e-e68a3534c3c7

diff --git a/data/Makefile.am b/data/Makefile.am
index f05a6f51d4345d29aa858a2064348837d9929ca6..398b10b0b5ce34ee14078e1e029f27fe24b3af02 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,9 @@
 MAINTAINERCLEANFILES   = Makefile.in
 
 icondir                        = $(SCIM_ICONDIR)
-icon_DATA              = scim-hangul.png
+icon_DATA              = scim-hangul.png \
+                         scim-hangul-on.png \
+                         scim-hangul-off.png
 
 symboldir              = @SCIM_HANGUL_DATADIR@
 symbol_DATA            = symbol.txt

diff --git a/data/scim-hangul-off.png b/data/scim-hangul-off.png
new file mode 100644 (file)
index 0000000..a621055
Binary files /dev/null and b/data/scim-hangul-off.png differ

diff --git a/data/scim-hangul-on.png b/data/scim-hangul-on.png
new file mode 100644 (file)
index 0000000..7980213
Binary files /dev/null and b/data/scim-hangul-on.png differ

diff --git a/src/scim_hangul_imengine.cpp b/src/scim_hangul_imengine.cpp
index 56fda74a2597321c5719f83fabf8211bd8498170..fc47c453b424148dbe8b72332e889ebdaef71e70 100644 (file)
--- a/src/scim_hangul_imengine.cpp
+++ b/src/scim_hangul_imengine.cpp
@@ -86,6 +86,9 @@
     #define SCIM_HANGUL_ICON_FILE           (SCIM_ICONDIR "/scim-hangul.png")
 #endif
 
+#define SCIM_HANGUL_ICON_ON      SCIM_ICONDIR "/scim-hangul-on.png"
+#define SCIM_HANGUL_ICON_OFF     SCIM_ICONDIR "/scim-hangul-off.png"
+
 static ConfigPointer _scim_config (0);
 
 static Property keyboard_layout   (SCIM_PROP_LAYOUT,    "");
@@ -876,9 +879,9 @@ HangulInstance::toggle_hanja_mode()
     m_factory->m_hanja_mode = !m_factory->m_hanja_mode;
 
     if (m_factory->m_hanja_mode) {
-       hanja_mode.set_label("漢");
+       hanja_mode.set_icon(SCIM_HANGUL_ICON_ON);
     } else {
-       hanja_mode.set_label("韓");
+       hanja_mode.set_icon(SCIM_HANGUL_ICON_OFF);
     }
 
     update_property(hanja_mode);
@@ -955,11 +958,12 @@ HangulInstance::register_all_properties()
        proplist.push_back(hangul_mode);
     }
 
-    if (is_hanja_mode()) {
-       hanja_mode.set_label("漢");
+    if (m_factory->m_hanja_mode) {
+       hanja_mode.set_icon(SCIM_HANGUL_ICON_ON);
     } else {
-       hanja_mode.set_label("韓");
+       hanja_mode.set_icon(SCIM_HANGUL_ICON_OFF);
     }
+    hanja_mode.set_label(_("Hanja Lock"));
     proplist.push_back(hanja_mode);
 
     register_properties(proplist);