From: Uwe Stöhr <uwestoehr@web.de>
Date: Wed, 26 Oct 2011 02:03:33 +0000 (+0000)
Subject: backport bug #7853
X-Git-Tag: 2.0.2~116
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=dd87ea4a999feb885bf1fc012c17515e8d341714;p=features.git

backport bug #7853

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40000 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/GuiPrintNomencl.cpp b/src/frontends/qt4/GuiPrintNomencl.cpp
index 2054f59944..1e41e3e93b 100644
--- a/src/frontends/qt4/GuiPrintNomencl.cpp
+++ b/src/frontends/qt4/GuiPrintNomencl.cpp
@@ -56,8 +56,7 @@ GuiPrintNomencl::GuiPrintNomencl(QWidget * parent) : InsetParamsWidget(parent)
 void GuiPrintNomencl::on_setWidthCO_activated(int i)
 {
 	bool const custom =
-		(setWidthCO->itemData(i).toString()
-		 == "custom");
+		(setWidthCO->itemData(i).toString() == "custom");
 	valueLE->setEnabled(custom);
 	unitLC->setEnabled(custom);
 	valueLA->setEnabled(custom);
@@ -70,10 +69,14 @@ void GuiPrintNomencl::paramsToDialog(InsetCommandParams const & params)
 	setWidthCO->setCurrentIndex(
 		setWidthCO->findData(toqstr(params["set_width"])));
 	
-	lengthToWidgets(valueLE,
-			unitLC,
-			params["width"],
-			Length::defaultUnit());
+	lengthToWidgets(valueLE, unitLC,
+			params["width"], Length::defaultUnit());
+
+	bool const custom =
+		(setWidthCO->itemData(setWidthCO->currentIndex()).toString() == "custom");
+	valueLE->setEnabled(custom);
+	unitLC->setEnabled(custom);
+	valueLA->setEnabled(custom);
 }
 
 
diff --git a/status.20x b/status.20x
index c741d4b65d..51999dc9c3 100644
--- a/status.20x
+++ b/status.20x
@@ -189,6 +189,8 @@ What's new
 - Fix display of section (etc) headings, in both TOC and menu, when there is 
   math in the title.
 
+- Correct handling of custom width in the nomenclature dialog (bug 7853).
+
 
 * ADVANCED FIND AND REPLACE