Fix bug 1749. CAUTION: lyx2lyx not fully working yet (see FIXMEs).

[features.git] / src / frontends / qt4 / QGraphics.cpp

diff --git a/src/frontends/qt4/QGraphics.cpp b/src/frontends/qt4/QGraphics.cpp
index dcd340dc7783714d6beac41cf4a3d8292ed0c9ac..f88bd150801acf1ec050812d64dd586254d29429 100644 (file)
--- a/src/frontends/qt4/QGraphics.cpp
+++ b/src/frontends/qt4/QGraphics.cpp
@@ -89,6 +89,7 @@ void QGraphics::build_dialog()
        bcview().addReadOnly(dialog_->rotationGB);
        bcview().addReadOnly(dialog_->latexoptions);
        bcview().addReadOnly(dialog_->getPB);
+       bcview().addReadOnly(dialog_->rotateOrderCB);
 
        // initialize the length validator
        addCheckedLineEdit(bcview(), dialog_->Scale, dialog_->scaleCB);
@@ -264,6 +265,12 @@ void QGraphics::update_contents()
        dialog_->setAutoText();
 
        dialog_->angle->setText(toqstr(igp.rotateAngle));
+       dialog_->rotateOrderCB->setChecked(igp.scaleBeforeRotation);
+
+       dialog_->rotateOrderCB->setEnabled((widthChecked ||
+                                          heightChecked ||
+                                          scaleChecked) &&
+                                          (igp.rotateAngle != "0"));
 
        dialog_->origin->clear();
 
@@ -382,6 +389,8 @@ void QGraphics::apply()
        igp.rotateOrigin =
                QGraphics::origin_ltx[dialog_->origin->currentIndex()];
 
+       igp.scaleBeforeRotation = dialog_->rotateOrderCB->isChecked();
+
        // more latex options
        igp.special = fromqstr(dialog_->latexoptions->text());
 }