* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-1999 The LyX Team.
+ * Copyright 1995-2000 The LyX Team.
*
* ====================================================== */
#include "lyx_gui_misc.h" // CancelCloseBoxCB
#include "debug.h"
#include "lyxrc.h"
+
+#if 0
#include "trans_mgr.h"
+#endif
+
#include "support/lstrings.h"
+#include "language.h"
+#include "frontends/Dialogs.h" // redrawGUI
-extern LyXRC * lyxrc;
+#ifdef SIGC_CXX_NAMESPACES
+using SigC::slot;
+#endif
+
+using std::endl;
// a wrapper around the callback static member.
extern "C" void C_Intl_DispatchCallback(FL_OBJECT * ob, long code);
Intl::Intl()
- : prim_lang(lyxrc->primary_kbmap),
- sec_lang(lyxrc->secondary_kbmap),
- trans(new TransManager)
+ : prim_lang(lyxrc.primary_kbmap),
+ sec_lang(lyxrc.secondary_kbmap)
+#if 0
+ , trans(new TransManager)
+#endif
{
- keymapon = lyxrc->use_kbmap;
+ keymapon = lyxrc.use_kbmap;
chsetcode = 0;
primarykeymap = false;
curkeymap = 0;
otherkeymap = 0;
+ r_ = Dialogs::redrawGUI.connect(slot(this, &Intl::redraw));
+}
+
+
+Intl::~Intl()
+{
+ r_.disconnect();
+#if 0
+ delete trans;
+#endif
+}
+
+
+void Intl::redraw()
+{
+ if (fd_form_keymap && fd_form_keymap->KeyMap->visible)
+ fl_redraw_form(fd_form_keymap->KeyMap);
}
{
if (lyxerr.debugging(Debug::KBMAP))
lyxerr << "Primary: `" << lang << "'" << endl;
+#if 0
return trans->SetPrimary(lang);
+#else
+ return trans.SetPrimary(lang);
+#endif
}
{
if (lyxerr.debugging(Debug::KBMAP))
lyxerr << "Secondary: `" << lang << "'" << endl;
+#if 0
return trans->SetSecondary(lang);
+#else
+ return trans.SetSecondary(lang);
+#endif
}
void Intl::KeyMapOn(bool on)
- /* turn on/off key mappings, status in keymapon */
+ // turn on/off key mappings, status in keymapon
{
keymapon = on;
} else {
fl_set_button(fd_form_keymap->KeyOffBtn, 1);
fl_hide_object(fd_form_keymap->KeymapErr);
+#if 0
trans->DisableKeymap();
+#else
+ trans.DisableKeymap();
+#endif
}
}
fl_set_button(fd_form_keymap->KeyOnBtn2, 0);
/* read text from choice */
- int i = Language->get();
-
- if (lyxerr.debugging(Debug::KBMAP))
- lyxerr << "Table: " << tex_babel[i-1] << endl;
+ int const i = Language->get();
string p;
if (i == otherkeymap)
curkeymap = i;
+#if 0
if (p.empty() || trans->SetPrimary(p)) {
+#else
+ if (p.empty() || trans.SetPrimary(p)) {
+#endif
// error selecting keymap
fl_show_object(fd_form_keymap->KeymapErr);
update();
} else {
// no error
+#if 0
trans->EnablePrimary();
+#else
+ trans.EnablePrimary();
+#endif
keymapon = true;
primarykeymap = true;
fl_hide_object(fd_form_keymap->KeymapErr);
fl_set_button(fd_form_keymap->KeyOnBtn, 0);
fl_set_button(fd_form_keymap->KeyOnBtn2, 1);
- /* read text from choice */
- int i = Language2->get();
-
- if (lyxerr.debugging(Debug::KBMAP))
- lyxerr << "Table: " << tex_babel[i-1] << endl;
+ // read text from choice
+ int const i = Language2->get();
string p;
if (i == otherkeymap)
p = Language2->getline();
curkeymap = i;
+#if 0
if (p.empty() || trans->SetSecondary(p)) {
// error selecting keymap
fl_show_object(fd_form_keymap->KeymapErr);
primarykeymap = false;
fl_hide_object(fd_form_keymap->KeymapErr);
}
+#else
+ if (p.empty() || trans.SetSecondary(p)) {
+ // error selecting keymap
+ fl_show_object(fd_form_keymap->KeymapErr);
+ update();
+ } else {
+ // no error
+ trans.EnableSecondary();
+ keymapon = true;
+ primarykeymap = false;
+ fl_hide_object(fd_form_keymap->KeymapErr);
+ }
+#endif
}
-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;
}
Intl * itl = static_cast<Intl *>(ob->u_vdata);
- if (itl!= 0) itl->Keymap(code);
+ if (itl != 0) itl->Keymap(code);
}
void Intl::InitKeyMapper(bool on)
- /* initialize key mapper */
+ // initialize key mapper
{
lyxerr[Debug::INIT] << "Initializing key mappings..." << endl;
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();
fl_hide_object(fd_form_keymap->KeymapErr);
fl_hide_object(fd_form_keymap->ChsetErr);
- fl_set_input(fd_form_keymap->Charset, lyxrc->font_norm.c_str());
+ fl_set_input(fd_form_keymap->Charset, lyxrc.font_norm.c_str());
// Adds two comboxes to the keyboard map
fl_addto_form(fd_form_keymap->KeyMap);
fl_end_form();
int n = 0;
+ // 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());
+ Language2->addto((*cit).second.lang());
+ ++n;
+ }
- while (true)
- if (!strlen(tex_babel[n]))
- break;
- else {
- Language->addto(tex_babel[n]);
- Language2->addto(tex_babel[n]);
- n++;
- }
-
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
+ else
+#if 0
trans->SetPrimary(prim_lang);
-
- if (!Language2->select_text(sec_lang.c_str())) {
+#else
+ trans.SetPrimary(prim_lang);
+#endif
+ if (!Language2->select_text(sec_lang)) {
Language2->select(n + 1);
fl_set_input(fd_form_keymap->OtherKeymap2, sec_lang.c_str());
}
else
+#if 0
trans->SetSecondary(sec_lang);
+#else
+ trans.SetSecondary(sec_lang);
+#endif
KeyMapOn(keymapon);
if (keymapon)
Keymap(23); // turn primary on
-
- trans->setCharset(lyxrc->font_norm.c_str());
+#if 0
+ trans->setCharset(lyxrc.font_norm);
+#else
+ trans.setCharset(lyxrc.font_norm);
+#endif
}
// spagetti example using a switch... (Lgb)
switch (code) {
case 0:
- /* cancel/hide */
+ // cancel/hide
fl_hide_form(fd_form_keymap->KeyMap);
break;
case 3:
KeyMapSec();
}
break;
- case 27: /* set new font norm */
+ case 27: // set new font norm
char const * p = fl_get_input(fd_form_keymap->Charset);
+#if 0
if (trans->setCharset(p))
+#else
+ if (trans.setCharset(p))
+#endif
fl_show_object(fd_form_keymap->ChsetErr);
else
fl_hide_object(fd_form_keymap->ChsetErr);
{
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"));
}