From: buliabyak <buliabyak@users.sourceforge.net>
Date: Fri, 3 Nov 2006 02:49:02 +0000 (+0000)
Subject: enable Ctrl+Shift+U to switch Unicode mode; add explanatory (Enter to finish) to... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f3e0c0e81a2b461c5c6b182084d31d395a44bd23;p=inkscape.git

enable Ctrl+Shift+U to switch Unicode mode; add explanatory (Enter to finish) to the statusbar
---

diff --git a/src/text-context.cpp b/src/text-context.cpp
index 3a6d2f57b..e969ffbfc 100644
--- a/src/text-context.cpp
+++ b/src/text-context.cpp
@@ -574,9 +574,9 @@ show_curr_uni_char(SPTextContext *const tc)
             }
         }
         tc->defaultMessageContext()->setF(Inkscape::NORMAL_MESSAGE,
-                                          _("Unicode: %s: %s"), tc->uni, utf8);
+                                          _("Unicode (<b>Enter</b> to finish): %s: %s"), tc->uni, utf8);
     } else {
-        tc->defaultMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Unicode: "));
+        tc->defaultMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Unicode (<b>Enter</b> to finish): "));
     }
 }
 
@@ -834,14 +834,14 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event)
                                 break;
                             case GDK_U:
                             case GDK_u:
-                                if (MOD__CTRL_ONLY) {
+                                if (MOD__CTRL_ONLY || (MOD__CTRL && MOD__SHIFT)) {
                                     if (tc->unimode) {
                                         tc->unimode = false;
                                         ec->defaultMessageContext()->clear();
                                     } else {
                                         tc->unimode = true;
                                         tc->unipos = 0;
-                                        ec->defaultMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Unicode: "));
+                                        ec->defaultMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Unicode (<b>Enter</b> to finish): "));
                                     }
                                     if (tc->imc) {
                                         gtk_im_context_reset(tc->imc);