for InsetText, InsetTabular and InsetMinipage.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1828
a592a061-630c-0410-9148-
cb99ea01b6c8
src/frontends/qt2/FileDialog.C
src/frontends/qt2/FormCharacter.C
src/frontends/qt2/FormCitation.C
src/frontends/qt2/FileDialog.C
src/frontends/qt2/FormCharacter.C
src/frontends/qt2/FormCitation.C
-src/frontends/qt2/FormCopyright.C
src/frontends/qt2/FormDocument.C
src/frontends/qt2/FormIndex.C
src/frontends/qt2/FormParagraph.C
src/frontends/qt2/FormDocument.C
src/frontends/qt2/FormIndex.C
src/frontends/qt2/FormParagraph.C
src/frontends/qt2/tabularcreatedlgimpl.C
src/frontends/xforms/combox.C
src/frontends/xforms/FileDialog.C
src/frontends/qt2/tabularcreatedlgimpl.C
src/frontends/xforms/combox.C
src/frontends/xforms/FileDialog.C
-src/frontends/xforms/FormBibitem.C
src/frontends/xforms/form_bibitem.C
src/frontends/xforms/form_bibitem.C
-src/frontends/xforms/FormBibtex.C
+src/frontends/xforms/FormBibitem.C
src/frontends/xforms/form_bibtex.C
src/frontends/xforms/form_bibtex.C
+src/frontends/xforms/FormBibtex.C
src/frontends/xforms/form_browser.C
src/frontends/xforms/form_browser.C
-src/frontends/xforms/FormCharacter.C
src/frontends/xforms/form_character.C
src/frontends/xforms/form_character.C
-src/frontends/xforms/FormCitation.C
+src/frontends/xforms/FormCharacter.C
src/frontends/xforms/form_citation.C
src/frontends/xforms/form_citation.C
-src/frontends/xforms/FormCopyright.C
+src/frontends/xforms/FormCitation.C
src/frontends/xforms/form_copyright.C
src/frontends/xforms/form_copyright.C
-src/frontends/xforms/FormCredits.C
+src/frontends/xforms/FormCopyright.C
src/frontends/xforms/form_credits.C
src/frontends/xforms/form_credits.C
-src/frontends/xforms/FormDocument.C
+src/frontends/xforms/FormCredits.C
src/frontends/xforms/form_document.C
src/frontends/xforms/form_document.C
-src/frontends/xforms/FormError.C
+src/frontends/xforms/FormDocument.C
src/frontends/xforms/form_error.C
src/frontends/xforms/form_error.C
-src/frontends/xforms/FormExternal.C
+src/frontends/xforms/FormError.C
src/frontends/xforms/form_external.C
src/frontends/xforms/form_external.C
-src/frontends/xforms/FormFiledialog.C
+src/frontends/xforms/FormExternal.C
src/frontends/xforms/form_filedialog.C
src/frontends/xforms/form_filedialog.C
-src/frontends/xforms/FormGraphics.C
+src/frontends/xforms/FormFiledialog.C
src/frontends/xforms/form_graphics.C
src/frontends/xforms/form_graphics.C
-src/frontends/xforms/FormInclude.C
+src/frontends/xforms/FormGraphics.C
src/frontends/xforms/form_include.C
src/frontends/xforms/form_include.C
-src/frontends/xforms/FormIndex.C
+src/frontends/xforms/FormInclude.C
src/frontends/xforms/form_index.C
src/frontends/xforms/form_index.C
+src/frontends/xforms/FormIndex.C
src/frontends/xforms/FormLog.C
src/frontends/xforms/FormMathsBitmap.C
src/frontends/xforms/FormLog.C
src/frontends/xforms/FormMathsBitmap.C
-src/frontends/xforms/FormMathsDeco.C
src/frontends/xforms/form_maths_deco.C
src/frontends/xforms/form_maths_deco.C
-src/frontends/xforms/FormMathsDelim.C
+src/frontends/xforms/FormMathsDeco.C
src/frontends/xforms/form_maths_delim.C
src/frontends/xforms/form_maths_delim.C
-src/frontends/xforms/FormMathsMatrix.C
+src/frontends/xforms/FormMathsDelim.C
src/frontends/xforms/form_maths_matrix.C
src/frontends/xforms/form_maths_matrix.C
-src/frontends/xforms/FormMathsPanel.C
+src/frontends/xforms/FormMathsMatrix.C
src/frontends/xforms/form_maths_panel.C
src/frontends/xforms/form_maths_panel.C
-src/frontends/xforms/FormMathsSpace.C
+src/frontends/xforms/FormMathsPanel.C
src/frontends/xforms/form_maths_space.C
src/frontends/xforms/form_maths_space.C
-src/frontends/xforms/FormMinipage.C
+src/frontends/xforms/FormMathsSpace.C
src/frontends/xforms/form_minipage.C
src/frontends/xforms/form_minipage.C
-src/frontends/xforms/FormParagraph.C
+src/frontends/xforms/FormMinipage.C
src/frontends/xforms/form_paragraph.C
src/frontends/xforms/form_paragraph.C
-src/frontends/xforms/FormPreamble.C
+src/frontends/xforms/FormParagraph.C
src/frontends/xforms/form_preamble.C
src/frontends/xforms/form_preamble.C
-src/frontends/xforms/FormPreferences.C
+src/frontends/xforms/FormPreamble.C
src/frontends/xforms/form_preferences.C
src/frontends/xforms/form_preferences.C
-src/frontends/xforms/FormPrint.C
+src/frontends/xforms/FormPreferences.C
src/frontends/xforms/form_print.C
src/frontends/xforms/form_print.C
-src/frontends/xforms/FormRef.C
+src/frontends/xforms/FormPrint.C
src/frontends/xforms/form_ref.C
src/frontends/xforms/form_ref.C
-src/frontends/xforms/FormSearch.C
+src/frontends/xforms/FormRef.C
src/frontends/xforms/form_search.C
src/frontends/xforms/form_search.C
-src/frontends/xforms/FormTabular.C
+src/frontends/xforms/FormSearch.C
src/frontends/xforms/form_tabular.C
src/frontends/xforms/form_tabular.C
-src/frontends/xforms/FormTabularCreate.C
+src/frontends/xforms/FormTabular.C
src/frontends/xforms/form_tabular_create.C
src/frontends/xforms/form_tabular_create.C
-src/frontends/xforms/FormToc.C
+src/frontends/xforms/FormTabularCreate.C
src/frontends/xforms/form_toc.C
src/frontends/xforms/form_toc.C
-src/frontends/xforms/FormUrl.C
+src/frontends/xforms/FormToc.C
src/frontends/xforms/form_url.C
src/frontends/xforms/form_url.C
+src/frontends/xforms/FormUrl.C
src/frontends/xforms/FormVCLog.C
src/frontends/xforms/input_validators.C
src/frontends/xforms/Menubar_pimpl.C
src/frontends/xforms/FormVCLog.C
src/frontends/xforms/input_validators.C
src/frontends/xforms/Menubar_pimpl.C
+2001-03-26 Juergen Vigna <jug@sad.it>
+
+ * lyxinset.h: added ShowInsetDialog() function in UpdatableInset.
+
+ * insettext.C (ShowInsetDialog): implemented above function.
+
+ * insettabular.C (ShowInsetDialog): ditto
+
+ * insetminipage.C (ShowInsetDialog): ditto
+
2001-03-23 Angus Leeming <a.leeming@ic.ac.uk>
* insetinclude.[Ch]: rename InsetInclude::InsetIncludeParams as
2001-03-23 Angus Leeming <a.leeming@ic.ac.uk>
* insetinclude.[Ch]: rename InsetInclude::InsetIncludeParams as
+bool InsetMinipage::ShowInsetDialog(BufferView * bv) const
+{
+ if (!inset->ShowInsetDialog(bv))
+ bv->owner()->getDialogs()->showMinipage(const_cast<InsetMinipage *>(this));
+ return true;
+}
+
+
void InsetMinipage::InsetButtonRelease(BufferView * bv, int x, int y,
int button)
{
if (button == 3) {
void InsetMinipage::InsetButtonRelease(BufferView * bv, int x, int y,
int button)
{
if (button == 3) {
-#if 0
-// we have to check first if we have a locking inset and if this locking inset
-// has a popup menu with the 3rd button
- if (the_locking_inset) {
- UpdatableInset * i;
- if ((i=the_locking_inset->GetFirstLockingInsetOfType(TABULAR_CODE))) {
- i->InsetButtonRelease(bv, x, y, button);
- return;
- }
- }
-#endif
- bv->owner()->getDialogs()->showMinipage(this);
return;
}
InsetCollapsable::InsetButtonRelease(bv, x, y, button);
return;
}
InsetCollapsable::InsetButtonRelease(bv, x, y, button);
int getMaxWidth(Painter &, UpdatableInset const *) const;
///
bool needFullRow() const { return false; }
int getMaxWidth(Painter &, UpdatableInset const *) const;
///
bool needFullRow() const { return false; }
+ ///
+ bool ShowInsetDialog(BufferView *) const;
private:
///
Position pos_;
private:
///
Position pos_;
ShowInsetCursor(bv);
return result;
}
ShowInsetCursor(bv);
return result;
}
+ // this to avoid compiler warnings.
+ default:
+ break;
}
if (the_locking_inset) {
}
if (the_locking_inset) {
+bool InsetTabular::ShowInsetDialog(BufferView * bv) const
+{
+ if (!the_locking_inset || !the_locking_inset->ShowInsetDialog(bv))
+ bv->owner()->getDialogs()->showTabular(const_cast<InsetTabular *>(this));
+ return true;
+}
+
+
void InsetTabular::OpenLayoutDialog(BufferView * bv) const
{
if (the_locking_inset) {
void InsetTabular::OpenLayoutDialog(BufferView * bv) const
{
if (the_locking_inset) {
///
void OpenLayoutDialog(BufferView *) const;
///
///
void OpenLayoutDialog(BufferView *) const;
///
+ bool ShowInsetDialog(BufferView *) const;
+ ///
LyXFunc::func_status getStatus(string const & argument) const;
//
LyXFunc::func_status getStatus(string const & argument) const;
//
+bool InsetText::ShowInsetDialog(BufferView * bv) const
+{
+ if (the_locking_inset)
+ return the_locking_inset->ShowInsetDialog(bv);
+ return false;
+}
+
+
void InsetText::SetFont(BufferView * bv, LyXFont const & font, bool toggleall)
{
if (TEXT(bv)->selection) {
void InsetText::SetFont(BufferView * bv, LyXFont const & font, bool toggleall)
{
if (TEXT(bv)->selection) {
///
void resizeLyXText(BufferView *) const;
///
///
void resizeLyXText(BufferView *) const;
///
+ bool ShowInsetDialog(BufferView *) const;
+ ///
LyXParagraph * par;
///
mutable int need_update;
LyXParagraph * par;
///
mutable int need_update;
virtual int getMaxWidth(Painter & pain, UpdatableInset const *) const;
///
int scroll() const { return scx; }
virtual int getMaxWidth(Painter & pain, UpdatableInset const *) const;
///
int scroll() const { return scx; }
+ ///
+ virtual bool ShowInsetDialog(BufferView *) const { return false; }