r14500 by jghali - #8683, magnifier does not work : avoid magnification step values of 100% as this cause zooming not to work in this case

[scribus-commit]

Revision: 14500
Author: jghali
Date: 2010-01-07T08:30:07.206706Z
Commit message: #8683, magnifier does not work : avoid magnification step values of 100% as this cause zooming not to work in this case

Changeset: 
M  /trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
M  /trunk/Scribus/scribus/prefsmanager.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp

Diffs:
Index: scribus/prefsmanager.cpp
===================================================================
--- scribus/prefsmanager.cpp	(revision 14499)
+++ scribus/prefsmanager.cpp	(revision 14500)
@@ -1953,8 +1953,8 @@
 			appPrefs.opToolPrefs.magMax  = dc.attribute("MAGMAX", "3200").toInt();
 			appPrefs.opToolPrefs.magStep = dc.attribute("MAGSTEP", "200").toInt();
 			//CB Reset prefs zoom step value to 200% instead of old values.
-			if (appPrefs.opToolPrefs.magStep<100)
-				appPrefs.opToolPrefs.magStep=200;
+			if (appPrefs.opToolPrefs.magStep <= 100)
+				appPrefs.opToolPrefs.magStep = 200;
 			appPrefs.itemToolPrefs.imageFillColor = dc.attribute("CPICT", CommonStrings::None);
 			appPrefs.itemToolPrefs.imageFillColorShade = dc.attribute("PICTSHADE", "100").toInt();
 			appPrefs.itemToolPrefs.imageScaleX = ScCLocale::toDoubleC(dc.attribute("PICTSCX"), 1.0);
Index: scribus/plugins/fileloader/scribus13format/scribus13format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 14499)
+++ scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 14500)
@@ -410,8 +410,8 @@
 		m_Doc->opToolPrefs.magMax     = dc.attribute("MAGMAX", "3200").toInt();
 		m_Doc->opToolPrefs.magStep    = dc.attribute("MAGSTEP", "200").toInt();
 		//CB Reset doc zoom step value to 200% instead of old values.
-		if (m_Doc->opToolPrefs.magStep<100)
-			m_Doc->opToolPrefs.magStep=200;
+		if (m_Doc->opToolPrefs.magStep <= 100)
+			m_Doc->opToolPrefs.magStep = 200;
 		m_Doc->itemToolPrefs.textTabFillChar = dc.attribute("TabFill","");
 		m_Doc->itemToolPrefs.textTabWidth   = ScCLocale::toDoubleC(dc.attribute("TabWidth"), 36.0);
 		if (dc.hasAttribute("CPICT"))
Index: scribus/plugins/fileloader/scribus150format/scribus150format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(revision 14499)
+++ scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(revision 14500)
@@ -921,7 +921,7 @@
 	doc->opToolPrefs.dispY       = attrs.valueAsDouble("dispY", 10.0);
 	doc->opToolPrefs.constrain   = attrs.valueAsDouble("constrain", 15.0);
 	//CB Reset doc zoom step value to 200% instead of old values.
-	if (doc->opToolPrefs.magStep < 100)
+	if (doc->opToolPrefs.magStep <= 100)
 		doc->opToolPrefs.magStep = 200;
 	doc->itemToolPrefs.textTabFillChar = attrs.valueAsString("TabFill","");
 	doc->itemToolPrefs.textTabWidth   = attrs.valueAsDouble("TabWidth", 36.0);
Index: scribus/plugins/fileloader/scribus134format/scribus134format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 14499)
+++ scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 14500)
@@ -918,7 +918,7 @@
 	doc->opToolPrefs.dispY       = attrs.valueAsDouble("dispY", 10.0);
 	doc->opToolPrefs.constrain   = attrs.valueAsDouble("constrain", 15.0);
 	//CB Reset doc zoom step value to 200% instead of old values.
-	if (doc->opToolPrefs.magStep < 100)
+	if (doc->opToolPrefs.magStep <= 100)
 		doc->opToolPrefs.magStep = 200;
 	doc->itemToolPrefs.textTabFillChar = attrs.valueAsString("TabFill","");
 	doc->itemToolPrefs.textTabWidth   = attrs.valueAsDouble("TabWidth", 36.0);