summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
5eb7add)
56 files changed:
docstring Inset::contextMenu(BufferView const &, int, int) const
docstring Inset::contextMenu(BufferView const &, int, int) const
+{
+ return contextMenuName();
+}
+
+
+docstring Inset::contextMenuName() const
/// This default implementation returns an empty string.
virtual docstring toolTip(BufferView const & bv, int x, int y) const;
/// This default implementation returns an empty string.
virtual docstring toolTip(BufferView const & bv, int x, int y) const;
+ /// \return Context menu identifier. This function determines
+ /// whose Inset's menu should be shown for the given position.
+ virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+
/// \return Context menu identifier for this inset.
/// This default implementation returns an empty string.
/// \return Context menu identifier for this inset.
/// This default implementation returns an empty string.
- virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+ virtual docstring contextMenuName() const;
+
// FIXME This should really disappear in favor of
// docstring name() const { return from_ascii(insetName(lyxCode()))); }
// FIXME This should really disappear in favor of
// docstring name() const { return from_ascii(insetName(lyxCode()))); }
-docstring InsetBibtex::contextMenu(BufferView const &, int, int) const
+docstring InsetBibtex::contextMenuName() const
{
return from_ascii("context-bibtex");
}
{
return from_ascii("context-bibtex");
}
///
docstring xhtml(XHTMLStream &, OutputParams const &) const;
///
///
docstring xhtml(XHTMLStream &, OutputParams const &) const;
///
- docstring contextMenu(BufferView const &, int, int) const;
+ docstring contextMenuName() const;
//@}
/// \name Static public methods obligated for InsetCommand derived classes
//@}
/// \name Static public methods obligated for InsetCommand derived classes
-docstring InsetBox::contextMenu(BufferView const &, int, int) const
+docstring InsetBox::contextMenuName() const
{
return from_ascii("context-box");
}
{
return from_ascii("context-box");
}
/// used by the constructors
void init();
///
/// used by the constructors
void init();
///
- docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
///
InsetBoxParams params_;
///
InsetBoxParams params_;
-docstring InsetBranch::contextMenu(BufferView const &, int, int) const
+docstring InsetBranch::contextMenuName() const
{
return from_ascii("context-branch");
}
{
return from_ascii("context-branch");
}
///
void validate(LaTeXFeatures &) const;
///
///
void validate(LaTeXFeatures &) const;
///
- docstring contextMenu(BufferView const &, int, int) const;
+ docstring contextMenuName() const;
///
void addToToc(DocIterator const &);
///
///
void addToToc(DocIterator const &);
///
-docstring InsetCitation::contextMenu(BufferView const &, int, int) const
+docstring InsetCitation::contextMenuName() const
{
return from_ascii("context-citation");
}
{
return from_ascii("context-citation");
}
///
void addToToc(DocIterator const &);
///
///
void addToToc(DocIterator const &);
///
- docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
//@}
/// \name Static public methods obligated for InsetCommand derived classes
//@}
/// \name Static public methods obligated for InsetCommand derived classes
int y) const
{
if (decoration() == InsetLayout::CONGLOMERATE)
int y) const
{
if (decoration() == InsetLayout::CONGLOMERATE)
- return from_ascii("context-conglomerate");
+ return contextMenuName();
if (geometry(bv) == NoButton)
if (geometry(bv) == NoButton)
- return from_ascii("context-collapsable");
+ return contextMenuName();
Dimension dim = dimensionCollapsed(bv);
if (x < xo(bv) + dim.wid && y < yo(bv) + dim.des)
Dimension dim = dimensionCollapsed(bv);
if (x < xo(bv) + dim.wid && y < yo(bv) + dim.des)
- return from_ascii("context-collapsable");
+ return contextMenuName();
+
+ return InsetText::contextMenuName();
+}
- return InsetText::contextMenu(bv, x, y);
+
+docstring InsetCollapsable::contextMenuName() const
+{
+ if (decoration() == InsetLayout::CONGLOMERATE)
+ return from_ascii("context-conglomerate");
+ else
+ return from_ascii("context-collapsable");
///
virtual bool usePlainLayout() const { return true; }
///
///
virtual bool usePlainLayout() const { return true; }
///
- virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenu(BufferView const & bv, int x, int y) const;
+ ///
+ docstring contextMenuName() const;
///
docstring floatName(std::string const & type) const;
protected:
///
docstring floatName(std::string const & type) const;
protected:
-docstring InsetCommand::contextMenu(BufferView const &, int, int) const
+docstring InsetCommand::contextMenuName() const
{
return from_ascii("context-") + from_ascii(insetName(p_.code()));
}
{
return from_ascii("context-") + from_ascii(insetName(p_.code()));
}
/// \name Methods relaying to the InsetCommandParams p_
//@{
///
/// \name Methods relaying to the InsetCommandParams p_
//@{
///
- docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
///
bool showInsetDialog(BufferView * bv) const;
///
///
bool showInsetDialog(BufferView * bv) const;
///
///
static std::string params2string(CollapseStatus);
///
static std::string params2string(CollapseStatus);
- docstring contextMenu(BufferView const &, int, int) const
+ docstring contextMenuName() const
{ return from_ascii("context-ert"); }
private:
///
{ return from_ascii("context-ert"); }
private:
///
-docstring InsetExternal::contextMenu(BufferView const &, int, int) const
+docstring InsetExternal::contextMenuName() const
{
return from_ascii("context-external");
}
{
return from_ascii("context-external");
}
/// \returns the number of rows (\n's) of generated code.
int latex(odocstream &, OutputParams const &) const;
///
/// \returns the number of rows (\n's) of generated code.
int latex(odocstream &, OutputParams const &) const;
///
- docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
///
bool setMouseHover(BufferView const * bv, bool mouse_hover);
///
///
bool setMouseHover(BufferView const * bv, bool mouse_hover);
///
-docstring InsetGraphics::contextMenu(BufferView const &, int, int) const
+docstring InsetGraphics::contextMenuName() const
{
return from_ascii("context-graphics");
}
{
return from_ascii("context-graphics");
}
///
void addToToc(DocIterator const &);
///
///
void addToToc(DocIterator const &);
///
- docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
/// Force inset into LTR environment if surroundings are RTL
bool forceLTR() const { return true; }
///
/// Force inset into LTR environment if surroundings are RTL
bool forceLTR() const { return true; }
///
-docstring InsetHyperlink::contextMenu(BufferView const &, int, int) const
+docstring InsetHyperlink::contextMenuName() const
{
return from_ascii("context-hyperlink");
}
{
return from_ascii("context-hyperlink");
}
///
docstring toolTip(BufferView const & bv, int x, int y) const;
///
///
docstring toolTip(BufferView const & bv, int x, int y) const;
///
- docstring contextMenu(BufferView const &, int, int) const;
+ docstring contextMenuName() const;
///
void validate(LaTeXFeatures &) const;
///
///
void validate(LaTeXFeatures &) const;
///
-docstring InsetInclude::contextMenu(BufferView const &, int, int) const
+docstring InsetInclude::contextMenuName() const
{
return from_ascii("context-include");
}
{
return from_ascii("context-include");
}
///
void updateBuffer(ParIterator const &, UpdateType);
///
///
void updateBuffer(ParIterator const &, UpdateType);
///
- docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
//@}
/// \name Static public methods obligated for InsetCommand derived classes
//@}
/// \name Static public methods obligated for InsetCommand derived classes
-docstring InsetIndex::contextMenu(BufferView const &, int, int) const
+docstring InsetIndex::contextMenuName() const
{
return from_ascii("context-index");
}
{
return from_ascii("context-index");
}
-docstring InsetPrintIndex::contextMenu(BufferView const &, int, int) const
+docstring InsetPrintIndex::contextMenuName() const
{
return buffer().masterBuffer()->params().use_indices ?
from_ascii("context-indexprint") : docstring();
{
return buffer().masterBuffer()->params().use_indices ?
from_ascii("context-indexprint") : docstring();
/// Updates needed features for this inset.
void validate(LaTeXFeatures & features) const;
///
/// Updates needed features for this inset.
void validate(LaTeXFeatures & features) const;
///
- docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
///
Inset * clone() const { return new InsetIndex(*this); }
///
Inset * clone() const { return new InsetIndex(*this); }
///
bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
///
///
bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
///
- docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
/// Updates needed features for this inset.
void validate(LaTeXFeatures & features) const;
///
/// Updates needed features for this inset.
void validate(LaTeXFeatures & features) const;
///
-docstring InsetInfo::contextMenu(BufferView const &, int, int) const
+docstring InsetInfo::contextMenuName() const
{
return from_ascii("context-info");
}
{
return from_ascii("context-info");
}
///
docstring toolTip(BufferView const & bv, int x, int y) const;
///
///
docstring toolTip(BufferView const & bv, int x, int y) const;
///
- docstring contextMenu(BufferView const &, int, int) const;
+ docstring contextMenuName() const;
/// should paragraph indendation be ommitted in any case?
bool neverIndent() const { return true; }
/// should paragraph indendation be ommitted in any case?
bool neverIndent() const { return true; }
-docstring InsetListings::contextMenu(BufferView const &, int, int) const
+docstring InsetListings::contextMenuName() const
{
return from_ascii("context-listings");
}
{
return from_ascii("context-listings");
}
///
InsetListingsParams & params() { return params_; }
///
///
InsetListingsParams & params() { return params_; }
///
- docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
///
void doDispatch(Cursor & cur, FuncRequest & cmd);
///
///
void doDispatch(Cursor & cur, FuncRequest & cmd);
///
-docstring InsetNewline::contextMenu(BufferView const &, int, int) const
+docstring InsetNewline::contextMenuName() const
{
return from_ascii("context-newline");
}
{
return from_ascii("context-newline");
}
///
ColorCode ColorName() const;
///
///
ColorCode ColorName() const;
///
- docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
///
Inset * clone() const { return new InsetNewline(*this); }
///
///
Inset * clone() const { return new InsetNewline(*this); }
///
-docstring InsetNewpage::contextMenu(BufferView const &, int, int) const
+docstring InsetNewpage::contextMenuName() const
{
return from_ascii("context-newpage");
}
{
return from_ascii("context-newpage");
}
///
ColorCode ColorName() const;
///
///
ColorCode ColorName() const;
///
- docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
///
Inset * clone() const { return new InsetNewpage(*this); }
///
///
Inset * clone() const { return new InsetNewpage(*this); }
///
-docstring InsetPrintNomencl::contextMenu(BufferView const &, int, int) const
+docstring InsetPrintNomencl::contextMenuName() const
{
return from_ascii("context-nomenclprint");
}
{
return from_ascii("context-nomenclprint");
}
///
int latex(odocstream &, OutputParams const &) const;
///
///
int latex(odocstream &, OutputParams const &) const;
///
- docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
//@}
/// \name Static public methods obligated for InsetCommand derived classes
//@}
/// \name Static public methods obligated for InsetCommand derived classes
-docstring InsetNote::contextMenu(BufferView const &, int, int) const
+docstring InsetNote::contextMenuName() const
{
return from_ascii("context-note");
}
{
return from_ascii("context-note");
}
/// used by the constructors
void init();
///
/// used by the constructors
void init();
///
- docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
///
friend class InsetNoteParams;
///
friend class InsetNoteParams;
-docstring InsetPhantom::contextMenu(BufferView const &, int, int) const
+docstring InsetPhantom::contextMenuName() const
{
return from_ascii("context-phantom");
}
{
return from_ascii("context-phantom");
}
/// used by the constructors
void init();
///
/// used by the constructors
void init();
///
- docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
///
friend class InsetPhantomParams;
///
friend class InsetPhantomParams;
bool descendable(BufferView const & /*bv*/) const { return true; }
bool descendable(BufferView const & /*bv*/) const { return true; }
- docstring contextMenu(BufferView const &, int, int) const
+ docstring contextMenuName() const
{ return from_ascii("context-preview"); }
void metrics(MetricsInfo & mi, Dimension & dim) const;
{ return from_ascii("context-preview"); }
void metrics(MetricsInfo & mi, Dimension & dim) const;
-docstring InsetScript::contextMenu(BufferView const &, int, int) const
+docstring InsetScript::contextMenuName() const
{
return from_ascii("context-script");
}
{
return from_ascii("context-script");
}
///
Inset * clone() const { return new InsetScript(*this); }
///
///
Inset * clone() const { return new InsetScript(*this); }
///
- docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
//@}
/// \name Public functions inherited from InsetText class
//@}
/// \name Public functions inherited from InsetText class
-docstring InsetSpace::contextMenu(BufferView const &, int, int) const
+docstring InsetSpace::contextMenuName() const
{
return from_ascii("context-space");
}
{
return from_ascii("context-space");
}
// a line separator)?
bool isSpace() const { return true; }
///
// a line separator)?
bool isSpace() const { return true; }
///
- docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
///
bool clickable(int /* x */, int /* y */) const { return true; }
protected:
///
bool clickable(int /* x */, int /* y */) const { return true; }
protected:
-docstring InsetTabular::contextMenu(BufferView const &, int, int) const
+docstring InsetTabular::contextMenuName() const
{
// FIXME: depending on the selection state, we could offer a different menu.
return from_ascii("context-tabular");
{
// FIXME: depending on the selection state, we could offer a different menu.
return from_ascii("context-tabular");
///
InsetCode lyxCode() const { return TABULAR_CODE; }
///
///
InsetCode lyxCode() const { return TABULAR_CODE; }
///
- docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
/// get offset of this cursor slice relative to our upper left corner
void cursorPos(BufferView const & bv, CursorSlice const & sl,
bool boundary, int & x, int & y) const;
/// get offset of this cursor slice relative to our upper left corner
void cursorPos(BufferView const & bv, CursorSlice const & sl,
bool boundary, int & x, int & y) const;
-docstring InsetText::contextMenu(BufferView const &, int, int) const
+docstring InsetText::contextMenuName() const
{
return from_ascii("context-edit");
}
{
return from_ascii("context-edit");
}
docstring toolTipText(docstring prefix = empty_docstring()) const;
///
docstring toolTipText(docstring prefix = empty_docstring()) const;
///
- virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
///
void doDispatch(Cursor & cur, FuncRequest & cmd);
protected:
///
void doDispatch(Cursor & cur, FuncRequest & cmd);
protected:
-docstring InsetVSpace::contextMenu(BufferView const &, int, int) const
+docstring InsetVSpace::contextMenuName() const
{
return from_ascii("context-vspace");
}
{
return from_ascii("context-vspace");
}
///
bool hasSettings() const { return true; }
///
///
bool hasSettings() const { return true; }
///
- docstring contextMenu(BufferView const & bv, int x, int y) const;
+ docstring contextMenuName() const;
///
static void string2params(std::string const &, VSpace &);
///
///
static void string2params(std::string const &, VSpace &);
///
-docstring InsetMathHull::contextMenu(BufferView const &, int, int) const
+docstring InsetMathHull::contextMenuName() const
{
return from_ascii("context-math");
}
{
return from_ascii("context-math");
}
void recordLocation(DocIterator const & di);
///
void recordLocation(DocIterator const & di);
///
- virtual docstring contextMenu(BufferView const &, int, int) const;
+ docstring contextMenuName() const;
///
InsetCode lyxCode() const { return MATH_HULL_CODE; }
///
InsetCode lyxCode() const { return MATH_HULL_CODE; }
-docstring InsetMathSpace::contextMenu(BufferView const &, int, int) const
+docstring InsetMathSpace::contextMenuName() const
{
return from_ascii("context-mathspace");
}
{
return from_ascii("context-mathspace");
}
///
bool hasSettings() const { return true; }
///
///
bool hasSettings() const { return true; }
///
- docstring contextMenu(BufferView const &, int, int) const;
+ docstring contextMenuName() const;
///
bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
///
///
bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
///
-docstring MathMacroTemplate::contextMenu(BufferView const &, int, int) const
+docstring MathMacroTemplate::contextMenuName() const
{
return from_ascii("context-math-macro-definition");
}
{
return from_ascii("context-math-macro-definition");
}
///
void infoize(odocstream & os) const;
///
///
void infoize(odocstream & os) const;
///
- docstring contextMenu(BufferView const &, int, int) const;
+ docstring contextMenuName() const;
protected:
///
virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
protected:
///
virtual void doDispatch(Cursor & cur, FuncRequest & cmd);