anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xforms clean-up, described in detail in my mail of 31 May. See

Browse Source 
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg38939.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4393 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-06-13 13:43:51 +00:00
parent 4399c57ed5
commit a97c4f51c3
202 changed files with 1040 additions and 8965 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2002-06-12 Angus Leeming <leeming@lyx.org>
* configure.in: add xforms/forms/*.lo to the xforms version of
FRONTEND_GUILIB.
2002-06-12 Angus Leeming <leeming@lyx.org>
* configure.in: remove LYX_STL_STRING_FWD.

2
configure.in
View File

@ -169,7 +169,7 @@ case "$lyx_use_frontend" in
xforms)
# for now don't set it for xforms as this is always entered
FRONTEND="xforms"
FRONTEND_GUILIB="xforms/*.lo"
FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
FRONTEND_INFO=`cat <<EOF

2
src/frontends/xforms/Alert_pimpl.C
View File

@ -14,7 +14,7 @@
#include "Alert.h"
#include "Alert_pimpl.h"
#include "xforms_helpers.h"
#include "forms_gettext.h"
#include "gettext.h"
#include <algorithm>

34
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,37 @@
2002-06-12 Angus Leeming <leeming@lyx.org>
* form_*.[Ch]: removed from the repository.
* forms/Makefile.am:
* forms/fdfix.sh: changes to generate form_*.[Ch] automatically.
* forms/form_*.fd: use a consistent naming convention for the fdesign
generated FD_xyz structs. For example, form_aboutlyx.h now contains:
struct FD_aboutlyx;
struct FD_aboutlyx_version;
struct FD_aboutlyx_credits;
struct FD_aboutlyx_license;
* forms/fdfix[ch].sed: no longer write the build routines for the
fdesign generated FD_xyz structs as member methods of the controlling
FormXyz class. It's unnecessary and needs patch files in addition to
the sed magic to work properly. Thus, the structs above are now
generated by routines
FD_aboutlyx * build_aboutlyx();
FD_aboutlyx_version * build_aboutlyx_version();
FD_aboutlyx_credits * build_aboutlyx_credits();
FD_aboutlyx_license * build_aboutlyx_license();
* forms/README: document all the above.
* forms_fwd.h: new file to forward declare FL_OBJECT, FL_FORM.
* forms_gettext.[Ch]: new files containing only the scex, idex functions
stored previously in xforms_helpers.[Ch].
* xforms_helpers.[Ch]: removed scex, idex functions.
* Most other files: minor changes associated with the above.
2002-06-12 John Levon <moz@compsoc.man.ac.uk>
* XWorkArea.h:

54
src/frontends/xforms/Dialogs.C
View File

@ -19,33 +19,33 @@
#include "xformsBC.h"
#include "combox.h" // needed for clean destruction of boost::scoped_ptr
#include "form_aboutlyx.h"
#include "form_bibitem.h"
#include "form_bibtex.h"
#include "form_browser.h"
#include "form_character.h"
#include "form_citation.h"
#include "form_error.h"
#include "form_ert.h"
#include "form_external.h"
#include "form_float.h"
#include "form_forks.h"
#include "form_graphics.h"
#include "form_include.h"
#include "form_index.h"
#include "form_minipage.h"
#include "form_paragraph.h"
#include "form_preamble.h"
#include "form_print.h"
#include "form_ref.h"
#include "form_search.h"
#include "form_sendto.h"
#include "form_spellchecker.h"
#include "form_tabular_create.h"
#include "form_texinfo.h"
#include "form_thesaurus.h"
#include "form_toc.h"
#include "form_url.h"
#include "forms/form_aboutlyx.h"
#include "forms/form_bibitem.h"
#include "forms/form_bibtex.h"
#include "forms/form_browser.h"
#include "forms/form_character.h"
#include "forms/form_citation.h"
#include "forms/form_error.h"
#include "forms/form_ert.h"
#include "forms/form_external.h"
#include "forms/form_float.h"
#include "forms/form_forks.h"
#include "forms/form_graphics.h"
#include "forms/form_include.h"
#include "forms/form_index.h"
#include "forms/form_minipage.h"
#include "forms/form_paragraph.h"
#include "forms/form_preamble.h"
#include "forms/form_print.h"
#include "forms/form_ref.h"
#include "forms/form_search.h"
#include "forms/form_sendto.h"
#include "forms/form_spellchecker.h"
#include "forms/form_tabular_create.h"
#include "forms/form_texinfo.h"
#include "forms/form_thesaurus.h"
#include "forms/form_toc.h"
#include "forms/form_url.h"
#include "FormAboutlyx.h"
#include "FormBibitem.h"

2
src/frontends/xforms/DropDown.C
View File

@ -15,6 +15,8 @@
#include "DropDown.h"
#include "xforms_helpers.h"
#include FORMS_H_LOCATION
#include <iostream>
#include <cctype>

9
src/frontends/xforms/DropDown.h
View File

@ -14,15 +14,16 @@
#pragma interface
#endif
#include "frontends/LyXView.h"
#include "LString.h"
#include FORMS_H_LOCATION
#include "forms_fwd.h"
#include <X11/Xlib.h>
#include <boost/signals/signal1.hpp>
#include "LString.h"
#include <vector>
class LyXView;
class DropDown {
public:
/// constructor

1
src/frontends/xforms/FeedbackController.C
View File

@ -22,6 +22,7 @@
#include "gettext.h" // _()
#include "xforms_helpers.h" // formatted
#include "support/LAssert.h"
#include FORMS_H_LOCATION
FeedbackController::FeedbackController()
: warning_posted_(false), message_widget_(0)

2
src/frontends/xforms/FeedbackController.h
View File

@ -16,7 +16,7 @@
#ifndef FEEDBACKCONTROLLER_H
#define FEEDBACKCONTROLLER_H
#include FORMS_H_LOCATION
#include "forms_fwd.h"
#include "LString.h"
#ifdef __GNUG__

13
src/frontends/xforms/FormAboutlyx.C
View File

@ -16,13 +16,14 @@
#include "xformsBC.h"
#include "ControlAboutlyx.h"
#include "FormAboutlyx.h"
#include "form_aboutlyx.h"
#include "forms/form_aboutlyx.h"
#include "xforms_helpers.h"
#include FORMS_H_LOCATION
#include "Lsstream.h"
using std::getline;
typedef FormCB<ControlAboutlyx, FormDB<FD_form_aboutlyx> > base_class;
typedef FormCB<ControlAboutlyx, FormDB<FD_aboutlyx> > base_class;
FormAboutlyx::FormAboutlyx(ControlAboutlyx & c)
: base_class(c, _("About LyX"), false)
@ -31,17 +32,17 @@ FormAboutlyx::FormAboutlyx(ControlAboutlyx & c)
void FormAboutlyx::build()
{
dialog_.reset(build_aboutlyx());
dialog_.reset(build_aboutlyx(this));
// create version tab
version_.reset(build_tab_version());
version_.reset(build_aboutlyx_version(this));
fl_set_object_label(version_->text_version,
controller().getVersion().c_str());
fl_set_object_label(version_->text_copyright,
controller().getCopyright().c_str());
// create license and warranty tab
license_.reset(build_tab_license());
license_.reset(build_aboutlyx_license(this));
string str = formatted(controller().getLicense(),
license_->text_license->w-10);
@ -52,7 +53,7 @@ void FormAboutlyx::build()
fl_set_object_label(license_->text_warranty, str.c_str());
// create credits
credits_.reset(build_tab_credits());
credits_.reset(build_aboutlyx_credits(this));
stringstream ss;
fl_add_browser_line(credits_->browser_credits,
controller().getCredits(ss).str().c_str());

25
src/frontends/xforms/FormAboutlyx.h
View File

@ -22,14 +22,14 @@
#include <boost/scoped_ptr.hpp>
class ControlAboutlyx;
struct FD_form_aboutlyx;
struct FD_form_tab_version;
struct FD_form_tab_credits;
struct FD_form_tab_license;
struct FD_aboutlyx;
struct FD_aboutlyx_version;
struct FD_aboutlyx_credits;
struct FD_aboutlyx_license;
/** This class provides an XForms implementation of the FormAboutlyx Dialog.
*/
class FormAboutlyx : public FormCB<ControlAboutlyx, FormDB<FD_form_aboutlyx> > {
class FormAboutlyx : public FormCB<ControlAboutlyx, FormDB<FD_aboutlyx> > {
public:
///
FormAboutlyx(ControlAboutlyx &);
@ -42,21 +42,12 @@ private:
/// Build the dialog
virtual void build();
/// Fdesign generated method
FD_form_aboutlyx * build_aboutlyx();
///
FD_form_tab_version * build_tab_version();
///
FD_form_tab_credits * build_tab_credits();
///
FD_form_tab_license * build_tab_license();
/// Real GUI implementation.
boost::scoped_ptr<FD_form_tab_version> version_;
boost::scoped_ptr<FD_aboutlyx_version> version_;
///
boost::scoped_ptr<FD_form_tab_credits> credits_;
boost::scoped_ptr<FD_aboutlyx_credits> credits_;
///
boost::scoped_ptr<FD_form_tab_license> license_;
boost::scoped_ptr<FD_aboutlyx_license> license_;
};
#endif // FORMABOUTLYX_H

1
src/frontends/xforms/FormBase.C
View File

@ -18,6 +18,7 @@
#include "xforms_resize.h"
#include "Tooltips.h"
#include "support/LAssert.h"
#include FORMS_H_LOCATION
extern "C" {

2
src/frontends/xforms/FormBase.h
View File

@ -24,7 +24,7 @@
#include <boost/scoped_ptr.hpp>
#include FORMS_H_LOCATION // Can't forward-declare FL_FORM
#include "forms_fwd.h"
class xformsBC;
class Tooltips;

2
src/frontends/xforms/FormBaseDeprecated.C
View File

@ -17,6 +17,8 @@
#include "xformsBC.h"
#include "xforms_resize.h"
#include "Tooltips.h"
#include FORMS_H_LOCATION
#include "lyxrc.h"
#include "frontends/LyXView.h"

2
src/frontends/xforms/FormBaseDeprecated.h
View File

@ -25,7 +25,7 @@
#include "xformsBC.h"
#include "FeedbackController.h"
#include FORMS_H_LOCATION
#include "forms_fwd.h"
#include <boost/signals/trackable.hpp>

7
src/frontends/xforms/FormBibitem.C
View File

@ -15,11 +15,12 @@
#include "xformsBC.h"
#include "ControlBibitem.h"
#include "FormBibitem.h"
#include "form_bibitem.h"
#include "forms/form_bibitem.h"
#include FORMS_H_LOCATION
#include "gettext.h"
#include "support/lstrings.h" // compare
typedef FormCB<ControlBibitem, FormDB<FD_form_bibitem> > base_class;
typedef FormCB<ControlBibitem, FormDB<FD_bibitem> > base_class;
FormBibitem::FormBibitem(ControlBibitem & c)
: base_class(c, _("Bibliography Entry"))
@ -28,7 +29,7 @@ FormBibitem::FormBibitem(ControlBibitem & c)
void FormBibitem::build()
{
dialog_.reset(build_bibitem());
dialog_.reset(build_bibitem(this));
fl_set_input_return(dialog_->input_key, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_label, FL_RETURN_CHANGED);

7
src/frontends/xforms/FormBibitem.h
View File

@ -18,12 +18,12 @@
#include "FormBase.h"
class ControlBibitem;
struct FD_form_bibitem;
struct FD_bibitem;
/**
* For bibliography entry editing
*/
class FormBibitem : public FormCB<ControlBibitem, FormDB<FD_form_bibitem> > {
class FormBibitem : public FormCB<ControlBibitem, FormDB<FD_bibitem> > {
public:
///
FormBibitem(ControlBibitem &);
@ -37,9 +37,6 @@ private:
virtual void update();
/// Filter the inputs on callback from xforms
virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
/// Fdesign generated method
FD_form_bibitem * build_bibitem();
};
#endif // FORMBIBITEM_H

8
src/frontends/xforms/FormBibtex.C
View File

@ -16,9 +16,11 @@
#include "xformsBC.h"
#include "ControlBibtex.h"
#include "FormBibtex.h"
#include "form_bibtex.h"
#include "forms/form_bibtex.h"
#include "Tooltips.h"
#include "xforms_helpers.h"
#include FORMS_H_LOCATION
#include "helper_funcs.h"
#include "gettext.h"
#include "debug.h"
@ -31,7 +33,7 @@ using std::vector;
using std::sort;
typedef FormCB<ControlBibtex, FormDB<FD_form_bibtex> > base_class;
typedef FormCB<ControlBibtex, FormDB<FD_bibtex> > base_class;
FormBibtex::FormBibtex(ControlBibtex & c)
: base_class(c, _("BibTeX Database"))
@ -40,7 +42,7 @@ FormBibtex::FormBibtex(ControlBibtex & c)
void FormBibtex::build()
{
dialog_.reset(build_bibtex());
dialog_.reset(build_bibtex(this));
fl_set_input_return(dialog_->input_database, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_style, FL_RETURN_CHANGED);

7
src/frontends/xforms/FormBibtex.h
View File

@ -18,12 +18,12 @@
#include "FormBase.h"
class ControlBibtex;
struct FD_form_bibtex;
struct FD_bibtex;
/**
* For bibtex database setting
*/
class FormBibtex : public FormCB<ControlBibtex, FormDB<FD_form_bibtex> > {
class FormBibtex : public FormCB<ControlBibtex, FormDB<FD_bibtex> > {
public:
///
FormBibtex(ControlBibtex &);
@ -37,9 +37,6 @@ private:
virtual void update();
/// Filter the inputs on callback from xforms
virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
/// Fdesign generated method
FD_form_bibtex * build_bibtex();
};
#endif // FORMBIBTEX_H

6
src/frontends/xforms/FormBrowser.C
View File

@ -13,17 +13,17 @@
#endif
#include "FormBrowser.h"
#include "form_browser.h"
#include "forms/form_browser.h"
#include "xformsBC.h"
FormBrowser::FormBrowser(ControlButtons & c, string const & t, bool allowResize)
: FormDB<FD_form_browser>(c, t, allowResize)
: FormDB<FD_browser>(c, t, allowResize)
{}
void FormBrowser::build()
{
dialog_.reset(build_browser());
dialog_.reset(build_browser(this));
// Manage the close button
bc().setCancel(dialog_->button_close);

6
src/frontends/xforms/FormBrowser.h
View File

@ -21,9 +21,9 @@
* This class provides an XForms implementation of a read only
* text browser.
*/
struct FD_form_browser;
struct FD_browser;
class FormBrowser : public FormDB<FD_form_browser> {
class FormBrowser : public FormDB<FD_browser> {
public:
///
FormBrowser(ControlButtons &, string const &, bool allowResize=true);
@ -31,8 +31,6 @@ public:
private:
/// Build the dialog.
virtual void build();
/// generated build function
FD_form_browser * build_browser();
};
#endif // FORMBROWSER_H

10
src/frontends/xforms/FormCharacter.C
View File

@ -18,11 +18,13 @@
#include "xformsBC.h"
#include "ControlCharacter.h"
#include "FormCharacter.h"
#include "form_character.h"
#include "forms/form_character.h"
#include "gettext.h"
#include "combox.h"
#include "helper_funcs.h"
#include "xforms_helpers.h"
#include FORMS_H_LOCATION
#include "frnt_lang.h"
#include "support/lstrings.h"
@ -32,14 +34,14 @@ using std::find;
using namespace frnt;
typedef FormCB<ControlCharacter, FormDB<FD_form_character> > base_class;
typedef FormCB<ControlCharacter, FormDB<FD_character> > base_class;
FormCharacter::FormCharacter(ControlCharacter & c)
: base_class(c, _("Character Layout"), false)
{}
void FormCharacter::ComboInputCB(int, void * v, Combox * combox)
void FormCharacter::ComboInputCB(int, void * v, Combox *)
{
FormCharacter * pre = static_cast<FormCharacter*>(v);
// must use input() directly, to avoid treating the Combox
@ -49,7 +51,7 @@ void FormCharacter::ComboInputCB(int, void * v, Combox * combox)
void FormCharacter::build()
{
dialog_.reset(build_character());
dialog_.reset(build_character(this));
vector<FamilyPair> const family = getFamilyData();
vector<SeriesPair> const series = getSeriesData();

7
src/frontends/xforms/FormCharacter.h
View File

@ -24,7 +24,7 @@
#include <boost/scoped_ptr.hpp>
class Combox;
struct FD_form_character;
struct FD_character;
/**
* This class provides an XForms implementation of the Character Dialog.
@ -32,7 +32,7 @@ struct FD_form_character;
* in their documents.
*/
class FormCharacter
: public FormCB<ControlCharacter, FormDB<FD_form_character> > {
: public FormCB<ControlCharacter, FormDB<FD_character> > {
public:
///
FormCharacter(ControlCharacter &);
@ -54,9 +54,6 @@ private:
combox is changed */
static void ComboInputCB(int, void *, Combox *);
/// Fdesign generated method
FD_form_character * build_character();
///
boost::scoped_ptr<Combox> combo_language2_;
///

12
src/frontends/xforms/FormCitation.C
View File

@ -16,10 +16,12 @@
#include "xformsBC.h"
#include "ControlCitation.h"
#include "FormCitation.h"
#include "form_citation.h"
#include "forms/form_citation.h"
#include "Tooltips.h"
#include "helper_funcs.h"
#include "xforms_helpers.h"
#include FORMS_H_LOCATION
#include "gettext.h"
#include "support/LAssert.h"
#include "support/lstrings.h"
@ -42,7 +44,7 @@ int string_width(string const & str)
}
void fillChoice(FD_form_citation * dialog, vector<string> vec)
void fillChoice(FD_citation * dialog, vector<string> vec)
{
// Check whether the current contents of the browser will be
// changed by loading the contents of the vec...
@ -84,7 +86,7 @@ void fillChoice(FD_form_citation * dialog, vector<string> vec)
}
void updateStyle(FD_form_citation * dialog, string command)
void updateStyle(FD_citation * dialog, string command)
{
// Find the style of the citekeys
vector<biblio::CiteStyle> const & styles =
@ -110,7 +112,7 @@ void updateStyle(FD_form_citation * dialog, string command)
} // namespace anon
typedef FormCB<ControlCitation, FormDB<FD_form_citation> > base_class;
typedef FormCB<ControlCitation, FormDB<FD_citation> > base_class;
FormCitation::FormCitation(ControlCitation & c)
@ -154,7 +156,7 @@ void FormCitation::hide()
void FormCitation::build()
{
dialog_.reset(build_citation());
dialog_.reset(build_citation(this));
fl_set_input_return(dialog_->input_after, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_before, FL_RETURN_CHANGED);

7
src/frontends/xforms/FormCitation.h
View File

@ -20,9 +20,9 @@
/** This class provides an XForms implementation of the Citation Dialog.
*/
class ControlCitation;
struct FD_form_citation;
struct FD_citation;
class FormCitation : public FormCB<ControlCitation, FormDB<FD_form_citation> > {
class FormCitation : public FormCB<ControlCitation, FormDB<FD_citation> > {
public:
///
FormCitation(ControlCitation &);
@ -47,9 +47,6 @@ private:
/// Filter the inputs on callback from xforms
virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
/// Fdesign generated method
FD_form_citation * build_citation();
/// search for a citation
void findBiblio(biblio::Direction const dir);

121
src/frontends/xforms/FormDocument.C
View File

@ -16,7 +16,7 @@
#endif
#include "FormDocument.h"
#include "form_document.h"
#include "forms/form_document.h"
#include "Alert.h"
#include "Dialogs.h"
#include "lyxtextclasslist.h"
@ -46,6 +46,8 @@
#include "support/filetools.h"
#include "support/lstrings.h"
#include FORMS_H_LOCATION
#include <boost/bind.hpp>
#include <functional>
@ -92,7 +94,7 @@ void FormDocument::build()
int n;
// the tabbed folder
dialog_.reset(build_tabbed_document());
dialog_.reset(build_document(this));
// Allow the base class to control messages
setMessageWidget(dialog_->text_warning);
@ -106,7 +108,7 @@ void FormDocument::build()
bc().addReadOnly (dialog_->button_reset_defaults);
// the document paper form
paper_.reset(build_doc_paper());
paper_.reset(build_document_paper(this));
fl_addto_choice(paper_->choice_papersize,
_(" Default | Custom | US letter | US legal "
"| US executive | A3 | A4 | A5 | B3 | B4 | B5 "));
@ -180,7 +182,7 @@ void FormDocument::build()
bc().addReadOnly (paper_->input_foot_skip);
// the document class form
class_.reset(build_doc_class());
class_.reset(build_document_class(this));
FL_OBJECT * obj;
// The language is a combo-box and has to be inserted manually
@ -238,7 +240,7 @@ void FormDocument::build()
bc().addReadOnly (class_->input_doc_spacing);
// the document language form
language_.reset(build_doc_language());
language_.reset(build_document_language(this));
fl_addto_choice(language_->choice_inputenc,
"default|auto|latin1|latin2|latin3|latin4|latin5|latin9"
"|koi8-r|koi8-u|cp866|cp1251|iso88595");
@ -275,7 +277,7 @@ void FormDocument::build()
bc().addReadOnly (language_->radio_double);
// the document options form
options_.reset(build_doc_options());
options_.reset(build_document_options(this));
fl_set_input_return(options_->input_float_placement, FL_RETURN_CHANGED);
setPrehandler(options_->input_float_placement);
@ -301,7 +303,7 @@ void FormDocument::build()
bc_.addReadOnly (options_->choice_postscript_driver);
// the document bullets form
bullets_.reset(build_doc_bullet());
bullets_.reset(build_document_bullet(this));
fl_addto_choice(bullets_->choice_bullet_size,
_(" default | tiny | script | footnote | small |"
" normal | large | Large | LARGE | huge | Huge"));
@ -422,39 +424,28 @@ bool saveParamsAsDefault(BufferParams const &params)
} //namespace
bool FormDocument::input(FL_OBJECT * ob, long data)
bool FormDocument::input(FL_OBJECT * ob, long)
{
State cb = static_cast<State>(data);
switch (cb) {
case CHECKCHOICECLASS:
if (ob == class_->choice_doc_class) {
CheckChoiceClass(ob, 0);
break;
case CHOICEBULLETSIZE:
} else if (ob == bullets_->choice_bullet_size) {
ChoiceBulletSize(ob, 0);
break;
case INPUTBULLETLATEX:
} else if (ob == bullets_->input_bullet_latex) {
InputBulletLaTeX(ob, 0);
break;
case BULLETDEPTH1:
case BULLETDEPTH2:
case BULLETDEPTH3:
case BULLETDEPTH4:
BulletDepth(ob, cb);
break;
case BULLETPANEL1:
case BULLETPANEL2:
case BULLETPANEL3:
case BULLETPANEL4:
case BULLETPANEL5:
case BULLETPANEL6:
BulletPanel(ob, cb);
break;
case BULLETBMTABLE:
} else if (ob == bullets_->radio_bullet_depth_1 ||
ob == bullets_->radio_bullet_depth_2 ||
ob == bullets_->radio_bullet_depth_3 ||
ob == bullets_->radio_bullet_depth_4) {
BulletDepth(ob);
} else if (ob == bullets_->radio_bullet_panel_standard ||
ob == bullets_->radio_bullet_panel_maths ||
ob == bullets_->radio_bullet_panel_ding1 ||
ob == bullets_->radio_bullet_panel_ding2 ||
ob == bullets_->radio_bullet_panel_ding3 ||
ob == bullets_->radio_bullet_panel_ding4) {
BulletPanel(ob);
} else if (ob == bullets_->bmtable_bullet_panel) {
BulletBMTable(ob, 0);
break;
default:
break;
}
bool const length_input = fl_get_choice(class_->choice_doc_skip) == 4;
@ -647,18 +638,7 @@ bool FormDocument::input(FL_OBJECT * ob, long data)
setEnabled(paper_->choice_foot_skip_units, use_geom);
}
switch (data) {
case INPUT:
case CHECKCHOICECLASS:
case CHOICEBULLETSIZE:
case INPUTBULLETLATEX:
case BULLETBMTABLE:
return CheckDocumentInput(ob, 0);
default:
break;
}
return true;
return CheckDocumentInput(ob, 0);
}
@ -1346,7 +1326,7 @@ void FormDocument::InputBulletLaTeX(FL_OBJECT *, long)
}
void FormDocument::BulletDepth(FL_OBJECT * ob, State cb)
void FormDocument::BulletDepth(FL_OBJECT * ob)
{
/* Should I do the following: */
/* 1. change to the panel that the current bullet belongs in */
@ -1359,13 +1339,13 @@ void FormDocument::BulletDepth(FL_OBJECT * ob, State cb)
BufferParams & param = lv_->buffer()->params;
int data = 0;
if (cb == BULLETDEPTH1)
if (ob == bullets_->radio_bullet_depth_1)
data = 0;
else if (cb == BULLETDEPTH2)
else if (ob == bullets_->radio_bullet_depth_2)
data = 1;
else if (cb == BULLETDEPTH3)
else if (ob == bullets_->radio_bullet_depth_3)
data = 2;
else if (cb == BULLETDEPTH4)
else if (ob == bullets_->radio_bullet_depth_4)
data = 3;
switch (fl_get_button_numb(ob)) {
@ -1382,23 +1362,23 @@ void FormDocument::BulletDepth(FL_OBJECT * ob, State cb)
}
void FormDocument::BulletPanel(FL_OBJECT * /*ob*/, State cb)
void FormDocument::BulletPanel(FL_OBJECT * ob)
{
/* Here we have to change the background pixmap to that selected */
/* by the user. (eg. standard.xpm, psnfss1.xpm etc...) */
int data = 0;
if (cb == BULLETPANEL1)
if (ob == bullets_->radio_bullet_panel_standard)
data = 0;
else if (cb == BULLETPANEL2)
else if (ob == bullets_->radio_bullet_panel_maths)
data = 1;
else if (cb == BULLETPANEL3)
else if (ob == bullets_->radio_bullet_panel_ding2)
data = 2;
else if (cb == BULLETPANEL4)
else if (ob == bullets_->radio_bullet_panel_ding3)
data = 3;
else if (cb == BULLETPANEL5)
else if (ob == bullets_->radio_bullet_panel_ding4)
data = 4;
else if (cb == BULLETPANEL6)
else if (ob == bullets_->radio_bullet_panel_ding1)
data = 5;
if (data != current_bullet_panel) {
@ -1408,32 +1388,23 @@ void FormDocument::BulletPanel(FL_OBJECT * /*ob*/, State cb)
/* free the current pixmap */
fl_free_bmtable_pixmap(bullets_->bmtable_bullet_panel);
string new_panel;
switch (cb) {
/* display the new one */
case BULLETPANEL1 :
if (ob == bullets_->radio_bullet_panel_standard) {
new_panel = "standard";
break;
case BULLETPANEL2 :
} else if (ob == bullets_->radio_bullet_panel_maths ) {
new_panel = "amssymb";
break;
case BULLETPANEL3 :
} else if (ob == bullets_->radio_bullet_panel_ding2) {
new_panel = "psnfss1";
break;
case BULLETPANEL4 :
} else if (ob == bullets_->radio_bullet_panel_ding3) {
new_panel = "psnfss2";
break;
case BULLETPANEL5 :
} else if (ob == bullets_->radio_bullet_panel_ding4) {
new_panel = "psnfss3";
break;
case BULLETPANEL6 :
} else if (ob == bullets_->radio_bullet_panel_ding1) {
new_panel = "psnfss4";
break;
default :
} else {
/* something very wrong happened */
// play it safe for now but should be an exception
current_bullet_panel = 0; // standard panel
new_panel = "standard";
break;
}
new_panel += ".xpm";
fl_set_bmtable_pixmap_file(bullets_->bmtable_bullet_panel, 6, 6,

74
src/frontends/xforms/FormDocument.h
View File

@ -23,12 +23,12 @@
class Combox;
class BufferParams;
struct FD_form_tabbed_document;
struct FD_form_doc_paper;
struct FD_form_doc_class;
struct FD_form_doc_language;
struct FD_form_doc_options;
struct FD_form_doc_bullet;
struct FD_document;
struct FD_document_paper;
struct FD_document_class;
struct FD_document_language;
struct FD_document_options;
struct FD_document_bullet;
/** This class provides an XForms implementation of the FormDocument dialog.
The table-layout-form here changes values for latex-tabulars
@ -39,39 +39,6 @@ public:
///
static void ComboInputCB(int, void *, Combox *);
private:
///
enum State {
///
INPUT,
///
CHECKCHOICECLASS,
///
CHOICEBULLETSIZE,
///
INPUTBULLETLATEX,
///
BULLETDEPTH1,
///
BULLETDEPTH2,
///
BULLETDEPTH3,
///
BULLETDEPTH4,
///
BULLETPANEL1,
///
BULLETPANEL2,
///
BULLETPANEL3,
///
BULLETPANEL4,
///
BULLETPANEL5,
///
BULLETPANEL6,
///
BULLETBMTABLE
};
/// Pointer to the actual instantiation of the ButtonController.
virtual xformsBC & bc();
/** Redraw the form (on receipt of a Signal indicating, for example,
@ -98,9 +65,9 @@ private:
///
void InputBulletLaTeX(FL_OBJECT * ob, long);
///
void BulletDepth(FL_OBJECT * ob, State);
void BulletDepth(FL_OBJECT * ob);
///
void BulletPanel(FL_OBJECT * ob, State);
void BulletPanel(FL_OBJECT * ob);
///
void BulletBMTable(FL_OBJECT * ob, long);
///
@ -145,31 +112,18 @@ private:
///
void bullets_apply();
/// Fdesign generated methods
FD_form_tabbed_document * build_tabbed_document();
///
FD_form_doc_paper * build_doc_paper();
///
FD_form_doc_class * build_doc_class();
///
FD_form_doc_language * build_doc_language();
///
FD_form_doc_options * build_doc_options();
///
FD_form_doc_bullet * build_doc_bullet();
/// Real GUI implementation.
boost::scoped_ptr<FD_form_tabbed_document> dialog_;
boost::scoped_ptr<FD_document> dialog_;
///
boost::scoped_ptr<FD_form_doc_paper> paper_;
boost::scoped_ptr<FD_document_paper> paper_;
///
boost::scoped_ptr<FD_form_doc_class> class_;
boost::scoped_ptr<FD_document_class> class_;
///
boost::scoped_ptr<FD_form_doc_language> language_;
boost::scoped_ptr<FD_document_language> language_;
///
boost::scoped_ptr<FD_form_doc_options> options_;
boost::scoped_ptr<FD_document_options> options_;
///
boost::scoped_ptr<FD_form_doc_bullet> bullets_;
boost::scoped_ptr<FD_document_bullet> bullets_;
///
int ActCell;
///

7
src/frontends/xforms/FormERT.C
View File

@ -15,12 +15,13 @@
#include "xformsBC.h"
#include "ControlERT.h"
#include "FormERT.h"
#include "form_ert.h"
#include "forms/form_ert.h"
#include "support/lstrings.h"
#include "helper_funcs.h"
#include "debug.h"
#include FORMS_H_LOCATION
typedef FormCB<ControlERT, FormDB<FD_form_ert> > base_class;
typedef FormCB<ControlERT, FormDB<FD_ert> > base_class;
FormERT::FormERT(ControlERT & c)
: base_class(c, _("ERT Options"))
@ -29,7 +30,7 @@ FormERT::FormERT(ControlERT & c)
void FormERT::build()
{
dialog_.reset(build_ert());
dialog_.reset(build_ert(this));
// Manage the ok, apply and cancel/close buttons
bc().setOK(dialog_->button_ok);

7
src/frontends/xforms/FormERT.h
View File

@ -17,13 +17,13 @@
#include "FormBase.h"
class ControlERT;
struct FD_form_ert;
struct FD_ert;
/** This class provides an XForms implementation of the ERT
Dialog.
*/
class FormERT
: public FormCB<ControlERT, FormDB<FD_form_ert> > {
: public FormCB<ControlERT, FormDB<FD_ert> > {
public:
///
FormERT(ControlERT &);
@ -34,9 +34,6 @@ private:
virtual void build();
/// Update dialog before/whilst showing it.
virtual void update();
/// Fdesign generated method
FD_form_ert * build_ert();
};
#endif // FORMERT_H

7
src/frontends/xforms/FormError.C
View File

@ -15,10 +15,11 @@
#include "xformsBC.h"
#include "ControlError.h"
#include "FormError.h"
#include "form_error.h"
#include "forms/form_error.h"
#include "xforms_helpers.h" // formatted
#include FORMS_H_LOCATION
typedef FormCB<ControlError, FormDB<FD_form_error> > base_class;
typedef FormCB<ControlError, FormDB<FD_error> > base_class;
FormError::FormError(ControlError & c)
: base_class(c, _("LaTeX Error"))
@ -27,7 +28,7 @@ FormError::FormError(ControlError & c)
void FormError::build()
{
dialog_.reset(build_error());
dialog_.reset(build_error(this));
// Manage the cancel/close button
bc().setCancel(dialog_->button_close);

7
src/frontends/xforms/FormError.h
View File

@ -17,11 +17,11 @@
#include "FormBase.h"
class ControlError;
struct FD_form_error;
struct FD_error;
/** This class provides an XForms implementation of the Error Dialog.
*/
class FormError : public FormCB<ControlError, FormDB<FD_form_error> > {
class FormError : public FormCB<ControlError, FormDB<FD_error> > {
public:
/// Constructor
FormError(ControlError &);
@ -33,9 +33,6 @@ private:
virtual void build();
/// Update dialog before showing it
virtual void update();
/// Fdesign generated method
FD_form_error * build_error();
};
#endif // FORMERROR_H

7
src/frontends/xforms/FormExternal.C
View File

@ -17,14 +17,15 @@
#include "xformsBC.h"
#include "ControlExternal.h"
#include "FormExternal.h"
#include "form_external.h"
#include "forms/form_external.h"
#include "gettext.h"
#include "xforms_helpers.h"
#include "helper_funcs.h"
#include "support/lstrings.h"
#include FORMS_H_LOCATION
typedef FormCB<ControlExternal, FormDB<FD_form_external> > base_class;
typedef FormCB<ControlExternal, FormDB<FD_external> > base_class;
FormExternal::FormExternal(ControlExternal & c)
: base_class(c, _("Edit external file"))
@ -45,7 +46,7 @@ void FormExternal::apply()
void FormExternal::build()
{
dialog_.reset(build_external());
dialog_.reset(build_external(this));
string const choice =
" " + getStringFromVector(controller().getTemplates(), " | ") + " ";

7
src/frontends/xforms/FormExternal.h
View File

@ -20,10 +20,10 @@
#include "insets/insetexternal.h"
class ControlExternal;
struct FD_form_external;
struct FD_external;
/// The class for editing External insets via a dialog
class FormExternal : public FormCB<ControlExternal, FormDB<FD_form_external> > {
class FormExternal : public FormCB<ControlExternal, FormDB<FD_external> > {
public:
///
FormExternal(ControlExternal &);
@ -43,9 +43,6 @@ private:
///
void updateComboChange();
/// Fdesign generated method
FD_form_external * build_external();
};
#endif // FORMEXTERNAL_H

8
src/frontends/xforms/FormFiledialog.C
View File

@ -27,7 +27,7 @@ using std::sort;
#include "support/lstrings.h"
#include "gettext.h"
#include "frontends/Dialogs.h"
#include "xforms_helpers.h"
#include "forms_gettext.h"
#include <boost/bind.hpp>
@ -74,6 +74,8 @@ extern "C" int gettimeofday(struct timeval *, struct timezone *);
#include "support/filetools.h"
#include "FormFiledialog.h"
#include "forms/form_filedialog.h"
#include FORMS_H_LOCATION
namespace {
@ -216,7 +218,7 @@ public:
// *** FileDialog::Private class implementation
// static members
FD_form_filedialog * FileDialog::Private::pFileDlgForm = 0;
FD_filedialog * FileDialog::Private::pFileDlgForm = 0;
FileDialog::Private * FileDialog::Private::pCurrentDlg = 0;
@ -427,7 +429,7 @@ FileDialog::Private::Private()
// Creates form if necessary.
if (!pFileDlgForm) {
pFileDlgForm = build_filedialog();
pFileDlgForm = build_filedialog(this);
// Set callbacks. This means that we don't need a patch file
fl_set_object_callback(pFileDlgForm->DirBox,
C_LyXFileDlg_FileDlgCB, 0);

10
src/frontends/xforms/FormFiledialog.h
View File

@ -18,8 +18,7 @@
#include "LString.h"
#include FORMS_H_LOCATION
#include "form_filedialog.h"
#include "forms_fwd.h"
#include "frontends/FileDialog.h"
@ -47,6 +46,8 @@ public:
//}
class FD_filedialog;
class FileDialog::Private : public boost::signals::trackable {
public:
///
@ -73,7 +74,7 @@ public:
private:
/// data
static FD_form_filedialog * pFileDlgForm;
static FD_filedialog * pFileDlgForm;
///
static FileDialog::Private * pCurrentDlg;
///
@ -103,9 +104,6 @@ private:
///
bool force_ok;
/// build the dialog
FD_form_filedialog * build_filedialog();
/** Redraw the form (on receipt of a Signal indicating, for example,
that the xform colors have been re-mapped).
*/

7
src/frontends/xforms/FormFloat.C
View File

@ -15,11 +15,12 @@
#include "xformsBC.h"
#include "ControlFloat.h"
#include "FormFloat.h"
#include "form_float.h"
#include "forms/form_float.h"
#include "support/lstrings.h"
#include "xforms_helpers.h"
#include FORMS_H_LOCATION
typedef FormCB<ControlFloat, FormDB<FD_form_float> > base_class;
typedef FormCB<ControlFloat, FormDB<FD_float> > base_class;
FormFloat::FormFloat(ControlFloat & c)
: base_class(c, _("Float Options"))
@ -32,7 +33,7 @@ FormFloat::FormFloat(ControlFloat & c)
void FormFloat::build()
{
dialog_.reset(build_float());
dialog_.reset(build_float(this));
// Manage the ok, apply and cancel/close buttons
bc().setOK(dialog_->button_ok);

7
src/frontends/xforms/FormFloat.h
View File

@ -17,12 +17,12 @@
#include "FormBase.h"
class ControlFloat;
struct FD_form_float;
struct FD_float;
/** This class provides an XForms implementation of the Float
Dialog.
*/
class FormFloat : public FormCB<ControlFloat, FormDB<FD_form_float> > {
class FormFloat : public FormCB<ControlFloat, FormDB<FD_float> > {
public:
///
FormFloat(ControlFloat &);
@ -36,9 +36,6 @@ private:
virtual void update();
/// Filter the inputs on callback from xforms
virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
/// Fdesign generated method
FD_form_float * build_float();
};
#endif // FORMFLOAT_H

7
src/frontends/xforms/FormForks.C
View File

@ -16,18 +16,19 @@
#include "xformsBC.h"
#include "FormForks.h"
#include "ControlForks.h"
#include "form_forks.h"
#include "forms/form_forks.h"
#include "Tooltips.h"
#include "helper_funcs.h"
#include "xforms_helpers.h"
#include "gettext.h"
#include "support/lstrings.h"
#include FORMS_H_LOCATION
using std::vector;
using std::find;
using std::find_if;
typedef FormCB<ControlForks, FormDB<FD_form_forks> > base_class;
typedef FormCB<ControlForks, FormDB<FD_forks> > base_class;
FormForks::FormForks(ControlForks & c)
: base_class(c, _("Child processes"))
@ -35,7 +36,7 @@ FormForks::FormForks(ControlForks & c)
void FormForks::build() {
dialog_.reset(build_forks());
dialog_.reset(build_forks(this));
// It appears that the browsers aren't initialised properly.
// This fudge fixes tings.

7
src/frontends/xforms/FormForks.h
View File

@ -16,10 +16,10 @@
#include "FormBase.h"
struct FD_form_forks;
class ControlForks;
struct FD_forks;
class FormForks : public FormCB<ControlForks, FormDB<FD_form_forks> > {
class FormForks : public FormCB<ControlForks, FormDB<FD_forks> > {
public:
///
FormForks(ControlForks &);
@ -37,9 +37,6 @@ private:
/// Filter the inputs on callback from xforms
virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
/// Fdesign generated method
FD_form_forks * build_forks();
ButtonPolicy::SMInput input_browser_children();
ButtonPolicy::SMInput input_browser_kill();
ButtonPolicy::SMInput input_button_all();

17
src/frontends/xforms/FormGraphics.C
View File

@ -16,7 +16,7 @@
#include "xformsBC.h"
#include "ControlGraphics.h"
#include "FormGraphics.h"
#include "form_graphics.h"
#include "forms/form_graphics.h"
#include "Alert.h"
#include "xforms_helpers.h"
@ -27,6 +27,7 @@
#include "support/filetools.h" // for MakeAbsPath etc
#include "insets/insetgraphicsParams.h"
#include "lyxrc.h" // for lyxrc.display_graphics
#include FORMS_H_LOCATION
using std::endl;
using std::vector;
@ -50,7 +51,7 @@ LyXLength getLyXLengthFromWidgets(FL_OBJECT * input, FL_OBJECT * choice)
} // namespace anon
typedef FormCB<ControlGraphics, FormDB<FD_form_graphics> > base_class;
typedef FormCB<ControlGraphics, FormDB<FD_graphics> > base_class;
FormGraphics::FormGraphics(ControlGraphics & c)
: base_class(c, _("Graphics"), false)
@ -71,7 +72,7 @@ void FormGraphics::redraw()
void FormGraphics::build()
{
dialog_.reset(build_graphics());
dialog_.reset(build_graphics(this));
// Allow the base class to control messages
setMessageWidget(dialog_->text_warning);
@ -83,7 +84,7 @@ void FormGraphics::build()
bc().setRestore(dialog_->button_restore);
// the file section
file_.reset(build_file());
file_.reset(build_graphics_file(this));
fl_set_input_return (file_->input_filename, FL_RETURN_CHANGED);
fl_set_input_return (file_->input_subcaption, FL_RETURN_CHANGED);
@ -113,7 +114,7 @@ void FormGraphics::build()
bc().addReadOnly(file_->check_nounzip);
// the lyxview section
lyxview_.reset(build_lyxview());
lyxview_.reset(build_graphics_lyxview(this));
fl_set_input_return (lyxview_->input_lyxwidth, FL_RETURN_CHANGED);
fl_set_input_return (lyxview_->input_lyxheight, FL_RETURN_CHANGED);
@ -133,7 +134,7 @@ void FormGraphics::build()
bc().addReadOnly(lyxview_->radio_nodisplay);
// the size section
size_.reset(build_size());
size_.reset(build_graphics_size(this));
fl_set_input_return (size_->input_scale, FL_RETURN_CHANGED);
fl_set_input_return (size_->input_width, FL_RETURN_CHANGED);
@ -158,7 +159,7 @@ void FormGraphics::build()
bc().addReadOnly(size_->check_aspectratio);
// the bounding box selection
bbox_.reset(build_bbox());
bbox_.reset(build_graphics_bbox(this));
fl_set_input_return (bbox_->input_bb_x0, FL_RETURN_CHANGED);
fl_set_input_return (bbox_->input_bb_y0, FL_RETURN_CHANGED);
fl_set_input_return (bbox_->input_bb_x1, FL_RETURN_CHANGED);
@ -180,7 +181,7 @@ void FormGraphics::build()
bc().addReadOnly(bbox_->check_clip);
// the rotate section
special_.reset(build_special());
special_.reset(build_graphics_special(this));
fl_set_input_return (special_->input_special, FL_RETURN_CHANGED);
setPrehandler(special_->input_special);

37
src/frontends/xforms/FormGraphics.h
View File

@ -23,16 +23,16 @@
#include <vector>
class ControlGraphics;
struct FD_form_graphics;
struct FD_form_file;
struct FD_form_lyxview;
struct FD_form_size;
struct FD_form_bbox;
struct FD_form_special;
struct FD_graphics;
struct FD_graphics_file;
struct FD_graphics_lyxview;
struct FD_graphics_size;
struct FD_graphics_bbox;
struct FD_graphics_special;
/** This class provides an XForms implementation of the Graphics Dialog.
*/
class FormGraphics : public FormCB<ControlGraphics, FormDB<FD_form_graphics> > {
class FormGraphics : public FormCB<ControlGraphics, FormDB<FD_graphics> > {
public:
///
FormGraphics(ControlGraphics &);
@ -53,29 +53,16 @@ private:
/// Filter the inputs on callback from xforms
virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
/// Fdesign generated method
FD_form_graphics * build_graphics();
///
FD_form_file * build_file();
///
FD_form_lyxview * build_lyxview();
///
FD_form_size * build_size();
///
FD_form_bbox * build_bbox();
///
FD_form_special * build_special();
/// Real GUI implementation.
boost::scoped_ptr<FD_form_file> file_;
boost::scoped_ptr<FD_graphics_file> file_;
///
boost::scoped_ptr<FD_form_lyxview> lyxview_;
boost::scoped_ptr<FD_graphics_lyxview> lyxview_;
///
boost::scoped_ptr<FD_form_size> size_;
boost::scoped_ptr<FD_graphics_size> size_;
///
boost::scoped_ptr<FD_form_bbox> bbox_;
boost::scoped_ptr<FD_graphics_bbox> bbox_;
///
boost::scoped_ptr<FD_form_special> special_;
boost::scoped_ptr<FD_graphics_special> special_;
/// Store the LaTeX names for the rotation origins.
std::vector<string> origins_;

7
src/frontends/xforms/FormInclude.C
View File

@ -18,12 +18,13 @@
#include "xformsBC.h"
#include "ControlInclude.h"
#include "FormInclude.h"
#include "form_include.h"
#include "forms/form_include.h"
#include "insets/insetinclude.h"
#include "xforms_helpers.h" // setEnabled
#include "support/lstrings.h" // strip
#include FORMS_H_LOCATION
typedef FormCB<ControlInclude, FormDB<FD_form_include> > base_class;
typedef FormCB<ControlInclude, FormDB<FD_include> > base_class;
FormInclude::FormInclude(ControlInclude & c)
: base_class(c, _("Include file"))
@ -32,7 +33,7 @@ FormInclude::FormInclude(ControlInclude & c)
void FormInclude::build()
{
dialog_.reset(build_include());
dialog_.reset(build_include(this));
fl_set_input_return(dialog_->input_filename, FL_RETURN_CHANGED);
setPrehandler(dialog_->input_filename);

7
src/frontends/xforms/FormInclude.h
View File

@ -18,11 +18,11 @@
#include "FormBase.h"
class ControlInclude;
struct FD_form_include;
struct FD_include;
/** This class provides an XForms implementation of the Include Dialog.
*/
class FormInclude : public FormCB<ControlInclude, FormDB<FD_form_include> > {
class FormInclude : public FormCB<ControlInclude, FormDB<FD_include> > {
public:
///
FormInclude(ControlInclude &);
@ -36,9 +36,6 @@ private:
virtual void update();
/// Filter the inputs on callback from xforms
virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
/// Fdesign generated method
FD_form_include * build_include();
};
#endif

7
src/frontends/xforms/FormIndex.C
View File

@ -16,9 +16,10 @@
#include "ControlIndex.h"
#include "FormIndex.h"
#include "frontends/LyXView.h"
#include "form_index.h"
#include "forms/form_index.h"
#include FORMS_H_LOCATION
typedef FormCB<ControlIndex, FormDB<FD_form_index> > base_class;
typedef FormCB<ControlIndex, FormDB<FD_index> > base_class;
FormIndex::FormIndex(ControlIndex & c)
: base_class(c, _("Index"))
@ -27,7 +28,7 @@ FormIndex::FormIndex(ControlIndex & c)
void FormIndex::build()
{
dialog_.reset(build_index());
dialog_.reset(build_index(this));
fl_set_input_return(dialog_->input_key, FL_RETURN_CHANGED);
setPrehandler(dialog_->input_key);

7
src/frontends/xforms/FormIndex.h
View File

@ -17,11 +17,11 @@
#include "FormBase.h"
class ControlIndex;
struct FD_form_index;
struct FD_index;
/** This class provides an XForms implementation of the Index Dialog.
*/
class FormIndex : public FormCB<ControlIndex, FormDB<FD_form_index> > {
class FormIndex : public FormCB<ControlIndex, FormDB<FD_index> > {
public:
///
FormIndex(ControlIndex &);
@ -33,9 +33,6 @@ private:
virtual void build();
/// Update dialog before/whilst showing it.
virtual void update();
/// Fdesign generated method
FD_form_index * build_index();
};
#endif // FORMINDEX_H

3
src/frontends/xforms/FormLog.C
View File

@ -15,8 +15,9 @@
#include "xformsBC.h"
#include "ControlLog.h"
#include "FormLog.h"
#include "form_browser.h"
#include "forms/form_browser.h"
#include "gettext.h"
#include FORMS_H_LOCATION
FormLog::FormLog(ControlLog & c)
: FormCB<ControlLog, FormBrowser>(c, _("LaTeX Log"))

2
src/frontends/xforms/FormMathsBitmap.C
View File

@ -19,7 +19,7 @@
#include "frontends/LyXView.h"
#include "bmtable.h"
#include "debug.h"
#include "xforms_helpers.h"
#include "forms_gettext.h"
#include "gettext.h"
#include "support/LAssert.h"

5
src/frontends/xforms/FormMathsDeco.C
View File

@ -16,9 +16,10 @@
#endif
#include "FormMathsDeco.h"
#include "form_maths_deco.h"
#include "forms/form_maths_deco.h"
#include "Dialogs.h"
#include "bmtable.h"
#include FORMS_H_LOCATION
#include "deco.xbm"
@ -51,7 +52,7 @@ FL_FORM * FormMathsDeco::form() const
void FormMathsDeco::build()
{
dialog_.reset(build_maths_deco());
dialog_.reset(build_maths_deco(this));
fl_set_bmtable_data(dialog_->bmtable_deco1, 3, 4,
deco1_width, deco1_height, deco1_bits);

7
src/frontends/xforms/FormMathsDeco.h
View File

@ -20,7 +20,7 @@
#include <boost/scoped_ptr.hpp>
struct FD_form_maths_deco;
struct FD_maths_deco;
/**
* This class provides an XForms implementation of the maths deco.
@ -41,11 +41,8 @@ private:
/// Pointer to the actual instantiation of the xforms form
virtual FL_FORM * form() const;
// build the form
FD_form_maths_deco * build_maths_deco();
// Real GUI implementation
boost::scoped_ptr<FD_form_maths_deco> dialog_;
boost::scoped_ptr<FD_maths_deco> dialog_;
/// Current choice
int deco_;

5
src/frontends/xforms/FormMathsDelim.C
View File

@ -16,13 +16,14 @@
#endif
#include "FormMathsDelim.h"
#include "form_maths_delim.h"
#include "forms/form_maths_delim.h"
#include "Dialogs.h"
#include "frontends/LyXView.h"
#include "bmtable.h"
#include "debug.h"
#include "support/lstrings.h"
#include "lyxfunc.h"
#include FORMS_H_LOCATION
#include "delim.xbm"
#include "delim0.xpm"
@ -57,7 +58,7 @@ FL_FORM * FormMathsDelim::form() const
void FormMathsDelim::build()
{
dialog_.reset(build_maths_delim());
dialog_.reset(build_maths_delim(this));
fl_set_button(dialog_->radio_left, 1);
// Initialize button_pix to "()" as found in images/delim0.xpm:

7
src/frontends/xforms/FormMathsDelim.h
View File

@ -20,7 +20,7 @@
#include <boost/scoped_ptr.hpp>
struct FD_form_maths_delim;
struct FD_maths_delim;
/**
* This class provides an XForms implementation of the maths delim.
@ -41,11 +41,8 @@ private:
/// Pointer to the actual instantiation of the xforms form
virtual FL_FORM * form() const;
// build the form
FD_form_maths_delim * build_maths_delim();
// Real GUI implementation
boost::scoped_ptr<FD_form_maths_delim> dialog_;
boost::scoped_ptr<FD_maths_delim> dialog_;
};
#endif // FORM_MATHSDELIM_H

5
src/frontends/xforms/FormMathsMatrix.C
View File

@ -18,13 +18,14 @@
#include <algorithm>
#include "FormMathsMatrix.h"
#include "form_maths_matrix.h"
#include "forms/form_maths_matrix.h"
#include "Dialogs.h"
#include "frontends/LyXView.h"
#include "Lsstream.h"
#include "lyxfunc.h"
#include "support/LAssert.h"
#include "support/lyxalgo.h" // lyx::count
#include FORMS_H_LOCATION
#ifndef CXX_GLOBAL_CSTD
using std::strlen;
@ -67,7 +68,7 @@ FL_FORM * FormMathsMatrix::form() const
void FormMathsMatrix::build()
{
dialog_.reset(build_maths_matrix());
dialog_.reset(build_maths_matrix(this));
fl_addto_choice(dialog_->choice_valign, _("Top | Center | Bottom"));
fl_set_choice(dialog_->choice_valign, 2);

7
src/frontends/xforms/FormMathsMatrix.h
View File

@ -20,7 +20,7 @@
#include <boost/scoped_ptr.hpp>
struct FD_form_maths_matrix;
struct FD_maths_matrix;
/**
* This class provides an XForms implementation of the maths matrix.
@ -42,11 +42,8 @@ private:
/// Pointer to the actual instantiation of the xforms form
virtual FL_FORM * form() const;
// build the form
FD_form_maths_matrix * build_maths_matrix();
// Real GUI implementation
boost::scoped_ptr<FD_form_maths_matrix> dialog_;
boost::scoped_ptr<FD_maths_matrix> dialog_;
};
#endif // FORM_MATHSMATRIX_H

19
src/frontends/xforms/FormMathsPanel.C
View File

@ -18,16 +18,16 @@
#include "Dialogs.h"
#include "frontends/LyXView.h"
#include "FormMathsPanel.h"
#include "form_maths_panel.h"
#include "forms/form_maths_panel.h"
#include "MathsSymbols.h"
#include "debug.h"
#include "lyxfunc.h"
#include "form_maths_deco.h"
#include "form_maths_delim.h"
#include "form_maths_matrix.h"
#include "form_maths_space.h"
#include "form_maths_style.h"
#include "forms/form_maths_deco.h"
#include "forms/form_maths_delim.h"
#include "forms/form_maths_matrix.h"
#include "forms/form_maths_space.h"
#include "forms/form_maths_style.h"
#include "FormMathsBitmap.h"
#include "FormMathsDeco.h"
@ -36,6 +36,9 @@
#include "FormMathsSpace.h"
#include "FormMathsStyle.h"
#include FORMS_H_LOCATION
#include <boost/bind.hpp>
#include "deco.xpm"
#include "delim.xpm"
#include "equation.xpm"
@ -61,8 +64,6 @@
#include "ams_nrel.xbm"
#include "ams_ops.xbm"
#include <boost/bind.hpp>
using std::vector;
FormMathsPanel::FormMathsPanel(LyXView * lv, Dialogs * d)
@ -171,7 +172,7 @@ void FormMathsPanel::setActive(FormMathsSub * a) const
void FormMathsPanel::build()
{
dialog_.reset(build_maths_panel());
dialog_.reset(build_maths_panel(this));
for (int i = 0; i < nr_function_names; ++i)
fl_add_browser_line(dialog_->browser_funcs,

9
src/frontends/xforms/FormMathsPanel.h
View File

@ -30,7 +30,7 @@ class FormMathsMatrix;
class FormMathsSpace;
class FormMathsStyle;
class FormMathsSub;
struct FD_form_maths_panel;
struct FD_maths_panel;
/**
* This class provides an XForms implementation of the maths panel.
@ -57,15 +57,12 @@ private:
/// Pointer to the actual instantiation of the xforms form
virtual FL_FORM * form() const;
// build the panels
FD_form_maths_panel * build_maths_panel();
// Real GUI implementation
boost::scoped_ptr<FD_maths_panel> dialog_;
/// send LFUN_MATH_DISPLAY
void mathDisplay() const;
// Real GUI implementation
boost::scoped_ptr<FD_form_maths_panel> dialog_;
/// Subdialogs
boost::scoped_ptr<FormMathsDeco> deco_;
boost::scoped_ptr<FormMathsDelim> delim_;

5
src/frontends/xforms/FormMathsSpace.C
View File

@ -16,7 +16,8 @@
#endif
#include "FormMathsSpace.h"
#include "form_maths_space.h"
#include "forms/form_maths_space.h"
#include FORMS_H_LOCATION
extern char * latex_mathspace[];
@ -37,7 +38,7 @@ FL_FORM * FormMathsSpace::form() const
void FormMathsSpace::build()
{
dialog_.reset(build_maths_space());
dialog_.reset(build_maths_space(this));
space_ = -1;

7
src/frontends/xforms/FormMathsSpace.h
View File

@ -20,7 +20,7 @@
#include <boost/scoped_ptr.hpp>
struct FD_form_maths_space;
struct FD_maths_space;
/**
* This class provides an XForms implementation of the maths space.
@ -41,11 +41,8 @@ private:
/// Pointer to the actual instantiation of the xforms form
virtual FL_FORM * form() const;
// build the form
FD_form_maths_space * build_maths_space();
// Real GUI implementation
boost::scoped_ptr<FD_form_maths_space> dialog_;
boost::scoped_ptr<FD_maths_space> dialog_;
/// The current choice.
int space_;

10
src/frontends/xforms/FormMathsStyle.C
View File

@ -17,14 +17,16 @@
#endif
#include "FormMathsStyle.h"
#include "form_maths_style.h"
#include "forms/form_maths_style.h"
#include "bmtable.h"
#include "debug.h"
#include FORMS_H_LOCATION
#include "style.xbm"
#include "font.xbm"
#include "debug.h"
char const * latex_mathstyle[] = {
"displaystyle", "textstyle", "scriptstyle", "scriptscriptstyle"
};
@ -53,7 +55,7 @@ FL_FORM * FormMathsStyle::form() const
void FormMathsStyle::build()
{
dialog_.reset(build_maths_style());
dialog_.reset(build_maths_style(this));
fl_set_bmtable_data(dialog_->bmtable_style1, 1, 1,
style1_width, style1_height, style1_bits);

7
src/frontends/xforms/FormMathsStyle.h
View File

@ -20,7 +20,7 @@
#include <boost/scoped_ptr.hpp>
struct FD_form_maths_style;
struct FD_maths_style;
/**
* This class provides an XForms implementation of the maths style.
@ -41,11 +41,8 @@ private:
/// Pointer to the actual instantiation of the xforms form
virtual FL_FORM * form() const;
// build the form
FD_form_maths_style * build_maths_style();
// Real GUI implementation
boost::scoped_ptr<FD_form_maths_style> dialog_;
boost::scoped_ptr<FD_maths_style> dialog_;
/// The current choice.
int style_;

7
src/frontends/xforms/FormMinipage.C
View File

@ -15,13 +15,14 @@
#include "xformsBC.h"
#include "ControlMinipage.h"
#include "FormMinipage.h"
#include "form_minipage.h"
#include "forms/form_minipage.h"
#include "support/lstrings.h"
#include "helper_funcs.h"
#include "debug.h"
#include "xforms_helpers.h"
#include FORMS_H_LOCATION
typedef FormCB<ControlMinipage, FormDB<FD_form_minipage> > base_class;
typedef FormCB<ControlMinipage, FormDB<FD_minipage> > base_class;
FormMinipage::FormMinipage(ControlMinipage & c)
: base_class(c, _("Minipage Options"))
@ -30,7 +31,7 @@ FormMinipage::FormMinipage(ControlMinipage & c)
void FormMinipage::build()
{
dialog_.reset(build_minipage());
dialog_.reset(build_minipage(this));
// Allow the base class to control messages
setMessageWidget(dialog_->text_warning);

7
src/frontends/xforms/FormMinipage.h
View File

@ -17,13 +17,13 @@
#include "FormBase.h"
class ControlMinipage;
struct FD_form_minipage;
struct FD_minipage;
/** This class provides an XForms implementation of the Minipage
Dialog.
*/
class FormMinipage
: public FormCB<ControlMinipage, FormDB<FD_form_minipage> > {
: public FormCB<ControlMinipage, FormDB<FD_minipage> > {
public:
///
FormMinipage(ControlMinipage &);
@ -36,9 +36,6 @@ private:
virtual void update();
/// Filter the inputs on callback from xforms
virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
/// Fdesign generated method
FD_form_minipage * build_minipage();
};
#endif // FORMMINIPAGE_H

7
src/frontends/xforms/FormParagraph.C
View File

@ -15,7 +15,7 @@
#include FORMS_H_LOCATION
#include "FormParagraph.h"
#include "form_paragraph.h"
#include "forms/form_paragraph.h"
#include "ControlParagraph.h"
#include "ParagraphParameters.h"
#include "xforms_helpers.h"
@ -28,6 +28,7 @@
#include "support/lstrings.h"
#include "support/LAssert.h"
#include FORMS_H_LOCATION
#include <functional>
@ -35,7 +36,7 @@ using std::vector;
using std::bind2nd;
using std::remove_if;
typedef FormCB<ControlParagraph, FormDB<FD_form_paragraph> > base_class;
typedef FormCB<ControlParagraph, FormDB<FD_paragraph> > base_class;
FormParagraph::FormParagraph(ControlParagraph & c)
: base_class(c, _("Paragraph Layout"), false)
@ -44,7 +45,7 @@ FormParagraph::FormParagraph(ControlParagraph & c)
void FormParagraph::build()
{
// the tabbed folder
dialog_.reset(build_paragraph());
dialog_.reset(build_paragraph(this));
// Allow the base class to control messages
setMessageWidget(dialog_->text_warning);

7
src/frontends/xforms/FormParagraph.h
View File

@ -16,13 +16,13 @@
#include "FormBase.h"
struct FD_form_paragraph;
struct FD_paragraph;
class ControlParagraph;
/** This class provides an XForms implementation of the FormParagraph dialog.
*/
class FormParagraph
: public FormCB<ControlParagraph, FormDB<FD_form_paragraph> > {
: public FormCB<ControlParagraph, FormDB<FD_paragraph> > {
public:
///
FormParagraph(ControlParagraph &);
@ -36,9 +36,6 @@ private:
/// Filter the inputs on callback from xforms
virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
/// Fdesign generated method
FD_form_paragraph * build_paragraph();
};
#endif

7
src/frontends/xforms/FormPreamble.C
View File

@ -15,10 +15,11 @@
#include "xformsBC.h"
#include "ControlPreamble.h"
#include "FormPreamble.h"
#include "form_preamble.h"
#include "forms/form_preamble.h"
#include "xforms_helpers.h"
#include FORMS_H_LOCATION
typedef FormCB<ControlPreamble, FormDB<FD_form_preamble> > base_class;
typedef FormCB<ControlPreamble, FormDB<FD_preamble> > base_class;
FormPreamble::FormPreamble(ControlPreamble & c)
: base_class(c, _("LaTeX preamble"))
@ -27,7 +28,7 @@ FormPreamble::FormPreamble(ControlPreamble & c)
void FormPreamble::build()
{
dialog_.reset(build_preamble());
dialog_.reset(build_preamble(this));
fl_set_input_return(dialog_->input_preamble, FL_RETURN_CHANGED);

7
src/frontends/xforms/FormPreamble.h
View File

@ -17,11 +17,11 @@
#include "FormBase.h"
class ControlPreamble;
struct FD_form_preamble;
struct FD_preamble;
/** This class provides an XForms implementation of the Preamble Dialog.
*/
class FormPreamble : public FormCB<ControlPreamble, FormDB<FD_form_preamble> > {
class FormPreamble : public FormCB<ControlPreamble, FormDB<FD_preamble> > {
public:
///
FormPreamble(ControlPreamble &);
@ -32,9 +32,6 @@ private:
virtual void build();
/// Update the dialog
virtual void update();
/// Fdesign generated method
FD_form_preamble * build_preamble();
};

64
src/frontends/xforms/FormPreferences.C
View File

@ -13,7 +13,7 @@
#endif
#include "FormPreferences.h"
#include "form_preferences.h"
#include "forms/form_preferences.h"
#include "Dialogs.h"
#include "buffer.h"
@ -31,6 +31,7 @@
#include "combox.h"
#include "Color.h"
#include "input_validators.h"
#include "forms_gettext.h"
#include "xforms_helpers.h"
#include "helper_funcs.h"
@ -43,6 +44,7 @@
#include <boost/bind.hpp>
#include FORMS_H_LOCATION
#include <utility>
#include <iomanip>
#include <X11/Xlib.h>
@ -159,7 +161,7 @@ void FormPreferences::hide()
void FormPreferences::build()
{
dialog_.reset(build_preferences());
dialog_.reset(build_preferences(this));
// Manage the restore, save, apply and cancel/close buttons
bc().setOK(dialog_->button_ok);
@ -171,11 +173,11 @@ void FormPreferences::build()
setMessageWidget(dialog_->text_warning);
// build the tab folders
converters_tab_.reset(build_inner_tab());
look_n_feel_tab_.reset(build_inner_tab());
inputs_tab_.reset(build_inner_tab());
outputs_tab_.reset(build_inner_tab());
lang_opts_tab_.reset(build_inner_tab());
converters_tab_.reset(build_preferences_inner_tab(this));
look_n_feel_tab_.reset(build_preferences_inner_tab(this));
inputs_tab_.reset(build_preferences_inner_tab(this));
outputs_tab_.reset(build_preferences_inner_tab(this));
lang_opts_tab_.reset(build_preferences_inner_tab(this));
// build actual tabfolder contents
// these will become nested tabfolders
@ -378,7 +380,7 @@ FormPreferences::Colors::Colors(FormPreferences & p)
{}
FD_form_colors const * FormPreferences::Colors::dialog()
FD_preferences_colors const * FormPreferences::Colors::dialog()
{
return dialog_.get();
}
@ -457,7 +459,7 @@ void FormPreferences::Colors::apply()
void FormPreferences::Colors::build()
{
dialog_.reset(parent_.build_colors());
dialog_.reset(build_preferences_colors(this));
fl_set_object_color(dialog_->button_color,
GUI_COLOR_CHOICE, GUI_COLOR_CHOICE);
@ -924,7 +926,7 @@ FormPreferences::Converters::Converters(FormPreferences & p)
{}
FD_form_converters const * FormPreferences::Converters::dialog()
FD_preferences_converters const * FormPreferences::Converters::dialog()
{
return dialog_.get();
}
@ -940,7 +942,7 @@ void FormPreferences::Converters::apply() const
void FormPreferences::Converters::build()
{
dialog_.reset(parent_.build_converters());
dialog_.reset(build_preferences_converters(this));
fl_set_input_return(dialog_->input_converter, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_flags, FL_RETURN_CHANGED);
@ -1183,7 +1185,7 @@ FormPreferences::Formats::Formats(FormPreferences & p)
{}
FD_form_formats const * FormPreferences::Formats::dialog()
FD_preferences_formats const * FormPreferences::Formats::dialog()
{
return dialog_.get();
}
@ -1197,7 +1199,7 @@ void FormPreferences::Formats::apply() const
void FormPreferences::Formats::build()
{
dialog_.reset(parent_.build_formats());
dialog_.reset(build_preferences_formats(this));
fl_set_input_return(dialog_->input_format, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_viewer, FL_RETURN_CHANGED);
@ -1408,7 +1410,7 @@ FormPreferences::InputsMisc::InputsMisc(FormPreferences & p)
{}
FD_form_inputs_misc const * FormPreferences::InputsMisc::dialog()
FD_preferences_inputs_misc const * FormPreferences::InputsMisc::dialog()
{
return dialog_.get();
}
@ -1423,7 +1425,7 @@ void FormPreferences::InputsMisc::apply() const
void FormPreferences::InputsMisc::build()
{
dialog_.reset(parent_.build_inputs_misc());
dialog_.reset(build_preferences_inputs_misc(this));
fl_set_input_return(dialog_->input_date_format, FL_RETURN_CHANGED);
@ -1456,7 +1458,7 @@ FormPreferences::Interface::Interface(FormPreferences & p)
{}
FD_form_interface const * FormPreferences::Interface::dialog()
FD_preferences_interface const * FormPreferences::Interface::dialog()
{
return dialog_.get();
}
@ -1478,7 +1480,7 @@ void FormPreferences::Interface::apply() const
void FormPreferences::Interface::build()
{
dialog_.reset(parent_.build_interface());
dialog_.reset(build_preferences_interface(this));
fl_set_input_return(dialog_->input_popup_normal_font, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_popup_bold_font, FL_RETURN_CHANGED);
@ -1573,7 +1575,7 @@ FormPreferences::Language::Language(FormPreferences & p)
{}
FD_form_language const * FormPreferences::Language::dialog()
FD_preferences_language const * FormPreferences::Language::dialog()
{
return dialog_.get();
}
@ -1625,7 +1627,7 @@ void FormPreferences::Language::apply()
void FormPreferences::Language::build()
{
dialog_.reset(parent_.build_language());
dialog_.reset(build_preferences_language(this));
fl_set_input_return(dialog_->input_package, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_command_begin, FL_RETURN_CHANGED);
@ -1811,7 +1813,7 @@ FormPreferences::LnFmisc::LnFmisc(FormPreferences & p)
{}
FD_form_lnf_misc const * FormPreferences::LnFmisc::dialog()
FD_preferences_lnf_misc const * FormPreferences::LnFmisc::dialog()
{
return dialog_.get();
}
@ -1854,7 +1856,7 @@ void FormPreferences::LnFmisc::apply() const
void FormPreferences::LnFmisc::build()
{
dialog_.reset(parent_.build_lnf_misc());
dialog_.reset(build_preferences_lnf_misc(this));
fl_set_counter_step(dialog_->counter_autosave, 1, 10);
fl_set_counter_step(dialog_->counter_wm_jump, 1, 10);
@ -1944,7 +1946,7 @@ FormPreferences::OutputsMisc::OutputsMisc(FormPreferences & p)
{}
FD_form_outputs_misc const * FormPreferences::OutputsMisc::dialog()
FD_preferences_outputs_misc const * FormPreferences::OutputsMisc::dialog()
{
return dialog_.get();
}
@ -1969,7 +1971,7 @@ void FormPreferences::OutputsMisc::apply() const
void FormPreferences::OutputsMisc::build()
{
dialog_.reset(parent_.build_outputs_misc());
dialog_.reset(build_preferences_outputs_misc(this));
fl_set_counter_step(dialog_->counter_line_len, 1, 10);
@ -2042,7 +2044,7 @@ FormPreferences::Paths::Paths(FormPreferences & p)
{}
FD_form_paths const * FormPreferences::Paths::dialog()
FD_preferences_paths const * FormPreferences::Paths::dialog()
{
return dialog_.get();
}
@ -2085,7 +2087,7 @@ void FormPreferences::Paths::apply()
void FormPreferences::Paths::build()
{
dialog_.reset(parent_.build_paths());
dialog_.reset(build_preferences_paths(this));
fl_set_input_return(dialog_->input_default_path, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_template_path, FL_RETURN_CHANGED);
@ -2293,7 +2295,7 @@ FormPreferences::Printer::Printer(FormPreferences & p)
{}
FD_form_printer const * FormPreferences::Printer::dialog()
FD_preferences_printer const * FormPreferences::Printer::dialog()
{
return dialog_.get();
}
@ -2375,7 +2377,7 @@ FormPreferences::Printer::feedback(FL_OBJECT const * const ob) const
void FormPreferences::Printer::build()
{
dialog_.reset(parent_.build_printer());
dialog_.reset(build_preferences_printer(this));
fl_set_input_return(dialog_->input_command, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_page_range, FL_RETURN_CHANGED);
@ -2463,7 +2465,7 @@ FormPreferences::ScreenFonts::ScreenFonts(FormPreferences & p)
{}
FD_form_screen_fonts const * FormPreferences::ScreenFonts::dialog()
FD_preferences_screen_fonts const * FormPreferences::ScreenFonts::dialog()
{
return dialog_.get();
}
@ -2587,7 +2589,7 @@ void FormPreferences::ScreenFonts::apply() const
void FormPreferences::ScreenFonts::build()
{
dialog_.reset(parent_.build_screen_fonts());
dialog_.reset(build_preferences_screen_fonts(this));
fl_set_counter_step(dialog_->counter_zoom, 1, 10);
fl_set_counter_step(dialog_->counter_dpi, 1, 10);
@ -2771,7 +2773,7 @@ FormPreferences::SpellOptions::SpellOptions(FormPreferences & p)
{}
FD_form_spelloptions const * FormPreferences::SpellOptions::dialog()
FD_preferences_spelloptions const * FormPreferences::SpellOptions::dialog()
{
return dialog_.get();
}
@ -2842,7 +2844,7 @@ void FormPreferences::SpellOptions::apply()
void FormPreferences::SpellOptions::build()
{
dialog_.reset(parent_.build_spelloptions());
dialog_.reset(build_preferences_spelloptions(this));
fl_addto_choice(dialog_->choice_spell_command,
_(" ispell | aspell "));

118
src/frontends/xforms/FormPreferences.h
View File

@ -22,26 +22,27 @@
#include <boost/scoped_ptr.hpp>
#include FORMS_H_LOCATION
#include <utility> // pair
class Combox;
class Dialogs;
class LyXView;
class RGBColor;
struct FD_form_colors;
struct FD_form_converters;
struct FD_form_formats;
struct FD_form_inputs_misc;
struct FD_form_interface;
struct FD_form_language;
struct FD_form_lnf_misc;
struct FD_form_inner_tab;
struct FD_form_outputs_misc;
struct FD_form_paths;
struct FD_form_preferences;
struct FD_form_printer;
struct FD_form_screen_fonts;
struct FD_form_spelloptions;
struct FD_preferences;
struct FD_preferences_colors;
struct FD_preferences_converters;
struct FD_preferences_formats;
struct FD_preferences_inputs_misc;
struct FD_preferences_interface;
struct FD_preferences_language;
struct FD_preferences_lnf_misc;
struct FD_preferences_inner_tab;
struct FD_preferences_outputs_misc;
struct FD_preferences_paths;
struct FD_preferences_printer;
struct FD_preferences_screen_fonts;
struct FD_preferences_spelloptions;
/** This class provides an XForms implementation of the FormPreferences Dialog.
@ -82,47 +83,18 @@ private:
std::pair<string,string> const & dir1= std::make_pair(string(),string()),
std::pair<string,string> const & dir2 = std::make_pair(string(),string()));
/// Fdesign generated methods
FD_form_preferences * build_preferences();
///
FD_form_inner_tab * build_inner_tab();
///
FD_form_colors * build_colors();
///
FD_form_converters * build_converters();
///
FD_form_formats * build_formats();
///
FD_form_inputs_misc * build_inputs_misc();
///
FD_form_interface * build_interface();
///
FD_form_language * build_language();
///
FD_form_lnf_misc * build_lnf_misc();
///
FD_form_outputs_misc * build_outputs_misc();
///
FD_form_paths * build_paths();
///
FD_form_printer * build_printer();
///
FD_form_screen_fonts * build_screen_fonts();
///
FD_form_spelloptions * build_spelloptions();
/// Real GUI implementation.
boost::scoped_ptr<FD_form_preferences> dialog_;
boost::scoped_ptr<FD_preferences> dialog_;
/// Converters tabfolder
boost::scoped_ptr<FD_form_inner_tab> converters_tab_;
boost::scoped_ptr<FD_preferences_inner_tab> converters_tab_;
/// reLyX and other import/input stuff
boost::scoped_ptr<FD_form_inner_tab> inputs_tab_;
boost::scoped_ptr<FD_preferences_inner_tab> inputs_tab_;
/// HCI configuration
boost::scoped_ptr<FD_form_inner_tab> look_n_feel_tab_;
boost::scoped_ptr<FD_preferences_inner_tab> look_n_feel_tab_;
/// Outputs tabfolder
boost::scoped_ptr<FD_form_inner_tab> outputs_tab_;
boost::scoped_ptr<FD_preferences_inner_tab> outputs_tab_;
/// Spellchecker, language stuff, etc
boost::scoped_ptr<FD_form_inner_tab> lang_opts_tab_;
boost::scoped_ptr<FD_preferences_inner_tab> lang_opts_tab_;
/** Each tab folder is encapsulated in its own class.
*/
@ -138,7 +110,7 @@ private:
///
Colors(FormPreferences & p);
///
FD_form_colors const * dialog();
FD_preferences_colors const * dialog();
///
void apply(); // not const as modifies modifiedXformsPrefs.
///
@ -174,7 +146,7 @@ private:
///
FormPreferences & parent_;
///
boost::scoped_ptr<FD_form_colors> dialog_;
boost::scoped_ptr<FD_preferences_colors> dialog_;
/// A vector of LyX LColor GUI name and associated RGB color.
std::vector<NamedColor> lyxColorDB;
@ -190,7 +162,7 @@ private:
///
Converters(FormPreferences & p);
///
FD_form_converters const * dialog();
FD_preferences_converters const * dialog();
///
void apply() const;
///
@ -223,7 +195,7 @@ private:
///
FormPreferences & parent_;
///
boost::scoped_ptr<FD_form_converters> dialog_;
boost::scoped_ptr<FD_preferences_converters> dialog_;
};
///
friend class Converters;
@ -234,7 +206,7 @@ private:
///
Formats(FormPreferences & p);
///
FD_form_formats const * dialog();
FD_preferences_formats const * dialog();
///
void apply() const;
///
@ -261,7 +233,7 @@ private:
///
FormPreferences & parent_;
///
boost::scoped_ptr<FD_form_formats> dialog_;
boost::scoped_ptr<FD_preferences_formats> dialog_;
};
///
friend class Formats;
@ -272,7 +244,7 @@ private:
///
InputsMisc(FormPreferences & p);
///
FD_form_inputs_misc const * dialog();
FD_preferences_inputs_misc const * dialog();
///
void apply() const;
///
@ -286,7 +258,7 @@ private:
///
FormPreferences & parent_;
///
boost::scoped_ptr<FD_form_inputs_misc> dialog_;
boost::scoped_ptr<FD_preferences_inputs_misc> dialog_;
};
///
friend class InputsMisc;
@ -297,7 +269,7 @@ private:
///
Interface(FormPreferences & p);
///
FD_form_interface const * dialog();
FD_preferences_interface const * dialog();
///
void apply() const;
///
@ -313,7 +285,7 @@ private:
///
FormPreferences & parent_;
///
boost::scoped_ptr<FD_form_interface> dialog_;
boost::scoped_ptr<FD_preferences_interface> dialog_;
};
///
friend class Interface;
@ -324,7 +296,7 @@ private:
///
Language(FormPreferences & p);
///
FD_form_language const * dialog();
FD_preferences_language const * dialog();
///
void apply(); // not const because calls update()
///
@ -342,7 +314,7 @@ private:
///
FormPreferences & parent_;
///
boost::scoped_ptr<FD_form_language> dialog_;
boost::scoped_ptr<FD_preferences_language> dialog_;
///
boost::scoped_ptr<Combox> combo_default_lang;
///
@ -357,7 +329,7 @@ private:
///
LnFmisc(FormPreferences & p);
///
FD_form_lnf_misc const * dialog();
FD_preferences_lnf_misc const * dialog();
///
void apply() const;
///
@ -371,7 +343,7 @@ private:
///
FormPreferences & parent_;
///
boost::scoped_ptr<FD_form_lnf_misc> dialog_;
boost::scoped_ptr<FD_preferences_lnf_misc> dialog_;
};
///
friend class LnFmisc;
@ -382,7 +354,7 @@ private:
///
OutputsMisc(FormPreferences & p);
///
FD_form_outputs_misc const * dialog();
FD_preferences_outputs_misc const * dialog();
///
void apply() const;
///
@ -396,7 +368,7 @@ private:
///
FormPreferences & parent_;
///
boost::scoped_ptr<FD_form_outputs_misc> dialog_;
boost::scoped_ptr<FD_preferences_outputs_misc> dialog_;
};
///
friend class OutputsMisc;
@ -407,7 +379,7 @@ private:
///
Paths(FormPreferences & p);
///
FD_form_paths const * dialog();
FD_preferences_paths const * dialog();
///
void apply();
///
@ -423,7 +395,7 @@ private:
///
FormPreferences & parent_;
///
boost::scoped_ptr<FD_form_paths> dialog_;
boost::scoped_ptr<FD_preferences_paths> dialog_;
};
///
friend class Paths;
@ -434,7 +406,7 @@ private:
///
Printer(FormPreferences & p);
///
FD_form_printer const * dialog();
FD_preferences_printer const * dialog();
///
void apply() const;
///
@ -448,7 +420,7 @@ private:
///
FormPreferences & parent_;
///
boost::scoped_ptr<FD_form_printer> dialog_;
boost::scoped_ptr<FD_preferences_printer> dialog_;
};
///
friend class Printer;
@ -459,7 +431,7 @@ private:
///
ScreenFonts(FormPreferences & p);
///
FD_form_screen_fonts const * dialog();
FD_preferences_screen_fonts const * dialog();
///
void apply() const;
///
@ -475,7 +447,7 @@ private:
///
FormPreferences & parent_;
///
boost::scoped_ptr<FD_form_screen_fonts> dialog_;
boost::scoped_ptr<FD_preferences_screen_fonts> dialog_;
};
///
friend class ScreenFonts;
@ -486,7 +458,7 @@ private:
///
SpellOptions(FormPreferences & p);
///
FD_form_spelloptions const * dialog();
FD_preferences_spelloptions const * dialog();
///
void apply(); // not const because calls update()!
///
@ -502,7 +474,7 @@ private:
///
FormPreferences & parent_;
///
boost::scoped_ptr<FD_form_spelloptions> dialog_;
boost::scoped_ptr<FD_preferences_spelloptions> dialog_;
};
///
friend class SpellOptions;

7
src/frontends/xforms/FormPrint.C
View File

@ -16,7 +16,7 @@
#include "xformsBC.h"
#include "ControlPrint.h"
#include "FormPrint.h"
#include "form_print.h"
#include "forms/form_print.h"
#include "frontends/LyXView.h"
@ -26,10 +26,11 @@
#include "xforms_helpers.h"
#include "support/lstrings.h"
#include FORMS_H_LOCATION
using std::make_pair;
typedef FormCB<ControlPrint, FormDB<FD_form_print> > base_class;
typedef FormCB<ControlPrint, FormDB<FD_print> > base_class;
FormPrint::FormPrint(ControlPrint & c)
: base_class(c, _("Print")),
@ -39,7 +40,7 @@ FormPrint::FormPrint(ControlPrint & c)
void FormPrint::build()
{
dialog_.reset(build_print());
dialog_.reset(build_print(this));
// Manage the ok, apply and cancel/close buttons
bc().setOK(dialog_->button_ok);

7
src/frontends/xforms/FormPrint.h
View File

@ -21,12 +21,12 @@
#include "RadioButtonGroup.h"
class ControlPrint;
struct FD_form_print;
struct FD_print;
/** This class provides an XForms implementation of the FormPrint Dialog.
The print dialog allows users to print their documents.
*/
class FormPrint : public FormCB<ControlPrint, FormDB<FD_form_print> > {
class FormPrint : public FormCB<ControlPrint, FormDB<FD_print> > {
public:
///
FormPrint(ControlPrint &);
@ -41,9 +41,6 @@ private:
/// Filter the inputs on callback from xforms
virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
/// Fdesign generated method
FD_form_print * build_print();
/// print target
RadioButtonGroup target_;
/// page order

7
src/frontends/xforms/FormRef.C
View File

@ -16,18 +16,19 @@
#include "xformsBC.h"
#include "ControlRef.h"
#include "FormRef.h"
#include "form_ref.h"
#include "forms/form_ref.h"
#include "xforms_helpers.h"
#include "insets/insetref.h"
#include "helper_funcs.h" // getStringFromVector
#include "support/lstrings.h" // frontStrip, strip
#include FORMS_H_LOCATION
using std::find;
using std::max;
using std::sort;
using std::vector;
typedef FormCB<ControlRef, FormDB<FD_form_ref> > base_class;
typedef FormCB<ControlRef, FormDB<FD_ref> > base_class;
FormRef::FormRef(ControlRef & c)
: base_class(c, _("Reference")),
@ -37,7 +38,7 @@ FormRef::FormRef(ControlRef & c)
void FormRef::build()
{
dialog_.reset(build_ref());
dialog_.reset(build_ref(this));
for (int i = 0; !InsetRef::types[i].latex_name.empty(); ++i)
fl_addto_choice(dialog_->choice_type,

7
src/frontends/xforms/FormRef.h
View File

@ -17,11 +17,11 @@
#include "FormBase.h"
class ControlRef;
struct FD_form_ref;
struct FD_ref;
/** This class provides an XForms implementation of the FormRef Dialog.
*/
class FormRef : public FormCB<ControlRef, FormDB<FD_form_ref> > {
class FormRef : public FormCB<ControlRef, FormDB<FD_ref> > {
public:
///
FormRef(ControlRef &);
@ -39,9 +39,6 @@ private:
///
void updateBrowser(std::vector<string> const &) const;
/// Fdesign generated method
FD_form_ref * build_ref();
///
bool at_ref_;
///

7
src/frontends/xforms/FormSearch.C
View File

@ -15,9 +15,10 @@
#include "xformsBC.h"
#include "ControlSearch.h"
#include "FormSearch.h"
#include "form_search.h"
#include "forms/form_search.h"
#include FORMS_H_LOCATION
typedef FormCB<ControlSearch, FormDB<FD_form_search> > base_class;
typedef FormCB<ControlSearch, FormDB<FD_search> > base_class;
FormSearch::FormSearch(ControlSearch & c)
: base_class(c, _("LyX: Find and Replace"))
@ -26,7 +27,7 @@ FormSearch::FormSearch(ControlSearch & c)
void FormSearch::build()
{
dialog_.reset(build_search());
dialog_.reset(build_search(this));
// Manage the ok, apply and cancel/close buttons
bc().setCancel(dialog_->button_close);

7
src/frontends/xforms/FormSearch.h
View File

@ -17,11 +17,11 @@
#include "FormBase.h"
class ControlSearch;
struct FD_form_search;
struct FD_search;
/** This class provides an XForms implementation of the FormSearch Dialog.
*/
class FormSearch : public FormCB<ControlSearch, FormDB<FD_form_search> > {
class FormSearch : public FormCB<ControlSearch, FormDB<FD_search> > {
public:
///
FormSearch(ControlSearch &);
@ -36,9 +36,6 @@ private:
/// Filter the inputs
virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
/// Fdesign generated method
FD_form_search * build_search();
};
#endif // FORMSEARCH_H

7
src/frontends/xforms/FormSendto.C
View File

@ -13,17 +13,18 @@
#endif
#include "FormSendto.h"
#include "form_sendto.h"
#include "forms/form_sendto.h"
#include "ControlSendto.h"
#include "xformsBC.h"
#include "Tooltips.h"
#include "xforms_helpers.h"
#include "converter.h"
#include "gettext.h"
#include FORMS_H_LOCATION
using std::vector;
typedef FormCB<ControlSendto, FormDB<FD_form_sendto> > base_class;
typedef FormCB<ControlSendto, FormDB<FD_sendto> > base_class;
FormSendto::FormSendto(ControlSendto & c)
: base_class(c, _("Send document to command"))
@ -32,7 +33,7 @@ FormSendto::FormSendto(ControlSendto & c)
void FormSendto::build()
{
dialog_.reset(build_sendto());
dialog_.reset(build_sendto(this));
fl_set_input_return(dialog_->input_command, FL_RETURN_CHANGED);
setPrehandler(dialog_->input_command);

7
src/frontends/xforms/FormSendto.h
View File

@ -19,11 +19,11 @@
class ControlSendto;
class Format;
struct FD_form_sendto;
struct FD_sendto;
/** This class provides an XForms implementation of the Custom Export Dialog.
*/
class FormSendto : public FormCB<ControlSendto, FormDB<FD_form_sendto> > {
class FormSendto : public FormCB<ControlSendto, FormDB<FD_sendto> > {
public:
///
FormSendto(ControlSendto &);
@ -38,9 +38,6 @@ private:
/// Filter the inputs on callback from xforms
virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
/// Fdesign generated method
FD_form_sendto * build_sendto();
std::vector<Format const *> all_formats_;
};

3
src/frontends/xforms/FormShowFile.C
View File

@ -15,8 +15,9 @@
#include "xformsBC.h"
#include "ControlShowFile.h"
#include "FormShowFile.h"
#include "form_browser.h"
#include "forms/form_browser.h"
#include "gettext.h"
#include FORMS_H_LOCATION
FormShowFile::FormShowFile(ControlShowFile & c)
: FormCB<ControlShowFile, FormBrowser>(c, string())

7
src/frontends/xforms/FormSpellchecker.C
View File

@ -16,9 +16,10 @@
#include "xforms_helpers.h"
#include "ControlSpellchecker.h"
#include "FormSpellchecker.h"
#include "form_spellchecker.h"
#include "forms/form_spellchecker.h"
#include FORMS_H_LOCATION
typedef FormCB<ControlSpellchecker, FormDB<FD_form_spellchecker> > base_class;
typedef FormCB<ControlSpellchecker, FormDB<FD_spellchecker> > base_class;
FormSpellchecker::FormSpellchecker(ControlSpellchecker & c)
: base_class(c, _("LyX: Spellchecker"), false)
@ -27,7 +28,7 @@ FormSpellchecker::FormSpellchecker(ControlSpellchecker & c)
void FormSpellchecker::build()
{
dialog_.reset(build_spellchecker());
dialog_.reset(build_spellchecker(this));
fl_set_slider_bounds(dialog_->slider, 0.0, 100.0);
fl_set_slider_step(dialog_->slider, 1.0);

7
src/frontends/xforms/FormSpellchecker.h
View File

@ -17,11 +17,11 @@
#include "FormBase.h"
class ControlSpellchecker;
struct FD_form_spellchecker;
struct FD_spellchecker;
/** This class provides an XForms implementation of the FormSpellchecker Dialog.
*/
class FormSpellchecker : public FormCB<ControlSpellchecker, FormDB<FD_form_spellchecker> > {
class FormSpellchecker : public FormCB<ControlSpellchecker, FormDB<FD_spellchecker> > {
public:
///
FormSpellchecker(ControlSpellchecker &);
@ -45,9 +45,6 @@ private:
/// Filter the inputs
virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
/// Fdesign generated method
FD_form_spellchecker * build_spellchecker();
};
#endif // FORMSPELLCHECKER_H

13
src/frontends/xforms/FormTabular.C
View File

@ -15,7 +15,7 @@
#include "debug.h"
#include "FormTabular.h"
#include "form_tabular.h"
#include "forms/form_tabular.h"
#include "frontends/LyXView.h"
#include "Dialogs.h"
#include "buffer.h"
@ -31,6 +31,7 @@
#include <boost/bind.hpp>
#include <functional>
#include FORMS_H_LOCATION
using std::vector;
@ -110,7 +111,7 @@ void FormTabular::updateInset(InsetTabular * inset)
void FormTabular::build()
{
dialog_.reset(build_tabular());
dialog_.reset(build_tabular(this));
// Allow the base class to control messages
setMessageWidget(dialog_->text_warning);
@ -118,10 +119,10 @@ void FormTabular::build()
setPrehandler(dialog_->input_tabular_column);
setPrehandler(dialog_->input_tabular_row);
tabular_options_.reset(build_tabular_options());
column_options_.reset(build_column_options());
cell_options_.reset(build_cell_options());
longtable_options_.reset(build_longtable_options());
tabular_options_.reset(build_tabular_options(this));
column_options_.reset(build_tabular_column(this));
cell_options_.reset(build_tabular_cell(this));
longtable_options_.reset(build_tabular_longtable(this));
fl_set_input_return(column_options_->input_column_width,
FL_RETURN_END);

31
src/frontends/xforms/FormTabular.h
View File

@ -20,11 +20,11 @@
#include "FormInset.h"
class InsetTabular;
struct FD_form_tabular;
struct FD_form_tabular_options;
struct FD_form_column_options;
struct FD_form_cell_options;
struct FD_form_longtable_options;
struct FD_tabular;
struct FD_tabular_options;
struct FD_tabular_column;
struct FD_tabular_cell;
struct FD_tabular_longtable;
/** This class provides an XForms implementation of the FormTabular Dialog.
The tabular dialog allows users to set/save their tabular.
@ -58,27 +58,16 @@ private:
///
virtual int checkLongtableOptions(FL_OBJECT *, string &);
/// Fdesign generated methods
FD_form_tabular * build_tabular();
///
FD_form_tabular_options * build_tabular_options();
///
FD_form_column_options * build_column_options();
///
FD_form_cell_options * build_cell_options();
///
FD_form_longtable_options * build_longtable_options();
/// Real GUI implementation.
boost::scoped_ptr<FD_form_tabular> dialog_;
boost::scoped_ptr<FD_tabular> dialog_;
///
boost::scoped_ptr<FD_form_tabular_options> tabular_options_;
boost::scoped_ptr<FD_tabular_options> tabular_options_;
///
boost::scoped_ptr<FD_form_column_options> column_options_;
boost::scoped_ptr<FD_tabular_column> column_options_;
///
boost::scoped_ptr<FD_form_cell_options> cell_options_;
boost::scoped_ptr<FD_tabular_cell> cell_options_;
///
boost::scoped_ptr<FD_form_longtable_options> longtable_options_;
boost::scoped_ptr<FD_tabular_longtable> longtable_options_;
/// pointer to the inset passed through showInset
InsetTabular * inset_;

7
src/frontends/xforms/FormTabularCreate.C
View File

@ -16,14 +16,15 @@
#include "xformsBC.h"
#include "ControlTabularCreate.h"
#include "FormTabularCreate.h"
#include "form_tabular_create.h"
#include "forms/form_tabular_create.h"
#include "support/lstrings.h"
#include FORMS_H_LOCATION
using std::make_pair;
typedef FormCB<ControlTabularCreate, FormDB<FD_form_tabular_create> > base_class;
typedef FormCB<ControlTabularCreate, FormDB<FD_tabular_create> > base_class;
FormTabularCreate::FormTabularCreate(ControlTabularCreate & c)
: base_class(c, _("Insert Tabular"))
@ -32,7 +33,7 @@ FormTabularCreate::FormTabularCreate(ControlTabularCreate & c)
void FormTabularCreate::build()
{
dialog_.reset(build_tabular_create());
dialog_.reset(build_tabular_create(this));
fl_set_slider_bounds(dialog_->slider_rows, 1, 50);
fl_set_slider_bounds(dialog_->slider_columns, 1, 50);

7
src/frontends/xforms/FormTabularCreate.h
View File

@ -18,13 +18,13 @@
#include "FormBase.h"
class ControlTabularCreate;
struct FD_form_tabular_create;
struct FD_tabular_create;
/** This class provides an XForms implementation of the TabularCreate
Dialog.
*/
class FormTabularCreate :
public FormCB<ControlTabularCreate, FormDB<FD_form_tabular_create> > {
public FormCB<ControlTabularCreate, FormDB<FD_tabular_create> > {
public:
///
FormTabularCreate(ControlTabularCreate &);
@ -36,9 +36,6 @@ private:
virtual void build();
/// not needed
virtual void update() {};
///
FD_form_tabular_create * build_tabular_create();
};
#endif // FORMTABULARCREATE

7
src/frontends/xforms/FormTexinfo.C
View File

@ -16,15 +16,16 @@
#include "xformsBC.h"
#include "FormTexinfo.h"
#include "form_texinfo.h"
#include "forms/form_texinfo.h"
#include "Tooltips.h"
#include "gettext.h"
#include "debug.h"
#include "xforms_helpers.h"
#include "support/LAssert.h"
#include FORMS_H_LOCATION
typedef FormCB<ControlTexinfo, FormDB<FD_form_texinfo> > base_class;
typedef FormCB<ControlTexinfo, FormDB<FD_texinfo> > base_class;
FormTexinfo::FormTexinfo(ControlTexinfo & c)
: base_class(c, _("LaTeX Information")),
activeStyle(ControlTexinfo::cls)
@ -32,7 +33,7 @@ FormTexinfo::FormTexinfo(ControlTexinfo & c)
void FormTexinfo::build() {
dialog_.reset(build_texinfo());
dialog_.reset(build_texinfo(this));
// courier medium
fl_set_browser_fontstyle(dialog_->browser,FL_FIXED_STYLE);
// with Path is default

6
src/frontends/xforms/FormTexinfo.h
View File

@ -17,9 +17,9 @@
#include "FormBase.h"
#include "ControlTexinfo.h"
struct FD_form_texinfo;
struct FD_texinfo;
class FormTexinfo : public FormCB<ControlTexinfo, FormDB<FD_form_texinfo> > {
class FormTexinfo : public FormCB<ControlTexinfo, FormDB<FD_texinfo> > {
public:
///
FormTexinfo(ControlTexinfo &);
@ -35,8 +35,6 @@ private:
virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
///
void updateStyles(ControlTexinfo::texFileSuffix);
/// Fdesign generated method
FD_form_texinfo * build_texinfo();
///
ControlTexinfo::texFileSuffix activeStyle;
};

15
src/frontends/xforms/FormThesaurus.C
View File

@ -12,14 +12,15 @@
#pragma implementation
#endif
#include <cctype>
#include "support/lstrings.h"
#include "xformsBC.h"
#include "xforms_helpers.h"
#include "ControlThesaurus.h"
#include "FormThesaurus.h"
#include "form_thesaurus.h"
#include "forms/form_thesaurus.h"
#include "xformsBC.h"
#include "xforms_helpers.h"
#include "debug.h"
#include "support/lstrings.h"
#include FORMS_H_LOCATION
#include <cctype>
#ifndef CXX_GLOBAL_CSTD
using std::isupper;
@ -29,7 +30,7 @@ using std::islower;
using std::vector;
typedef FormCB<ControlThesaurus, FormDB<FD_form_thesaurus> > base_class;
typedef FormCB<ControlThesaurus, FormDB<FD_thesaurus> > base_class;
FormThesaurus::FormThesaurus(ControlThesaurus & c)
@ -41,7 +42,7 @@ FormThesaurus::FormThesaurus(ControlThesaurus & c)
void FormThesaurus::build()
{
dialog_.reset(build_thesaurus());
dialog_.reset(build_thesaurus(this));
fl_set_input_return(dialog_->input_entry, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_replace, FL_RETURN_CHANGED);

12
src/frontends/xforms/FormThesaurus.h
View File

@ -17,16 +17,11 @@
#include "FormBase.h"
class ControlThesaurus;
struct FD_form_thesaurus;
struct FD_form_noun;
struct FD_form_verb;
struct FD_form_adjective;
struct FD_form_adverb;
struct FD_form_other;
struct FD_thesaurus;
/** This class provides an XForms implementation of the Thesaurus dialog.
*/
class FormThesaurus : public FormCB<ControlThesaurus, FormDB<FD_form_thesaurus> > {
class FormThesaurus : public FormCB<ControlThesaurus, FormDB<FD_thesaurus> > {
public:
///
FormThesaurus(ControlThesaurus &);
@ -39,9 +34,6 @@ private:
/// update dialog
virtual void update();
/// dialog build
FD_form_thesaurus * build_thesaurus();
/// set the replace word properly
void setReplace(string const & templ, string const & nstr);

7
src/frontends/xforms/FormToc.C
View File

@ -15,18 +15,19 @@
#include "FormToc.h"
#include "xformsBC.h"
#include "ControlToc.h"
#include "form_toc.h"
#include "forms/form_toc.h"
#include "helper_funcs.h" // getStringFromVector
#include "support/lstrings.h" // frontStrip, strip
#include "debug.h"
#include "gettext.h"
#include FORMS_H_LOCATION
#include <vector>
using std::endl;
typedef FormCB<ControlToc, FormDB<FD_form_toc> > base_class;
typedef FormCB<ControlToc, FormDB<FD_toc> > base_class;
FormToc::FormToc(ControlToc & c)
: base_class(c, _("Table of Contents"))
@ -35,7 +36,7 @@ FormToc::FormToc(ControlToc & c)
void FormToc::build()
{
dialog_.reset(build_toc());
dialog_.reset(build_toc(this));
string const choice =
" " + getStringFromVector(controller().getTypes(), " | ") + " ";

7
src/frontends/xforms/FormToc.h
View File

@ -18,11 +18,11 @@
#include "buffer.h"
class ControlToc;
struct FD_form_toc;
struct FD_toc;
/** This class provides an XForms implementation of the FormToc Dialog.
*/
class FormToc : public FormCB<ControlToc, FormDB<FD_form_toc> > {
class FormToc : public FormCB<ControlToc, FormDB<FD_toc> > {
public:
///
FormToc(ControlToc &);
@ -41,9 +41,6 @@ private:
///
void updateContents();
/// Fdesign generated method
FD_form_toc * build_toc();
///
Buffer::SingleList toclist_;
};

7
src/frontends/xforms/FormUrl.C
View File

@ -16,9 +16,10 @@
#include "xformsBC.h"
#include "ControlUrl.h"
#include "FormUrl.h"
#include "form_url.h"
#include "forms/form_url.h"
#include FORMS_H_LOCATION
typedef FormCB<ControlUrl, FormDB<FD_form_url> > base_class;
typedef FormCB<ControlUrl, FormDB<FD_url> > base_class;
FormUrl::FormUrl(ControlUrl & c)
: base_class(c, _("Url"))
@ -27,7 +28,7 @@ FormUrl::FormUrl(ControlUrl & c)
void FormUrl::build()
{
dialog_.reset(build_url());
dialog_.reset(build_url(this));
fl_set_input_return(dialog_->input_name, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_url, FL_RETURN_CHANGED);

6
src/frontends/xforms/FormUrl.h
View File

@ -17,11 +17,11 @@
#include "FormBase.h"
class ControlUrl;
struct FD_form_url;
struct FD_url;
/** This class provides an XForms implementation of the Url Dialog.
*/
class FormUrl : public FormCB<ControlUrl, FormDB<FD_form_url> > {
class FormUrl : public FormCB<ControlUrl, FormDB<FD_url> > {
public:
///
FormUrl(ControlUrl &);
@ -33,8 +33,6 @@ private:
virtual void build();
/// Update dialog before showing it
virtual void update();
/// Filter the inputs on callback from xforms
FD_form_url * build_url();
};
#endif // FORMURL_H

3
src/frontends/xforms/FormVCLog.C
View File

@ -16,8 +16,9 @@
#include "xformsBC.h"
#include "ControlVCLog.h"
#include "FormVCLog.h"
#include "form_browser.h"
#include "forms/form_browser.h"
#include "gettext.h"
#include FORMS_H_LOCATION
FormVCLog::FormVCLog(ControlVCLog & c)
: FormCB<ControlVCLog, FormBrowser>(c, _("Version Control Log"))

115
src/frontends/xforms/Makefile.am
View File

@ -18,15 +18,33 @@ endif
# Alphabetical order please. It makes it easier to figure out what's missing.
libxforms_la_SOURCES = \
Alert_pimpl.C \
forms_fwd.h \
forms_gettext.C \
forms_gettext.h \
bmtable.c \
bmtable.h \
combox.C \
combox.h \
input_validators.C \
input_validators.h \
lyx_gui.C \
lyxlookup.C \
lyxlookup.h \
xfont_loader.C \
xfont_loader.h \
xfont_metrics.C \
xfont_metrics.h \
xforms_helpers.C \
xforms_helpers.h \
xforms_resize.C \
xforms_resize.h \
$(XFORMSGIMAGE) xformsBC.C \
xformsBC.h \
Alert_pimpl.C \
Color.C \
Color.h \
ColorHandler.C \
ColorHandler.h \
combox.C \
combox.h \
Dialogs.C \
DropDown.h \
DropDown.C \
@ -37,72 +55,40 @@ libxforms_la_SOURCES = \
FontInfo.h \
FormFiledialog.h \
FormFiledialog.C \
form_filedialog.C \
form_filedialog.h \
FormAboutlyx.C \
FormAboutlyx.h \
form_aboutlyx.C \
form_aboutlyx.h \
FormBase.C \
FormBase.h \
FormBaseDeprecated.C \
FormBaseDeprecated.h \
FormBibitem.C \
FormBibitem.h \
form_bibitem.C \
form_bibitem.h \
FormBibtex.C \
FormBibtex.h \
form_bibtex.C \
form_bibtex.h \
FormBrowser.C \
FormBrowser.h \
form_browser.C \
form_browser.h \
FormCharacter.C \
FormCharacter.h \
form_character.C \
form_character.h \
FormCitation.C \
FormCitation.h \
form_citation.C \
form_citation.h \
FormDocument.C \
FormDocument.h \
form_document.C \
form_document.h \
FormError.C \
FormError.h \
form_error.C \
form_error.h \
FormERT.C \
FormERT.h \
form_ert.C \
form_ert.h \
FormExternal.C \
FormExternal.h \
form_external.C \
form_external.h \
FormFloat.C \
FormFloat.h \
form_float.C \
form_float.h \
FormForks.C \
FormForks.h \
form_forks.C \
form_forks.h \
FormGraphics.C \
FormGraphics.h \
form_graphics.C \
form_graphics.h \
FormInclude.C \
FormInclude.h \
form_include.C \
form_include.h \
FormIndex.C \
FormIndex.h \
form_index.C \
form_index.h \
FormInset.C \
FormInset.h \
FormLog.C \
@ -111,97 +97,50 @@ libxforms_la_SOURCES = \
FormMathsBitmap.h \
FormMathsDeco.C \
FormMathsDeco.h \
form_maths_deco.C \
form_maths_deco.h \
FormMathsDelim.C \
FormMathsDelim.h \
form_maths_delim.C \
form_maths_delim.h \
FormMathsMatrix.C \
FormMathsMatrix.h \
form_maths_matrix.C \
form_maths_matrix.h \
FormMathsPanel.C \
FormMathsPanel.h \
form_maths_panel.C \
form_maths_panel.h \
FormMathsSpace.C \
FormMathsSpace.h \
form_maths_space.C \
form_maths_space.h \
FormMathsStyle.C \
FormMathsStyle.h \
form_maths_style.C \
form_maths_style.h \
FormMinipage.C \
FormMinipage.h \
form_minipage.C \
form_minipage.h \
FormParagraph.C \
FormParagraph.h \
form_paragraph.C \
form_paragraph.h \
FormPreamble.C \
FormPreamble.h \
form_preamble.C \
form_preamble.h \
FormPreferences.C \
FormPreferences.h \
form_preferences.C \
form_preferences.h \
FormPrint.C \
FormPrint.h \
form_print.C \
form_print.h \
FormRef.C \
FormRef.h \
form_ref.C \
form_ref.h \
FormSearch.C \
FormSearch.h \
form_search.C \
form_search.h \
FormSendto.C \
FormSendto.h \
form_sendto.C \
form_sendto.h \
FormShowFile.C \
FormShowFile.h \
FormSpellchecker.C \
FormSpellchecker.h \
form_spellchecker.C \
form_spellchecker.h \
FormTabular.C \
FormTabular.h \
form_tabular.C \
form_tabular.h \
FormTabularCreate.C \
FormTabularCreate.h \
form_tabular_create.C \
form_tabular_create.h \
FormTexinfo.C \
FormTexinfo.h \
form_texinfo.C \
form_texinfo.h \
FormThesaurus.C \
FormThesaurus.h \
form_thesaurus.C \
form_thesaurus.h \
FormToc.C \
FormToc.h \
form_toc.C \
form_toc.h \
FormUrl.C \
FormUrl.h \
form_url.C \
form_url.h \
FormVCLog.C \
FormVCLog.h \
input_validators.C \
input_validators.h \
lyx_gui.C \
lyxlookup.C \
lyxlookup.h \
MathsSymbols.C \
MathsSymbols.h \
Menubar_pimpl.C \
@ -219,17 +158,7 @@ libxforms_la_SOURCES = \
XPainter.C \
XPainter.h \
XWorkArea.h \
XWorkArea.C \
xfont_loader.C \
xfont_loader.h \
xfont_metrics.C \
xfont_metrics.h \
xforms_helpers.C \
xforms_helpers.h \
xforms_resize.C \
xforms_resize.h \
$(XFORMSGIMAGE) xformsBC.C \
xformsBC.h
XWorkArea.C
libxforms.la: $(libxforms_la_OBJECTS) $(libxforms_la_DEPENDENCIES)

1
src/frontends/xforms/Menubar_pimpl.C
View File

@ -25,6 +25,7 @@
#include "support/LAssert.h"
#include "gettext.h"
#include "debug.h"
#include FORMS_H_LOCATION
#include <boost/scoped_ptr.hpp>

3
src/frontends/xforms/Menubar_pimpl.h
View File

@ -23,7 +23,8 @@
#include <boost/shared_ptr.hpp>
#include FORMS_H_LOCATION
#include "forms_fwd.h"
#include <X11/X.h> // Window
#include <vector>
#include <map>

1
src/frontends/xforms/RadioButtonGroup.C
View File

@ -15,6 +15,7 @@
#endif
#include "RadioButtonGroup.h"
#include FORMS_H_LOCATION
#include "debug.h" // for lyxerr
#include "support/lyxfunctional.h"

2
src/frontends/xforms/RadioButtonGroup.h
View File

@ -19,7 +19,7 @@
#include "support/types.h"
#include <vector>
#include <utility>
#include FORMS_H_LOCATION
#include "forms_fwd.h"
/** This class simplifies the work with a group of radio buttons,
* the idea is that you register a bunch of radio buttons with the accompanying

1
src/frontends/xforms/Toolbar_pimpl.C
View File

@ -28,6 +28,7 @@
#include "MathsSymbols.h"
#include "gettext.h"
#include "Tooltips.h"
#include FORMS_H_LOCATION
#include "support/LAssert.h"
#include "support/filetools.h"

2
src/frontends/xforms/Toolbar_pimpl.h
View File

@ -12,7 +12,7 @@
#define TOOLBAR_PIMPL_H
#include <vector>
#include FORMS_H_LOCATION
#include "forms_fwd.h"
#include "frontends/Toolbar.h"

1
src/frontends/xforms/Tooltips.C
View File

@ -24,6 +24,7 @@
#include "gettext.h"
#include "support/lstrings.h"
#include "support/LAssert.h"
#include FORMS_H_LOCATION
#include <boost/bind.hpp>

2
src/frontends/xforms/Tooltips.h
View File

@ -22,7 +22,7 @@
#include <boost/signals/signal0.hpp>
#include <boost/signals/trackable.hpp>
#include FORMS_H_LOCATION // Can't forward-declare FL_OBJECT
#include "forms_fwd.h" // Can't forward-declare FL_OBJECT
#include <map>

Some files were not shown because too many files have changed in this diff Show More