#include "trans_mgr.h"
#include "support/lstrings.h"
#include "language.h"
+#include "frontends/Dialogs.h" // redrawGUI
+
+#ifdef SIGC_CXX_NAMESPACES
+using SigC::slot;
+#endif
using std::endl;
primarykeymap = false;
curkeymap = 0;
otherkeymap = 0;
+ r_ = Dialogs::redrawGUI.connect(slot(this, &Intl::redraw));
+}
+
+Intl::~Intl()
+{
+ r_.disconnect();
+ delete trans;
+}
+
+
+void Intl::redraw()
+{
+ if (fd_form_keymap && fd_form_keymap->KeyMap->visible)
+ fl_redraw_form(fd_form_keymap->KeyMap);
}
fl_set_button(fd_form_keymap->KeyOnBtn2, 0);
/* read text from choice */
- int i = Language->get();
+ int const i = Language->get();
-#if 0
- if (lyxerr.debugging(Debug::KBMAP))
- lyxerr << "Table: " << tex_babel[i-1] << endl;
-#endif
string p;
if (i == otherkeymap)
p = fl_get_input(fd_form_keymap->OtherKeymap);
fl_set_button(fd_form_keymap->KeyOnBtn2, 1);
/* read text from choice */
- int i = Language2->get();
+ int const i = Language2->get();
-#if 0
- if (lyxerr.debugging(Debug::KBMAP))
- lyxerr << "Table: " << tex_babel[i-1] << endl;
-#endif
string p;
if (i == otherkeymap)
p = fl_get_input(fd_form_keymap->OtherKeymap2);
}
}
-
-void Intl::LCombo(int, void * v)
-{
- Intl * itl = static_cast<Intl*>(v);
- itl->Keymap(23);
- return;
-}
-
-
-void Intl::LCombo2(int, void * v)
+void Intl::LCombo(int, void * v, Combox * combox)
{
Intl * itl = static_cast<Intl*>(v);
- itl->Keymap(43);
+ if (combox == itl->Language)
+ itl->Keymap(23);
+ else if (combox == itl->Language2)
+ itl->Keymap(43);
return;
}
-
void Intl::DispatchCallback(FL_OBJECT * ob, long code)
{
if (ob && (code == 0)) {
Language = new Combox(FL_COMBOX_DROPLIST);
Language2 = new Combox(FL_COMBOX_DROPLIST);
Language->setcallback(LCombo, this);
- Language2->setcallback(LCombo2, this);
+ Language2->setcallback(LCombo, this);
fd_form_keymap = create_form_KeyMap();
Language2->add(120, 110, 160, 30, 300); // Secondary
fl_end_form();
-#if 0
int n = 0;
- while (true)
- if (!strlen(tex_babel[n]))
- break;
- else {
- Language->addto(tex_babel[n]);
- Language2->addto(tex_babel[n]);
- ++n;
- }
-#else
- int n = 1;
// Default is not in the language map
+#ifdef DO_USE_DEFAULT_LANGUAGE
Language->addto("default");
Language2->addto("default");
+ ++n;
+#endif
for (Languages::const_iterator cit = languages.begin();
cit != languages.end(); ++cit) {
- Language->addto((*cit).second.lang.c_str());
- Language2->addto((*cit).second.lang.c_str());
+ Language->addto((*cit).second.lang());
+ Language2->addto((*cit).second.lang());
++n;
}
-#endif
+
Language->addto(_("other..."));
Language2->addto(_("other..."));
otherkeymap = n + 1;
- if (!Language->select_text(prim_lang.c_str())) {
- Language->select(n+1);
+ if (!Language->select_text(prim_lang)) {
+ Language->select(n + 1);
fl_set_input(fd_form_keymap->OtherKeymap, prim_lang.c_str());
}
else
trans->SetPrimary(prim_lang);
- if (!Language2->select_text(sec_lang.c_str())) {
+ if (!Language2->select_text(sec_lang)) {
Language2->select(n + 1);
fl_set_input(fd_form_keymap->OtherKeymap2, sec_lang.c_str());
}
if (keymapon)
Keymap(23); // turn primary on
- trans->setCharset(lyxrc.font_norm.c_str());
+ trans->setCharset(lyxrc.font_norm);
}
{
if (fd_form_keymap->KeyMap->visible) {
fl_raise_form(fd_form_keymap->KeyMap);
- } else fl_show_form(fd_form_keymap->KeyMap, FL_PLACE_MOUSE,
- FL_FULLBORDER, _("Key Mappings"));
+ } else fl_show_form(fd_form_keymap->KeyMap,
+ FL_PLACE_MOUSE | FL_FREE_SIZE, FL_TRANSIENT,
+ _("Key Mappings"));
}