#include "support/lstrings.h"
#include "support/path.h"
#include "support/syscall.h"
+#include "gettext.h"
using std::endl;
InsetExternal::InsetExternal()
- : view(0)
+ : view_(0)
{
- tempname = lyx::tempName(string(), "lyxext");
+ tempname_ = lyx::tempName(string(), "lyxext");
//ExternalTemplateManager::Templates::const_iterator i1;
params_.templ = ExternalTemplateManager::get().getTemplates().begin()->second;
}
InsetExternal::~InsetExternal()
{
- lyx::unlink(tempname);
+ lyx::unlink(tempname_);
hideDialog();
}
-InsetExternal::InsetExternalParams InsetExternal::params() const
+InsetExternal::Params InsetExternal::params() const
{
return params_;
}
-void InsetExternal::setFromParams(InsetExternalParams const & p)
+void InsetExternal::setFromParams(Params const & p)
{
params_.filename = p.filename;
params_.parameters = p.parameters;
void InsetExternal::Edit(BufferView * bv,
int /*x*/, int /*y*/, unsigned int /*button*/)
{
- view = bv;
- view->owner()->getDialogs()->showExternal(this);
+ view_ = bv;
+ view_->owner()->getDialogs()->showExternal(this);
}
{
InsetExternal * inset = new InsetExternal();
inset->params_ = params_;
+ inset->view_ = view_;
return inset;
}
result = subst(result, "$$Basename", basename);
result = subst(result, "$$Parameters", params_.parameters);
result = ReplaceEnvironmentPath(result);
- result = subst(result, "$$Tempname", tempname);
+ result = subst(result, "$$Tempname", tempname_);
result = subst(result, "$$Sysdir", system_lyxdir);
// Handle the $$Contents(filename) syntax
if (cit == et.formats.end())
return;
- executeCommand(doSubstitution(view->buffer(),
- (*cit).second.updateCommand),
- view->buffer());
+ executeCommand(doSubstitution(view_->buffer(),
+ (*cit).second.updateCommand),
+ view_->buffer());
}
if (et.automaticProduction)
updateExternal();
- executeCommand(doSubstitution(view->buffer(),
- et.viewCommand),
- view->buffer());
+ executeCommand(doSubstitution(view_->buffer(),
+ et.viewCommand),
+ view_->buffer());
}
if (et.automaticProduction)
updateExternal();
- executeCommand(doSubstitution(view->buffer(),
- et.editCommand),
- view->buffer());
+ executeCommand(doSubstitution(view_->buffer(),
+ et.editCommand),
+ view_->buffer());
}
+
+
+bool operator==(InsetExternal::Params const & left,
+ InsetExternal::Params const & right)
+{
+ return ((left.filename == right.filename) &&
+ (left.parameters == right.parameters) &&
+ (left.templ.lyxName == right.templ.lyxName));
+}
+
+
+bool operator!=(InsetExternal::Params const & left,
+ InsetExternal::Params const & right)
+{
+ return !(left == right);
+}
+