X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_gui_misc.C;h=1a937143ed6d3c84e2d4efadab669e332e00b9c6;hb=9f7498dbdf16f61cd5c9ee82e0cb6576d2bf620f;hp=8d05868f4c909265b50edaed2c096ab5f23144a9;hpb=1fefef39080cbf6565d17acf3995312ce9bf067f;p=lyx.git diff --git a/src/lyx_gui_misc.C b/src/lyx_gui_misc.C index 8d05868f4c..1a937143ed 100644 --- a/src/lyx_gui_misc.C +++ b/src/lyx_gui_misc.C @@ -18,17 +18,11 @@ #include #include "lyx_gui_misc.h" #include "BufferView.h" -#include "bibforms.h" #include "buffer.h" -#include "form1.h" #include "gettext.h" -#include "include_form.h" -#include "log_form.h" -#include "layout_forms.h" -#include "lyx.h" +#include "figure_form.h" #include "lyx_cb.h" #include "lyx_main.h" -#include "mathed/math_forms.h" #include "minibuffer.h" #include "print_form.h" #include "sp_form.h" @@ -43,19 +37,10 @@ using std::endl; extern BufferView * current_view; -extern FD_form_character * fd_form_character; -extern FD_form_preamble * fd_form_preamble; -extern FD_form_sendto * fd_form_sendto; extern FD_form_figure * fd_form_figure; -extern FD_LaTeXLog * fd_latex_log; +extern FD_form_sendto * fd_form_sendto; extern FD_form_spell_check * fd_form_spell_check; -extern FD_panel * fd_panel; -extern FD_delim * fd_delim; -extern FD_deco * fd_deco; -extern FD_space * fd_space; -extern FD_matrix * fd_matrix; -extern FD_bibitem_form * bibitem_form; -extern FD_include * form; +extern FD_form_spell_options * fd_form_spell_options; extern void HideFiguresPopups(); @@ -64,15 +49,26 @@ extern "C" int CancelCloseBoxCB(FL_FORM *, void *) { return FL_CANCEL; } - - -// Prevents LyX from being killed when the close box is pressed in a popup. -extern "C" int IgnoreCloseBoxCB(FL_FORM *, void *) +// Redraw the form (on receipt of a Signal indicating, for example, +// that the xform colors have been re-mapped). +void RedrawAllBufferRelatedDialogs() { - return FL_IGNORE; + if (fd_form_figure->form_figure->visible) { + fl_redraw_form(fd_form_figure->form_figure); + } + if (fd_form_sendto->form_sendto->visible) { + fl_redraw_form(fd_form_sendto->form_sendto); + } + if (fd_form_spell_check && + fd_form_spell_check->form_spell_check->visible) { + fl_redraw_form(fd_form_spell_check->form_spell_check); + } + if (fd_form_spell_options && + fd_form_spell_options->form_spell_options->visible) { + fl_redraw_form(fd_form_spell_options->form_spell_options); + } } - // Prevents LyX from crashing when no buffers available // This is also one of the functions that we _really_ dont want // we should try to finds way to help us with that. @@ -83,151 +79,24 @@ void CloseAllBufferRelatedDialogs() // have been created otherwise hiding one could cause a crash // need the visible check otherwise XForms prints a warning // if hiding an invisible form - if (fd_form_character->form_character->visible) { - fl_hide_form(fd_form_character->form_character); - } - if (fd_form_preamble->form_preamble->visible) { - fl_hide_form(fd_form_preamble->form_preamble); - } if (fd_form_figure->form_figure->visible) { fl_hide_form(fd_form_figure->form_figure); } if (fd_form_sendto->form_sendto->visible) { fl_hide_form(fd_form_sendto->form_sendto); } - if (fd_latex_log->LaTeXLog->visible) { - fl_hide_form(fd_latex_log->LaTeXLog); - } if (fd_form_spell_check) { if (fd_form_spell_check->form_spell_check->visible) { fl_trigger_object(fd_form_spell_check->done); } } - if (fd_panel) { - if (fd_panel->panel->visible) { - fl_hide_form(fd_panel->panel); - } - } - if (fd_delim) { - if (fd_delim->delim->visible) { - fl_hide_form(fd_delim->delim); - } - } - if (fd_deco) { - if (fd_deco->deco->visible) { - fl_hide_form(fd_deco->deco); - } - } - if (fd_space) { - if (fd_space->space->visible) { - fl_hide_form(fd_space->space); - } - } - if (fd_matrix) { - if (fd_matrix->matrix->visible) { - fl_hide_form(fd_matrix->matrix); - } - } - if (bibitem_form) { - if (bibitem_form->bibitem_form->visible) { - fl_hide_form(bibitem_form->bibitem_form); - } - } - if (form) { - if (form->include->visible) { - fl_hide_form(form->include); - } - } HideFiguresPopups(); } // This is another function we really don't want. // Again the Signal/Slot mechanism is tailor made for this task. -void updateAllVisibleBufferRelatedDialogs() +void updateAllVisibleBufferRelatedDialogs(bool) { - if (fd_form_preamble->form_preamble->visible) { - UpdateLayoutPreamble(); - } - if (fd_latex_log->LaTeXLog->visible) { - LatexLogUpdate(0,0); - } - if (current_view->buffer()->isReadonly()) { - // a little crude perhaps but it works. ARRae - if (fd_form_character->form_character->visible) { - fl_hide_form(fd_form_character->form_character); - } -#ifndef ALWAYS_CLOSE_MATH_PANELS - // The math popups should be closed only if we switch - // to a readonly buffer - if (fd_panel) { - if (fd_panel->panel->visible) { - fl_hide_form(fd_panel->panel); - } - } - if (fd_delim) { - if (fd_delim->delim->visible) { - fl_hide_form(fd_delim->delim); - } - } - if (fd_deco) { - if (fd_deco->deco->visible) { - fl_hide_form(fd_deco->deco); - } - } - if (fd_space) { - if (fd_space->space->visible) { - fl_hide_form(fd_space->space); - } - } - if (fd_matrix) { - if (fd_matrix->matrix->visible) { - fl_hide_form(fd_matrix->matrix); - } - } -#endif - } - - // We have either changed buffers or changed the readonly status - // so the safest thing to do is hide all inset popups that - // are editting insets from the previous buffer or aren't - // allowed in readonly docs. -#ifdef ALWAYS_CLOSE_MATH_PANELS - if (fd_panel) { - if (fd_panel->panel->visible) { - fl_hide_form(fd_panel->panel); - } - } - if (fd_delim) { - if (fd_delim->delim->visible) { - fl_hide_form(fd_delim->delim); - } - } - if (fd_deco) { - if (fd_deco->deco->visible) { - fl_hide_form(fd_deco->deco); - } - } - if (fd_space) { - if (fd_space->space->visible) { - fl_hide_form(fd_space->space); - } - } - if (fd_matrix) { - if (fd_matrix->matrix->visible) { - fl_hide_form(fd_matrix->matrix); - } - } -#endif - if (bibitem_form) { - if (bibitem_form->bibitem_form->visible) { - fl_hide_form(bibitem_form->bibitem_form); - } - } - if (form) { - if (form->include->visible) { - fl_hide_form(form->include); - } - } HideFiguresPopups(); } @@ -397,7 +266,7 @@ void WarnReadonly(string const & file) /// Get the dpi setting of the current screen float getScreenDPI() { - Screen * scr = DefaultScreenOfDisplay(fl_get_display()); + Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen); //DefaultScreen(fl_get_display()); return ((HeightOfScreen(scr) * 25.4 / HeightMMOfScreen(scr)) + (WidthOfScreen(scr) * 25.4 / WidthMMOfScreen(scr))) / 2; }