de.po: fix doubled accelerator keys

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

diff --git a/src/graphics/GraphicsCacheItem.cpp b/src/graphics/GraphicsCacheItem.cpp
index 592e51c5257cdf9c14f77754fd2b77cbbeac291b..ff83f6f7d23ccb96b3a4fd9dc19c3ce789cf035d 100644 (file)
--- a/src/graphics/GraphicsCacheItem.cpp
+++ b/src/graphics/GraphicsCacheItem.cpp
@@ -41,6 +41,13 @@ public:
        ///
        Impl(FileName const & file);
 
+       /**
+        *  If no file conversion is needed, then tryDisplayFormat() calls
+        *  loadImage() directly.
+        * \return true if a conversion is necessary.
+        */
+       bool tryDisplayFormat(FileName & filename, string & from);
+
        /** Start the image conversion process, checking first that it is
         *  necessary. If it is necessary, then a conversion task is started.
         *  CacheItem asumes that the conversion is asynchronous and so
@@ -48,9 +55,6 @@ public:
         *  is finished, this Signal is emitted, returning the converted
         *  file to this->imageConverted.
         *
-        *  If no file conversion is needed, then convertToDisplayFormat() calls
-        *  loadImage() directly.
-        *
         *  convertToDisplayFormat() will set the loading status flag as
         *  approriate through calls to setStatus().
         */
@@ -59,7 +63,7 @@ public:
        /** Load the image into memory. This is called either from
         *  convertToDisplayFormat() direct or from imageConverted().
         */
-       void loadImage();
+       bool loadImage();
 
        /** Get a notification when the image conversion is done.
         *  Connected to a signal on_finish_ which is passed to
@@ -135,6 +139,19 @@ FileName const & CacheItem::filename() const
 }
 
 
+bool CacheItem::tryDisplayFormat() const
+{
+       if (pimpl_->status_ != WaitingToLoad)
+               pimpl_->reset();
+       FileName filename;
+       string from;
+       bool const success = pimpl_->tryDisplayFormat(filename, from);
+       if (!success)
+               pimpl_->reset();
+       return success;
+}
+
+
 void CacheItem::startLoading() const
 {
        pimpl_->startLoading();
@@ -264,15 +281,14 @@ void CacheItem::Impl::imageConverted(bool success)
        // Add the converted file to the file cache
        ConverterCache::get().add(filename_, to_, file_to_load_);
 
-       loadImage();
+       setStatus(loadImage() ? Loaded : ErrorLoading);
 }
 
 
 // This function gets called from the callback after the image has been
 // converted successfully.
-void CacheItem::Impl::loadImage()
+bool CacheItem::Impl::loadImage()
 {
-       setStatus(Loading);
        LYXERR(Debug::GRAPHICS, "Loading image.");
 
        image_.reset(Image::newImage());
@@ -288,13 +304,7 @@ void CacheItem::Impl::loadImage()
        if (remove_loaded_file_ && unzipped_filename_ != file_to_load_)
                file_to_load_.removeFile();
 
-       if (!success) {
-               setStatus(ErrorLoading);
-               return;
-       }
-
-       // Inform the outside world.
-       setStatus(Loaded);
+       return success;
 }
 
 
@@ -335,29 +345,25 @@ static string const findTargetFormat(string const & from)
 }
 
 
-void CacheItem::Impl::convertToDisplayFormat()
+bool CacheItem::Impl::tryDisplayFormat(FileName & filename, string & from)
 {
-       setStatus(Converting);
-
        // First, check that the file exists!
        if (!filename_.isReadableFile()) {
                if (status_ != ErrorNoFile) {
-                       setStatus(ErrorNoFile);
+                       status_ = ErrorNoFile;
                        LYXERR(Debug::GRAPHICS, "\tThe file is not readable");
                }
-               return;
+               return true;
        }
 
-       // Make a local copy in case we unzip it
-       FileName filename;
        zipped_ = filename_.isZippedFile();
        if (zipped_) {
                unzipped_filename_ = FileName::tempName(
                        filename_.toFilesystemEncoding());
                if (unzipped_filename_.empty()) {
-                       setStatus(ErrorConverting);
+                       status_ = ErrorConverting;
                        LYXERR(Debug::GRAPHICS, "\tCould not create temporary file.");
-                       return;
+                       return true;
                }
                filename = unzipFile(filename_, unzipped_filename_.toFilesystemEncoding());
        } else {
@@ -369,9 +375,9 @@ void CacheItem::Impl::convertToDisplayFormat()
                << "\tAttempting to convert image file: " << filename
                << "\n\twith displayed filename: " << to_utf8(displayed_filename));
 
-       string const from = formats.getFormatFromFile(filename);
+       from = formats.getFormatFromFile(filename);
        if (from.empty()) {
-               setStatus(ErrorConverting);
+               status_ = ErrorConverting;
                LYXERR(Debug::GRAPHICS, "\tCould not determine file format.");
        }
        LYXERR(Debug::GRAPHICS, "\n\tThe file contains " << from << " format data.");
@@ -381,28 +387,41 @@ void CacheItem::Impl::convertToDisplayFormat()
                // No conversion needed!
                LYXERR(Debug::GRAPHICS, "\tNo conversion needed (from == to)!");
                file_to_load_ = filename;
-               loadImage();
-               return;
+               status_ = loadImage() ? Loaded : ErrorLoading;
+               return true;
        }
 
        if (ConverterCache::get().inCache(filename, to_)) {
                LYXERR(Debug::GRAPHICS, "\tNo conversion needed (file in file cache)!");
                file_to_load_ = ConverterCache::get().cacheName(filename, to_);
-               loadImage();
-               return;
+               status_ = loadImage() ? Loaded : ErrorLoading;
+               return true;
        }
+       return false;
+}
+
 
+void CacheItem::Impl::convertToDisplayFormat()
+{
        LYXERR(Debug::GRAPHICS, "\tConverting it to " << to_ << " format.");
 
+       // Make a local copy in case we unzip it
+       FileName filename;
+       string from;
+       if (tryDisplayFormat(filename, from)) {
+               // The image status has changed, tell it to the outside world.
+               statusChanged();
+               return;
+       }
+
+       // We will need a conversion, tell it to the outside world.
+       setStatus(Converting);
+
        // 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");
        remove_loaded_file_ = true;
 
-       // Remove the temp file, we only want the name...
-       // FIXME: This is unsafe!
-       to_file_base.removeFile();
-
        // 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.