#5502 add binding for full screen toggle on mac

[lyx.git] / src / graphics / GraphicsCacheItem.cpp

diff --git a/src/graphics/GraphicsCacheItem.cpp b/src/graphics/GraphicsCacheItem.cpp
index bf255444a525c5a227fd4c0a478b011f83d30774..2e8c415f36b6709d849389281d2a084f6e031a64 100644 (file)
--- a/src/graphics/GraphicsCacheItem.cpp
+++ b/src/graphics/GraphicsCacheItem.cpp
@@ -25,8 +25,10 @@
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/FileMonitor.h"
+#include "support/lassert.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
+#include "support/TempFile.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -107,7 +109,7 @@ public:
        bool remove_loaded_file_;
 
        /// The image and its loading status.
-       boost::shared_ptr<Image> image_;
+       shared_ptr<Image> image_;
        ///
        ImageStatus status_;
 
@@ -143,7 +145,9 @@ bool CacheItem::tryDisplayFormat() const
 {
        if (pimpl_->status_ != WaitingToLoad)
                pimpl_->reset();
-       bool const conversion_needed = pimpl_->tryDisplayFormat(FileName(), string());
+       FileName filename;
+       string from;
+       bool const conversion_needed = pimpl_->tryDisplayFormat(filename, from);
        bool const success = status() == Loaded && !conversion_needed;
        if (!success)
                pimpl_->reset();
@@ -206,7 +210,7 @@ CacheItem::Impl::Impl(FileName const & file)
          remove_loaded_file_(false),
          status_(WaitingToLoad)
 {
-       monitor_.connect(boost::bind(&Impl::startLoading, this));
+       monitor_.connect(bind(&Impl::startLoading, this));
 }
 
 
@@ -232,7 +236,7 @@ void CacheItem::Impl::reset()
        file_to_load_.erase();
        to_.erase();
 
-       if (image_.get())
+       if (image_)
                image_.reset();
 
        status_ = WaitingToLoad;
@@ -313,7 +317,7 @@ static string const findTargetFormat(string const & from)
        FormatList const & formats = Cache::get().loadableFormats();
 
         // There must be a format to load from.
-       LASSERT(!formats.empty(), /**/);
+       LASSERT(!formats.empty(), return string());
 
        // Use the standard converter if we don't know the format to load
        // from.
@@ -347,6 +351,7 @@ static string const findTargetFormat(string const & from)
 bool CacheItem::Impl::tryDisplayFormat(FileName & filename, string & from)
 {
        // First, check that the file exists!
+       filename_.refresh();
        if (!filename_.isReadableFile()) {
                if (status_ != ErrorNoFile) {
                        status_ = ErrorNoFile;
@@ -355,10 +360,16 @@ bool CacheItem::Impl::tryDisplayFormat(FileName & filename, string & from)
                return false;
        }
 
-       zipped_ = filename_.isZippedFile();
+       zipped_ = formats.isZippedFile(filename_);
        if (zipped_) {
-               unzipped_filename_ = FileName::tempName(
-                       filename_.toFilesystemEncoding());
+               string tempname = unzippedFileName(filename_.toFilesystemEncoding());
+               string const ext = getExtension(tempname);
+               tempname = changeExtension(tempname, "") + "-XXXXXX";
+               if (!ext.empty())
+                       tempname = addExtension(tempname, ext);
+               TempFile tempfile(tempname);
+               tempfile.setAutoRemove(false);
+               unzipped_filename_ = tempfile.name();
                if (unzipped_filename_.empty()) {
                        status_ = ErrorConverting;
                        LYXERR(Debug::GRAPHICS, "\tCould not create temporary file.");
@@ -369,7 +380,7 @@ bool CacheItem::Impl::tryDisplayFormat(FileName & filename, string & from)
                filename = filename_;
        }
 
-       docstring const displayed_filename = makeDisplayPath(filename_.absFilename());
+       docstring const displayed_filename = makeDisplayPath(filename_.absFileName());
        LYXERR(Debug::GRAPHICS, "[CacheItem::Impl::convertToDisplayFormat]\n"
                << "\tAttempting to convert image file: " << filename
                << "\n\twith displayed filename: " << to_utf8(displayed_filename));
@@ -418,14 +429,16 @@ void CacheItem::Impl::convertToDisplayFormat()
 
        // Add some stuff to create a uniquely named temporary file.
        // This file is deleted in loadImage after it is loaded into memory.
-       FileName const to_file_base = FileName::tempName("CacheItem");
+       TempFile tempfile("CacheItem");
+       tempfile.setAutoRemove(false);
+       FileName const to_file_base = tempfile.name();
        remove_loaded_file_ = true;
 
        // Connect a signal to this->imageConverted and pass this signal to
        // the graphics converter so that we can load the modified file
        // on completion of the conversion process.
-       converter_.reset(new Converter(filename, to_file_base.absFilename(), from, to_));
-       converter_->connect(boost::bind(&Impl::imageConverted, this, _1));
+       converter_.reset(new Converter(filename, to_file_base.absFileName(), from, to_));
+       converter_->connect(bind(&Impl::imageConverted, this, _1));
        converter_->startConversion();
 }