From 8df69fdedd9ee2d8832ac0380b272886c4fa0c46 Mon Sep 17 00:00:00 2001 From: Allan Rae Date: Wed, 2 Aug 2000 05:54:58 +0000 Subject: [PATCH] regenerated form_xxx files; got the bastard compiling; TOC dialog crashes lyx git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@946 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 9 +++ po/POTFILES.in | 1 + src/ext_l10n.h | 90 ++++++++++++------------- src/frontends/xforms/FormCommand.C | 5 +- src/frontends/xforms/Makefile.am | 19 +++--- src/frontends/xforms/form_citation.C | 22 +++--- src/frontends/xforms/form_citation.h | 8 +-- src/frontends/xforms/form_copyright.h | 2 +- src/frontends/xforms/form_graphics.C | 17 +++-- src/frontends/xforms/form_graphics.h | 2 +- src/frontends/xforms/form_preferences.h | 2 +- src/frontends/xforms/form_print.h | 2 +- src/frontends/xforms/form_tabular.h | 2 +- src/frontends/xforms/form_toc.C | 45 +++++++++++++ src/frontends/xforms/form_toc.h | 19 ++++++ src/frontends/xforms/form_url.C | 4 +- src/frontends/xforms/form_url.h | 6 +- 17 files changed, 170 insertions(+), 85 deletions(-) create mode 100644 src/frontends/xforms/form_toc.C create mode 100644 src/frontends/xforms/form_toc.h diff --git a/ChangeLog b/ChangeLog index f460dfc21f..ce2c2d1457 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2000-08-02 Allan Rae + + * src/frontends/xforms/Makefile.am: A few forgotten files + + * src/frontends/xforms/FormCommand.C (showInset): The rest of the + Signals-not-copyable-problem Lars' started commenting out. + + * src/frontends/xforms/form_toc.[hC]: new files. TOC crashes lyx. + 2000-08-01 Lars Gullik Bjønnes * src/insets/insetcommand.h: Signals is not copyable so anoter diff --git a/po/POTFILES.in b/po/POTFILES.in index d3c7a625ef..8e277b5b4c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -39,6 +39,7 @@ src/frontends/xforms/form_print.C src/frontends/xforms/FormTabular.C src/frontends/xforms/form_tabular.C src/frontends/xforms/FormToc.C +src/frontends/xforms/form_toc.C src/frontends/xforms/FormUrl.C src/frontends/xforms/form_url.C src/frontends/xforms/Menubar_pimpl.C diff --git a/src/ext_l10n.h b/src/ext_l10n.h index b65be178fb..8b4c562def 100644 --- a/src/ext_l10n.h +++ b/src/ext_l10n.h @@ -165,18 +165,17 @@ _("Credits...|e"); _("Version...|V"); _(""); _("A&A"); -_("ACT"); -_("AT_RISE:"); _("Abstract"); _("Accepted"); _("Acknowledgement"); -_("Acknowledgement(s)"); _("Acknowledgement*"); _("Acknowledgement-numbered"); -_("Acknowledgement-unnumbered"); +_("Acknowledgement(s)"); _("Acknowledgements"); +_("Acknowledgement-unnumbered"); _("Acknowledgments"); _("Acnowledgement"); +_("ACT"); _("Addchap"); _("Addchap*"); _("Addition"); @@ -194,15 +193,15 @@ _("Anlagen"); _("Anrede"); _("Appendices"); _("Appendix"); +_("AT_RISE:"); _("Author"); -_("AuthorRunning"); _("Author_Email"); _("Author_Running"); +_("AuthorRunning"); _("Author_URL"); _("Axiom"); _("Axiom-numbered"); _("Axiom-plain"); -_("BLZ"); _("Backaddress"); _("Bank"); _("BankAccount"); @@ -210,12 +209,13 @@ _("BankCode"); _("Betreff"); _("Bibliography"); _("Biography"); +_("BLZ"); _("Brieftext"); -_("CC"); -_("CURTAIN"); _("Caption"); _("Case"); _("Case-numbered"); +_("CC"); +_("cc"); _("CenteredCaption"); _("Chapter"); _("Chapter*"); @@ -255,6 +255,7 @@ _("Criterion-plain"); _("CrossList"); _("Current"); _("Current_Address"); +_("CURTAIN"); _("Customer"); _("Data"); _("Date"); @@ -269,10 +270,10 @@ _("Definition-unnumbered"); _("Description"); _("Dialogue"); _("EMail"); -_("EXT."); _("Email"); _("Encl"); _("Encl."); +_("encl"); _("End_All_Slides"); _("Enumerate"); _("Example"); @@ -283,43 +284,48 @@ _("Example-unnumbered"); _("Exercise"); _("Exercise-numbered"); _("Exercise-plain"); +_("EXT."); _("Extratitle"); -_("FADE_IN:"); -_("FADE_OUT:"); _("Fact"); _("Fact*"); _("Fact-numbered"); _("Fact-plain"); _("Fact-unnumbered"); +_("FADE_IN:"); +_("FADE_OUT:"); _("FigCaption"); +_("first"); _("FirstAuthor"); _("FirstName"); _("FitBitmap"); _("FitFigure"); _("Foilhead"); +_("foilhead"); _("Footernote"); _("FourAffiliations"); _("FourAuthors"); _("Gruss"); -_("HTTP"); _("Headnote"); -_("INT."); +_("HTTP"); _("Idea"); _("IhrSchreiben"); _("IhrZeichen"); _("Institute"); _("Institution"); +_("INT."); _("InvisibleText"); _("Invoice"); _("Itemize"); _("Journal"); +_("journal"); _("Keywords"); _("Konto"); -_("LaTeX"); -_("LaTeX_Title"); _("Labeling"); _("Land"); +_("landscape"); _("LandscapeSlide"); +_("LaTeX"); +_("LaTeX_Title"); _("Lemma"); _("Lemma*"); _("Lemma-numbered"); @@ -338,8 +344,10 @@ _("MarkBoth"); _("MathLetters"); _("MeinZeichen"); _("Minisec"); -_("MyRef"); +_("modying"); +_("msnumber"); _("My_Address"); +_("MyRef"); _("Myref"); _("Name"); _("Narrative"); @@ -349,18 +357,18 @@ _("Note"); _("Note*"); _("Note-numbered"); _("Note-plain"); -_("Note-unnumbered"); _("NoteToEditor"); _("Notetoeditor"); +_("Note-unnumbered"); _("Offprint"); _("Offprints"); _("Offsets"); +_("offsets"); _("Oggetto"); _("Opening"); _("Ort"); _("Overlay"); _("PACS"); -_("PS"); _("Paragraph"); _("Paragraph*"); _("Paragraph-numbered"); @@ -371,8 +379,8 @@ _("Petit"); _("Phone"); _("Place"); _("PlaceFigure"); -_("PlaceTable"); _("Placefigure"); +_("PlaceTable"); _("Placetable"); _("PortraitSlide"); _("PostalCommend"); @@ -389,11 +397,12 @@ _("Proposition*"); _("Proposition-numbered"); _("Proposition-plain"); _("Proposition-unnumbered"); +_("PS"); +_("ps"); _("Publishers"); _("Question"); _("Quotation"); _("Quote"); -_("REVTEX_Title"); _("Received"); _("Recieved"); _("Recieved/Accepted"); @@ -403,17 +412,17 @@ _("Remark"); _("Remark*"); _("Remark-numbered"); _("Remark-plain"); -_("Remark-unnumbered"); _("Remarks"); +_("Remark-unnumbered"); _("RetourAdresse"); _("ReturnAddress"); -_("RightHeader"); +_("REVTEX_Title"); _("Right_Address"); +_("RightHeader"); _("Rotatefoilhead"); _("Running_LaTeX_Title"); _("SCENE"); _("SCENE*"); -_("SGML"); _("Scrap"); _("Section"); _("Section*"); @@ -421,10 +430,11 @@ _("Section-numbered"); _("Send"); _("Send_To_Address"); _("Seriate"); +_("SGML"); _("ShortFoilhead"); +_("Shortfoilhead"); _("ShortRotatefoilhead"); _("ShortTitle"); -_("Shortfoilhead"); _("Signature"); _("Slide"); _("Slide*"); @@ -440,26 +450,26 @@ _("State"); _("Strasse"); _("Street"); _("Style"); -_("SubSection"); -_("SubTitle"); +_("style"); _("Subitle"); _("Subject"); _("Subjectclass"); _("Subparagraph"); _("Subparagraph*"); +_("SubSection"); _("Subsection"); _("Subsection*"); _("Subsection-numbered"); _("Subsubsection"); _("Subsubsection*"); _("Subsubsection-numbered"); +_("SubTitle"); _("Subtitle"); _("Suggested"); _("Summary"); _("Summary-numbered"); _("Surname"); -_("TOC_Author"); -_("TOC_Title"); +_("surname"); _("TableComments"); _("TableRefs"); _("Telefax"); @@ -471,8 +481,8 @@ _("Theorem"); _("Theorem*"); _("Theorem-numbered"); _("Theorem-plain"); -_("Theorem-unnumbered"); _("TheoremTemplate"); +_("Theorem-unnumbered"); _("Thesaurus"); _("ThickLine"); _("This"); @@ -480,39 +490,29 @@ _("ThreeAffiliations"); _("ThreeAuthors"); _("TickList"); _("Title"); -_("Title_Running"); _("Titlehead"); +_("Title_Running"); +_("TOC_Author"); +_("TOC_Title"); _("Town"); -_("Trans_Keywords"); _("Transition"); +_("Trans_Keywords"); _("Translated"); _("TranslatedAbstract"); _("Translated_Title"); _("Translator"); _("TwoAffiliations"); _("TwoAuthors"); -_("URL"); _("Unterschrift"); _("Uppertitleback"); +_("URL"); _("Use"); _("Verbatim"); _("Verse"); _("Verteiler"); _("VisibleText"); _("YourMail"); -_("YourRef"); _("Yourmail"); +_("YourRef"); _("Yourref"); _("Zusatz"); -_("cc"); -_("encl"); -_("first"); -_("foilhead"); -_("journal"); -_("landscape"); -_("modying"); -_("msnumber"); -_("offsets"); -_("ps"); -_("style"); -_("surname"); diff --git a/src/frontends/xforms/FormCommand.C b/src/frontends/xforms/FormCommand.C index e873f66d43..4f30c131ef 100644 --- a/src/frontends/xforms/FormCommand.C +++ b/src/frontends/xforms/FormCommand.C @@ -39,7 +39,10 @@ void FormCommand::showInset( InsetCommand * const inset ) if( dialogIsOpen || inset == 0 ) return; inset_ = inset; - ih_ = inset_->hide.connect(slot(this, &FormCommand::hide)); + // companion to Lars' commenting out in insetcommand. + // need a better plan perhaps since there seems to be a small + // flaw here if we copy an inset while it's visible + // ih_ = inset_->hide.connect(slot(this, &FormCommand::hide)); params = inset->params(); show(); diff --git a/src/frontends/xforms/Makefile.am b/src/frontends/xforms/Makefile.am index ed0aa6d3f2..0cca58a829 100644 --- a/src/frontends/xforms/Makefile.am +++ b/src/frontends/xforms/Makefile.am @@ -9,8 +9,15 @@ LIBS= LDFLAGS= LYXDATADIRS = forms ETAGS_ARGS = --lang=c++ +# Alphabetical order please. It makes it easier to figure out what's missing. libxforms_la_SOURCES = \ Dialogs.C \ + FormCitation.C \ + FormCitation.h \ + form_citation.C \ + form_citation.h \ + FormCommand.C \ + FormCommand.h \ FormCopyright.C \ FormCopyright.h \ form_copyright.C \ @@ -27,18 +34,14 @@ libxforms_la_SOURCES = \ FormPrint.h \ form_print.C \ form_print.h \ - FormGraphics.C \ - FormGraphics.h \ - form_graphics.C \ - form_graphics.h \ - FormCitation.C \ - FormCitation.h \ - form_citation.C \ - form_citation.h \ FormTabular.C \ FormTabular.h \ form_tabular.C \ form_tabular.h \ + FormToc.C \ + FormToc.h \ + form_toc.C \ + form_toc.h \ FormUrl.C \ FormUrl.h \ form_url.C \ diff --git a/src/frontends/xforms/form_citation.C b/src/frontends/xforms/form_citation.C index d67a5d0574..488c8a517f 100644 --- a/src/frontends/xforms/form_citation.C +++ b/src/frontends/xforms/form_citation.C @@ -15,31 +15,31 @@ FD_form_citation * FormCitation::build_citation() FL_OBJECT *obj; FD_form_citation *fdui = new FD_form_citation; - fdui->form_citation = fl_bgn_form(FL_NO_BOX, 450, 780); + fdui->form_citation = fl_bgn_form(FL_NO_BOX, 430, 770); fdui->form_citation->u_vdata = this; - fdui->box = obj = fl_add_box(FL_UP_BOX, 0, 0, 430, 780, ""); + fdui->box = obj = fl_add_box(FL_UP_BOX, 0, 0, 430, 770, ""); fl_set_object_resize(obj, FL_RESIZE_X); fdui->citeBrsr = obj = fl_add_browser(FL_HOLD_BROWSER, 10, 30, 180, 370, _("Inset keys")); fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT); fl_set_object_resize(obj, FL_RESIZE_X); - fl_set_object_callback(obj, C_FormCitationInputCB, CITEBRSR); + fl_set_object_callback(obj, C_FormCommandInputCB, CITEBRSR); fdui->bibBrsr = obj = fl_add_browser(FL_HOLD_BROWSER, 240, 30, 180, 370, _("Bibliography keys")); fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT); fl_set_object_resize(obj, FL_RESIZE_X); - fl_set_object_callback(obj, C_FormCitationInputCB, BIBBRSR); + fl_set_object_callback(obj, C_FormCommandInputCB, BIBBRSR); fdui->addBtn = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 30, 30, 30, _("@4->")); fl_set_object_resize(obj, FL_RESIZE_NONE); - fl_set_object_callback(obj, C_FormCitationInputCB, ADD); + fl_set_object_callback(obj, C_FormCommandInputCB, ADD); fdui->delBtn = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 65, 30, 30, _("@9+")); fl_set_object_resize(obj, FL_RESIZE_NONE); - fl_set_object_callback(obj, C_FormCitationInputCB, DELETE); + fl_set_object_callback(obj, C_FormCommandInputCB, DELETE); fdui->upBtn = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 100, 30, 30, _("@8->")); fl_set_object_resize(obj, FL_RESIZE_NONE); - fl_set_object_callback(obj, C_FormCitationInputCB, UP); + fl_set_object_callback(obj, C_FormCommandInputCB, UP); fdui->downBtn = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 135, 30, 30, _("@2->")); fl_set_object_resize(obj, FL_RESIZE_NONE); - fl_set_object_callback(obj, C_FormCitationInputCB, DOWN); - fdui->infoBrsr = obj = fl_add_browser(FL_NORMAL_BROWSER, 10, 440, 430, 110, _("Info")); + fl_set_object_callback(obj, C_FormCommandInputCB, DOWN); + fdui->infoBrsr = obj = fl_add_browser(FL_NORMAL_BROWSER, 10, 440, 410, 110, _("Info")); fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT); fl_set_object_resize(obj, FL_RESIZE_X); fdui->style = obj = fl_add_choice(FL_NORMAL_CHOICE, 160, 570, 130, 30, _("Citation style")); @@ -51,11 +51,11 @@ FD_form_citation * FormCitation::build_citation() fl_set_object_resize(obj, FL_RESIZE_X); fdui->ok = obj = fl_add_button(FL_RETURN_BUTTON, 230, 730, 90, 30, _("OK")); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); - fl_set_object_callback(obj, C_FormCitationOKCB, 0); + fl_set_object_callback(obj, C_FormCommandOKCB, 0); fdui->cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 730, 90, 30, _("Cancel")); fl_set_button_shortcut(obj, _("^["), 1); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); - fl_set_object_callback(obj, C_FormCitationCancelCB, 0); + fl_set_object_callback(obj, C_FormCommandCancelCB, 0); fl_end_form(); fdui->form_citation->fdui = fdui; diff --git a/src/frontends/xforms/form_citation.h b/src/frontends/xforms/form_citation.h index c4b5c4b397..a2ef2f2063 100644 --- a/src/frontends/xforms/form_citation.h +++ b/src/frontends/xforms/form_citation.h @@ -1,12 +1,12 @@ -/** Header file generated with fdesign on Fri Jul 28 11:50:10 2000.**/ +/** Header file generated with fdesign on Wed Aug 2 13:56:56 2000.**/ #ifndef FD_form_citation_h_ #define FD_form_citation_h_ /** Callbacks, globals and object handlers **/ -extern "C" void C_FormCitationInputCB(FL_OBJECT *, long); -extern "C" void C_FormCitationOKCB(FL_OBJECT *, long); -extern "C" void C_FormCitationCancelCB(FL_OBJECT *, long); +extern "C" void C_FormCommandInputCB(FL_OBJECT *, long); +extern "C" void C_FormCommandOKCB(FL_OBJECT *, long); +extern "C" void C_FormCommandCancelCB(FL_OBJECT *, long); /**** Forms and Objects ****/ diff --git a/src/frontends/xforms/form_copyright.h b/src/frontends/xforms/form_copyright.h index 87f70a9bc4..3a415f4ad2 100644 --- a/src/frontends/xforms/form_copyright.h +++ b/src/frontends/xforms/form_copyright.h @@ -1,4 +1,4 @@ -/** Header file generated with fdesign on Fri Jul 28 11:50:10 2000.**/ +/** Header file generated with fdesign on Wed Aug 2 13:56:56 2000.**/ #ifndef FD_form_copyright_h_ #define FD_form_copyright_h_ diff --git a/src/frontends/xforms/form_graphics.C b/src/frontends/xforms/form_graphics.C index 281bca8468..293e2963c2 100644 --- a/src/frontends/xforms/form_graphics.C +++ b/src/frontends/xforms/form_graphics.C @@ -1,4 +1,4 @@ -// File modified by fdfix.sh for use by lyx (with xforms >= 0.86) and gettext +// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext #include #include "lyx_gui_misc.h" #include "gettext.h" @@ -22,9 +22,11 @@ FD_form_graphics * FormGraphics::build_graphics() fl_set_object_resize(obj, FL_RESIZE_NONE); obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 310, 390, 30, ""); obj = fl_add_frame(FL_ENGRAVED_FRAME, 230, 250, 170, 50, ""); - fdui->input_filename = obj = fl_add_input(FL_NORMAL_INPUT, 90, 20, 210, 30, idex(_("Graphics File|F#F")));fl_set_button_shortcut(obj, scex(_("Graphics File|F#F")), 1); + fdui->input_filename = obj = fl_add_input(FL_NORMAL_INPUT, 90, 20, 210, 30, idex(_("Graphics File|F#F"))); + fl_set_button_shortcut(obj, scex(_("Graphics File|F#F")), 1); fl_set_object_callback(obj, C_FormGraphicsInputCB, 0); - fdui->button_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 20, 90, 30, idex(_("Browse|B#B")));fl_set_button_shortcut(obj, scex(_("Browse|B#B")), 1); + fdui->button_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 20, 90, 30, idex(_("Browse|B#B"))); + fl_set_button_shortcut(obj, scex(_("Browse|B#B")), 1); fl_set_object_callback(obj, C_FormGraphicsBrowseCB, 0); obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 70, 200, 160, _("Width")); fl_set_object_lalign(obj, FL_ALIGN_CENTER); @@ -40,9 +42,11 @@ FD_form_graphics * FormGraphics::build_graphics() fl_set_object_lalign(obj, FL_ALIGN_CENTER); fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 10, 350, 70, 30, _("Ok")); fl_set_object_callback(obj, C_FormGraphicsOKCB, 0); - fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 100, 350, 70, 30, idex(_("Apply|A#A")));fl_set_button_shortcut(obj, scex(_("Apply|A#A")), 1); + fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 100, 350, 70, 30, idex(_("Apply|A#A"))); + fl_set_button_shortcut(obj, scex(_("Apply|A#A")), 1); fl_set_object_callback(obj, C_FormGraphicsApplyCB, 0); - fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 190, 350, 70, 30, idex(_("Cancel|C#C^[")));fl_set_button_shortcut(obj, scex(_("Cancel|C#C^[")), 1); + fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 190, 350, 70, 30, idex(_("Cancel|C#C^["))); + fl_set_button_shortcut(obj, scex(_("Cancel|C#C^[")), 1); fl_set_object_callback(obj, C_FormGraphicsCancelCB, 0); fdui->radio_button_group_width = fl_bgn_group(); @@ -88,7 +92,8 @@ FD_form_graphics * FormGraphics::build_graphics() fl_set_object_callback(obj, C_FormGraphicsInputCB, 0); fdui->input_subcaption = obj = fl_add_input(FL_NORMAL_INPUT, 120, 310, 280, 30, ""); fl_set_object_callback(obj, C_FormGraphicsInputCB, 0); - fdui->check_subcaption = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 310, 110, 30, idex(_("Subcaption|S#S")));fl_set_button_shortcut(obj, scex(_("Subcaption|S#S")), 1); + fdui->check_subcaption = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 310, 110, 30, idex(_("Subcaption|S#S"))); + fl_set_button_shortcut(obj, scex(_("Subcaption|S#S")), 1); fl_set_object_callback(obj, C_FormGraphicsInputCB, 0); fl_end_form(); diff --git a/src/frontends/xforms/form_graphics.h b/src/frontends/xforms/form_graphics.h index c33862e4c6..203f37d198 100644 --- a/src/frontends/xforms/form_graphics.h +++ b/src/frontends/xforms/form_graphics.h @@ -1,4 +1,4 @@ -/** Header file generated with fdesign on Wed Jul 19 10:20:11 2000.**/ +/** Header file generated with fdesign on Wed Aug 2 13:56:57 2000.**/ #ifndef FD_form_graphics_h_ #define FD_form_graphics_h_ diff --git a/src/frontends/xforms/form_preferences.h b/src/frontends/xforms/form_preferences.h index e6ce493e39..07a0f74472 100644 --- a/src/frontends/xforms/form_preferences.h +++ b/src/frontends/xforms/form_preferences.h @@ -1,4 +1,4 @@ -/** Header file generated with fdesign on Fri Jul 28 11:50:11 2000.**/ +/** Header file generated with fdesign on Wed Aug 2 13:56:57 2000.**/ #ifndef FD_form_bind_h_ #define FD_form_bind_h_ diff --git a/src/frontends/xforms/form_print.h b/src/frontends/xforms/form_print.h index 63a4d1ee64..be79d86f03 100644 --- a/src/frontends/xforms/form_print.h +++ b/src/frontends/xforms/form_print.h @@ -1,4 +1,4 @@ -/** Header file generated with fdesign on Fri Jul 28 11:50:11 2000.**/ +/** Header file generated with fdesign on Wed Aug 2 13:56:57 2000.**/ #ifndef FD_form_print_h_ #define FD_form_print_h_ diff --git a/src/frontends/xforms/form_tabular.h b/src/frontends/xforms/form_tabular.h index 5b582a1316..74f646937a 100644 --- a/src/frontends/xforms/form_tabular.h +++ b/src/frontends/xforms/form_tabular.h @@ -1,4 +1,4 @@ -/** Header file generated with fdesign on Mon Jul 31 12:55:35 2000.**/ +/** Header file generated with fdesign on Wed Aug 2 13:56:57 2000.**/ #ifndef FD_form_tabular_h_ #define FD_form_tabular_h_ diff --git a/src/frontends/xforms/form_toc.C b/src/frontends/xforms/form_toc.C new file mode 100644 index 0000000000..cade37f8c6 --- /dev/null +++ b/src/frontends/xforms/form_toc.C @@ -0,0 +1,45 @@ +// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext +#include +#include "lyx_gui_misc.h" +#include "gettext.h" + +/* Form definition file generated with fdesign. */ + +#include FORMS_H_LOCATION +#include +#include "form_toc.h" +#include "FormToc.h" + +FD_form_toc * FormToc::build_toc() +{ + FL_OBJECT *obj; + FD_form_toc *fdui = new FD_form_toc; + + fdui->form_toc = fl_bgn_form(FL_NO_BOX, 420, 340); + fdui->form_toc->u_vdata = this; + obj = fl_add_box(FL_UP_BOX, 0, 0, 420, 340, ""); + fdui->browser = obj = fl_add_browser(FL_HOLD_BROWSER, 10, 10, 400, 280, ""); + fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast); + fl_set_object_callback(obj, C_FormCommandApplyCB, 0); + obj = fl_add_button(FL_RETURN_BUTTON, 310, 300, 100, 30, _("Close")); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); + fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); + fl_set_object_callback(obj, C_FormCommandCancelCB, 0); + obj = fl_add_button(FL_NORMAL_BUTTON, 200, 300, 100, 30, _("Update")); + fl_set_button_shortcut(obj, scex(_("Update|#U#u")), 1); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); + fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); + fl_set_object_callback(obj, C_FormCommandApplyCB, 0); + fdui->type = obj = fl_add_choice(FL_NORMAL_CHOICE, 60, 300, 130, 30, _("Type")); + fl_set_object_shortcut(obj, scex(_("Type|#T#t")), 1); + fl_set_object_boxtype(obj, FL_FRAME_BOX); + fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); + fl_set_object_callback(obj, C_FormCommandApplyCB, 0); + fl_end_form(); + + fdui->form_toc->fdui = fdui; + + return fdui; +} +/*---------------------------------------*/ + diff --git a/src/frontends/xforms/form_toc.h b/src/frontends/xforms/form_toc.h new file mode 100644 index 0000000000..f61f232fbb --- /dev/null +++ b/src/frontends/xforms/form_toc.h @@ -0,0 +1,19 @@ +/** Header file generated with fdesign on Wed Aug 2 13:56:57 2000.**/ + +#ifndef FD_form_toc_h_ +#define FD_form_toc_h_ + +/** Callbacks, globals and object handlers **/ +extern "C" void C_FormCommandApplyCB(FL_OBJECT *, long); +extern "C" void C_FormCommandCancelCB(FL_OBJECT *, long); + + +/**** Forms and Objects ****/ +struct FD_form_toc { + + FL_FORM *form_toc; + FL_OBJECT *browser; + FL_OBJECT *type; +}; + +#endif /* FD_form_toc_h_ */ diff --git a/src/frontends/xforms/form_url.C b/src/frontends/xforms/form_url.C index 7b388bdad4..2572de7846 100644 --- a/src/frontends/xforms/form_url.C +++ b/src/frontends/xforms/form_url.C @@ -37,10 +37,10 @@ FD_form_url * FormUrl::build_url() fl_set_button_shortcut(obj, _("^["), 1); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); - fl_set_object_callback(obj, C_FormUrlCancelCB, 0); + fl_set_object_callback(obj, C_FormCommandCancelCB, 0); fdui->ok = obj = fl_add_button(FL_RETURN_BUTTON, 300, 100, 100, 30, _("OK")); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); - fl_set_object_callback(obj, C_FormUrlOKCB, 0); + fl_set_object_callback(obj, C_FormCommandOKCB, 0); fl_end_form(); fdui->form_url->fdui = fdui; diff --git a/src/frontends/xforms/form_url.h b/src/frontends/xforms/form_url.h index 20a31be8ed..e15d756abd 100644 --- a/src/frontends/xforms/form_url.h +++ b/src/frontends/xforms/form_url.h @@ -1,11 +1,11 @@ -/** Header file generated with fdesign on Fri Jul 28 11:50:11 2000.**/ +/** Header file generated with fdesign on Wed Aug 2 13:56:57 2000.**/ #ifndef FD_form_url_h_ #define FD_form_url_h_ /** Callbacks, globals and object handlers **/ -extern "C" void C_FormUrlCancelCB(FL_OBJECT *, long); -extern "C" void C_FormUrlOKCB(FL_OBJECT *, long); +extern "C" void C_FormCommandCancelCB(FL_OBJECT *, long); +extern "C" void C_FormCommandOKCB(FL_OBJECT *, long); /**** Forms and Objects ****/ -- 2.39.5