diff options
| author | craig <craig@11d20701-8431-0410-a711-e3c959e3b870> | 2012-01-03 20:12:33 +0000 |
|---|---|---|
| committer | craig <craig@11d20701-8431-0410-a711-e3c959e3b870> | 2012-01-03 20:12:33 +0000 |
| commit | c7121e7a5edae3d64a81a7e345e4e7782de86a14 (patch) | |
| tree | a372b91d4f47241d2e481efdf482b0ca13d5ddf8 | |
| parent | a16e353700dd4fd51befa2fd6a8a342fe87e7fcf (diff) | |
| download | scribus-c7121e7a5edae3d64a81a7e345e4e7782de86a14.tar.gz scribus-c7121e7a5edae3d64a81a7e345e4e7782de86a14.tar.xz scribus-c7121e7a5edae3d64a81a7e345e4e7782de86a14.zip | |
#10016: Add in margin related variables
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17174 11d20701-8431-0410-a711-e3c959e3b870
| -rw-r--r-- | scribus/about.cpp | 2 | ||||
| -rw-r--r-- | scribus/pageitem.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scribus/about.cpp b/scribus/about.cpp index 9cfb618..eda50ac 100644 --- a/scribus/about.cpp +++ b/scribus/about.cpp @@ -114,7 +114,7 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent ) 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 = ""; diff --git a/scribus/pageitem.cpp b/scribus/pageitem.cpp index 9f30a0d..4a05a2d 100644 --- a/scribus/pageitem.cpp +++ b/scribus/pageitem.cpp @@ -5828,6 +5828,10 @@ void PageItem::updateConstants() { 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); |