r18963 by fschmid - Bump maximum zoom to 32000%

[scribus-commit]

Author: fschmid
Date: Sun Mar 30 09:49:08 2014
New Revision: 18963

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18963
Log:
Bump maximum zoom to 32000%

Modified:
    trunk/Scribus/scribus/prefsmanager.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribusview.cpp
    trunk/Scribus/scribus/ui/prefs_operatortoolsbase.ui

Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18963&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp (original)
+++ trunk/Scribus/scribus/prefsmanager.cpp Sun Mar 30 09:49:08 2014
@@ -262,7 +262,7 @@
 	appPrefs.itemToolPrefs.lineStartArrow = 0;
 	appPrefs.itemToolPrefs.lineEndArrow = 0;
 	appPrefs.opToolPrefs.magMin = 1;
-	appPrefs.opToolPrefs.magMax = 3200;
+	appPrefs.opToolPrefs.magMax = 32000;
 	appPrefs.opToolPrefs.magStep = 25;
 	qDebug()<<ScQApp->currGUILanguage();
 	appPrefs.docSetupPrefs.docUnitIndex = unitIndexFromString(LocaleManager::instance()->unitForLocale(ScQApp->currGUILanguage()));
@@ -2156,7 +2156,7 @@
 		if (dc.tagName()=="OperatorTools")
 		{
 			appPrefs.opToolPrefs.magMin  = dc.attribute("MinimumMagnification", "1").toInt();
-			appPrefs.opToolPrefs.magMax  = dc.attribute("MaximumMagnification", "3200").toInt();
+			appPrefs.opToolPrefs.magMax  = dc.attribute("MaximumMagnification", "32000").toInt();
 			appPrefs.opToolPrefs.magStep = dc.attribute("MagnificationStep", "25").toInt();
 			if (appPrefs.opToolPrefs.magStep < 0)
 				appPrefs.opToolPrefs.magStep = 25;

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18963&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sun Mar 30 09:49:08 2014
@@ -7226,6 +7226,7 @@
 					int h = qRound(qMin(scw_v->visibleHeight() / scw_v->scale(), scw->doc()->currentPage()->height()));
 					scw_v->rememberOldZoomLocation(w / 2 + x,h / 2 + y);
 					scw_v->zoom((scw_v->scale() / oldPrefs.displayPrefs.displayScale) * prefsManager->displayScale());
+					scw_v->zoomSpinBox->setMaximum(doc->opToolPrefs().magMax);
 				}
 				if (shadowChanged)
 					scw->view()->DrawNew();

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18963&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Sun Mar 30 09:49:08 2014
@@ -196,7 +196,7 @@
 // 	setCurrentComboItem(previewQualitySwitcher, tr("Normal"));
 	previewQualitySwitcher->setCurrentIndex(Prefs->itemToolPrefs.imageLowResType);
 
-	zoomSpinBox = new ScrSpinBox( 1, 3200, this, 6 );
+	zoomSpinBox = new ScrSpinBox( 1, 32000, this, 6 );
 	zoomSpinBox->setTabAdvance(false);
 	zoomSpinBox->setFont(fo);
 	zoomSpinBox->setValue( 100 );
@@ -4130,7 +4130,7 @@
 	double v2=Doc->opToolPrefs().magMax*Prefs->displayPrefs.displayScale/100.0;
 	if (Scale > v2)
 		Scale=v2;
-	double v3=32*Prefs->displayPrefs.displayScale;
+	double v3=320*Prefs->displayPrefs.displayScale;
 	if (Scale > v3)
 		Scale=v3;
 
@@ -4384,7 +4384,7 @@
 {
 	QPoint canvasPoint;
 	QPoint globalPoint = m_canvas->canvasToGlobal(QPointF(canvasX, canvasY));
-	double newScale    = (scale > 32*Prefs->displayPrefs.displayScale) ? (32*Prefs->displayPrefs.displayScale) : scale;
+	double newScale    = (scale > (Prefs->opToolPrefs.magMax / 100) * Prefs->displayPrefs.displayScale) ? ((Prefs->opToolPrefs.magMax / 100) * Prefs->displayPrefs.displayScale) : scale;
 	undoManager->setUndoEnabled(false);
 	updatesOn(false);
 	setScale(newScale);

Modified: trunk/Scribus/scribus/ui/prefs_operatortoolsbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18963&path=/trunk/Scribus/scribus/ui/prefs_operatortoolsbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_operatortoolsbase.ui (original)
+++ trunk/Scribus/scribus/ui/prefs_operatortoolsbase.ui Sun Mar 30 09:49:08 2014
@@ -105,7 +105,7 @@
             <number>10</number>
            </property>
            <property name="maximum">
-            <number>3200</number>
+            <number>32000</number>
            </property>
           </widget>
          </item>