From 6ac69a78f8f83aea7cb662e1675c4a4f1fe364d8 Mon Sep 17 00:00:00 2001 From: Richard Kimberly Heck Date: Sun, 6 Jan 2019 12:51:02 -0500 Subject: [PATCH] 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) --- src/frontends/qt4/GuiRef.cpp | 2 ++ src/insets/InsetRef.cpp | 2 +- status.23x | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/frontends/qt4/GuiRef.cpp b/src/frontends/qt4/GuiRef.cpp index fac8be9881..9f03a2d4b3 100644 --- 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 124738daf7..2c22b1f23c 100644 --- 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 c35e9577c7..41d00f09a4 100644 --- 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