mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-23 10:18:50 +00:00
The uncontroversial part of Michael Schmitt's minipage cleanup (removal of the gnome/gtk stuff and the forgotten MINIPAGE_CODE)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8250 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
d7aad4e806
commit
1ebd651ad6
@ -1,3 +1,10 @@
|
||||
2003-12-14 Michael Schmitt <michael.schmitt@teststep.org>
|
||||
|
||||
* Dialogs.C:
|
||||
* Dialogs2.C:
|
||||
* Dialogs_impl.h:
|
||||
* Makefile.am: remove minipage
|
||||
|
||||
2003-10-08 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
Fix doxygen warnings.
|
||||
|
@ -40,7 +40,6 @@ Dialogs::Impl::Impl(LyXView & lv, Dialogs & d)
|
||||
include(lv, d),
|
||||
logfile(lv, d),
|
||||
mathpanel(lv, d),
|
||||
minipage(lv, d),
|
||||
paragraph(lv, d),
|
||||
preamble(lv, d),
|
||||
preferences(lv, d),
|
||||
|
@ -91,17 +91,6 @@ void Dialogs::showMergeChanges()
|
||||
pimpl_->changes.controller().show();
|
||||
}
|
||||
|
||||
void Dialogs::showMinipage(InsetMinipage * im)
|
||||
{
|
||||
pimpl_->minipage.controller().showInset(im);
|
||||
}
|
||||
|
||||
|
||||
void Dialogs::updateMinipage(InsetMinipage * im)
|
||||
{
|
||||
pimpl_->minipage.controller().showInset(im);
|
||||
}
|
||||
|
||||
|
||||
void Dialogs::showParagraph()
|
||||
{
|
||||
|
@ -75,10 +75,6 @@
|
||||
#include "FormMathsPanel.h"
|
||||
#include "forms/form_maths_panel.h"
|
||||
|
||||
#include "ControlMinipage.h"
|
||||
#include "FormMinipage.h"
|
||||
#include "forms/form_minipage.h"
|
||||
|
||||
#include "ControlParagraph.h"
|
||||
#include "FormParagraph.h"
|
||||
#include "forms/form_paragraph.h"
|
||||
@ -178,9 +174,6 @@ LogFileDialog;
|
||||
typedef GUI<ControlMath, FormMathsPanel, OkCancelReadOnlyPolicy, xformsBC>
|
||||
MathPanelDialog;
|
||||
|
||||
typedef GUI<ControlMinipage, FormMinipage, NoRepeatedApplyReadOnlyPolicy, xformsBC>
|
||||
MinipageDialog;
|
||||
|
||||
typedef GUI<ControlParagraph, FormParagraph, OkApplyCancelReadOnlyPolicy, xformsBC>
|
||||
ParagraphDialog;
|
||||
|
||||
@ -237,7 +230,6 @@ struct Dialogs::Impl {
|
||||
IncludeDialog include;
|
||||
LogFileDialog logfile;
|
||||
MathPanelDialog mathpanel;
|
||||
MinipageDialog minipage;
|
||||
ParagraphDialog paragraph;
|
||||
PreambleDialog preamble;
|
||||
PreferencesDialog preferences;
|
||||
|
@ -41,7 +41,6 @@ xforms_objects = \
|
||||
../xforms/FormMathsPanel.lo \
|
||||
../xforms/FormMathsSpace.lo \
|
||||
../xforms/FormMathsStyle.lo \
|
||||
../xforms/FormMinipage.lo \
|
||||
../xforms/FormParagraph.lo \
|
||||
../xforms/FormPreferences.lo \
|
||||
../xforms/FormPrint.lo \
|
||||
@ -98,7 +97,6 @@ xforms_objects = \
|
||||
../xforms/forms/form_maths_panel.lo \
|
||||
../xforms/forms/form_maths_space.lo \
|
||||
../xforms/forms/form_maths_style.lo \
|
||||
../xforms/forms/form_minipage.lo \
|
||||
../xforms/forms/form_paragraph.lo \
|
||||
../xforms/forms/form_preamble.lo \
|
||||
../xforms/forms/form_preferences.lo \
|
||||
|
@ -1,3 +1,8 @@
|
||||
2003-12-14 Michael Schmitt <michael.schmitt@teststep.org>
|
||||
|
||||
* Dialogs.C:
|
||||
* Makefile.am: remove minipage
|
||||
|
||||
2003-10-30 Huang Ying <hying_caritas@163.com>
|
||||
|
||||
* GToolbar.C : change layouts widget update code according xforms
|
||||
|
@ -30,7 +30,6 @@
|
||||
#include "ControlInclude.h"
|
||||
#include "ControlLog.h"
|
||||
#include "ControlMath.h"
|
||||
#include "ControlMinipage.h"
|
||||
#include "ControlNote.h"
|
||||
#include "ControlParagraph.h"
|
||||
#include "ControlRef.h"
|
||||
@ -63,7 +62,6 @@
|
||||
#include "FormMathsMatrix.h"
|
||||
#include "FormMathsSpace.h"
|
||||
#include "FormMathsStyle.h"
|
||||
#include "FormMinipage.h"
|
||||
#include "FormNote.h"
|
||||
#include "FormParagraph.h"
|
||||
#include "FormRef.h"
|
||||
@ -121,7 +119,7 @@ char const * const dialognames[] = { "aboutlyx", "bibitem", "bibtex", "branch",
|
||||
"mathmisc", "mathdots", "mathbigoperators", "mathamsmisc",
|
||||
"mathamsarrows", "mathamsrelations", "mathamsnegatedrelations", "mathamsoperators",
|
||||
"mathdelimiter", "mathmatrix", "mathspace", "mathstyle",
|
||||
"minipage", "note", "paragraph", "ref", "tabular", "tabularcreate", "texinfo",
|
||||
"box", "note", "paragraph", "ref", "tabular", "tabularcreate", "texinfo",
|
||||
|
||||
#ifdef HAVE_LIBAIKSAURUS
|
||||
"thesaurus",
|
||||
@ -411,10 +409,6 @@ Dialog * Dialogs::build(string const & name)
|
||||
dialog->setController(new ControlMath(*dialog));
|
||||
dialog->setView(new FormMathsStyle(*dialog));
|
||||
dialog->bc().bp(new IgnorantPolicy);
|
||||
} else if (name == "minipage") {
|
||||
dialog->setController(new ControlMinipage(*dialog));
|
||||
dialog->setView(new FormMinipage(*dialog));
|
||||
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
|
||||
} else if (name == "note") {
|
||||
dialog->setController(new ControlNote(*dialog));
|
||||
dialog->setView(new FormNote(*dialog));
|
||||
|
@ -98,7 +98,6 @@ xforms_objects = \
|
||||
../xforms/FormMathsMatrix.lo \
|
||||
../xforms/FormMathsSpace.lo \
|
||||
../xforms/FormMathsStyle.lo \
|
||||
../xforms/FormMinipage.lo \
|
||||
../xforms/FormNote.lo \
|
||||
../xforms/FormParagraph.lo \
|
||||
../xforms/FormPreamble.lo \
|
||||
|
@ -95,8 +95,6 @@ public:
|
||||
///
|
||||
WRAP_CODE,
|
||||
///
|
||||
MINIPAGE_CODE,
|
||||
///
|
||||
SPACE_CODE, // 25
|
||||
///
|
||||
SPECIALCHAR_CODE,
|
||||
|
Loading…
Reference in New Issue
Block a user