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

Simplify some of the tooltip stuff now.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36346 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-11-17 16:55:58 +00:00
parent 7d0b98a858
commit 4133f627b2
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/insets/InsetIndex.cpp
View File

@ -288,11 +288,7 @@ docstring InsetIndex::toolTip(BufferView const &, int, int) const
tip += ")";
}
tip += ": ";
OutputParams rp(&buffer().params().encoding());
odocstringstream ods;
InsetText::plaintext(ods, rp);
tip += ods.str();
return wrapParas(tip);
return InsetText::toolTipText(tip);
}

9
src/insets/InsetPhantom.cpp
View File

@ -299,13 +299,10 @@ bool InsetPhantom::getStatus(Cursor & cur, FuncRequest const & cmd,
docstring InsetPhantom::toolTip(BufferView const &, int, int) const
{
OutputParams rp(&buffer().params().encoding());
odocstringstream ods;
InsetCollapsable::plaintext(ods, rp);
docstring content_tip = support::wrapParas(ods.str());
docstring const tip = InsetText::toolTipText();
docstring res = phantomtranslator_loc().find(params_.type);
if (!content_tip.empty())
res += from_ascii(": ") + "\n" + content_tip;
if (!tip.empty())
res += from_ascii(": ") + "\n" + tip;
return res;
}

3
src/insets/InsetText.cpp
View File

@ -820,11 +820,12 @@ docstring InsetText::contextMenu(BufferView const &, int, int) const
}
docstring InsetText::toolTipText() const
docstring InsetText::toolTipText(docstring prefix) const
{
static unsigned int max_length = 400; // five 80 column lines
OutputParams rp(&buffer().params().encoding());
odocstringstream oss;
oss << prefix;
ParagraphList::const_iterator beg = paragraphs().begin();
ParagraphList::const_iterator end = paragraphs().end();

4
src/insets/InsetText.h
View File

@ -191,7 +191,9 @@ public:
///
void completionPosAndDim(Cursor const &, int & x, int & y, Dimension & dim) const;
/// returns the text to be used as tooltip
docstring toolTipText() const;
/// \param prefix: a string that will preced the tooltip,
/// e.g., "Index: ".
docstring toolTipText(docstring prefix = from_ascii("")) const;
///
virtual docstring contextMenu(BufferView const & bv, int x, int y) const;