r17174 by craig - #10016: Add in margin related variables

[scribus-commit]

Author: craig
Date: Tue Jan  3 20:12:33 2012
New Revision: 17174

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17174
Log:
#10016: Add in margin related variables

Modified:
    branches/Version14x/Scribus/scribus/about.cpp
    branches/Version14x/Scribus/scribus/pageitem.cpp

Modified: branches/Version14x/Scribus/scribus/about.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17174&path=/branches/Version14x/Scribus/scribus/about.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/about.cpp (original)
+++ branches/Version14x/Scribus/scribus/about.cpp Tue Jan  3 20:12:33 2012
@@ -114,7 +114,7 @@
 	buildID = new QLabel( tab );
 	buildID->setAlignment(Qt::AlignCenter);
 	buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
-	QString BUILD_DAY = "1";
+	QString BUILD_DAY = "3";
 	QString BUILD_MONTH = CommonStrings::january;
 	QString BUILD_YEAR = "2012";
 	QString BUILD_TIME = "";

Modified: branches/Version14x/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17174&path=/branches/Version14x/Scribus/scribus/pageitem.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/pageitem.cpp (original)
+++ branches/Version14x/Scribus/scribus/pageitem.cpp Tue Jan  3 20:12:33 2012
@@ -5828,6 +5828,10 @@
 	{
 		m_Doc->constants().insert("pagewidth", m_Doc->Pages->at(OwnPage)->width());
 		m_Doc->constants().insert("pageheight", m_Doc->Pages->at(OwnPage)->height());
+		m_Doc->constants().insert("marginleft", m_Doc->Pages->at(OwnPage)->Margins.Left);
+		m_Doc->constants().insert("marginright", m_Doc->Pages->at(OwnPage)->width() - m_Doc->Pages->at(OwnPage)->Margins.Right);
+		m_Doc->constants().insert("margintop", m_Doc->Pages->at(OwnPage)->Margins.Top);
+		m_Doc->constants().insert("marginbottom", m_Doc->Pages->at(OwnPage)->height() - m_Doc->Pages->at(OwnPage)->Margins.Bottom);
 	}
 	m_Doc->constants().insert("width", Width);
 	m_Doc->constants().insert("height", Height);