r13967 by cbradney - Final (?) splitting of prefs variables into groups

scribus-commit scribus-commit at lists.scribus.net
Sun Sep 6 22:35:53 CEST 2009


Revision: 13967
Author: cbradney
Date: 2009-09-06T20:32:36.998608Z
Commit message: Final (?) splitting of prefs variables into groups

Changeset: 
M  /trunk/Scribus/scribus/ui/tabpdfoptions.cpp
M  /trunk/Scribus/scribus/scribusXml.cpp
M  /trunk/Scribus/scribus/ui/prefs.cpp
M  /trunk/Scribus/scribus/ui/reformdoc.cpp
M  /trunk/Scribus/scribus/ui/preview.cpp
M  /trunk/Scribus/scribus/scribusdoc.cpp
M  /trunk/Scribus/scribus/plugins/aiimplugin/importai.cpp
M  /trunk/Scribus/scribus/ui/storyeditor.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
M  /trunk/Scribus/scribus/fileloader.cpp
M  /trunk/Scribus/scribus/scpreview.cpp
M  /trunk/Scribus/scribus/gtaction.cpp
M  /trunk/Scribus/scribus/prefsmanager.cpp
M  /trunk/Scribus/scribus/scribus.cpp
M  /trunk/Scribus/scribus/prefsstructs.h
M  /trunk/Scribus/scribus/scfonts.cpp
M  /trunk/Scribus/scribus/ui/tabdocument.cpp
M  /trunk/Scribus/scribus/scribuscore.cpp
M  /trunk/Scribus/scribus/ui/fontprefs.cpp
M  /trunk/Scribus/scribus/ui/masterpagepalette.cpp
M  /trunk/Scribus/scribus/colorsetmanager.cpp

Diffs:
Index: scribus/fileloader.cpp
===================================================================
--- scribus/fileloader.cpp	(revision 13966)
+++ scribus/fileloader.cpp	(revision 13967)
@@ -266,8 +266,8 @@
 	currDoc->itemToolPrefs.polyCurvature = prefsManager->appPrefs.itemToolPrefs.polyCurvature;
 	currDoc->itemToolPrefs.polyFd = prefsManager->appPrefs.itemToolPrefs.polyFd;
 	currDoc->itemToolPrefs.polyS = prefsManager->appPrefs.itemToolPrefs.polyS;
-	currDoc->AutoSave = prefsManager->appPrefs.AutoSave;
-	currDoc->AutoSaveTime = prefsManager->appPrefs.AutoSaveTime;
+	currDoc->AutoSave = prefsManager->appPrefs.docSetupPrefs.AutoSave;
+	currDoc->AutoSaveTime = prefsManager->appPrefs.docSetupPrefs.AutoSaveTime;
 	ReplacedFonts = currDoc->AllFonts->getSubstitutions();
 	//dummyScFaces.clear();
 	bool ret = false;
@@ -514,7 +514,7 @@
 				for (itfsu = ReplacedFonts.begin(); itfsu != ReplacedFonts.end(); ++itfsu)
 				{
 					if (dia.stickyReplacements->isChecked())
-						prefsManager->appPrefs.GFontSub[itfsu.key()] = itfsu.value();
+						prefsManager->appPrefs.fontPrefs.GFontSub[itfsu.key()] = itfsu.value();
 				}
 				currDoc->AllFonts->setSubstitutions(ReplacedFonts, currDoc);
 				ResourceCollection repl;
Index: scribus/gtaction.cpp
===================================================================
--- scribus/gtaction.cpp	(revision 13966)
+++ scribus/gtaction.cpp	(revision 13967)
@@ -583,16 +583,16 @@
 			}
 			if (!found)
 			{
-				if (!prefsManager->appPrefs.GFontSub.contains(font->getName()))
+				if (!prefsManager->appPrefs.fontPrefs.GFontSub.contains(font->getName()))
 				{
 					MissingFont *dia = new MissingFont(0, useFont, textFrame->doc());
 					dia->exec();
 					useFont = dia->getReplacementFont();
-					prefsManager->appPrefs.GFontSub[font->getName()] = useFont;
+					prefsManager->appPrefs.fontPrefs.GFontSub[font->getName()] = useFont;
 					delete dia;
 				}
 				else
-					useFont = prefsManager->appPrefs.GFontSub[font->getName()];
+					useFont = prefsManager->appPrefs.fontPrefs.GFontSub[font->getName()];
 			}
 		}
 	}
Index: scribus/scribuscore.cpp
===================================================================
--- scribus/scribuscore.cpp	(revision 13966)
+++ scribus/scribuscore.cpp	(revision 13967)
@@ -599,35 +599,35 @@
 	if (m_HaveCMS)
 	{
 		ProfilesL::Iterator ip;
-		if ((prefsManager->appPrefs.DCMSset.DefaultImageRGBProfile.isEmpty()) || (!InputProfiles.contains(prefsManager->appPrefs.DCMSset.DefaultImageRGBProfile)))
+		if ((prefsManager->appPrefs.colorPrefs.DCMSset.DefaultImageRGBProfile.isEmpty()) || (!InputProfiles.contains(prefsManager->appPrefs.colorPrefs.DCMSset.DefaultImageRGBProfile)))
 		{
 			ip = InputProfiles.begin();
-			prefsManager->appPrefs.DCMSset.DefaultImageRGBProfile = ip.key();
+			prefsManager->appPrefs.colorPrefs.DCMSset.DefaultImageRGBProfile = ip.key();
 		}
-		if ((prefsManager->appPrefs.DCMSset.DefaultImageCMYKProfile.isEmpty()) || (!InputProfilesCMYK.contains(prefsManager->appPrefs.DCMSset.DefaultImageCMYKProfile)))
+		if ((prefsManager->appPrefs.colorPrefs.DCMSset.DefaultImageCMYKProfile.isEmpty()) || (!InputProfilesCMYK.contains(prefsManager->appPrefs.colorPrefs.DCMSset.DefaultImageCMYKProfile)))
 		{
 			ip = InputProfilesCMYK.begin();
-			prefsManager->appPrefs.DCMSset.DefaultImageCMYKProfile = ip.key();
+			prefsManager->appPrefs.colorPrefs.DCMSset.DefaultImageCMYKProfile = ip.key();
 		}
-		if ((prefsManager->appPrefs.DCMSset.DefaultSolidColorRGBProfile.isEmpty()) || (!InputProfiles.contains(prefsManager->appPrefs.DCMSset.DefaultSolidColorRGBProfile)))
+		if ((prefsManager->appPrefs.colorPrefs.DCMSset.DefaultSolidColorRGBProfile.isEmpty()) || (!InputProfiles.contains(prefsManager->appPrefs.colorPrefs.DCMSset.DefaultSolidColorRGBProfile)))
 		{
 			ip = InputProfiles.begin();
-			prefsManager->appPrefs.DCMSset.DefaultSolidColorRGBProfile = ip.key();
+			prefsManager->appPrefs.colorPrefs.DCMSset.DefaultSolidColorRGBProfile = ip.key();
 		}
-		if ((prefsManager->appPrefs.DCMSset.DefaultSolidColorCMYKProfile.isEmpty()) || (!InputProfilesCMYK.contains(prefsManager->appPrefs.DCMSset.DefaultSolidColorCMYKProfile)))
+		if ((prefsManager->appPrefs.colorPrefs.DCMSset.DefaultSolidColorCMYKProfile.isEmpty()) || (!InputProfilesCMYK.contains(prefsManager->appPrefs.colorPrefs.DCMSset.DefaultSolidColorCMYKProfile)))
 		{
 			ip = InputProfilesCMYK.begin();
-			prefsManager->appPrefs.DCMSset.DefaultSolidColorCMYKProfile = ip.key();
+			prefsManager->appPrefs.colorPrefs.DCMSset.DefaultSolidColorCMYKProfile = ip.key();
 		}
-		if ((prefsManager->appPrefs.DCMSset.DefaultMonitorProfile.isEmpty()) || (!MonitorProfiles.contains(prefsManager->appPrefs.DCMSset.DefaultMonitorProfile)))
+		if ((prefsManager->appPrefs.colorPrefs.DCMSset.DefaultMonitorProfile.isEmpty()) || (!MonitorProfiles.contains(prefsManager->appPrefs.colorPrefs.DCMSset.DefaultMonitorProfile)))
 		{
 			ip = MonitorProfiles.begin();
-			prefsManager->appPrefs.DCMSset.DefaultMonitorProfile = ip.key();
+			prefsManager->appPrefs.colorPrefs.DCMSset.DefaultMonitorProfile = ip.key();
 		}
-		if ((prefsManager->appPrefs.DCMSset.DefaultPrinterProfile.isEmpty()) || (!PrinterProfiles.contains(prefsManager->appPrefs.DCMSset.DefaultPrinterProfile)))
+		if ((prefsManager->appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile.isEmpty()) || (!PrinterProfiles.contains(prefsManager->appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile)))
 		{
 			ip = PrinterProfiles.begin();
-			prefsManager->appPrefs.DCMSset.DefaultPrinterProfile = ip.key();
+			prefsManager->appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile = ip.key();
 		}
 		InitDefaultColorTransforms();
 	}
Index: scribus/scribusdoc.cpp
===================================================================
--- scribus/scribusdoc.cpp	(revision 13966)
+++ scribus/scribusdoc.cpp	(revision 13967)
@@ -199,8 +199,8 @@
 	BookMarks(),
 	OldBM(false),
 	hasName(false),
-	AutoSave(prefsData.AutoSave),
-	AutoSaveTime(prefsData.AutoSaveTime),
+	AutoSave(prefsData.docSetupPrefs.AutoSave),
+	AutoSaveTime(prefsData.docSetupPrefs.AutoSaveTime),
 	autoSaveTimer(new QTimer(this)),
 	MLineStyles(),
 	arrowStyles(prefsData.arrowStyles),
@@ -312,8 +312,8 @@
 	BookMarks(),
 	OldBM(false),
 	hasName(false),
-	AutoSave(prefsData.AutoSave),
-	AutoSaveTime(prefsData.AutoSaveTime),
+	AutoSave(prefsData.docSetupPrefs.AutoSave),
+	AutoSaveTime(prefsData.docSetupPrefs.AutoSaveTime),
 	autoSaveTimer(new QTimer(this)),
 	MLineStyles(),
 	arrowStyles(prefsData.arrowStyles),
@@ -382,7 +382,7 @@
 	m_pagesChanged.connectObserver(m_docUpdater);
 
 	PrefsManager *prefsManager = PrefsManager::instance();
-	CMSSettings = prefsManager->appPrefs.DCMSset;
+	CMSSettings = prefsManager->appPrefs.colorPrefs.DCMSset;
 	PDF_Options.SolidProf = CMSSettings.DefaultSolidColorRGBProfile;
 	PDF_Options.ImageProf = CMSSettings.DefaultImageRGBProfile;
 	PDF_Options.PrintProf = CMSSettings.DefaultPrinterProfile;
@@ -399,28 +399,28 @@
 
 	PageColors.ensureBlackAndWhite();
 	if (prefsData.itemToolPrefs.dPen != CommonStrings::None)
-		PageColors.insert(prefsData.itemToolPrefs.dPen, prefsData.DColors[prefsData.itemToolPrefs.dPen]);
+		PageColors.insert(prefsData.itemToolPrefs.dPen, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.dPen]);
 	itemToolPrefs.dPen = prefsData.itemToolPrefs.dPen;
 	if (prefsData.itemToolPrefs.dPenLine != CommonStrings::None)
-		PageColors.insert(prefsData.itemToolPrefs.dPenLine, prefsData.DColors[prefsData.itemToolPrefs.dPenLine]);
+		PageColors.insert(prefsData.itemToolPrefs.dPenLine, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.dPenLine]);
 	itemToolPrefs.dPenLine = prefsData.itemToolPrefs.dPenLine;
 	if (prefsData.itemToolPrefs.dPenText != CommonStrings::None)
-		PageColors.insert(prefsData.itemToolPrefs.dPenText, prefsData.DColors[prefsData.itemToolPrefs.dPenText]);
+		PageColors.insert(prefsData.itemToolPrefs.dPenText, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.dPenText]);
 	itemToolPrefs.dPenText = prefsData.itemToolPrefs.dPenText;
 	if (prefsData.itemToolPrefs.dStrokeText != CommonStrings::None)
-		PageColors.insert(prefsData.itemToolPrefs.dStrokeText, prefsData.DColors[prefsData.itemToolPrefs.dStrokeText]);
+		PageColors.insert(prefsData.itemToolPrefs.dStrokeText, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.dStrokeText]);
 	itemToolPrefs.dStrokeText = prefsData.itemToolPrefs.dStrokeText;
 	if (prefsData.itemToolPrefs.dBrush != CommonStrings::None)
-		PageColors.insert(prefsData.itemToolPrefs.dBrush, prefsData.DColors[prefsData.itemToolPrefs.dBrush]);
+		PageColors.insert(prefsData.itemToolPrefs.dBrush, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.dBrush]);
 	itemToolPrefs.dBrush = prefsData.itemToolPrefs.dBrush;
 	if (prefsData.itemToolPrefs.dBrushPict != CommonStrings::None)
-		PageColors.insert(prefsData.itemToolPrefs.dBrushPict, prefsData.DColors[prefsData.itemToolPrefs.dBrushPict]);
+		PageColors.insert(prefsData.itemToolPrefs.dBrushPict, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.dBrushPict]);
 	itemToolPrefs.dBrushPict = prefsData.itemToolPrefs.dBrushPict;
 	if (prefsData.itemToolPrefs.dTextBackGround != CommonStrings::None)
-		PageColors.insert(prefsData.itemToolPrefs.dTextBackGround, prefsData.DColors[prefsData.itemToolPrefs.dTextBackGround]);
+		PageColors.insert(prefsData.itemToolPrefs.dTextBackGround, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.dTextBackGround]);
 	itemToolPrefs.dTextBackGround = prefsData.itemToolPrefs.dTextBackGround;
 	if (prefsData.itemToolPrefs.dTextLineColor != CommonStrings::None)
-		PageColors.insert(prefsData.itemToolPrefs.dTextLineColor, prefsData.DColors[prefsData.itemToolPrefs.dTextLineColor]);
+		PageColors.insert(prefsData.itemToolPrefs.dTextLineColor, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.dTextLineColor]);
 
 	
 	ParagraphStyle pstyle;
@@ -559,7 +559,7 @@
 	PageColors.ensureBlackAndWhite();
 	PageColors.setDocument(this);
 
-	CMSSettings = prefsManager->appPrefs.DCMSset;
+	CMSSettings = prefsManager->appPrefs.colorPrefs.DCMSset;
 	PDF_Options.SolidProf = CMSSettings.DefaultSolidColorRGBProfile;
 	PDF_Options.ImageProf = CMSSettings.DefaultImageRGBProfile;
 	PDF_Options.PrintProf = CMSSettings.DefaultPrinterProfile;
@@ -3475,7 +3475,7 @@
 						ScriXmlDoc *ss = new ScriXmlDoc();
 						QString dataS = ss->WriteElem(this, view(), &tempSelection);
 						setCurrentPage(targetPage);
-						ss->ReadElem(dataS, prefsData.fontPrefs.AvailFonts, this, targetPage->xOffset(), targetPage->yOffset(), false, true, prefsData.GFontSub, view());
+						ss->ReadElem(dataS, prefsData.fontPrefs.AvailFonts, this, targetPage->xOffset(), targetPage->yOffset(), false, true, prefsData.fontPrefs.GFontSub, view());
 						delete ss;
 						setMasterPageMode(false);
 					}
@@ -3504,7 +3504,7 @@
 				QString dataS = ss->WriteElem(this, view(), &tempSelection);
 				setMasterPageMode(true);
 				setCurrentPage(targetPage);
-				ss->ReadElem(dataS, prefsData.fontPrefs.AvailFonts, this, targetPage->xOffset(), targetPage->yOffset(), false, true, prefsData.GFontSub, view());
+				ss->ReadElem(dataS, prefsData.fontPrefs.AvailFonts, this, targetPage->xOffset(), targetPage->yOffset(), false, true, prefsData.fontPrefs.GFontSub, view());
 				delete ss;
 				setMasterPageMode(false);
 			}
@@ -4961,7 +4961,7 @@
 					if ((lcount < itemBuffer.count()) && !itemBuffer[lcount].isEmpty())
 					{
 						ScriXmlDoc *ss = new ScriXmlDoc();
-						ss->ReadElemToLayer(itemBuffer[lcount], prefsData.fontPrefs.AvailFonts, this, destination->xOffset(), destination->yOffset(), false, true, prefsData.GFontSub, view(),(*it).ID);
+						ss->ReadElemToLayer(itemBuffer[lcount], prefsData.fontPrefs.AvailFonts, this, destination->xOffset(), destination->yOffset(), false, true, prefsData.fontPrefs.GFontSub, view(),(*it).ID);
 						delete ss;
 					}
 					lcount++;
Index: scribus/prefsmanager.cpp
===================================================================
--- scribus/prefsmanager.cpp	(revision 13966)
+++ scribus/prefsmanager.cpp	(revision 13967)
@@ -135,7 +135,7 @@
 	appPrefs.itemToolPrefs.defSize = 120;
 
 	/** Default colours **/
-	appPrefs.DColors.clear();
+	appPrefs.colorPrefs.DColors.clear();
 	
 	ColorSetManager csm;
 	csm.initialiseDefaultPrefs(appPrefs);
@@ -147,15 +147,15 @@
 	QFile fiC(pfadC2);
 	if (!fiC.exists())
 	{
-		appPrefs.DColors.insert("White", ScColor(0, 0, 0, 0));
-		appPrefs.DColors.insert("Black", ScColor(0, 0, 0, 255));
-		appPrefs.DColors.insert("Blue", ScColor(255, 255, 0, 0));
-		appPrefs.DColors.insert("Cyan", ScColor(255, 0, 0, 0));
-		appPrefs.DColors.insert("Green", ScColor(255, 0, 255, 0));
-		appPrefs.DColors.insert("Red", ScColor(0, 255, 255, 0));
-		appPrefs.DColors.insert("Yellow", ScColor(0, 0, 255, 0));
-		appPrefs.DColors.insert("Magenta", ScColor(0, 255, 0, 0));
-		appPrefs.DColorSet = "Scribus-Small";
+		appPrefs.colorPrefs.DColors.insert("White", ScColor(0, 0, 0, 0));
+		appPrefs.colorPrefs.DColors.insert("Black", ScColor(0, 0, 0, 255));
+		appPrefs.colorPrefs.DColors.insert("Blue", ScColor(255, 255, 0, 0));
+		appPrefs.colorPrefs.DColors.insert("Cyan", ScColor(255, 0, 0, 0));
+		appPrefs.colorPrefs.DColors.insert("Green", ScColor(255, 0, 255, 0));
+		appPrefs.colorPrefs.DColors.insert("Red", ScColor(0, 255, 255, 0));
+		appPrefs.colorPrefs.DColors.insert("Yellow", ScColor(0, 0, 255, 0));
+		appPrefs.colorPrefs.DColors.insert("Magenta", ScColor(0, 255, 0, 0));
+		appPrefs.colorPrefs.DColorSet = "Scribus-Small";
 	}
 	else
 	{
@@ -175,11 +175,11 @@
 				CoE >> Cname;
 				ScColor tmp;
 				tmp.setColorRGB(Rval, Gval, Bval);
-				appPrefs.DColors.insert(Cname, tmp);
+				appPrefs.colorPrefs.DColors.insert(Cname, tmp);
 			}
 			fiC.close();
 		}
-		appPrefs.DColorSet = "X11 RGB-Set";
+		appPrefs.colorPrefs.DColorSet = "X11 RGB-Set";
 	}
 	*/
 
@@ -291,7 +291,7 @@
 	appPrefs.itemToolPrefs.polyCurvature = 0.0;
 //	appPrefs.PSize = 40;
 	appPrefs.printerPrefs.ClipMargin = false;
-	appPrefs.GCRMode = false;
+	appPrefs.printerPrefs.GCRMode = false;
 	appPrefs.uiPrefs.RecentDocs.clear();
 	appPrefs.scrapbookPrefs.RecentScrapbooks.clear();
 	appPrefs.uiPrefs.recentDocCount = 5;
@@ -324,8 +324,8 @@
 	appPrefs.hyphPrefs.ignoredWords.clear();
 	appPrefs.hyphPrefs.Automatic = true;
 	appPrefs.hyphPrefs.AutoCheck = false;
-	appPrefs.AutoSave = true;
-	appPrefs.AutoSaveTime = 600000;
+	appPrefs.docSetupPrefs.AutoSave = true;
+	appPrefs.docSetupPrefs.AutoSaveTime = 600000;
 
 	int dpi = qApp->desktop()->logicalDpiX();
 	if ((dpi < 60) || (dpi > 200))
@@ -337,17 +337,17 @@
 	appPrefs.pathPrefs.colorProfiles = "";
 	appPrefs.pathPrefs.scripts = "";
 	appPrefs.pathPrefs.documentTemplates = "";
-	appPrefs.CustomColorSets.clear();
-	appPrefs.PrPr_Mode = false;
-	appPrefs.Gcr_Mode = true;
-	appPrefs.PrPr_AntiAliasing = false;
-	appPrefs.PrPr_Transparency = false;
-	appPrefs.PrPr_C = true;
-	appPrefs.PrPr_M = true;
-	appPrefs.PrPr_Y = true;
-	appPrefs.PrPr_K = true;
-	appPrefs.PrPr_InkCoverage = false;
-	appPrefs.PrPr_InkThreshold = 250;
+	appPrefs.colorPrefs.CustomColorSets.clear();
+	appPrefs.printPreviewPrefs.PrPr_Mode = false;
+	//appPrefs.Gcr_Mode = true;
+	appPrefs.printPreviewPrefs.PrPr_AntiAliasing = false;
+	appPrefs.printPreviewPrefs.PrPr_Transparency = false;
+	appPrefs.printPreviewPrefs.PrPr_C = true;
+	appPrefs.printPreviewPrefs.PrPr_M = true;
+	appPrefs.printPreviewPrefs.PrPr_Y = true;
+	appPrefs.printPreviewPrefs.PrPr_K = true;
+	appPrefs.printPreviewPrefs.PrPr_InkCoverage = false;
+	appPrefs.printPreviewPrefs.PrPr_InkThreshold = 250;
 	appPrefs.extToolPrefs.imageEditorExecutable = "gimp";
 	appPrefs.extToolPrefs.extBrowserExecutable = "";
 	appPrefs.extToolPrefs.uniconvExecutable = "uniconv";
@@ -361,20 +361,20 @@
 	appPrefs.extToolPrefs.gs_AntiAliasText = true;
 	appPrefs.extToolPrefs.gs_exe = getGSDefaultExeName();
 	appPrefs.extToolPrefs.gs_Resolution = 72;
-	appPrefs.STEcolor = QColor(Qt::white);
-	appPrefs.DCMSset.DefaultMonitorProfile = "";
-	appPrefs.DCMSset.DefaultPrinterProfile = "";
-	appPrefs.DCMSset.DefaultImageRGBProfile = "";
-	appPrefs.DCMSset.DefaultSolidColorRGBProfile = "";
-	appPrefs.DCMSset.DefaultSolidColorCMYKProfile = "";
-	appPrefs.DCMSset.CMSinUse = false;
-	appPrefs.DCMSset.SoftProofOn = false;
-	appPrefs.DCMSset.SoftProofFullOn = false;
-	appPrefs.DCMSset.GamutCheck = false;
-	appPrefs.DCMSset.BlackPoint = true;
-	appPrefs.DCMSset.DefaultIntentColors = 1;
-	appPrefs.DCMSset.DefaultIntentImages = 0;
-	appPrefs.GFontSub.clear();
+	appPrefs.storyEditorPrefs.STEcolor = QColor(Qt::white);
+	appPrefs.colorPrefs.DCMSset.DefaultMonitorProfile = "";
+	appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile = "";
+	appPrefs.colorPrefs.DCMSset.DefaultImageRGBProfile = "";
+	appPrefs.colorPrefs.DCMSset.DefaultSolidColorRGBProfile = "";
+	appPrefs.colorPrefs.DCMSset.DefaultSolidColorCMYKProfile = "";
+	appPrefs.colorPrefs.DCMSset.CMSinUse = false;
+	appPrefs.colorPrefs.DCMSset.SoftProofOn = false;
+	appPrefs.colorPrefs.DCMSset.SoftProofFullOn = false;
+	appPrefs.colorPrefs.DCMSset.GamutCheck = false;
+	appPrefs.colorPrefs.DCMSset.BlackPoint = true;
+	appPrefs.colorPrefs.DCMSset.DefaultIntentColors = 1;
+	appPrefs.colorPrefs.DCMSset.DefaultIntentImages = 0;
+	appPrefs.fontPrefs.GFontSub.clear();
 	appPrefs.displayPrefs.scratch.Left = 100;
 	appPrefs.displayPrefs.scratch.Right = 100;
 	appPrefs.displayPrefs.scratch.Top = 20;
@@ -521,7 +521,7 @@
 void PrefsManager::initDefaultGUIFont(const QFont& guiFont)
 {
 	appPrefs.uiPrefs.applicationFontSize = guiFont.pointSize();
-	appPrefs.STEfont = guiFont.toString();
+	appPrefs.storyEditorPrefs.STEfont = guiFont.toString();
 	appPrefs.uiPrefs.paletteFontSize = appPrefs.uiPrefs.applicationFontSize;
 }
 
@@ -1044,17 +1044,17 @@
 
 const ColorList& PrefsManager::colorSet()
 {
-	return appPrefs.DColors;
+	return appPrefs.colorPrefs.DColors;
 }
 
 ColorList* PrefsManager::colorSetPtr()
 {
-	return &appPrefs.DColors;
+	return &appPrefs.colorPrefs.DColors;
 }
 
 const QString& PrefsManager::colorSetName()
 {
-	return appPrefs.DColorSet;
+	return appPrefs.colorPrefs.DColorSet;
 }
 
 bool PrefsManager::isToolColor(const QString& name)
@@ -1140,34 +1140,34 @@
 	ColorList tmpSet = colorSet;
 	QString penText = appPrefs.itemToolPrefs.dPenText;
 	if (!tmpSet.contains(penText) && penText != CommonStrings::None)
-		tmpSet[penText] = appPrefs.DColors[penText];
+		tmpSet[penText] = appPrefs.colorPrefs.DColors[penText];
 	QString strokeText = appPrefs.itemToolPrefs.dStrokeText;
 	if (!tmpSet.contains(strokeText) && strokeText != CommonStrings::None)
-		tmpSet[strokeText] = appPrefs.DColors[strokeText];
+		tmpSet[strokeText] = appPrefs.colorPrefs.DColors[strokeText];
 	QString textBackGround = appPrefs.itemToolPrefs.dTextBackGround;
 	if (!tmpSet.contains(textBackGround) && textBackGround != CommonStrings::None)
-		tmpSet[textBackGround] = appPrefs.DColors[textBackGround];
+		tmpSet[textBackGround] = appPrefs.colorPrefs.DColors[textBackGround];
 	QString textLineColor = appPrefs.itemToolPrefs.dTextLineColor;
 	if (!tmpSet.contains(textLineColor) && textLineColor != CommonStrings::None)
-		tmpSet[textLineColor] = appPrefs.DColors[textLineColor];
+		tmpSet[textLineColor] = appPrefs.colorPrefs.DColors[textLineColor];
 	QString pen = appPrefs.itemToolPrefs.dPen;
 	if (!tmpSet.contains(pen) && pen != CommonStrings::None)
-		tmpSet[pen] = appPrefs.DColors[pen];
+		tmpSet[pen] = appPrefs.colorPrefs.DColors[pen];
 	QString brush = appPrefs.itemToolPrefs.dBrush;
 	if (!tmpSet.contains(brush) && brush != CommonStrings::None)
-		tmpSet[brush] = appPrefs.DColors[brush];
+		tmpSet[brush] = appPrefs.colorPrefs.DColors[brush];
 	QString penLine = appPrefs.itemToolPrefs.dPenLine;
 	if (!tmpSet.contains(penLine) && penLine != CommonStrings::None)
-		tmpSet[penLine] = appPrefs.DColors[penLine];
+		tmpSet[penLine] = appPrefs.colorPrefs.DColors[penLine];
 	QString brushPict = appPrefs.itemToolPrefs.dBrushPict;
 	if (!tmpSet.contains(brushPict) && brushPict != CommonStrings::None)
-		tmpSet[brushPict] = appPrefs.DColors[brushPict];
-	appPrefs.DColors = tmpSet;
+		tmpSet[brushPict] = appPrefs.colorPrefs.DColors[brushPict];
+	appPrefs.colorPrefs.DColors = tmpSet;
 }
 
 void PrefsManager::setColorSetName(const QString& colorSetName)
 {
-	appPrefs.DColorSet=colorSetName;
+	appPrefs.colorPrefs.DColorSet=colorSetName;
 }
 
 
@@ -1262,8 +1262,8 @@
 	dc.setAttribute("ScratchTop", appPrefs.displayPrefs.scratch.Top);
 	dc.setAttribute("GapHorizontal", ScCLocale::toQStringC(appPrefs.displayPrefs.GapHorizontal));
 	dc.setAttribute("GapVertical", ScCLocale::toQStringC(appPrefs.displayPrefs.GapVertical));
-	dc.setAttribute("STECOLOR", appPrefs.STEcolor.name());
-	dc.setAttribute("STEFONT", appPrefs.STEfont);
+	dc.setAttribute("STECOLOR", appPrefs.storyEditorPrefs.STEcolor.name());
+	dc.setAttribute("STEFONT", appPrefs.storyEditorPrefs.STEfont);
 	dc.setAttribute("STYLEPREVIEW", static_cast<int>(appPrefs.miscPrefs.haveStylePreview));
 	dc.setAttribute("UI_SHOWSTARTUPDIALOG", static_cast<int>(appPrefs.uiPrefs.showStartupDialog));
 	dc.setAttribute("UI_USESMALLWIDGETS", static_cast<int>(appPrefs.uiPrefs.useSmallWidgets));
@@ -1393,8 +1393,8 @@
 	}
 	elem.appendChild(dc73);
 	QDomElement dc75=docu.createElement("PAGEPALETTE");
-	dc75.setAttribute("THUMBS", static_cast<int>(appPrefs.SepalT));
-	dc75.setAttribute("NAMES", static_cast<int>(appPrefs.SepalN));
+	dc75.setAttribute("THUMBS", static_cast<int>(appPrefs.uiPrefs.SepalT));
+	dc75.setAttribute("NAMES", static_cast<int>(appPrefs.uiPrefs.SepalN));
 	elem.appendChild(dc75);
 	QDomElement dc76=docu.createElement("DOKUMENT");
 	dc76.setAttribute("PAGESIZE",appPrefs.docSetupPrefs.pageSize);
@@ -1407,8 +1407,8 @@
 	dc76.setAttribute("RANDR",ScCLocale::toQStringC(appPrefs.docSetupPrefs.margins.Right));
 	dc76.setAttribute("PRESET",appPrefs.docSetupPrefs.marginPreset);
 	dc76.setAttribute("DOPPEL", appPrefs.docSetupPrefs.pagePositioning);
-	dc76.setAttribute("AutoSave", static_cast<int>(appPrefs.AutoSave));
-	dc76.setAttribute("AutoSaveTime", appPrefs.AutoSaveTime);
+	dc76.setAttribute("AutoSave", static_cast<int>(appPrefs.docSetupPrefs.AutoSave));
+	dc76.setAttribute("AutoSaveTime", appPrefs.docSetupPrefs.AutoSaveTime);
 	dc76.setAttribute("BleedTop", ScCLocale::toQStringC(appPrefs.docSetupPrefs.bleeds.Top));
 	dc76.setAttribute("BleedLeft", ScCLocale::toQStringC(appPrefs.docSetupPrefs.bleeds.Left));
 	dc76.setAttribute("BleedRight", ScCLocale::toQStringC(appPrefs.docSetupPrefs.bleeds.Right));
@@ -1463,40 +1463,40 @@
 		elem.appendChild(dc79a);
 	}
 	QDomElement dc81=docu.createElement("CMS");
-	dc81.setAttribute("DPSo", static_cast<int>(appPrefs.DCMSset.SoftProofOn));
-	dc81.setAttribute("DPSFo", static_cast<int>(appPrefs.DCMSset.SoftProofFullOn));
-	dc81.setAttribute("DPuse", static_cast<int>(appPrefs.DCMSset.CMSinUse));
-	dc81.setAttribute("DPgam", static_cast<int>(appPrefs.DCMSset.GamutCheck));
-	dc81.setAttribute("DPbla", static_cast<int>(appPrefs.DCMSset.BlackPoint));
-	dc81.setAttribute("DPMo",appPrefs.DCMSset.DefaultMonitorProfile);
-	dc81.setAttribute("DPPr",appPrefs.DCMSset.DefaultPrinterProfile);
-	dc81.setAttribute("DPIn",appPrefs.DCMSset.DefaultImageRGBProfile);
-	dc81.setAttribute("DPInCMYK",appPrefs.DCMSset.DefaultImageCMYKProfile);
-	dc81.setAttribute("DPIn2",appPrefs.DCMSset.DefaultSolidColorRGBProfile);
-	dc81.setAttribute("DPIn3",appPrefs.DCMSset.DefaultSolidColorCMYKProfile);
-	//dc81.setAttribute("DIPr",appPrefs.DCMSset.DefaultIntentPrinter);
-	//dc81.setAttribute("DIMo",appPrefs.DCMSset.DefaultIntentMonitor);
-	dc81.setAttribute("DISc",appPrefs.DCMSset.DefaultIntentColors);
-	dc81.setAttribute("DIIm",appPrefs.DCMSset.DefaultIntentImages);
+	dc81.setAttribute("DPSo", static_cast<int>(appPrefs.colorPrefs.DCMSset.SoftProofOn));
+	dc81.setAttribute("DPSFo", static_cast<int>(appPrefs.colorPrefs.DCMSset.SoftProofFullOn));
+	dc81.setAttribute("DPuse", static_cast<int>(appPrefs.colorPrefs.DCMSset.CMSinUse));
+	dc81.setAttribute("DPgam", static_cast<int>(appPrefs.colorPrefs.DCMSset.GamutCheck));
+	dc81.setAttribute("DPbla", static_cast<int>(appPrefs.colorPrefs.DCMSset.BlackPoint));
+	dc81.setAttribute("DPMo",appPrefs.colorPrefs.DCMSset.DefaultMonitorProfile);
+	dc81.setAttribute("DPPr",appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile);
+	dc81.setAttribute("DPIn",appPrefs.colorPrefs.DCMSset.DefaultImageRGBProfile);
+	dc81.setAttribute("DPInCMYK",appPrefs.colorPrefs.DCMSset.DefaultImageCMYKProfile);
+	dc81.setAttribute("DPIn2",appPrefs.colorPrefs.DCMSset.DefaultSolidColorRGBProfile);
+	dc81.setAttribute("DPIn3",appPrefs.colorPrefs.DCMSset.DefaultSolidColorCMYKProfile);
+	//dc81.setAttribute("DIPr",appPrefs.colorPrefs.DCMSset.DefaultIntentPrinter);
+	//dc81.setAttribute("DIMo",appPrefs.colorPrefs.DCMSset.DefaultIntentMonitor);
+	dc81.setAttribute("DISc",appPrefs.colorPrefs.DCMSset.DefaultIntentColors);
+	dc81.setAttribute("DIIm",appPrefs.colorPrefs.DCMSset.DefaultIntentImages);
 	elem.appendChild(dc81);
 	QDomElement dc82=docu.createElement("PRINTER");
 	dc82.setAttribute("NAME",appPrefs.printerPrefs.PrinterName);
 	dc82.setAttribute("FILE",appPrefs.printerPrefs.PrinterFile);
 	dc82.setAttribute("COMMAND",appPrefs.printerPrefs.PrinterCommand);
 	dc82.setAttribute("CLIPMARGIN", static_cast<int>(appPrefs.printerPrefs.ClipMargin));
-	dc82.setAttribute("GMODE", static_cast<int>(appPrefs.GCRMode));
+	dc82.setAttribute("GMODE", static_cast<int>(appPrefs.printerPrefs.GCRMode));
 	elem.appendChild(dc82);
 	QDomElement dc8Pr=docu.createElement("PRINTPREVIEW");
-	dc8Pr.setAttribute("Mode", static_cast<int>(appPrefs.PrPr_Mode));
-	dc8Pr.setAttribute("GcrMode", static_cast<int>(appPrefs.Gcr_Mode));
-	dc8Pr.setAttribute("AntiAliasing", static_cast<int>(appPrefs.PrPr_AntiAliasing));
-	dc8Pr.setAttribute("Transparency", static_cast<int>(appPrefs.PrPr_Transparency));
-	dc8Pr.setAttribute("Cyan", static_cast<int>(appPrefs.PrPr_C));
-	dc8Pr.setAttribute("Magenta", static_cast<int>(appPrefs.PrPr_M));
-	dc8Pr.setAttribute("Yellow", static_cast<int>(appPrefs.PrPr_Y));
-	dc8Pr.setAttribute("Black", static_cast<int>(appPrefs.PrPr_K));
-	dc8Pr.setAttribute("InkCoverage", static_cast<int>(appPrefs.PrPr_InkCoverage));
-	dc8Pr.setAttribute("InkThreshold", appPrefs.PrPr_InkThreshold);
+	dc8Pr.setAttribute("Mode", static_cast<int>(appPrefs.printPreviewPrefs.PrPr_Mode));
+	//dc8Pr.setAttribute("GcrMode", static_cast<int>(appPrefs.Gcr_Mode));
+	dc8Pr.setAttribute("AntiAliasing", static_cast<int>(appPrefs.printPreviewPrefs.PrPr_AntiAliasing));
+	dc8Pr.setAttribute("Transparency", static_cast<int>(appPrefs.printPreviewPrefs.PrPr_Transparency));
+	dc8Pr.setAttribute("Cyan", static_cast<int>(appPrefs.printPreviewPrefs.PrPr_C));
+	dc8Pr.setAttribute("Magenta", static_cast<int>(appPrefs.printPreviewPrefs.PrPr_M));
+	dc8Pr.setAttribute("Yellow", static_cast<int>(appPrefs.printPreviewPrefs.PrPr_Y));
+	dc8Pr.setAttribute("Black", static_cast<int>(appPrefs.printPreviewPrefs.PrPr_K));
+	dc8Pr.setAttribute("InkCoverage", static_cast<int>(appPrefs.printPreviewPrefs.PrPr_InkCoverage));
+	dc8Pr.setAttribute("InkThreshold", appPrefs.printPreviewPrefs.PrPr_InkThreshold);
 	elem.appendChild(dc8Pr);
 	QDomElement dc8Ex = docu.createElement("EXTERNAL");
 	dc8Ex.setAttribute("GIMP", imageEditorExecutable());
@@ -1539,7 +1539,7 @@
 	}
 	elem.appendChild(rde);
 	ColorList::Iterator itc;
-	for (itc = appPrefs.DColors.begin(); itc != appPrefs.DColors.end(); ++itc)
+	for (itc = appPrefs.colorPrefs.DColors.begin(); itc != appPrefs.colorPrefs.DColors.end(); ++itc)
 	{
 		QDomElement co=docu.createElement("COLOR");
 		co.setAttribute("NAME",itc.key());
@@ -1579,21 +1579,21 @@
 		elem.appendChild(kscc);
 	}
 	QMap<QString,QString>::Iterator itfsu;
-	for (itfsu = appPrefs.GFontSub.begin(); itfsu != appPrefs.GFontSub.end(); ++itfsu)
+	for (itfsu = appPrefs.fontPrefs.GFontSub.begin(); itfsu != appPrefs.fontPrefs.GFontSub.end(); ++itfsu)
 	{
 		QDomElement fosu = docu.createElement("Substitute");
 		fosu.setAttribute("Name",itfsu.key());
 		fosu.setAttribute("Replace",itfsu.value());
 		elem.appendChild(fosu);
 	}
-	for (int ccs=0; ccs<appPrefs.CustomColorSets.count(); ++ccs)
+	for (int ccs=0; ccs<appPrefs.colorPrefs.CustomColorSets.count(); ++ccs)
 	{
 		QDomElement cos=docu.createElement("COLORSET");
-		cos.setAttribute("NAME",appPrefs.CustomColorSets[ccs]);
+		cos.setAttribute("NAME",appPrefs.colorPrefs.CustomColorSets[ccs]);
 		elem.appendChild(cos);
 	}
 	QDomElement cosd=docu.createElement("DCOLORSET");
-	cosd.setAttribute("NAME",appPrefs.DColorSet);
+	cosd.setAttribute("NAME",appPrefs.colorPrefs.DColorSet);
 	elem.appendChild(cosd);
 	QDomElement pdf = docu.createElement("PDF");
 	pdf.setAttribute("Thumbnails", static_cast<int>(appPrefs.pdfPrefs.Thumbnails));
@@ -1752,7 +1752,7 @@
 	firstTimeIgnoreOldPrefs=!prefs135FileFound;
 	if (!prefs135FileFound)
 		return false;
-	appPrefs.DColors.clear();
+	appPrefs.colorPrefs.DColors.clear();
 	appPrefs.extToolPrefs.latexCommands.clear();
 	ScColor lf = ScColor();
 	QDomNode DOC=elem.firstChild();
@@ -1822,9 +1822,9 @@
 			appPrefs.displayPrefs.GapHorizontal  = ScCLocale::toDoubleC(dc.attribute("GapHorizontal"), 0.0);
 			appPrefs.displayPrefs.GapVertical    = ScCLocale::toDoubleC(dc.attribute("GapVertical"), 40.0);
 			if (dc.hasAttribute("STECOLOR"))
-				appPrefs.STEcolor = QColor(dc.attribute("STECOLOR"));
+				appPrefs.storyEditorPrefs.STEcolor = QColor(dc.attribute("STECOLOR"));
 			if (dc.hasAttribute("STEFONT"))
-				appPrefs.STEfont = dc.attribute("STEFONT");
+				appPrefs.storyEditorPrefs.STEfont = dc.attribute("STEFONT");
 			appPrefs.displayPrefs.showToolTips = static_cast<bool>(dc.attribute("ToolTips", "1").toInt());
 			appPrefs.displayPrefs.showMouseCoordinates = static_cast<bool>(dc.attribute("showMouseCoordinates", "1").toInt());
 			appPrefs.uiPrefs.stickyTools = static_cast<bool>(dc.attribute("stickyTools", "0").toInt());
@@ -1981,8 +1981,8 @@
 		}
 		if (dc.tagName()=="PAGEPALETTE")
 		{
-			appPrefs.SepalT = static_cast<bool>(dc.attribute("THUMBS").toInt());
-			appPrefs.SepalN = static_cast<bool>(dc.attribute("NAMES").toInt());
+			appPrefs.uiPrefs.SepalT = static_cast<bool>(dc.attribute("THUMBS").toInt());
+			appPrefs.uiPrefs.SepalN = static_cast<bool>(dc.attribute("NAMES").toInt());
 		}
 		if (dc.tagName()=="SCRAPBOOK")
 		{
@@ -2015,8 +2015,8 @@
 			appPrefs.docSetupPrefs.margins.Right  = ScCLocale::toDoubleC(dc.attribute("RANDR"), 9.0);
 			appPrefs.docSetupPrefs.marginPreset   = dc.attribute("PRESET", "0").toInt();
 			appPrefs.docSetupPrefs.pagePositioning    = dc.attribute("DOPPEL", "0").toInt();
-			appPrefs.AutoSave      = static_cast<bool>(dc.attribute("AutoSave", "0").toInt());
-			appPrefs.AutoSaveTime  = dc.attribute("AutoSaveTime", "600000").toInt();
+			appPrefs.docSetupPrefs.AutoSave      = static_cast<bool>(dc.attribute("AutoSave", "0").toInt());
+			appPrefs.docSetupPrefs.AutoSaveTime  = dc.attribute("AutoSaveTime", "600000").toInt();
 			appPrefs.docSetupPrefs.bleeds.Top    = ScCLocale::toDoubleC(dc.attribute("BleedTop"), 0.0);
 			appPrefs.docSetupPrefs.bleeds.Left   = ScCLocale::toDoubleC(dc.attribute("BleedLeft"), 0.0);
 			appPrefs.docSetupPrefs.bleeds.Right  = ScCLocale::toDoubleC(dc.attribute("BleedRight"), 0.0);
@@ -2063,19 +2063,19 @@
 		}
 		if (dc.tagName()=="CMS")
 		{
-			appPrefs.DCMSset.SoftProofOn = static_cast<bool>(dc.attribute("DPSo", "0").toInt());
-			appPrefs.DCMSset.SoftProofFullOn = static_cast<bool>(dc.attribute("DPSFo", "0").toInt());
-			appPrefs.DCMSset.CMSinUse = static_cast<bool>(dc.attribute("DPuse", "0").toInt());
-			appPrefs.DCMSset.GamutCheck = static_cast<bool>(dc.attribute("DPgam", "0").toInt());
-			appPrefs.DCMSset.BlackPoint = static_cast<bool>(dc.attribute("DPbla", "1").toInt());
-			appPrefs.DCMSset.DefaultMonitorProfile = dc.attribute("DPMo","");
-			appPrefs.DCMSset.DefaultPrinterProfile = dc.attribute("DPPr","");
-			appPrefs.DCMSset.DefaultImageRGBProfile = dc.attribute("DPIn","");
-			appPrefs.DCMSset.DefaultImageCMYKProfile = dc.attribute("DPInCMYK","");
-			appPrefs.DCMSset.DefaultSolidColorRGBProfile = dc.attribute("DPIn2","");
-			appPrefs.DCMSset.DefaultSolidColorCMYKProfile = dc.attribute("DPIn3","");
-			appPrefs.DCMSset.DefaultIntentColors = dc.attribute("DISc", "1").toInt();
-			appPrefs.DCMSset.DefaultIntentImages = dc.attribute("DIIm", "0").toInt();
+			appPrefs.colorPrefs.DCMSset.SoftProofOn = static_cast<bool>(dc.attribute("DPSo", "0").toInt());
+			appPrefs.colorPrefs.DCMSset.SoftProofFullOn = static_cast<bool>(dc.attribute("DPSFo", "0").toInt());
+			appPrefs.colorPrefs.DCMSset.CMSinUse = static_cast<bool>(dc.attribute("DPuse", "0").toInt());
+			appPrefs.colorPrefs.DCMSset.GamutCheck = static_cast<bool>(dc.attribute("DPgam", "0").toInt());
+			appPrefs.colorPrefs.DCMSset.BlackPoint = static_cast<bool>(dc.attribute("DPbla", "1").toInt());
+			appPrefs.colorPrefs.DCMSset.DefaultMonitorProfile = dc.attribute("DPMo","");
+			appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile = dc.attribute("DPPr","");
+			appPrefs.colorPrefs.DCMSset.DefaultImageRGBProfile = dc.attribute("DPIn","");
+			appPrefs.colorPrefs.DCMSset.DefaultImageCMYKProfile = dc.attribute("DPInCMYK","");
+			appPrefs.colorPrefs.DCMSset.DefaultSolidColorRGBProfile = dc.attribute("DPIn2","");
+			appPrefs.colorPrefs.DCMSset.DefaultSolidColorCMYKProfile = dc.attribute("DPIn3","");
+			appPrefs.colorPrefs.DCMSset.DefaultIntentColors = dc.attribute("DISc", "1").toInt();
+			appPrefs.colorPrefs.DCMSset.DefaultIntentImages = dc.attribute("DIIm", "0").toInt();
 		}
 		if (!importingFrom12 && dc.tagName()=="SHORTCUT")
 		{
@@ -2127,20 +2127,20 @@
 			appPrefs.printerPrefs.PrinterFile = dc.attribute("FILE");
 			appPrefs.printerPrefs.PrinterCommand = dc.attribute("COMMAND");
 			appPrefs.printerPrefs.ClipMargin = static_cast<bool>(dc.attribute("CLIPMARGIN", "1").toInt());
-			appPrefs.GCRMode = static_cast<bool>(dc.attribute("GMODE", "1").toInt());
+			appPrefs.printerPrefs.GCRMode = static_cast<bool>(dc.attribute("GMODE", "1").toInt());
 		}
 		if (dc.tagName()=="PRINTPREVIEW")
 		{
-			appPrefs.PrPr_Mode = static_cast<bool>(dc.attribute("Mode", "0").toInt());
-			appPrefs.Gcr_Mode = static_cast<bool>(dc.attribute("GcrMode", "1").toInt());
-			appPrefs.PrPr_AntiAliasing = static_cast<bool>(dc.attribute("AntiAliasing", "0").toInt());
-			appPrefs.PrPr_Transparency = static_cast<bool>(dc.attribute("Transparency", "0").toInt());
-			appPrefs.PrPr_C = static_cast<bool>(dc.attribute("Cyan", "1").toInt());
-			appPrefs.PrPr_M = static_cast<bool>(dc.attribute("Magenta", "1").toInt());
-			appPrefs.PrPr_Y = static_cast<bool>(dc.attribute("Yellow", "1").toInt());
-			appPrefs.PrPr_K = static_cast<bool>(dc.attribute("Black", "1").toInt());
-			appPrefs.PrPr_InkCoverage = static_cast<bool>(dc.attribute("InkCoverage", "0").toInt());
-			appPrefs.PrPr_InkThreshold = dc.attribute("InkThreshold", "250").toInt();
+			appPrefs.printPreviewPrefs.PrPr_Mode = static_cast<bool>(dc.attribute("Mode", "0").toInt());
+			//appPrefs.Gcr_Mode = static_cast<bool>(dc.attribute("GcrMode", "1").toInt());
+			appPrefs.printPreviewPrefs.PrPr_AntiAliasing = static_cast<bool>(dc.attribute("AntiAliasing", "0").toInt());
+			appPrefs.printPreviewPrefs.PrPr_Transparency = static_cast<bool>(dc.attribute("Transparency", "0").toInt());
+			appPrefs.printPreviewPrefs.PrPr_C = static_cast<bool>(dc.attribute("Cyan", "1").toInt());
+			appPrefs.printPreviewPrefs.PrPr_M = static_cast<bool>(dc.attribute("Magenta", "1").toInt());
+			appPrefs.printPreviewPrefs.PrPr_Y = static_cast<bool>(dc.attribute("Yellow", "1").toInt());
+			appPrefs.printPreviewPrefs.PrPr_K = static_cast<bool>(dc.attribute("Black", "1").toInt());
+			appPrefs.printPreviewPrefs.PrPr_InkCoverage = static_cast<bool>(dc.attribute("InkCoverage", "0").toInt());
+			appPrefs.printPreviewPrefs.PrPr_InkThreshold = dc.attribute("InkThreshold", "250").toInt();
 		}
 		if (dc.tagName()=="EXTERNAL")
 		{
@@ -2250,14 +2250,14 @@
 				lf.setRegistrationColor(static_cast<bool>(dc.attribute("Register").toInt()));
 			else
 				lf.setRegistrationColor(false);
-			appPrefs.DColors[dc.attribute("NAME")] = lf;
+			appPrefs.colorPrefs.DColors[dc.attribute("NAME")] = lf;
 		}
 		if (dc.tagName()=="Substitute")
-		  appPrefs.GFontSub[dc.attribute("Name")] = dc.attribute("Replace");
+		  appPrefs.fontPrefs.GFontSub[dc.attribute("Name")] = dc.attribute("Replace");
 		if (dc.tagName()=="COLORSET")
-			appPrefs.CustomColorSets.append(dc.attribute("NAME"));
+			appPrefs.colorPrefs.CustomColorSets.append(dc.attribute("NAME"));
 		if (dc.tagName()=="DCOLORSET")
-			appPrefs.DColorSet = dc.attribute("NAME");
+			appPrefs.colorPrefs.DColorSet = dc.attribute("NAME");
 		if(dc.tagName()=="PDF")
 		{
 			appPrefs.pdfPrefs.Articles = static_cast<bool>(dc.attribute("Articles").toInt());
@@ -2387,7 +2387,7 @@
 		}
 		DOC=DOC.nextSibling();
 	}
-	appPrefs.DColors.ensureBlackAndWhite();
+	appPrefs.colorPrefs.DColors.ensureBlackAndWhite();
 	appPrefs.ui_SystemTheme = qApp->style()->objectName();
 	if (appPrefs.uiPrefs.style.length() > 0)
 	{
Index: scribus/scribusXml.cpp
===================================================================
--- scribus/scribusXml.cpp	(revision 13966)
+++ scribus/scribusXml.cpp	(revision 13967)
@@ -483,7 +483,7 @@
 	QString tmpf = fStr;
 	if ((!avail.contains(tmpf)) || (!avail[tmpf].usable()))
 	{
-		if ((!prefsManager->appPrefs.GFontSub.contains(tmpf)) || (!avail[prefsManager->appPrefs.GFontSub[tmpf]].usable()))
+		if ((!prefsManager->appPrefs.fontPrefs.GFontSub.contains(tmpf)) || (!avail[prefsManager->appPrefs.fontPrefs.GFontSub[tmpf]].usable()))
 		{
 			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 			MissingFont *dia = new MissingFont(0, tmpf, doc);
@@ -491,10 +491,10 @@
 			tmpf = dia->getReplacementFont();
 			delete dia;
 			qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
-			prefsManager->appPrefs.GFontSub[fStr] = tmpf;
+			prefsManager->appPrefs.fontPrefs.GFontSub[fStr] = tmpf;
 		}
 		else
-			tmpf = prefsManager->appPrefs.GFontSub[tmpf];
+			tmpf = prefsManager->appPrefs.fontPrefs.GFontSub[tmpf];
 		ReplacedFonts[fStr] = tmpf;
 	}
 	if (!doc->UsedFonts.contains(tmpf))
@@ -2590,13 +2590,13 @@
 			dummyScFaces.append(dummy);
 		}
 		unknown = true;
-		if ((!appPrefs.GFontSub.contains(tmpf)) || (!appPrefs.fontPrefs.AvailFonts[appPrefs.GFontSub[tmpf]].usable()))
+		if ((!appPrefs.fontPrefs.GFontSub.contains(tmpf)) || (!appPrefs.fontPrefs.AvailFonts[appPrefs.fontPrefs.GFontSub[tmpf]].usable()))
 		{
 			newReplacement = true;
 			ReplacedFonts.insert(tmpf, appPrefs.itemToolPrefs.defFont);
 		}
 		else
-			ReplacedFonts.insert(tmpf, appPrefs.GFontSub[tmpf]);
+			ReplacedFonts.insert(tmpf, appPrefs.fontPrefs.GFontSub[tmpf]);
 //		tmpf = ReplacedFonts[tmpf];
 	}
 	else if (hasFont)
Index: scribus/prefsstructs.h
===================================================================
--- scribus/prefsstructs.h	(revision 13966)
+++ scribus/prefsstructs.h	(revision 13967)
@@ -70,17 +70,19 @@
 	int mouseMoveTimeout; //! Mouse move timeout for move/resize operations
 	int wheelJump; //! Distance to jump with mouse wheel scrolling
 	int applicationFontSize; //! Font size to use in the application, apart from pßalettes
-	int paletteFontSize; //! Fotn size to use in the palettes
+	int paletteFontSize; //! Font size to use in the palettes
 	QString style; 	//! Currently used QStyle name
 	int recentDocCount; //! Number of recent documents to remember
-	QStringList RecentDocs;
+	QStringList RecentDocs; //! List of recent documents
 	QString language; //! Language of the user interface
 	bool useSmallWidgets; //! Use small widgets in the palettes
 	bool showStartupDialog; //! Whether to show the startup dialog or not
-	bool stickyTools;
-	bool grayscaleIcons;
+	bool stickyTools; //! Whether a user's tool section remains after use or the normal tool is reselected
+	bool grayscaleIcons; //! Show icons in toolbars as grayscale
 	WindowPrefs mainWinSettings;
 	QByteArray mainWinState;
+	bool SepalT; //! Page Palette - show page thumbnails
+	bool SepalN; //! Page Palette - show names on pages
 };
 
 //Paths
@@ -104,6 +106,8 @@
 	int marginPreset; //! Use a preset ratio margin setup
 	int pagePositioning; //! Show pages in 1,2,3,4 pages side by side on screen
 	int docUnitIndex; //! The index of the default unit
+	bool AutoSave;
+	int AutoSaveTime;
 };
 
 //Guides
@@ -195,66 +199,72 @@
 struct OperatorToolPrefs
 {
 	/* Magnifier Tool */
-	int magMin;
-	int magMax;
-	int magStep;
+	int magMin; //! Magnification minimum
+	int magMax; //! Magnification maximum
+	int magStep; //! Default step between magnification levels
 	/* Item Duplicate Offset */
 	double dispX;
 	double dispY;
 	/* Rotation Tool constrain value */
-	double constrain;
+	double constrain; //! Angle to constrain rotation to when constraining is active
 };
 
 struct HyphenatorPrefs
 {
-	int MinWordLen;
-	int HyCount;
-	QString Language;
-	QHash<QString, QString> specialWords;
-	QSet<QString> ignoredWords;
+	int MinWordLen; //! Minimum word length to hyphenate
+	int HyCount; //! Maximum number of consecutive rows to hyphenate
+	QString Language; //! Language to use for hyphenation
+	QHash<QString, QString> specialWords; //! List of special words to hyphenate
+	QSet<QString> ignoredWords; //! List of words the hyphenator ignores
 	bool Automatic;
 	bool AutoCheck;
 };
 
 struct FontPrefs
 {
-	SCFonts AvailFonts;
-	bool askBeforeSubstitute;
+	SCFonts AvailFonts; //! Fonts that Scribus has available to it, or the current document has available to use
+	bool askBeforeSubstitute; //! Request that the user confirms a font substituion or not
+	QMap<QString,QString> GFontSub;
 };
 
 struct PrinterPrefs
 {
-	QString PrinterName;
-	QString PrinterFile;
-	QString PrinterCommand;
-	bool ClipMargin;
+	QString PrinterName; //! Default Printer name (source from CUPS)
+	QString PrinterFile; //! File to print to
+	QString PrinterCommand; //! Special printer command to use
+	bool ClipMargin; //! When printing, clip the print job to the margins
+	bool GCRMode;
 };
 
-struct ColorManagementPrefs
+struct ColorPrefs
 {
+	ColorList DColors;
+	QString DColorSet;
+	QStringList CustomColorSets;
+	CMSData DCMSset;
 };
 
 struct ItemAttrPrefs
 {
-	ObjAttrVector defaultItemAttributes;
+	ObjAttrVector defaultItemAttributes; //! The default item attributes
 };
 
 struct TOCPrefs
 {
-	ToCSetupVector defaultToCSetups;
+	ToCSetupVector defaultToCSetups; //! Default Tables of Contents
 };
 
 struct KeyboardShortcutsPrefs
 {
-	QMap<QString,Keys> KeyActions;
+	QMap<QString,Keys> KeyActions; //! Keyboard Shortcuts lists for the ScrActions
 };
 
 struct ScrapbookPrefs
 {
-	QStringList RecentScrapbooks;
+	QStringList RecentScrapbooks; //! List of recently used scrapbooks
 	int numScrapbookCopies;
-	bool doCopyToScrapbook;
-	bool persistentScrapbook;
+	bool doCopyToScrapbook; //! When copying (copy/paste), also copy to a scrapbook
+	bool persistentScrapbook; //! Keep the scrapbook contents between sessions
 };
 
 struct DisplayPrefs
@@ -304,6 +314,25 @@
 	int paragraphsLI;
 };
 
+struct StoryEditorPrefs
+{
+	QColor STEcolor;
+	QString STEfont;
+};
+
+struct PrintPreviewPrefs
+{
+	bool PrPr_Mode;
+	bool PrPr_AntiAliasing;
+	bool PrPr_Transparency;
+	bool PrPr_C;
+	bool PrPr_M;
+	bool PrPr_Y;
+	bool PrPr_K;
+	bool PrPr_InkCoverage;
+	int PrPr_InkThreshold;
+};
+
 struct PluginPrefs
 {
 };
@@ -328,7 +357,7 @@
 	HyphenatorPrefs hyphPrefs;
 	FontPrefs fontPrefs;
 	PrinterPrefs printerPrefs;
-	ColorManagementPrefs colorMgmtPrefs;
+	ColorPrefs colorPrefs;
 	PDFOptions pdfPrefs;
 	ItemAttrPrefs itemAttrPrefs;
 	TOCPrefs tocPrefs;
@@ -341,41 +370,18 @@
 	ShortWordPrefs shortwordPrefs;
 	ScripterPrefs scripterPrefs;
 	CheckerPrefsList checkerPrefsList;
+	StoryEditorPrefs storyEditorPrefs;
+	PrintPreviewPrefs printPreviewPrefs;
 
-
-	// Remaining to sort out
 	QList<ArrowDesc> arrowStyles;
 	QList<PageSet> pageSets;
-	ColorList DColors;
 	QString curCheckProfile;
-	bool SepalT;
-	bool SepalN;
-	CMSData DCMSset;
-	QMap<QString,QString> GFontSub;
-	bool AutoSave;
-	int AutoSaveTime;
-	QString DColorSet;
-	QStringList CustomColorSets;
-	bool PrPr_Mode;
-	bool Gcr_Mode;
-	bool PrPr_AntiAliasing;
-	bool PrPr_Transparency;
-	bool PrPr_C;
-	bool PrPr_M;
-	bool PrPr_Y;
-	bool PrPr_K;
-	bool PrPr_InkCoverage;
-	int PrPr_InkThreshold;
-	bool GCRMode;
-	QColor STEcolor;
-	QString STEfont;
 
 
-
-
 	//TODO : Remove these no longer used items
 	//! System default QStyle name for current instance, seemingly unused
 	QString ui_SystemTheme;
+	//	bool Gcr_Mode;
 };
 
 #endif
Index: scribus/scfonts.cpp
===================================================================
--- scribus/scfonts.cpp	(revision 13966)
+++ scribus/scfonts.cpp	(revision 13967)
@@ -585,12 +585,12 @@
 	if (!contains(fontname) || !(*this)[fontname].usable())
 	{
 		QString replFont;
-		if ((!prefsManager->appPrefs.GFontSub.contains(fontname)) || (!(*this)[prefsManager->appPrefs.GFontSub[fontname]].usable()))
+		if ((!prefsManager->appPrefs.fontPrefs.GFontSub.contains(fontname)) || (!(*this)[prefsManager->appPrefs.fontPrefs.GFontSub[fontname]].usable()))
 		{
 			replFont = doc ? doc->itemToolPrefs.defFont : prefsManager->appPrefs.itemToolPrefs.defFont;
 		}
 		else
-			replFont = prefsManager->appPrefs.GFontSub[fontname];
+			replFont = prefsManager->appPrefs.fontPrefs.GFontSub[fontname];
 		ScFace repl = (*this)[replFont].mkReplacementFor(fontname, doc ? doc->DocName : QString(""));
 		insert(fontname, repl);
 	}
Index: scribus/colorsetmanager.cpp
===================================================================
--- scribus/colorsetmanager.cpp	(revision 13966)
+++ scribus/colorsetmanager.cpp	(revision 13967)
@@ -34,18 +34,18 @@
 	QFile fiC(pfadC2);
 	if (!fiC.exists())
 	{
-		appPrefs.DColors.insert("White", ScColor(0, 0, 0, 0));
-		appPrefs.DColors.insert("Black", ScColor(0, 0, 0, 255));
+		appPrefs.colorPrefs.DColors.insert("White", ScColor(0, 0, 0, 0));
+		appPrefs.colorPrefs.DColors.insert("Black", ScColor(0, 0, 0, 255));
 		ScColor cc = ScColor(255, 255, 255, 255);
 		cc.setRegistrationColor(true);
-		appPrefs.DColors.insert("Registration", cc);
-		appPrefs.DColors.insert("Blue", ScColor(255, 255, 0, 0));
-		appPrefs.DColors.insert("Cyan", ScColor(255, 0, 0, 0));
-		appPrefs.DColors.insert("Green", ScColor(255, 0, 255, 0));
-		appPrefs.DColors.insert("Red", ScColor(0, 255, 255, 0));
-		appPrefs.DColors.insert("Yellow", ScColor(0, 0, 255, 0));
-		appPrefs.DColors.insert("Magenta", ScColor(0, 255, 0, 0));
-		appPrefs.DColorSet = "Scribus-Small";
+		appPrefs.colorPrefs.DColors.insert("Registration", cc);
+		appPrefs.colorPrefs.DColors.insert("Blue", ScColor(255, 255, 0, 0));
+		appPrefs.colorPrefs.DColors.insert("Cyan", ScColor(255, 0, 0, 0));
+		appPrefs.colorPrefs.DColors.insert("Green", ScColor(255, 0, 255, 0));
+		appPrefs.colorPrefs.DColors.insert("Red", ScColor(0, 255, 255, 0));
+		appPrefs.colorPrefs.DColors.insert("Yellow", ScColor(0, 0, 255, 0));
+		appPrefs.colorPrefs.DColors.insert("Magenta", ScColor(0, 255, 0, 0));
+		appPrefs.colorPrefs.DColorSet = "Scribus-Small";
 	}
 	else
 	{
@@ -83,7 +83,7 @@
 							lf.setRegistrationColor(static_cast<bool>(pg.attribute("Register").toInt()));
 						else
 							lf.setRegistrationColor(false);
-						appPrefs.DColors.insert(pg.attribute("NAME"), lf);
+						appPrefs.colorPrefs.DColors.insert(pg.attribute("NAME"), lf);
 					}
 					PAGE=PAGE.nextSibling();
 				}
@@ -100,12 +100,12 @@
 					CoE >> Cname;
 					ScColor tmp;
 					tmp.setColorRGB(Rval, Gval, Bval);
-					appPrefs.DColors.insert(Cname, tmp);
+					appPrefs.colorPrefs.DColors.insert(Cname, tmp);
 				}
 			}
 			fiC.close();
 		}
-		appPrefs.DColorSet = "Scribus Basic";
+		appPrefs.colorPrefs.DColorSet = "Scribus Basic";
 	}
 }
 
Index: scribus/ui/tabdocument.cpp
===================================================================
--- scribus/ui/tabdocument.cpp	(revision 13966)
+++ scribus/ui/tabdocument.cpp	(revision 13967)
@@ -233,8 +233,8 @@
 	marginGroup->setPageSize(prefsPageSizeName);
 	marginGroup->setNewBleeds(prefsData->docSetupPrefs.bleeds);
 	marginGroup->setMarginPreset(prefsData->docSetupPrefs.marginPreset);
-	GroupAS->setChecked( prefsData->AutoSave );
-	ASTime->setValue(prefsData->AutoSaveTime / 1000 / 60);
+	GroupAS->setChecked( prefsData->docSetupPrefs.AutoSave );
+	ASTime->setValue(prefsData->docSetupPrefs.AutoSaveTime / 1000 / 60);
 	connect(pageWidth, SIGNAL(valueChanged(double)), this, SLOT(setPageWidth(double)));
 	connect(pageHeight, SIGNAL(valueChanged(double)), this, SLOT(setPageHeight(double)));
 	connect(pageOrientationComboBox, SIGNAL(activated(int)), this, SLOT(setOrien(int)));
Index: scribus/ui/prefs.cpp
===================================================================
--- scribus/ui/prefs.cpp	(revision 13966)
+++ scribus/ui/prefs.cpp	(revision 13967)
@@ -101,7 +101,7 @@
 
 	if (ScCore->haveCMS())
 	{
-		tabColorManagement = new CMSPrefs(prefsWidgets, &prefsData->DCMSset, &ScCore->InputProfiles, &ScCore->InputProfilesCMYK, &ScCore->PrinterProfiles, &ScCore->MonitorProfiles);
+		tabColorManagement = new CMSPrefs(prefsWidgets, &prefsData->colorPrefs.DCMSset, &ScCore->InputProfiles, &ScCore->InputProfilesCMYK, &ScCore->PrinterProfiles, &ScCore->MonitorProfiles);
 		addItem( tr("Color Management"), loadIcon("blend.png"), tabColorManagement);
 	}
 
@@ -227,7 +227,7 @@
 							0, false);
 
 	if (ScCore->haveCMS())
-		tabColorManagement->restoreDefaults(&prefsData->DCMSset, &ScCore->InputProfiles,
+		tabColorManagement->restoreDefaults(&prefsData->colorPrefs.DCMSset, &ScCore->InputProfiles,
 										 &ScCore->InputProfilesCMYK,
 										 &ScCore->PrinterProfiles, &ScCore->MonitorProfiles);
 	QStringList defaultAttributesList=tabDefaultItemAttributes->getDocAttributesNames();
@@ -548,8 +548,8 @@
 	prefsManager->appPrefs.opToolPrefs.dispX = tabTools->genDispX->value();
 	prefsManager->appPrefs.opToolPrefs.dispY = tabTools->genDispY->value();
 	prefsManager->appPrefs.opToolPrefs.constrain = tabTools->genRot->value();
-	prefsManager->appPrefs.AutoSave = tabDocument->GroupAS->isChecked();
-	prefsManager->appPrefs.AutoSaveTime = tabDocument->ASTime->value() * 60 * 1000;
+	prefsManager->appPrefs.docSetupPrefs.AutoSave = tabDocument->GroupAS->isChecked();
+	prefsManager->appPrefs.docSetupPrefs.AutoSaveTime = tabDocument->ASTime->value() * 60 * 1000;
 	prefsManager->appPrefs.hyphPrefs.MinWordLen = tabHyphenator->getWordLen();
 	prefsManager->appPrefs.hyphPrefs.Language = ScCore->primaryMainWindow()->GetLang(tabHyphenator->getLanguage());
 	prefsManager->appPrefs.hyphPrefs.Automatic = !tabHyphenator->getVerbose();
@@ -562,9 +562,9 @@
 	// not required propably as it's done already in the dialog prefsManager->appPrefs.AvailFonts == get fonts from fontprefs
 	uint a = 0;
 	QMap<QString,QString>::Iterator itfsuend=tabFonts->RList.end();
-	prefsManager->appPrefs.GFontSub.clear();
+	prefsManager->appPrefs.fontPrefs.GFontSub.clear();
 	for (QMap<QString,QString>::Iterator itfsu = tabFonts->RList.begin(); itfsu != itfsuend; ++itfsu)
-		prefsManager->appPrefs.GFontSub[itfsu.key()] = tabFonts->FlagsRepl.at(a++)->currentText();
+		prefsManager->appPrefs.fontPrefs.GFontSub[itfsu.key()] = tabFonts->FlagsRepl.at(a++)->currentText();
 	
 	prefsManager->appPrefs.itemAttrPrefs.defaultItemAttributes = *(tabDefaultItemAttributes->getNewAttributes());
 	prefsManager->appPrefs.tocPrefs.defaultToCSetups = *(tabDefaultTOCIndexPrefs->getNewToCs());
Index: scribus/ui/preview.cpp
===================================================================
--- scribus/ui/preview.cpp	(revision 13966)
+++ scribus/ui/preview.cpp	(revision 13967)
@@ -127,17 +127,17 @@
 	Layout2->setAlignment( Qt::AlignTop );
 	AntiAlias = new QCheckBox(devTitle);
 	AntiAlias->setText( tr("Enable &Antialiasing"));
-	AntiAlias->setChecked( postscriptPreview ? prefsManager->appPrefs.PrPr_AntiAliasing : false);
+	AntiAlias->setChecked( postscriptPreview ? prefsManager->appPrefs.printPreviewPrefs.PrPr_AntiAliasing : false);
 	AntiAlias->setEnabled( postscriptPreview );
 	Layout2->addWidget(AntiAlias);
 	AliasTr = new QCheckBox(devTitle);
 	AliasTr->setText( tr("Display Trans&parency"));
-	AliasTr->setChecked(prefsManager->appPrefs.PrPr_Transparency);
+	AliasTr->setChecked(prefsManager->appPrefs.printPreviewPrefs.PrPr_Transparency);
 	AliasTr->setEnabled( postscriptPreview );
 	Layout2->addWidget(AliasTr);
 	EnableCMYK = new QCheckBox(devTitle);
 	EnableCMYK->setText( tr("&Display CMYK"));
-	EnableCMYK->setChecked( postscriptPreview ? prefsManager->appPrefs.PrPr_Mode : false);
+	EnableCMYK->setChecked( postscriptPreview ? prefsManager->appPrefs.printPreviewPrefs.PrPr_Mode : false);
 	EnableCMYK->setEnabled( postscriptPreview );
 	Layout2->addWidget(EnableCMYK);
 	if (HaveTiffSep)
@@ -166,28 +166,28 @@
 		cp->setFocusPolicy(Qt::NoFocus);
 		connect(cp, SIGNAL(clicked()), this, SLOT(ToggleCMYK_Colour()));
 		Table->setCellWidget(0, 0, cp);
-		cp->setChecked(prefsManager->appPrefs.PrPr_C);
+		cp->setChecked(prefsManager->appPrefs.printPreviewPrefs.PrPr_C);
 		flagsVisible.insert("Cyan", cp);
 		Table->setItem(1, 1, new QTableWidgetItem( tr("Magenta")));
 		cp = new QCheckBox(this);
 		cp->setFocusPolicy(Qt::NoFocus);
 		connect(cp, SIGNAL(clicked()), this, SLOT(ToggleCMYK_Colour()));
 		Table->setCellWidget(1, 0, cp);
-		cp->setChecked(prefsManager->appPrefs.PrPr_M);
+		cp->setChecked(prefsManager->appPrefs.printPreviewPrefs.PrPr_M);
 		flagsVisible.insert("Magenta", cp);
 		Table->setItem(2, 1, new QTableWidgetItem( tr("Yellow")));
 		cp = new QCheckBox(this);
 		cp->setFocusPolicy(Qt::NoFocus);
 		connect(cp, SIGNAL(clicked()), this, SLOT(ToggleCMYK_Colour()));
 		Table->setCellWidget(2, 0, cp);
-		cp->setChecked(prefsManager->appPrefs.PrPr_Y);
+		cp->setChecked(prefsManager->appPrefs.printPreviewPrefs.PrPr_Y);
 		flagsVisible.insert("Yellow", cp);
 		Table->setItem(3, 1, new QTableWidgetItem( tr("Black")));
 		cp = new QCheckBox(this);
 		cp->setFocusPolicy(Qt::NoFocus);
 		connect(cp, SIGNAL(clicked()), this, SLOT(ToggleCMYK_Colour()));
 		Table->setCellWidget(3, 0, cp);
-		cp->setChecked(prefsManager->appPrefs.PrPr_K);
+		cp->setChecked(prefsManager->appPrefs.printPreviewPrefs.PrPr_K);
 		flagsVisible.insert("Black", cp);
 		for (int sp = 0; sp < spots.count(); ++sp)
 		{
@@ -204,7 +204,7 @@
 
 		EnableInkCover = new QCheckBox(devTitle);
 		EnableInkCover->setText( tr("Display Ink Coverage"));
-		EnableInkCover->setChecked(prefsManager->appPrefs.PrPr_InkCoverage);
+		EnableInkCover->setChecked(prefsManager->appPrefs.printPreviewPrefs.PrPr_InkCoverage);
 		EnableInkCover->setEnabled( postscriptPreview );
 		Layout2->addWidget(EnableInkCover);
 		connect(EnableInkCover, SIGNAL(clicked()), this, SLOT(ToggleCMYK_Colour()));
@@ -219,7 +219,7 @@
 		CoverThresholdValue->setMinimum(0);
 		CoverThresholdValue->setSingleStep(10);
 		CoverThresholdValue->setSpecialValueText( tr("None"));
-		CoverThresholdValue->setValue(prefsManager->appPrefs.PrPr_InkThreshold);
+		CoverThresholdValue->setValue(prefsManager->appPrefs.printPreviewPrefs.PrPr_InkThreshold);
 		if ((EnableCMYK->isChecked()) && (EnableInkCover->isChecked()))
 			CoverThresholdValue->setEnabled(true);
 		else
@@ -234,22 +234,22 @@
 	{
 		EnableCMYK_C = new QCheckBox(devTitle);
 		EnableCMYK_C->setText( tr("&C"));
-		EnableCMYK_C->setChecked(postscriptPreview ? prefsManager->appPrefs.PrPr_C : true);
+		EnableCMYK_C->setChecked(postscriptPreview ? prefsManager->appPrefs.printPreviewPrefs.PrPr_C : true);
 		EnableCMYK_C->setEnabled(postscriptPreview);
 		Layout2->addWidget(EnableCMYK_C);
 		EnableCMYK_M = new QCheckBox(devTitle);
 		EnableCMYK_M->setText( tr("&M"));
-		EnableCMYK_M->setChecked(postscriptPreview ? prefsManager->appPrefs.PrPr_M : true);
+		EnableCMYK_M->setChecked(postscriptPreview ? prefsManager->appPrefs.printPreviewPrefs.PrPr_M : true);
 		EnableCMYK_M->setEnabled(postscriptPreview);
 		Layout2->addWidget(EnableCMYK_M);
 		EnableCMYK_Y = new QCheckBox(devTitle);
 		EnableCMYK_Y->setText( tr("&Y"));
-		EnableCMYK_Y->setChecked(postscriptPreview ? prefsManager->appPrefs.PrPr_Y : true);
+		EnableCMYK_Y->setChecked(postscriptPreview ? prefsManager->appPrefs.printPreviewPrefs.PrPr_Y : true);
 		EnableCMYK_Y->setEnabled(postscriptPreview);
 		Layout2->addWidget(EnableCMYK_Y);
 		EnableCMYK_K = new QCheckBox(devTitle);
 		EnableCMYK_K->setText( tr("&K"));
-		EnableCMYK_K->setChecked(postscriptPreview ? prefsManager->appPrefs.PrPr_K : true);
+		EnableCMYK_K->setChecked(postscriptPreview ? prefsManager->appPrefs.printPreviewPrefs.PrPr_K : true);
 		EnableCMYK_K->setEnabled(postscriptPreview);
 		Layout2->addWidget(EnableCMYK_K);
 	}
@@ -338,7 +338,7 @@
 	Anzeige->setWidget(Anz);
 	int w = Anz->width() + tbWidth + 50;
 	resize(qMin(QApplication::desktop()->width()-30,w), 500);
-	if (!PrefsManager::instance()->appPrefs.PrPr_Mode)
+	if (!PrefsManager::instance()->appPrefs.printPreviewPrefs.PrPr_Mode)
 	{
 		if (HaveTiffSep)
 			Table->setEnabled(false);
Index: scribus/ui/tabpdfoptions.cpp
===================================================================
--- scribus/ui/tabpdfoptions.cpp	(revision 13966)
+++ scribus/ui/tabpdfoptions.cpp	(revision 13967)
@@ -1248,7 +1248,7 @@
 		if (mdoc != 0 && exporting)
 			tp = mdoc->CMSSettings.DefaultSolidColorRGBProfile;
 		else
-			tp = PrefsManager::instance()->appPrefs.DCMSset.DefaultSolidColorRGBProfile;
+			tp = PrefsManager::instance()->appPrefs.colorPrefs.DCMSset.DefaultSolidColorRGBProfile;
 	}
 	ProfilesL::Iterator itp;
 	ProfilesL::Iterator itpend=ScCore->InputProfiles.end();
@@ -1270,7 +1270,7 @@
 		if (mdoc != 0 && exporting)
 			tp1 = mdoc->CMSSettings.DefaultSolidColorRGBProfile;
 		else
-			tp1 = PrefsManager::instance()->appPrefs.DCMSset.DefaultSolidColorRGBProfile;
+			tp1 = PrefsManager::instance()->appPrefs.colorPrefs.DCMSset.DefaultSolidColorRGBProfile;
 	}
 	ProfilesL::Iterator itp2;
 	ProfilesL::Iterator itp2end=ScCore->InputProfiles.end();
@@ -1299,7 +1299,7 @@
 		if (mdoc != 0 && exporting)
 			tp3 = mdoc->CMSSettings.DefaultPrinterProfile;
 		else
-			tp3 = PrefsManager::instance()->appPrefs.DCMSset.DefaultPrinterProfile;
+			tp3 = PrefsManager::instance()->appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile;
 	}
 	PrintProfC->clear();
 	for (itp3 = PDFXProfiles.constBegin(); itp3 != PDFXProfiles.constEnd(); ++itp3)
@@ -1670,7 +1670,7 @@
 			if (doc != 0)
 				tp = doc->CMSSettings.DefaultSolidColorRGBProfile;
 			else
-				tp = PrefsManager::instance()->appPrefs.DCMSset.DefaultSolidColorRGBProfile;
+				tp = PrefsManager::instance()->appPrefs.colorPrefs.DCMSset.DefaultSolidColorRGBProfile;
 		}
 		SolidPr->clear();
 		ProfilesL::Iterator itp;
@@ -1692,7 +1692,7 @@
 			if (doc != 0)
 				tp1 = doc->CMSSettings.DefaultSolidColorRGBProfile;
 			else
-				tp1 = PrefsManager::instance()->appPrefs.DCMSset.DefaultSolidColorRGBProfile;
+				tp1 = PrefsManager::instance()->appPrefs.colorPrefs.DCMSset.DefaultSolidColorRGBProfile;
 		}
 		ImageP->clear();
 		ProfilesL::Iterator itp2;
Index: scribus/ui/reformdoc.cpp
===================================================================
--- scribus/ui/reformdoc.cpp	(revision 13966)
+++ scribus/ui/reformdoc.cpp	(revision 13967)
@@ -517,11 +517,11 @@
 // 		it.current().subset(tabFonts->fontFlags[it.currentKey()].FlagSub);
 // 	}
 	uint a = 0;
-	prefsManager->appPrefs.GFontSub.clear();
+	prefsManager->appPrefs.fontPrefs.GFontSub.clear();
 	QMap<QString,QString>::Iterator itfsu;
 	QMap<QString,QString>::Iterator itfsuend=tabFonts->RList.end();
 	for (itfsu = tabFonts->RList.begin(); itfsu != itfsuend; ++itfsu)
-		prefsManager->appPrefs.GFontSub[itfsu.key()] = tabFonts->FlagsRepl.at(a++)->currentText();
+		prefsManager->appPrefs.fontPrefs.GFontSub[itfsu.key()] = tabFonts->FlagsRepl.at(a++)->currentText();
 	QStringList uf = currDoc->UsedFonts.keys();
 	QMap<QString,int>::Iterator it3;
 //	for (it3 = currDoc->UsedFonts.begin(); it3 != currDoc->UsedFonts.end(); ++it3)
Index: scribus/ui/masterpagepalette.cpp
===================================================================
--- scribus/ui/masterpagepalette.cpp	(revision 13966)
+++ scribus/ui/masterpagepalette.cpp	(revision 13967)
@@ -271,7 +271,7 @@
 				{
 					ScriXmlDoc *ss = new ScriXmlDoc();
 					QString buffer = ss->WriteElem(currentDoc, currentView, currentDoc->m_Selection);
-					ss->ReadElemToLayer(buffer, prefsManager->appPrefs.fontPrefs.AvailFonts, currentDoc, destination->xOffset(), destination->yOffset(), false, true, prefsManager->appPrefs.GFontSub, currentView, it->ID);
+					ss->ReadElemToLayer(buffer, prefsManager->appPrefs.fontPrefs.AvailFonts, currentDoc, destination->xOffset(), destination->yOffset(), false, true, prefsManager->appPrefs.fontPrefs.GFontSub, currentView, it->ID);
 					currentDoc->m_Selection->clear();
 					delete ss;
 				}
Index: scribus/ui/storyeditor.cpp
===================================================================
--- scribus/ui/storyeditor.cpp	(revision 13966)
+++ scribus/ui/storyeditor.cpp	(revision 13967)
@@ -1898,7 +1898,7 @@
 
 //	Editor->setPaper(prefsManager->appPrefs.STEcolor);
 	QFont fo;
-	fo.fromString(prefsManager->appPrefs.STEfont);
+	fo.fromString(prefsManager->appPrefs.storyEditorPrefs.STEfont);
 	Editor->setFont(fo);
 	EditorBar->setFrameStyle(Editor->frameStyle());
 	EditorBar->setLineWidth(Editor->lineWidth());
@@ -2175,16 +2175,15 @@
 void StoryEditor::setBackPref()
 {
 	blockUpdate = true;
-	QColor neu = QColor();
-	neu = QColorDialog::getColor(Editor->palette().color(QPalette::Base), this);
-	if (neu.isValid())
+	QColor newColor(QColorDialog::getColor(Editor->palette().color(QPalette::Base), this));
+	if (newColor.isValid())
 	{
 		QPalette pal;
-		pal.setColor(QPalette::Active, QPalette::Base, neu);
-		pal.setColor(QPalette::Inactive, QPalette::Base, neu);
-		pal.setColor(QPalette::Disabled, QPalette::Base, neu);
+		pal.setColor(QPalette::Active, QPalette::Base, newColor);
+		pal.setColor(QPalette::Inactive, QPalette::Base, newColor);
+		pal.setColor(QPalette::Disabled, QPalette::Base, newColor);
 		Editor->setPalette(pal);
-		prefsManager->appPrefs.STEcolor = neu;
+		prefsManager->appPrefs.storyEditorPrefs.STEcolor = newColor;
 	}
 	blockUpdate = false;
 }
@@ -2193,7 +2192,7 @@
 {
 	blockUpdate = true;
 	Editor->setFont( QFontDialog::getFont( 0, Editor->font(), this ) );
-	prefsManager->appPrefs.STEfont = Editor->font().toString();
+	prefsManager->appPrefs.storyEditorPrefs.STEfont = Editor->font().toString();
 	EditorBar->doRepaint();
 	blockUpdate = false;
 }
@@ -2262,16 +2261,9 @@
 	charStyle.setFeatures(Editor->CurrentStyle.featureList());
 	Editor->updateSel(charStyle);
 	Editor->setStyle(s);
-	if ((s & ScStyle_Outline) || (s & ScStyle_Shadowed))
-	{
-		StrokeTools->TxStroke->setEnabled(true);
-		StrokeTools->PM1->setEnabled(true);
-	}
-	else
-	{
-		StrokeTools->TxStroke->setEnabled(false);
-		StrokeTools->PM1->setEnabled(false);
-	}
+	bool setter=((s & ScStyle_Outline) || (s & ScStyle_Shadowed));
+	StrokeTools->TxStroke->setEnabled(setter);
+	StrokeTools->PM1->setEnabled(setter);
 	modifiedText();
 	Editor->setFocus();
 }
@@ -2370,10 +2362,11 @@
 
 void StoryEditor::updateProps(int p, int ch)
 {
-	ColorList::Iterator it;
-	int c = 0;
 	if (Editor->wasMod)
 		return;
+	ColorList::Iterator it;
+	int c = 0;
+
 	if ((p >= static_cast<int>(Editor->StyledText.nrOfParagraphs())) || (Editor->StyledText.length() == 0) || (!firstSet))
 	{
 		int pos = Editor->StyledText.startOfParagraph(p) + ch;
Index: scribus/ui/fontprefs.cpp
===================================================================
--- scribus/ui/fontprefs.cpp	(revision 13966)
+++ scribus/ui/fontprefs.cpp	(revision 13967)
@@ -39,7 +39,7 @@
 
 FontPrefsTab::FontPrefsTab( QWidget* parent, bool Hdoc, QString PPath, ScribusDoc* doc ) : QTabWidget( parent )
 {
-	RList = PrefsManager::instance()->appPrefs.GFontSub;
+	RList = PrefsManager::instance()->appPrefs.fontPrefs.GFontSub;
 	HomeP = PPath;
 	DocAvail = Hdoc;
 	UsedFonts.clear();
@@ -373,7 +373,7 @@
 // 	UsedFonts.sort();
 	FlagsRepl.clear();
 	Table3->clearContents();
-	Table3->setRowCount(PrefsManager::instance()->appPrefs.GFontSub.count());
+	Table3->setRowCount(PrefsManager::instance()->appPrefs.fontPrefs.GFontSub.count());
 	int a = 0;
 	QMap<QString,QString>::Iterator itfsu;
 	for (itfsu = RList.begin(); itfsu != RList.end(); ++itfsu)
Index: scribus/scribus.cpp
===================================================================
--- scribus/scribus.cpp	(revision 13966)
+++ scribus/scribus.cpp	(revision 13967)
@@ -3984,63 +3984,63 @@
 			{
 				cmsWarning = true;
 				missing.append(doc->CMSSettings.DefaultImageRGBProfile);
-				replacement.append(prefsManager->appPrefs.DCMSset.DefaultImageRGBProfile);
-				doc->CMSSettings.DefaultImageRGBProfile = prefsManager->appPrefs.DCMSset.DefaultImageRGBProfile;
+				replacement.append(prefsManager->appPrefs.colorPrefs.DCMSset.DefaultImageRGBProfile);
+				doc->CMSSettings.DefaultImageRGBProfile = prefsManager->appPrefs.colorPrefs.DCMSset.DefaultImageRGBProfile;
 			}
 			if (!ScCore->InputProfilesCMYK.contains(doc->CMSSettings.DefaultImageCMYKProfile))
 			{
 				cmsWarning = true;
 				missing.append(doc->CMSSettings.DefaultImageCMYKProfile);
-				replacement.append(prefsManager->appPrefs.DCMSset.DefaultImageCMYKProfile);
-				doc->CMSSettings.DefaultImageCMYKProfile = prefsManager->appPrefs.DCMSset.DefaultImageCMYKProfile;
+				replacement.append(prefsManager->appPrefs.colorPrefs.DCMSset.DefaultImageCMYKProfile);
+				doc->CMSSettings.DefaultImageCMYKProfile = prefsManager->appPrefs.colorPrefs.DCMSset.DefaultImageCMYKProfile;
 			}
 			if (!ScCore->InputProfiles.contains(doc->CMSSettings.DefaultSolidColorRGBProfile))
 			{
 				cmsWarning = true;
 				missing.append(doc->CMSSettings.DefaultSolidColorRGBProfile);
-				replacement.append(prefsManager->appPrefs.DCMSset.DefaultSolidColorRGBProfile);
-				doc->CMSSettings.DefaultSolidColorRGBProfile = prefsManager->appPrefs.DCMSset.DefaultSolidColorRGBProfile;
+				replacement.append(prefsManager->appPrefs.colorPrefs.DCMSset.DefaultSolidColorRGBProfile);
+				doc->CMSSettings.DefaultSolidColorRGBProfile = prefsManager->appPrefs.colorPrefs.DCMSset.DefaultSolidColorRGBProfile;
 			}
 			if (!ScCore->InputProfilesCMYK.contains(doc->CMSSettings.DefaultSolidColorCMYKProfile))
 			{
 				cmsWarning = true;
 				missing.append(doc->CMSSettings.DefaultSolidColorCMYKProfile);
-				replacement.append(prefsManager->appPrefs.DCMSset.DefaultSolidColorCMYKProfile);
-				doc->CMSSettings.DefaultSolidColorCMYKProfile = prefsManager->appPrefs.DCMSset.DefaultSolidColorCMYKProfile;
+				replacement.append(prefsManager->appPrefs.colorPrefs.DCMSset.DefaultSolidColorCMYKProfile);
+				doc->CMSSettings.DefaultSolidColorCMYKProfile = prefsManager->appPrefs.colorPrefs.DCMSset.DefaultSolidColorCMYKProfile;
 			}
 			if (!ScCore->MonitorProfiles.contains(doc->CMSSettings.DefaultMonitorProfile))
 			{
 				cmsWarning = true;
 				missing.append(doc->CMSSettings.DefaultMonitorProfile);
-				replacement.append(prefsManager->appPrefs.DCMSset.DefaultMonitorProfile);
-				doc->CMSSettings.DefaultMonitorProfile = prefsManager->appPrefs.DCMSset.DefaultMonitorProfile;
+				replacement.append(prefsManager->appPrefs.colorPrefs.DCMSset.DefaultMonitorProfile);
+				doc->CMSSettings.DefaultMonitorProfile = prefsManager->appPrefs.colorPrefs.DCMSset.DefaultMonitorProfile;
 			}
 			if (!ScCore->PrinterProfiles.contains(doc->CMSSettings.DefaultPrinterProfile))
 			{
 				cmsWarning = true;
 				missing.append(doc->CMSSettings.DefaultPrinterProfile);
-				replacement.append(prefsManager->appPrefs.DCMSset.DefaultPrinterProfile);
-				doc->CMSSettings.DefaultPrinterProfile = prefsManager->appPrefs.DCMSset.DefaultPrinterProfile;
+				replacement.append(prefsManager->appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile);
+				doc->CMSSettings.DefaultPrinterProfile = prefsManager->appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile;
 			}
 			if (!ScCore->PrinterProfiles.contains(doc->PDF_Options.PrintProf))
 			{
 				cmsWarning = true;
 				missing.append(doc->PDF_Options.PrintProf);
-				replacement.append(prefsManager->appPrefs.DCMSset.DefaultPrinterProfile);
+				replacement.append(prefsManager->appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile);
 				doc->PDF_Options.PrintProf = doc->CMSSettings.DefaultPrinterProfile;
 			}
 			if (!ScCore->InputProfiles.contains(doc->PDF_Options.ImageProf))
 			{
 				cmsWarning = true;
 				missing.append(doc->PDF_Options.ImageProf);
-				replacement.append(prefsManager->appPrefs.DCMSset.DefaultImageRGBProfile);
+				replacement.append(prefsManager->appPrefs.colorPrefs.DCMSset.DefaultImageRGBProfile);
 				doc->PDF_Options.ImageProf = doc->CMSSettings.DefaultImageRGBProfile;
 			}
 			if (!ScCore->InputProfiles.contains(doc->PDF_Options.SolidProf))
 			{
 				cmsWarning = true;
 				missing.append(doc->PDF_Options.SolidProf);
-				replacement.append(prefsManager->appPrefs.DCMSset.DefaultSolidColorRGBProfile);
+				replacement.append(prefsManager->appPrefs.colorPrefs.DCMSset.DefaultSolidColorRGBProfile);
 				doc->PDF_Options.SolidProf = doc->CMSSettings.DefaultSolidColorRGBProfile;
 			}
 			if (cmsWarning)
@@ -4807,7 +4807,7 @@
 	ColorList usedSpots;
 	doc->getUsedColors(usedSpots, true);
 	QStringList spots = usedSpots.keys();
-	PrintDialog *printer = new PrintDialog(this, doc, doc->Print_Options.filename, doc->Print_Options.printer, PDef.Command, doc->Print_Options.devMode, prefsManager->appPrefs.GCRMode, spots);
+	PrintDialog *printer = new PrintDialog(this, doc, doc->Print_Options.filename, doc->Print_Options.printer, PDef.Command, doc->Print_Options.devMode, prefsManager->appPrefs.printerPrefs.GCRMode, spots);
 	printer->setMinMax(1, doc->Pages->count(), doc->currentPage()->pageNr()+1);
 	printDinUse = true;
 	connect(printer, SIGNAL(doPreview()), this, SLOT(doPrintPreview()));
@@ -5866,8 +5866,8 @@
 {
 	if (!visible)
 	{
-		prefsManager->appPrefs.SepalT = pagePalette->getThumb();
-		prefsManager->appPrefs.SepalN = pagePalette->getNamen();
+		prefsManager->appPrefs.uiPrefs.SepalT = pagePalette->getThumb();
+		prefsManager->appPrefs.uiPrefs.SepalN = pagePalette->getNamen();
 	}
 }
 
@@ -7392,7 +7392,7 @@
 		edc = doc->PageColors;
 	else
 		edc = prefsManager->colorSet();
-	ColorManager* dia = new ColorManager(this, edc, doc, prefsManager->colorSetName(), prefsManager->appPrefs.CustomColorSets);
+	ColorManager* dia = new ColorManager(this, edc, doc, prefsManager->colorSetName(), prefsManager->appPrefs.colorPrefs.CustomColorSets);
 	if (dia->exec())
 	{
 		if (HaveDoc)
@@ -7437,7 +7437,7 @@
 		}
 	}
 	if (!HaveDoc)
-		prefsManager->appPrefs.CustomColorSets = dia->customColSet;
+		prefsManager->appPrefs.colorPrefs.CustomColorSets = dia->customColSet;
 	delete dia;
 }
 
@@ -7743,24 +7743,24 @@
 		connect(dia, SIGNAL(doPrint()), this, SLOT(slotReallyPrint()));
 		dia->exec();
 		PrefsManager *prefsManager=PrefsManager::instance();
-		prefsManager->appPrefs.PrPr_Mode = dia->EnableCMYK->isChecked();
-		prefsManager->appPrefs.PrPr_AntiAliasing = dia->AntiAlias->isChecked();
-		prefsManager->appPrefs.PrPr_Transparency = dia->AliasTr->isChecked();
+		prefsManager->appPrefs.printPreviewPrefs.PrPr_Mode = dia->EnableCMYK->isChecked();
+		prefsManager->appPrefs.printPreviewPrefs.PrPr_AntiAliasing = dia->AntiAlias->isChecked();
+		prefsManager->appPrefs.printPreviewPrefs.PrPr_Transparency = dia->AliasTr->isChecked();
 		if ( !ScCore->haveTIFFSep() || !dia->postscriptPreview )
 		{
-			prefsManager->appPrefs.PrPr_C = dia->EnableCMYK_C->isChecked();
-			prefsManager->appPrefs.PrPr_M = dia->EnableCMYK_M->isChecked();
-			prefsManager->appPrefs.PrPr_Y = dia->EnableCMYK_Y->isChecked();
-			prefsManager->appPrefs.PrPr_K = dia->EnableCMYK_K->isChecked();
+			prefsManager->appPrefs.printPreviewPrefs.PrPr_C = dia->EnableCMYK_C->isChecked();
+			prefsManager->appPrefs.printPreviewPrefs.PrPr_M = dia->EnableCMYK_M->isChecked();
+			prefsManager->appPrefs.printPreviewPrefs.PrPr_Y = dia->EnableCMYK_Y->isChecked();
+			prefsManager->appPrefs.printPreviewPrefs.PrPr_K = dia->EnableCMYK_K->isChecked();
 		}
 		else
 		{
-			prefsManager->appPrefs.PrPr_C = dia->flagsVisible["Cyan"]->isChecked();
-			prefsManager->appPrefs.PrPr_M = dia->flagsVisible["Magenta"]->isChecked();
-			prefsManager->appPrefs.PrPr_Y = dia->flagsVisible["Yellow"]->isChecked();
-			prefsManager->appPrefs.PrPr_K = dia->flagsVisible["Black"]->isChecked();
-			prefsManager->appPrefs.PrPr_InkCoverage = dia->EnableInkCover->isChecked();
-			prefsManager->appPrefs.PrPr_InkThreshold = dia->CoverThresholdValue->value();
+			prefsManager->appPrefs.printPreviewPrefs.PrPr_C = dia->flagsVisible["Cyan"]->isChecked();
+			prefsManager->appPrefs.printPreviewPrefs.PrPr_M = dia->flagsVisible["Magenta"]->isChecked();
+			prefsManager->appPrefs.printPreviewPrefs.PrPr_Y = dia->flagsVisible["Yellow"]->isChecked();
+			prefsManager->appPrefs.printPreviewPrefs.PrPr_K = dia->flagsVisible["Black"]->isChecked();
+			prefsManager->appPrefs.printPreviewPrefs.PrPr_InkCoverage = dia->EnableInkCover->isChecked();
+			prefsManager->appPrefs.printPreviewPrefs.PrPr_InkThreshold = dia->CoverThresholdValue->value();
 		}
 //		prefsManager->appPrefs.Gcr_Mode = dia->EnableGCR->isChecked();
 		disconnect(dia, SIGNAL(doPrint()), this, SLOT(slotReallyPrint()));
@@ -7830,7 +7830,7 @@
 	options.mirrorH = false;
 	options.mirrorV = false;
 	options.useICC = true;
-	options.doGCR = prefsManager->appPrefs.GCRMode;
+	options.doGCR = prefsManager->appPrefs.printerPrefs.GCRMode;
 	options.setDevParam = false;
 	options.doClip = true;
 	options.cropMarks = false;
@@ -8220,7 +8220,7 @@
 		view->requestMode(submodeEndNodeEdit);
 
 	ScriXmlDoc ss;
-	if(ss.ReadElem(xml, prefsManager->appPrefs.fontPrefs.AvailFonts, docc, x, y, art, loca, prefsManager->appPrefs.GFontSub, vie))
+	if(ss.ReadElem(xml, prefsManager->appPrefs.fontPrefs.AvailFonts, docc, x, y, art, loca, prefsManager->appPrefs.fontPrefs.GFontSub, vie))
 	{
 		vie->DrawNew();
 		if (doc == docc)
Index: scribus/plugins/aiimplugin/importai.cpp
===================================================================
--- scribus/plugins/aiimplugin/importai.cpp	(revision 13966)
+++ scribus/plugins/aiimplugin/importai.cpp	(revision 13967)
@@ -1838,7 +1838,7 @@
 				textFont = family;
 			else
 			{
-				if (!PrefsManager::instance()->appPrefs.GFontSub.contains(family))
+				if (!PrefsManager::instance()->appPrefs.fontPrefs.GFontSub.contains(family))
 				{
 					qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 					MissingFont *dia = new MissingFont(0, family, m_Doc);
@@ -1846,10 +1846,10 @@
 					QString tmpf = dia->getReplacementFont();
 					delete dia;
 					qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
-					PrefsManager::instance()->appPrefs.GFontSub[family] = tmpf;
+					PrefsManager::instance()->appPrefs.fontPrefs.GFontSub[family] = tmpf;
 				}
 				else
-					textFont = PrefsManager::instance()->appPrefs.GFontSub[family];
+					textFont = PrefsManager::instance()->appPrefs.fontPrefs.GFontSub[family];
 			}
 			textSize *= 10.0;
 		}
Index: scribus/plugins/fileloader/scribus13format/scribus13format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 13966)
+++ scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 13967)
@@ -3045,7 +3045,7 @@
 	QString tmpf = fStr;
 	if ((!(*m_AvailableFonts).contains(tmpf)) || (!(*m_AvailableFonts)[tmpf].usable()))
 	{
-		if ((!prefsManager->appPrefs.GFontSub.contains(tmpf)) || (!(*m_AvailableFonts)[prefsManager->appPrefs.GFontSub[tmpf]].usable()))
+		if ((!prefsManager->appPrefs.fontPrefs.GFontSub.contains(tmpf)) || (!(*m_AvailableFonts)[prefsManager->appPrefs.fontPrefs.GFontSub[tmpf]].usable()))
 		{
 			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 			MissingFont *dia = new MissingFont(0, tmpf, doc);
@@ -3053,10 +3053,10 @@
 			tmpf = dia->getReplacementFont();
 			delete dia;
 			qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
-			prefsManager->appPrefs.GFontSub[fStr] = tmpf;
+			prefsManager->appPrefs.fontPrefs.GFontSub[fStr] = tmpf;
 		}
 		else
-			tmpf = prefsManager->appPrefs.GFontSub[tmpf];
+			tmpf = prefsManager->appPrefs.fontPrefs.GFontSub[tmpf];
 		ReplacedFonts[fStr] = tmpf;
 	}
 	if (!doc->UsedFonts.contains(tmpf))
Index: scribus/scpreview.cpp
===================================================================
--- scribus/scpreview.cpp	(revision 13966)
+++ scribus/scpreview.cpp	(revision 13967)
@@ -125,7 +125,7 @@
 			tmpf = GetAttr(&pg, "NAME");
 			if ((!prefsManager->appPrefs.fontPrefs.AvailFonts.contains(tmpf)) || (!prefsManager->appPrefs.fontPrefs.AvailFonts[tmpf].usable()))
 			{
-				if ((!prefsManager->appPrefs.GFontSub.contains(tmpf)) || (!prefsManager->appPrefs.fontPrefs.AvailFonts[prefsManager->appPrefs.GFontSub[tmpf]].usable()))
+				if ((!prefsManager->appPrefs.fontPrefs.GFontSub.contains(tmpf)) || (!prefsManager->appPrefs.fontPrefs.AvailFonts[prefsManager->appPrefs.fontPrefs.GFontSub[tmpf]].usable()))
 				{
 					ScCore->showSplash(false);
 					MissingFont *dia = new MissingFont(0, tmpf, 0);
@@ -133,10 +133,10 @@
 					tmpf = dia->getReplacementFont();
 					delete dia;
 					ScCore->showSplash(true);
-					prefsManager->appPrefs.GFontSub[pg.attribute("NAME")] = tmpf;
+					prefsManager->appPrefs.fontPrefs.GFontSub[pg.attribute("NAME")] = tmpf;
 				}
 				else
-					tmpf = prefsManager->appPrefs.GFontSub[tmpf];
+					tmpf = prefsManager->appPrefs.fontPrefs.GFontSub[tmpf];
 			}
 			if (!DoFonts.contains(tmpf))
 			{




More information about the scribus-commit mailing list