Added inset-select-all to emacs bindings

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

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index 278168a6ace3f7c4ef494e1cdb344812c884b974..6417013696a3f043dc12ae4ea3ed3014bb2f0583 100644 (file)
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -45,6 +45,7 @@
 #include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
+#include "support/TempFile.h"
 
 #include <sstream>
 #include <vector>
@@ -67,33 +68,39 @@ namespace Alert = frontend::Alert;
 
 namespace external {
 
-TempName::TempName()
+TempName::TempName() : tempfile_(new support::TempFile("lyxextXXXXXX.tmp"))
 {
-       FileName const tempname = FileName::tempName("lyxext");
        // must have an extension for the converter code to work correctly.
-       tempname_ = FileName(tempname.absFileName() + ".tmp");
 }
 
 
-TempName::TempName(TempName const &)
+TempName::TempName(TempName const & that) : tempfile_(0)
 {
-       tempname_ = TempName()();
+       *this = that;
 }
 
 
 TempName::~TempName()
 {
-       tempname_.removeFile();
+       delete tempfile_;
 }
 
 
 TempName & TempName::operator=(TempName const & other)
 {
-       if (this != &other)
-               tempname_ = TempName()();
+       if (this != &other) {
+               delete tempfile_;
+               tempfile_ = new support::TempFile("lyxextXXXXXX.tmp");
+       }
        return *this;
 }
 
+
+support::FileName TempName::operator()() const
+{
+       return tempfile_->name();
+}
+
 } // namespace external
 
 
@@ -542,8 +549,7 @@ static void add_preview_and_start_loading(RenderMonitoredPreview & renderer,
 {
        InsetExternalParams const & params = inset.params();
 
-       if (RenderPreview::status() != LyXRC::PREVIEW_OFF &&
-           isPreviewWanted(params)) {
+       if (RenderPreview::previewText() && isPreviewWanted(params)) {
                renderer.setAbsFile(params.filename);
                docstring const snippet = latexString(inset);
                renderer.addPreview(snippet, buffer);
@@ -577,7 +583,7 @@ void InsetExternal::setParams(InsetExternalParams const & p)
                || !lyxrc.display_graphics
                || params_.preview_mode == PREVIEW_OFF
                || (params_.preview_mode == PREVIEW_INSTANT
-                   && RenderPreview::status() == LyXRC::PREVIEW_OFF)) {
+                   && !RenderPreview::previewText())) {
                RenderButton * button_ptr = renderer_->asButton();
                if (!button_ptr) {
                        renderer_.reset(new RenderButton);
@@ -593,6 +599,7 @@ void InsetExternal::setParams(InsetExternalParams const & p)
                LASSERT(false, return);
                break;
        case PREVIEW_INSTANT: {
+               //FIXME: why is the value below immediately forgotten?
                RenderMonitoredPreview * preview_ptr = renderer_->asMonitoredPreview();
                renderer_.reset(new RenderMonitoredPreview(this));
                preview_ptr = renderer_->asMonitoredPreview();