revert r27209

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27229 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 06eccf5570712e38a44b129947176dd84c599ab8..070042d14b540133109725578f895424b218451b 100644 (file)
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -228,26 +228,7 @@ InsetLayout Box:Shaded
        MultiPar              true
 End
 
-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
+InsetLayout Float
        LabelFont
          Color               collapsable
          Size                Small

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index a1d729d5c7f7ef627cd0b05e09c0e396214c7604..44e35ab607e48a77e6bc55397a6a21526e3874c1 100644 (file)
--- 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 (!put_in_tempdir) {
+       else if (backend_format == format) {
                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 d4a73ffebb77b5bdffca96f090597718a722012c..314c7d6731632a7c412c51c1723e34322c41e754 100644 (file)
--- a/src/frontends/qt4/GuiKeySymbol.cpp
+++ b/src/frontends/qt4/GuiKeySymbol.cpp
@@ -694,9 +694,25 @@ 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(seq.toString(forgui ? QKeySequence::NativeText
-                                           : QKeySequence::PortableText));
+       return qstring_to_ucs4(str);
 }
 
 

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index 0a537598697556e6d393cdc038aed8aaafefb1e0..3b6547c9ec4ebea7d2c524639dd052b6291f6e67 100644 (file)
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -127,6 +127,12 @@ 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 b1500f9a0ed99d9d17ea3e0ecdf57bdd59ce2a4d..e5e9b63b1722702e6ea0a55bd9453f5abe3912a8 100644 (file)
--- 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 { return name_; }
+       docstring name() const;
        ///
        docstring toolTip(BufferView const & bv, int x, int y) const;
        ///