From: Tommaso Cucinotta <tommaso@lyx.org>
Date: Sun, 31 Jul 2011 18:43:12 +0000 (+0000)
Subject: Size tab now enables and disables correctly depending on the capabilities configured... 
X-Git-Tag: 2.0.1~66
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f24d460bf6fc23f24c2d6cce652f2e6939120e76;p=features.git

Size tab now enables and disables correctly depending on the capabilities configured for the current external template (selected via the combo).


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

diff --git a/src/frontends/qt4/GuiExternal.cpp b/src/frontends/qt4/GuiExternal.cpp
index e71504d27b..b3d9e44ec0 100644
--- a/src/frontends/qt4/GuiExternal.cpp
+++ b/src/frontends/qt4/GuiExternal.cpp
@@ -512,21 +512,19 @@ void GuiExternal::updateTemplate()
 	TransformIDs::const_iterator tr_begin = transformIds.begin();
 	TransformIDs::const_iterator const tr_end = transformIds.end();
 
-	bool found = std::find(tr_begin, tr_end, external::Rotate) != tr_end;
-	rotationGB->setEnabled(found);
+	bool rotate = std::find(tr_begin, tr_end, external::Rotate) != tr_end;
+	rotationGB->setEnabled(rotate);
 
-	found = std::find(tr_begin, tr_end, external::Resize) != tr_end;
-	scaleGB->setEnabled(found);
+	bool resize = std::find(tr_begin, tr_end, external::Resize) != tr_end;
+	scaleGB->setEnabled(resize);
 
-	found = std::find(tr_begin, tr_end, external::Clip) != tr_end;
-	cropGB->setEnabled(found);
+	bool clip = std::find(tr_begin, tr_end, external::Clip) != tr_end;
+	cropGB->setEnabled(clip);
 
-	tab->setTabEnabled(tab->indexOf(sizetab),
-		rotationGB->isEnabled()
-		|| scaleGB->isEnabled()
-		|| cropGB->isEnabled());
+	sizetab->setEnabled(rotate || resize || clip);
+	tab->setTabEnabled(tab->indexOf(sizetab), rotate || resize || clip);
 
-	found = std::find(tr_begin, tr_end, external::Extra) != tr_end;
+	bool found = std::find(tr_begin, tr_end, external::Extra) != tr_end;
 	optionsGB->setEnabled(found);
 
 	bool scaled = displayGB->isChecked() && displayGB->isEnabled() &&
diff --git a/status.20x b/status.20x
index 5664937f77..943d2cd834 100644
--- a/status.20x
+++ b/status.20x
@@ -55,6 +55,8 @@ What's new
   only the current paragraph, except when complete source is requested
   (bug 7463).
 
+- Size tab now enables and disables correctly depending on the capabilities
+  configured for the current external template (selected via the combo).
 
 * DOCUMENTATION AND LOCALIZATION