From 6c80f6633d70a384160ce048343a7c60b379c0cd Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Sat, 16 Mar 2002 12:55:22 +0000 Subject: [PATCH] gnome patch from Michael. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3760 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/gnome/ChangeLog | 7 +++- src/frontends/gnome/Dialogs.C | 7 +++- src/frontends/gnome/Makefile.am | 67 ++++++++++++--------------------- src/frontends/gnome/README | 32 ++++++++++++---- 4 files changed, 59 insertions(+), 54 deletions(-) diff --git a/src/frontends/gnome/ChangeLog b/src/frontends/gnome/ChangeLog index 10fd6b6d2e..b47b48130f 100644 --- a/src/frontends/gnome/ChangeLog +++ b/src/frontends/gnome/ChangeLog @@ -1,9 +1,14 @@ +2002-03-16 Michael A. Koziarski + + * Makefile.am: Cleanup and linking fix. + * README: Added procedure for adding a new dialog. + * Dialogs.C (tooltipsEnable): new method. + 2002-03-14 Michael A. Koziarski * Timeout_pimpl.C * Timeout_pimpl.h: implemented running to fix compilation, linking fix still to come - 2002-03-11 Lars Gullik Bjønnes diff --git a/src/frontends/gnome/Dialogs.C b/src/frontends/gnome/Dialogs.C index d4792e2f9b..40a4e5e2cc 100644 --- a/src/frontends/gnome/Dialogs.C +++ b/src/frontends/gnome/Dialogs.C @@ -19,7 +19,7 @@ #include "Dialogs.h" #include "BufferView.h" #include "gnomeBC.h" - +#include "Tooltips.h" #include "ControlBibitem.h" #include "ControlBibtex.h" #include "ControlCharacter.h" @@ -63,7 +63,10 @@ #include "FormUrl.h" #include "FormMinipage.h" */ - +bool Dialogs::tooltipsEnabled() +{ + return Tooltips::enabled(); +} Dialogs::Dialogs(LyXView * lv) { add(new GUIUrl(*lv, *this)); diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am index a6e3d04948..8cf3771380 100644 --- a/src/frontends/gnome/Makefile.am +++ b/src/frontends/gnome/Makefile.am @@ -13,63 +13,44 @@ else XFORMSGIMAGE = ../xforms/xformsGImage.lo endif +# alphabetised xforms_objects = \ - ../xforms/xforms_helpers.lo \ - ../xforms/Toolbar_pimpl.lo \ + ../xforms/Alert_pimpl.lo \ + ../xforms/bmtable.lo \ ../xforms/combox.lo \ - ../xforms/MathsSymbols.lo \ + ../xforms/Color.lo \ + ../xforms/DropDown.lo \ + ../xforms/FeedbackController.lo \ + ../xforms/FormBaseDeprecated.lo \ ../xforms/FormMathsBitmap.lo \ ../xforms/FormMathsDeco.lo \ + ../xforms/form_maths_deco.lo \ ../xforms/FormMathsDelim.lo \ + ../xforms/form_maths_delim.lo \ ../xforms/FormMathsMatrix.lo \ + ../xforms/form_maths_matrix.lo \ ../xforms/FormMathsPanel.lo \ + ../xforms/form_maths_panel.lo \ ../xforms/FormMathsSpace.lo \ - ../xforms/DropDown.lo \ - ../xforms/Alert_pimpl.lo \ - $(XFORMSGIMAGE) ../xforms/Menubar_pimpl.lo + ../xforms/form_maths_space.lo \ + ../xforms/FormMathsStyle.lo \ + ../xforms/form_maths_style.lo \ + ../xforms/MathsSymbols.lo \ + ../xforms/Menubar_pimpl.lo \ + ../xforms/Toolbar_pimpl.lo \ + ../xforms/Tooltips.lo \ + ../xforms/xforms_helpers.lo \ + ../xforms/xformsBC.lo \ + $(XFORMSGIMAGE) libgnome.la: xforms.lo $(libgnome_la_OBJECTS) $(libgnome_la_DEPENDENCIES) xforms.lo: $(xforms_objects) $(CXXLINK) $(xforms_objects) -# ../xforms/FileDialog.lo \ -# ../xforms/FormFiledialog.lo \ -# ../xforms/form_filedialog.lo -# ../xforms/Timeout_pimpl.lo \ -# ../xforms/Color.lo \ -# ../xforms/FormFiledialog.lo \ -# ../xforms/form_filedialog.lo \ -# ../xforms/FormBase.lo \ -# ../xforms/FormCitation.lo \ -# ../xforms/form_citation.lo \ -# ../xforms/FormCopyright.lo \ -# ../xforms/form_copyright.lo \ -# ../xforms/FormDocument.lo \ -# ../xforms/form_document.lo \ -# ../xforms/FormError.lo \ -# ../xforms/form_error.lo \ -# ../xforms/FormGraphics.lo \ -# ../xforms/form_graphics.lo \ -# ../xforms/FormIndex.lo \ -# ../xforms/form_index.lo \ -# ../xforms/FormInset.lo \ -# ../xforms/FormParagraph.lo \ -# ../xforms/form_paragraph.lo \ -# ../xforms/FormPreferences.lo \ -# ../xforms/form_preferences.lo \ -# ../xforms/FormPrint.lo \ -# ../xforms/form_print.lo \ -# ../xforms/FormRef.lo \ -# ../xforms/form_ref.lo \ -# ../xforms/FormTabular.lo \ -# ../xforms/form_tabular.lo \ -# ../xforms/FormTabularCreate.lo \ -# ../xforms/form_tabular_create.lo \ -# ../xforms/FormToc.lo \ -# ../xforms/form_toc.lo \ -# ../xforms/input_validators.lo \ -# ../xforms/RadioButtonGroup.lo \ +### +# KOZ 20020315 Large commented out removed. +### #LDFLAGS= $(libgnome_la_OBJADD) LYXDATADIRS = diff --git a/src/frontends/gnome/README b/src/frontends/gnome/README index 291b7de435..d427144ca9 100644 --- a/src/frontends/gnome/README +++ b/src/frontends/gnome/README @@ -2,7 +2,12 @@ GNOME FRONT END =============== Firstly, this stuff is pre-alpha. I don't use it so you shouldn't -either. At all, no exceptions :). +either. At all, no exceptions :). Secondly I'm no c++ guru, I'm +learning as I go along so if something looks stupid, there's a good +chance it is. + +Adding Dialogs +-------------- The GNOME frontend of LyX uses libglade to draw the dialogs. The base (GnomeBase.C) class handles the drawing and activating of the Dialogs, @@ -20,16 +25,27 @@ If you look at FormUrl you'll see that there are a number of helper functions at the bottom of the .C file. These are automatically generated by accessors.py -Glade files now must follow the following conventions: +For accessors.py to work glade files now must adhere to the following +conventions: * The filename should be the same as the .C and .h Files (i.e FormTabularCreate.glade) - * The root widget should have the same name - * Functional widgets should have an r_ as the first two characters of - their name. (see below) - -USING ACCESSORS.PY -================== + * The root widget should be named similarly (i.e FormTabularCreate) + * Functional widgets, those actually used rather than the filler + widgets like Gtk::HBox etc, should have an r_ as the first two + characters of their name. (see below) + +To make the build system include your new dialog edit Makefile.am as +follows: + 1) make clean in src/frontends/gnome/ + 2) Add FormX.C and FormX.h to libgnome_la_SOURCES + 3) Remove FormX.lo and form_x.lo (if applicable) from xforms_objects + 4) make clean && make in src/frontends/ + 5) make in src/ + + +Using accessors.py +------------------ Usage: -- 2.39.2