r21898 by craig - Rename MarginDialog 1/2

[scribus-commit]

Author: craig
Date: Fri Apr 14 21:50:15 2017
New Revision: 21898

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21898
Log:
Rename MarginDialog 1/2

Modified:
    trunk/Scribus/scribus/ui/margindialog.cpp
    trunk/Scribus/scribus/ui/margindialog.h
    trunk/Scribus/scribus/ui/scdockpalette.h

Modified: trunk/Scribus/scribus/ui/margindialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21898&path=/trunk/Scribus/scribus/ui/margindialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/margindialog.cpp	(original)
+++ trunk/Scribus/scribus/ui/margindialog.cpp	Fri Apr 14 21:50:15 2017
@@ -26,7 +26,7 @@
 #include "scrspinbox.h"
 #include "units.h"
 
-MarginDialog::MarginDialog( QWidget* parent, ScribusDoc* doc ) : QDialog( parent)
+PagePopertiesDialog::PagePopertiesDialog( QWidget* parent, ScribusDoc* doc ) : QDialog( parent)
 {
 	setModal(true);
 	setWindowTitle( tr( "Manage Page Properties" ) );
@@ -193,7 +193,7 @@
 	resize(minimumSizeHint());
 }
 
-void MarginDialog::setPageWidth(double)
+void PagePopertiesDialog::setPageWidth(double)
 {
 	pageWidth = widthSpinBox->value() / unitRatio;
 	marginWidget->setPageWidth(pageWidth);
@@ -207,7 +207,7 @@
 	}
 }
 
-void MarginDialog::setPageHeight(double)
+void PagePopertiesDialog::setPageHeight(double)
 {
 	pageHeight = heightSpinBox->value() / unitRatio;
 	marginWidget->setPageHeight(pageHeight);
@@ -221,14 +221,14 @@
 	}
 }
 
-void MarginDialog::setPageSize()
+void PagePopertiesDialog::setPageSize()
 {
 	if (sizeQComboBox->currentText() != CommonStrings::trCustomPageSize)
 		oldOri++;
 	setOrientation(orientationQComboBox->currentIndex());
 }
 
-void MarginDialog::setSize(const QString & gr)
+void PagePopertiesDialog::setSize(const QString & gr)
 {
 	pageWidth = widthSpinBox->value() / unitRatio;
 	pageHeight = heightSpinBox->value() / unitRatio;
@@ -259,7 +259,7 @@
 	delete ps2;
 }
 
-void MarginDialog::setOrientation(int ori)
+void PagePopertiesDialog::setOrientation(int ori)
 {
 	setSize(sizeQComboBox->currentText());
 	disconnect(widthSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setPageWidth(double)));
@@ -286,7 +286,7 @@
 	connect(heightSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setPageHeight(double)));
 }
 
-int MarginDialog::pageOrder()
+int PagePopertiesDialog::pageOrder()
 {
 	int lp=0;
 	if (Links!=0)
@@ -300,59 +300,59 @@
 	return lp;
 }
 
-double MarginDialog::getPageWidth()
+double PagePopertiesDialog::getPageWidth()
 {
 	return pageWidth;
 }
 
-double MarginDialog::getPageHeight()
+double PagePopertiesDialog::getPageHeight()
 {
 	return pageHeight;
 }
 
-int MarginDialog::getPageOrientation()
+int PagePopertiesDialog::getPageOrientation()
 {
 	return orientationQComboBox->currentIndex();
 }
 
-QString MarginDialog::getpPrefsPageSizeName()
+QString PagePopertiesDialog::getpPrefsPageSizeName()
 {
 	return prefsPageSizeName;
 }
 
-bool MarginDialog::getMoveObjects()
+bool PagePopertiesDialog::getMoveObjects()
 {
 	return moveObjects->isChecked();
 }
 
-double MarginDialog::top()
+double PagePopertiesDialog::top()
 {
 	return marginWidget->top();
 }
 
-double MarginDialog::bottom()
+double PagePopertiesDialog::bottom()
 {
 	return marginWidget->bottom();
 }
 
-double MarginDialog::left()
+double PagePopertiesDialog::left()
 {
 	return marginWidget->left();
 }
 
-double MarginDialog::right()
+double PagePopertiesDialog::right()
 {
 	return marginWidget->right();
 }
 
-QString MarginDialog::masterPage()
+QString PagePopertiesDialog::masterPage()
 {
 	if (masterPageComboBox != NULL)
 		return masterPageComboBox->currentText();
 	return "";
 }
 
-int MarginDialog::getMarginPreset()
+int PagePopertiesDialog::getMarginPreset()
 {
 	return marginWidget->getMarginPreset();
 }

Modified: trunk/Scribus/scribus/ui/margindialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21898&path=/trunk/Scribus/scribus/ui/margindialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/margindialog.h	(original)
+++ trunk/Scribus/scribus/ui/margindialog.h	Fri Apr 14 21:50:15 2017
@@ -4,8 +4,8 @@
 a copyright and/or license notice that predates the release of Scribus 1.3.2
 for which a new license (GPL+exception) is in place.
 */
-#ifndef MARGINDIALOG_H
-#define MARGINDIALOG_H
+#ifndef PAGEPROPERTIESDIALOG_H
+#define PAGEPROPERTIESDIALOG_H
 
 #include "scribusapi.h"
 #include <QDialog>
@@ -25,7 +25,7 @@
 
 /*! \brief A dialog to setup the existing document margins.
 In modal mode called from void ScribusMainWindow::changePageProperties() */
-class SCRIBUS_API MarginDialog : public QDialog
+class SCRIBUS_API PagePopertiesDialog : public QDialog
 {
 	Q_OBJECT
 
@@ -33,8 +33,8 @@
 	/*! \brief GUI setup
 	\param parent Scribus main window in this case
 	\param doc current document */
-	MarginDialog( QWidget* parent,  ScribusDoc* doc);
-	~MarginDialog() {};
+	PagePopertiesDialog( QWidget* parent,  ScribusDoc* doc);
+	~PagePopertiesDialog() {}
 
 	/*! \brief Returns recomputed "Links" index/value for facing pages.
 	\retval int 0 for max item, 1 for min. item++ for middle. Why? */

Modified: trunk/Scribus/scribus/ui/scdockpalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21898&path=/trunk/Scribus/scribus/ui/scdockpalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/scdockpalette.h	(original)
+++ trunk/Scribus/scribus/ui/scdockpalette.h	Fri Apr 14 21:50:15 2017
@@ -41,7 +41,7 @@
 
 	public:
 		ScDockPalette( QWidget * parent = NULL, const QString& prefsContext = QString::null, Qt::WindowFlags f = 0 );
-		~ScDockPalette() {};
+		~ScDockPalette() {}
 		/** @brief Sample way to grab keystrokes, simply calls superclass at this point */
 		//virtual void keyPressEvent(QKeyEvent *keyEvent);
 		virtual void hide();