#include "InsetCollapsible.h"
#include "Buffer.h"
+#include "BufferParams.h"
#include "BufferView.h"
+#include "CutAndPaste.h"
#include "Cursor.h"
#include "Dimension.h"
+#include "Format.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
#include "InsetLayout.h"
#include "Lexer.h"
#include "MetricsInfo.h"
#include "OutputParams.h"
+#include "TextClass.h"
#include "TocBackend.h"
#include "frontends/FontMetrics.h"
#include "support/lassert.h"
#include "support/lstrings.h"
#include "support/RefChanger.h"
+#include "support/TempFile.h"
using namespace std;
: InsetText(rhs),
status_(rhs.status_),
labelstring_(rhs.labelstring_)
-{}
+{
+ tempfile_.reset();
+}
+
+
+InsetCollapsible & InsetCollapsible::operator=(InsetCollapsible const & that)
+{
+ if (&that == this)
+ return *this;
+ *this = InsetCollapsible(that);
+ return *this;
+}
InsetCollapsible::~InsetCollapsible()
// Draw the change tracking cue on the label, unless RowPainter already
// takes care of it.
if (canPaintChange(bv))
- pi.change_.paintCue(pi, x, y, x + dimc.width(), labelfont);
+ pi.change.paintCue(pi, x, y, x + dimc.width(), labelfont);
} else {
view_[&bv].button_dim_.x1 = 0;
view_[&bv].button_dim_.y1 = 0;
}
// Do not draw the cue for INSERTED -- it is already in the button and
// that's enough.
- Changer dummy = (pi.change_.type == Change::INSERTED)
- ? make_change(pi.change_, Change())
+ Changer cdummy = (pi.change.type == Change::INSERTED)
+ ? make_change(pi.change, Change())
: Changer();
InsetText::draw(pi, textx, texty);
break;
case Corners:
textx = x;
texty = baseline;
- { // We will take care of the frame and the change tracking cue
- // ourselves, below.
- Changer dummy = make_change(pi.change_, Change());
+ // We will take care of the frame and the change tracking cue
+ // ourselves, below.
+ {
+ Changer cdummy = make_change(pi.change, Change());
const_cast<InsetCollapsible *>(this)->setDrawFrame(false);
InsetText::draw(pi, textx, texty);
const_cast<InsetCollapsible *>(this)->setDrawFrame(true);
desc -= 3;
// Colour the frame according to the change type. (Like for tables.)
- Color colour = pi.change_.changed() ? pi.change_.color()
+ Color colour = pi.change.changed() ? pi.change.color()
: Color_foreground;
const int xx1 = x + TEXT_TO_INSET_OFFSET - 1;
const int xx2 = x + textdim.wid - TEXT_TO_INSET_OFFSET + 1;
// the label below the text. Can be toggled.
if (g == SubLabel) {
FontInfo font(getLabelfont());
- if (pi.change_.changed())
+ if (pi.change.changed())
font.setPaintColor(colour);
font.realize(sane_font);
font.decSize();
}
// Strike through the inset if deleted and not already handled by
// RowPainter.
- if (pi.change_.deleted() && canPaintChange(bv))
- pi.change_.paintCue(pi, xx1, y1, xx2, y + desc);
+ if (pi.change.deleted() && canPaintChange(bv))
+ pi.change.paintCue(pi, xx1, y1, xx2, y + desc);
break;
}
}
bool InsetCollapsible::editable() const
{
+ if (tempfile_)
+ return false;
+
switch (decoration()) {
case InsetLayout::CLASSIC:
case InsetLayout::MINIMALISTIC:
bool InsetCollapsible::descendable(BufferView const & bv) const
{
+ if (tempfile_)
+ return false;
+
return geometry(bv) != ButtonOnly;
}
pos_type i = 0;
pos_type j = 0;
for (; i < n && j < p_siz; ++j) {
+ if (paragraphs().begin()->isDeleted(j))
+ continue;
if (paragraphs().begin()->isInset(j)) {
if (!paragraphs().begin()->getInset(j)->isChar())
continue;
if (paragraphs().size() > 1 || (i > 0 && j < p_siz)) {
label << "...";
}
- docstring const lbl = label.str();
- return lbl.empty() ? l : lbl;
+ return label.str().empty() ? l : label.str();
}
{
//lyxerr << "InsetCollapsible: edit xy" << endl;
if (geometry(cur.bv()) == ButtonOnly
+ || !descendable(cur.bv())
|| (view_[&cur.bv()].button_dim_.contains(x, y)
&& geometry(cur.bv()) != NoButton))
return this;
cur.dispatched();
break;
+ case LFUN_INSET_EDIT: {
+ cur.push(*this);
+ text().selectAll(cur);
+ string const format =
+ cur.buffer()->params().documentClass().outputFormat();
+ string const ext = theFormats().extension(format);
+ tempfile_.reset(new support::TempFile("ert_editXXXXXX." + ext));
+ support::FileName const tempfilename = tempfile_->name();
+ string const name = tempfilename.toFilesystemEncoding();
+ ofdocstream os(name.c_str());
+ os << cur.selectionAsString(false);
+ os.close();
+ // Since we lock the inset while the external file is edited,
+ // we need to move the cursor outside and clear any selection inside
+ cur.clearSelection();
+ cur.pop();
+ cur.leaveInset(*this);
+ theFormats().edit(buffer(), tempfilename, format);
+ break;
+ }
+ case LFUN_INSET_END_EDIT: {
+ support::FileName const tempfilename = tempfile_->name();
+ docstring const s = tempfilename.fileContents("UTF-8");
+ cur.recordUndoInset(this);
+ cur.push(*this);
+ text().selectAll(cur);
+ cap::replaceSelection(cur);
+ cur.text()->insertStringAsLines(cur, s, cur.current_font);
+ // FIXME (gb) it crashes without this
+ cur.fixIfBroken();
+ tempfile_.reset();
+ cur.pop();
+ break;
+ }
+
default:
InsetText::doDispatch(cur, cmd);
break;
flag.setEnabled(false);
return true;
+ case LFUN_INSET_EDIT:
+ flag.setEnabled(getLayout().editExternally() && tempfile_ == 0);
+ return true;
+
+ case LFUN_INSET_END_EDIT:
+ flag.setEnabled(getLayout().editExternally() && tempfile_ != 0);
+ return true;
+
default:
return InsetText::getStatus(cur, cmd, flag);
}
docstring const InsetCollapsible::buttonLabel(BufferView const & bv) const
{
+ // indicate changed content in label (#8645)
+ // ✎ U+270E LOWER RIGHT PENCIL
+ docstring const indicator = (isChanged() && geometry(bv) == ButtonOnly)
+ ? docstring(1, 0x270E) : docstring();
InsetLayout const & il = getLayout();
docstring const label = getLabel();
if (!il.contentaslabel() || geometry(bv) != ButtonOnly)
- return label;
- return getNewLabel(label);
+ return indicator + label;
+ return indicator + getNewLabel(label);
}
{
bool doing_output = output_active && producesOutput();
InsetLayout const & layout = getLayout();
- if (layout.addToToc()) {
- TocBuilder & b = backend.builder(layout.tocType());
- // Cursor inside the inset
- DocIterator pit = cpit;
- pit.push_back(CursorSlice(const_cast<InsetCollapsible &>(*this)));
- docstring const label = getLabel();
- b.pushItem(pit, label + (label.empty() ? "" : ": "), output_active);
- // Proceed with the rest of the inset.
- InsetText::addToToc(cpit, doing_output, utype, backend);
- if (layout.isTocCaption()) {
- docstring str;
- text().forOutliner(str, TOC_ENTRY_LENGTH);
- b.argumentItem(str);
- }
- b.pop();
- } else
- InsetText::addToToc(cpit, doing_output, utype, backend);
+ if (!layout.addToToc())
+ return InsetText::addToToc(cpit, doing_output, utype, backend);
+
+ TocBuilder & b = backend.builder(layout.tocType());
+ // Cursor inside the inset
+ DocIterator pit = cpit;
+ pit.push_back(CursorSlice(const_cast<InsetCollapsible &>(*this)));
+ docstring const label = getLabel();
+ b.pushItem(pit, label + (label.empty() ? "" : ": "), output_active);
+ // Proceed with the rest of the inset.
+ InsetText::addToToc(cpit, doing_output, utype, backend);
+ if (layout.isTocCaption()) {
+ docstring str;
+ text().forOutliner(str, TOC_ENTRY_LENGTH);
+ b.argumentItem(str);
+ }
+ b.pop();
}
projects / lyx.git / blobdiff