ws changes only

[lyx.git] / src / insets / insetinclude.h

diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h
index e3bfe8cfe5509449b5435cae84f70536c205e01b..9fda837950f9518eb284da4648b61f7e719a6882 100644 (file)
--- a/src/insets/insetinclude.h
+++ b/src/insets/insetinclude.h
@@ -14,15 +14,16 @@
 
 #include "inset.h"
 #include "insetcommandparams.h"
-#include "renderers.h"
+#include "render_button.h"
 #include <boost/scoped_ptr.hpp>
+#include <boost/weak_ptr.hpp>
 
 
 class Buffer;
 class Dimension;
 struct LaTeXFeatures;
+class RenderMonitoredPreview;
 
-// Created by AAS 970521
 
 /// for including tex/lyx files
 class InsetInclude: public InsetOld {
@@ -42,8 +43,6 @@ public:
        void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
-       ///
-       virtual BufferView * view() const;
 
        /// get the parameters
        InsetCommandParams const & params(void) const;
@@ -55,14 +54,14 @@ public:
         *  \param list the list of labels in the child buffer.
         */
        void getLabelList(Buffer const & buffer,
-                         std::vector<string> & list) const;
+                         std::vector<std::string> & list) const;
        /** Fills \c keys
         *  \param buffer the Buffer containing this inset.
         *  \param keys the list of bibkeys in the child buffer.
         */
        ///
        void fillWithBibKeys(Buffer const & buffer,
-               std::vector<std::pair<string,string> > & keys) const;
+               std::vector<std::pair<std::string,std::string> > & keys) const;
        ///
        EDITABLE editable() const { return IS_EDITABLE; }
        ///
@@ -83,12 +82,22 @@ public:
        void addPreview(lyx::graphics::PreviewLoader &) const;
 
 private:
+       void cache(BufferView *) const;
+       BufferView * view() const;
+
+       /// Slot receiving a signal that the preview is ready to display.
+       void statusChanged() const;
+       /** Slot receiving a signal that the external file has changed
+        *  and the preview should be regenerated.
+        */
+       void fileChanged() const;
+
        friend class InsetIncludeMailer;
 
        /// set the parameters
        void set(InsetCommandParams const & params, Buffer const &);
        /// get the text displayed on the button
-       string const getScreenLabel(Buffer const &) const;
+       std::string const getScreenLabel(Buffer const &) const;
        ///
        void write(std::ostream &) const;
        ///
@@ -97,17 +106,15 @@ private:
        /// the parameters
        InsetCommandParams params_;
        /// holds the entity name that defines the file location (SGML)
-       string const include_label;
+       std::string const include_label;
 
-       /// Use the Pimpl idiom to hide the internals of the previewer.
-       class PreviewImpl;
-       friend class PreviewImpl;
        /// The pointer never changes although *preview_'s contents may.
-       boost::scoped_ptr<PreviewImpl> const preview_;
+       boost::scoped_ptr<RenderMonitoredPreview> const preview_;
 
        /// cache
+       mutable boost::weak_ptr<BufferView> view_;
        mutable bool set_label_;
-       mutable ButtonRenderer button_;
+       mutable RenderButton button_;
 };
 
 
@@ -120,16 +127,16 @@ public:
        ///
        virtual InsetBase & inset() const { return inset_; }
        ///
-       virtual string const & name() const { return name_; }
+       virtual std::string const & name() const { return name_; }
        ///
-       virtual string const inset2string(Buffer const &) const;
+       virtual std::string const inset2string(Buffer const &) const;
        ///
-       static void string2params(string const &, InsetCommandParams &);
+       static void string2params(std::string const &, InsetCommandParams &);
        ///
-       static string const params2string(InsetCommandParams const &);
+       static std::string const params2string(InsetCommandParams const &);
 private:
        ///
-       static string const name_;
+       static std::string const name_;
        ///
        InsetInclude & inset_;
 };