+2001-03-28 Angus Leeming <a.leeming@ic.ac.uk>
+
+ * Makefile.am: removed form1.[Ch], lyx.[Ch] and added figure_form.[Ch],
+ figureForm.[Ch].
+
+ * figureForm.[Ch]: stripped the FD_from_figure manipulation
+ code out of lux_cb.[Ch], ready for its (imminent?) removal.
+
+ * lyx_cb.[Ch]: see above.
+
+ * figure_form.[Ch]: fdesign generated code, combining lyx.[Ch] and
+ form1.[Ch].
+
+ * form1.[Ch]:
+ * lyx.[Ch]: replaced by figure_form.[Ch].
+
+ * lyx_gui.C:
+ * lyx_gui_misc.C:
+ * lyxfunc.C: changed headers associated with above changes.
+
2001-03-27 Juergen Vigna <jug@sad.it>
* BufferView_pimpl.C: set the temporary cursor right!
exporter.h \
ext_l10n.h \
figure.h \
+ figure_form.C \
+ figure_form.h \
+ figureForm.C \
+ figureForm.h \
font.C \
font.h \
- form1.C \
- form1.h \
gettext.C \
gettext.h \
importer.C \
lastfiles.h \
layout.C \
layout.h \
- lyx.C \
- lyx.h \
lyx_cb.C \
lyx_cb.h \
lyx_gui.C \
--- /dev/null
+/* This file is part of
+ * ======================================================
+ *
+ * LyX, The Document Processor
+ *
+ * Copyright 1995 Matthias Ettrich,
+ * Copyright 1995-2000 The LyX Team.
+ *
+ * ====================================================== */
+
+#include <config.h>
+
+#include <fstream>
+#include <algorithm>
+#include <utility>
+#include <iostream>
+
+#include FORMS_H_LOCATION
+
+#include "figure_form.h"
+#include "insets/figinset.h"
+#include "BufferView.h"
+#include "minibuffer.h"
+#include "lyxtext.h"
+#include "LyXView.h"
+
+extern FD_form_figure * fd_form_figure;
+extern BufferView * current_view;
+
+void Figure()
+{
+ if (fd_form_figure->form_figure->visible) {
+ fl_raise_form(fd_form_figure->form_figure);
+ } else {
+ fl_show_form(fd_form_figure->form_figure,
+ FL_PLACE_MOUSE | FL_FREE_SIZE, FL_TRANSIENT,
+ _("Insert Figure"));
+ }
+}
+
+
+/* callbacks for form form_figure */
+extern "C"
+void FigureApplyCB(FL_OBJECT *, long)
+{
+ if (!current_view->available())
+ return;
+
+ Buffer * buffer = current_view->buffer();
+ if (buffer->isReadonly()) // paranoia
+ return;
+
+ current_view->owner()->getMiniBuffer()->Set(_("Inserting figure..."));
+ if (fl_get_button(fd_form_figure->radio_inline)) {
+ InsetFig * new_inset = new InsetFig(100, 20, *buffer);
+ current_view->insertInset(new_inset);
+ current_view->owner()->getMiniBuffer()->Set(_("Figure inserted"));
+ new_inset->Edit(current_view, 0, 0, 0);
+ return;
+ }
+
+ current_view->hideCursor();
+ current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR);
+ current_view->beforeChange(current_view->text);
+
+ current_view->text->SetCursorParUndo(current_view->buffer());
+ current_view->text->FreezeUndo();
+
+ current_view->text->BreakParagraph(current_view);
+ current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+
+#ifndef NEW_INSETS
+ if (current_view->text->cursor.par()->Last()) {
+#else
+ if (current_view->text->cursor.par()->size()) {
+#endif
+ current_view->text->CursorLeft(current_view);
+
+ current_view->text->BreakParagraph(current_view);
+ current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ }
+
+ // The standard layout should always be numer 0;
+ current_view->text->SetLayout(current_view, 0);
+
+#ifndef NEW_INSETS
+ if (current_view->text->cursor.par()->footnoteflag ==
+ LyXParagraph::NO_FOOTNOTE) {
+#endif
+ current_view->text->
+ SetParagraph(current_view, 0, 0,
+ 0, 0,
+ VSpace (0.3 * buffer->params.spacing.getValue(),
+ LyXLength::CM),
+ VSpace (0.3 *
+ buffer->params.spacing.getValue(),
+ LyXLength::CM),
+ LYX_ALIGN_CENTER, string(), 0);
+#ifndef NEW_INSETS
+ } else {
+ current_view->text->SetParagraph(current_view, 0, 0,
+ 0, 0,
+ VSpace(VSpace::NONE),
+ VSpace(VSpace::NONE),
+ LYX_ALIGN_CENTER,
+ string(),
+ 0);
+ }
+#endif
+
+ current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+
+ Inset * new_inset = new InsetFig(100, 100, *buffer);
+ current_view->insertInset(new_inset);
+ new_inset->Edit(current_view, 0, 0, 0);
+ current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR);
+ current_view->owner()->getMiniBuffer()->Set(_("Figure inserted"));
+ current_view->text->UnFreezeUndo();
+ current_view->setState();
+}
+
+
+extern "C"
+void FigureCancelCB(FL_OBJECT *, long)
+{
+ fl_hide_form(fd_form_figure->form_figure);
+}
+
+
+extern "C"
+void FigureOKCB(FL_OBJECT * ob, long data)
+{
+ FigureApplyCB(ob, data);
+ FigureCancelCB(ob, data);
+}
--- /dev/null
+// -*- C++ -*-
+#ifndef FIGUREFORM_H
+#define FIGUREFORM_H
+
+///
+void Figure();
+
+#endif
+
--- /dev/null
+// File modified by fdfix.sh for use by lyx (with xforms > 0.88) and gettext
+#include <config.h>
+#include "lyx_gui_misc.h"
+#include "gettext.h"
+
+/* Form definition file generated with fdesign. */
+
+#include FORMS_H_LOCATION
+#include <cstdlib>
+#include "figure_form.h"
+
+FD_Figure *create_form_Figure(void)
+{
+ FL_OBJECT *obj;
+ FD_Figure *fdui = (FD_Figure *) fl_calloc(1, sizeof(FD_Figure));
+
+ fdui->Figure = fl_bgn_form(FL_NO_BOX, 420, 390);
+ obj = fl_add_box(FL_UP_BOX, 0, 0, 420, 390, "");
+ obj = fl_add_frame(FL_ENGRAVED_FRAME, 230, 220, 180, 80, "");
+ fl_set_object_color(obj, FL_COL1, FL_COL1);
+ obj = fl_add_frame(FL_ENGRAVED_FRAME, 230, 60, 180, 140, "");
+ fl_set_object_color(obj, FL_COL1, FL_COL1);
+ obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 244, 200, 56, "");
+ fl_set_object_color(obj, FL_COL1, FL_COL1);
+ obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 60, 200, 160, "");
+ fl_set_object_color(obj, FL_COL1, FL_COL1);
+ fdui->EpsFile = obj = fl_add_input(FL_NORMAL_INPUT, 80, 10, 230, 30, idex(_("EPS file|#E")));fl_set_button_shortcut(obj, scex(_("EPS file|#E")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 2);
+ fdui->Preview = obj = fl_add_button(FL_NORMAL_BUTTON, 270, 350, 140, 30, idex(_("Full Screen Preview|#v")));fl_set_button_shortcut(obj, scex(_("Full Screen Preview|#v")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 1);
+ fdui->Browse = obj = fl_add_button(FL_NORMAL_BUTTON, 320, 10, 90, 30, idex(_("Browse...|#B")));fl_set_button_shortcut(obj, scex(_("Browse...|#B")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 0);
+ fdui->Width = obj = fl_add_input(FL_FLOAT_INPUT, 20, 180, 80, 30, "");
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 2);
+ fdui->Height = obj = fl_add_input(FL_FLOAT_INPUT, 120, 180, 80, 30, "");
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 2);
+ fdui->ApplyBtn = obj = fl_add_button(FL_NORMAL_BUTTON, 100, 350, 60, 30, idex(_("Apply|#A")));fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 7);
+ fdui->OkBtn = obj = fl_add_button(FL_RETURN_BUTTON, 10, 350, 70, 30, _("OK"));
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 8);
+ fdui->CancelBtn = obj = fl_add_button(FL_NORMAL_BUTTON, 180, 350, 70, 30, idex(_("Cancel|^[")));fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 9);
+ fdui->Frame = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 230, 230, 180, 30, idex(_("Display Frame|#F")));fl_set_button_shortcut(obj, scex(_("Display Frame|#F")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 53);
+ fdui->Translations = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 230, 260, 180, 30, idex(_("Do Translations|#r")));fl_set_button_shortcut(obj, scex(_("Do Translations|#r")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 54);
+ obj = fl_add_text(FL_NORMAL_TEXT, 240, 210, 70, 20, _("Options"));
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
+ fl_set_object_lstyle(obj, FL_BOLD_STYLE);
+ fdui->Angle = obj = fl_add_input(FL_FLOAT_INPUT, 100, 260, 80, 30, idex(_("Angle:|#L")));fl_set_button_shortcut(obj, scex(_("Angle:|#L")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 2);
+
+ fdui->HeightGrp = fl_bgn_group();
+ // xgettext:no-c-format
+ fdui->page2 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 130, 110, 30, idex(_("% of Page|#g")));fl_set_button_shortcut(obj, scex(_("% of Page|#g")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 23);
+ fdui->Default2 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 70, 80, 30, idex(_("Default|#t")));fl_set_button_shortcut(obj, scex(_("Default|#t")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 20);
+ fdui->cm2 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 90, 60, 30, idex(_("cm|#m")));fl_set_button_shortcut(obj, scex(_("cm|#m")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 21);
+ fdui->in2 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 110, 80, 30, idex(_("inches|#h")));fl_set_button_shortcut(obj, scex(_("inches|#h")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 22);
+ fl_end_group();
+
+ obj = fl_add_text(FL_NORMAL_TEXT, 237, 50, 53, 20, _("Display"));
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
+ fl_set_object_lstyle(obj, FL_BOLD_STYLE);
+ fdui->HeightLabel = obj = fl_add_text(FL_NORMAL_TEXT, 120, 50, 60, 20, _("Height"));
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
+ fl_set_object_lstyle(obj, FL_BOLD_STYLE);
+ fdui->WidthLabel = obj = fl_add_text(FL_NORMAL_TEXT, 20, 50, 60, 20, _("Width"));
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
+ fl_set_object_lstyle(obj, FL_BOLD_STYLE);
+ obj = fl_add_text(FL_NORMAL_TEXT, 20, 230, 90, 30, _("Rotation"));
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
+ fl_set_object_lstyle(obj, FL_BOLD_STYLE);
+
+ fdui->DisplayGrp = fl_bgn_group();
+ fdui->Wysiwyg3 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 230, 130, 180, 30, idex(_("Display in Color|#D")));fl_set_button_shortcut(obj, scex(_("Display in Color|#D")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 63);
+ fdui->Wysiwyg0 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 230, 160, 180, 30, idex(_("Do not display this figure|#y")));fl_set_button_shortcut(obj, scex(_("Do not display this figure|#y")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 3);
+ fdui->Wysiwyg2 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 230, 100, 180, 30, idex(_("Display as Grayscale|#i")));fl_set_button_shortcut(obj, scex(_("Display as Grayscale|#i")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 43);
+ fdui->Wysiwyg1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 230, 70, 180, 30, idex(_("Display as Monochrome|#s")));fl_set_button_shortcut(obj, scex(_("Display as Monochrome|#s")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 33);
+ fl_end_group();
+
+
+ fdui->WidthGrp = fl_bgn_group();
+ fdui->Default1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 70, 80, 30, idex(_("Default|#U")));fl_set_button_shortcut(obj, scex(_("Default|#U")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 10);
+ fdui->cm1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 90, 60, 30, idex(_("cm|#c")));fl_set_button_shortcut(obj, scex(_("cm|#c")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 11);
+ fdui->in1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 110, 80, 30, idex(_("inches|#n")));fl_set_button_shortcut(obj, scex(_("inches|#n")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 12);
+ // xgettext:no-c-format
+ fdui->page1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 130, 110, 30, idex(_("% of Page|#P")));fl_set_button_shortcut(obj, scex(_("% of Page|#P")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 13);
+ // xgettext:no-c-format
+ fdui->column1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 150, 110, 30, idex(_("% of Column|#o")));fl_set_button_shortcut(obj, scex(_("% of Column|#o")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 14);
+ fl_end_group();
+
+ obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 310, 400, 30, "");
+ fdui->Subcaption = obj = fl_add_input(FL_NORMAL_INPUT, 150, 310, 260, 30, idex(_("Caption|#k")));fl_set_button_shortcut(obj, scex(_("Caption|#k")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 2);
+ fdui->Subfigure = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 310, 90, 30, idex(_("Subfigure|#q")));fl_set_button_shortcut(obj, scex(_("Subfigure|#q")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, GraphicsCB, 70);
+ fl_end_form();
+
+ fdui->Figure->fdui = fdui;
+
+ return fdui;
+}
+/*---------------------------------------*/
+
+FD_form_figure *create_form_form_figure(void)
+{
+ FL_OBJECT *obj;
+ FD_form_figure *fdui = (FD_form_figure *) fl_calloc(1, sizeof(FD_form_figure));
+
+ fdui->form_figure = fl_bgn_form(FL_NO_BOX, 340, 150);
+ obj = fl_add_box(FL_UP_BOX, 0, 0, 340, 150, "");
+ obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 20, 320, 80, "");
+ fl_set_object_color(obj, FL_COL1, FL_COL1);
+
+ fdui->group_radio_fugre = fl_bgn_group();
+ fdui->radio_postscript = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 30, 320, 30, idex(_("Encapsulated Postscript (*.eps, *.ps)|#E")));fl_set_button_shortcut(obj, scex(_("Encapsulated Postscript (*.eps, *.ps)|#E")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fdui->radio_inline = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 60, 320, 30, idex(_("Inlined EPS (*.eps, *.ps)|#I")));fl_set_button_shortcut(obj, scex(_("Inlined EPS (*.eps, *.ps)|#I")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_end_group();
+
+ obj = fl_add_button(FL_RETURN_BUTTON, 10, 110, 100, 30, _("OK"));
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, FigureOKCB, 0);
+ obj = fl_add_button(FL_NORMAL_BUTTON, 120, 110, 100, 30, idex(_("Apply|#A")));fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, FigureApplyCB, 0);
+ obj = fl_add_button(FL_NORMAL_BUTTON, 230, 110, 100, 30, idex(_("Cancel|^[")));fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1);
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, FigureCancelCB, 0);
+ obj = fl_add_text(FL_NORMAL_TEXT, 20, 10, 50, 20, _("Type"));
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
+ fl_set_object_lstyle(obj, FL_BOLD_STYLE);
+ fl_end_form();
+
+ fdui->form_figure->fdui = fdui;
+
+ return fdui;
+}
+/*---------------------------------------*/
+
--- /dev/null
+/** Header file generated with fdesign **/
+
+#ifndef FD_Figure_h_
+#define FD_Figure_h_
+
+/** Callbacks, globals and object handlers **/
+extern "C" void GraphicsCB(FL_OBJECT *, long);
+
+extern "C" void FigureOKCB(FL_OBJECT *, long);
+extern "C" void FigureApplyCB(FL_OBJECT *, long);
+extern "C" void FigureCancelCB(FL_OBJECT *, long);
+
+
+/**** Forms and Objects ****/
+typedef struct {
+ FL_FORM *Figure;
+ void *vdata;
+ char *cdata;
+ long ldata;
+ FL_OBJECT *EpsFile;
+ FL_OBJECT *Preview;
+ FL_OBJECT *Browse;
+ FL_OBJECT *Width;
+ FL_OBJECT *Height;
+ FL_OBJECT *ApplyBtn;
+ FL_OBJECT *OkBtn;
+ FL_OBJECT *CancelBtn;
+ FL_OBJECT *Frame;
+ FL_OBJECT *Translations;
+ FL_OBJECT *Angle;
+ FL_OBJECT *HeightGrp;
+ FL_OBJECT *page2;
+ FL_OBJECT *Default2;
+ FL_OBJECT *cm2;
+ FL_OBJECT *in2;
+ FL_OBJECT *HeightLabel;
+ FL_OBJECT *WidthLabel;
+ FL_OBJECT *DisplayGrp;
+ FL_OBJECT *Wysiwyg3;
+ FL_OBJECT *Wysiwyg0;
+ FL_OBJECT *Wysiwyg2;
+ FL_OBJECT *Wysiwyg1;
+ FL_OBJECT *WidthGrp;
+ FL_OBJECT *Default1;
+ FL_OBJECT *cm1;
+ FL_OBJECT *in1;
+ FL_OBJECT *page1;
+ FL_OBJECT *column1;
+ FL_OBJECT *Subcaption;
+ FL_OBJECT *Subfigure;
+} FD_Figure;
+
+extern FD_Figure * create_form_Figure(void);
+typedef struct {
+ FL_FORM *form_figure;
+ void *vdata;
+ char *cdata;
+ long ldata;
+ FL_OBJECT *group_radio_fugre;
+ FL_OBJECT *radio_postscript;
+ FL_OBJECT *radio_inline;
+} FD_form_figure;
+
+extern FD_form_figure * create_form_form_figure(void);
+
+#endif /* FD_Figure_h_ */
+++ /dev/null
-// File modified by fdfix.sh for use by lyx (with xforms > 0.88) and gettext
-#include <config.h>
-#include "lyx_gui_misc.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <cstdlib>
-#include "form1.h"
-
-/*---------------------------------------*/
-
-FD_Figure *create_form_Figure(void)
-{
- FL_OBJECT *obj;
- FD_Figure *fdui = (FD_Figure *) fl_calloc(1, sizeof(FD_Figure));
-
- fdui->Figure = fl_bgn_form(FL_NO_BOX, 420, 390);
- obj = fl_add_box(FL_UP_BOX, 0, 0, 420, 390, "");
- obj = fl_add_frame(FL_ENGRAVED_FRAME, 230, 220, 180, 80, "");
- fl_set_object_color(obj, FL_COL1, FL_COL1);
- obj = fl_add_frame(FL_ENGRAVED_FRAME, 230, 60, 180, 140, "");
- fl_set_object_color(obj, FL_COL1, FL_COL1);
- obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 244, 200, 56, "");
- fl_set_object_color(obj, FL_COL1, FL_COL1);
- obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 60, 200, 160, "");
- fl_set_object_color(obj, FL_COL1, FL_COL1);
- fdui->EpsFile = obj = fl_add_input(FL_NORMAL_INPUT, 80, 10, 230, 30, idex(_("EPS file|#E")));fl_set_button_shortcut(obj, scex(_("EPS file|#E")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 2);
- fdui->Preview = obj = fl_add_button(FL_NORMAL_BUTTON, 270, 350, 140, 30, idex(_("Full Screen Preview|#v")));fl_set_button_shortcut(obj, scex(_("Full Screen Preview|#v")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 1);
- fdui->Browse = obj = fl_add_button(FL_NORMAL_BUTTON, 320, 10, 90, 30, idex(_("Browse...|#B")));fl_set_button_shortcut(obj, scex(_("Browse...|#B")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 0);
- fdui->Width = obj = fl_add_input(FL_FLOAT_INPUT, 20, 180, 80, 30, "");
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 2);
- fdui->Height = obj = fl_add_input(FL_FLOAT_INPUT, 120, 180, 80, 30, "");
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 2);
- fdui->ApplyBtn = obj = fl_add_button(FL_NORMAL_BUTTON, 100, 350, 60, 30, idex(_("Apply|#A")));fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 7);
- fdui->OkBtn = obj = fl_add_button(FL_RETURN_BUTTON, 10, 350, 70, 30, _("OK"));
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 8);
- fdui->CancelBtn = obj = fl_add_button(FL_NORMAL_BUTTON, 180, 350, 70, 30, idex(_("Cancel|^[")));fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 9);
- fdui->Frame = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 230, 230, 180, 30, idex(_("Display Frame|#F")));fl_set_button_shortcut(obj, scex(_("Display Frame|#F")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 53);
- fdui->Translations = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 230, 260, 180, 30, idex(_("Do Translations|#r")));fl_set_button_shortcut(obj, scex(_("Do Translations|#r")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 54);
- obj = fl_add_text(FL_NORMAL_TEXT, 240, 210, 70, 20, _("Options"));
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
- fl_set_object_lstyle(obj, FL_BOLD_STYLE);
- fdui->Angle = obj = fl_add_input(FL_FLOAT_INPUT, 100, 260, 80, 30, idex(_("Angle:|#L")));fl_set_button_shortcut(obj, scex(_("Angle:|#L")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 2);
-
- fdui->HeightGrp = fl_bgn_group();
- // xgettext:no-c-format
- fdui->page2 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 130, 110, 30, idex(_("% of Page|#g")));fl_set_button_shortcut(obj, scex(_("% of Page|#g")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 23);
- fdui->Default2 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 70, 80, 30, idex(_("Default|#t")));fl_set_button_shortcut(obj, scex(_("Default|#t")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 20);
- fdui->cm2 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 90, 60, 30, idex(_("cm|#m")));fl_set_button_shortcut(obj, scex(_("cm|#m")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 21);
- fdui->in2 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 110, 80, 30, idex(_("inches|#h")));fl_set_button_shortcut(obj, scex(_("inches|#h")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 22);
- fl_end_group();
-
- obj = fl_add_text(FL_NORMAL_TEXT, 237, 50, 53, 20, _("Display"));
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
- fl_set_object_lstyle(obj, FL_BOLD_STYLE);
- fdui->HeightLabel = obj = fl_add_text(FL_NORMAL_TEXT, 120, 50, 60, 20, _("Height"));
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
- fl_set_object_lstyle(obj, FL_BOLD_STYLE);
- fdui->WidthLabel = obj = fl_add_text(FL_NORMAL_TEXT, 20, 50, 60, 20, _("Width"));
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
- fl_set_object_lstyle(obj, FL_BOLD_STYLE);
- obj = fl_add_text(FL_NORMAL_TEXT, 20, 230, 90, 30, _("Rotation"));
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
- fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-
- fdui->DisplayGrp = fl_bgn_group();
- fdui->Wysiwyg3 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 230, 130, 180, 30, idex(_("Display in Color|#D")));fl_set_button_shortcut(obj, scex(_("Display in Color|#D")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 63);
- fdui->Wysiwyg0 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 230, 160, 180, 30, idex(_("Do not display this figure|#y")));fl_set_button_shortcut(obj, scex(_("Do not display this figure|#y")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 3);
- fdui->Wysiwyg2 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 230, 100, 180, 30, idex(_("Display as Grayscale|#i")));fl_set_button_shortcut(obj, scex(_("Display as Grayscale|#i")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 43);
- fdui->Wysiwyg1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 230, 70, 180, 30, idex(_("Display as Monochrome|#s")));fl_set_button_shortcut(obj, scex(_("Display as Monochrome|#s")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 33);
- fl_end_group();
-
-
- fdui->WidthGrp = fl_bgn_group();
- fdui->Default1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 70, 80, 30, idex(_("Default|#U")));fl_set_button_shortcut(obj, scex(_("Default|#U")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 10);
- fdui->cm1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 90, 60, 30, idex(_("cm|#c")));fl_set_button_shortcut(obj, scex(_("cm|#c")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 11);
- fdui->in1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 110, 80, 30, idex(_("inches|#n")));fl_set_button_shortcut(obj, scex(_("inches|#n")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 12);
- // xgettext:no-c-format
- fdui->page1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 130, 110, 30, idex(_("% of Page|#P")));fl_set_button_shortcut(obj, scex(_("% of Page|#P")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 13);
- // xgettext:no-c-format
- fdui->column1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 150, 110, 30, idex(_("% of Column|#o")));fl_set_button_shortcut(obj, scex(_("% of Column|#o")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 14);
- fl_end_group();
-
- obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 310, 400, 30, "");
- fdui->Subcaption = obj = fl_add_input(FL_NORMAL_INPUT, 150, 310, 260, 30, idex(_("Caption|#k")));fl_set_button_shortcut(obj, scex(_("Caption|#k")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 2);
- fdui->Subfigure = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 310, 90, 30, idex(_("Subfigure|#q")));fl_set_button_shortcut(obj, scex(_("Subfigure|#q")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, GraphicsCB, 70);
- fl_end_form();
-
- fdui->Figure->fdui = fdui;
-
- return fdui;
-}
-/*---------------------------------------*/
+++ /dev/null
-/** Header file generated with fdesign **/
-
-#ifndef FD_KeyMap_h_
-#define FD_KeyMap_h_
-
-/** Callbacks, globals and object handlers **/
-
-extern "C" void GraphicsCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-typedef struct {
- FL_FORM *Figure;
- void *vdata;
- char *cdata;
- long ldata;
- FL_OBJECT *EpsFile;
- FL_OBJECT *Preview;
- FL_OBJECT *Browse;
- FL_OBJECT *Width;
- FL_OBJECT *Height;
- FL_OBJECT *ApplyBtn;
- FL_OBJECT *OkBtn;
- FL_OBJECT *CancelBtn;
- FL_OBJECT *Frame;
- FL_OBJECT *Translations;
- FL_OBJECT *Angle;
- FL_OBJECT *HeightGrp;
- FL_OBJECT *page2;
- FL_OBJECT *Default2;
- FL_OBJECT *cm2;
- FL_OBJECT *in2;
- FL_OBJECT *HeightLabel;
- FL_OBJECT *WidthLabel;
- FL_OBJECT *DisplayGrp;
- FL_OBJECT *Wysiwyg3;
- FL_OBJECT *Wysiwyg0;
- FL_OBJECT *Wysiwyg2;
- FL_OBJECT *Wysiwyg1;
- FL_OBJECT *WidthGrp;
- FL_OBJECT *Default1;
- FL_OBJECT *cm1;
- FL_OBJECT *in1;
- FL_OBJECT *page1;
- FL_OBJECT *column1;
- FL_OBJECT *Subcaption;
- FL_OBJECT *Subfigure;
-} FD_Figure;
-
-extern FD_Figure * create_form_Figure(void);
-
-#endif /* FD_KeyMap_h_ */
+2001-03-28 Angus Leeming <a.leeming@ic.ac.uk>
+
+ * insets/figinset.[Ch]: changed headers lyx.h, form1.h -> figure_form.h.
+
2001-03-27 Angus Leeming <a.leeming@ic.ac.uk>
* insetgraphicsParams.C (operator!=): new function, needed by the
#include <cmath>
#include "figinset.h"
-#include "lyx.h"
#include "lyx_main.h"
#include "buffer.h"
#include "frontends/FileDialog.h"
#ifndef FIGINSET_H
#define FIGINSET_H
-#include "form1.h"
+#include "figure_form.h"
#include "LString.h"
#include "buffer.h"
#include "LaTeXFeatures.h"
+++ /dev/null
-// File modified by fdfix.sh for use by lyx (with xforms > 0.88) and gettext
-#include <config.h>
-#include "lyx_gui_misc.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <cstdlib>
-#include "lyx.h"
-
-FD_form_figure *create_form_form_figure(void)
-{
- FL_OBJECT *obj;
- FD_form_figure *fdui = (FD_form_figure *) fl_calloc(1, sizeof(FD_form_figure));
-
- fdui->form_figure = fl_bgn_form(FL_NO_BOX, 340, 150);
- obj = fl_add_box(FL_UP_BOX, 0, 0, 340, 150, "");
- obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 20, 320, 80, "");
- fl_set_object_color(obj, FL_COL1, FL_COL1);
-
- fdui->group_radio_fugre = fl_bgn_group();
- fdui->radio_postscript = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 30, 320, 30, idex(_("Encapsulated Postscript (*.eps, *.ps)|#E")));fl_set_button_shortcut(obj, scex(_("Encapsulated Postscript (*.eps, *.ps)|#E")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fdui->radio_inline = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 60, 320, 30, idex(_("Inlined EPS (*.eps, *.ps)|#I")));fl_set_button_shortcut(obj, scex(_("Inlined EPS (*.eps, *.ps)|#I")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_end_group();
-
- obj = fl_add_button(FL_RETURN_BUTTON, 10, 110, 100, 30, _("OK"));
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, FigureOKCB, 0);
- obj = fl_add_button(FL_NORMAL_BUTTON, 120, 110, 100, 30, idex(_("Apply|#A")));fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, FigureApplyCB, 0);
- obj = fl_add_button(FL_NORMAL_BUTTON, 230, 110, 100, 30, idex(_("Cancel|^[")));fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, FigureCancelCB, 0);
- obj = fl_add_text(FL_NORMAL_TEXT, 20, 10, 50, 20, _("Type"));
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
- fl_set_object_lstyle(obj, FL_BOLD_STYLE);
- fl_end_form();
-
- fdui->form_figure->fdui = fdui;
-
- return fdui;
-}
+++ /dev/null
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_title_h_
-#define FD_form_title_h_
-
-/** Callbacks, globals and object handlers **/
-extern "C" void FigureOKCB(FL_OBJECT *, long);
-extern "C" void FigureApplyCB(FL_OBJECT *, long);
-extern "C" void FigureCancelCB(FL_OBJECT *, long);
-
-/**** Forms and Objects ****/
-typedef struct {
- FL_FORM *form_figure;
- void *vdata;
- char *cdata;
- long ldata;
- FL_OBJECT *group_radio_fugre;
- FL_OBJECT *radio_postscript;
- FL_OBJECT *radio_inline;
-} FD_form_figure;
-
-extern FD_form_figure * create_form_form_figure(void);
-
-#endif /* FD_form_title_h_ */
#include <iostream>
#include FORMS_H_LOCATION
-#include "lyx.h"
-#include "lyx_main.h"
+
#include "lyx_cb.h"
-#include "insets/insetlabel.h"
-#include "insets/figinset.h"
-#include "minibuffer.h"
-#include "bufferlist.h"
-#include "frontends/FileDialog.h"
#include "lyx_gui_misc.h"
-#include "LyXView.h"
-#include "lastfiles.h"
+#include "lyx_main.h"
+#include "bufferlist.h"
#include "bufferview_funcs.h"
+#include "lastfiles.h"
+#include "LyXView.h"
+#include "lyxrc.h"
+#include "lyxtext.h"
+#include "minibuffer.h"
+#include "frontends/FileDialog.h"
+#include "insets/insetlabel.h"
#include "support/FileInfo.h"
-#include "support/syscall.h"
#include "support/filetools.h"
#include "support/path.h"
-#include "lyxrc.h"
-#include "lyxtext.h"
+#include "support/syscall.h"
using std::vector;
using std::ifstream;
using std::make_pair;
extern BufferList bufferlist;
-extern FD_form_figure * fd_form_figure;
-
-extern BufferView * current_view; // called too many times in this file...
-
// this should be static, but I need it in buffer.C
bool quitting; // flag, that we are quitting the program
extern bool finished; // all cleanup done just let it run through now.
}
-void Figure()
-{
- if (fd_form_figure->form_figure->visible) {
- fl_raise_form(fd_form_figure->form_figure);
- } else {
- fl_show_form(fd_form_figure->form_figure,
- FL_PLACE_MOUSE | FL_FREE_SIZE, FL_TRANSIENT,
- _("Insert Figure"));
- }
-}
-
-
-/* callbacks for form form_figure */
-extern "C"
-void FigureApplyCB(FL_OBJECT *, long)
-{
- if (!current_view->available())
- return;
-
- Buffer * buffer = current_view->buffer();
- if (buffer->isReadonly()) // paranoia
- return;
-
- current_view->owner()->getMiniBuffer()->Set(_("Inserting figure..."));
- if (fl_get_button(fd_form_figure->radio_inline)) {
- InsetFig * new_inset = new InsetFig(100, 20, *buffer);
- current_view->insertInset(new_inset);
- current_view->owner()->getMiniBuffer()->Set(_("Figure inserted"));
- new_inset->Edit(current_view, 0, 0, 0);
- return;
- }
-
- current_view->hideCursor();
- current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR);
- current_view->beforeChange(current_view->text);
-
- current_view->text->SetCursorParUndo(current_view->buffer());
- current_view->text->FreezeUndo();
-
- current_view->text->BreakParagraph(current_view);
- current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-
-#ifndef NEW_INSETS
- if (current_view->text->cursor.par()->Last()) {
-#else
- if (current_view->text->cursor.par()->size()) {
-#endif
- current_view->text->CursorLeft(current_view);
-
- current_view->text->BreakParagraph(current_view);
- current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- }
-
- // The standard layout should always be numer 0;
- current_view->text->SetLayout(current_view, 0);
-
-#ifndef NEW_INSETS
- if (current_view->text->cursor.par()->footnoteflag ==
- LyXParagraph::NO_FOOTNOTE) {
-#endif
- current_view->text->
- SetParagraph(current_view, 0, 0,
- 0, 0,
- VSpace (0.3 * buffer->params.spacing.getValue(),
- LyXLength::CM),
- VSpace (0.3 *
- buffer->params.spacing.getValue(),
- LyXLength::CM),
- LYX_ALIGN_CENTER, string(), 0);
-#ifndef NEW_INSETS
- } else {
- current_view->text->SetParagraph(current_view, 0, 0,
- 0, 0,
- VSpace(VSpace::NONE),
- VSpace(VSpace::NONE),
- LYX_ALIGN_CENTER,
- string(),
- 0);
- }
-#endif
-
- current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-
- Inset * new_inset = new InsetFig(100, 100, *buffer);
- current_view->insertInset(new_inset);
- new_inset->Edit(current_view, 0, 0, 0);
- current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR);
- current_view->owner()->getMiniBuffer()->Set(_("Figure inserted"));
- current_view->text->UnFreezeUndo();
- current_view->setState();
-}
-
-
-extern "C"
-void FigureCancelCB(FL_OBJECT *, long)
-{
- fl_hide_form(fd_form_figure->form_figure);
-}
-
-
-extern "C"
-void FigureOKCB(FL_OBJECT * ob, long data)
-{
- FigureApplyCB(ob, data);
- FigureCancelCB(ob, data);
-}
-
-
// This function runs "configure" and then rereads lyx.defaults to
// reconfigure the automatic settings.
void Reconfigure(BufferView * bv)
///
void MenuLayoutSave(BufferView * bv);
///
-void Figure();
-///
void Reconfigure(BufferView * bv);
#endif
#include "lyx_gui.h"
#include FORMS_H_LOCATION
#include "support/filetools.h"
-#include "lyx.h"
-#include "form1.h"
+#include "figure_form.h"
#include "print_form.h"
#include "tex-strings.h"
#include "lyx_main.h"
#include "lyx_gui_misc.h"
#include "BufferView.h"
#include "buffer.h"
-#include "form1.h"
#include "gettext.h"
-#include "lyx.h"
+#include "figure_form.h"
#include "lyx_cb.h"
#include "lyx_main.h"
#include "minibuffer.h"
#include "bufferlist.h"
#include "ColorHandler.h"
#include "lyxserver.h"
-#include "lyx.h"
+#include "figure_form.h"
#include "intl.h"
#include "lyx_main.h"
#include "lyx_cb.h"