Move isMultiCell() to Cursor, and use it.

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

diff --git a/src/insets/InsetExternal.h b/src/insets/InsetExternal.h
index 8956c7c38d40d4d682b78740f7fa55bfb3c692c7..a9f8adbe5347b2ce7cef040a3c72d65d9fd3a636 100644 (file)
--- a/src/insets/InsetExternal.h
+++ b/src/insets/InsetExternal.h
@@ -13,8 +13,8 @@
 #define INSET_EXTERNAL_H
 
 #include "Inset.h"
+#include "ExternalTemplate.h"
 #include "ExternalTransforms.h"
-#include "EmbeddedFiles.h"
 
 #include "support/FileName.h"
 #include "support/Translator.h"
@@ -45,20 +45,6 @@ private:
        support::FileName tempname_;
 };
 
-/// How is the image to be displayed on the LyX screen?
-enum DisplayType {
-       DefaultDisplay,
-       MonochromeDisplay,
-       GrayscaleDisplay,
-       ColorDisplay,
-       PreviewDisplay,
-       NoDisplay
-};
-
-
-/// The translator between the Display enum and corresponding lyx string.
-Translator<DisplayType, std::string> const & displayTranslator();
-
 } // namespace external
 
 
@@ -78,9 +64,11 @@ public:
        std::string const & templatename() const { return templatename_; }
 
        /// The external file.
-       EmbeddedFile filename;
-       /// How the inset is to be displayed by LyX.
-       external::DisplayType display;
+       support::DocFileName filename;
+       /// If the inset is to be displayed by LyX.
+       bool display;
+       /// If the inset is to use the preview mechanism.
+       PreviewMode preview_mode;
        /// The scale of the displayed graphic (if shown).
        unsigned int lyxscale;
 
@@ -119,10 +107,10 @@ public:
        InsetExternalParams const & params() const;
        ///
        void setParams(InsetExternalParams const &);
-       ///
-       void setBuffer(Buffer & buffer);
        /// \returns the number of rows (\n's) of generated code.
        int latex(odocstream &, OutputParams const &) const;
+       ///
+       docstring contextMenu(BufferView const & bv, int x, int y) const;
 
 private:
        ///
@@ -151,10 +139,6 @@ private:
        void edit(Cursor & cur, bool front, EntryDirection entry_from);
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
-       /// external file can be embedded
-       void registerEmbeddedFiles(EmbeddedFileList &) const;
-       ///
-       void updateEmbeddedFile(EmbeddedFile const &);
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///