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

[scribus-commit]

Author: craig
Date: Tue Jan  3 20:12:24 2012
New Revision: 17173

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

Modified:
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/ui/about.cpp

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17173&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Tue Jan  3 20:12:24 2012
@@ -6930,6 +6930,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);

Modified: trunk/Scribus/scribus/ui/about.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17173&path=/trunk/Scribus/scribus/ui/about.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/about.cpp (original)
+++ trunk/Scribus/scribus/ui/about.cpp Tue Jan  3 20:12:24 2012
@@ -112,9 +112,9 @@
 	buildID = new QLabel( tab );
 	buildID->setAlignment(Qt::AlignCenter);
 	buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
-	QString BUILD_DAY = "23";
-	QString BUILD_MONTH = CommonStrings::december;
-	QString BUILD_YEAR = "2011";
+	QString BUILD_DAY = "3";
+	QString BUILD_MONTH = CommonStrings::january;
+	QString BUILD_YEAR = "2012";
 	QString BUILD_TIME = "";
 	QString BUILD_TZ = "";
 	QString BUILD_NAME = "";