r13889 by cbradney - Rename guides preference variables and some prefs structs

scribus-commit scribus-commit at lists.scribus.net
Wed Aug 26 05:50:33 CEST 2009


Revision: 13889
Author: cbradney
Date: 2009-08-20T22:44:55.978918Z
Commit message: Rename guides preference variables and some prefs structs

Changeset: 
M  /trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
M  /trunk/Scribus/scribus/canvasmode_nodeedit.cpp
M  /trunk/Scribus/scribus/ui/reformdoc.cpp
M  /trunk/Scribus/scribus/canvasmode_rotate.cpp
M  /trunk/Scribus/scribus/scribusdoc.cpp
M  /trunk/Scribus/scribus/documentchecker.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
M  /trunk/Scribus/scribus/fileloader.cpp
M  /trunk/Scribus/scribus/ui/tabcheckdoc.cpp
M  /trunk/Scribus/scribus/canvasgesture_linemove.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
M  /trunk/Scribus/scribus/ui/tabdisplay.cpp
M  /trunk/Scribus/scribus/ui/tabtools.h
M  /trunk/Scribus/scribus/prefsmanager.cpp
M  /trunk/Scribus/scribus/canvasgesture_rulermove.cpp
M  /trunk/Scribus/scribus/scribus.cpp
M  /trunk/Scribus/scribus/ui/polygonwidget.h
M  /trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
M  /trunk/Scribus/scribus/ui/tabtypography.h
M  /trunk/Scribus/scribus/scpageoutput.cpp
M  /trunk/Scribus/scribus/canvasmode_edit.cpp
M  /trunk/Scribus/scribus/canvasmode_normal.cpp
M  /trunk/Scribus/scribus/ui/tabguides.h
M  /trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
M  /trunk/Scribus/scribus/pageitem.cpp
M  /trunk/Scribus/scribus/ui/prefs.cpp
M  /trunk/Scribus/scribus/canvasmode_drawbezier.cpp
M  /trunk/Scribus/scribus/canvasmode_create.cpp
M  /trunk/Scribus/scribus/ui/tabtools.cpp
M  /trunk/Scribus/scribus/canvasmode_legacy.cpp
M  /trunk/Scribus/scribus/scribusdoc.h
M  /trunk/Scribus/scribus/ui/polygonwidget.cpp
M  /trunk/Scribus/scribus/ui/tabtypography.cpp
M  /trunk/Scribus/scribus/pageitem_textframe.cpp
M  /trunk/Scribus/scribus/canvas.cpp
M  /trunk/Scribus/scribus/prefsstructs.h
M  /trunk/Scribus/scribus/ui/hruler.cpp
M  /trunk/Scribus/scribus/ui/tabdisplay.h
M  /trunk/Scribus/scribus/prefsmanager.h
M  /trunk/Scribus/scribus/ui/tabguides.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp

Diffs:
Index: scribus/documentchecker.cpp
===================================================================
--- scribus/documentchecker.cpp	(revision 13888)
+++ scribus/documentchecker.cpp	(revision 13889)
@@ -35,7 +35,7 @@
 {
 	PageItem* currItem;
 	QString chstr;
-	struct checkerPrefs checkerSettings;
+	struct CheckerPrefs checkerSettings;
 	checkerSettings.ignoreErrors = currDoc->checkerProfiles[currDoc->curCheckProfile].ignoreErrors;
 	checkerSettings.autoCheck = currDoc->checkerProfiles[currDoc->curCheckProfile].autoCheck;
 	checkerSettings.checkGlyphs = currDoc->checkerProfiles[currDoc->curCheckProfile].checkGlyphs;
Index: scribus/fileloader.cpp
===================================================================
--- scribus/fileloader.cpp	(revision 13888)
+++ scribus/fileloader.cpp	(revision 13889)
@@ -252,14 +252,14 @@
 bool FileLoader::LoadFile(ScribusDoc* currDoc)
 {
 	newReplacement = false;
-	currDoc->guidesSettings.marginsShown = prefsManager->appPrefs.guidesSettings.marginsShown;
-	currDoc->guidesSettings.framesShown = prefsManager->appPrefs.guidesSettings.framesShown;
-	currDoc->guidesSettings.layerMarkersShown = prefsManager->appPrefs.guidesSettings.layerMarkersShown;
-	currDoc->guidesSettings.gridShown = prefsManager->appPrefs.guidesSettings.gridShown;
-	currDoc->guidesSettings.guidesShown = prefsManager->appPrefs.guidesSettings.guidesShown;
-	currDoc->guidesSettings.colBordersShown = prefsManager->appPrefs.guidesSettings.colBordersShown;
-	currDoc->guidesSettings.baseShown = prefsManager->appPrefs.guidesSettings.baseShown;
-	currDoc->guidesSettings.linkShown = prefsManager->appPrefs.guidesSettings.linkShown;
+	currDoc->guidesSettings.marginsShown = prefsManager->appPrefs.guidesPrefs.marginsShown;
+	currDoc->guidesSettings.framesShown = prefsManager->appPrefs.guidesPrefs.framesShown;
+	currDoc->guidesSettings.layerMarkersShown = prefsManager->appPrefs.guidesPrefs.layerMarkersShown;
+	currDoc->guidesSettings.gridShown = prefsManager->appPrefs.guidesPrefs.gridShown;
+	currDoc->guidesSettings.guidesShown = prefsManager->appPrefs.guidesPrefs.guidesShown;
+	currDoc->guidesSettings.colBordersShown = prefsManager->appPrefs.guidesPrefs.colBordersShown;
+	currDoc->guidesSettings.baselineGridShown = prefsManager->appPrefs.guidesPrefs.baselineGridShown;
+	currDoc->guidesSettings.linkShown = prefsManager->appPrefs.guidesPrefs.linkShown;
 	currDoc->toolSettings.polyC = prefsManager->appPrefs.toolSettings.polyC;
 	currDoc->toolSettings.polyF = prefsManager->appPrefs.toolSettings.polyF;
 	currDoc->toolSettings.polyR = prefsManager->appPrefs.toolSettings.polyR;
Index: scribus/canvasmode_nodeedit.cpp
===================================================================
--- scribus/canvasmode_nodeedit.cpp	(revision 13888)
+++ scribus/canvasmode_nodeedit.cpp	(revision 13889)
@@ -341,8 +341,8 @@
 			Guides tmpGuides = m_doc->currentPage()->guides.horizontals(GuideManagerCore::Standard);
 			for (it = tmpGuides.begin(); it != tmpGuides.end(); ++it)
 			{
-				if ( (*it) + m_doc->currentPage()->yOffset() < npf.y() + m_doc->guidesSettings.grabRad * sc &&
-					 (*it) + m_doc->currentPage()->yOffset() > npf.y() - m_doc->guidesSettings.grabRad * sc )
+				if ( (*it) + m_doc->currentPage()->yOffset() < npf.y() + m_doc->guidesSettings.grabRadius * sc &&
+					 (*it) + m_doc->currentPage()->yOffset() > npf.y() - m_doc->guidesSettings.grabRadius * sc )
 				{
 					if ((m_canvas->m_viewMode.m_MouseButtonPressed) && (GyM != -1))
 						MoveGY = true;
@@ -358,8 +358,8 @@
 			tmpGuides = m_doc->currentPage()->guides.verticals(GuideManagerCore::Standard);
 			for (it = tmpGuides.begin(); it!= tmpGuides.end(); ++it)
 			{
-				if ( (*it) + m_doc->currentPage()->xOffset() < npf.x() + m_doc->guidesSettings.grabRad * sc &&
-					 (*it) + m_doc->currentPage()->xOffset() > npf.x() - m_doc->guidesSettings.grabRad * sc)
+				if ( (*it) + m_doc->currentPage()->xOffset() < npf.x() + m_doc->guidesSettings.grabRadius * sc &&
+					 (*it) + m_doc->currentPage()->xOffset() > npf.x() - m_doc->guidesSettings.grabRadius * sc)
 				{
 					if ((m_canvas->m_viewMode.m_MouseButtonPressed) && (GxM != -1))
 						MoveGX = true;
@@ -743,7 +743,7 @@
 			FPoint tangent = FPoint(0, 0);
 			FPoint nearPoint = FPoint(0, 0);
 			double nearT = 0.0;
-			QRect mpo2(0, 0, m_doc->guidesSettings.grabRad*3, m_doc->guidesSettings.grabRad*3);
+			QRect mpo2(0, 0, m_doc->guidesSettings.grabRadius*3, m_doc->guidesSettings.grabRadius*3);
 			mpo2.moveCenter(QPoint(qRound(npf2.x()), qRound(npf2.y())));
 			for (uint poi=0; poi<Clip.size()-3; poi += 4)
 			{
@@ -991,7 +991,7 @@
 		FPoint tangent = FPoint(0, 0);
 		FPoint nearPoint = FPoint(0, 0);
 		double nearT = 0.0;
-		QRect mpo2(0, 0, m_doc->guidesSettings.grabRad*3, m_doc->guidesSettings.grabRad*3);
+		QRect mpo2(0, 0, m_doc->guidesSettings.grabRadius*3, m_doc->guidesSettings.grabRadius*3);
 		mpo2.moveCenter(QPoint(qRound(npf2.x()), qRound(npf2.y())));
 		for (uint poi=0; poi<Clip.size()-3; poi += 4)
 		{
Index: scribus/canvasmode_drawfreehand.cpp
===================================================================
--- scribus/canvasmode_drawfreehand.cpp	(revision 13888)
+++ scribus/canvasmode_drawfreehand.cpp	(revision 13889)
@@ -269,7 +269,7 @@
 	m_view->registerMousePress(m->globalPos());
 	Mxp = mousePointDoc.x(); //qRound(m->x()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.x());
 	Myp = mousePointDoc.y(); //qRound(m->y()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.y());
-	QRect mpo(m->x()-m_doc->guidesSettings.grabRad, m->y()-m_doc->guidesSettings.grabRad, m_doc->guidesSettings.grabRad*2, m_doc->guidesSettings.grabRad*2);
+	QRect mpo(m->x()-m_doc->guidesSettings.grabRadius, m->y()-m_doc->guidesSettings.grabRadius, m_doc->guidesSettings.grabRadius*2, m_doc->guidesSettings.grabRadius*2);
 //	mpo.moveBy(qRound(m_doc->minCanvasCoordinate.x() * m_canvas->scale()), qRound(m_doc->minCanvasCoordinate.y() * m_canvas->scale()));
 	Rxp = m_doc->ApplyGridF(FPoint(Mxp, Myp)).x();
 	Rxpd = Mxp - Rxp;
@@ -1012,7 +1012,7 @@
 	FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
 	Mxp = mousePointDoc.x(); //static_cast<int>(m->x()/m_canvas->scale());
 	Myp = mousePointDoc.y(); //static_cast<int>(m->y()/m_canvas->scale());
-	QRect mpo(m->x()-m_doc->guidesSettings.grabRad, m->y()-m_doc->guidesSettings.grabRad, m_doc->guidesSettings.grabRad*2, m_doc->guidesSettings.grabRad*2);
+	QRect mpo(m->x()-m_doc->guidesSettings.grabRadius, m->y()-m_doc->guidesSettings.grabRadius, m_doc->guidesSettings.grabRadius*2, m_doc->guidesSettings.grabRadius*2);
 //	mpo.moveBy(qRound(Doc->minCanvasCoordinate.x() * m_canvas->scale()), qRound(m_doc->minCanvasCoordinate.y() * m_canvas->scale()));
 	m_doc->nodeEdit.deselect();
 	m_view->Deselect(false);
Index: scribus/canvasmode_create.cpp
===================================================================
--- scribus/canvasmode_create.cpp	(revision 13888)
+++ scribus/canvasmode_create.cpp	(revision 13889)
@@ -249,8 +249,8 @@
 			{
 				if (m_doc->useRaster)
 				{
-					newX = qRound(newX / m_doc->guidesSettings.minorGrid) * m_doc->guidesSettings.minorGrid;
-					newY = qRound(newY / m_doc->guidesSettings.minorGrid) * m_doc->guidesSettings.minorGrid;
+					newX = qRound(newX / m_doc->guidesSettings.minorGridSpacing) * m_doc->guidesSettings.minorGridSpacing;
+					newY = qRound(newY / m_doc->guidesSettings.minorGridSpacing) * m_doc->guidesSettings.minorGridSpacing;
 				}
 				if (m->modifiers() & Qt::ControlModifier)
 				{
@@ -317,7 +317,7 @@
 //	oldClip = 0;
 	m->accept();
 	m_view->registerMousePress(m->globalPos());
-	QRect mpo(m->x()-m_doc->guidesSettings.grabRad, m->y()-m_doc->guidesSettings.grabRad, m_doc->guidesSettings.grabRad*2, m_doc->guidesSettings.grabRad*2);
+	QRect mpo(m->x()-m_doc->guidesSettings.grabRadius, m->y()-m_doc->guidesSettings.grabRadius, m_doc->guidesSettings.grabRadius*2, m_doc->guidesSettings.grabRadius*2);
 //	mpo.moveBy(qRound(m_doc->minCanvasCoordinate.x() * m_canvas->scale()), qRound(m_doc->minCanvasCoordinate.y() * m_canvas->scale()));
 	canvasPressCoord = mousePointDoc;
 	createObjectMode = m_doc->appMode;
@@ -416,7 +416,7 @@
 	m_MouseButtonPressed = true;
 	FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
 	canvasPressCoord     = mousePointDoc;
-	QRect mpo(m->x()-m_doc->guidesSettings.grabRad, m->y()-m_doc->guidesSettings.grabRad, m_doc->guidesSettings.grabRad*2, m_doc->guidesSettings.grabRad*2);
+	QRect mpo(m->x()-m_doc->guidesSettings.grabRadius, m->y()-m_doc->guidesSettings.grabRadius, m_doc->guidesSettings.grabRadius*2, m_doc->guidesSettings.grabRadius*2);
 //	mpo.moveBy(qRound(Doc->minCanvasCoordinate.x() * m_canvas->scale()), qRound(m_doc->minCanvasCoordinate.y() * m_canvas->scale()));
 	m_doc->nodeEdit.deselect();
 	m_view->Deselect(false);
Index: scribus/canvasmode_legacy.cpp
===================================================================
--- scribus/canvasmode_legacy.cpp	(revision 13888)
+++ scribus/canvasmode_legacy.cpp	(revision 13889)
@@ -509,7 +509,7 @@
 	}
 	if ((m_doc->guidesSettings.guidesShown) && (m_doc->appMode == modeNormal) && (!m_doc->GuideLock) && (m_doc->OnPage(mousePointDoc.x(), mousePointDoc.y()) != -1) )
 	{
-		if( ((m_doc->guidesSettings.before) && (m_canvas->itemUnderCursor(m->globalPos()))) == false )
+		if( ((m_doc->guidesSettings.guidePlacement) && (m_canvas->itemUnderCursor(m->globalPos()))) == false )
 		{
 			if (!guideMoveGesture)
 			{
@@ -627,8 +627,8 @@
 		{
 			if ((m_doc->useRaster) && (m_doc->OnPage(currItem) != -1))
 			{
-				newX = qRound(newX / m_doc->guidesSettings.minorGrid) * m_doc->guidesSettings.minorGrid;
-				newY = qRound(newY / m_doc->guidesSettings.minorGrid) * m_doc->guidesSettings.minorGrid;
+				newX = qRound(newX / m_doc->guidesSettings.minorGridSpacing) * m_doc->guidesSettings.minorGridSpacing;
+				newY = qRound(newY / m_doc->guidesSettings.minorGridSpacing) * m_doc->guidesSettings.minorGridSpacing;
 			}
 			m_canvas->newRedrawPolygon() << QPoint(qRound(newX - currItem->xPos()), qRound(newY - currItem->yPos()));
 			m_view->updateContents();
@@ -646,8 +646,8 @@
 			}
 			if ((m_doc->useRaster) && (m_doc->OnPage(currItem) != -1))
 			{
-				newX = qRound(newX / m_doc->guidesSettings.minorGrid) * m_doc->guidesSettings.minorGrid;
-				newY = qRound(newY / m_doc->guidesSettings.minorGrid) * m_doc->guidesSettings.minorGrid;
+				newX = qRound(newX / m_doc->guidesSettings.minorGridSpacing) * m_doc->guidesSettings.minorGridSpacing;
+				newY = qRound(newY / m_doc->guidesSettings.minorGridSpacing) * m_doc->guidesSettings.minorGridSpacing;
 			}
 			QMatrix mp = currItem->getTransform();
 //			mp.translate(currItem->xPos(),// - m_doc->minCanvasCoordinate.x(), 
@@ -665,8 +665,8 @@
 		{
 			if (m_doc->useRaster)
 			{
-				newX = qRound(newX / m_doc->guidesSettings.minorGrid) * m_doc->guidesSettings.minorGrid;
-				newY = qRound(newY / m_doc->guidesSettings.minorGrid) * m_doc->guidesSettings.minorGrid;
+				newX = qRound(newX / m_doc->guidesSettings.minorGridSpacing) * m_doc->guidesSettings.minorGridSpacing;
+				newY = qRound(newY / m_doc->guidesSettings.minorGridSpacing) * m_doc->guidesSettings.minorGridSpacing;
 			}
 			double newRot=xy2Deg(newX - currItem->xPos(), newY - currItem->yPos());
 			//Constrain rotation angle, when the mouse is being dragged around for a new line
@@ -1229,7 +1229,7 @@
 					break;
 				QMatrix p;
 				m_canvas->Transform(currItem, p);
-				QRect mpo = QRect(m->x()-m_doc->guidesSettings.grabRad, m->y()-m_doc->guidesSettings.grabRad, m_doc->guidesSettings.grabRad*2, m_doc->guidesSettings.grabRad*2);
+				QRect mpo = QRect(m->x()-m_doc->guidesSettings.grabRadius, m->y()-m_doc->guidesSettings.grabRadius, m_doc->guidesSettings.grabRadius*2, m_doc->guidesSettings.grabRadius*2);
 //				mpo.moveBy(qRound(m_doc->minCanvasCoordinate.x() * m_canvas->scale()), qRound(m_doc->minCanvasCoordinate.y() * m_canvas->scale()));
 				if ((QRegion(p.map(QPolygon(QRect(-3, -3, static_cast<int>(currItem->width()+6), static_cast<int>(currItem->height()+6))))).contains(mpo))
 					&& ((m_doc->appMode == modeNormal) || (m_doc->appMode == modeRotation) || (m_doc->appMode == modeEdit)))
@@ -1341,7 +1341,7 @@
 	m_view->registerMousePress(m->globalPos());
 	Mxp = mousePointDoc.x(); //qRound(m->x()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.x());
 	Myp = mousePointDoc.y(); //qRound(m->y()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.y());
-	QRect mpo(m->x()-m_doc->guidesSettings.grabRad, m->y()-m_doc->guidesSettings.grabRad, m_doc->guidesSettings.grabRad*2, m_doc->guidesSettings.grabRad*2);
+	QRect mpo(m->x()-m_doc->guidesSettings.grabRadius, m->y()-m_doc->guidesSettings.grabRadius, m_doc->guidesSettings.grabRadius*2, m_doc->guidesSettings.grabRadius*2);
 //	mpo.moveBy(qRound(m_doc->minCanvasCoordinate.x() * m_canvas->scale()), qRound(m_doc->minCanvasCoordinate.y() * m_canvas->scale()));
 	if (m_doc->appMode != modeEdit)
 	{
@@ -4216,7 +4216,7 @@
 	FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
 	Mxp = mousePointDoc.x(); //static_cast<int>(m->x()/m_canvas->scale());
 	Myp = mousePointDoc.y(); //static_cast<int>(m->y()/m_canvas->scale());
-	QRect mpo(m->x()-m_doc->guidesSettings.grabRad, m->y()-m_doc->guidesSettings.grabRad, m_doc->guidesSettings.grabRad*2, m_doc->guidesSettings.grabRad*2);
+	QRect mpo(m->x()-m_doc->guidesSettings.grabRadius, m->y()-m_doc->guidesSettings.grabRadius, m_doc->guidesSettings.grabRadius*2, m_doc->guidesSettings.grabRadius*2);
 //	mpo.moveBy(qRound(Doc->minCanvasCoordinate.x() * m_canvas->scale()), qRound(m_doc->minCanvasCoordinate.y() * m_canvas->scale()));
 	m_doc->nodeEdit.deselect();
 	m_view->Deselect(false);
@@ -4270,14 +4270,14 @@
 	FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
 	Mxp = mousePointDoc.x(); //m->x()/m_canvas->scale());
 	Myp = mousePointDoc.y(); //m->y()/m_canvas->scale());
-	double grabRadius = m_doc->guidesSettings.grabRad / m_canvas->scale();
+	double grabRadius = m_doc->guidesSettings.grabRadius / m_canvas->scale();
 	int MxpS = static_cast<int>(mousePointDoc.x()); //m->x()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.x());
 	int MypS = static_cast<int>(mousePointDoc.y()); //m->y()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.y());
 	mpo = QRectF(Mxp-grabRadius, Myp-grabRadius, grabRadius*2, grabRadius*2);
 //	mpo.translate(m_doc->minCanvasCoordinate.x() * m_canvas->scale(), m_doc->minCanvasCoordinate.y() * m_canvas->scale());
 	m_doc->nodeEdit.deselect();
 // 	int a;
-	if(!m_doc->guidesSettings.before) // guides are on foreground and want to be processed first
+	if(!m_doc->guidesSettings.guidePlacement) // guides are on foreground and want to be processed first
 	{
 		if ((m_doc->guidesSettings.guidesShown) && (m_doc->appMode == modeNormal) /*&& (!m_doc->GuideLock)*/ && (m_doc->OnPage(MxpS, MypS) != -1))
 		{
@@ -4886,12 +4886,12 @@
 	FPoint n1(currItem->width(), currItem->height(), currItem->xPos(), currItem->yPos(), currItem->rotation(), 1, 1);
 	//	n1 -= QPoint(qRound(m_doc->minCanvasCoordinate.x()), qRound(m_doc->minCanvasCoordinate.y()));
 	d1 = sqrt(pow(n1.x() * m_canvas->scale() - m->x(),2)+pow(n1.y() * m_canvas->scale() - m->y(),2));
-	if (d1 < m_doc->guidesSettings.grabRad)
+	if (d1 < m_doc->guidesSettings.grabRadius)
 		distance.insert(d1, 1);
 	n1 = FPoint(0, 0, currItem->xPos(), currItem->yPos(), currItem->rotation(), 1, 1);
 	//	n1 -= QPoint(qRound(m_doc->minCanvasCoordinate.x()), qRound(m_doc->minCanvasCoordinate.y()));
 	d1 = sqrt(pow(n1.x() * m_canvas->scale() - m->x(),2)+pow(n1.y() * m_canvas->scale() - m->y(),2));
-	if (d1 < m_doc->guidesSettings.grabRad)
+	if (d1 < m_doc->guidesSettings.grabRadius)
 		distance.insert(d1, 2);
 	if (!currItem->asLine())
 	{
@@ -4899,32 +4899,32 @@
 		n1 = FPoint(currItem->width(), 0, currItem->xPos(), currItem->yPos(), currItem->rotation(), 1, 1);
 		//		n1 -= docMinCanvasCoordinate;
 		d1 = sqrt(pow(n1.x() * m_canvas->scale() - m->x(),2)+pow(n1.y() * m_canvas->scale() - m->y(),2));
-		if (d1 < m_doc->guidesSettings.grabRad)
+		if (d1 < m_doc->guidesSettings.grabRadius)
 			distance.insert(d1, 3);
 		n1 = FPoint(0, currItem->height(), currItem->xPos(), currItem->yPos(), currItem->rotation(), 1, 1);
 		//		n1 -= docMinCanvasCoordinate;
 		d1 = sqrt(pow(n1.x() * m_canvas->scale() - m->x(),2)+pow(n1.y() * m_canvas->scale() - m->y(),2));
-		if (d1 < m_doc->guidesSettings.grabRad)
+		if (d1 < m_doc->guidesSettings.grabRadius)
 			distance.insert(d1, 4);
 		n1 = FPoint(currItem->width()/2, currItem->height(), currItem->xPos(), currItem->yPos(), currItem->rotation(), 1, 1);
 		//		n1 -= docMinCanvasCoordinate;
 		d1 = sqrt(pow(n1.x() * m_canvas->scale() - m->x(),2)+pow(n1.y() * m_canvas->scale() - m->y(),2));
-		if (d1 < m_doc->guidesSettings.grabRad)
+		if (d1 < m_doc->guidesSettings.grabRadius)
 			distance.insert(d1, 5);
 		n1 = FPoint(currItem->width(), currItem->height()/2, currItem->xPos(), currItem->yPos(), currItem->rotation(), 1, 1);
 		//		n1 -= docMinCanvasCoordinate;
 		d1 = sqrt(pow(n1.x() * m_canvas->scale() - m->x(),2)+pow(n1.y() * m_canvas->scale() - m->y(),2));
-		if (d1 < m_doc->guidesSettings.grabRad)
+		if (d1 < m_doc->guidesSettings.grabRadius)
 			distance.insert(d1, 6);
 		n1 = FPoint(0, currItem->height()/2, currItem->xPos(), currItem->yPos(), currItem->rotation(), 1, 1);
 		//		n1 -= docMinCanvasCoordinate;
 		d1 = sqrt(pow(n1.x() * m_canvas->scale() - m->x(),2)+pow(n1.y() * m_canvas->scale() - m->y(),2));
-		if (d1 < m_doc->guidesSettings.grabRad)
+		if (d1 < m_doc->guidesSettings.grabRadius)
 			distance.insert(d1, 7);
 		n1 = FPoint(currItem->width()/2, 0, currItem->xPos(), currItem->yPos(), currItem->rotation(), 1, 1);
 		//		n1 -= docMinCanvasCoordinate;
 		d1 = sqrt(pow(n1.x() * m_canvas->scale() - m->x(),2)+pow(n1.y() * m_canvas->scale() - m->y(),2));
-		if (d1 < m_doc->guidesSettings.grabRad)
+		if (d1 < m_doc->guidesSettings.grabRadius)
 			distance.insert(d1, 8);
 	}
 	QList<int> result = distance.values();
Index: scribus/scribusdoc.cpp
===================================================================
--- scribus/scribusdoc.cpp	(revision 13888)
+++ scribus/scribusdoc.cpp	(revision 13889)
@@ -173,7 +173,7 @@
 	CurrentSel(-1),
 	nodeEdit(),
 	typographicSettings(prefsData.typographicSettings),
-	guidesSettings(prefsData.guidesSettings),
+	guidesSettings(prefsData.guidesPrefs),
 	toolSettings(prefsData.toolSettings),
 	checkerProfiles(prefsData.checkerProfiles),
 	curCheckProfile(prefsData.curCheckProfile),
@@ -285,7 +285,7 @@
 	CurrentSel(-1),
 	nodeEdit(),
 	typographicSettings(prefsData.typographicSettings),
-	guidesSettings(prefsData.guidesSettings),
+	guidesSettings(prefsData.guidesPrefs),
 	toolSettings(prefsData.toolSettings),
 	checkerProfiles(prefsData.checkerProfiles),
 	curCheckProfile(prefsData.curCheckProfile),
@@ -5857,7 +5857,7 @@
 		}
 		else
 		{
-			storyStyle.setLineSpacing(typographicSettings.valueBaseGrid-1);
+			storyStyle.setLineSpacing(guidesSettings.valueBaselineGrid-1);
 		}
 		itemSelection_ApplyParagraphStyle(storyStyle, customSelection);
 	}
@@ -9096,8 +9096,8 @@
 	int onp = OnPage(in.x(), in.y());
 	if (useRaster && (onp != -1))
 	{
-		np.setX(static_cast<int>(qRound((in.x() - Pages->at(onp)->xOffset()) / guidesSettings.minorGrid) * guidesSettings.minorGrid + Pages->at(onp)->xOffset()));
-		np.setY(static_cast<int>(qRound((in.y() - Pages->at(onp)->yOffset()) / guidesSettings.minorGrid) * guidesSettings.minorGrid + Pages->at(onp)->yOffset()));
+		np.setX(static_cast<int>(qRound((in.x() - Pages->at(onp)->xOffset()) / guidesSettings.minorGridSpacing) * guidesSettings.minorGridSpacing + Pages->at(onp)->xOffset()));
+		np.setY(static_cast<int>(qRound((in.y() - Pages->at(onp)->yOffset()) / guidesSettings.minorGridSpacing) * guidesSettings.minorGridSpacing + Pages->at(onp)->yOffset()));
 	}
 	else
 		np = in;
@@ -9111,8 +9111,8 @@
 	int onp = OnPage(in.x(), in.y());
 	if (useRaster && (onp != -1))
 	{
-		np.setX(qRound((in.x() - Pages->at(onp)->xOffset()) / guidesSettings.minorGrid) * guidesSettings.minorGrid + Pages->at(onp)->xOffset());
-		np.setY(qRound((in.y() - Pages->at(onp)->yOffset()) / guidesSettings.minorGrid) * guidesSettings.minorGrid + Pages->at(onp)->yOffset());
+		np.setX(qRound((in.x() - Pages->at(onp)->xOffset()) / guidesSettings.minorGridSpacing) * guidesSettings.minorGridSpacing + Pages->at(onp)->xOffset());
+		np.setY(qRound((in.y() - Pages->at(onp)->yOffset()) / guidesSettings.minorGridSpacing) * guidesSettings.minorGridSpacing + Pages->at(onp)->yOffset());
 	}
 	else
 		np = in;
Index: scribus/canvasgesture_rulermove.cpp
===================================================================
--- scribus/canvasgesture_rulermove.cpp	(revision 13888)
+++ scribus/canvasgesture_rulermove.cpp	(revision 13889)
@@ -105,7 +105,7 @@
 	const int page = m_doc->OnPage(mousePointDoc.x(), mousePointDoc.y());
 	if ((m_doc->guidesSettings.guidesShown) && (!m_doc->GuideLock) && page >= 0)
 	{
-		double grabRadScale = m_doc->guidesSettings.grabRad / m_canvas->scale();
+		double grabRadScale = m_doc->guidesSettings.grabRadius / m_canvas->scale();
 		int index = m_doc->Pages->at(page)->guides.isMouseOnVertical(mousePointDoc.x() + grabRadScale, mousePointDoc.x() - grabRadScale, GuideManagerCore::Standard);
 		if (index >= 0)
 		{
@@ -137,7 +137,7 @@
 	const int page = m_doc->OnPage(mousePointDoc.x(), mousePointDoc.y());
 	if ((m_doc->guidesSettings.guidesShown) && page >= 0)
 	{
-		double grabRadScale = m_doc->guidesSettings.grabRad / m_canvas->scale();
+		double grabRadScale = m_doc->guidesSettings.grabRadius / m_canvas->scale();
 		int index = m_doc->Pages->at(page)->guides.isMouseOnVertical(mousePointDoc.x() + grabRadScale, mousePointDoc.x() - grabRadScale, GuideManagerCore::Standard);
 		if (index >= 0)
 		{
Index: scribus/prefsmanager.cpp
===================================================================
--- scribus/prefsmanager.cpp	(revision 13888)
+++ scribus/prefsmanager.cpp	(revision 13889)
@@ -194,28 +194,28 @@
 	appPrefs.mainWinSettings.yPosition=(d->availableGeometry().height()-appPrefs.mainWinSettings.height)/2;
 	appPrefs.mainWinSettings.maximized = false;
 	appPrefs.mainWinState = QByteArray();
-	appPrefs.guidesSettings.marginsShown = true;
-	appPrefs.guidesSettings.framesShown = true;
-	appPrefs.guidesSettings.layerMarkersShown = false;
-	appPrefs.guidesSettings.gridShown = false;
-	appPrefs.guidesSettings.guidesShown = true;
-	appPrefs.guidesSettings.colBordersShown = true;
-	appPrefs.guidesSettings.baseShown = false;
-	appPrefs.guidesSettings.showPic = true;
-	appPrefs.guidesSettings.showControls = false;
-	appPrefs.guidesSettings.linkShown = false;
-	appPrefs.guidesSettings.rulersShown = true;
-	appPrefs.guidesSettings.showBleed = true;
-	appPrefs.guidesSettings.rulerMode = true;
-	appPrefs.guidesSettings.grabRad = 4;
-	appPrefs.guidesSettings.guideRad = 10;
-	appPrefs.guidesSettings.minorGrid = 20;
-	appPrefs.guidesSettings.majorGrid = 100;
-	appPrefs.guidesSettings.minorColor = QColor(Qt::green);
-	appPrefs.guidesSettings.majorColor = QColor(Qt::green);
-	appPrefs.guidesSettings.margColor = QColor(Qt::blue);
-	appPrefs.guidesSettings.guideColor = QColor(Qt::darkBlue);
-	appPrefs.guidesSettings.baseColor = QColor(Qt::lightGray);
+	appPrefs.guidesPrefs.marginsShown = true;
+	appPrefs.guidesPrefs.framesShown = true;
+	appPrefs.guidesPrefs.layerMarkersShown = false;
+	appPrefs.guidesPrefs.gridShown = false;
+	appPrefs.guidesPrefs.guidesShown = true;
+	appPrefs.guidesPrefs.colBordersShown = true;
+	appPrefs.guidesPrefs.baselineGridShown = false;
+	appPrefs.guidesPrefs.showPic = true;
+	appPrefs.guidesPrefs.showControls = false;
+	appPrefs.guidesPrefs.linkShown = false;
+	appPrefs.guidesPrefs.rulersShown = true;
+	appPrefs.guidesPrefs.showBleed = true;
+	appPrefs.guidesPrefs.rulerMode = true;
+	appPrefs.guidesPrefs.grabRadius = 4;
+	appPrefs.guidesPrefs.guideRad = 10;
+	appPrefs.guidesPrefs.minorGridSpacing = 20;
+	appPrefs.guidesPrefs.majorGridSpacing = 100;
+	appPrefs.guidesPrefs.minorGridColor = QColor(Qt::green);
+	appPrefs.guidesPrefs.majorGridColor = QColor(Qt::green);
+	appPrefs.guidesPrefs.marginColor = QColor(Qt::blue);
+	appPrefs.guidesPrefs.guideColor = QColor(Qt::darkBlue);
+	appPrefs.guidesPrefs.baselineGridColor = QColor(Qt::lightGray);
 	appPrefs.typographicSettings.valueSuperScript = 33;
 	appPrefs.typographicSettings.scalingSuperScript = 66;
 	appPrefs.typographicSettings.valueSubScript = 33;
@@ -226,8 +226,8 @@
 	appPrefs.typographicSettings.valueUnderlineWidth = -1;
 	appPrefs.typographicSettings.valueStrikeThruPos = -1;
 	appPrefs.typographicSettings.valueStrikeThruWidth = -1;
-	appPrefs.typographicSettings.valueBaseGrid = 14.4;
-	appPrefs.typographicSettings.offsetBaseGrid = 0.0;
+	appPrefs.guidesPrefs.valueBaselineGrid = 14.4;
+	appPrefs.guidesPrefs.offsetBaselineGrid = 0.0;
 	appPrefs.uiPrefs.style = "";
 	appPrefs.grayscaleIcons = false; // can be a little slower on startup.. but its a nice effect to play with
 	appPrefs.showToolTips = true;
@@ -281,7 +281,7 @@
 	appPrefs.toolSettings.shadePict = 100;
 	appPrefs.toolSettings.scaleX = 1;
 	appPrefs.toolSettings.scaleY = 1;
-	appPrefs.guidesSettings.before = true;
+	appPrefs.guidesPrefs.guidePlacement = true;
 	appPrefs.docSetupPrefs.docUnitIndex = 0;
 	appPrefs.toolSettings.polyC = 4;
 	appPrefs.toolSettings.polyF = 0.5;
@@ -1056,7 +1056,7 @@
 	return isToolColor(appPrefs.toolSettings, name);
 }
 
-bool PrefsManager::isToolColor(const struct toolPrefs& settings, const QString& name)
+bool PrefsManager::isToolColor(const struct ToolPrefs& settings, const QString& name)
 {
 	if (settings.dPenText == name)
 		return true;
@@ -1082,7 +1082,7 @@
 	return toolColorNames(appPrefs.toolSettings);
 }
 
-QStringList PrefsManager::toolColorNames(const struct toolPrefs& settings)
+QStringList PrefsManager::toolColorNames(const struct ToolPrefs& settings)
 {
 	QStringList names;
 	names.append(settings.dPenText);
@@ -1108,7 +1108,7 @@
 	replaceToolColors(appPrefs.toolSettings, replaceMap);
 }
 
-void PrefsManager::replaceToolColors(struct toolPrefs& settings, const QMap<QString, QString> replaceMap)
+void PrefsManager::replaceToolColors(struct ToolPrefs& settings, const QMap<QString, QString> replaceMap)
 {
 	if (replaceMap.contains(settings.dPenText))
 		settings.dPenText = replaceMap[settings.dPenText];
@@ -1231,25 +1231,25 @@
 	dc.setAttribute("UI_MOUSEMOVETIMEOUT", appPrefs.uiPrefs.mouseMoveTimeout);
 	dc.setAttribute("UI_APPLICATIONFONTSIZE",appPrefs.uiPrefs.applicationFontSize);
 	dc.setAttribute("UI_PALETTEFONTSIZE",appPrefs.uiPrefs.paletteFontSize);
-	dc.setAttribute("GRAB",appPrefs.guidesSettings.grabRad);
+	dc.setAttribute("GRAB",appPrefs.guidesPrefs.grabRadius);
 	dc.setAttribute("UNIT",appPrefs.docSetupPrefs.docUnitIndex);
 	dc.setAttribute("UI_RECENTDOCCOUNT", appPrefs.uiPrefs.recentDocCount);
 	dc.setAttribute("DOC", appPrefs.pathPrefs.documents);
 	dc.setAttribute("PROFILES", appPrefs.pathPrefs.colorProfiles);
 	dc.setAttribute("SCRIPTS", appPrefs.pathPrefs.scripts);
 	dc.setAttribute("TEMPLATES", appPrefs.pathPrefs.documentTemplates);
-	dc.setAttribute("SHOWGUIDES", static_cast<int>(appPrefs.guidesSettings.guidesShown));
-	dc.setAttribute("showcolborders", static_cast<int>(appPrefs.guidesSettings.colBordersShown));
-	dc.setAttribute("FRV", static_cast<int>(appPrefs.guidesSettings.framesShown));
-	dc.setAttribute("SHOWLAYERM", static_cast<int>(appPrefs.guidesSettings.layerMarkersShown));
-	dc.setAttribute("SHOWMARGIN", static_cast<int>(appPrefs.guidesSettings.marginsShown));
-	dc.setAttribute("SHOWBASE", static_cast<int>(appPrefs.guidesSettings.baseShown));
-	dc.setAttribute("SHOWLINK", static_cast<int>(appPrefs.guidesSettings.linkShown));
-	dc.setAttribute("SHOWPICT", static_cast<int>(appPrefs.guidesSettings.showPic));
-	dc.setAttribute("SHOWControl", static_cast<int>(appPrefs.guidesSettings.showControls));
-	dc.setAttribute("rulersShown", static_cast<int>(appPrefs.guidesSettings.rulersShown));
-	dc.setAttribute("showBleed", static_cast<int>(appPrefs.guidesSettings.showBleed));
-	dc.setAttribute("rulerMode", static_cast<int>(appPrefs.guidesSettings.rulerMode));
+	dc.setAttribute("SHOWGUIDES", static_cast<int>(appPrefs.guidesPrefs.guidesShown));
+	dc.setAttribute("showcolborders", static_cast<int>(appPrefs.guidesPrefs.colBordersShown));
+	dc.setAttribute("FRV", static_cast<int>(appPrefs.guidesPrefs.framesShown));
+	dc.setAttribute("SHOWLAYERM", static_cast<int>(appPrefs.guidesPrefs.layerMarkersShown));
+	dc.setAttribute("SHOWMARGIN", static_cast<int>(appPrefs.guidesPrefs.marginsShown));
+	dc.setAttribute("SHOWBASE", static_cast<int>(appPrefs.guidesPrefs.baselineGridShown));
+	dc.setAttribute("SHOWLINK", static_cast<int>(appPrefs.guidesPrefs.linkShown));
+	dc.setAttribute("SHOWPICT", static_cast<int>(appPrefs.guidesPrefs.showPic));
+	dc.setAttribute("SHOWControl", static_cast<int>(appPrefs.guidesPrefs.showControls));
+	dc.setAttribute("rulersShown", static_cast<int>(appPrefs.guidesPrefs.rulersShown));
+	dc.setAttribute("showBleed", static_cast<int>(appPrefs.guidesPrefs.showBleed));
+	dc.setAttribute("rulerMode", static_cast<int>(appPrefs.guidesPrefs.rulerMode));
 	dc.setAttribute("ScratchBottom", appPrefs.scratch.Bottom);
 	dc.setAttribute("ScratchLeft", appPrefs.scratch.Left);
 	dc.setAttribute("ScratchRight", appPrefs.scratch.Right);
@@ -1266,15 +1266,15 @@
 	dc.setAttribute("stickyTools", static_cast<int>(appPrefs.stickyTools));
 	elem.appendChild(dc);
 	QDomElement dc1=docu.createElement("GRID");
-	dc1.setAttribute("MINOR",ScCLocale::toQStringC(appPrefs.guidesSettings.minorGrid));
-	dc1.setAttribute("MAJOR",ScCLocale::toQStringC(appPrefs.guidesSettings.majorGrid));
-	dc1.setAttribute("MINORC",appPrefs.guidesSettings.minorColor.name());
-	dc1.setAttribute("MAJORC",appPrefs.guidesSettings.majorColor.name());
-	dc1.setAttribute("GuideC", appPrefs.guidesSettings.guideColor.name());
-	dc1.setAttribute("BaseC", appPrefs.guidesSettings.baseColor.name());
-	dc1.setAttribute("GuideZ", ScCLocale::toQStringC(appPrefs.guidesSettings.guideRad));
-	dc1.setAttribute("BACKG", static_cast<int>(appPrefs.guidesSettings.before));
-	dc1.setAttribute("SHOW", static_cast<int>(appPrefs.guidesSettings.gridShown));
+	dc1.setAttribute("MINOR",ScCLocale::toQStringC(appPrefs.guidesPrefs.minorGridSpacing));
+	dc1.setAttribute("MAJOR",ScCLocale::toQStringC(appPrefs.guidesPrefs.majorGridSpacing));
+	dc1.setAttribute("MINORC",appPrefs.guidesPrefs.minorGridColor.name());
+	dc1.setAttribute("MAJORC",appPrefs.guidesPrefs.majorGridColor.name());
+	dc1.setAttribute("GuideC", appPrefs.guidesPrefs.guideColor.name());
+	dc1.setAttribute("BaseC", appPrefs.guidesPrefs.baselineGridColor.name());
+	dc1.setAttribute("GuideZ", ScCLocale::toQStringC(appPrefs.guidesPrefs.guideRad));
+	dc1.setAttribute("BACKG", static_cast<int>(appPrefs.guidesPrefs.guidePlacement));
+	dc1.setAttribute("SHOW", static_cast<int>(appPrefs.guidesPrefs.gridShown));
 	elem.appendChild(dc1);
 	QDomElement dc1a=docu.createElement("PAGE");
 	dc1a.setAttribute("ShowPageShadow",static_cast<int>(appPrefs.showPageShadow));
@@ -1287,7 +1287,7 @@
 	dc1a.setAttribute("DFrameAnnotationColor",appPrefs.DFrameAnnotationColor.name());
 	dc1a.setAttribute("DPageBorderColor",appPrefs.DPageBorderColor.name());
 	dc1a.setAttribute("DControlCharColor",appPrefs.DControlCharColor.name());
-	dc1a.setAttribute("MARGC",appPrefs.guidesSettings.margColor.name());
+	dc1a.setAttribute("MARGC",appPrefs.guidesPrefs.marginColor.name());
 	dc1a.setAttribute("RANDF", static_cast<int>(appPrefs.marginColored));
 	dc1a.setAttribute("DScale", ScCLocale::toQStringC(appPrefs.DisScale));
 	elem.appendChild(dc1a);
@@ -1303,8 +1303,8 @@
 	dc3.setAttribute("HOCHSC",appPrefs.typographicSettings.scalingSuperScript);
 	dc3.setAttribute("SMCAPS",appPrefs.typographicSettings.valueSmallCaps);
 	dc3.setAttribute("AUTOL", appPrefs.typographicSettings.autoLineSpacing);
-	dc3.setAttribute("BASE", ScCLocale::toQStringC(appPrefs.typographicSettings.valueBaseGrid));
-	dc3.setAttribute("BASEO", ScCLocale::toQStringC(appPrefs.typographicSettings.offsetBaseGrid));
+	dc3.setAttribute("BASE", ScCLocale::toQStringC(appPrefs.guidesPrefs.valueBaselineGrid));
+	dc3.setAttribute("BASEO", ScCLocale::toQStringC(appPrefs.guidesPrefs.offsetBaselineGrid));
 	if (appPrefs.typographicSettings.valueUnderlinePos == -1)
 		dc3.setAttribute("UnderlinePos", appPrefs.typographicSettings.valueUnderlinePos);
 	else
@@ -1793,19 +1793,19 @@
 			appPrefs.pathPrefs.scripts = dc.attribute("SCRIPTS","");
 			appPrefs.pathPrefs.documentTemplates = dc.attribute("TEMPLATES","");
 			appPrefs.docSetupPrefs.docUnitIndex = dc.attribute("UNIT", "0").toInt();
-			appPrefs.guidesSettings.grabRad = dc.attribute("GRAB", "4").toInt();
-			appPrefs.guidesSettings.guidesShown = static_cast<bool>(dc.attribute("SHOWGUIDES", "1").toInt());
-			appPrefs.guidesSettings.colBordersShown = static_cast<bool>(dc.attribute("showcolborders", "0").toInt());
-			appPrefs.guidesSettings.framesShown = static_cast<bool>(dc.attribute("FRV", "1").toInt());
-			appPrefs.guidesSettings.layerMarkersShown = static_cast<bool>(dc.attribute("SHOWLAYERM", "0").toInt());
-			appPrefs.guidesSettings.marginsShown = static_cast<bool>(dc.attribute("SHOWMARGIN", "1").toInt());
-			appPrefs.guidesSettings.baseShown = static_cast<bool>(dc.attribute("SHOWBASE", "1").toInt());
-			appPrefs.guidesSettings.linkShown = static_cast<bool>(dc.attribute("SHOWLINK", "0").toInt());
-			appPrefs.guidesSettings.showPic = static_cast<bool>(dc.attribute("SHOWPICT", "1").toInt());
-			appPrefs.guidesSettings.showControls = static_cast<bool>(dc.attribute("SHOWControl", "0").toInt());
-			appPrefs.guidesSettings.rulersShown = static_cast<bool>(dc.attribute("rulersShown", "1").toInt());
-			appPrefs.guidesSettings.showBleed = static_cast<bool>(dc.attribute("showBleed", "1").toInt());
-			appPrefs.guidesSettings.rulerMode = static_cast<bool>(dc.attribute("rulerMode", "1").toInt());
+			appPrefs.guidesPrefs.grabRadius = dc.attribute("GRAB", "4").toInt();
+			appPrefs.guidesPrefs.guidesShown = static_cast<bool>(dc.attribute("SHOWGUIDES", "1").toInt());
+			appPrefs.guidesPrefs.colBordersShown = static_cast<bool>(dc.attribute("showcolborders", "0").toInt());
+			appPrefs.guidesPrefs.framesShown = static_cast<bool>(dc.attribute("FRV", "1").toInt());
+			appPrefs.guidesPrefs.layerMarkersShown = static_cast<bool>(dc.attribute("SHOWLAYERM", "0").toInt());
+			appPrefs.guidesPrefs.marginsShown = static_cast<bool>(dc.attribute("SHOWMARGIN", "1").toInt());
+			appPrefs.guidesPrefs.baselineGridShown = static_cast<bool>(dc.attribute("SHOWBASE", "1").toInt());
+			appPrefs.guidesPrefs.linkShown = static_cast<bool>(dc.attribute("SHOWLINK", "0").toInt());
+			appPrefs.guidesPrefs.showPic = static_cast<bool>(dc.attribute("SHOWPICT", "1").toInt());
+			appPrefs.guidesPrefs.showControls = static_cast<bool>(dc.attribute("SHOWControl", "0").toInt());
+			appPrefs.guidesPrefs.rulersShown = static_cast<bool>(dc.attribute("rulersShown", "1").toInt());
+			appPrefs.guidesPrefs.showBleed = static_cast<bool>(dc.attribute("showBleed", "1").toInt());
+			appPrefs.guidesPrefs.rulerMode = static_cast<bool>(dc.attribute("rulerMode", "1").toInt());
 			appPrefs.haveStylePreview = static_cast<bool>(dc.attribute("STYLEPREVIEW", "1").toInt());
 
 			appPrefs.scratch.Bottom = ScCLocale::toDoubleC(dc.attribute("ScratchBottom"), 20.0);
@@ -1824,18 +1824,18 @@
 		}
 		if (dc.tagName()=="GRID")
 		{
-			appPrefs.guidesSettings.minorGrid  = ScCLocale::toDoubleC(dc.attribute("MINOR"), 20.0);
-			appPrefs.guidesSettings.majorGrid  = ScCLocale::toDoubleC(dc.attribute("MAJOR"), 100.0);
-			appPrefs.guidesSettings.minorColor = QColor(dc.attribute("MINORC"));
-			appPrefs.guidesSettings.majorColor = QColor(dc.attribute("MAJORC"));
-			appPrefs.guidesSettings.before = static_cast<bool>(dc.attribute("BACKG", "1").toInt());
-			appPrefs.guidesSettings.gridShown = static_cast<bool>(dc.attribute("SHOW", "0").toInt());
+			appPrefs.guidesPrefs.minorGridSpacing  = ScCLocale::toDoubleC(dc.attribute("MINOR"), 20.0);
+			appPrefs.guidesPrefs.majorGridSpacing  = ScCLocale::toDoubleC(dc.attribute("MAJOR"), 100.0);
+			appPrefs.guidesPrefs.minorGridColor = QColor(dc.attribute("MINORC"));
+			appPrefs.guidesPrefs.majorGridColor = QColor(dc.attribute("MAJORC"));
+			appPrefs.guidesPrefs.guidePlacement = static_cast<bool>(dc.attribute("BACKG", "1").toInt());
+			appPrefs.guidesPrefs.gridShown = static_cast<bool>(dc.attribute("SHOW", "0").toInt());
 			if (dc.hasAttribute("GuideC"))
-				appPrefs.guidesSettings.guideColor = QColor(dc.attribute("GuideC"));
+				appPrefs.guidesPrefs.guideColor = QColor(dc.attribute("GuideC"));
 			if (dc.hasAttribute("GuideZ"))
-				appPrefs.guidesSettings.guideRad = ScCLocale::toDoubleC(dc.attribute("GuideZ"), 10.0);
+				appPrefs.guidesPrefs.guideRad = ScCLocale::toDoubleC(dc.attribute("GuideZ"), 10.0);
 			if (dc.hasAttribute("BaseC"))
-				appPrefs.guidesSettings.baseColor = QColor(dc.attribute("BaseC"));
+				appPrefs.guidesPrefs.baselineGridColor = QColor(dc.attribute("BaseC"));
 		}
 		if (dc.tagName()=="PAGE")
 		{
@@ -1849,7 +1849,7 @@
 			appPrefs.DFrameAnnotationColor = QColor(dc.attribute("DFrameAnnotationColor","#0000ff"));
 			appPrefs.DPageBorderColor = QColor(dc.attribute("DPageBorderColor","#ff0000"));
 			appPrefs.DControlCharColor = QColor(dc.attribute("DControlCharColor","#800000"));
-			appPrefs.guidesSettings.margColor = QColor(dc.attribute("MARGC","#0000ff"));
+			appPrefs.guidesPrefs.marginColor = QColor(dc.attribute("MARGC","#0000ff"));
 			appPrefs.marginColored = static_cast<bool>(dc.attribute("RANDF", "0").toInt());
 			appPrefs.DisScale = ScCLocale::toDoubleC(dc.attribute("DScale"), appPrefs.DisScale);
 		}
@@ -1860,8 +1860,8 @@
 			appPrefs.typographicSettings.valueSubScript = dc.attribute("TIEF").toInt();
 			appPrefs.typographicSettings.scalingSubScript = dc.attribute("TIEFSC").toInt();
 			appPrefs.typographicSettings.valueSmallCaps  = dc.attribute("SMCAPS").toInt();
-			appPrefs.typographicSettings.valueBaseGrid   = ScCLocale::toDoubleC(dc.attribute("BASE"), 12.0);
-			appPrefs.typographicSettings.offsetBaseGrid  = ScCLocale::toDoubleC(dc.attribute("BASEO"), 0.0);
+			appPrefs.guidesPrefs.valueBaselineGrid   = ScCLocale::toDoubleC(dc.attribute("BASE"), 12.0);
+			appPrefs.guidesPrefs.offsetBaselineGrid  = ScCLocale::toDoubleC(dc.attribute("BASEO"), 0.0);
 			appPrefs.typographicSettings.autoLineSpacing = dc.attribute("AUTOL", "20").toInt();
 			double ulp = ScCLocale::toDoubleC(dc.attribute("UnderlinePos"), -1.0);
 			if (ulp != -1)
@@ -2097,7 +2097,7 @@
 			QString name=dc.attribute("Name");
 			if ((name == tr("PostScript")) ||  (name == tr("Postscript")) || (name == "Postscript"))
 				name = CommonStrings::PostScript;
-			struct checkerPrefs checkerSettings;
+			struct CheckerPrefs checkerSettings;
 			checkerSettings.ignoreErrors = static_cast<bool>(dc.attribute("ignoreErrors", "0").toInt());
 			checkerSettings.autoCheck = static_cast<bool>(dc.attribute("autoCheck", "1").toInt());
 			checkerSettings.checkGlyphs = static_cast<bool>(dc.attribute("checkGlyphs", "1").toInt());
@@ -2398,7 +2398,7 @@
 {
 	if (cp!=NULL)
 	{
-		struct checkerPrefs checkerSettings;
+		struct CheckerPrefs checkerSettings;
 		checkerSettings.ignoreErrors = false;
 		checkerSettings.autoCheck = true;
 		checkerSettings.checkGlyphs = true;
Index: scribus/prefsmanager.h
===================================================================
--- scribus/prefsmanager.h	(revision 13888)
+++ scribus/prefsmanager.h	(revision 13889)
@@ -168,13 +168,13 @@
 	const QString& colorSetName();
 	/*! \brief Return if a color belongs to tools prefs colors */
 	bool isToolColor(const QString& name);
-	static bool isToolColor(const struct toolPrefs& settings, const QString& name);
+	static bool isToolColor(const struct ToolPrefs& settings, const QString& name);
 	/*! \brief Return the list of used colors in tool prefs */
 	QStringList toolColorNames();
-	static QStringList toolColorNames(const struct toolPrefs& settings);
+	static QStringList toolColorNames(const struct ToolPrefs& settings);
 	/*! \brief Replace used colors in tool prefs */
 	void replaceToolColors(const QMap<QString, QString> replaceMap);
-	static void replaceToolColors(struct toolPrefs& settings, const QMap<QString, QString> replaceMap);
+	static void replaceToolColors(struct ToolPrefs& settings, const QMap<QString, QString> replaceMap);
 	/*! \brief Finds the fonts on the system
 	Must be run after: PrefsManager::setup()
 	Must be run before: PrefsManager::initDefaults()
Index: scribus/canvasgesture_linemove.cpp
===================================================================
--- scribus/canvasgesture_linemove.cpp	(revision 13888)
+++ scribus/canvasgesture_linemove.cpp	(revision 13889)
@@ -188,8 +188,8 @@
 	
 	if (m_doc->useRaster)
 	{
-		newX = qRound(newX / m_doc->guidesSettings.minorGrid) * m_doc->guidesSettings.minorGrid;
-		newY = qRound(newY / m_doc->guidesSettings.minorGrid) * m_doc->guidesSettings.minorGrid;
+		newX = qRound(newX / m_doc->guidesSettings.minorGridSpacing) * m_doc->guidesSettings.minorGridSpacing;
+		newY = qRound(newY / m_doc->guidesSettings.minorGridSpacing) * m_doc->guidesSettings.minorGridSpacing;
 	}
 	//<<#8099
 	FPoint np2 = m_doc->ApplyGridF(FPoint(newX, newY));
Index: scribus/canvasmode_edit.cpp
===================================================================
--- scribus/canvasmode_edit.cpp	(revision 13888)
+++ scribus/canvasmode_edit.cpp	(revision 13889)
@@ -1306,7 +1306,7 @@
 	FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
 	Mxp = mousePointDoc.x(); //m->x()/m_canvas->scale());
 	Myp = mousePointDoc.y(); //m->y()/m_canvas->scale());
-	double grabRadius = m_doc->guidesSettings.grabRad / m_canvas->scale();
+	double grabRadius = m_doc->guidesSettings.grabRadius / m_canvas->scale();
 	int MxpS = static_cast<int>(mousePointDoc.x()); //m->x()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.x());
 	int MypS = static_cast<int>(mousePointDoc.y()); //m->y()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.y());
 	mpo = QRectF(Mxp-grabRadius, Myp-grabRadius, grabRadius*2, grabRadius*2);
Index: scribus/canvasmode_drawbezier.cpp
===================================================================
--- scribus/canvasmode_drawbezier.cpp	(revision 13888)
+++ scribus/canvasmode_drawbezier.cpp	(revision 13889)
@@ -236,8 +236,8 @@
 			{
 				if ((m_doc->useRaster) && (m_doc->OnPage(currItem) != -1))
 				{
-					newX = qRound(newX / m_doc->guidesSettings.minorGrid) * m_doc->guidesSettings.minorGrid;
-					newY = qRound(newY / m_doc->guidesSettings.minorGrid) * m_doc->guidesSettings.minorGrid;
+					newX = qRound(newX / m_doc->guidesSettings.minorGridSpacing) * m_doc->guidesSettings.minorGridSpacing;
+					newY = qRound(newY / m_doc->guidesSettings.minorGridSpacing) * m_doc->guidesSettings.minorGridSpacing;
 				}
 				m_canvas->newRedrawPolygon() << QPoint(qRound(newX - currItem->xPos()), qRound(newY - currItem->yPos()));
 				m_view->updateCanvas();
@@ -296,7 +296,7 @@
 	m_view->registerMousePress(m->globalPos());
 	Mxp = mousePointDoc.x(); //qRound(m->x()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.x());
 	Myp = mousePointDoc.y(); //qRound(m->y()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.y());
-	QRect mpo(m->x()-m_doc->guidesSettings.grabRad, m->y()-m_doc->guidesSettings.grabRad, m_doc->guidesSettings.grabRad*2, m_doc->guidesSettings.grabRad*2);
+	QRect mpo(m->x()-m_doc->guidesSettings.grabRadius, m->y()-m_doc->guidesSettings.grabRadius, m_doc->guidesSettings.grabRadius*2, m_doc->guidesSettings.grabRadius*2);
 //	mpo.moveBy(qRound(m_doc->minCanvasCoordinate.x() * m_canvas->scale()), qRound(m_doc->minCanvasCoordinate.y() * m_canvas->scale()));
 	Rxp = m_doc->ApplyGridF(FPoint(Mxp, Myp)).x();
 	Rxpd = Mxp - Rxp;
@@ -485,7 +485,7 @@
 	FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
 	Mxp = mousePointDoc.x(); //static_cast<int>(m->x()/m_canvas->scale());
 	Myp = mousePointDoc.y(); //static_cast<int>(m->y()/m_canvas->scale());
-	QRect mpo(m->x()-m_doc->guidesSettings.grabRad, m->y()-m_doc->guidesSettings.grabRad, m_doc->guidesSettings.grabRad*2, m_doc->guidesSettings.grabRad*2);
+	QRect mpo(m->x()-m_doc->guidesSettings.grabRadius, m->y()-m_doc->guidesSettings.grabRadius, m_doc->guidesSettings.grabRadius*2, m_doc->guidesSettings.grabRadius*2);
 //	mpo.moveBy(qRound(Doc->minCanvasCoordinate.x() * m_canvas->scale()), qRound(m_doc->minCanvasCoordinate.y() * m_canvas->scale()));
 	m_doc->nodeEdit.deselect();
 	m_view->Deselect(false);
Index: scribus/canvas.cpp
===================================================================
--- scribus/canvas.cpp	(revision 13888)
+++ scribus/canvas.cpp	(revision 13889)
@@ -211,7 +211,7 @@
 {
 	QPoint localPoint1 = globalPoint - (mapToParent(QPoint(0,0)) + parentWidget()->mapToGlobal(QPoint(0, 0)));
 	QPoint localPoint2 = canvasToLocal(canvasPoint);
-	int radius = m_doc->guidesSettings.grabRad;
+	int radius = m_doc->guidesSettings.grabRadius;
 	return qAbs(localPoint1.x() - localPoint2.x()) < radius
 		&& qAbs(localPoint1.y() - localPoint2.y()) < radius;
 }
@@ -221,7 +221,7 @@
 {
 	QPoint localPoint1 = globalPoint - (mapToParent(QPoint(0,0)) + parentWidget()->mapToGlobal(QPoint(0, 0)));
 	QPoint localPoint2 = canvasToLocal(canvasPoint);
-	int radius = m_doc->guidesSettings.grabRad;
+	int radius = m_doc->guidesSettings.grabRadius;
 	return qAbs(localPoint1.x() - localPoint2.x()) < radius
 		&& qAbs(localPoint1.y() - localPoint2.y()) < radius;
 }
@@ -273,7 +273,7 @@
 Canvas::FrameHandle Canvas::frameHitTest(QPointF canvasPoint, QRectF frame) const
 {
 	FrameHandle result = INSIDE;
-	const double radius = m_doc->guidesSettings.grabRad / m_viewMode.scale;
+	const double radius = m_doc->guidesSettings.grabRadius / m_viewMode.scale;
 	const double radius2 = radius * radius;
 	double resultDistance = radius2 * 10.0; // far off
 	
@@ -362,7 +362,7 @@
 PageItem* Canvas::itemUnderCursor(QPoint globalPos, PageItem* itemAbove, bool allowInGroup, bool allowMasterItems) const
 {
 	PageItem* currItem;
-	QRectF mouseArea = globalToCanvas(QRect(globalPos, QSize(2*m_doc->guidesSettings.grabRad, 2*m_doc->guidesSettings.grabRad)));
+	QRectF mouseArea = globalToCanvas(QRect(globalPos, QSize(2*m_doc->guidesSettings.grabRadius, 2*m_doc->guidesSettings.grabRadius)));
 	// look for masterpage items first
 	if (allowMasterItems && !m_doc->masterPageMode() && m_doc->currentPage()->FromMaster.count() != 0)
 	{
@@ -915,7 +915,7 @@
 			painter->beginLayer(1.0, 0);
 		
 		m_viewMode.linkedFramesToShow.clear();
-		if ((m_doc->guidesSettings.before) && (!m_viewMode.viewAsPreview))
+		if ((m_doc->guidesSettings.guidePlacement) && (!m_viewMode.viewAsPreview))
 		{
 			drawGuides(painter, clipx, clipy, clipw, cliph);
 		}
@@ -931,7 +931,7 @@
 		}
 		painter->endLayer();
 //		Tcontents = tim.elapsed();
-		if ((!m_doc->guidesSettings.before) && (!m_viewMode.viewAsPreview))
+		if ((!m_doc->guidesSettings.guidePlacement) && (!m_viewMode.viewAsPreview))
 		{
 			drawGuides(painter, clipx, clipy, clipw, cliph);
 		}
@@ -958,7 +958,7 @@
 		double h = m_doc->currentPage()->height() * m_viewMode.scale;
 		QRectF drawRect = QRectF(x, y, w+5, h+5);
 		drawRect.translate(-m_doc->minCanvasCoordinate.x() * m_viewMode.scale, -m_doc->minCanvasCoordinate.y() * m_viewMode.scale);
-		if ((!m_doc->guidesSettings.before) && (drawRect.intersects(QRect(clipx, clipy, clipw, cliph))))
+		if ((!m_doc->guidesSettings.guidePlacement) && (drawRect.intersects(QRect(clipx, clipy, clipw, cliph))))
 			DrawPageMarks(painter, m_doc->currentPage(), QRect(clipx, clipy, clipw, cliph));
 	}
 	if (((m_doc->m_Selection->count() != 0) || (m_viewMode.linkedFramesToShow.count() != 0))  && (!m_viewMode.viewAsPreview))
@@ -1647,7 +1647,7 @@
 			painter->drawRect(m_doc->scratch.Left, m_doc->scratch.Top, m_doc->currentPage()->width(), m_doc->currentPage()->height());
 		}
 		painter->setAntialiasing(true);
-		if (m_doc->guidesSettings.before)
+		if (m_doc->guidesSettings.guidePlacement)
 			DrawPageMarks(painter, m_doc->currentPage(), QRect(clipx, clipy, clipw, cliph));
 //		painter->endLayer();
 	}
@@ -1826,11 +1826,11 @@
 	//Draw the margins
 	if (m_doc->guidesSettings.marginsShown)
 	{
-		p->setPen(m_doc->guidesSettings.margColor);
+		p->setPen(m_doc->guidesSettings.marginColor);
 		if (m_doc->marginColored)
 		{
 			p->setFillMode(ScPainter::Solid);
-			p->setBrush(m_doc->guidesSettings.margColor);
+			p->setBrush(m_doc->guidesSettings.marginColor);
 			p->drawRect(0, 0, pageWidth, page->Margins.Top);
 			p->drawRect(0, page->Margins.Top, page->Margins.Left, pageHeight - page->Margins.Top);
 			p->drawRect(page->Margins.Left, pageHeight - page->Margins.Bottom, pageWidth - page->Margins.Right - page->Margins.Left, page->Margins.Bottom);
@@ -1846,10 +1846,10 @@
 //		p->drawLine(FPoint(pageWidth - page->Margins.Right, 0), FPoint(pageWidth - page->Margins.Right, pageHeight));
 	}
 	//Draw the baseline grid
-	if (m_doc->guidesSettings.baseShown)
+	if (m_doc->guidesSettings.baselineGridShown)
 	{
-		p->setPen(m_doc->guidesSettings.baseColor, lineWidth, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
-		for (double yg = m_doc->typographicSettings.offsetBaseGrid; yg < pageHeight; yg += m_doc->typographicSettings.valueBaseGrid)
+		p->setPen(m_doc->guidesSettings.baselineGridColor, lineWidth, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+		for (double yg = m_doc->guidesSettings.offsetBaselineGrid; yg < pageHeight; yg += m_doc->guidesSettings.valueBaselineGrid)
 			p->drawLine(FPoint(0, yg), FPoint(pageWidth, yg));
 	}
 	//Draw the grid lines
@@ -1862,8 +1862,8 @@
 		if (m_viewMode.scale > 0.49)
 		{
 			double i,start;
-			i = m_doc->guidesSettings.majorGrid;
-			p->setPen(m_doc->guidesSettings.majorColor, lineWidth, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+			i = m_doc->guidesSettings.majorGridSpacing;
+			p->setPen(m_doc->guidesSettings.majorGridColor, lineWidth, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 			start=floor(lowerBy/i);
 			start*=i;
 			for (double b = start; b <= highBy; b+=i)
@@ -1876,8 +1876,8 @@
 			{
 				p->drawLine(FPoint(b, qMax(lowerBy, 0.0)), FPoint(b, qMin(pageHeight, highBy)));
 			}
-			i = m_doc->guidesSettings.minorGrid;
-			p->setPen(m_doc->guidesSettings.minorColor, lineWidth, Qt::DotLine, Qt::FlatCap, Qt::MiterJoin);
+			i = m_doc->guidesSettings.minorGridSpacing;
+			p->setPen(m_doc->guidesSettings.minorGridColor, lineWidth, Qt::DotLine, Qt::FlatCap, Qt::MiterJoin);
 			start=floor(lowerBy/i);
 			start*=i;
 			for (double b = start; b <= highBy; b+=i)
Index: scribus/scpageoutput.cpp
===================================================================
--- scribus/scpageoutput.cpp	(revision 13888)
+++ scribus/scpageoutput.cpp	(revision 13889)
@@ -1362,7 +1362,7 @@
 				{
 					const ParagraphStyle& style(item->itemText.paragraphStyle(a));
 					if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
-						chs = qRound(10 * ((m_doc->typographicSettings.valueBaseGrid * (style.dropCapLines()-1) + (charStyle.font().ascent(style.charStyle().fontSize() / 10.0))) / charStyle.font().realCharHeight(chstr[0], 10)));
+						chs = qRound(10 * ((m_doc->guidesSettings.valueBaselineGrid * (style.dropCapLines()-1) + (charStyle.font().ascent(style.charStyle().fontSize() / 10.0))) / charStyle.font().realCharHeight(chstr[0], 10)));
 					else
 					{
 						if (style.lineSpacingMode() == ParagraphStyle::FixedLineSpacing)
Index: scribus/pageitem.cpp
===================================================================
--- scribus/pageitem.cpp	(revision 13888)
+++ scribus/pageitem.cpp	(revision 13889)
@@ -931,8 +931,8 @@
 	emit textToFrameDistances(Extra, TExtra, BExtra, RExtra);
 }
 
-double PageItem::gridOffset() const { return m_Doc->typographicSettings.offsetBaseGrid; }
-double PageItem::gridDistance() const { return m_Doc->typographicSettings.valueBaseGrid; }
+double PageItem::gridOffset() const { return m_Doc->guidesSettings.offsetBaselineGrid; }
+double PageItem::gridDistance() const { return m_Doc->guidesSettings.valueBaselineGrid; }
 
 void PageItem::setGridOffset(double) { } // FIXME
 void PageItem::setGridDistance(double) { } // FIXME
Index: scribus/scribusdoc.h
===================================================================
--- scribus/scribusdoc.h	(revision 13888)
+++ scribus/scribusdoc.h	(revision 13889)
@@ -999,10 +999,10 @@
 
 	NodeEditContext nodeEdit;
 
-	typoPrefs typographicSettings;
-	guidesPrefs guidesSettings;
-	toolPrefs toolSettings;
-	QMap<QString, checkerPrefs> checkerProfiles;
+	TypoPrefs typographicSettings;
+	GuidesPrefs guidesSettings;
+	ToolPrefs toolSettings;
+	QMap<QString, CheckerPrefs> checkerProfiles;
 	QString curCheckProfile;
 	/** \brief Letztes Element fuer AutoTextrahmen */
 	PageItem *LastAuto;
Index: scribus/pageitem_textframe.cpp
===================================================================
--- scribus/pageitem_textframe.cpp	(revision 13888)
+++ scribus/pageitem_textframe.cpp	(revision 13889)
@@ -926,14 +926,14 @@
 //				qDebug() << QString("auto linespacing: %1").arg(style.lineSpacing());
 			}
 			else if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
-				style.setLineSpacing(m_Doc->typographicSettings.valueBaseGrid);
+				style.setLineSpacing(m_Doc->guidesSettings.valueBaselineGrid);
 
 //			qDebug() << QString("style @0: %1 -- %2, %4/%5 char: %3").arg(style.leftMargin()).arg(style.rightMargin())
 //				   .arg(style.charStyle().asString()).arg(style.name()).arg(style.parent()?style.parent()->name():"");
 			if (style.hasDropCap())
 			{
 				if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
-					chs = qRound(m_Doc->typographicSettings.valueBaseGrid  * style.dropCapLines() * 10);
+					chs = qRound(m_Doc->guidesSettings.valueBaselineGrid  * style.dropCapLines() * 10);
 				else
 					chs = qRound(style.lineSpacing() * style.dropCapLines() * 10);
 			}
@@ -982,7 +982,7 @@
 				style.setLineSpacing(style.charStyle().font().height(style.charStyle().fontSize() / 10.0));
 			}
 			else if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
-				style.setLineSpacing(m_Doc->typographicSettings.valueBaseGrid);
+				style.setLineSpacing(m_Doc->guidesSettings.valueBaselineGrid);
 			// find out about par gap and dropcap
 			if (a == firstInFrame())
 			{
@@ -1052,7 +1052,7 @@
 					{
 						DropLines = style.dropCapLines();
 						if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
-							DropCapDrop = m_Doc->typographicSettings.valueBaseGrid * (DropLines-1);
+							DropCapDrop = m_Doc->guidesSettings.valueBaselineGrid * (DropLines-1);
 						else
 						{
 							if (style.lineSpacingMode() == ParagraphStyle::FixedLineSpacing)
@@ -1070,7 +1070,7 @@
 			{
 				// dropcap active?
 				if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
-					DropCapDrop = m_Doc->typographicSettings.valueBaseGrid * (DropLines-1);
+					DropCapDrop = m_Doc->guidesSettings.valueBaselineGrid * (DropLines-1);
 				else
 				{
 					if (style.lineSpacingMode() == ParagraphStyle::FixedLineSpacing)
@@ -1087,8 +1087,8 @@
 				double fontAscent     = charStyle.font().ascent(style.charStyle().fontSize() / 10.0);
 				if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
 				{
-					chsd = (10 * ((m_Doc->typographicSettings.valueBaseGrid * (DropLines-1) + fontAscent) / realCharHeight));
-					chs  = (10 * ((m_Doc->typographicSettings.valueBaseGrid * (DropLines-1) + fontAscent) / realCharAscent));
+					chsd = (10 * ((m_Doc->guidesSettings.valueBaselineGrid * (DropLines-1) + fontAscent) / realCharHeight));
+					chs  = (10 * ((m_Doc->guidesSettings.valueBaselineGrid * (DropLines-1) + fontAscent) / realCharAscent));
 				}
 				else
 				{
@@ -1149,7 +1149,7 @@
 				{
 					wide = hl->embedded.getItem()->gWidth + hl->embedded.getItem()->lineWidth();
 					if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
-						asce = m_Doc->typographicSettings.valueBaseGrid * DropLines;
+						asce = m_Doc->guidesSettings.valueBaselineGrid * DropLines;
 					else
 					{
 						if (style.lineSpacingMode() == ParagraphStyle::FixedLineSpacing)
@@ -1220,7 +1220,7 @@
 						if (DropCmode)
 						{
 							if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
-								desc2 = -charStyle.font().descent() * m_Doc->typographicSettings.valueBaseGrid * style.dropCapLines();
+								desc2 = -charStyle.font().descent() * m_Doc->guidesSettings.valueBaselineGrid * style.dropCapLines();
 							else
 								desc2 = -charStyle.font().descent() * style.lineSpacing() * style.dropCapLines();
 						}
@@ -1233,11 +1233,11 @@
 						double by = Ypos;
 						if (OwnPage != -1)
 							by = Ypos - m_Doc->Pages->at(OwnPage)->yOffset();
-						int ol1 = qRound((by + current.yPos - m_Doc->typographicSettings.offsetBaseGrid) * 10000.0);
-						int ol2 = static_cast<int>(ol1 / m_Doc->typographicSettings.valueBaseGrid);
-//						qDebug() << QString("baseline adjust: y=%1->%2").arg(current.yPos).arg(ceil(  ol2 / 10000.0 ) * m_Doc->typographicSettings.valueBaseGrid + m_Doc->typographicSettings.offsetBaseGrid - by);
+						int ol1 = qRound((by + current.yPos - m_Doc->guidesSettings.offsetBaselineGrid) * 10000.0);
+						int ol2 = static_cast<int>(ol1 / m_Doc->guidesSettings.valueBaselineGrid);
+//						qDebug() << QString("baseline adjust: y=%1->%2").arg(current.yPos).arg(ceil(  ol2 / 10000.0 ) * m_Doc->typographicSettings.valueBaselineGrid + m_Doc->typographicSettings.offsetBaselineGrid - by);
 
-						current.yPos = ceil(  ol2 / 10000.0 ) * m_Doc->typographicSettings.valueBaseGrid + m_Doc->typographicSettings.offsetBaseGrid - by;
+						current.yPos = ceil(  ol2 / 10000.0 ) * m_Doc->guidesSettings.valueBaselineGrid + m_Doc->guidesSettings.offsetBaselineGrid - by;
 					}
 				}
 				else
@@ -1262,17 +1262,17 @@
 //							if (((a > 0) && (itemText.at(a-1)->ch == QChar(13))) || ((a == 0) && (BackBox == 0)))
 //								current.yPos += m_Doc->docParagraphStyles[hl->cab].gapBefore;
 				}
-//				qDebug() << QString("layout: nextline grid=%1 x %2").arg(style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing).arg(m_Doc->typographicSettings.valueBaseGrid);
+//				qDebug() << QString("layout: nextline grid=%1 x %2").arg(style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing).arg(m_Doc->typographicSettings.valueBaselineGrid);
 				if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
 				{
 					double by = Ypos;
 					if (OwnPage != -1)
 						by = Ypos - m_Doc->Pages->at(OwnPage)->yOffset();
-					int ol1 = qRound((by + current.yPos - m_Doc->typographicSettings.offsetBaseGrid) * 10000.0);
-					int ol2 = static_cast<int>(ol1 / m_Doc->typographicSettings.valueBaseGrid);
-//					qDebug() << QString("useBaselIneGrid: %1 * %2 + %3 - %4").arg(ol2 / 10000.0).arg(m_Doc->typographicSettings.valueBaseGrid).arg(m_Doc->typographicSettings.offsetBaseGrid).arg(by);
-//					qDebug() << QString("baseline adjust: y=%1->%2").arg(current.yPos).arg(ceil(  ol2 / 10000.0 ) * m_Doc->typographicSettings.valueBaseGrid + m_Doc->typographicSettings.offsetBaseGrid - by);
-					current.yPos = ceil(  ol2 / 10000.0 ) * m_Doc->typographicSettings.valueBaseGrid + m_Doc->typographicSettings.offsetBaseGrid - by;
+					int ol1 = qRound((by + current.yPos - m_Doc->guidesSettings.offsetBaselineGrid) * 10000.0);
+					int ol2 = static_cast<int>(ol1 / m_Doc->guidesSettings.valueBaselineGrid);
+//					qDebug() << QString("useBaselIneGrid: %1 * %2 + %3 - %4").arg(ol2 / 10000.0).arg(m_Doc->typographicSettings.valueBaselineGrid).arg(m_Doc->typographicSettings.offsetBaselineGrid).arg(by);
+//					qDebug() << QString("baseline adjust: y=%1->%2").arg(current.yPos).arg(ceil(  ol2 / 10000.0 ) * m_Doc->typographicSettings.valueBaselineGrid + m_Doc->typographicSettings.offsetBaselineGrid - by);
+					current.yPos = ceil(  ol2 / 10000.0 ) * m_Doc->guidesSettings.valueBaselineGrid + m_Doc->guidesSettings.offsetBaselineGrid - by;
 				}
 				/* this causes different spacing for first line:
 				if (current.yPos-TopOffset < 0.0)
@@ -1307,16 +1307,16 @@
 							current.yPos++;
 						else
 							current.yPos += qMax(style.lineSpacing(), 1.0);
-//						qDebug() << QString("layout: next lower line grid=%1 x %2").arg(style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing).arg(m_Doc->typographicSettings.valueBaseGrid);
+//						qDebug() << QString("layout: next lower line grid=%1 x %2").arg(style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing).arg(m_Doc->typographicSettings.valueBaselineGrid);
 						if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
 						{
 							double by = Ypos;
 							if (OwnPage != -1)
 								by = Ypos - m_Doc->Pages->at(OwnPage)->yOffset();
-							int ol1 = qRound((by + current.yPos - m_Doc->typographicSettings.offsetBaseGrid) * 10000.0);
-							int ol2 = static_cast<int>(ol1 / m_Doc->typographicSettings.valueBaseGrid);
-//							qDebug() << QString("baseline adjust: y=%1->%2").arg(current.yPos).arg(ceil(  ol2 / 10000.0 ) * m_Doc->typographicSettings.valueBaseGrid + m_Doc->typographicSettings.offsetBaseGrid - by);
-							current.yPos = ceil(  ol2 / 10000.0 ) * m_Doc->typographicSettings.valueBaseGrid + m_Doc->typographicSettings.offsetBaseGrid - by;
+							int ol1 = qRound((by + current.yPos - m_Doc->guidesSettings.offsetBaselineGrid) * 10000.0);
+							int ol2 = static_cast<int>(ol1 / m_Doc->guidesSettings.valueBaselineGrid);
+//							qDebug() << QString("baseline adjust: y=%1->%2").arg(current.yPos).arg(ceil(  ol2 / 10000.0 ) * m_Doc->typographicSettings.valueBaselineGrid + m_Doc->typographicSettings.offsetBaselineGrid - by);
+							current.yPos = ceil(  ol2 / 10000.0 ) * m_Doc->guidesSettings.valueBaselineGrid + m_Doc->guidesSettings.offsetBaselineGrid - by;
 						}
 						if (current.isEndOfCol())
 						{
@@ -1334,23 +1334,23 @@
 									if (DropCmode)
 									{
 										if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
-											desc2 = -charStyle.font().descent() * m_Doc->typographicSettings.valueBaseGrid * style.dropCapLines();
+											desc2 = -charStyle.font().descent() * m_Doc->guidesSettings.valueBaselineGrid * style.dropCapLines();
 										else
 											desc2 = -charStyle.font().descent() * style.lineSpacing() * style.dropCapLines();
 									}
 									if (DropCmode)
 										DropLines = style.dropCapLines();
 								}
-//								qDebug() << QString("layout: nextcol2 grid=%1 x %2").arg(style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing).arg(m_Doc->typographicSettings.valueBaseGrid);
+//								qDebug() << QString("layout: nextcol2 grid=%1 x %2").arg(style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing).arg(m_Doc->guideSettings.valueBaselineGrid);
 								if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
 								{
 									double by = Ypos;
 									if (OwnPage != -1)
 										by = Ypos - m_Doc->Pages->at(OwnPage)->yOffset();
-									int ol1 = qRound((by + current.yPos - m_Doc->typographicSettings.offsetBaseGrid) * 10000.0);
-									int ol2 = static_cast<int>(ol1 / m_Doc->typographicSettings.valueBaseGrid);
-//									qDebug() << QString("baseline adjust: y=%1->%2").arg(current.yPos).arg(ceil(  ol2 / 10000.0 ) * m_Doc->typographicSettings.valueBaseGrid + m_Doc->typographicSettings.offsetBaseGrid - by);
-									current.yPos = ceil(  ol2 / 10000.0 ) * m_Doc->typographicSettings.valueBaseGrid + m_Doc->typographicSettings.offsetBaseGrid - by;
+									int ol1 = qRound((by + current.yPos - m_Doc->guidesSettings.offsetBaselineGrid) * 10000.0);
+									int ol2 = static_cast<int>(ol1 / m_Doc->guidesSettings.valueBaselineGrid);
+//									qDebug() << QString("baseline adjust: y=%1->%2").arg(current.yPos).arg(ceil(  ol2 / 10000.0 ) * m_Doc->guideSettings.valueBaseGrid + m_Doc->typographicSettings.offsetBaselineGrid - by);
+									current.yPos = ceil(  ol2 / 10000.0 ) * m_Doc->guidesSettings.valueBaselineGrid + m_Doc->guidesSettings.offsetBaselineGrid - by;
 								}
 							}
 							else
@@ -1591,17 +1591,17 @@
 				QPolygon tcli(4);
 				if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
 				{
-					current.yPos -= m_Doc->typographicSettings.valueBaseGrid * (DropLines-1);
+					current.yPos -= m_Doc->guidesSettings.valueBaselineGrid * (DropLines-1);
 					double by = Ypos;
 					if (OwnPage != -1)
 						by = Ypos - m_Doc->Pages->at(OwnPage)->yOffset();
-					int ol1 = qRound((by + current.yPos - m_Doc->typographicSettings.offsetBaseGrid) * 10000.0);
-					int ol2 = static_cast<int>(ol1 / m_Doc->typographicSettings.valueBaseGrid);
-//					qDebug() << QString("baseline adjust after dropcaps: y=%1->%2").arg(current.yPos).arg(ceil(  ol2 / 10000.0 ) * m_Doc->typographicSettings.valueBaseGrid + m_Doc->typographicSettings.offsetBaseGrid - by);
-					current.yPos = ceil(  ol2 / 10000.0 ) * m_Doc->typographicSettings.valueBaseGrid + m_Doc->typographicSettings.offsetBaseGrid - by;
+					int ol1 = qRound((by + current.yPos - m_Doc->guidesSettings.offsetBaselineGrid) * 10000.0);
+					int ol2 = static_cast<int>(ol1 / m_Doc->guidesSettings.valueBaselineGrid);
+//					qDebug() << QString("baseline adjust after dropcaps: y=%1->%2").arg(current.yPos).arg(ceil(  ol2 / 10000.0 ) * m_Doc->guideSettings.valueBaselineGrid + m_Doc->typographicSettings.offsetBaselineGrid - by);
+					current.yPos = ceil(  ol2 / 10000.0 ) * m_Doc->guidesSettings.valueBaselineGrid + m_Doc->guidesSettings.offsetBaselineGrid - by;
 					//FIXME: use current.colLeft instead of xOffset?
-					tcli.setPoint(0, QPoint(qRound(hl->glyph.xoffset), qRound(maxDY-DropLines*m_Doc->typographicSettings.valueBaseGrid)));
-					tcli.setPoint(1, QPoint(qRound(maxDX), qRound(maxDY-DropLines*m_Doc->typographicSettings.valueBaseGrid)));
+					tcli.setPoint(0, QPoint(qRound(hl->glyph.xoffset), qRound(maxDY-DropLines*m_Doc->guidesSettings.valueBaselineGrid)));
+					tcli.setPoint(1, QPoint(qRound(maxDX), qRound(maxDY-DropLines*m_Doc->guidesSettings.valueBaselineGrid)));
 				}
 				else
 				{
@@ -1693,7 +1693,7 @@
 //							qDebug() << QString("auto linespacing: %1").arg(style.lineSpacing());
 						}
 						else if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
-							style.setLineSpacing(m_Doc->typographicSettings.valueBaseGrid);
+							style.setLineSpacing(m_Doc->guidesSettings.valueBaselineGrid);
 						current.itemsInLine = a - current.line.firstItem + 1;
 //						qDebug() << QString("style outs pos %1: %2 (%3)").arg(a).arg(style.alignment()).arg(style.parent());
 //						qDebug() << QString("style <@%6: %1 -- %2, %4/%5 char: %3").arg(style.leftMargin()).arg(style.rightMargin())
@@ -1781,7 +1781,7 @@
 //								qDebug() << QString("auto linespacing: %1").arg(style.lineSpacing());
 							}
 							else if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
-								style.setLineSpacing(m_Doc->typographicSettings.valueBaseGrid);
+								style.setLineSpacing(m_Doc->guidesSettings.valueBaselineGrid);
 						}
 						current.breakLine(itemText, a);
 //						qDebug() << QString("style no break pos %1: %2 (%3)").arg(a).arg(style.alignment()).arg(style.parent());
@@ -1820,7 +1820,7 @@
 //								qDebug() << QString("nextline: y=%1+%2").arg(current.yPos).arg(style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing? m_Doc->typographicSettings.valueBaseGrid : style.lineSpacing());
 
 								if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
-									current.yPos += m_Doc->typographicSettings.valueBaseGrid;
+									current.yPos += m_Doc->guidesSettings.valueBaselineGrid;
 								else
 									current.yPos += style.lineSpacing();
 								if (current.isEndOfCol(desc) && (current.column+1 == Cols))
@@ -1895,7 +1895,7 @@
 						{
 //							qDebug() << QString("next line (grid): y=%1+%2").arg(current.yPos).arg(m_Doc->typographicSettings.valueBaseGrid);
 
-							current.yPos += m_Doc->typographicSettings.valueBaseGrid;
+							current.yPos += m_Doc->guidesSettings.valueBaselineGrid;
 						}
 						else
 						{
@@ -1907,7 +1907,7 @@
 							if (pStyle.lineSpacingMode() == ParagraphStyle::AutomaticLineSpacing)
 								lineSpacing = pStyle.charStyle().font().height(pStyle.charStyle().fontSize() / 10.0);
 							else if (pStyle.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
-								lineSpacing = m_Doc->typographicSettings.valueBaseGrid;
+								lineSpacing = m_Doc->guidesSettings.valueBaselineGrid;
 							current.yPos += lineSpacing;
 						}
 						if (AbsHasDrop)
@@ -2531,7 +2531,7 @@
 				{
 					const ParagraphStyle& style(itemText.paragraphStyle(a));
 					if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
-						chs = qRound(10 * ((m_Doc->typographicSettings.valueBaseGrid * (style.dropCapLines()-1) + (charStyle.font().ascent(style.charStyle().fontSize() / 10.0))) / charStyle.font().realCharHeight(chstr0, 10)));
+						chs = qRound(10 * ((m_Doc->guidesSettings.valueBaselineGrid * (style.dropCapLines()-1) + (charStyle.font().ascent(style.charStyle().fontSize() / 10.0))) / charStyle.font().realCharHeight(chstr0, 10)));
 					else
 					{
 						if (style.lineSpacingMode() == ParagraphStyle::FixedLineSpacing)
Index: scribus/ui/polygonwidget.h
===================================================================
--- scribus/ui/polygonwidget.h	(revision 13888)
+++ scribus/ui/polygonwidget.h	(revision 13889)
@@ -21,7 +21,7 @@
 	double GetZeroFaktor();
 	double GetMaxFaktor();
 	void getValues(int* polyC, int* polyFd, double* polyF, bool* polyS, double* polyR, double* polyCurvature);
-	void restoreDefaults(struct toolPrefs *prefsData);
+	void restoreDefaults(struct ToolPrefs *prefsData);
 	double PFactor;
 
 public slots:
Index: scribus/ui/polygonwidget.cpp
===================================================================
--- scribus/ui/polygonwidget.cpp	(revision 13888)
+++ scribus/ui/polygonwidget.cpp	(revision 13889)
@@ -52,7 +52,7 @@
 	connect(CurvatureSlider, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
 }
 
-void PolygonWidget::restoreDefaults(struct toolPrefs *prefsData)
+void PolygonWidget::restoreDefaults(struct ToolPrefs *prefsData)
 {
 	disconnect(Faktor, SIGNAL(valueChanged(int)), this, SLOT(ValFromSpin(int)));
 	disconnect(Faktor2, SIGNAL(valueChanged(int)), this, SLOT(ValFromSpin2(int)));
Index: scribus/ui/tabtools.h
===================================================================
--- scribus/ui/tabtools.h	(revision 13888)
+++ scribus/ui/tabtools.h	(revision 13889)
@@ -40,10 +40,10 @@
 	Q_OBJECT
 
 public:
-	TabTools( QWidget* parent, struct toolPrefs *prefsData, int unitIndex, ScribusDoc* doc);
+	TabTools( QWidget* parent, struct ToolPrefs *prefsData, int unitIndex, ScribusDoc* doc);
 	~TabTools() {};
 
-	void restoreDefaults(struct toolPrefs *prefsData, int unitIndex);
+	void restoreDefaults(struct ToolPrefs *prefsData, int unitIndex);
 
 	/*! \brief Enable sample rendering.
 	It's called when user selects this panel in preferences. First painting is very slow
Index: scribus/ui/tabdisplay.h
===================================================================
--- scribus/ui/tabdisplay.h	(revision 13888)
+++ scribus/ui/tabdisplay.h	(revision 13889)
@@ -25,7 +25,7 @@
 	public:
 		TabDisplay(QWidget* parent = 0, const char* name = 0);
 		~TabDisplay(){};
-		void restoreDefaults(struct ApplicationPrefs *prefsData, struct guidesPrefs &guidesSettings, QList<PageSet> &pageSets, int pageLayout, MarginStruct &scratch);
+		void restoreDefaults(struct ApplicationPrefs *prefsData, struct GuidesPrefs &guidesSettings, QList<PageSet> &pageSets, int pageLayout, MarginStruct &scratch);
 		void unitChange(int docUnitIx);
 		//! \brief Hide non-needed widgets for ReformDoc widget
 		void setDocSetupMode();
Index: scribus/ui/tabguides.h
===================================================================
--- scribus/ui/tabguides.h	(revision 13888)
+++ scribus/ui/tabguides.h	(revision 13889)
@@ -27,9 +27,9 @@
 	Q_OBJECT
 
 public:
-	TabGuides( QWidget* parent, struct guidesPrefs *prefsData, struct typoPrefs *prefsData2, int unitIndex);
+	TabGuides( QWidget* parent, struct GuidesPrefs *prefsData, struct TypoPrefs *prefsData2, int unitIndex);
 	~TabGuides() {};
-	void restoreDefaults(struct guidesPrefs *prefsData, struct typoPrefs *prefsData2, int unitIndex);
+	void restoreDefaults(struct GuidesPrefs *prefsData, struct TypoPrefs *prefsData2, int unitIndex);
 	void unitChange(QString unit, int docUnitIndex, double invUnitConversion);
 
 	ScrSpinBox* majorSpace;
Index: scribus/ui/prefs.cpp
===================================================================
--- scribus/ui/prefs.cpp	(revision 13888)
+++ scribus/ui/prefs.cpp	(revision 13889)
@@ -78,7 +78,7 @@
 	tabDocument = new TabDocument( prefsWidgets, "tabDocument" );
 	addItem( tr("Document"), loadIcon("scribusdoc.png"), tabDocument);
 
-	tabGuides = new TabGuides(prefsWidgets, &prefsData->guidesSettings, &prefsData->typographicSettings, docUnitIndex);
+	tabGuides = new TabGuides(prefsWidgets, &prefsData->guidesPrefs, &prefsData->typographicSettings, docUnitIndex);
 	addItem( tr("Guides"), loadIcon("guides.png"), tabGuides);
 
 	tabTypo = new TabTypograpy(prefsWidgets, &prefsData->typographicSettings);
@@ -201,12 +201,12 @@
 	tabGeneral->restoreDefaults(prefsData);
 	tabDocument->restoreDefaults(prefsData);
 	tabPrinter->restoreDefaults(prefsData);
-	tabView->restoreDefaults(prefsData, prefsData->guidesSettings, prefsData->pageSets, prefsData->docSetupPrefs.pagePositioning, prefsData->scratch);
+	tabView->restoreDefaults(prefsData, prefsData->guidesPrefs, prefsData->pageSets, prefsData->docSetupPrefs.pagePositioning, prefsData->scratch);
 	tabView->gapHorizontal->setValue(prefsData->GapHorizontal); // * unitRatio);
 	tabView->gapVertical->setValue(prefsData->GapVertical); // * unitRatio);
 	tabScrapbook->restoreDefaults(prefsData);
 	tabHyphenator->restoreDefaults(prefsData);
-	tabGuides->restoreDefaults(&prefsData->guidesSettings, &prefsData->typographicSettings, docUnitIndex);
+	tabGuides->restoreDefaults(&prefsData->guidesPrefs, &prefsData->typographicSettings, docUnitIndex);
 	tabTypo->restoreDefaults(&prefsData->typographicSettings);
 	tabTools->restoreDefaults(&prefsData->toolSettings, docUnitIndex);
 	// main performance issue in availFonts->GetFonts(HomeP)!
@@ -378,13 +378,13 @@
 	prefsManager->appPrefs.DControlCharColor = tabView->colorControlChars;
 	// Guides
 
-	prefsManager->appPrefs.guidesSettings.framesShown = tabView->checkFrame->isChecked();
-	prefsManager->appPrefs.guidesSettings.showBleed = tabView->checkBleed->isChecked();
-	prefsManager->appPrefs.guidesSettings.layerMarkersShown = tabView->checkLayerM->isChecked();
-	prefsManager->appPrefs.guidesSettings.rulerMode = tabView->checkRuler->isChecked();
-	prefsManager->appPrefs.guidesSettings.showPic = tabView->checkPictures->isChecked();
-	prefsManager->appPrefs.guidesSettings.linkShown = tabView->checkLink->isChecked();
-	prefsManager->appPrefs.guidesSettings.showControls = tabView->checkControl->isChecked();
+	prefsManager->appPrefs.guidesPrefs.framesShown = tabView->checkFrame->isChecked();
+	prefsManager->appPrefs.guidesPrefs.showBleed = tabView->checkBleed->isChecked();
+	prefsManager->appPrefs.guidesPrefs.layerMarkersShown = tabView->checkLayerM->isChecked();
+	prefsManager->appPrefs.guidesPrefs.rulerMode = tabView->checkRuler->isChecked();
+	prefsManager->appPrefs.guidesPrefs.showPic = tabView->checkPictures->isChecked();
+	prefsManager->appPrefs.guidesPrefs.linkShown = tabView->checkLink->isChecked();
+	prefsManager->appPrefs.guidesPrefs.showControls = tabView->checkControl->isChecked();
 	prefsManager->appPrefs.DisScale = tabView->DisScale;
 
 	prefsManager->appPrefs.doCopyToScrapbook = tabScrapbook->useScrapBookasExtension->isChecked();
@@ -429,7 +429,7 @@
 	prefsManager->setLatexCommands(tabExtTools->newLatexCommands());
 	prefsManager->setLatexEditorExecutable(tabExtTools->newLatexEditor());
 
-	prefsManager->appPrefs.guidesSettings.before = tabGuides->inBackground->isChecked();
+	prefsManager->appPrefs.guidesPrefs.guidePlacement = tabGuides->inBackground->isChecked();
 	
 	prefsManager->appPrefs.askBeforeSubstituite = tabMiscellaneous->AskForSubs->isChecked();
 	prefsManager->appPrefs.haveStylePreview = tabMiscellaneous->stylePreview->isChecked();
@@ -442,19 +442,19 @@
 	prefsManager->appPrefs.toolSettings.defFont = tabTools->fontComboText->currentText();
 	prefsManager->appPrefs.toolSettings.defSize = tabTools->sizeComboText->currentText().left(2).toInt() * 10;
 
-	prefsManager->appPrefs.guidesSettings.marginsShown = tabGuides->marginBox->isChecked();
-	prefsManager->appPrefs.guidesSettings.gridShown = tabGuides->checkGrid->isChecked();
-	prefsManager->appPrefs.guidesSettings.guidesShown = tabGuides->guideBox->isChecked();
-	prefsManager->appPrefs.guidesSettings.baseShown = tabGuides->baselineBox->isChecked();
-	prefsManager->appPrefs.guidesSettings.grabRad = tabGuides->grabDistance->value();
-	prefsManager->appPrefs.guidesSettings.guideRad = tabGuides->snapDistance->value();
-	prefsManager->appPrefs.guidesSettings.minorGrid = tabGuides->minorSpace->value() / prefsUnitRatio;
-	prefsManager->appPrefs.guidesSettings.majorGrid = tabGuides->majorSpace->value() / prefsUnitRatio;
-	prefsManager->appPrefs.guidesSettings.minorColor = tabGuides->colorMinorGrid;
-	prefsManager->appPrefs.guidesSettings.majorColor = tabGuides->colorMajorGrid;
-	prefsManager->appPrefs.guidesSettings.margColor = tabGuides->colorMargin;
-	prefsManager->appPrefs.guidesSettings.guideColor = tabGuides->colorGuides;
-	prefsManager->appPrefs.guidesSettings.baseColor = tabGuides->colorBaselineGrid;
+	prefsManager->appPrefs.guidesPrefs.marginsShown = tabGuides->marginBox->isChecked();
+	prefsManager->appPrefs.guidesPrefs.gridShown = tabGuides->checkGrid->isChecked();
+	prefsManager->appPrefs.guidesPrefs.guidesShown = tabGuides->guideBox->isChecked();
+	prefsManager->appPrefs.guidesPrefs.baselineGridShown = tabGuides->baselineBox->isChecked();
+	prefsManager->appPrefs.guidesPrefs.grabRadius = tabGuides->grabDistance->value();
+	prefsManager->appPrefs.guidesPrefs.guideRad = tabGuides->snapDistance->value();
+	prefsManager->appPrefs.guidesPrefs.minorGridSpacing = tabGuides->minorSpace->value() / prefsUnitRatio;
+	prefsManager->appPrefs.guidesPrefs.majorGridSpacing = tabGuides->majorSpace->value() / prefsUnitRatio;
+	prefsManager->appPrefs.guidesPrefs.minorGridColor = tabGuides->colorMinorGrid;
+	prefsManager->appPrefs.guidesPrefs.majorGridColor = tabGuides->colorMajorGrid;
+	prefsManager->appPrefs.guidesPrefs.marginColor = tabGuides->colorMargin;
+	prefsManager->appPrefs.guidesPrefs.guideColor = tabGuides->colorGuides;
+	prefsManager->appPrefs.guidesPrefs.baselineGridColor = tabGuides->colorBaselineGrid;
 	prefsManager->appPrefs.checkerProfiles = tabDocChecker->checkerProfile;
 	prefsManager->appPrefs.curCheckProfile = tabDocChecker->curCheckProfile->currentText();
 	prefsManager->appPrefs.typographicSettings.valueSuperScript = tabTypo->superDisplacement->value();
@@ -463,8 +463,8 @@
 	prefsManager->appPrefs.typographicSettings.scalingSubScript = tabTypo->subScaling->value();
 	prefsManager->appPrefs.typographicSettings.valueSmallCaps = tabTypo->capsScaling->value();
 	prefsManager->appPrefs.typographicSettings.autoLineSpacing = tabTypo->autoLine->value();
-	prefsManager->appPrefs.typographicSettings.valueBaseGrid = tabGuides->baseGrid->value(); // / prefsUnitRatio;
-	prefsManager->appPrefs.typographicSettings.offsetBaseGrid = tabGuides->baseOffset->value(); // / prefsUnitRatio;
+	prefsManager->appPrefs.guidesPrefs.valueBaselineGrid = tabGuides->baseGrid->value(); // / prefsUnitRatio;
+	prefsManager->appPrefs.guidesPrefs.offsetBaselineGrid = tabGuides->baseOffset->value(); // / prefsUnitRatio;
 	prefsManager->appPrefs.typographicSettings.valueUnderlinePos = qRound(tabTypo->underlinePos->value() * 10);
 	prefsManager->appPrefs.typographicSettings.valueUnderlineWidth = qRound(tabTypo->underlineWidth->value() * 10);
 	prefsManager->appPrefs.typographicSettings.valueStrikeThruPos = qRound(tabTypo->strikethruPos->value() * 10);
Index: scribus/ui/hruler.cpp
===================================================================
--- scribus/ui/hruler.cpp	(revision 13888)
+++ scribus/ui/hruler.cpp	(revision 13889)
@@ -103,12 +103,12 @@
 		RulerCode = rc_none;
 		Markp = -1;
 		double Pos = (ItemPos-offs+Extra+lineCorr)*Scaling;
-		if ((static_cast<int>(Pos-1) < (m->x()+currDoc->guidesSettings.grabRad))
-				   && (static_cast<int>(Pos-1) > (m->x()-currDoc->guidesSettings.grabRad)))
+		if ((static_cast<int>(Pos-1) < (m->x()+currDoc->guidesSettings.grabRadius))
+				   && (static_cast<int>(Pos-1) > (m->x()-currDoc->guidesSettings.grabRadius)))
 			RulerCode = rc_leftFrameDist;
 		Pos = (ItemEndPos-offs-RExtra-lineCorr)*Scaling;
-		if ((static_cast<int>(Pos+1) < (m->x()+currDoc->guidesSettings.grabRad))
-				   && (static_cast<int>(Pos+1) > (m->x()-currDoc->guidesSettings.grabRad)))
+		if ((static_cast<int>(Pos+1) < (m->x()+currDoc->guidesSettings.grabRadius))
+				   && (static_cast<int>(Pos+1) > (m->x()-currDoc->guidesSettings.grabRadius)))
 			RulerCode = rc_rightFrameDist;
 		double ColWidth = (ItemEndPos - ItemPos - (ColGap * (Cols - 1)) - Extra - RExtra - 2*lineCorr) / Cols;
 		QRect fpo;
@@ -390,10 +390,10 @@
 		{
 			qApp->changeOverrideCursor(QCursor(loadIcon("tab.png"), 3));
 			double Pos = (ItemPos-offs+Extra+lineCorr)*Scaling;
-			if ((static_cast<int>(Pos) < (m->x()+currDoc->guidesSettings.grabRad)) && (static_cast<int>(Pos) > (m->x()-currDoc->guidesSettings.grabRad)))
+			if ((static_cast<int>(Pos) < (m->x()+currDoc->guidesSettings.grabRadius)) && (static_cast<int>(Pos) > (m->x()-currDoc->guidesSettings.grabRadius)))
 				qApp->changeOverrideCursor(QCursor(Qt::SizeHorCursor));
 			Pos = (ItemEndPos-offs-RExtra-lineCorr)*Scaling;
-			if ((static_cast<int>(Pos) < (m->x()+currDoc->guidesSettings.grabRad)) && (static_cast<int>(Pos) > (m->x()-currDoc->guidesSettings.grabRad)))
+			if ((static_cast<int>(Pos) < (m->x()+currDoc->guidesSettings.grabRadius)) && (static_cast<int>(Pos) > (m->x()-currDoc->guidesSettings.grabRadius)))
 				qApp->changeOverrideCursor(QCursor(Qt::SizeHorCursor));
 			QRect fpo;
 			double ColWidth = (ItemEndPos - ItemPos - (ColGap * (Cols - 1)) - Extra - RExtra - 2*lineCorr) / Cols;
Index: scribus/ui/tabdisplay.cpp
===================================================================
--- scribus/ui/tabdisplay.cpp	(revision 13888)
+++ scribus/ui/tabdisplay.cpp	(revision 13889)
@@ -60,7 +60,7 @@
 	connect(rulerUnitCombo, SIGNAL(activated(int)), this, SLOT(drawRuler()));
 }
 
-void TabDisplay::restoreDefaults(struct ApplicationPrefs *prefsData, struct guidesPrefs &guidesSettings, QList<PageSet> &pageSets, int pageLayout, MarginStruct &scratch)
+void TabDisplay::restoreDefaults(struct ApplicationPrefs *prefsData, struct GuidesPrefs &guidesSettings, QList<PageSet> &pageSets, int pageLayout, MarginStruct &scratch)
 {
 	docUnitIndex = prefsData->docSetupPrefs.docUnitIndex;
 	double unitRatio = unitGetRatioFromIndex(docUnitIndex);
Index: scribus/ui/reformdoc.cpp
===================================================================
--- scribus/ui/reformdoc.cpp	(revision 13888)
+++ scribus/ui/reformdoc.cpp	(revision 13889)
@@ -306,7 +306,7 @@
 		item->moveBy(LeftD, TopD);
 		item->setRedrawBounding();
 	}
-	currDoc->guidesSettings.before = tabGuides->inBackground->isChecked();
+	currDoc->guidesSettings.guidePlacement = tabGuides->inBackground->isChecked();
 	currDoc->marginColored = tabView->checkUnprintable->isChecked();
 	currDoc->papColor = tabView->colorPaper;
 	currDoc->guidesSettings.marginsShown = tabGuides->marginBox->isChecked();
@@ -315,20 +315,20 @@
 	currDoc->guidesSettings.layerMarkersShown = tabView->checkLayerM->isChecked();
 	currDoc->guidesSettings.gridShown = tabGuides->checkGrid->isChecked();
 	currDoc->guidesSettings.guidesShown = tabGuides->guideBox->isChecked();
-	currDoc->guidesSettings.baseShown = tabGuides->baselineBox->isChecked();
+	currDoc->guidesSettings.baselineGridShown = tabGuides->baselineBox->isChecked();
 	currDoc->guidesSettings.showPic = tabView->checkPictures->isChecked();
 	currDoc->guidesSettings.linkShown = tabView->checkLink->isChecked();
 	currDoc->guidesSettings.showControls = tabView->checkControl->isChecked();
 	currDoc->guidesSettings.rulerMode = tabView->checkRuler->isChecked();
-	currDoc->guidesSettings.grabRad = tabGuides->grabDistance->value();
+	currDoc->guidesSettings.grabRadius = tabGuides->grabDistance->value();
 	currDoc->guidesSettings.guideRad = tabGuides->snapDistance->value();
-	currDoc->guidesSettings.minorGrid = tabGuides->minorSpace->value() / currDoc->unitRatio();
-	currDoc->guidesSettings.majorGrid = tabGuides->majorSpace->value() / currDoc->unitRatio();
-	currDoc->guidesSettings.minorColor = tabGuides->colorMinorGrid;
-	currDoc->guidesSettings.majorColor = tabGuides->colorMajorGrid;
-	currDoc->guidesSettings.margColor = tabGuides->colorMargin;
+	currDoc->guidesSettings.minorGridSpacing = tabGuides->minorSpace->value() / currDoc->unitRatio();
+	currDoc->guidesSettings.majorGridSpacing = tabGuides->majorSpace->value() / currDoc->unitRatio();
+	currDoc->guidesSettings.minorGridColor = tabGuides->colorMinorGrid;
+	currDoc->guidesSettings.majorGridColor = tabGuides->colorMajorGrid;
+	currDoc->guidesSettings.marginColor = tabGuides->colorMargin;
 	currDoc->guidesSettings.guideColor = tabGuides->colorGuides;
-	currDoc->guidesSettings.baseColor = tabGuides->colorBaselineGrid;
+	currDoc->guidesSettings.baselineGridColor = tabGuides->colorBaselineGrid;
 	currDoc->checkerProfiles = tabDocChecker->checkerProfile;
 	currDoc->curCheckProfile = tabDocChecker->curCheckProfile->currentText();
 	currDoc->typographicSettings.valueSuperScript = tabTypo->superDisplacement->value();
@@ -337,8 +337,8 @@
 	currDoc->typographicSettings.scalingSubScript = tabTypo->subScaling->value();
 	currDoc->typographicSettings.valueSmallCaps = tabTypo->capsScaling->value();
 	currDoc->typographicSettings.autoLineSpacing = tabTypo->autoLine->value();
-	currDoc->typographicSettings.valueBaseGrid = tabGuides->baseGrid->value(); // / currDoc->unitRatio();
-	currDoc->typographicSettings.offsetBaseGrid = tabGuides->baseOffset->value(); // / currDoc->unitRatio();
+	currDoc->guidesSettings.valueBaselineGrid = tabGuides->baseGrid->value(); // / currDoc->unitRatio();
+	currDoc->guidesSettings.offsetBaselineGrid = tabGuides->baseOffset->value(); // / currDoc->unitRatio();
 	currDoc->typographicSettings.valueUnderlinePos = qRound(tabTypo->underlinePos->value() * 10);
 	currDoc->typographicSettings.valueUnderlineWidth = qRound(tabTypo->underlineWidth->value() * 10);
 	currDoc->typographicSettings.valueStrikeThruPos = qRound(tabTypo->strikethruPos->value() * 10);
Index: scribus/ui/tabtypography.h
===================================================================
--- scribus/ui/tabtypography.h	(revision 13888)
+++ scribus/ui/tabtypography.h	(revision 13889)
@@ -21,9 +21,9 @@
 	Q_OBJECT
 
 public:
-	TabTypograpy( QWidget* parent, struct typoPrefs *prefsData);
+	TabTypograpy( QWidget* parent, struct TypoPrefs *prefsData);
 	~TabTypograpy() {};
-	void restoreDefaults(struct typoPrefs *prefsData);
+	void restoreDefaults(struct TypoPrefs *prefsData);
 
 	QGroupBox* groupBox1a;
 	QLabel* textLabel1a;
Index: scribus/prefsstructs.h
===================================================================
--- scribus/prefsstructs.h	(revision 13888)
+++ scribus/prefsstructs.h	(revision 13889)
@@ -19,7 +19,7 @@
 #include "pdfoptions.h"
 #include "scfonts.h"
 
-struct checkerPrefs
+struct CheckerPrefs
 {
 	bool ignoreErrors;
 	bool autoCheck;
@@ -37,9 +37,9 @@
 	bool ignoreOffLayers;
 };
 
-typedef QMap<QString, checkerPrefs> CheckerPrefsList;
+typedef QMap<QString, CheckerPrefs> CheckerPrefsList;
 
-struct typoPrefs
+struct TypoPrefs
 {
 	int valueSuperScript;
 	int scalingSuperScript;
@@ -51,11 +51,9 @@
 	int valueUnderlineWidth;
 	int valueStrikeThruPos;
 	int valueStrikeThruWidth;
-	double valueBaseGrid;
-	double offsetBaseGrid;
 };
 
-struct windowPrefs
+struct WindowPrefs
 {
 	int xPosition;
 	int yPosition;
@@ -66,35 +64,8 @@
 	bool maximized;
 };
 
-struct guidesPrefs
+struct ToolPrefs
 {
-	bool gridShown;
-	QColor majorColor;
-	double majorGrid;
-	double minorGrid;
-	QColor minorColor;
-	double guideRad;
-	int grabRad;
-	bool framesShown;
-	bool guidesShown;
-	bool colBordersShown;
-	bool marginsShown;
-	bool baseShown;
-	bool linkShown;
-	bool showPic;
-	bool showControls;
-	bool showBleed;
-	bool rulerMode;
-	bool rulersShown;
-	bool layerMarkersShown;
-	bool before;
-	QColor guideColor;
-	QColor baseColor;
-	QColor margColor;
-};
-
-struct toolPrefs
-{
 	/* Texttool */
 	QString defFont;
 	int defSize;
@@ -188,12 +159,50 @@
 	int docUnitIndex; //! The index of the default unit
 };
 
+//Guides
+struct GuidesPrefs
+{
+	bool guidePlacement;
+
+	int grabRadius;
+	double guideRad;
+
+	bool guidesShown;
+	bool marginsShown;
+	bool gridShown;
+	bool baselineGridShown;
+	bool framesShown;
+	bool colBordersShown;
+	bool layerMarkersShown;
+	bool linkShown;
+	bool rulersShown;
+
+	double majorGridSpacing;
+	double minorGridSpacing;
+	double valueBaselineGrid;
+	double offsetBaselineGrid;
+
+	bool showPic;
+	bool showControls;
+	bool showBleed;
+	bool rulerMode;
+
+
+
+	QColor guideColor;
+	QColor marginColor;
+	QColor majorGridColor;
+	QColor minorGridColor;
+	QColor baselineGridColor;
+};
+
+
 struct ApplicationPrefs
 {
 	UIPrefs uiPrefs;
 	PathPrefs pathPrefs;
 	DocumentSetupPrefs docSetupPrefs;
-	//Guides
+	GuidesPrefs guidesPrefs;
 	//Typography
 	//Item Tools
 	//Operators Tools
@@ -230,13 +239,12 @@
 	QColor DPageBorderColor;
 	QColor DControlCharColor;
 
-	guidesPrefs guidesSettings;
-	typoPrefs typographicSettings;
-	toolPrefs toolSettings;
+	TypoPrefs typographicSettings;
+	ToolPrefs toolSettings;
 	CheckerPrefsList checkerProfiles;
 	QString curCheckProfile;
 
-	windowPrefs mainWinSettings;
+	WindowPrefs mainWinSettings;
 	QByteArray mainWinState;
 	
 
Index: scribus/ui/tabcheckdoc.cpp
===================================================================
--- scribus/ui/tabcheckdoc.cpp	(revision 13888)
+++ scribus/ui/tabcheckdoc.cpp	(revision 13889)
@@ -240,7 +240,7 @@
 
 void TabCheckDoc::addProf()
 {
-	struct checkerPrefs checkerSettings;
+	struct CheckerPrefs checkerSettings;
 	checkerSettings.ignoreErrors = ignoreErrors->isChecked();
 	checkerSettings.autoCheck = automaticCheck->isChecked();
 	checkerSettings.checkGlyphs = missingGlyphs->isChecked();
Index: scribus/canvasmode_rotate.cpp
===================================================================
--- scribus/canvasmode_rotate.cpp	(revision 13888)
+++ scribus/canvasmode_rotate.cpp	(revision 13889)
@@ -209,7 +209,7 @@
 	m_doc->leaveDrag = false;
 	m->accept();
 	m_view->registerMousePress(m->globalPos());
-	QRect mpo(m->x()-m_doc->guidesSettings.grabRad, m->y()-m_doc->guidesSettings.grabRad, m_doc->guidesSettings.grabRad*2, m_doc->guidesSettings.grabRad*2);
+	QRect mpo(m->x()-m_doc->guidesSettings.grabRadius, m->y()-m_doc->guidesSettings.grabRadius, m_doc->guidesSettings.grabRadius*2, m_doc->guidesSettings.grabRadius*2);
 	Rxp  = m_doc->ApplyGridF(m_canvasPressCoord).x();
 	Rxpd = m_canvasPressCoord.x() - Rxp;
 	m_canvasPressCoord.setX( qRound(Rxp) );
@@ -431,7 +431,7 @@
 					break;
 				QMatrix p;
 				m_canvas->Transform(currItem, p);
-				QRect mpo = QRect(m->x()-m_doc->guidesSettings.grabRad, m->y()-m_doc->guidesSettings.grabRad, m_doc->guidesSettings.grabRad*2, m_doc->guidesSettings.grabRad*2);
+				QRect mpo = QRect(m->x()-m_doc->guidesSettings.grabRadius, m->y()-m_doc->guidesSettings.grabRadius, m_doc->guidesSettings.grabRadius*2, m_doc->guidesSettings.grabRadius*2);
 				if ((QRegion(p.map(QPolygon(QRect(-3, -3, static_cast<int>(currItem->width()+6), static_cast<int>(currItem->height()+6))))).contains(mpo)))
 				{
 					tx = p.mapRect(QRect(0, 0, static_cast<int>(currItem->width()), static_cast<int>(currItem->height())));
Index: scribus/scribus.cpp
===================================================================
--- scribus/scribus.cpp	(revision 13888)
+++ scribus/scribus.cpp	(revision 13889)
@@ -2486,7 +2486,7 @@
 	scrActions["viewShowGrid"]->setChecked(doc->guidesSettings.gridShown);
 	scrActions["viewShowGuides"]->setChecked(doc->guidesSettings.guidesShown);
 	scrActions["viewShowColumnBorders"]->setChecked(doc->guidesSettings.colBordersShown);
-	scrActions["viewShowBaseline"]->setChecked(doc->guidesSettings.baseShown);
+	scrActions["viewShowBaseline"]->setChecked(doc->guidesSettings.baselineGridShown);
 	scrActions["viewShowImages"]->setChecked(doc->guidesSettings.showPic);
 	scrActions["viewShowTextChain"]->setChecked(doc->guidesSettings.linkShown);
 	scrActions["viewShowTextControls"]->setChecked(doc->guidesSettings.showControls);
@@ -2562,7 +2562,7 @@
 	scrActions["viewShowGrid"]->setChecked(doc->guidesSettings.gridShown);
 	scrActions["viewShowGuides"]->setChecked(doc->guidesSettings.guidesShown);
 	scrActions["viewShowColumnBorders"]->setChecked(doc->guidesSettings.colBordersShown);
-	scrActions["viewShowBaseline"]->setChecked(doc->guidesSettings.baseShown);
+	scrActions["viewShowBaseline"]->setChecked(doc->guidesSettings.baselineGridShown);
 	scrActions["viewShowImages"]->setChecked(doc->guidesSettings.showPic);
 	scrActions["viewShowTextChain"]->setChecked(doc->guidesSettings.linkShown);
 	scrActions["viewShowTextControls"]->setChecked(doc->guidesSettings.showControls);
@@ -5911,7 +5911,7 @@
 		doc->guidesSettings.framesShown = guidesStatus[2];
 		doc->guidesSettings.gridShown = guidesStatus[3];
 		doc->guidesSettings.guidesShown = guidesStatus[4];
-		doc->guidesSettings.baseShown = guidesStatus[5];
+		doc->guidesSettings.baselineGridShown = guidesStatus[5];
 		doc->guidesSettings.linkShown = guidesStatus[6];
 		doc->guidesSettings.showControls = guidesStatus[7];
 		doc->guidesSettings.rulerMode = guidesStatus[8];
@@ -5939,7 +5939,7 @@
 		guidesStatus[2] = !doc->guidesSettings.framesShown;
 		guidesStatus[3] = !doc->guidesSettings.gridShown;
 		guidesStatus[4] = !doc->guidesSettings.guidesShown;
-		guidesStatus[5] = !doc->guidesSettings.baseShown;
+		guidesStatus[5] = !doc->guidesSettings.baselineGridShown;
 		guidesStatus[6] = !doc->guidesSettings.linkShown;
 		guidesStatus[7] = !doc->guidesSettings.showControls;
 		guidesStatus[8] = !doc->guidesSettings.rulerMode;
@@ -5951,7 +5951,7 @@
 		doc->guidesSettings.framesShown = false;
 		doc->guidesSettings.gridShown = false;
 		doc->guidesSettings.guidesShown = false;
-		doc->guidesSettings.baseShown = false;
+		doc->guidesSettings.baselineGridShown = false;
 		doc->guidesSettings.linkShown = false;
 		doc->guidesSettings.showControls = false;
 		doc->guidesSettings.rulerMode = false;
@@ -5968,7 +5968,7 @@
 	scrActions["viewShowGrid"]->setChecked(doc->guidesSettings.gridShown);
 	scrActions["viewShowGuides"]->setChecked(doc->guidesSettings.guidesShown);
 	scrActions["viewShowColumnBorders"]->setChecked(doc->guidesSettings.colBordersShown);
-	scrActions["viewShowBaseline"]->setChecked(doc->guidesSettings.baseShown);
+	scrActions["viewShowBaseline"]->setChecked(doc->guidesSettings.baselineGridShown);
 	scrActions["viewShowTextChain"]->setChecked(doc->guidesSettings.linkShown);
 	scrActions["viewShowTextControls"]->setChecked(doc->guidesSettings.showControls);
 	scrActions["viewShowRulers"]->setChecked(doc->guidesSettings.rulersShown);
@@ -6051,7 +6051,7 @@
 	if (doc)
 	{
 		guidesStatus[0] = false;
-		doc->guidesSettings.baseShown = !doc->guidesSettings.baseShown;
+		doc->guidesSettings.baselineGridShown = !doc->guidesSettings.baselineGridShown;
 		view->DrawNew();
 	}
 }
Index: scribus/plugins/fileloader/scribus12format/scribus12format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus12format/scribus12format.cpp	(revision 13888)
+++ scribus/plugins/fileloader/scribus12format/scribus12format.cpp	(revision 13889)
@@ -284,14 +284,14 @@
 		m_Doc->PageSp=dc.attribute("AUTOSPALTEN").toInt();
 		m_Doc->PageSpa=ScCLocale::toDoubleC(dc.attribute("ABSTSPALTEN"));
 		m_Doc->setUnitIndex(dc.attribute("UNITS", "0").toInt());
-		m_Doc->guidesSettings.gridShown = prefsManager->appPrefs.guidesSettings.gridShown;
-		m_Doc->guidesSettings.guidesShown = prefsManager->appPrefs.guidesSettings.guidesShown;
-		m_Doc->guidesSettings.colBordersShown = prefsManager->appPrefs.guidesSettings.colBordersShown;
-		m_Doc->guidesSettings.framesShown = prefsManager->appPrefs.guidesSettings.framesShown;
-		m_Doc->guidesSettings.layerMarkersShown = prefsManager->appPrefs.guidesSettings.layerMarkersShown;
-		m_Doc->guidesSettings.marginsShown = prefsManager->appPrefs.guidesSettings.marginsShown;
-		m_Doc->guidesSettings.baseShown = prefsManager->appPrefs.guidesSettings.baseShown;
-		m_Doc->guidesSettings.linkShown = prefsManager->appPrefs.guidesSettings.linkShown;
+		m_Doc->guidesSettings.gridShown = prefsManager->appPrefs.guidesPrefs.gridShown;
+		m_Doc->guidesSettings.guidesShown = prefsManager->appPrefs.guidesPrefs.guidesShown;
+		m_Doc->guidesSettings.colBordersShown = prefsManager->appPrefs.guidesPrefs.colBordersShown;
+		m_Doc->guidesSettings.framesShown = prefsManager->appPrefs.guidesPrefs.framesShown;
+		m_Doc->guidesSettings.layerMarkersShown = prefsManager->appPrefs.guidesPrefs.layerMarkersShown;
+		m_Doc->guidesSettings.marginsShown = prefsManager->appPrefs.guidesPrefs.marginsShown;
+		m_Doc->guidesSettings.baselineGridShown = prefsManager->appPrefs.guidesPrefs.baselineGridShown;
+		m_Doc->guidesSettings.linkShown = prefsManager->appPrefs.guidesPrefs.linkShown;
 		m_Doc->guidesSettings.showPic = true;
 		m_Doc->guidesSettings.showControls = false;
 // 		DoFonts.clear();
@@ -322,8 +322,8 @@
 		m_Doc->typographicSettings.valueSubScript = dc.attribute("VTIEF").toInt();
 		m_Doc->typographicSettings.scalingSubScript = dc.attribute("VTIEFSC").toInt();
 		m_Doc->typographicSettings.valueSmallCaps = dc.attribute("VKAPIT").toInt();
-		m_Doc->typographicSettings.valueBaseGrid = ScCLocale::toDoubleC(dc.attribute("BASEGRID"), 12.0);
-		m_Doc->typographicSettings.offsetBaseGrid = ScCLocale::toDoubleC(dc.attribute("BASEO"), 0.0);
+		m_Doc->guidesSettings.valueBaselineGrid = ScCLocale::toDoubleC(dc.attribute("BASEGRID"), 12.0);
+		m_Doc->guidesSettings.offsetBaselineGrid = ScCLocale::toDoubleC(dc.attribute("BASEO"), 0.0);
 		m_Doc->typographicSettings.autoLineSpacing = dc.attribute("AUTOL", "20").toInt();
 		m_Doc->GroupCounter = 1 /*dc.attribute("GROUPC", "1").toInt()*/;
 		//m_Doc->HasCMS = static_cast<bool>(dc.attribute("HCMS", "0").toInt());
@@ -351,8 +351,8 @@
 		m_Doc->GuideLock = static_cast<bool>(dc.attribute("GUIDELOCK", "0").toInt());
 		m_Doc->SnapGuides = static_cast<bool>(dc.attribute("SnapToGuides", "0").toInt());
 		m_Doc->useRaster = static_cast<bool>(dc.attribute("SnapToGrid", "0").toInt());
-		m_Doc->guidesSettings.minorGrid = ScCLocale::toDoubleC(dc.attribute("MINGRID"), prefsManager->appPrefs.guidesSettings.minorGrid);
-		m_Doc->guidesSettings.majorGrid = ScCLocale::toDoubleC(dc.attribute("MAJGRID"), prefsManager->appPrefs.guidesSettings.majorGrid);
+		m_Doc->guidesSettings.minorGridSpacing = ScCLocale::toDoubleC(dc.attribute("MINGRID"), prefsManager->appPrefs.guidesPrefs.minorGridSpacing);
+		m_Doc->guidesSettings.majorGridSpacing = ScCLocale::toDoubleC(dc.attribute("MAJGRID"), prefsManager->appPrefs.guidesPrefs.majorGridSpacing);
 		m_Doc->toolSettings.dStartArrow = 0;
 		m_Doc->toolSettings.dEndArrow = 0;
 		m_Doc->LastAuto = 0;
Index: scribus/plugins/fileloader/scribus13format/scribus13format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 13888)
+++ scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 13889)
@@ -288,8 +288,8 @@
 		m_Doc->typographicSettings.valueSubScript = dc.attribute("VTIEF").toInt();
 		m_Doc->typographicSettings.scalingSubScript = dc.attribute("VTIEFSC").toInt();
 		m_Doc->typographicSettings.valueSmallCaps = dc.attribute("VKAPIT").toInt();
-		m_Doc->typographicSettings.valueBaseGrid  = ScCLocale::toDoubleC(dc.attribute("BASEGRID"), 12.0);
-		m_Doc->typographicSettings.offsetBaseGrid = ScCLocale::toDoubleC(dc.attribute("BASEO"), 0.0);
+		m_Doc->guidesSettings.valueBaselineGrid  = ScCLocale::toDoubleC(dc.attribute("BASEGRID"), 12.0);
+		m_Doc->guidesSettings.offsetBaselineGrid = ScCLocale::toDoubleC(dc.attribute("BASEO"), 0.0);
 		m_Doc->typographicSettings.autoLineSpacing = dc.attribute("AUTOL", "20").toInt();
 		m_Doc->typographicSettings.valueUnderlinePos = dc.attribute("UnderlinePos", "-1").toInt();
 		m_Doc->typographicSettings.valueUnderlineWidth = dc.attribute("UnderlineWidth", "-1").toInt();
@@ -332,15 +332,15 @@
 		m_Doc->Automatic = static_cast<bool>(dc.attribute("AUTOMATIC", "1").toInt());
 		m_Doc->AutoCheck = static_cast<bool>(dc.attribute("AUTOCHECK", "0").toInt());
 		m_Doc->GuideLock = static_cast<bool>(dc.attribute("GUIDELOCK", "0").toInt());
-		m_Doc->guidesSettings.minorGrid = ScCLocale::toDoubleC(dc.attribute("MINGRID"), prefsManager->appPrefs.guidesSettings.minorGrid);
-		m_Doc->guidesSettings.majorGrid = ScCLocale::toDoubleC(dc.attribute("MAJGRID"), prefsManager->appPrefs.guidesSettings.majorGrid);
+		m_Doc->guidesSettings.minorGridSpacing = ScCLocale::toDoubleC(dc.attribute("MINGRID"), prefsManager->appPrefs.guidesPrefs.minorGridSpacing);
+		m_Doc->guidesSettings.majorGridSpacing = ScCLocale::toDoubleC(dc.attribute("MAJGRID"), prefsManager->appPrefs.guidesPrefs.majorGridSpacing);
 		m_Doc->guidesSettings.gridShown = static_cast<bool>(dc.attribute("SHOWGRID", "0").toInt());
 		m_Doc->guidesSettings.guidesShown = static_cast<bool>(dc.attribute("SHOWGUIDES", "1").toInt());
 		m_Doc->guidesSettings.colBordersShown = static_cast<bool>(dc.attribute("showcolborders", "0").toInt());
 		m_Doc->guidesSettings.framesShown = static_cast<bool>(dc.attribute("SHOWFRAME", "1").toInt());
 		m_Doc->guidesSettings.layerMarkersShown = static_cast<bool>(dc.attribute("SHOWLAYERM", "0").toInt());
 		m_Doc->guidesSettings.marginsShown = static_cast<bool>(dc.attribute("SHOWMARGIN", "1").toInt());
-		m_Doc->guidesSettings.baseShown = static_cast<bool>(dc.attribute("SHOWBASE", "0").toInt());
+		m_Doc->guidesSettings.baselineGridShown = static_cast<bool>(dc.attribute("SHOWBASE", "0").toInt());
 		m_Doc->guidesSettings.showPic = static_cast<bool>(dc.attribute("SHOWPICT", "1").toInt());
 		m_Doc->guidesSettings.linkShown = static_cast<bool>(dc.attribute("SHOWLINK", "0").toInt());
 		m_Doc->guidesSettings.showControls = static_cast<bool>(dc.attribute("SHOWControl", "0").toInt());
@@ -412,19 +412,19 @@
 		if (dc.hasAttribute("PAGEC"))
 			m_Doc->papColor = QColor(dc.attribute("PAGEC"));
 		if (dc.hasAttribute("MARGC"))
-			m_Doc->guidesSettings.margColor = QColor(dc.attribute("MARGC"));
+			m_Doc->guidesSettings.marginColor = QColor(dc.attribute("MARGC"));
 		if (dc.hasAttribute("MINORC"))
-			m_Doc->guidesSettings.minorColor = QColor(dc.attribute("MINORC"));
+			m_Doc->guidesSettings.minorGridColor = QColor(dc.attribute("MINORC"));
 		if (dc.hasAttribute("MAJORC"))
-			m_Doc->guidesSettings.majorColor = QColor(dc.attribute("MAJORC"));
+			m_Doc->guidesSettings.majorGridColor = QColor(dc.attribute("MAJORC"));
 		if (dc.hasAttribute("GuideC"))
 			m_Doc->guidesSettings.guideColor = QColor(dc.attribute("GuideC"));
 		if (dc.hasAttribute("BaseC"))
-			m_Doc->guidesSettings.baseColor = QColor(dc.attribute("BaseC"));
+			m_Doc->guidesSettings.baselineGridColor = QColor(dc.attribute("BaseC"));
 		m_Doc->marginColored = static_cast<bool>(dc.attribute("RANDF", "0").toInt());
-		m_Doc->guidesSettings.before = static_cast<bool>(dc.attribute("BACKG", "1").toInt());
+		m_Doc->guidesSettings.guidePlacement = static_cast<bool>(dc.attribute("BACKG", "1").toInt());
 		m_Doc->guidesSettings.guideRad = ScCLocale::toDoubleC(dc.attribute("GuideRad"), 10.0);
-		m_Doc->guidesSettings.grabRad  = dc.attribute("GRAB", "4").toInt();
+		m_Doc->guidesSettings.grabRadius  = dc.attribute("GRAB", "4").toInt();
 		if (dc.hasAttribute("currentProfile"))
 		{
 			m_Doc->checkerProfiles.clear();
@@ -477,7 +477,7 @@
 			}
 			if (pg.tagName()=="CheckProfile")
 			{
-				struct checkerPrefs checkerSettings;
+				struct CheckerPrefs checkerSettings;
 				checkerSettings.ignoreErrors = static_cast<bool>(pg.attribute("ignoreErrors", "0").toInt());
 				checkerSettings.autoCheck = static_cast<bool>(pg.attribute("autoCheck", "1").toInt());
 				checkerSettings.checkGlyphs = static_cast<bool>(pg.attribute("checkGlyphs", "1").toInt());
@@ -875,7 +875,8 @@
 					//m_Doc->Pages = &m_Doc->MasterPages;
 					m_Doc->setMasterPageMode(true);
 				}
-				int docGc = m_Doc->GroupCounter, pagenr = -1;
+				//unused int docGc = m_Doc->GroupCounter,
+				int pagenr = -1;
 				if ((!pg.attribute("OnMasterPage").isEmpty()) && (pg.tagName()=="MASTEROBJECT"))
 				{
 					m_Doc->setCurrentPage(m_Doc->MasterPages.at(m_Doc->MasterNames[pg.attribute("OnMasterPage")]));
@@ -1217,8 +1218,8 @@
 	dc.setAttribute("VTIEF",m_Doc->typographicSettings.valueSubScript);
 	dc.setAttribute("VTIEFSC",m_Doc->typographicSettings.scalingSubScript);
 	dc.setAttribute("VKAPIT",m_Doc->typographicSettings.valueSmallCaps);
-	dc.setAttribute("BASEGRID",m_Doc->typographicSettings.valueBaseGrid);
-	dc.setAttribute("BASEO", m_Doc->typographicSettings.offsetBaseGrid);
+	dc.setAttribute("BASEGRID",m_Doc->guidesSettings.valueBaselineGrid);
+	dc.setAttribute("BASEO", m_Doc->guidesSettings.offsetBaselineGrid);
 	dc.setAttribute("AUTOL", m_Doc->typographicSettings.autoLineSpacing);
 	dc.setAttribute("UnderlinePos", m_Doc->typographicSettings.valueUnderlinePos);
 	dc.setAttribute("UnderlineWidth", m_Doc->typographicSettings.valueUnderlineWidth);
@@ -1248,15 +1249,15 @@
 	dc.setAttribute("GUIDELOCK", static_cast<int>(m_Doc->GuideLock));
 	dc.setAttribute("SnapToGuides", static_cast<int>(m_Doc->SnapGuides));
 	dc.setAttribute("SnapToGrid", static_cast<int>(m_Doc->useRaster));
-	dc.setAttribute("MINGRID", m_Doc->guidesSettings.minorGrid);
-	dc.setAttribute("MAJGRID", m_Doc->guidesSettings.majorGrid);
+	dc.setAttribute("MINGRID", m_Doc->guidesSettings.minorGridSpacing);
+	dc.setAttribute("MAJGRID", m_Doc->guidesSettings.majorGridSpacing);
 	dc.setAttribute("SHOWGRID", static_cast<int>(m_Doc->guidesSettings.gridShown));
 	dc.setAttribute("SHOWGUIDES", static_cast<int>(m_Doc->guidesSettings.guidesShown));
 	dc.setAttribute("showcolborders", static_cast<int>(m_Doc->guidesSettings.colBordersShown));
 	dc.setAttribute("SHOWFRAME", static_cast<int>(m_Doc->guidesSettings.framesShown));
 	dc.setAttribute("SHOWLAYERM", static_cast<int>(m_Doc->guidesSettings.layerMarkersShown));
 	dc.setAttribute("SHOWMARGIN", static_cast<int>(m_Doc->guidesSettings.marginsShown));
-	dc.setAttribute("SHOWBASE", static_cast<int>(m_Doc->guidesSettings.baseShown));
+	dc.setAttribute("SHOWBASE", static_cast<int>(m_Doc->guidesSettings.baselineGridShown));
 	dc.setAttribute("SHOWPICT", static_cast<int>(m_Doc->guidesSettings.showPic));
 	dc.setAttribute("SHOWControl", static_cast<int>(m_Doc->guidesSettings.showControls));
 	dc.setAttribute("SHOWLINK", static_cast<int>(m_Doc->guidesSettings.linkShown));
@@ -1265,7 +1266,7 @@
 	dc.setAttribute("rulerXoffset", m_Doc->rulerXoffset);
 	dc.setAttribute("rulerYoffset", m_Doc->rulerYoffset);
 	dc.setAttribute("GuideRad", m_Doc->guidesSettings.guideRad);
-	dc.setAttribute("GRAB",m_Doc->guidesSettings.grabRad);
+	dc.setAttribute("GRAB",m_Doc->guidesSettings.grabRadius);
 	dc.setAttribute("POLYC", m_Doc->toolSettings.polyC);
 	dc.setAttribute("POLYF", m_Doc->toolSettings.polyF);
 	dc.setAttribute("POLYR", m_Doc->toolSettings.polyR);
@@ -1308,14 +1309,14 @@
 	dc.setAttribute("PASPECT", static_cast<int>(m_Doc->toolSettings.aspectRatio));
 	dc.setAttribute("EmbeddedPath", static_cast<int>(m_Doc->toolSettings.useEmbeddedPath));
 	dc.setAttribute("HalfRes", m_Doc->toolSettings.lowResType);
-	dc.setAttribute("MINORC",m_Doc->guidesSettings.minorColor.name());
-	dc.setAttribute("MAJORC",m_Doc->guidesSettings.majorColor.name());
+	dc.setAttribute("MINORC",m_Doc->guidesSettings.minorGridColor.name());
+	dc.setAttribute("MAJORC",m_Doc->guidesSettings.majorGridColor.name());
 	dc.setAttribute("GuideC", m_Doc->guidesSettings.guideColor.name());
-	dc.setAttribute("BaseC", m_Doc->guidesSettings.baseColor.name());
+	dc.setAttribute("BaseC", m_Doc->guidesSettings.baselineGridColor.name());
 	dc.setAttribute("GuideZ", m_Doc->guidesSettings.guideRad);
-	dc.setAttribute("BACKG", static_cast<int>(m_Doc->guidesSettings.before));
+	dc.setAttribute("BACKG", static_cast<int>(m_Doc->guidesSettings.guidePlacement));
 	dc.setAttribute("PAGEC",m_Doc->papColor.name());
-	dc.setAttribute("MARGC",m_Doc->guidesSettings.margColor.name());
+	dc.setAttribute("MARGC",m_Doc->guidesSettings.marginColor.name());
 	dc.setAttribute("RANDF", static_cast<int>(m_Doc->marginColored));
 	dc.setAttribute("currentProfile", m_Doc->curCheckProfile);
 	CheckerPrefsList::Iterator itcp;
Index: scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
===================================================================
--- scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp	(revision 13888)
+++ scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp	(revision 13889)
@@ -127,8 +127,8 @@
 	docu.writeAttribute("VTIEF"  , m_Doc->typographicSettings.valueSubScript);
 	docu.writeAttribute("VTIEFSC", m_Doc->typographicSettings.scalingSubScript);
 	docu.writeAttribute("VKAPIT" , m_Doc->typographicSettings.valueSmallCaps);
-	docu.writeAttribute("BASEGRID",m_Doc->typographicSettings.valueBaseGrid);
-	docu.writeAttribute("BASEO"  , m_Doc->typographicSettings.offsetBaseGrid);
+	docu.writeAttribute("BASEGRID",m_Doc->guidesSettings.valueBaselineGrid);
+	docu.writeAttribute("BASEO"  , m_Doc->guidesSettings.offsetBaselineGrid);
 	docu.writeAttribute("AUTOL"  , m_Doc->typographicSettings.autoLineSpacing);
 	docu.writeAttribute("UnderlinePos"   , m_Doc->typographicSettings.valueUnderlinePos);
 	docu.writeAttribute("UnderlineWidth" , m_Doc->typographicSettings.valueUnderlineWidth);
@@ -158,15 +158,15 @@
 	docu.writeAttribute("GUIDELOCK", static_cast<int>(m_Doc->GuideLock));
 	docu.writeAttribute("SnapToGuides", static_cast<int>(m_Doc->SnapGuides));
 	docu.writeAttribute("SnapToGrid", static_cast<int>(m_Doc->useRaster));
-	docu.writeAttribute("MINGRID", m_Doc->guidesSettings.minorGrid);
-	docu.writeAttribute("MAJGRID", m_Doc->guidesSettings.majorGrid);
+	docu.writeAttribute("MINGRID", m_Doc->guidesSettings.minorGridSpacing);
+	docu.writeAttribute("MAJGRID", m_Doc->guidesSettings.majorGridSpacing);
 	docu.writeAttribute("SHOWGRID", static_cast<int>(m_Doc->guidesSettings.gridShown));
 	docu.writeAttribute("SHOWGUIDES", static_cast<int>(m_Doc->guidesSettings.guidesShown));
 	docu.writeAttribute("showcolborders", static_cast<int>(m_Doc->guidesSettings.colBordersShown));
 	docu.writeAttribute("SHOWFRAME", static_cast<int>(m_Doc->guidesSettings.framesShown));
 	docu.writeAttribute("SHOWLAYERM", static_cast<int>(m_Doc->guidesSettings.layerMarkersShown));
 	docu.writeAttribute("SHOWMARGIN", static_cast<int>(m_Doc->guidesSettings.marginsShown));
-	docu.writeAttribute("SHOWBASE", static_cast<int>(m_Doc->guidesSettings.baseShown));
+	docu.writeAttribute("SHOWBASE", static_cast<int>(m_Doc->guidesSettings.baselineGridShown));
 	docu.writeAttribute("SHOWPICT", static_cast<int>(m_Doc->guidesSettings.showPic));
 	docu.writeAttribute("SHOWControl", static_cast<int>(m_Doc->guidesSettings.showControls));
 	docu.writeAttribute("SHOWLINK", static_cast<int>(m_Doc->guidesSettings.linkShown));
@@ -176,7 +176,7 @@
 	docu.writeAttribute("rulerXoffset", m_Doc->rulerXoffset);
 	docu.writeAttribute("rulerYoffset", m_Doc->rulerYoffset);
 	docu.writeAttribute("GuideRad", m_Doc->guidesSettings.guideRad);
-	docu.writeAttribute("GRAB",m_Doc->guidesSettings.grabRad);
+	docu.writeAttribute("GRAB",m_Doc->guidesSettings.grabRadius);
 	docu.writeAttribute("POLYC", m_Doc->toolSettings.polyC);
 	docu.writeAttribute("POLYF", m_Doc->toolSettings.polyF);
 	docu.writeAttribute("POLYR", m_Doc->toolSettings.polyR);
@@ -225,14 +225,14 @@
 	docu.writeAttribute("dispX", m_Doc->toolSettings.dispX);
 	docu.writeAttribute("dispY", m_Doc->toolSettings.dispY);
 	docu.writeAttribute("constrain", m_Doc->toolSettings.constrain);
-	docu.writeAttribute("MINORC",m_Doc->guidesSettings.minorColor.name());
-	docu.writeAttribute("MAJORC",m_Doc->guidesSettings.majorColor.name());
+	docu.writeAttribute("MINORC",m_Doc->guidesSettings.minorGridColor.name());
+	docu.writeAttribute("MAJORC",m_Doc->guidesSettings.majorGridColor.name());
 	docu.writeAttribute("GuideC", m_Doc->guidesSettings.guideColor.name());
-	docu.writeAttribute("BaseC", m_Doc->guidesSettings.baseColor.name());
+	docu.writeAttribute("BaseC", m_Doc->guidesSettings.baselineGridColor.name());
 	docu.writeAttribute("GuideZ", m_Doc->guidesSettings.guideRad);
-	docu.writeAttribute("BACKG", static_cast<int>(m_Doc->guidesSettings.before));
+	docu.writeAttribute("BACKG", static_cast<int>(m_Doc->guidesSettings.guidePlacement));
 	docu.writeAttribute("PAGEC",m_Doc->papColor.name());
-	docu.writeAttribute("MARGC",m_Doc->guidesSettings.margColor.name());
+	docu.writeAttribute("MARGC",m_Doc->guidesSettings.marginColor.name());
 	docu.writeAttribute("RANDF", static_cast<int>(m_Doc->marginColored));
 	docu.writeAttribute("currentProfile", m_Doc->curCheckProfile);
 
Index: scribus/plugins/fileloader/scribus150format/scribus150format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(revision 13888)
+++ scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(revision 13889)
@@ -820,15 +820,15 @@
 void Scribus150Format::readGuideSettings(ScribusDoc* doc, ScXmlStreamAttributes& attrs)
 {
 	PrefsManager* prefsManager = PrefsManager::instance();
-	doc->guidesSettings.minorGrid = attrs.valueAsDouble("MINGRID", prefsManager->appPrefs.guidesSettings.minorGrid);
-	doc->guidesSettings.majorGrid = attrs.valueAsDouble("MAJGRID", prefsManager->appPrefs.guidesSettings.majorGrid);
+	doc->guidesSettings.minorGridSpacing = attrs.valueAsDouble("MINGRID", prefsManager->appPrefs.guidesPrefs.minorGridSpacing);
+	doc->guidesSettings.majorGridSpacing = attrs.valueAsDouble("MAJGRID", prefsManager->appPrefs.guidesPrefs.majorGridSpacing);
 	doc->guidesSettings.gridShown    = attrs.valueAsBool("SHOWGRID", false);
 	doc->guidesSettings.guidesShown  =attrs.valueAsBool("SHOWGUIDES", true);
 	doc->guidesSettings.colBordersShown  = attrs.valueAsBool("showcolborders", false);
 	doc->guidesSettings.framesShown  = attrs.valueAsBool("SHOWFRAME", true);
 	doc->guidesSettings.layerMarkersShown = attrs.valueAsBool("SHOWLAYERM", false);
 	doc->guidesSettings.marginsShown = attrs.valueAsBool("SHOWMARGIN", true);
-	doc->guidesSettings.baseShown    = attrs.valueAsBool("SHOWBASE", false);
+	doc->guidesSettings.baselineGridShown    = attrs.valueAsBool("SHOWBASE", false);
 	doc->guidesSettings.showPic      = attrs.valueAsBool("SHOWPICT", true);
 	doc->guidesSettings.linkShown    = attrs.valueAsBool("SHOWLINK", false);
 	doc->guidesSettings.showControls = attrs.valueAsBool("SHOWControl", false);
@@ -836,18 +836,18 @@
 	doc->guidesSettings.rulersShown  = attrs.valueAsBool("showrulers", true);
 	doc->guidesSettings.showBleed    = attrs.valueAsBool("showBleed", true);
 	if (attrs.hasAttribute("MARGC"))
-		doc->guidesSettings.margColor  = QColor(attrs.valueAsString("MARGC"));
+		doc->guidesSettings.marginColor  = QColor(attrs.valueAsString("MARGC"));
 	if (attrs.hasAttribute("MINORC"))
-		doc->guidesSettings.minorColor = QColor(attrs.valueAsString("MINORC"));
+		doc->guidesSettings.minorGridColor = QColor(attrs.valueAsString("MINORC"));
 	if (attrs.hasAttribute("MAJORC"))
-		doc->guidesSettings.majorColor = QColor(attrs.valueAsString("MAJORC"));
+		doc->guidesSettings.majorGridColor = QColor(attrs.valueAsString("MAJORC"));
 	if (attrs.hasAttribute("GuideC"))
 		doc->guidesSettings.guideColor = QColor(attrs.valueAsString("GuideC"));
 	if (attrs.hasAttribute("BaseC"))
-		doc->guidesSettings.baseColor  = QColor(attrs.valueAsString("BaseC"));
-	doc->guidesSettings.before   = attrs.valueAsBool("BACKG", true);
+		doc->guidesSettings.baselineGridColor  = QColor(attrs.valueAsString("BaseC"));
+	doc->guidesSettings.guidePlacement   = attrs.valueAsBool("BACKG", true);
 	doc->guidesSettings.guideRad = attrs.valueAsDouble("GuideRad", 10.0);
-	doc->guidesSettings.grabRad  = attrs.valueAsInt("GRAB", 4);
+	doc->guidesSettings.grabRadius  = attrs.valueAsInt("GRAB", 4);
 }
 
 void Scribus150Format::readToolSettings(ScribusDoc* doc, ScXmlStreamAttributes& attrs)
@@ -921,8 +921,8 @@
 	doc->typographicSettings.valueSubScript     = attrs.valueAsInt("VTIEF");
 	doc->typographicSettings.scalingSubScript   = attrs.valueAsInt("VTIEFSC");
 	doc->typographicSettings.valueSmallCaps     = attrs.valueAsInt("VKAPIT");
-	doc->typographicSettings.valueBaseGrid      = attrs.valueAsDouble("BASEGRID", 12.0);
-	doc->typographicSettings.offsetBaseGrid     = attrs.valueAsDouble("BASEO", 0.0);
+	doc->guidesSettings.valueBaselineGrid      = attrs.valueAsDouble("BASEGRID", 12.0);
+	doc->guidesSettings.offsetBaselineGrid     = attrs.valueAsDouble("BASEO", 0.0);
 	doc->typographicSettings.autoLineSpacing    = attrs.valueAsInt("AUTOL", 20);
 	doc->typographicSettings.valueUnderlinePos  = attrs.valueAsInt("UnderlinePos", -1);
 	doc->typographicSettings.valueUnderlineWidth  = attrs.valueAsInt("UnderlineWidth", -1);
@@ -973,7 +973,7 @@
 
 bool Scribus150Format::readCheckProfile(ScribusDoc* doc, ScXmlStreamAttributes& attrs)
 {
-	struct checkerPrefs checkerSettings;
+	struct CheckerPrefs checkerSettings;
 	QString profileName = attrs.valueAsString("Name");
 	if (profileName.isEmpty())
 		return true;
Index: scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
===================================================================
--- scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp	(revision 13888)
+++ scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp	(revision 13889)
@@ -124,8 +124,8 @@
 	docu.writeAttribute("VTIEF"  , m_Doc->typographicSettings.valueSubScript);
 	docu.writeAttribute("VTIEFSC", m_Doc->typographicSettings.scalingSubScript);
 	docu.writeAttribute("VKAPIT" , m_Doc->typographicSettings.valueSmallCaps);
-	docu.writeAttribute("BASEGRID",m_Doc->typographicSettings.valueBaseGrid);
-	docu.writeAttribute("BASEO"  , m_Doc->typographicSettings.offsetBaseGrid);
+	docu.writeAttribute("BASEGRID",m_Doc->guidesSettings.valueBaselineGrid);
+	docu.writeAttribute("BASEO"  , m_Doc->guidesSettings.offsetBaselineGrid);
 	docu.writeAttribute("AUTOL"  , m_Doc->typographicSettings.autoLineSpacing);
 	docu.writeAttribute("UnderlinePos"   , m_Doc->typographicSettings.valueUnderlinePos);
 	docu.writeAttribute("UnderlineWidth" , m_Doc->typographicSettings.valueUnderlineWidth);
@@ -155,15 +155,15 @@
 	docu.writeAttribute("GUIDELOCK", static_cast<int>(m_Doc->GuideLock));
 	docu.writeAttribute("SnapToGuides", static_cast<int>(m_Doc->SnapGuides));
 	docu.writeAttribute("SnapToGrid", static_cast<int>(m_Doc->useRaster));
-	docu.writeAttribute("MINGRID", m_Doc->guidesSettings.minorGrid);
-	docu.writeAttribute("MAJGRID", m_Doc->guidesSettings.majorGrid);
+	docu.writeAttribute("MINGRID", m_Doc->guidesSettings.minorGridSpacing);
+	docu.writeAttribute("MAJGRID", m_Doc->guidesSettings.majorGridSpacing);
 	docu.writeAttribute("SHOWGRID", static_cast<int>(m_Doc->guidesSettings.gridShown));
 	docu.writeAttribute("SHOWGUIDES", static_cast<int>(m_Doc->guidesSettings.guidesShown));
 	docu.writeAttribute("showcolborders", static_cast<int>(m_Doc->guidesSettings.colBordersShown));
 	docu.writeAttribute("SHOWFRAME", static_cast<int>(m_Doc->guidesSettings.framesShown));
 	docu.writeAttribute("SHOWLAYERM", static_cast<int>(m_Doc->guidesSettings.layerMarkersShown));
 	docu.writeAttribute("SHOWMARGIN", static_cast<int>(m_Doc->guidesSettings.marginsShown));
-	docu.writeAttribute("SHOWBASE", static_cast<int>(m_Doc->guidesSettings.baseShown));
+	docu.writeAttribute("SHOWBASE", static_cast<int>(m_Doc->guidesSettings.baselineGridShown));
 	docu.writeAttribute("SHOWPICT", static_cast<int>(m_Doc->guidesSettings.showPic));
 	docu.writeAttribute("SHOWControl", static_cast<int>(m_Doc->guidesSettings.showControls));
 	docu.writeAttribute("SHOWLINK", static_cast<int>(m_Doc->guidesSettings.linkShown));
@@ -173,7 +173,7 @@
 	docu.writeAttribute("rulerXoffset", m_Doc->rulerXoffset);
 	docu.writeAttribute("rulerYoffset", m_Doc->rulerYoffset);
 	docu.writeAttribute("GuideRad", m_Doc->guidesSettings.guideRad);
-	docu.writeAttribute("GRAB",m_Doc->guidesSettings.grabRad);
+	docu.writeAttribute("GRAB",m_Doc->guidesSettings.grabRadius);
 	docu.writeAttribute("POLYC", m_Doc->toolSettings.polyC);
 	docu.writeAttribute("POLYF", m_Doc->toolSettings.polyF);
 	docu.writeAttribute("POLYR", m_Doc->toolSettings.polyR);
@@ -222,14 +222,14 @@
 	docu.writeAttribute("dispX", m_Doc->toolSettings.dispX);
 	docu.writeAttribute("dispY", m_Doc->toolSettings.dispY);
 	docu.writeAttribute("constrain", m_Doc->toolSettings.constrain);
-	docu.writeAttribute("MINORC",m_Doc->guidesSettings.minorColor.name());
-	docu.writeAttribute("MAJORC",m_Doc->guidesSettings.majorColor.name());
+	docu.writeAttribute("MINORC",m_Doc->guidesSettings.minorGridColor.name());
+	docu.writeAttribute("MAJORC",m_Doc->guidesSettings.majorGridColor.name());
 	docu.writeAttribute("GuideC", m_Doc->guidesSettings.guideColor.name());
-	docu.writeAttribute("BaseC", m_Doc->guidesSettings.baseColor.name());
+	docu.writeAttribute("BaseC", m_Doc->guidesSettings.baselineGridColor.name());
 	docu.writeAttribute("GuideZ", m_Doc->guidesSettings.guideRad);
-	docu.writeAttribute("BACKG", static_cast<int>(m_Doc->guidesSettings.before));
+	docu.writeAttribute("BACKG", static_cast<int>(m_Doc->guidesSettings.guidePlacement));
 	docu.writeAttribute("PAGEC",m_Doc->papColor.name());
-	docu.writeAttribute("MARGC",m_Doc->guidesSettings.margColor.name());
+	docu.writeAttribute("MARGC",m_Doc->guidesSettings.marginColor.name());
 	docu.writeAttribute("RANDF", static_cast<int>(m_Doc->marginColored));
 	docu.writeAttribute("currentProfile", m_Doc->curCheckProfile);
 
Index: scribus/plugins/fileloader/scribus134format/scribus134format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 13888)
+++ scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 13889)
@@ -828,15 +828,15 @@
 void Scribus134Format::readGuideSettings(ScribusDoc* doc, ScXmlStreamAttributes& attrs)
 {
 	PrefsManager* prefsManager = PrefsManager::instance();
-	doc->guidesSettings.minorGrid = attrs.valueAsDouble("MINGRID", prefsManager->appPrefs.guidesSettings.minorGrid);
-	doc->guidesSettings.majorGrid = attrs.valueAsDouble("MAJGRID", prefsManager->appPrefs.guidesSettings.majorGrid);
+	doc->guidesSettings.minorGridSpacing = attrs.valueAsDouble("MINGRID", prefsManager->appPrefs.guidesPrefs.minorGridSpacing);
+	doc->guidesSettings.majorGridSpacing = attrs.valueAsDouble("MAJGRID", prefsManager->appPrefs.guidesPrefs.majorGridSpacing);
 	doc->guidesSettings.gridShown    = attrs.valueAsBool("SHOWGRID", false);
 	doc->guidesSettings.guidesShown  =attrs.valueAsBool("SHOWGUIDES", true);
 	doc->guidesSettings.colBordersShown  = attrs.valueAsBool("showcolborders", false);
 	doc->guidesSettings.framesShown  = attrs.valueAsBool("SHOWFRAME", true);
 	doc->guidesSettings.layerMarkersShown = attrs.valueAsBool("SHOWLAYERM", false);
 	doc->guidesSettings.marginsShown = attrs.valueAsBool("SHOWMARGIN", true);
-	doc->guidesSettings.baseShown    = attrs.valueAsBool("SHOWBASE", false);
+	doc->guidesSettings.baselineGridShown    = attrs.valueAsBool("SHOWBASE", false);
 	doc->guidesSettings.showPic      = attrs.valueAsBool("SHOWPICT", true);
 	doc->guidesSettings.linkShown    = attrs.valueAsBool("SHOWLINK", false);
 	doc->guidesSettings.showControls = attrs.valueAsBool("SHOWControl", false);
@@ -844,18 +844,18 @@
 	doc->guidesSettings.rulersShown  = attrs.valueAsBool("showrulers", true);
 	doc->guidesSettings.showBleed    = attrs.valueAsBool("showBleed", true);
 	if (attrs.hasAttribute("MARGC"))
-		doc->guidesSettings.margColor  = QColor(attrs.valueAsString("MARGC"));
+		doc->guidesSettings.marginColor  = QColor(attrs.valueAsString("MARGC"));
 	if (attrs.hasAttribute("MINORC"))
-		doc->guidesSettings.minorColor = QColor(attrs.valueAsString("MINORC"));
+		doc->guidesSettings.minorGridColor = QColor(attrs.valueAsString("MINORC"));
 	if (attrs.hasAttribute("MAJORC"))
-		doc->guidesSettings.majorColor = QColor(attrs.valueAsString("MAJORC"));
+		doc->guidesSettings.majorGridColor = QColor(attrs.valueAsString("MAJORC"));
 	if (attrs.hasAttribute("GuideC"))
 		doc->guidesSettings.guideColor = QColor(attrs.valueAsString("GuideC"));
 	if (attrs.hasAttribute("BaseC"))
-		doc->guidesSettings.baseColor  = QColor(attrs.valueAsString("BaseC"));
-	doc->guidesSettings.before   = attrs.valueAsBool("BACKG", true);
+		doc->guidesSettings.baselineGridColor  = QColor(attrs.valueAsString("BaseC"));
+	doc->guidesSettings.guidePlacement   = attrs.valueAsBool("BACKG", true);
 	doc->guidesSettings.guideRad = attrs.valueAsDouble("GuideRad", 10.0);
-	doc->guidesSettings.grabRad  = attrs.valueAsInt("GRAB", 4);
+	doc->guidesSettings.grabRadius  = attrs.valueAsInt("GRAB", 4);
 }
 
 void Scribus134Format::readToolSettings(ScribusDoc* doc, ScXmlStreamAttributes& attrs)
@@ -929,8 +929,8 @@
 	doc->typographicSettings.valueSubScript     = attrs.valueAsInt("VTIEF");
 	doc->typographicSettings.scalingSubScript   = attrs.valueAsInt("VTIEFSC");
 	doc->typographicSettings.valueSmallCaps     = attrs.valueAsInt("VKAPIT");
-	doc->typographicSettings.valueBaseGrid      = attrs.valueAsDouble("BASEGRID", 12.0);
-	doc->typographicSettings.offsetBaseGrid     = attrs.valueAsDouble("BASEO", 0.0);
+	doc->guidesSettings.valueBaselineGrid      = attrs.valueAsDouble("BASEGRID", 12.0);
+	doc->guidesSettings.offsetBaselineGrid     = attrs.valueAsDouble("BASEO", 0.0);
 	doc->typographicSettings.autoLineSpacing    = attrs.valueAsInt("AUTOL", 20);
 	doc->typographicSettings.valueUnderlinePos  = attrs.valueAsInt("UnderlinePos", -1);
 	doc->typographicSettings.valueUnderlineWidth  = attrs.valueAsInt("UnderlineWidth", -1);
@@ -981,7 +981,7 @@
 
 bool Scribus134Format::readCheckProfile(ScribusDoc* doc, ScXmlStreamAttributes& attrs)
 {
-	struct checkerPrefs checkerSettings;
+	struct CheckerPrefs checkerSettings;
 	QString profileName = attrs.valueAsString("Name");
 	if (profileName.isEmpty())
 		return true;
Index: scribus/canvasmode_normal.cpp
===================================================================
--- scribus/canvasmode_normal.cpp	(revision 13888)
+++ scribus/canvasmode_normal.cpp	(revision 13889)
@@ -264,7 +264,7 @@
 	m_mouseCurrentPoint = mousePointDoc;
 	if ((m_doc->guidesSettings.guidesShown) && (!m_doc->GuideLock) && (m_doc->OnPage(mousePointDoc.x(), mousePointDoc.y()) != -1) )
 	{
-		if( ((m_doc->guidesSettings.before) && (m_canvas->itemUnderCursor(m->globalPos()))) == false )
+		if( ((m_doc->guidesSettings.guidePlacement) && (m_canvas->itemUnderCursor(m->globalPos()))) == false )
 		{
 			if (!guideMoveGesture)
 			{
@@ -541,7 +541,7 @@
 					break;
 				QMatrix p;
 				m_canvas->Transform(currItem, p);
-				QRect mpo = QRect(m->x()-m_doc->guidesSettings.grabRad, m->y()-m_doc->guidesSettings.grabRad, m_doc->guidesSettings.grabRad*2, m_doc->guidesSettings.grabRad*2);
+				QRect mpo = QRect(m->x()-m_doc->guidesSettings.grabRadius, m->y()-m_doc->guidesSettings.grabRadius, m_doc->guidesSettings.grabRadius*2, m_doc->guidesSettings.grabRadius*2);
 //				mpo.moveBy(qRound(m_doc->minCanvasCoordinate.x() * m_canvas->scale()), qRound(m_doc->minCanvasCoordinate.y() * m_canvas->scale()));
 				if ((QRegion(p.map(QPolygon(QRect(-3, -3, static_cast<int>(currItem->width()+6), static_cast<int>(currItem->height()+6))))).contains(mpo)))
 				{
@@ -611,7 +611,7 @@
 	MoveGX = MoveGY = false;
 	m->accept();
 	m_view->registerMousePress(m->globalPos());
-	QRect mpo(m->x()-m_doc->guidesSettings.grabRad, m->y()-m_doc->guidesSettings.grabRad, m_doc->guidesSettings.grabRad*2, m_doc->guidesSettings.grabRad*2);
+	QRect mpo(m->x()-m_doc->guidesSettings.grabRadius, m->y()-m_doc->guidesSettings.grabRadius, m_doc->guidesSettings.grabRadius*2, m_doc->guidesSettings.grabRadius*2);
 //	mpo.moveBy(qRound(m_doc->minCanvasCoordinate.x() * m_canvas->scale()), qRound(m_doc->minCanvasCoordinate.y() * m_canvas->scale()));
 
 	if (m->button() == Qt::MidButton)
@@ -1024,14 +1024,14 @@
 	m_canvas->m_viewMode.m_MouseButtonPressed = true;
 	FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
 	m_mouseCurrentPoint  = mousePointDoc;
-	double grabRadius = m_doc->guidesSettings.grabRad / m_canvas->scale();
+	double grabRadius = m_doc->guidesSettings.grabRadius / m_canvas->scale();
 	int MxpS = static_cast<int>(mousePointDoc.x()); //m->x()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.x());
 	int MypS = static_cast<int>(mousePointDoc.y()); //m->y()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.y());
 	QRectF mpo(m_mouseCurrentPoint.x()-grabRadius, m_mouseCurrentPoint.y()-grabRadius, grabRadius*2, grabRadius*2);
 //	mpo.translate(m_doc->minCanvasCoordinate.x() * m_canvas->scale(), m_doc->minCanvasCoordinate.y() * m_canvas->scale());
 	m_doc->nodeEdit.deselect();
 
-	if(!m_doc->guidesSettings.before) // guides are on foreground and want to be processed first
+	if(!m_doc->guidesSettings.guidePlacement) // guides are on foreground and want to be processed first
 	{
 		if ((m_doc->guidesSettings.guidesShown) /*&& (!m_doc->GuideLock)*/ && (m_doc->OnPage(MxpS, MypS) != -1))
 		{
Index: scribus/ui/tabtools.cpp
===================================================================
--- scribus/ui/tabtools.cpp	(revision 13888)
+++ scribus/ui/tabtools.cpp	(revision 13889)
@@ -39,7 +39,7 @@
 #include "colorlistbox.h"
 
 
-TabTools::TabTools( QWidget* parent, struct toolPrefs *prefsData, int unitIndex, ScribusDoc* doc) : QWidget( parent )
+TabTools::TabTools( QWidget* parent, struct ToolPrefs *prefsData, int unitIndex, ScribusDoc* doc) : QWidget( parent )
 {
 	docu = doc;
 	fontPreview = false;
@@ -609,7 +609,7 @@
 	}
 }
 
-void TabTools::restoreDefaults(struct toolPrefs *prefsData, int unitIndex)
+void TabTools::restoreDefaults(struct ToolPrefs *prefsData, int unitIndex)
 {
 	enableSignals(false);
 
Index: scribus/ui/tabtypography.cpp
===================================================================
--- scribus/ui/tabtypography.cpp	(revision 13888)
+++ scribus/ui/tabtypography.cpp	(revision 13889)
@@ -15,7 +15,7 @@
 #include "prefsstructs.h"
 #include "scribusstructs.h"
 
-TabTypograpy::TabTypograpy( QWidget* parent, struct typoPrefs *prefsData) : QWidget( parent )
+TabTypograpy::TabTypograpy( QWidget* parent, struct TypoPrefs *prefsData) : QWidget( parent )
 {
 	tabTypoLayout = new QGridLayout( this );
 	tabTypoLayout->setMargin(0);
@@ -159,7 +159,7 @@
 	strikethruWidth->setToolTip( tr( "Line width expressed as a percentage of the font size" ) );
 }
 
-void TabTypograpy::restoreDefaults(struct typoPrefs *prefsData)
+void TabTypograpy::restoreDefaults(struct TypoPrefs *prefsData)
 {
 	capsScaling->setValue( prefsData->valueSmallCaps );
 	subDisplacement->setValue( prefsData->valueSubScript );
Index: scribus/ui/tabguides.cpp
===================================================================
--- scribus/ui/tabguides.cpp	(revision 13888)
+++ scribus/ui/tabguides.cpp	(revision 13889)
@@ -23,7 +23,7 @@
 #include "scribusstructs.h"
 #include "units.h"
 
-TabGuides::TabGuides( QWidget* parent, struct guidesPrefs *prefsData, struct typoPrefs *prefsData2, int unitIndex) : QWidget( parent )
+TabGuides::TabGuides( QWidget* parent, struct GuidesPrefs *prefsData, struct TypoPrefs *prefsData2, int unitIndex) : QWidget( parent )
 {
 	double unitRatio = unitGetRatioFromIndex(unitIndex);
 	QString unit = unitGetSuffixFromIndex(unitIndex);
@@ -235,7 +235,7 @@
 	marginBox->setToolTip( tr("Turns the margins on or off"));
 }
 
-void TabGuides::restoreDefaults(struct guidesPrefs *prefsData, struct typoPrefs *prefsData2, int unitIndex)
+void TabGuides::restoreDefaults(struct GuidesPrefs *prefsData, struct TypoPrefs *prefsData2, int unitIndex)
 {
 	QString unit = unitGetSuffixFromIndex(unitIndex);
 	double unitRatio = unitGetRatioFromIndex(unitIndex);
@@ -246,36 +246,36 @@
 	colorGuides = prefsData->guideColor;
 	guideColor->setIcon(pm3);
 	QPixmap pm6(54, 14);
-	pm6.fill(prefsData->margColor);
-	colorMargin = prefsData->margColor;
+	pm6.fill(prefsData->marginColor);
+	colorMargin = prefsData->marginColor;
 	marginColor->setIcon(pm6);
 	QPixmap pm1(54, 14);
-	pm1.fill(prefsData->majorColor);
-	colorMajorGrid = prefsData->majorColor;
+	pm1.fill(prefsData->majorGridColor);
+	colorMajorGrid = prefsData->majorGridColor;
 	majorGridColor->setIcon(pm1);
 	QPixmap pm(54, 14);
-	pm.fill(prefsData->minorColor);
-	colorMinorGrid = prefsData->minorColor;
+	pm.fill(prefsData->minorGridColor);
+	colorMinorGrid = prefsData->minorGridColor;
 	minorGridColor->setIcon(pm);
 	QPixmap pm4(54, 14);
-	pm4.fill(prefsData->baseColor);
-	colorBaselineGrid = prefsData->baseColor;
+	pm4.fill(prefsData->baselineGridColor);
+	colorBaselineGrid = prefsData->baselineGridColor;
 	baselineColor->setIcon(pm4);
 	minorSpace->setDecimals( decimals );
-	minorSpace->setValue(prefsData->minorGrid  * unitRatio);
+	minorSpace->setValue(prefsData->minorGridSpacing  * unitRatio);
 	minorSpace->setSuffix( unit );
 	majorSpace->setDecimals( decimals );
-	majorSpace->setValue(prefsData->majorGrid * unitRatio);
+	majorSpace->setValue(prefsData->majorGridSpacing * unitRatio);
 	majorSpace->setSuffix( unit );
 	snapDistance->setValue(qRound(prefsData->guideRad));
 	snapDistance->setSuffix( " " + tr( "px" ) );
-	grabDistance->setValue(prefsData->grabRad);
+	grabDistance->setValue(prefsData->grabRadius);
 	grabDistance->setSuffix( " " + tr( " px" ) );
-	baseGrid->setValue(prefsData2->valueBaseGrid);
-	baseOffset->setValue(prefsData2->offsetBaseGrid);
-	inBackground->setChecked( prefsData->before );
-	inForeground->setChecked( !prefsData->before );
-	baselineBox->setChecked(prefsData->baseShown);
+	baseGrid->setValue(prefsData->valueBaselineGrid);
+	baseOffset->setValue(prefsData->offsetBaselineGrid);
+	inBackground->setChecked( prefsData->guidePlacement );
+	inForeground->setChecked( !prefsData->guidePlacement );
+	baselineBox->setChecked(prefsData->baselineGridShown);
 	checkGrid->setChecked(prefsData->gridShown);
 	marginBox->setChecked(prefsData->marginsShown);
 	guideBox->setChecked(prefsData->guidesShown);




More information about the scribus-commit mailing list