r20506 by jghali -

[scribus-commit]

Author: jghali
Date: Wed Oct 28 13:04:56 2015
New Revision: 20506

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20506
Log:
#12683: add width and height variables in the image position fields of the PP <ibrahim>

Modified:
    trunk/Scribus/scribus/ui/propertiespalette_image.cpp
    trunk/Scribus/scribus/ui/propertiespalette_image.h

Modified: trunk/Scribus/scribus/ui/propertiespalette_image.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20506&path=/trunk/Scribus/scribus/ui/propertiespalette_image.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_image.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_image.cpp	Wed Oct 28 13:04:56 2015
@@ -112,6 +112,16 @@
 	connect(compressionQuality , SIGNAL(activated(int))      , this, SLOT(handleCompressionQuality()));
 }
 
+void PropertiesPalette_Image::updateSpinBoxConstants()
+{
+	if (!m_haveDoc)
+		return;
+	if(m_doc->m_Selection->count()==0)
+		return;
+	imageXOffsetSpinBox->setConstants(&m_doc->constants());
+	imageYOffsetSpinBox->setConstants(&m_doc->constants());
+}
+
 void PropertiesPalette_Image::changeEvent(QEvent *e)
 {
 	if (e->type() == QEvent::LanguageChange)
@@ -159,6 +169,7 @@
 	imageYScaleSpinBox->setValues( 1, 30000, 2, 1);
 	imgDpiX->setValues( 1, 30000, 2, 1);
 	imgDpiY->setValues( 1, 30000, 2, 1);
+	updateSpinBoxConstants();
 
 	connect(m_doc->m_Selection, SIGNAL(selectionChanged()), this, SLOT(handleSelectionChanged()));
 	connect(m_doc             , SIGNAL(docChanged())      , this, SLOT(handleSelectionChanged()));
@@ -528,6 +539,7 @@
 	{
 		setEnabled(false);
 	}
+	updateSpinBoxConstants();
 }
 
 void PropertiesPalette_Image::handleLocalXY()

Modified: trunk/Scribus/scribus/ui/propertiespalette_image.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20506&path=/trunk/Scribus/scribus/ui/propertiespalette_image.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_image.h	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_image.h	Wed Oct 28 13:04:56 2015
@@ -77,6 +77,7 @@
 protected slots:
 	void spinboxStartUserAction();
 	void spinboxFinishUserAction();
+	void updateSpinBoxConstants();
 
 private slots: