X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetfloatlist.C;h=3df488deb3ada0c903675a2581c34040081b0d90;hb=6ce86e2bfe0a403e0e811b66fdddb2d56cfe0f83;hp=5b35f22f56f9c5bfa88bee7e193ce3a18d05ea56;hpb=5f2e3c4c43f8e1736a2b7654595dfe6c175b4b3b;p=lyx.git

diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C
index 5b35f22f56..3df488deb3 100644
--- a/src/insets/insetfloatlist.C
+++ b/src/insets/insetfloatlist.C
@@ -1,25 +1,61 @@
+/**
+ * \file insetfloatlist.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS
+ */
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "insetfloatlist.h"
 #include "FloatList.h"
+#include "LaTeXFeatures.h"
+#include "lyxlex.h"
+#include "frontends/Dialogs.h"
+#include "frontends/LyXView.h"
+#include "BufferView.h"
 #include "buffer.h"
+#include "toc.h"
 #include "gettext.h"
 #include "debug.h"
 
+#include "support/BoostFormat.h"
+
+using std::ostream;
 using std::endl;
 
-string const InsetFloatList::getScreenLabel(Buffer const *) const 
+
+InsetFloatList::InsetFloatList()
+	: InsetCommand(InsetCommandParams())
 {
-	string const guiName = floatList[float_type]->second.name();
-	if (!guiName.empty()) {
-		string const res = _("List of ") + guiName;
-		return res;
-	}
-	return _("ERROR nonexistant float type!");
+}
+
+
+InsetFloatList::InsetFloatList(string const & type)
+	: InsetCommand(InsetCommandParams())
+{
+	setCmdName(type);
+}
+
+
+InsetFloatList::~InsetFloatList()
+{
+	InsetCommandMailer mailer("toc", *this);
+	mailer.hideDialog();
+}
+
+
+string const InsetFloatList::getScreenLabel(Buffer const * buf) const
+{
+	FloatList const & floats = buf->params.getLyXTextClass().floats();
+	FloatList::const_iterator it = floats[getCmdName()];
+	if (it != floats.end())
+		return _(it->second.listName());
+	else
+		return _("ERROR: Nonexistent float type!");
 }
 
 
@@ -29,24 +65,27 @@ Inset::Code InsetFloatList::lyxCode() const
 }
 
 
-void InsetFloatList::write(Buffer const *, std::ostream & os) const
+void InsetFloatList::write(Buffer const *, ostream & os) const
 {
-	os << "FloatList " << float_type << "\n";
+	os << "FloatList " << getCmdName() << "\n";
 }
 
 
-void InsetFloatList::read(Buffer const *, LyXLex & lex) 
+void InsetFloatList::read(Buffer const * buf, LyXLex & lex)
 {
+	FloatList const & floats = buf->params.getLyXTextClass().floats();
 	string token;
 
-	if (lex.EatLine()) {
-		float_type = lex.GetString();
-		lyxerr << "FloatList::float_type: " << float_type << endl;
+	if (lex.eatLine()) {
+		setCmdName(lex.getString());
+		lyxerr[Debug::INSETS] << "FloatList::float_type: " << getCmdName() << endl;
+		if (!floats.typeExist(getCmdName()))
+			lex.printError("InsetFloatList: Unknown float type: `$$Token'");
 	} else
 		lex.printError("InsetFloatList: Parse error: `$$Token'");
-	while (lex.IsOK()) {
+	while (lex.isOK()) {
 		lex.nextToken();
-		token = lex.GetString();
+		token = lex.getString();
 		if (token == "\\end_inset")
 			break;
 	}
@@ -57,29 +96,25 @@ void InsetFloatList::read(Buffer const *, LyXLex & lex)
 }
 
 
-void InsetFloatList::edit(BufferView *, int, int, unsigned int)
+void InsetFloatList::edit(BufferView * bv, int, int, mouse_button::state)
 {
-#ifdef WITH_WARNINGS
-#warning Implement me please.
-#endif
-#if 0
-	bv->owner()->getDialogs()->showFloatList(this);
-#endif
+	InsetCommandMailer mailer("toc", *this);
+	mailer.showDialog(bv);
 }
 
 
 void InsetFloatList::edit(BufferView * bv, bool)
 {
-	edit(bv, 0, 0, 0);
+	edit(bv, 0, 0, mouse_button::none);
 }
 
 
-int InsetFloatList::latex(Buffer const *, std::ostream & os, bool, bool) const
+int InsetFloatList::latex(Buffer const * buf, ostream & os, bool, bool) const
 {
-	FloatList::const_iterator cit = floatList[float_type];
+	FloatList const & floats = buf->params.getLyXTextClass().floats();
+	FloatList::const_iterator cit = floats[getCmdName()];
 
-	
-	if (cit != floatList.end()) {
+	if (cit != floats.end()) {
 		if (cit->second.builtin()) {
 			// Only two different types allowed here:
 			string const type = cit->second.type();
@@ -91,32 +126,40 @@ int InsetFloatList::latex(Buffer const *, std::ostream & os, bool, bool) const
 				os << "%% unknown builtin float\n";
 			}
 		} else {
-			os << "\\listof{" << float_type << "}{"
-			   << _("List of ") << cit->second.name() << "}\n";
+			os << "\\listof{" << getCmdName() << "}{"
+			   << cit->second.listName() << "}\n";
 		}
 	} else {
-		os << "%%\\listof{" << float_type << "}{"
-		   << _("List of ") << cit->second.name() << "}\n";
+#if USE_BOOST_FORMAT
+		os << "%%\\listof{"
+		   << getCmdName()
+		   << "}{"
+		   << boost::format(_("List of %1$s")) % cit->second.name()
+		   << "}\n";
+#else
+		os << "%%\\listof{"
+		   << getCmdName()
+		   << "}{"
+		   << _("List of ") << cit->second.name()
+		   << "}\n";
+#endif
 	}
 	return 1;
 }
 
 
-int InsetFloatList::ascii(Buffer const * buffer, std::ostream & os, int) const
+int InsetFloatList::ascii(Buffer const * buffer, ostream & os, int) const
 {
 	os << getScreenLabel(buffer) << "\n\n";
 
-	Buffer::Lists const toc_list = buffer->getLists();
-	Buffer::Lists::const_iterator cit =
-		toc_list.find(float_type);
-	if (cit != toc_list.end()) {
-		Buffer::SingleList::const_iterator ccit = cit->second.begin();
-		Buffer::SingleList::const_iterator end = cit->second.end();
-		for (; ccit != end; ++ccit)
-			os << string(4 * ccit->depth, ' ')
-			   << ccit->str << "\n";
-	}
+	toc::asciiTocList(getCmdName(), buffer, os);
 
 	os << "\n";
 	return 0;
 }
+
+
+void InsetFloatList::validate(LaTeXFeatures & features) const
+{
+	features.useFloat(getCmdName());
+}