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

Use the same scheme as qt: vars not pointer to vars.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5018 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-08-16 20:07:39 +00:00
parent 6aee235af7
commit 153e7c9e55
6 changed files with 404 additions and 633 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,11 @@
2002-08-16 Angus Leeming <leeming@lyx.org>
* Dialogs.C:
* Dialogs2.C:
* Dialogs_impl.h: use the qt2 scheme of vars not pointer to vars.
* Dialogs3.C: removed.
2002-08-16 Angus Leeming <leeming@lyx.org> 2002-08-16 Angus Leeming <leeming@lyx.org>
* Tooltips.C (c-tor): don't forget the "#ifdef crap xforms" code next * Tooltips.C (c-tor): don't forget the "#ifdef crap xforms" code next
@ -11,8 +19,8 @@
2002-08-15 Angus Leeming <leeming@lyx.org> 2002-08-15 Angus Leeming <leeming@lyx.org>
* Dialogs.C: * Dialogs.C:
* Dialogs2.C * Dialogs2.C:
* Dialogs3.C * Dialogs3.C:
* Dialogs_impl.h: the brave new world of Dialog creation. * Dialogs_impl.h: the brave new world of Dialog creation.
* FormBaseDeprecated.C: * FormBaseDeprecated.C:

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

@ -16,163 +16,6 @@
#include "Dialogs_impl.h" #include "Dialogs_impl.h"
#include "Tooltips.h"
#include "xformsBC.h"
#include "combox.h"
#include "ControlAboutlyx.h"
#include "FormAboutlyx.h"
#include "forms/form_aboutlyx.h"
#include "ControlBibitem.h"
#include "FormBibitem.h"
#include "forms/form_bibitem.h"
#include "ControlBibtex.h"
#include "FormBibtex.h"
#include "forms/form_bibtex.h"
#include "FormBrowser.h"
#include "forms/form_browser.h"
#include "ControlCharacter.h"
#include "FormCharacter.h"
#include "forms/form_character.h"
#include "ControlCitation.h"
#include "FormCitation.h"
#include "forms/form_citation.h"
#include "FormDocument.h"
#include "forms/form_document.h"
#include "ControlError.h"
#include "FormError.h"
#include "forms/form_error.h"
#include "ControlERT.h"
#include "FormERT.h"
#include "forms/form_ert.h"
#include "ControlExternal.h"
#include "FormExternal.h"
#include "forms/form_external.h"
#include "ControlFloat.h"
#include "FormFloat.h"
#include "forms/form_float.h"
#include "ControlForks.h"
#include "FormForks.h"
#include "forms/form_forks.h"
#include "ControlGraphics.h"
#include "FormGraphics.h"
#include "forms/form_graphics.h"
#include "ControlInclude.h"
#include "FormInclude.h"
#include "forms/form_include.h"
#include "ControlIndex.h"
#include "FormIndex.h"
#include "forms/form_index.h"
#include "ControlLog.h"
#include "FormLog.h"
#include "ControlShowFile.h"
#include "FormShowFile.h"
#include "FormMathsBitmap.h"
#include "FormMathsPanel.h"
#include "forms/form_maths_panel.h"
#include "FormMathsDeco.h"
#include "forms/form_maths_deco.h"
#include "FormMathsDelim.h"
#include "forms/form_maths_delim.h"
#include "FormMathsMatrix.h"
#include "forms/form_maths_matrix.h"
#include "FormMathsSpace.h"
#include "forms/form_maths_space.h"
#include "FormMathsStyle.h"
#include "forms/form_maths_style.h"
#include "ControlMinipage.h"
#include "FormMinipage.h"
#include "forms/form_minipage.h"
#include "ControlParagraph.h"
#include "FormParagraph.h"
#include "forms/form_paragraph.h"
#include "ControlPreamble.h"
#include "FormPreamble.h"
#include "forms/form_preamble.h"
#include "FormPreferences.h"
#include "forms/form_preferences.h"
#include "ControlPrint.h"
#include "FormPrint.h"
#include "forms/form_print.h"
#include "ControlRef.h"
#include "FormRef.h"
#include "forms/form_ref.h"
#include "ControlSearch.h"
#include "FormSearch.h"
#include "forms/form_search.h"
#include "ControlSendto.h"
#include "FormSendto.h"
#include "forms/form_sendto.h"
#include "ControlSpellchecker.h"
#include "FormSpellchecker.h"
#include "forms/form_spellchecker.h"
#include "FormTabular.h"
#include "forms/form_tabular.h"
#include "ControlTabularCreate.h"
#include "FormTabularCreate.h"
#include "forms/form_tabular_create.h"
#include "ControlTexinfo.h"
#include "FormTexinfo.h"
#include "forms/form_texinfo.h"
#ifdef HAVE_LIBAIKSAURUS
#include "ControlThesaurus.h"
#include "FormThesaurus.h"
#include "forms/form_thesaurus.h"
#endif
#include "ControlToc.h"
#include "FormToc.h"
#include "forms/form_toc.h"
#include "ControlUrl.h"
#include "FormUrl.h"
#include "forms/form_url.h"
#include "ControlVCLog.h"
#include "FormVCLog.h"
Dialogs::Impl::Impl(LyXView & lv, Dialogs & d)
: lv_(lv), d_(d)
{}
Dialogs::Dialogs(LyXView & lv) Dialogs::Dialogs(LyXView & lv)
: pimpl_(new Impl(lv, *this)) : pimpl_(new Impl(lv, *this))
{ {
@ -197,3 +40,44 @@ bool Dialogs::tooltipsEnabled()
{ {
return Tooltips::enabled(); return Tooltips::enabled();
} }
Dialogs::Impl::Impl(LyXView & lv, Dialogs & d)
: aboutlyx(lv, d),
bibitem(lv, d),
bibtex(lv, d),
character(lv, d),
citation(lv, d),
document(lv, d),
error(lv, d),
ert(lv, d),
external(lv, d),
file(lv, d),
floats(lv, d),
forks(lv, d),
graphics(lv, d),
include(lv, d),
index(lv, d),
logfile(lv, d),
mathpanel(lv, d),
minipage(lv, d),
paragraph(lv, d),
preamble(lv, d),
preferences(lv, d),
print(lv, d),
ref(lv, d),
search(lv, d),
sendto(lv, d),
spellchecker(lv, d),
tabular(lv, d),
tabularcreate(lv, d),
texinfo(lv, d),
#ifdef HAVE_LIBAIKSAURUS
thesaurus(lv, d),
#endif
toc(lv, d),
url(lv, d),
vclogfile(lv, d)
{}

253
src/frontends/xforms/Dialogs2.C
View File

@ -16,188 +16,269 @@
#include "Dialogs_impl.h" #include "Dialogs_impl.h"
#include "combox.h"
#include "ControlAboutlyx.h"
#include "FormAboutlyx.h"
#include "forms/form_aboutlyx.h"
#include "ControlBibitem.h"
#include "FormBibitem.h"
#include "forms/form_bibitem.h"
#include "ControlBibtex.h"
#include "FormBibtex.h"
#include "forms/form_bibtex.h"
#include "FormBrowser.h"
#include "forms/form_browser.h"
#include "ControlCharacter.h"
#include "FormCharacter.h"
#include "forms/form_character.h"
#include "ControlCitation.h"
#include "FormCitation.h"
#include "forms/form_citation.h"
#include "FormDocument.h"
#include "forms/form_document.h"
#include "ControlError.h"
#include "FormError.h"
#include "forms/form_error.h"
#include "ControlERT.h"
#include "FormERT.h"
#include "forms/form_ert.h"
#include "ControlExternal.h"
#include "FormExternal.h"
#include "forms/form_external.h"
#include "ControlFloat.h"
#include "FormFloat.h"
#include "forms/form_float.h"
#include "ControlForks.h"
#include "FormForks.h"
#include "forms/form_forks.h"
#include "ControlGraphics.h"
#include "FormGraphics.h"
#include "forms/form_graphics.h"
#include "ControlInclude.h"
#include "FormInclude.h"
#include "forms/form_include.h"
#include "ControlIndex.h"
#include "FormIndex.h"
#include "forms/form_index.h"
#include "ControlLog.h"
#include "FormLog.h"
#include "ControlShowFile.h"
#include "FormShowFile.h"
void Dialogs::showAboutlyx() void Dialogs::showAboutlyx()
{ {
pimpl_->dialog(pimpl_->aboutlyx).controller().show(); pimpl_->aboutlyx.controller().show();
} }
void Dialogs::showBibitem(InsetCommand * ic) void Dialogs::showBibitem(InsetCommand * ic)
{ {
pimpl_->dialog(pimpl_->bibitem).controller().showInset(ic); pimpl_->bibitem.controller().showInset(ic);
} }
void Dialogs::showBibtex(InsetCommand * ic) void Dialogs::showBibtex(InsetCommand * ic)
{ {
pimpl_->dialog(pimpl_->bibtex).controller().showInset(ic); pimpl_->bibtex.controller().showInset(ic);
} }
void Dialogs::showCharacter() void Dialogs::showCharacter()
{ {
pimpl_->dialog(pimpl_->character).controller().show(); pimpl_->character.controller().show();
} }
void Dialogs::setUserFreeFont() void Dialogs::setUserFreeFont()
{ {
pimpl_->dialog(pimpl_->character).controller().apply(); pimpl_->character.controller().apply();
} }
void Dialogs::showCitation(InsetCommand * ic) void Dialogs::showCitation(InsetCommand * ic)
{ {
pimpl_->dialog(pimpl_->citation).controller().showInset(ic); pimpl_->citation.controller().showInset(ic);
} }
void Dialogs::createCitation(string const & s) void Dialogs::createCitation(string const & s)
{ {
pimpl_->dialog(pimpl_->citation).controller().createInset(s); pimpl_->citation.controller().createInset(s);
} }
void Dialogs::showDocument() void Dialogs::showDocument()
{ {
pimpl_->dialog(pimpl_->document).show(); pimpl_->document.show();
} }
void Dialogs::showError(InsetError * ie) void Dialogs::showError(InsetError * ie)
{ {
pimpl_->dialog(pimpl_->error).controller().showInset(ie); pimpl_->error.controller().showInset(ie);
} }
void Dialogs::showERT(InsetERT * ie) void Dialogs::showERT(InsetERT * ie)
{ {
pimpl_->dialog(pimpl_->ert).controller().showInset(ie); pimpl_->ert.controller().showInset(ie);
} }
void Dialogs::updateERT(InsetERT * ie) void Dialogs::updateERT(InsetERT * ie)
{ {
pimpl_->dialog(pimpl_->ert).controller().showInset(ie); pimpl_->ert.controller().showInset(ie);
} }
void Dialogs::showExternal(InsetExternal * ie) void Dialogs::showExternal(InsetExternal * ie)
{ {
pimpl_->dialog(pimpl_->external).controller().showInset(ie); pimpl_->external.controller().showInset(ie);
} }
void Dialogs::showFile(string const & f) void Dialogs::showFile(string const & f)
{ {
pimpl_->dialog(pimpl_->file).controller().showFile(f); pimpl_->file.controller().showFile(f);
} }
void Dialogs::showFloat(InsetFloat * ifl) void Dialogs::showFloat(InsetFloat * ifl)
{ {
pimpl_->dialog(pimpl_->floats).controller().showInset(ifl); pimpl_->floats.controller().showInset(ifl);
} }
void Dialogs::showForks() void Dialogs::showForks()
{ {
pimpl_->dialog(pimpl_->forks).controller().show(); pimpl_->forks.controller().show();
} }
void Dialogs::showGraphics(InsetGraphics * ig) void Dialogs::showGraphics(InsetGraphics * ig)
{ {
pimpl_->dialog(pimpl_->graphics).controller().showInset(ig); pimpl_->graphics.controller().showInset(ig);
} }
void Dialogs::showInclude(InsetInclude * ii) void Dialogs::showInclude(InsetInclude * ii)
{ {
pimpl_->dialog(pimpl_->include).controller().showInset(ii); pimpl_->include.controller().showInset(ii);
} }
void Dialogs::showIndex(InsetCommand * ic) void Dialogs::showIndex(InsetCommand * ic)
{ {
pimpl_->dialog(pimpl_->index).controller().showInset(ic); pimpl_->index.controller().showInset(ic);
} }
void Dialogs::createIndex() void Dialogs::createIndex()
{ {
pimpl_->dialog(pimpl_->index).controller().createInset(string()); pimpl_->index.controller().createInset(string());
} }
void Dialogs::showLogFile() void Dialogs::showLogFile()
{ {
pimpl_->dialog(pimpl_->logfile).controller().show(); pimpl_->logfile.controller().show();
}
void Dialogs::showMathPanel()
{
pimpl_->mathpanel.show();
}
void Dialogs::showMinipage(InsetMinipage * im)
{
pimpl_->minipage.controller().showInset(im);
}
void Dialogs::updateMinipage(InsetMinipage * im)
{
pimpl_->minipage.controller().showInset(im);
}
void Dialogs::showParagraph()
{
pimpl_->paragraph.controller().show();
}
void Dialogs::updateParagraph()
{
pimpl_->paragraph.controller().changedParagraph();
}
void Dialogs::showPreamble()
{
pimpl_->preamble.controller().show();
}
void Dialogs::showPreferences()
{
pimpl_->preferences.show();
}
void Dialogs::showPrint()
{
pimpl_->print.controller().show();
}
void Dialogs::showRef(InsetCommand * ic)
{
pimpl_->ref.controller().showInset(ic);
}
void Dialogs::createRef(string const & s)
{
pimpl_->ref.controller().createInset(s);
}
void Dialogs::showSearch()
{
pimpl_->search.controller().show();
}
void Dialogs::showSendto()
{
pimpl_->sendto.controller().show();
}
void Dialogs::showSpellchecker()
{
pimpl_->spellchecker.controller().show();
}
void Dialogs::showTabular(InsetTabular * it)
{
pimpl_->tabular.showInset(it);
}
void Dialogs::updateTabular(InsetTabular * it)
{
pimpl_->tabular.updateInset(it);
}
void Dialogs::showTabularCreate()
{
pimpl_->tabularcreate.controller().show();
}
void Dialogs::showTexinfo()
{
pimpl_->texinfo.controller().show();
}
#ifdef HAVE_LIBAIKSAURUS
void Dialogs::showThesaurus(string const & s)
{
pimpl_->thesaurus.controller().showEntry(s);
}
#else
void Dialogs::showThesaurus(string const &)
{}
#endif
void Dialogs::showTOC(InsetCommand * ic)
{
pimpl_->toc.controller().showInset(ic);
}
void Dialogs::createTOC(string const & s)
{
pimpl_->toc.controller().createInset(s);
}
void Dialogs::showUrl(InsetCommand * ic)
{
pimpl_->url.controller().showInset(ic);
}
void Dialogs::createUrl(string const & s)
{
pimpl_->url.controller().createInset(s);
}
void Dialogs::showVCLogFile()
{
pimpl_->vclogfile.controller().show();
} }

253
src/frontends/xforms/Dialogs3.C
View File

@ -1,253 +0,0 @@
/**
* \file xforms/Dialogs2.C
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team.
* See the file COPYING.
*
* \author Allan Rae, rae@lyx.org
* \author Angus Leeming <leeming@lyx.org>
*/
#include <config.h>
#ifdef __GNUG__
#pragma implementation
#endif
#include "Dialogs_impl.h"
#include "Tooltips.h"
#include "xformsBC.h"
#include "combox.h"
#include "FormBrowser.h"
#include "forms/form_browser.h"
#include "FormMathsBitmap.h"
#include "FormMathsPanel.h"
#include "forms/form_maths_panel.h"
#include "FormMathsDeco.h"
#include "forms/form_maths_deco.h"
#include "FormMathsDelim.h"
#include "forms/form_maths_delim.h"
#include "FormMathsMatrix.h"
#include "forms/form_maths_matrix.h"
#include "FormMathsSpace.h"
#include "forms/form_maths_space.h"
#include "FormMathsStyle.h"
#include "forms/form_maths_style.h"
#include "ControlMinipage.h"
#include "FormMinipage.h"
#include "forms/form_minipage.h"
#include "ControlParagraph.h"
#include "FormParagraph.h"
#include "forms/form_paragraph.h"
#include "ControlPreamble.h"
#include "FormPreamble.h"
#include "forms/form_preamble.h"
#include "FormPreferences.h"
#include "forms/form_preferences.h"
#include "ControlPrint.h"
#include "FormPrint.h"
#include "forms/form_print.h"
#include "ControlRef.h"
#include "FormRef.h"
#include "forms/form_ref.h"
#include "ControlSearch.h"
#include "FormSearch.h"
#include "forms/form_search.h"
#include "ControlSendto.h"
#include "FormSendto.h"
#include "forms/form_sendto.h"
#include "ControlSpellchecker.h"
#include "FormSpellchecker.h"
#include "forms/form_spellchecker.h"
#include "FormTabular.h"
#include "forms/form_tabular.h"
#include "ControlTabularCreate.h"
#include "FormTabularCreate.h"
#include "forms/form_tabular_create.h"
#include "ControlTexinfo.h"
#include "FormTexinfo.h"
#include "forms/form_texinfo.h"
#ifdef HAVE_LIBAIKSAURUS
#include "ControlThesaurus.h"
#include "FormThesaurus.h"
#include "forms/form_thesaurus.h"
#endif
#include "ControlToc.h"
#include "FormToc.h"
#include "forms/form_toc.h"
#include "ControlUrl.h"
#include "FormUrl.h"
#include "forms/form_url.h"
#include "ControlVCLog.h"
#include "FormVCLog.h"
void Dialogs::showMathPanel()
{
pimpl_->dialog(pimpl_->mathpanel).show();
}
void Dialogs::showMinipage(InsetMinipage * im)
{
pimpl_->dialog(pimpl_->minipage).controller().showInset(im);
}
void Dialogs::updateMinipage(InsetMinipage * im)
{
pimpl_->dialog(pimpl_->minipage).controller().showInset(im);
}
void Dialogs::showParagraph()
{
pimpl_->dialog(pimpl_->paragraph).controller().show();
}
void Dialogs::updateParagraph()
{
pimpl_->dialog(pimpl_->paragraph).controller().changedParagraph();
}
void Dialogs::showPreamble()
{
pimpl_->dialog(pimpl_->preamble).controller().show();
}
void Dialogs::showPreferences()
{
pimpl_->dialog(pimpl_->preferences).show();
}
void Dialogs::showPrint()
{
pimpl_->dialog(pimpl_->print).controller().show();
}
void Dialogs::showRef(InsetCommand * ic)
{
pimpl_->dialog(pimpl_->ref).controller().showInset(ic);
}
void Dialogs::createRef(string const & s)
{
pimpl_->dialog(pimpl_->ref).controller().createInset(s);
}
void Dialogs::showSearch()
{
pimpl_->dialog(pimpl_->search).controller().show();
}
void Dialogs::showSendto()
{
pimpl_->dialog(pimpl_->sendto).controller().show();
}
void Dialogs::showSpellchecker()
{
pimpl_->dialog(pimpl_->spellchecker).controller().show();
}
void Dialogs::showTabular(InsetTabular * it)
{
pimpl_->dialog(pimpl_->tabular).showInset(it);
}
void Dialogs::updateTabular(InsetTabular * it)
{
pimpl_->dialog(pimpl_->tabular).updateInset(it);
}
void Dialogs::showTabularCreate()
{
pimpl_->dialog(pimpl_->tabularcreate).controller().show();
}
void Dialogs::showTexinfo()
{
pimpl_->dialog(pimpl_->texinfo).controller().show();
}
#ifdef HAVE_LIBAIKSAURUS
void Dialogs::showThesaurus(string const & s)
{
pimpl_->dialog(pimpl_->thesaurus).controller().showEntry(s);
}
#else
void Dialogs::showThesaurus(string const &)
{}
#endif
void Dialogs::showTOC(InsetCommand * ic)
{
pimpl_->dialog(pimpl_->toc).controller().showInset(ic);
}
void Dialogs::createTOC(string const & s)
{
pimpl_->dialog(pimpl_->toc).controller().createInset(s);
}
void Dialogs::showUrl(InsetCommand * ic)
{
pimpl_->dialog(pimpl_->url).controller().showInset(ic);
}
void Dialogs::createUrl(string const & s)
{
pimpl_->dialog(pimpl_->url).controller().createInset(s);
}
void Dialogs::showVCLogFile()
{
pimpl_->dialog(pimpl_->vclogfile).controller().show();
}

320
src/frontends/xforms/Dialogs_impl.h
View File

@ -16,82 +16,156 @@
#include "Dialogs.h" #include "Dialogs.h"
#include "controllers/GUI.h" #include "controllers/GUI.h"
#include <boost/scoped_ptr.hpp> #include "Tooltips.h"
#include "xformsBC.h"
#include "combox.h"
#include "ControlAboutlyx.h"
#include "FormAboutlyx.h"
#include "forms/form_aboutlyx.h"
class ControlAboutlyx; #include "ControlBibitem.h"
class ControlBibitem; #include "FormBibitem.h"
class ControlBibtex; #include "forms/form_bibitem.h"
class ControlCharacter;
class ControlCitation;
class ControlError;
class ControlERT;
class ControlExternal;
class ControlShowFile;
class ControlFloat;
class ControlForks;
class ControlGraphics;
class ControlInclude;
class ControlIndex;
class ControlLog;
class ControlMinipage;
class ControlParagraph;
class ControlPreamble;
class ControlPrint;
class ControlRef;
class ControlSearch;
class ControlSendto;
class ControlSpellchecker;
class ControlTabularCreate;
class ControlTexinfo;
class ControlToc;
class ControlUrl;
class ControlVCLog;
class FormAboutlyx; #include "ControlBibtex.h"
class FormBibitem; #include "FormBibtex.h"
class FormBibtex; #include "forms/form_bibtex.h"
class FormCharacter;
class FormCitation; #include "FormBrowser.h"
class FormDocument; #include "forms/form_browser.h"
class FormError;
class FormERT; #include "ControlCharacter.h"
class FormExternal; #include "FormCharacter.h"
class FormShowFile; #include "forms/form_character.h"
class FormFloat;
class FormForks; #include "ControlCitation.h"
class FormGraphics; #include "FormCitation.h"
class FormInclude; #include "forms/form_citation.h"
class FormIndex;
class FormLog; #include "FormDocument.h"
class FormMathsPanel; #include "forms/form_document.h"
class FormMinipage;
class FormParagraph; #include "ControlError.h"
class FormPreamble; #include "FormError.h"
class FormPreferences; #include "forms/form_error.h"
class FormPrint;
class FormRef; #include "ControlERT.h"
class FormSearch; #include "FormERT.h"
class FormSendto; #include "forms/form_ert.h"
class FormSpellchecker;
class FormTabular; #include "ControlExternal.h"
class FormTabularCreate; #include "FormExternal.h"
class FormTexinfo; #include "forms/form_external.h"
class FormToc;
class FormUrl; #include "ControlFloat.h"
class FormVCLog; #include "FormFloat.h"
#include "forms/form_float.h"
#include "ControlForks.h"
#include "FormForks.h"
#include "forms/form_forks.h"
#include "ControlGraphics.h"
#include "FormGraphics.h"
#include "forms/form_graphics.h"
#include "ControlInclude.h"
#include "FormInclude.h"
#include "forms/form_include.h"
#include "ControlIndex.h"
#include "FormIndex.h"
#include "forms/form_index.h"
#include "ControlLog.h"
#include "FormLog.h"
#include "ControlShowFile.h"
#include "FormShowFile.h"
#include "FormMathsBitmap.h"
#include "FormMathsPanel.h"
#include "forms/form_maths_panel.h"
#include "FormMathsDeco.h"
#include "forms/form_maths_deco.h"
#include "FormMathsDelim.h"
#include "forms/form_maths_delim.h"
#include "FormMathsMatrix.h"
#include "forms/form_maths_matrix.h"
#include "FormMathsSpace.h"
#include "forms/form_maths_space.h"
#include "FormMathsStyle.h"
#include "forms/form_maths_style.h"
#include "ControlMinipage.h"
#include "FormMinipage.h"
#include "forms/form_minipage.h"
#include "ControlParagraph.h"
#include "FormParagraph.h"
#include "forms/form_paragraph.h"
#include "ControlPreamble.h"
#include "FormPreamble.h"
#include "forms/form_preamble.h"
#include "FormPreferences.h"
#include "forms/form_preferences.h"
#include "ControlPrint.h"
#include "FormPrint.h"
#include "forms/form_print.h"
#include "ControlRef.h"
#include "FormRef.h"
#include "forms/form_ref.h"
#include "ControlSearch.h"
#include "FormSearch.h"
#include "forms/form_search.h"
#include "ControlSendto.h"
#include "FormSendto.h"
#include "forms/form_sendto.h"
#include "ControlSpellchecker.h"
#include "FormSpellchecker.h"
#include "forms/form_spellchecker.h"
#include "FormTabular.h"
#include "forms/form_tabular.h"
#include "ControlTabularCreate.h"
#include "FormTabularCreate.h"
#include "forms/form_tabular_create.h"
#include "ControlTexinfo.h"
#include "FormTexinfo.h"
#include "forms/form_texinfo.h"
#ifdef HAVE_LIBAIKSAURUS #ifdef HAVE_LIBAIKSAURUS
class ControlThesaurus; #include "ControlThesaurus.h"
class FormThesaurus; #include "FormThesaurus.h"
#include "forms/form_thesaurus.h"
#endif #endif
class OkCancelPolicy; #include "ControlToc.h"
class OkApplyCancelPolicy; #include "FormToc.h"
class OkCancelReadOnlyPolicy; #include "forms/form_toc.h"
class OkApplyCancelReadOnlyPolicy;
class NoRepeatedApplyReadOnlyPolicy; #include "ControlUrl.h"
class xformsBC; #include "FormUrl.h"
#include "forms/form_url.h"
#include "ControlVCLog.h"
#include "FormVCLog.h"
typedef GUI<ControlAboutlyx, FormAboutlyx, OkCancelPolicy, xformsBC> typedef GUI<ControlAboutlyx, FormAboutlyx, OkCancelPolicy, xformsBC>
@ -103,12 +177,10 @@ BibitemDialog;
typedef GUI<ControlBibtex, FormBibtex, OkCancelReadOnlyPolicy, xformsBC> typedef GUI<ControlBibtex, FormBibtex, OkCancelReadOnlyPolicy, xformsBC>
BibtexDialog; BibtexDialog;
typedef GUI<ControlCharacter, FormCharacter, typedef GUI<ControlCharacter, FormCharacter, OkApplyCancelReadOnlyPolicy, xformsBC>
OkApplyCancelReadOnlyPolicy, xformsBC>
CharacterDialog; CharacterDialog;
typedef GUI<ControlCitation, FormCitation, typedef GUI<ControlCitation, FormCitation, NoRepeatedApplyReadOnlyPolicy, xformsBC>
NoRepeatedApplyReadOnlyPolicy, xformsBC>
CitationDialog; CitationDialog;
typedef FormDocument DocumentDialog; typedef FormDocument DocumentDialog;
@ -119,8 +191,7 @@ ErrorDialog;
typedef GUI<ControlERT, FormERT, NoRepeatedApplyReadOnlyPolicy, xformsBC> typedef GUI<ControlERT, FormERT, NoRepeatedApplyReadOnlyPolicy, xformsBC>
ERTDialog; ERTDialog;
typedef GUI<ControlExternal, FormExternal, typedef GUI<ControlExternal, FormExternal, OkApplyCancelReadOnlyPolicy, xformsBC>
OkApplyCancelReadOnlyPolicy, xformsBC>
ExternalDialog; ExternalDialog;
typedef GUI<ControlShowFile, FormShowFile, OkCancelPolicy, xformsBC> typedef GUI<ControlShowFile, FormShowFile, OkCancelPolicy, xformsBC>
@ -132,8 +203,7 @@ FloatDialog;
typedef GUI<ControlForks, FormForks, OkApplyCancelPolicy, xformsBC> typedef GUI<ControlForks, FormForks, OkApplyCancelPolicy, xformsBC>
ForksDialog; ForksDialog;
typedef GUI<ControlGraphics, FormGraphics, typedef GUI<ControlGraphics, FormGraphics, NoRepeatedApplyReadOnlyPolicy, xformsBC>
NoRepeatedApplyReadOnlyPolicy, xformsBC>
GraphicsDialog; GraphicsDialog;
typedef GUI<ControlInclude, FormInclude, OkCancelReadOnlyPolicy, xformsBC> typedef GUI<ControlInclude, FormInclude, OkCancelReadOnlyPolicy, xformsBC>
@ -147,16 +217,13 @@ LogFileDialog;
typedef FormMathsPanel MathPanelDialog; typedef FormMathsPanel MathPanelDialog;
typedef GUI<ControlMinipage, FormMinipage, typedef GUI<ControlMinipage, FormMinipage, NoRepeatedApplyReadOnlyPolicy, xformsBC>
NoRepeatedApplyReadOnlyPolicy, xformsBC>
MinipageDialog; MinipageDialog;
typedef GUI<ControlParagraph, FormParagraph, typedef GUI<ControlParagraph, FormParagraph, OkApplyCancelReadOnlyPolicy, xformsBC>
OkApplyCancelReadOnlyPolicy, xformsBC>
ParagraphDialog; ParagraphDialog;
typedef GUI<ControlPreamble, FormPreamble, typedef GUI<ControlPreamble, FormPreamble, NoRepeatedApplyReadOnlyPolicy, xformsBC>
NoRepeatedApplyReadOnlyPolicy, xformsBC>
PreambleDialog; PreambleDialog;
typedef FormPreferences PreferencesDialog; typedef FormPreferences PreferencesDialog;
@ -173,22 +240,19 @@ SearchDialog;
typedef GUI<ControlSendto, FormSendto, OkApplyCancelPolicy, xformsBC> typedef GUI<ControlSendto, FormSendto, OkApplyCancelPolicy, xformsBC>
SendtoDialog; SendtoDialog;
typedef GUI<ControlSpellchecker, FormSpellchecker, typedef GUI<ControlSpellchecker, FormSpellchecker, NoRepeatedApplyReadOnlyPolicy, xformsBC>
NoRepeatedApplyReadOnlyPolicy, xformsBC>
SpellcheckerDialog; SpellcheckerDialog;
typedef FormTabular TabularDialog; typedef FormTabular TabularDialog;
typedef GUI<ControlTabularCreate, FormTabularCreate, typedef GUI<ControlTabularCreate, FormTabularCreate, OkApplyCancelReadOnlyPolicy, xformsBC>
OkApplyCancelReadOnlyPolicy, xformsBC>
TabularCreateDialog; TabularCreateDialog;
typedef GUI<ControlTexinfo, FormTexinfo, OkCancelPolicy, xformsBC> typedef GUI<ControlTexinfo, FormTexinfo, OkCancelPolicy, xformsBC>
TexinfoDialog; TexinfoDialog;
#ifdef HAVE_LIBAIKSAURUS #ifdef HAVE_LIBAIKSAURUS
typedef GUI<ControlThesaurus, FormThesaurus, typedef GUI<ControlThesaurus, FormThesaurus, OkApplyCancelReadOnlyPolicy, xformsBC>
OkApplyCancelReadOnlyPolicy, xformsBC>
ThesaurusDialog; ThesaurusDialog;
#endif #endif
@ -204,55 +268,43 @@ VCLogFileDialog;
struct Dialogs::Impl { struct Dialogs::Impl {
Impl(LyXView & lv, Dialogs & d); Impl(LyXView & lv, Dialogs & d);
template <typename T> AboutlyxDialog aboutlyx;
T & dialog(boost::scoped_ptr<T> & var) BibitemDialog bibitem;
{ BibtexDialog bibtex;
if (!var.get()) CharacterDialog character;
var.reset(new T(lv_, d_)); CitationDialog citation;
return *var; DocumentDialog document;
} ErrorDialog error;
ERTDialog ert;
boost::scoped_ptr<AboutlyxDialog> aboutlyx; ExternalDialog external;
boost::scoped_ptr<BibitemDialog> bibitem; FileDialog file;
boost::scoped_ptr<BibtexDialog> bibtex; FloatDialog floats;
boost::scoped_ptr<CharacterDialog> character; ForksDialog forks;
boost::scoped_ptr<CitationDialog> citation; GraphicsDialog graphics;
boost::scoped_ptr<DocumentDialog> document; IncludeDialog include;
boost::scoped_ptr<ErrorDialog> error; IndexDialog index;
boost::scoped_ptr<ERTDialog> ert; LogFileDialog logfile;
boost::scoped_ptr<ExternalDialog> external; MathPanelDialog mathpanel;
boost::scoped_ptr<FileDialog> file; MinipageDialog minipage;
boost::scoped_ptr<FloatDialog> floats; ParagraphDialog paragraph;
boost::scoped_ptr<ForksDialog> forks; PreambleDialog preamble;
boost::scoped_ptr<GraphicsDialog> graphics; PreferencesDialog preferences;
boost::scoped_ptr<IncludeDialog> include; PrintDialog print;
boost::scoped_ptr<IndexDialog> index; RefDialog ref;
boost::scoped_ptr<LogFileDialog> logfile; SearchDialog search;
boost::scoped_ptr<MathPanelDialog> mathpanel; SendtoDialog sendto;
boost::scoped_ptr<MinipageDialog> minipage; SpellcheckerDialog spellchecker;
boost::scoped_ptr<ParagraphDialog> paragraph; TabularDialog tabular;
boost::scoped_ptr<PreambleDialog> preamble; TabularCreateDialog tabularcreate;
boost::scoped_ptr<PreferencesDialog> preferences; TexinfoDialog texinfo;
boost::scoped_ptr<PrintDialog> print;
boost::scoped_ptr<RefDialog> ref;
boost::scoped_ptr<SearchDialog> search;
boost::scoped_ptr<SendtoDialog> sendto;
boost::scoped_ptr<SpellcheckerDialog> spellchecker;
boost::scoped_ptr<TabularDialog> tabular;
boost::scoped_ptr<TabularCreateDialog> tabularcreate;
boost::scoped_ptr<TexinfoDialog> texinfo;
#ifdef HAVE_LIBAIKSAURUS #ifdef HAVE_LIBAIKSAURUS
boost::scoped_ptr<ThesaurusDialog> thesaurus; ThesaurusDialog thesaurus;
#endif #endif
boost::scoped_ptr<TocDialog> toc; TocDialog toc;
boost::scoped_ptr<UrlDialog> url; UrlDialog url;
boost::scoped_ptr<VCLogFileDialog> vclogfile; VCLogFileDialog vclogfile;
private:
LyXView & lv_;
Dialogs & d_;
}; };
#endif // DIALOGS_IMPL_H #endif // DIALOGS_IMPL_H

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

@ -49,7 +49,6 @@ libxforms_la_SOURCES = \
ColorHandler.h \ ColorHandler.h \
Dialogs.C \ Dialogs.C \
Dialogs2.C \ Dialogs2.C \
Dialogs3.C \
Dialogs_impl.h \ Dialogs_impl.h \
DropDown.h \ DropDown.h \
DropDown.C \ DropDown.C \