this, SLOT(change_adaptor()));
connect(browsePB, SIGNAL(clicked()),
this, SLOT(browseClicked()));
+ connect(embedCB, SIGNAL(toggled(bool)),
+ this, SLOT(change_adaptor()));
connect(editPB, SIGNAL(clicked()),
this, SLOT(editClicked()));
connect(externalCO, SIGNAL(activated(QString)),
string const name =
params_.filename.outputFilename(bufferFilepath());
fileED->setText(toqstr(name));
+ embedCB->setCheckState(params_.filename.embedded() ? Qt::Checked : Qt::Unchecked);
externalCO->setCurrentIndex(getTemplateNumber(params_.templatename()));
updateTemplate();
void GuiExternal::applyView()
{
params_.filename.set(fromqstr(fileED->text()), bufferFilepath());
+ params_.filename.setEmbed(embedCB->checkState() == Qt::Checked);
params_.settemplate(getTemplate(externalCO->currentIndex()).lyxName);
void editExternal(InsetExternalParams const & params, Buffer const & buffer)
{
- formats.edit(buffer, params.filename,
+ formats.edit(buffer, params.filename.availableFile(),
formats.getFormatFromFile(params.filename));
}
if (from_checksum != temp_checksum) {
Mover const & mover = getMover(from_format);
- if (!mover.copy(params.filename, temp_file)) {
+ if (!mover.copy(params.filename.availableFile(), temp_file)) {
LYXERR(Debug::EXTERNAL, "external::updateExternal. "
<< "Unable to copy " << params.filename << " to " << temp_file);
return; // FAILURE
ErrorList el;
bool const success =
theConverters().convert(&buffer, temp_file, abs_to_file,
- params.filename, from_format, to_format, el,
+ params.filename.availableFile(), from_format, to_format, el,
Converters::try_default | Converters::try_cache);
if (!success) {
#include "MetricsInfo.h"
#include "OutputParams.h"
+#include "frontends/alert.h"
+
#include "graphics/PreviewLoader.h"
+#include "support/ExceptionMessage.h"
#include "support/filetools.h"
#include "support/lstrings.h"
#include "support/lyxlib.h"
namespace lyx {
+namespace Alert = frontend::Alert;
+
extern bool use_gui;
namespace external {
os << "External\n"
<< "\ttemplate " << templatename() << '\n';
- if (!filename.empty())
+ if (!filename.empty()) {
os << "\tfilename " << filename.outputFilename(buffer.filePath()) << '\n';
-
+ os << "\tembed " << (filename.embedded() ? "true" : "false") << '\n';
+ }
if (display != defaultDisplayType)
os << "\tdisplay "
<< external::displayTranslator().find(display)
enum ExternalTags {
EX_TEMPLATE = 1,
EX_FILENAME,
+ EX_EMBED,
EX_DISPLAY,
EX_LYXSCALE,
EX_DRAFT,
{ "draft", EX_DRAFT},
{ "extra", EX_EXTRA },
{ "filename", EX_FILENAME},
+ { "embed", EX_EMBED},
{ "height", EX_HEIGHT },
{ "keepAspectRatio", EX_KEEPASPECTRATIO },
{ "lyxscale", EX_LYXSCALE},
filename.set(name, buffer.filePath());
break;
}
+
+ case EX_EMBED: {
+ lex.next();
+ filename.setEmbed(lex.getBool());
+ break;
+ }
case EX_DISPLAY: {
lex.next();
Buffer const & buffer = cur.buffer();
InsetExternalParams p;
InsetExternalMailer::string2params(to_utf8(cmd.argument()), buffer, p);
+ if (!p.filename.empty()) {
+ try {
+ p.filename.enable(buffer.embeddedFiles().enabled(), &buffer);
+ } catch (ExceptionMessage const & message) {
+ Alert::error(message.title_, message.details_);
+ // do not set parameter if an error happens
+ break;
+ }
+ }
setParams(p, buffer);
break;
}
void InsetExternal::registerEmbeddedFiles(Buffer const &,
EmbeddedFiles & files) const
{
- // temporarily disable embedding for this inset
- /* files.registerFile(params_.filename, this); */
+ files.registerFile(params_.filename, this);
+}
+
+
+void InsetExternal::updateEmbeddedFile(Buffer const & buf,
+ EmbeddedFile const & file)
+{
+ // when embedding is enabled, change of embedding status leads to actions
+ EmbeddedFile temp = file;
+ temp.enable(buf.embeddedFiles().enabled(), &buf);
+ // this will not be set if an exception is thorwn in enable()
+ params_.filename = temp;
}
{
graphics::Params gparams;
- gparams.filename = eparams.filename;
+ gparams.filename = eparams.filename.availableFile();
+ gparams.icon = eparams.filename.embedded() ? "pin.png" : "";
gparams.scale = eparams.lyxscale;
if (eparams.clipdata.clip)
gparams.bb = eparams.clipdata.bbox;
void InsetExternal::read(Buffer const & buffer, Lexer & lex)
{
InsetExternalParams params;
- if (params.read(buffer, lex))
+ if (params.read(buffer, lex)) {
+ // exception handling is not needed as long as embedded files are in place.
+ params.filename.enable(buffer.embeddedFiles().enabled(), & buffer);
setParams(params, buffer);
+ }
}
std::string const & templatename() const { return templatename_; }
/// The external file.
- support::DocFileName filename;
+ EmbeddedFile filename;
/// How the inset is to be displayed by LyX.
external::DisplayType display;
/// The scale of the displayed graphic (if shown).
bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
/// external file can be embedded
void registerEmbeddedFiles(Buffer const &, EmbeddedFiles &) const;
+ ///
+ void updateEmbeddedFile(Buffer const &, EmbeddedFile const &);
protected:
InsetExternal(InsetExternal const &);