X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInclude.h;h=0e14405a8a6305abb774125c33f1cb757fe65c8e;hb=67e70c6c022fa445cd654937faeb87955e3bca7a;hp=e715b8b4a62012ec0229b294f8bbcdaa74dad5f7;hpb=9b39c142b6a7b1f7a131906b15cdd602cc0237f8;p=lyx.git

diff --git a/src/insets/InsetInclude.h b/src/insets/InsetInclude.h
index e715b8b4a6..0e14405a8a 100644
--- a/src/insets/InsetInclude.h
+++ b/src/insets/InsetInclude.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Richard Heck (conversion to InsetCommand)
  *
  * Full author contact details are available in file CREDITS.
@@ -13,13 +13,14 @@
 #ifndef INSET_INCLUDE_H
 #define INSET_INCLUDE_H
 
-#include "BiblioInfo.h"
 #include "InsetCommand.h"
+
+#include "BiblioInfo.h"
+#include "Counters.h"
 #include "InsetCommandParams.h"
 #include "RenderButton.h"
-#include "MailInset.h"
-#include "Counters.h"
-#include "EmbeddedFiles.h"
+
+#include "support/FileNameList.h"
 
 #include <boost/scoped_ptr.hpp>
 
@@ -27,6 +28,7 @@ namespace lyx {
 
 class Buffer;
 class Dimension;
+class InsetLabel;
 class LaTeXFeatures;
 class RenderMonitoredPreview;
 
@@ -35,20 +37,19 @@ class InsetInclude : public InsetCommand {
 public:
 	///
 	InsetInclude(InsetCommandParams const &);
+	~InsetInclude();
+
+	void setBuffer(Buffer & buffer);
+	bool isLabeled() const { return true; }
 
 	/// Override these InsetButton methods if Previewing
 	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
-	virtual DisplayType display() const;
+	DisplayType display() const;
 	///
 	InsetCode lyxCode() const { return INCLUDE_CODE; }
-	/** Fills \c list
-	 *  \param buffer the Buffer containing this inset.
-	 *  \param list the list of labels in the child buffer.
-	 */
-	void getLabelList(std::vector<docstring> & list) const;
 	/** Fills \c keys
 	 *  \param buffer the Buffer containing this inset.
 	 *  \param keys the list of bibkeys in the child buffer.
@@ -68,10 +69,10 @@ public:
 	 *  Return an empty vector if the child doc is not loaded.
 	 *  \param buffer the Buffer containing this inset.
 	 */
-	EmbeddedFileList const &
-		getBibfilesCache(Buffer const & buffer) const;
+	support::FileNameList const &
+		getBibfilesCache() const;
 	///
-	EDITABLE editable() const { return IS_EDITABLE; }
+	bool hasSettings() const { return true; }
 	///
 	int latex(odocstream &, OutputParams const &) const;
 	///
@@ -83,31 +84,39 @@ public:
 	///
 	void addPreview(graphics::PreviewLoader &) const;
 	///
-	void addToToc(ParConstIterator const &) const;
+	void addToToc(DocIterator const &);
 	///
-	void updateLabels(ParIterator const &);
-	/// child document can be embedded
-	void registerEmbeddedFiles(EmbeddedFileList &) const;
+	void updateCommand();
 	///
-	void updateEmbeddedFile(EmbeddedFile const & file);
+	void updateLabels(ParIterator const &);
 	///
 	static ParamInfo const & findInfo(std::string const &);
 	///
-	static std::string defaultCommand() { return "include"; };
+	static std::string defaultCommand() { return "include"; }
 	///
 	static bool isCompatibleCommand(std::string const & s);
+	///
+	docstring contextMenu(BufferView const & bv, int x, int y) const;
+	/// \return the child buffer if the file is a LyX doc and could be loaded
+	Buffer * getChildBuffer() const;
 protected:
 	InsetInclude(InsetInclude const &);
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
+	///
+	bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
 private:
-	Inset * clone() const;
+	Inset * clone() const { return new InsetInclude(*this); }
 
 	/** Slot receiving a signal that the external file has changed
 	 *  and the preview should be regenerated.
 	 */
 	void fileChanged() const;
 
+	/// \return loaded Buffer or zero if the file loading did not proceed.
+	Buffer * loadIfNeeded() const;
+	/// launch external application
+	void editIncluded(std::string const & file);
 	/// set the parameters
 	void setParams(InsetCommandParams const & params);
 	/// get the text displayed on the button
@@ -118,22 +127,17 @@ private:
 	/// The pointer never changes although *preview_'s contents may.
 	boost::scoped_ptr<RenderMonitoredPreview> const preview_;
 
+	/// 
+	mutable bool failedtoload_;
 	/// cache
 	mutable bool set_label_;
 	mutable RenderButton button_;
 	mutable docstring listings_label_;
+	InsetLabel * label_;
+	mutable Buffer * child_buffer_;
 };
 
-/// return the child buffer if the file is a LyX doc and is loaded
-Buffer * getChildBuffer(Buffer const & buffer, InsetCommandParams const & params);
-	
-/// return loaded Buffer or zero if the file loading did not proceed.
-Buffer * loadIfNeeded(Buffer const & parent, InsetCommandParams const & params);
-
-///
-void resetParentBuffer(Buffer const * parent, InsetCommandParams const & params,
-	bool close_it);
 
 } // namespace lyx
 
-#endif // INSETINCLUDE_H
+#endif // INSET_INCLUDE_H