]> git.lyx.org Git - lyx.git/blobdiff - src/lyx_gui_misc.C
Fix working of the spellchecker dialog with ispell when there are no
[lyx.git] / src / lyx_gui_misc.C
index 99ea77f214fe3f29d36c5f7d4040dc9305ba9338..dc4c6ca53734e13cab33fbfd70e6eb2cfed4863a 100644 (file)
@@ -1,11 +1,10 @@
-// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  * 
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #include "lyx_gui_misc.h"
 #include "BufferView.h"
 #include "buffer.h"
-#include "credits_form.h"
-#include "form1.h"
 #include "gettext.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"
 #include "LyXView.h"
 #include "bufferview_funcs.h"
 #include "support/filetools.h"
 #include "lyxrc.h"
+#include "debug.h"
 
 using std::pair;
 using std::make_pair;
@@ -41,68 +35,30 @@ using std::endl;
 
 extern BufferView * current_view;
 
-extern FD_form_character * fd_form_character;
-extern FD_form_credits * fd_form_credits;
 extern FD_form_figure * fd_form_figure;
-extern FD_form_preamble * fd_form_preamble;
 extern FD_form_sendto * fd_form_sendto;
-extern FD_form_spell_check * fd_form_spell_check;
-extern FD_form_spell_options * fd_form_spell_options;
-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 void HideFiguresPopups();
 
+
 // Prevents LyX from being killed when the close box is pressed in a popup.
-extern "C" int CancelCloseBoxCB(FL_FORM *, void *)
+extern "C"
+int CancelCloseBoxCB(FL_FORM *, void *)
 {
        return FL_CANCEL;
 }
+
+
 // Redraw the form (on receipt of a Signal indicating, for example,
 // that the xform colors have been re-mapped).
 void RedrawAllBufferRelatedDialogs()
 {
-       if (fd_deco && fd_deco->deco->visible) {
-               fl_redraw_form(fd_deco->deco);
-       }
-       if (fd_delim && fd_delim->delim->visible) {
-               fl_redraw_form(fd_delim->delim);
-       }
-       if (fd_form_character->form_character->visible) {
-               fl_redraw_form(fd_form_character->form_character);
-       }
-       if (fd_form_credits && fd_form_credits->form_credits->visible) {
-               fl_redraw_form(fd_form_credits->form_credits);
-       }
        if (fd_form_figure->form_figure->visible) {
                fl_redraw_form(fd_form_figure->form_figure);
        }
-       if (fd_form_preamble->form_preamble->visible) {
-               fl_redraw_form(fd_form_preamble->form_preamble);
-       }
        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);
-       }
-       if (fd_matrix && fd_matrix->matrix->visible) {
-               fl_redraw_form(fd_matrix->matrix);
-       }
-       if (fd_panel && fd_panel->panel->visible) {
-               fl_redraw_form(fd_panel->panel);
-       }
-       if (fd_space && fd_space->space->visible) {
-               fl_redraw_form(fd_space->space);
-       }
 }
 
 // Prevents LyX from crashing when no buffers available
@@ -115,48 +71,12 @@ 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_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);
-               }
-       }
        HideFiguresPopups();
 }
 
@@ -164,76 +84,6 @@ void CloseAllBufferRelatedDialogs()
 // Again the Signal/Slot mechanism is tailor made for this task.
 void updateAllVisibleBufferRelatedDialogs(bool)
 {
-       if (fd_form_preamble->form_preamble->visible) {
-               UpdateLayoutPreamble(current_view);
-       }
-       if (current_view->buffer() &&  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
        HideFiguresPopups();
 }
 
@@ -273,29 +123,20 @@ char const * flyx_ident_extract(char const * sc)
 }
 
 
-void WriteStatus(MiniBuffer * minib, string const & s)
-{
-       if (minib) {
-               minib->Set(s);
-               minib->Store();
-       } else
-               lyxerr << s << endl;
-}
-
-
 //
 void WriteAlert(string const & s1, string const & s2, string const & s3)
 {
-       MiniBuffer * minibuffer = 0;
+       LyXView * lview = 0;
        if (current_view && current_view->owner())
-               minibuffer = current_view->owner()->getMiniBuffer();
-       if (minibuffer) {
+               lview = current_view->owner();
+       if (lview) {
                /// Write to minibuffer
-               ProhibitInput(current_view);
-               minibuffer->Set(s1, s2, s3);
+               lview->prohibitInput();
+               string const msg = s1 + ' ' + s2 + ' ' + s3;
+               lview->message(msg);
                fl_set_resource("flAlert.dismiss.label", _("Dismiss"));
                fl_show_alert(s1.c_str(), s2.c_str(), s3.c_str(), 0);
-               AllowInput(current_view);
+               lview->allowInput();
        } else {
                /// Write to lyxerr
                lyxerr << "----------------------------------------" << endl