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

diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C
index 5b35f22f56..8d2c565f09 100644
--- a/src/insets/insetfloatlist.C
+++ b/src/insets/insetfloatlist.C
@@ -6,20 +6,39 @@
 
 #include "insetfloatlist.h"
 #include "FloatList.h"
+#include "frontends/Dialogs.h"
+#include "LyXView.h"
+#include "BufferView.h"
 #include "buffer.h"
 #include "gettext.h"
 #include "debug.h"
 
+
+using std::ostream;
 using std::endl;
 
+
+InsetFloatList::InsetFloatList()
+	: InsetCommand(InsetCommandParams())
+{
+}
+
+ 
+InsetFloatList::InsetFloatList(string const & type)
+	: InsetCommand(InsetCommandParams())
+{
+	setCmdName(type);
+}
+
+
 string const InsetFloatList::getScreenLabel(Buffer const *) const 
 {
-	string const guiName = floatList[float_type]->second.name();
+	string const guiName = floatList[getCmdName()]->second.name();
 	if (!guiName.empty()) {
-		string const res = _("List of ") + guiName;
+		string const res = guiName + _(" List");
 		return res;
 	}
-	return _("ERROR nonexistant float type!");
+	return _("ERROR: Nonexistent float type!");
 }
 
 
@@ -29,9 +48,9 @@ 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";
 }
 
 
@@ -39,14 +58,14 @@ void InsetFloatList::read(Buffer const *, LyXLex & lex)
 {
 	string token;
 
-	if (lex.EatLine()) {
-		float_type = lex.GetString();
-		lyxerr << "FloatList::float_type: " << float_type << endl;
+	if (lex.eatLine()) {
+		setCmdName(lex.getString());
+		lyxerr << "FloatList::float_type: " << getCmdName() << endl;
 	} 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,14 +76,9 @@ void InsetFloatList::read(Buffer const *, LyXLex & lex)
 }
 
 
-void InsetFloatList::edit(BufferView *, int, int, unsigned int)
+void InsetFloatList::edit(BufferView * bv, int, int, unsigned int)
 {
-#ifdef WITH_WARNINGS
-#warning Implement me please.
-#endif
-#if 0
-	bv->owner()->getDialogs()->showFloatList(this);
-#endif
+	bv->owner()->getDialogs()->showTOC(this);
 }
 
 
@@ -74,11 +88,10 @@ void InsetFloatList::edit(BufferView * bv, bool)
 }
 
 
-int InsetFloatList::latex(Buffer const *, std::ostream & os, bool, bool) const
+int InsetFloatList::latex(Buffer const *, ostream & os, bool, bool) const
 {
-	FloatList::const_iterator cit = floatList[float_type];
+	FloatList::const_iterator cit = floatList[getCmdName()];
 
-	
 	if (cit != floatList.end()) {
 		if (cit->second.builtin()) {
 			// Only two different types allowed here:
@@ -91,24 +104,24 @@ int InsetFloatList::latex(Buffer const *, std::ostream & os, bool, bool) const
 				os << "%% unknown builtin float\n";
 			}
 		} else {
-			os << "\\listof{" << float_type << "}{"
+			os << "\\listof{" << getCmdName() << "}{"
 			   << _("List of ") << cit->second.name() << "}\n";
 		}
 	} else {
-		os << "%%\\listof{" << float_type << "}{"
+		os << "%%\\listof{" << getCmdName() << "}{"
 		   << _("List of ") << cit->second.name() << "}\n";
 	}
 	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);
+		toc_list.find(getCmdName());
 	if (cit != toc_list.end()) {
 		Buffer::SingleList::const_iterator ccit = cit->second.begin();
 		Buffer::SingleList::const_iterator end = cit->second.end();