#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
+
+#ifdef SIGC_CXX_NAMESPACES
+using SigC::slot;
+#endif
using std::endl;
Intl::Intl()
: prim_lang(lyxrc.primary_kbmap),
- sec_lang(lyxrc.secondary_kbmap),
- trans(new TransManager)
+ sec_lang(lyxrc.secondary_kbmap)
+#if 0
+ , trans(new TransManager)
+#endif
{
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
}
}
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 */
+ // read text from choice
int const i = Language2->get();
string p;
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, Combox * combox)
{
Intl * itl = static_cast<Intl*>(v);
return;
}
+
void Intl::DispatchCallback(FL_OBJECT * ob, long code)
{
if (ob && (code == 0)) {
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->select(n + 1);
fl_set_input(fd_form_keymap->OtherKeymap, prim_lang.c_str());
}
- else
+ else
+#if 0
trans->SetPrimary(prim_lang);
-
+#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
-
+#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);