r21215 by jghali -

[scribus-commit]

Author: jghali
Date: Mon Apr 18 20:45:38 2016
New Revision: 21215

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21215
Log:
do not limit pathtext properties to point unit

Modified:
    branches/Version14x/Scribus/scribus/propertiespalette.cpp

Modified: branches/Version14x/Scribus/scribus/propertiespalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21215&path=/branches/Version14x/Scribus/scribus/propertiespalette.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/propertiespalette.cpp	(original)
+++ branches/Version14x/Scribus/scribus/propertiespalette.cpp	Mon Apr 18 20:45:38 2016
@@ -2290,8 +2290,8 @@
 		pathTextType->setCurrentIndex(CurItem->textPathType);
 		flippedPathText->setChecked(CurItem->textPathFlipped);
 		showcurveCheckBox->setChecked(CurItem->PoShow);
-		LineW->setValue(CurItem->BaseOffs * -1);
-		Dist->setValue(CurItem->textToFrameDistLeft());
+		LineW->setValue(CurItem->BaseOffs * -1 * m_unitRatio);
+		Dist->setValue(CurItem->textToFrameDistLeft() * m_unitRatio);
 		flopItem->setHidden(true);
 		DistanceItem->setHidden(true);
 		Distance2Item->setHidden(false);
@@ -2703,6 +2703,9 @@
     DRight->setNewUnit( m_unitIndex );
     RoundRect->setNewUnit( m_unitIndex );
     LSize->setNewUnit( m_unitIndex );
+
+	Dist->setNewUnit( m_unitIndex );
+	LineW->setNewUnit( m_unitIndex );
 /*
 	double maxXYWHVal=30000 * m_unitRatio;
 	double minXYVal=-30000 * m_unitRatio;
@@ -5052,7 +5055,7 @@
 {
 	if (!HaveDoc || !HaveItem || !m_ScMW || m_ScMW->scriptIsRunning())
 		return;
-	CurItem->setTextToFrameDistLeft(Dist->value());
+	CurItem->setTextToFrameDistLeft(Dist->value() / m_unitRatio);
 	doc->AdjustItemSize(CurItem);
 	CurItem->updatePolyClip();
 	CurItem->update();
@@ -5063,7 +5066,7 @@
 {
 	if (!HaveDoc || !HaveItem || !m_ScMW || m_ScMW->scriptIsRunning())
 		return;
-	CurItem->BaseOffs = -LineW->value();
+	CurItem->BaseOffs = -LineW->value() / m_unitRatio;
 	doc->AdjustItemSize(CurItem);
 	CurItem->updatePolyClip();
 	CurItem->update();
@@ -5472,8 +5475,6 @@
 	maxGlyphExtSpinBox->setSuffix(pctSuffix);
 	
 	QString ptSuffix = tr(" pt");
-	Dist->setSuffix(ptSuffix);
-	LineW->setSuffix(ptSuffix);
 	Size->setSuffix(ptSuffix);
 	LineSp->setSuffix(ptSuffix);
 
@@ -5493,6 +5494,9 @@
 	DBottom->setSuffix(ein);
 	DRight->setSuffix(ein);
 	RoundRect->setSuffix(ein);
+
+	Dist->setSuffix(ein);
+	LineW->setSuffix(ein);
 
 	SeStyle->languageChange();
 	GroupAlign->languageChange();