Index: scribus/plugins/fileloader/scribus170format/scribus170format.cpp =================================================================== --- scribus/plugins/fileloader/scribus170format/scribus170format.cpp (Revision 26493) +++ scribus/plugins/fileloader/scribus170format/scribus170format.cpp (Arbeitskopie) @@ -2579,10 +2579,14 @@ doc->guidesPrefs().minorGridColor = QColor(attrs.valueAsString("MINORC")); if (attrs.hasAttribute("MAJORC")) doc->guidesPrefs().majorGridColor = QColor(attrs.valueAsString("MAJORC")); - if (attrs.hasAttribute("GuideC")) + if (attrs.hasAttribute("GuideC")) //legacy < 1.7.x doc->guidesPrefs().guideColor = QColor(attrs.valueAsString("GuideC")); - if (attrs.hasAttribute("BaseC")) + if (attrs.hasAttribute("GuidesColor")) + doc->guidesPrefs().guideColor = QColor(attrs.valueAsString("GuidesColor")); + if (attrs.hasAttribute("BaseC")) //legacy < 1.7.x doc->guidesPrefs().baselineGridColor = QColor(attrs.valueAsString("BaseC")); + if (attrs.hasAttribute("BaselineGridColor")) + doc->guidesPrefs().baselineGridColor = QColor(attrs.valueAsString("BaselineGridColor")); if (attrs.hasAttribute("BACKG")) { doc->guidesPrefs().renderStackOrder.clear(); Index: scribus/plugins/fileloader/scribus170format/scribus170format_save.cpp =================================================================== --- scribus/plugins/fileloader/scribus170format/scribus170format_save.cpp (Revision 26493) +++ scribus/plugins/fileloader/scribus170format/scribus170format_save.cpp (Arbeitskopie) @@ -497,8 +497,8 @@ docu.writeAttribute("constrain", m_Doc->opToolPrefs().constrain); docu.writeAttribute("MINORC",m_Doc->guidesPrefs().minorGridColor.name()); docu.writeAttribute("MAJORC",m_Doc->guidesPrefs().majorGridColor.name()); - docu.writeAttribute("GuideC", m_Doc->guidesPrefs().guideColor.name()); - docu.writeAttribute("BaseC", m_Doc->guidesPrefs().baselineGridColor.name()); + docu.writeAttribute("GuidesColor", m_Doc->guidesPrefs().guideColor.name()); + docu.writeAttribute("BaselineGridColor", m_Doc->guidesPrefs().baselineGridColor.name()); QString renderStack; int renderStackCount = m_Doc->guidesPrefs().renderStackOrder.count(); for (int r = 0; r < renderStackCount; r++) Index: scribus/prefsmanager.cpp =================================================================== --- scribus/prefsmanager.cpp (Revision 26493) +++ scribus/prefsmanager.cpp (Arbeitskopie) @@ -2173,12 +2173,18 @@ } appPrefs.guidesPrefs.gridType = dc.attribute("GridType", "0").toInt(); appPrefs.guidesPrefs.gridShown = static_cast(dc.attribute("ShowGrid", "0").toInt()); - if (dc.hasAttribute("GuideC")) - appPrefs.guidesPrefs.guideColor = QColor(dc.attribute("GuideC")); - if (dc.hasAttribute("GuideZ")) + if (dc.hasAttribute("GuideC")) // legacy < 1.7.x + appPrefs.guidesPrefs.guideColor = QColor(dc.attribute("GuideC", "#000080")); + if (dc.hasAttribute("GuidesColor")) + appPrefs.guidesPrefs.guideColor = QColor(dc.attribute("GuidesColor", "#000080")); + if (dc.hasAttribute("GuideZ")) // legacy + appPrefs.guidesPrefs.guideRad = ScCLocale::toDoubleC(dc.attribute("GuideZ"), 10.0); + if (dc.hasAttribute("ObjectToGuideSnapRadius")) appPrefs.guidesPrefs.guideRad = ScCLocale::toDoubleC(dc.attribute("ObjectToGuideSnapRadius"), 10.0); - if (dc.hasAttribute("BaseC")) - appPrefs.guidesPrefs.baselineGridColor = QColor(dc.attribute("BaselineGridColor")); + if (dc.hasAttribute("BaseC")) // legacy < 1.7.x + appPrefs.guidesPrefs.baselineGridColor = QColor(dc.attribute("BaseC", "#c0c0c0")); + if (dc.hasAttribute("BaselineGridColor")) + appPrefs.guidesPrefs.baselineGridColor = QColor(dc.attribute("BaselineGridColor", "#c0c0c0")); appPrefs.guidesPrefs.marginColor = QColor(dc.attribute("MarginColor", "#0000ff")); appPrefs.guidesPrefs.valueBaselineGrid = ScCLocale::toDoubleC(dc.attribute("BaselineGridDistance"), 12.0); appPrefs.guidesPrefs.offsetBaselineGrid = ScCLocale::toDoubleC(dc.attribute("BaselineGridOffset"), 0.0);