anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 03:03:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* move extended tooltips support to InsetCollapsable (fixes bug 3778).

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24524 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2008-04-27 14:47:07 +00:00
parent ba4d271346
commit fa568e12f0
5 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/insets/InsetCollapsable.cpp
View File

@ -112,13 +112,26 @@ docstring InsetCollapsable::toolTip(BufferView const & bv, int x, int y) const
if (x > xo(bv) + dim.wid || y > yo(bv) + dim.des)
return docstring();
docstring default_tip;
switch (status_) {
case Open:
return _("Left-click to collapse the inset");
default_tip = _("Left-click to collapse the inset");
break;
case Collapsed:
return _("Left-click to open the inset");
default_tip = _("Left-click to open the inset");
break;
}
return docstring();
OutputParams rp(&buffer().params().encoding());
odocstringstream ods;
InsetText::plaintext(ods, rp);
docstring content_tip = ods.str();
// shorten it if necessary
if (content_tip.size() > 200)
content_tip = content_tip.substr(0, 200) + "...";
if (!isOpen() && !content_tip.empty())
return content_tip + '\n' + default_tip;
return default_tip;
}

9
src/insets/InsetFloat.cpp
View File

@ -129,8 +129,15 @@ InsetFloat::~InsetFloat()
docstring InsetFloat::toolTip(BufferView const & bv, int x, int y) const
{
if (InsetCollapsable::toolTip(bv, x, y).empty())
return docstring();
docstring default_tip;
if (isOpen())
default_tip = _("Left-click to collapse the inset");
else
default_tip = _("Left-click to open the inset");
OutputParams rp(&buffer().params().encoding());
docstring default_tip = InsetCollapsable::toolTip(bv, x, y);
docstring caption_tip = getCaptionText(rp);
if (!isOpen() && !caption_tip.empty())
return caption_tip + '\n' + default_tip;

11
src/insets/InsetFoot.cpp
View File

@ -82,15 +82,8 @@ void InsetFoot::addToToc(ParConstIterator const & cpit) const
docstring InsetFoot::toolTip(BufferView const & bv, int x, int y) const
{
docstring default_tip = InsetCollapsable::toolTip(bv, x, y);
OutputParams rp(&buffer().params().encoding());
odocstringstream ods;
InsetText::plaintext(ods, rp);
docstring foot_tip = custom_label_ + ": " + ods.str();
// shorten it if necessary
if (foot_tip.size() > 200)
foot_tip = foot_tip.substr(0, 200) + "...";
if (!isOpen() && !foot_tip.empty())
return foot_tip + '\n' + default_tip;
if (!isOpen())
return custom_label_ + ": " + default_tip;
return default_tip;
}

16
src/insets/InsetMarginal.cpp
View File

@ -38,22 +38,6 @@ docstring InsetMarginal::editMessage() const
}
docstring InsetMarginal::toolTip(BufferView const & bv, int x, int y) const
{
docstring default_tip = InsetCollapsable::toolTip(bv, x, y);
OutputParams rp(&buffer().params().encoding());
odocstringstream ods;
InsetText::plaintext(ods, rp);
docstring margin_tip = ods.str();
// shorten it if necessary
if (margin_tip.size() > 200)
margin_tip = margin_tip.substr(0, 200) + "...";
if (!isOpen() && !margin_tip.empty())
return margin_tip + '\n' + default_tip;
return default_tip;
}
int InsetMarginal::latex(odocstream & os, OutputParams const & runparams) const
{
os << "%\n\\marginpar{";

2
src/insets/InsetMarginal.h
View File

@ -40,8 +40,6 @@ public:
docstring editMessage() const;
///
void addToToc(ParConstIterator const &) const;
///
docstring toolTip(BufferView const & bv, int x, int y) const;
private:
///
Inset * clone() const { return new InsetMarginal(*this); }