anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 15:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the much faster forOutliner also to get the tooltip text.

Browse Source
This commit is contained in:
Richard Heck 2015-11-26 15:21:21 -05:00
parent a5ea77410e
commit cf64064db7
7 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Paragraph.cpp
View File

@ -3269,8 +3269,6 @@ void Paragraph::forOutliner(docstring & os, size_t const maxlen,
char_type const c = d->text_[i];
if (isPrintable(c))
os += c;
else if (c == '\t' || c == '\n')
os += ' ';
else if (c == META_INSET)
getInset(i)->forOutliner(os, tmplen, false);
}

2
src/insets/Inset.h
View File

@ -74,7 +74,7 @@ std::string insetName(InsetCode);
/// Eg, insetDisplayName(BRANCH_CODE) == _("Branch")
docstring insetDisplayName(InsetCode);
///
static int const TOC_ENTRY_LENGTH = 128;
static int const TOC_ENTRY_LENGTH = 120;
/// Common base class to all insets

12
src/insets/InsetBranch.cpp
View File

@ -356,11 +356,15 @@ void InsetBranch::addToToc(DocIterator const & cpit, bool output_active,
{
DocIterator pit = cpit;
pit.push_back(CursorSlice(const_cast<InsetBranch &>(*this)));
docstring tooltip;
text().forOutliner(tooltip, TOC_ENTRY_LENGTH);
docstring str = params_.branch + ": " + tooltip;
tooltip = support::wrapParas(tooltip, 0, 60, 2);
shared_ptr<Toc> toc = buffer().tocBackend().toc("branch");
docstring str = params_.branch + ": ";
text().forOutliner(str, TOC_ENTRY_LENGTH);
toc->push_back(TocItem(pit, 0, str, output_active, toolTipText(docstring(), 3, 60)));
toc->push_back(TocItem(pit, 0, str, output_active, tooltip));
// Proceed with the rest of the inset.
bool const doing_output = output_active && isBranchSelected();
InsetCollapsable::addToToc(cpit, doing_output, utype);

13
src/insets/InsetFoot.cpp
View File

@ -26,6 +26,7 @@
#include "support/debug.h"
#include "support/docstream.h"
#include "support/gettext.h"
#include "support/lstrings.h"
using namespace std;
@ -79,11 +80,15 @@ void InsetFoot::addToToc(DocIterator const & cpit, bool output_active,
{
DocIterator pit = cpit;
pit.push_back(CursorSlice(const_cast<InsetFoot &>(*this)));
docstring tooltip;
text().forOutliner(tooltip, TOC_ENTRY_LENGTH);
docstring str = custom_label_ + ": " + tooltip;
tooltip = support::wrapParas(tooltip, 0, 60, 2);
shared_ptr<Toc> toc = buffer().tocBackend().toc("footnote");
docstring str = custom_label_ + ": ";
text().forOutliner(str, TOC_ENTRY_LENGTH);
toc->push_back(TocItem(pit, 0, str, output_active, toolTipText(docstring(), 3, 60)));
toc->push_back(TocItem(pit, 0, str, output_active, tooltip));
// Proceed with the rest of the inset.
InsetFootlike::addToToc(cpit, output_active, utype);
}

11
src/insets/InsetMarginal.cpp
View File

@ -20,6 +20,7 @@
#include "support/docstream.h"
#include "support/gettext.h"
#include "support/lstrings.h"
namespace lyx {
@ -57,10 +58,14 @@ void InsetMarginal::addToToc(DocIterator const & cpit, bool output_active,
DocIterator pit = cpit;
pit.push_back(CursorSlice(const_cast<InsetMarginal &>(*this)));
docstring tooltip;
text().forOutliner(tooltip, TOC_ENTRY_LENGTH);
docstring const str = tooltip;
tooltip = support::wrapParas(tooltip, 0, 60, 2);
shared_ptr<Toc> toc = buffer().tocBackend().toc("marginalnote");
docstring str;
text().forOutliner(str, TOC_ENTRY_LENGTH);
toc->push_back(TocItem(pit, 0, str, output_active, toolTipText(docstring(), 3, 60)));
toc->push_back(TocItem(pit, 0, str, output_active, tooltip));
// Proceed with the rest of the inset.
InsetFootlike::addToToc(cpit, output_active, utype);
}

12
src/insets/InsetNote.cpp
View File

@ -37,6 +37,7 @@
#include "support/debug.h"
#include "support/docstream.h"
#include "support/gettext.h"
#include "support/lstrings.h"
#include "support/Translator.h"
#include "frontends/Application.h"
@ -213,11 +214,14 @@ void InsetNote::addToToc(DocIterator const & cpit, bool output_active,
DocIterator pit = cpit;
pit.push_back(CursorSlice(const_cast<InsetNote &>(*this)));
shared_ptr<Toc> toc = buffer().tocBackend().toc("note");
InsetLayout const & il = getLayout();
docstring str = translateIfPossible(il.labelstring()) + from_ascii(": ");
text().forOutliner(str, TOC_ENTRY_LENGTH);
toc->push_back(TocItem(pit, 0, str, output_active, toolTipText(docstring(), 3, 60)));
docstring tooltip;
text().forOutliner(tooltip, TOC_ENTRY_LENGTH);
docstring str = translateIfPossible(il.labelstring()) + ": " + tooltip;
tooltip = support::wrapParas(tooltip, 0, 60, 2);
shared_ptr<Toc> toc = buffer().tocBackend().toc("note");
toc->push_back(TocItem(pit, 0, str, output_active, tooltip));
// Proceed with the rest of the inset.
bool doing_output = output_active && producesOutput();

3
src/insets/InsetText.h
View File

@ -201,6 +201,9 @@ public:
/// e.g., "Index: ".
/// \param numlines: the number of lines in the tooltip
/// \param len: length of those lines
/// NOTE This routine is kind of slow. It's fine to use it within the
/// GUI, but definitely do not try to use it in updateBuffer or anything
/// of that sort.
docstring toolTipText(docstring prefix = empty_docstring(),
size_t numlines = 5, size_t len = 80) const;