r21901 by craig - Fix old function name typo

[scribus-commit]

Author: craig
Date: Fri Apr 14 21:57:55 2017
New Revision: 21901

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21901
Log:
Fix old function name typo

Modified:
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21901&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/CMakeLists.txt	Fri Apr 14 21:57:55 2017
@@ -379,7 +379,6 @@
 	ui/marknote.h
 	ui/marksmanager.h
 	ui/markvariabletext.h
-	ui/margindialog.h
 	ui/marginpresetlayout.h
 	ui/marginwidget.h
 	ui/newmarginwidget.h
@@ -403,6 +402,7 @@
 	ui/pagepalette_pages.h
 	ui/pagepalette_masterpages.h
 	ui/pagepalette_widgets.h
+	ui/pagepropertiesdialog.h
 	ui/pageselector.h
 	ui/paintmanager.h
 	ui/patternpropsdialog.h
@@ -851,7 +851,6 @@
 	ui/marknote.cpp
 	ui/marksmanager.cpp
 	ui/markvariabletext.cpp
-	ui/margindialog.cpp
 	ui/marginpresetlayout.cpp
 	ui/marginwidget.cpp
 	ui/newmarginwidget.cpp
@@ -875,6 +874,7 @@
 	ui/pagepalette_pages.cpp
 	ui/pagepalette_masterpages.cpp
 	ui/pagepalette_widgets.cpp
+	ui/pagepropertiesdialog.cpp
 	ui/pageselector.cpp
 	ui/paintmanager.cpp
 	ui/patternpropsdialog.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21901&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Fri Apr 14 21:57:55 2017
@@ -188,7 +188,7 @@
 #include "ui/javadocs.h"
 #include "ui/layers.h"
 #include "ui/loremipsum.h"
-#include "ui/margindialog.h"
+#include "ui/pagepropertiesdialog.h"
 #include "ui/marginwidget.h"
 #include "ui/mark2item.h"
 #include "ui/mark2mark.h"
@@ -6260,13 +6260,13 @@
 	if (doc->appMode == modeEditClip)
 		view->requestMode(submodeEndNodeEdit);
 	QString currPageMasterPageName(doc->currentPage()->MPageNam);
-	MarginDialog *dia = new MarginDialog(this, doc);
+	PagePropertiesDialog *dia = new PagePropertiesDialog(this, doc);
 	if (dia->exec())
 	{
 		int orientation = dia->getPageOrientation();
 		double pageHeight = dia->getPageHeight();
 		double pageWidth = dia->getPageWidth();
-		QString pageSizeName = dia->getpPrefsPageSizeName();
+		QString pageSizeName = dia->getPrefsPageSizeName();
 		int lp=0;
 		if (doc->masterPageMode() && doc->pagePositioning() != singlePage)
 			lp = dia->pageOrder();