From e4dea6c076aa4ca929ba31504fcbf3b8911f91d8 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 3 Nov 2008 09:03:01 +0000
Subject: [PATCH] oops! r27229 was wrong

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27230 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/layouts/stdinsets.inc          | 21 ++++++++++++++++++++-
 src/Buffer.cpp                     |  2 +-
 src/frontends/qt4/GuiKeySymbol.cpp | 20 ++------------------
 src/insets/InsetFloat.cpp          |  6 ------
 src/insets/InsetFloat.h            |  2 +-
 5 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 070042d14b..06eccf5570 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -228,7 +228,26 @@ InsetLayout Box:Shaded
 	MultiPar              true
 End
 
-InsetLayout Float
+InsetLayout figure
+	LabelString           Figure
+	LabelFont
+	  Color               collapsable
+	  Size                Small
+	EndFont
+	MultiPar              true
+End
+
+InsetLayout table
+	LabelString           Table
+	LabelFont
+	  Color               collapsable
+	  Size                Small
+	EndFont
+	MultiPar              true
+End
+
+InsetLayout algorithm
+	LabelString           Algorithm
 	LabelFont
 	  Color               collapsable
 	  Size                Small
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 44e35ab607..a1d729d5c7 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2391,7 +2391,7 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
 		makeDocBookFile(FileName(filename), runparams);
 	}
 	// LaTeX backend
-	else if (backend_format == format) {
+	else if (!put_in_tempdir) {
 		runparams.nice = true;
 		if (!makeLaTeXFile(FileName(filename), string(), runparams))
 			return false;
diff --git a/src/frontends/qt4/GuiKeySymbol.cpp b/src/frontends/qt4/GuiKeySymbol.cpp
index 314c7d6731..d4a73ffebb 100644
--- a/src/frontends/qt4/GuiKeySymbol.cpp
+++ b/src/frontends/qt4/GuiKeySymbol.cpp
@@ -694,25 +694,9 @@ docstring const KeySymbol::print(KeyModifier mod, bool forgui) const
 		tmpkey += Qt::AltModifier;
 
 	QKeySequence seq(tmpkey);
-	QString str;
-	
-	if (forgui)
-		str = seq.toString(QKeySequence::NativeText);
-	else {
-#ifdef Q_WS_MACX
-		// Qt/Mac does not use Command and friends in the
-		// portable case, but the windows-like Control+x (bug 5421).
-		str = seq.toString(QKeySequence::NativeText);
-		str.replace(QChar(0x21E7), qt_("Shift-"));
-		str.replace(QChar(0x2303), qt_("Control-"));
-		str.replace(QChar(0x2325), qt_("Option-"));
-		str.replace(QChar(0x2318), qt_("Command-"));
-#else
-		str = seq.toString(QKeySequence::PortableText);	
-#endif
-	}
 
-	return qstring_to_ucs4(str);
+	return qstring_to_ucs4(seq.toString(forgui ? QKeySequence::NativeText
+					    : QKeySequence::PortableText));
 }
 
 
diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index 3b6547c9ec..0a53759869 100644
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -127,12 +127,6 @@ InsetFloat::~InsetFloat()
 }
 
 
-docstring InsetFloat::name() const 
-{ 
-	return "Float:" + name_; 
-}
-
-
 docstring InsetFloat::toolTip(BufferView const & bv, int x, int y) const
 {
 	if (InsetCollapsable::toolTip(bv, x, y).empty() || isOpen())
diff --git a/src/insets/InsetFloat.h b/src/insets/InsetFloat.h
index e5e9b63b17..b1500f9a0e 100644
--- a/src/insets/InsetFloat.h
+++ b/src/insets/InsetFloat.h
@@ -71,7 +71,7 @@ public:
 	InsetFloatParams const & params() const { return params_; }
 private:
 	///
-	docstring name() const;
+	docstring name() const { return name_; }
 	///
 	docstring toolTip(BufferView const & bv, int x, int y) const;
 	///
-- 
2.39.2