Fix text frame drawing.

[lyx.git] / src / insets / InsetExternal.cpp

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index 06733efdd9ebc48489fa656e37bdd5ed35c849e7..31115a4a85b1d4b1e675ea66ea2f3996a8a5c5a6 100644 (file)
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -44,9 +44,7 @@
 
 #include <sstream>
 
-using std::endl;
 using std::string;
-using std::auto_ptr;
 using std::istringstream;
 using std::ostream;
 using std::ostringstream;
@@ -59,7 +57,7 @@ lyx::external::DisplayType const defaultDisplayType = lyx::external::NoDisplay;
 
 unsigned int const defaultLyxScale = 100;
 
-string defaultTemplateName = "RasterImage";
+string defaultTemplateName;
 
 } // namespace anon
 
@@ -132,9 +130,15 @@ Translator<DisplayType, string> const & displayTranslator()
 InsetExternalParams::InsetExternalParams()
        : display(defaultDisplayType),
          lyxscale(defaultLyxScale),
-         draft(false),
-         templatename_(defaultTemplateName)
-{}
+         draft(false)
+{
+       if (defaultTemplateName.empty()) {
+               external::TemplateManager const & etm =
+                       external::TemplateManager::get();
+               templatename_ = etm.getTemplates().begin()->first;
+       } else
+               templatename_ = defaultTemplateName;
+}
 
 
 namespace {
@@ -400,16 +404,16 @@ InsetExternal::InsetExternal()
 
 
 InsetExternal::InsetExternal(InsetExternal const & other)
-       : InsetOld(other),
+       : Inset(other),
          boost::signals::trackable(),
          params_(other.params_),
          renderer_(other.renderer_->clone(this))
 {}
 
 
-auto_ptr<InsetBase> InsetExternal::doClone() const
+Inset * InsetExternal::clone() const
 {
-       return auto_ptr<InsetBase>(new InsetExternal(*this));
+       return new InsetExternal(*this);
 }
 
 
@@ -450,11 +454,12 @@ void InsetExternal::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
 
        case LFUN_MOUSE_RELEASE:
-               InsetExternalMailer(*this).showDialog(&cur.bv());
+               if (!cur.selection())
+                       InsetExternalMailer(*this).showDialog(&cur.bv());
                break;
 
        default:
-               InsetBase::doDispatch(cur, cmd);
+               Inset::doDispatch(cur, cmd);
        }
 }
 
@@ -471,11 +476,18 @@ bool InsetExternal::getStatus(Cursor & cur, FuncRequest const & cmd,
                return true;
 
        default:
-               return InsetBase::getStatus(cur, cmd, flag);
+               return Inset::getStatus(cur, cmd, flag);
        }
 }
 
 
+void InsetExternal::registerEmbeddedFiles(Buffer const &,
+       EmbeddedFiles & files, ParConstIterator const & pit) const
+{
+       files.registerFile(params_.filename.absFilename(), EmbeddedFile::AUTO, pit);
+}
+
+
 void InsetExternal::edit(Cursor & cur, bool)
 {
        InsetExternalMailer(*this).showDialog(&cur.bv());
@@ -576,8 +588,9 @@ docstring const getScreenLabel(InsetExternalParams const & params,
                return support::bformat((_("External template %1$s is not installed")),
                                        from_utf8(params.templatename()));
        // FIXME UNICODE
+       docstring gui = _(ptr->guiName);
        return from_utf8(external::doSubstitution(params, buffer,
-                               ptr->guiName, false));
+                               to_utf8(gui), false));
 }
 
 void add_preview_and_start_loading(RenderMonitoredPreview &,
@@ -674,7 +687,7 @@ void InsetExternal::read(Buffer const & buffer, Lexer & lex)
 
 
 int InsetExternal::latex(Buffer const & buf, odocstream & os,
-                         OutputParams const & runparams) const
+                        OutputParams const & runparams) const
 {
        if (params_.draft) {
                // FIXME UNICODE
@@ -705,37 +718,37 @@ int InsetExternal::latex(Buffer const & buf, odocstream & os,
 
                if (cit != et.formats.end()) {
                        return external::writeExternal(params_, "PDFLaTeX",
-                                                       buf, os,
-                                                       *(runparams.exportdata),
-                                                       external_in_tmpdir,
-                                                       dryrun);
-                }
+                                                      buf, os,
+                                                      *(runparams.exportdata),
+                                                      external_in_tmpdir,
+                                                      dryrun);
+               }
        }
 
        return external::writeExternal(params_, "LaTeX", buf, os,
-                                       *(runparams.exportdata),
-                                       external_in_tmpdir,
-                                       dryrun);
+                                      *(runparams.exportdata),
+                                      external_in_tmpdir,
+                                      dryrun);
 }
 
 
 int InsetExternal::plaintext(Buffer const & buf, odocstream & os,
-                             OutputParams const & runparams) const
+                            OutputParams const & runparams) const
 {
        os << '\n'; // output external material on a new line
        external::writeExternal(params_, "Ascii", buf, os,
-                               *(runparams.exportdata), false,
-                               runparams.dryrun || runparams.inComment);
+                               *(runparams.exportdata), false,
+                               runparams.dryrun || runparams.inComment);
        return PLAINTEXT_NEWLINE;
 }
 
 
 int InsetExternal::docbook(Buffer const & buf, odocstream & os,
-                           OutputParams const & runparams) const
+                          OutputParams const & runparams) const
 {
        return external::writeExternal(params_, "DocBook", buf, os,
                                       *(runparams.exportdata), false,
-                                      runparams.dryrun || runparams.inComment);
+                                      runparams.dryrun || runparams.inComment);
 }
 
 
@@ -877,7 +890,7 @@ void InsetExternalMailer::string2params(string const & in,
                return print_mailer_error("InsetExternalMailer", in, 1, name_);
 
        // This is part of the inset proper that is usually swallowed
-       // by LyXText::readInset
+       // by Text::readInset
        string id;
        lex >> id;
        if (!lex || id != "External")