Fix problem caused by re-ordering of menu at 5f6332bf4.

This broke the activation and de-activation of plural, capitalize,
etc. I guess that tells us how much those get used....

(cherry picked from commit 9b3f9cc687c5294e13555c6596184dd0e6a5d6cf)

diff --git a/src/frontends/qt4/GuiRef.cpp b/src/frontends/qt4/GuiRef.cpp
index fac8be98817aa3e4ffa70408d11dd3029dae7e2b..9f03a2d4b3888e9eff4b7d22cd1f12baaf732f9c 100644 (file)
--- a/src/frontends/qt4/GuiRef.cpp
+++ b/src/frontends/qt4/GuiRef.cpp
@@ -150,9 +150,11 @@ void GuiRef::enableBoxes()
 {
        bool const isFormatted =
            (InsetRef::getName(typeCO->currentIndex()) == "formatted");
+       LYXERR0(InsetRef::getName(typeCO->currentIndex()));
        bool const isLabelOnly =
            (InsetRef::getName(typeCO->currentIndex()) == "labelonly");
        bool const usingRefStyle = buffer().params().use_refstyle;
+       LYXERR0(usingRefStyle);
        pluralCB->setEnabled(isFormatted && usingRefStyle);
        capsCB->setEnabled(isFormatted && usingRefStyle);
        noprefixCB->setEnabled(isLabelOnly);

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index 124738daf7a88d6e0bea4584527eaf2d5d72a545..2c22b1f23c8ba0244fe14e7c31e4044e1d0b46b6 100644 (file)
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -476,8 +476,8 @@ InsetRef::type_info const InsetRef::types[] = {
        { "pageref",   N_("Page Number"),           N_("Page: ")},
        { "vpageref",  N_("Textual Page Number"),   N_("TextPage: ")},
        { "vref",      N_("Standard+Textual Page"), N_("Ref+Text: ")},
-       { "formatted", N_("Formatted"),             N_("Format: ")},
        { "nameref",   N_("Reference to Name"),     N_("NameRef: ")},
+       { "formatted", N_("Formatted"),             N_("Format: ")},
        { "labelonly", N_("Label Only"),            N_("Label: ")},
        { "", "", "" }
 };

diff --git a/status.23x b/status.23x
index c35e9577c73e2788b7eea8bebf9d700958db5475..41d00f09a4883d0ec58b18b4c77d631eae293620 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -123,6 +123,8 @@ What's new
 
 - Only allow toggling math limits when it makes sense.
 
+- Repair (de)activation of plural, capitalize, etc, for refstyle.
+
 
 * INTERNALS