From 818f6e3f704ad477e9646db6e34e5d2203a63b9c Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 12 Dec 2000 15:25:27 +0000 Subject: [PATCH] Fix spellchecker popups glitch, TOC menu glitch, remove dependency on xforms in lyxlookup.C git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1275 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 8 ++++++++ forms/sp_form.fd | 8 ++++---- src/frontends/xforms/Menubar_pimpl.C | 3 ++- src/lyxlookup.C | 17 +++++++++-------- src/sp_form.C | 8 ++++---- 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58557966d8..edc14183d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2000-12-11 Jean-Marc Lasgouttes + * src/lyxlookup.C: do not condition on FL_REVISION. + + * forms/sp_form.fd: + * src/sp_form.C: fix the font size of some text entries + + * src/frontends/xforms/Menubar_pimpl.C (add_toc): honor separator + after TOC when there is no TOC. + * src/lyxrc.C (readBindFileIfNeeded): new method. Reads the main bind file if it has not been done yet. (read): remove local bindFile variable. Try to fix the handling of diff --git a/forms/sp_form.fd b/forms/sp_form.fd index 03762369a2..fc36a1aba6 100644 --- a/forms/sp_form.fd +++ b/forms/sp_form.fd @@ -146,7 +146,7 @@ boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE -size: 0 +size: FL_NORMAL_SIZE lcol: FL_BLACK label: shortcut: @@ -272,7 +272,7 @@ boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE -size: 0 +size: FL_NORMAL_SIZE lcol: FL_BLACK label: shortcut: @@ -290,7 +290,7 @@ boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE -size: 0 +size: FL_NORMAL_SIZE lcol: FL_BLACK label: shortcut: @@ -386,7 +386,7 @@ boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE style: FL_NORMAL_STYLE -size: 0 +size: FL_NORMAL_SIZE lcol: FL_BLACK label: shortcut: diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C index 1f1a198a79..891ebdef56 100644 --- a/src/frontends/xforms/Menubar_pimpl.C +++ b/src/frontends/xforms/Menubar_pimpl.C @@ -336,7 +336,8 @@ void Menubar::Pimpl::add_toc(int menu, string const & extra_label, // Handle normal TOC if (max_nonempty == 0 && toc_list[0].empty()) { - fl_addtopup(menu,_("No Table of Contents%i")); + fl_addtopup(menu, (_("No Table of Contents%i") + + extra_label).c_str()); return; } diff --git a/src/lyxlookup.C b/src/lyxlookup.C index 0b48540116..16007c6552 100644 --- a/src/lyxlookup.C +++ b/src/lyxlookup.C @@ -17,11 +17,9 @@ #ifdef HAVE_XOPENIM // This part is the full blown Input Method manager for X11R5 and up. // For the plain-and-old-X11R4 version, see later. -#include FORMS_H_LOCATION -//#include -//#include -//#include -#if FL_REVISION < 89 +#include +#include +#include #ifdef HAVE_LOCALE_H #include #endif @@ -41,7 +39,11 @@ XComposeStatus compose_status= {0, 0}; void InitLyXLookup(Display * display, Window window) { xic = 0; - + + lyxerr[Debug::KEY] + << "InitLyXLookup: creating an input context." + << endl; + // This part could be done before opening display setlocale(LC_CTYPE, ""); if (!XSupportsLocale()) { @@ -185,7 +187,7 @@ int LyXLookupString(XEvent * event, lyxerr[Debug::KEY] << "XBufferOverflow" << endl; break; case XLookupBoth: - lyxerr[Debug::KEY] << "XLookupBoth" + lyxerr[Debug::KEY] << "XLookupBoth " << string(buffer_return, result) << endl; break; @@ -264,4 +266,3 @@ void CloseLyXLookup() #endif // HAVE_XOPENIM -#endif diff --git a/src/sp_form.C b/src/sp_form.C index ebc087bf62..af7eeac027 100644 --- a/src/sp_form.C +++ b/src/sp_form.C @@ -30,7 +30,7 @@ FD_form_spell_options *create_form_form_spell_options(void) fl_end_group(); fdui->altlang_input = obj = fl_add_input(FL_NORMAL_INPUT, 40, 90, 240, 30, ""); - fl_set_object_lsize(obj, 0); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); fdui->compounds = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 160, 320, 30, idex(_("Treat run-together words as legal|#T")));fl_set_button_shortcut(obj, scex(_("Treat run-together words as legal|#T")), 1); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fdui->inpenc = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 190, 320, 30, idex(_("Input Encoding switch to ispell|#I")));fl_set_button_shortcut(obj, scex(_("Input Encoding switch to ispell|#I")), 1); @@ -48,9 +48,9 @@ FD_form_spell_options *create_form_form_spell_options(void) fdui->esc_chars = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 280, 320, 30, idex(_("Extra special chars allowed in words:|#E")));fl_set_button_shortcut(obj, scex(_("Extra special chars allowed in words:|#E")), 1); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fdui->perdict_input = obj = fl_add_input(FL_NORMAL_INPUT, 40, 250, 240, 30, ""); - fl_set_object_lsize(obj, 0); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); fdui->esc_chars_input = obj = fl_add_input(FL_NORMAL_INPUT, 40, 310, 240, 30, ""); - fl_set_object_lsize(obj, 0); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); obj = fl_add_text(FL_NORMAL_TEXT, 20, 10, 90, 20, _("Dictionary")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE); @@ -81,7 +81,7 @@ FD_form_spell_check *create_form_form_spell_check(void) fl_set_object_lsize(obj, 0); fdui->text = obj = fl_add_text(FL_NORMAL_TEXT, 80, 10, 220, 30, ""); fl_set_object_boxtype(obj, FL_DOWN_BOX); - fl_set_object_lsize(obj, 0); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE); fdui->input = obj = fl_add_input(FL_NORMAL_INPUT, 80, 40, 220, 30, _("Replace")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); -- 2.39.5