From cce95aea5393cb91f22e3ed2cc52b635dfbd55ec Mon Sep 17 00:00:00 2001
From: John Levon <levon@movementarian.org>
Date: Thu, 8 Aug 2002 04:24:36 +0000
Subject: [PATCH] couple more fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4898 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt2/ChangeLog             |  7 +++++++
 src/frontends/qt2/QGraphics.C           |  2 ++
 src/frontends/qt2/QLImage.C             |  2 +-
 src/frontends/qt2/ui/QGraphicsDialog.ui | 18 +++++++++---------
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 5ac2da2f79..80b58c6614 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-08  John Levon  <levon@movementarian.org>
+
+	* QGraphicsDialog.C: enable rotate
+
+	* ui/QGraphicsDialog.ui: trigger changed on
+	  activated() not highlighted()
+ 
 2002-08-08  John Levon  <levon@movementarian.org>
 
 	* QGraphics.C:
diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C
index d552697f76..4e87685986 100644
--- a/src/frontends/qt2/QGraphics.C
+++ b/src/frontends/qt2/QGraphics.C
@@ -258,6 +258,8 @@ void QGraphics::apply()
 	else
 	    igp.rotateOrigin = string();
 
+	igp.rotate = igp.rotateAngle != 0.0;
+	 
 	igp.special = dialog_->latexoptions->text();
 }
 
diff --git a/src/frontends/qt2/QLImage.C b/src/frontends/qt2/QLImage.C
index c17d157247..6b8a3a092e 100644
--- a/src/frontends/qt2/QLImage.C
+++ b/src/frontends/qt2/QLImage.C
@@ -240,7 +240,7 @@ void QLImage::rotate(Params const & params)
 	lyxerr[Debug::GRAPHICS] << "rotating image by " << params.angle << " degrees" << endl;
  
 	QWMatrix m;
-	m.rotate(params.angle);
+	m.rotate(-params.angle);
 	xformed_pixmap_ = xformed_pixmap_.xForm(m);
 }
 
diff --git a/src/frontends/qt2/ui/QGraphicsDialog.ui b/src/frontends/qt2/ui/QGraphicsDialog.ui
index fbdceb852d..af9ded4434 100644
--- a/src/frontends/qt2/ui/QGraphicsDialog.ui
+++ b/src/frontends/qt2/ui/QGraphicsDialog.ui
@@ -2384,31 +2384,31 @@
     </connection>
     <connection>
         <sender>lbXunit</sender>
-        <signal>highlighted(int)</signal>
+        <signal>activated(int)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
         <sender>lbYunit</sender>
-        <signal>highlighted(int)</signal>
+        <signal>activated(int)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
         <sender>rtXunit</sender>
-        <signal>highlighted(int)</signal>
+        <signal>activated(int)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
         <sender>rtYXunit</sender>
-        <signal>highlighted(int)</signal>
+        <signal>activated(int)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
         <sender>origin</sender>
-        <signal>highlighted(int)</signal>
+        <signal>activated(int)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
@@ -2485,14 +2485,14 @@
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>displayscale</sender>
-        <signal>returnPressed()</signal>
+        <sender>displayratioCB</sender>
+        <signal>stateChanged(int)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>displayratioCB</sender>
-        <signal>stateChanged(int)</signal>
+        <sender>displayscale</sender>
+        <signal>textChanged(const QString&amp;)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>