Cache icons of dynamic menu buttons

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

diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp
index a7e37f3ee5e3acfd7f62ce9f0c6698a5d9b003db..de04e4db50ffbd7612daf909b52702f1350e1885 100644 (file)
--- a/src/graphics/PreviewLoader.cpp
+++ b/src/graphics/PreviewLoader.cpp
@@ -19,7 +19,6 @@
 #include "Converter.h"
 #include "Encoding.h"
 #include "Format.h"
-#include "InsetIterator.h"
 #include "LaTeXFeatures.h"
 #include "LyXRC.h"
 #include "output.h"
@@ -29,8 +28,6 @@
 
 #include "frontends/Application.h" // hexName
 
-#include "insets/Inset.h"
-
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/FileName.h"
@@ -183,7 +180,7 @@ public:
        void refreshPreviews();
 
        /// Emit this signal when an image is ready for display.
-       signals2::signal<void(PreviewImage const &)> imageReady;
+       signal<void(PreviewImage const &)> imageReady;
 
        Buffer const & buffer() const { return buffer_; }
 
@@ -193,7 +190,7 @@ private:
        /// Called by the ForkedCall process that generated the bitmap files.
        void finishedGenerating(pid_t, int);
        ///
-       void dumpPreamble(otexstream &, OutputParams::FLAVOR) const;
+       void dumpPreamble(otexstream &, Flavor) const;
        ///
        void dumpData(odocstream &, BitmapFile const &) const;
 
@@ -229,8 +226,6 @@ private:
        ///
        QTimer * delay_refresh_;
        ///
-       Trackable trackable_;
-       ///
        bool finished_generating_;
 
        /// We don't own this
@@ -247,16 +242,10 @@ lyx::Converter const * PreviewLoader::Impl::pconverter_;
 //
 
 PreviewLoader::PreviewLoader(Buffer const & b)
-       : pimpl_(new Impl(*this, b))
+       : pimpl_(make_shared<Impl>(*this, b))
 {}
 
 
-PreviewLoader::~PreviewLoader()
-{
-       delete pimpl_;
-}
-
-
 PreviewImage const * PreviewLoader::preview(string const & latex_snippet) const
 {
        return pimpl_->preview(latex_snippet);
@@ -293,7 +282,7 @@ void PreviewLoader::refreshPreviews()
 }
 
 
-signals2::connection PreviewLoader::connect(slot const & slot) const
+connection PreviewLoader::connect(slot const & slot) const
 {
        return pimpl_->imageReady.connect(slot);
 }
@@ -383,8 +372,8 @@ PreviewLoader::Impl::Impl(PreviewLoader & p, Buffer const & b)
 {
        font_scaling_factor_ = int(buffer_.fontScalingFactor());
        if (theApp()) {
-               fg_color_ = convert(theApp()->hexName(foregroundColor()).c_str(), 16);
-               bg_color_ = convert(theApp()->hexName(backgroundColor()).c_str(), 16);
+               fg_color_ = convert(theApp()->hexName(foregroundColor()), 16);
+               bg_color_ = convert(theApp()->hexName(backgroundColor()), 16);
        } else {
                fg_color_ = 0x0;
                bg_color_ = 0xffffff;
@@ -447,8 +436,8 @@ PreviewLoader::Impl::preview(string const & latex_snippet) const
        int fg = 0x0;
        int bg = 0xffffff;
        if (theApp()) {
-               fg = convert(theApp()->hexName(foregroundColor()).c_str(), 16);
-               bg = convert(theApp()->hexName(backgroundColor()).c_str(), 16);
+               fg = convert(theApp()->hexName(foregroundColor()), 16);
+               bg = convert(theApp()->hexName(backgroundColor()), 16);
        }
        if (font_scaling_factor_ != fs || fg_color_ != fg || bg_color_ != bg) {
                // Schedule refresh of all previews on zoom or color changes.
@@ -640,37 +629,37 @@ void PreviewLoader::Impl::startLoading(bool wait)
                        && buffer_.params().default_output_format != "default";
        // Use LATEX flavor if the document does not specify a specific
        // output format (see bug 9371).
-       OutputParams::FLAVOR flavor = docformat
+       Flavor flavor = docformat
                                        ? buffer_.params().getOutputFlavor()
-                                       : OutputParams::LATEX;
+                                       : Flavor::LaTeX;
        if (buffer_.params().encoding().package() == Encoding::japanese) {
                latexparam = " --latex=platex";
-               flavor = OutputParams::LATEX;
+               flavor = Flavor::LaTeX;
        }
        else if (buffer_.params().useNonTeXFonts) {
-               if (flavor == OutputParams::LUATEX)
+               if (flavor == Flavor::LuaTeX)
                        latexparam = " --latex=lualatex";
                else {
-                       flavor = OutputParams::XETEX;
+                       flavor = Flavor::XeTeX;
                        latexparam = " --latex=xelatex";
                }
        }
        else {
                switch (flavor) {
-                       case OutputParams::PDFLATEX:
+                       case Flavor::PdfLaTeX:
                                latexparam = " --latex=pdflatex";
                                break;
-                       case OutputParams::XETEX:
+                       case Flavor::XeTeX:
                                latexparam = " --latex=xelatex";
                                break;
-                       case OutputParams::LUATEX:
+                       case Flavor::LuaTeX:
                                latexparam = " --latex=lualatex";
                                break;
-                       case OutputParams::DVILUATEX:
+                       case Flavor::DviLuaTeX:
                                latexparam = " --latex=dvilualatex";
                                break;
                        default:
-                               flavor = OutputParams::LATEX;
+                               flavor = Flavor::LaTeX;
                }
        }
        dumpPreamble(os, flavor);
@@ -724,9 +713,12 @@ void PreviewLoader::Impl::startLoading(bool wait)
 
        // Initiate the conversion from LaTeX to bitmap images files.
        ForkedCall::sigPtr convert_ptr = make_shared<ForkedCall::sig>();
-       convert_ptr->connect(ForkedProcess::slot([this](pid_t pid, int retval){
-                               finishedGenerating(pid, retval);
-                       }).track_foreign(trackable_.p()));
+       weak_ptr<PreviewLoader::Impl> this_ = parent_.pimpl_;
+       convert_ptr->connect([this_](pid_t pid, int retval){
+                       if (auto p = this_.lock()) {
+                               p->finishedGenerating(pid, retval);
+                       }
+               });
 
        ForkedCall call(buffer_.filePath());
        int ret = call.startScript(command, convert_ptr);
@@ -814,10 +806,10 @@ void PreviewLoader::Impl::finishedGenerating(pid_t pid, int retval)
 }
 
 
-void PreviewLoader::Impl::dumpPreamble(otexstream & os, OutputParams::FLAVOR flavor) const
+void PreviewLoader::Impl::dumpPreamble(otexstream & os, Flavor flavor) const
 {
        // Dump the preamble only.
-       LYXERR(Debug::LATEX, "dumpPreamble, flavor == " << flavor);
+       LYXERR(Debug::LATEX, "dumpPreamble, flavor == " << static_cast<int>(flavor));
        OutputParams runparams(&buffer_.params().encoding());
        runparams.flavor = flavor;
        runparams.nice = true;
@@ -827,11 +819,11 @@ void PreviewLoader::Impl::dumpPreamble(otexstream & os, OutputParams::FLAVOR fla
        buffer_.writeLaTeXSource(os, buffer_.filePath(), runparams, Buffer::OnlyPreamble);
 
        // FIXME! This is a HACK! The proper fix is to control the 'true'
-       // passed to WriteStream below:
+       // passed to TeXMathStream below:
        // int InsetMathNest::latex(Buffer const &, odocstream & os,
        //                          OutputParams const & runparams) const
        // {
-       //      WriteStream wi(os, runparams.moving_arg, true);
+       //      TeXMathStream wi(os, runparams.moving_arg, true);
        //      par_->write(wi);
        //      return wi.line();
        // }