X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FIntl.cpp;h=fdae0b1aba144b5bc1471e0749830fba66d0f7ea;hb=02d2e4aa3279b872c9786718dab4f95fd44e900a;hp=fe91d4e7e0fbf84f89f7d5838aca2e51533bcc13;hpb=f630be890494c849981e4fb52ea4740506e92bed;p=lyx.git diff --git a/src/Intl.cpp b/src/Intl.cpp index fe91d4e7e0..fdae0b1aba 100644 --- a/src/Intl.cpp +++ b/src/Intl.cpp @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author unknown - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Angus Leeming * \author John Levon * @@ -14,16 +14,13 @@ #include #include "Intl.h" -#include "debug.h" #include "LyXRC.h" +#include "support/debug.h" namespace lyx { -using std::endl; - - Intl::Intl() : keymap(Intl::PRIMARY), keymapon(lyxrc.use_kbmap), prim_lang(lyxrc.primary_kbmap), sec_lang(lyxrc.secondary_kbmap) @@ -40,18 +37,19 @@ void Intl::keyMapOn(bool on) keyMapPrim(); else keyMapSec(); - } else + } else { trans.disableKeymap(); + } } void Intl::toggleKeyMap() { - if (keymapon && (keymap == PRIMARY)) { + if (keymapon && (keymap == PRIMARY)) keyMapSec(); - } else if (keymapon) { + else if (keymapon) keyMapOn(false); - } else + else keyMapPrim(); } @@ -78,7 +76,7 @@ void Intl::keyMapSec() void Intl::initKeyMapper(bool on) { - LYXERR(Debug::INIT) << "Initializing key mappings..." << endl; + LYXERR(Debug::INIT, "Initializing key mappings..."); if (trans.setPrimary(prim_lang) == -1) prim_lang.erase();