r13974 by cbradney - Rename display prefs variables to nice names and comment the variables
scribus-commit
scribus-commit at lists.scribus.net
Tue Sep 8 20:55:33 CEST 2009
Revision: 13974
Author: cbradney
Date: 2009-09-08T18:53:50.014660Z
Commit message: Rename display prefs variables to nice names and comment the variables
Changeset:
M /trunk/Scribus/scribus/ui/tabdisplay.cpp
M /trunk/Scribus/scribus/pageitem_textframe.cpp
M /trunk/Scribus/scribus/prefsmanager.cpp
M /trunk/Scribus/scribus/canvas.cpp
M /trunk/Scribus/scribus/pageitem.cpp
M /trunk/Scribus/scribus/prefsstructs.h
M /trunk/Scribus/scribus/ui/prefs.cpp
M /trunk/Scribus/scribus/sampleitem.cpp
M /trunk/Scribus/scribus/scribusdoc.cpp
M /trunk/Scribus/scribus/scpageoutput.cpp
M /trunk/Scribus/scribus/scribusview.cpp
Diffs:
Index: scribus/scribusdoc.cpp
===================================================================
--- scribus/scribusdoc.cpp (revision 13973)
+++ scribus/scribusdoc.cpp (revision 13974)
@@ -140,8 +140,8 @@
viewCount(0), viewID(0),
SnapGuides(false), GuideLock(false),
scratch(prefsData.displayPrefs.scratch),
- GapHorizontal(prefsData.displayPrefs.GapHorizontal),
- GapVertical(prefsData.displayPrefs.GapVertical),
+ GapHorizontal(prefsData.displayPrefs.pageGapHorizontal),
+ GapVertical(prefsData.displayPrefs.pageGapVertical),
// ScratchLeft(prefsData.ScratchLeft),
// ScratchRight(prefsData.ScratchRight),
// ScratchTop(prefsData.ScratchTop),
@@ -169,7 +169,7 @@
UsedFonts(),
AllFonts(&prefsData.fontPrefs.AvailFonts),
AObjects(),
- papColor(prefsData.displayPrefs.DpapColor),
+ papColor(prefsData.displayPrefs.paperColor),
CurrentSel(-1),
nodeEdit(),
typographicSettings(prefsData.typoPrefs),
@@ -251,8 +251,8 @@
viewCount(0), viewID(0),
SnapGuides(false), GuideLock(false),
scratch(prefsData.displayPrefs.scratch),
- GapHorizontal(prefsData.displayPrefs.GapHorizontal),
- GapVertical(prefsData.displayPrefs.GapVertical),
+ GapHorizontal(prefsData.displayPrefs.pageGapHorizontal),
+ GapVertical(prefsData.displayPrefs.pageGapVertical),
// ScratchLeft(prefsData.ScratchLeft),
// ScratchRight(prefsData.ScratchRight),
// ScratchTop(prefsData.ScratchTop),
@@ -282,7 +282,7 @@
UsedFonts(),
AllFonts(&prefsData.fontPrefs.AvailFonts),
AObjects(),
- papColor(prefsData.displayPrefs.DpapColor),
+ papColor(prefsData.displayPrefs.paperColor),
CurrentSel(-1),
nodeEdit(),
typographicSettings(prefsData.typoPrefs),
Index: scribus/prefsmanager.cpp
===================================================================
--- scribus/prefsmanager.cpp (revision 13973)
+++ scribus/prefsmanager.cpp (revision 13974)
@@ -257,16 +257,16 @@
appPrefs.opToolPrefs.dispX = 10.0;
appPrefs.opToolPrefs.dispY = 10.0;
appPrefs.opToolPrefs.constrain = 15.0;
- appPrefs.displayPrefs.DpapColor = QColor(Qt::white);
+ appPrefs.displayPrefs.paperColor = QColor(Qt::white);
appPrefs.displayPrefs.showPageShadow = true;
- appPrefs.displayPrefs.DFrameColor = QColor(Qt::red);
- appPrefs.displayPrefs.DFrameNormColor = QColor(Qt::black);
- appPrefs.displayPrefs.DFrameGroupColor = QColor(Qt::darkCyan);
- appPrefs.displayPrefs.DFrameLockColor = QColor(Qt::darkRed);
- appPrefs.displayPrefs.DFrameLinkColor = QColor(Qt::red);
- appPrefs.displayPrefs.DFrameAnnotationColor = QColor(Qt::blue);
- appPrefs.displayPrefs.DPageBorderColor = QColor(Qt::red);
- appPrefs.displayPrefs.DControlCharColor = QColor(Qt::darkRed);
+ appPrefs.displayPrefs.frameColor = QColor(Qt::red);
+ appPrefs.displayPrefs.frameNormColor = QColor(Qt::black);
+ appPrefs.displayPrefs.frameGroupColor = QColor(Qt::darkCyan);
+ appPrefs.displayPrefs.frameLockColor = QColor(Qt::darkRed);
+ appPrefs.displayPrefs.frameLinkColor = QColor(Qt::red);
+ appPrefs.displayPrefs.frameAnnotationColor = QColor(Qt::blue);
+ appPrefs.displayPrefs.pageBorderColor = QColor(Qt::red);
+ appPrefs.displayPrefs.controlCharColor = QColor(Qt::darkRed);
appPrefs.itemToolPrefs.dCols = 1;
appPrefs.itemToolPrefs.dGap = 0.0;
appPrefs.itemToolPrefs.dShadeLine = 100;
@@ -330,9 +330,8 @@
int dpi = qApp->desktop()->logicalDpiX();
if ((dpi < 60) || (dpi > 200))
dpi = 72;
- appPrefs.displayPrefs.DisScale = dpi / 72.0;
+ appPrefs.displayPrefs.displayScale = dpi / 72.0;
-// appPrefs.displayPrefs.DisScale = 1.0;
appPrefs.pathPrefs.documents = ScPaths::getUserDocumentDir();
appPrefs.pathPrefs.colorProfiles = "";
appPrefs.pathPrefs.scripts = "";
@@ -379,16 +378,13 @@
appPrefs.displayPrefs.scratch.Right = 100;
appPrefs.displayPrefs.scratch.Top = 20;
appPrefs.displayPrefs.scratch.Bottom = 20;
- appPrefs.displayPrefs.GapHorizontal = 0.0;
- appPrefs.displayPrefs.GapVertical = 40.0;
+ appPrefs.displayPrefs.pageGapHorizontal = 0.0;
+ appPrefs.displayPrefs.pageGapVertical = 40.0;
struct PageSet pageS;
pageS.Name = CommonStrings::pageSet1;
pageS.FirstPage = 0;
pageS.Rows = 1;
pageS.Columns = 1;
-// pageS.GapHorizontal = 0.0;
-// pageS.GapVertical = 0.0;
-// pageS.GapBelow = 40.0;
pageS.pageNames.clear();
appPrefs.pageSets.append(pageS);
pageS.Name = CommonStrings::pageSet2;
@@ -1191,7 +1187,7 @@
double PrefsManager::displayScale() const
{
- return appPrefs.displayPrefs.DisScale;
+ return appPrefs.displayPrefs.displayScale;
}
const QString& PrefsManager::uiLanguage() const
@@ -1260,8 +1256,8 @@
dc.setAttribute("ScratchLeft", appPrefs.displayPrefs.scratch.Left);
dc.setAttribute("ScratchRight", appPrefs.displayPrefs.scratch.Right);
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("GapHorizontal", ScCLocale::toQStringC(appPrefs.displayPrefs.pageGapHorizontal));
+ dc.setAttribute("GapVertical", ScCLocale::toQStringC(appPrefs.displayPrefs.pageGapVertical));
dc.setAttribute("STECOLOR", appPrefs.storyEditorPrefs.STEcolor.name());
dc.setAttribute("STEFONT", appPrefs.storyEditorPrefs.STEfont);
dc.setAttribute("STYLEPREVIEW", static_cast<int>(appPrefs.miscPrefs.haveStylePreview));
@@ -1284,18 +1280,18 @@
elem.appendChild(dc1);
QDomElement dc1a=docu.createElement("PAGE");
dc1a.setAttribute("ShowPageShadow",static_cast<int>(appPrefs.displayPrefs.showPageShadow));
- dc1a.setAttribute("PAGEC",appPrefs.displayPrefs.DpapColor.name());
- dc1a.setAttribute("SELEC",appPrefs.displayPrefs.DFrameColor.name());
- dc1a.setAttribute("DFrameNormColor",appPrefs.displayPrefs.DFrameNormColor.name());
- dc1a.setAttribute("DFrameGroupColor",appPrefs.displayPrefs.DFrameGroupColor.name());
- dc1a.setAttribute("DFrameLockColor",appPrefs.displayPrefs.DFrameLockColor.name());
- dc1a.setAttribute("DFrameLinkColor",appPrefs.displayPrefs.DFrameLinkColor.name());
- dc1a.setAttribute("DFrameAnnotationColor",appPrefs.displayPrefs.DFrameAnnotationColor.name());
- dc1a.setAttribute("DPageBorderColor",appPrefs.displayPrefs.DPageBorderColor.name());
- dc1a.setAttribute("DControlCharColor",appPrefs.displayPrefs.DControlCharColor.name());
+ dc1a.setAttribute("PAGEC",appPrefs.displayPrefs.paperColor.name());
+ dc1a.setAttribute("SELEC",appPrefs.displayPrefs.frameColor.name());
+ dc1a.setAttribute("DFrameNormColor",appPrefs.displayPrefs.frameNormColor.name());
+ dc1a.setAttribute("DFrameGroupColor",appPrefs.displayPrefs.frameGroupColor.name());
+ dc1a.setAttribute("DFrameLockColor",appPrefs.displayPrefs.frameLockColor.name());
+ dc1a.setAttribute("DFrameLinkColor",appPrefs.displayPrefs.frameLinkColor.name());
+ dc1a.setAttribute("DFrameAnnotationColor",appPrefs.displayPrefs.frameAnnotationColor.name());
+ dc1a.setAttribute("DPageBorderColor",appPrefs.displayPrefs.pageBorderColor.name());
+ dc1a.setAttribute("DControlCharColor",appPrefs.displayPrefs.controlCharColor.name());
dc1a.setAttribute("MARGC",appPrefs.guidesPrefs.marginColor.name());
dc1a.setAttribute("RANDF", static_cast<int>(appPrefs.displayPrefs.marginColored));
- dc1a.setAttribute("DScale", ScCLocale::toQStringC(appPrefs.displayPrefs.DisScale));
+ dc1a.setAttribute("DScale", ScCLocale::toQStringC(appPrefs.displayPrefs.displayScale));
elem.appendChild(dc1a);
QDomElement dc2=docu.createElement("FONTS");
dc2.setAttribute("FACE",appPrefs.itemToolPrefs.defFont);
@@ -1819,8 +1815,8 @@
appPrefs.displayPrefs.scratch.Left = ScCLocale::toDoubleC(dc.attribute("ScratchLeft"), 100.0);
appPrefs.displayPrefs.scratch.Right = ScCLocale::toDoubleC(dc.attribute("ScratchRight"), 100.0);
appPrefs.displayPrefs.scratch.Top = ScCLocale::toDoubleC(dc.attribute("ScratchTop"), 20.0);
- appPrefs.displayPrefs.GapHorizontal = ScCLocale::toDoubleC(dc.attribute("GapHorizontal"), 0.0);
- appPrefs.displayPrefs.GapVertical = ScCLocale::toDoubleC(dc.attribute("GapVertical"), 40.0);
+ appPrefs.displayPrefs.pageGapHorizontal = ScCLocale::toDoubleC(dc.attribute("GapHorizontal"), 0.0);
+ appPrefs.displayPrefs.pageGapVertical = ScCLocale::toDoubleC(dc.attribute("GapVertical"), 40.0);
if (dc.hasAttribute("STECOLOR"))
appPrefs.storyEditorPrefs.STEcolor = QColor(dc.attribute("STECOLOR"));
if (dc.hasAttribute("STEFONT"))
@@ -1847,18 +1843,18 @@
if (dc.tagName()=="PAGE")
{
appPrefs.displayPrefs.showPageShadow = static_cast<bool>(dc.attribute("ShowPageShadow", "1").toInt());
- appPrefs.displayPrefs.DpapColor = QColor(dc.attribute("PAGEC"));
- appPrefs.displayPrefs.DFrameColor = QColor(dc.attribute("SELEC","#ff0000"));
- appPrefs.displayPrefs.DFrameNormColor = QColor(dc.attribute("DFrameNormColor","#000000"));
- appPrefs.displayPrefs.DFrameGroupColor = QColor(dc.attribute("DFrameGroupColor","#008080"));
- appPrefs.displayPrefs.DFrameLockColor = QColor(dc.attribute("DFrameLockColor","#800000"));
- appPrefs.displayPrefs.DFrameLinkColor = QColor(dc.attribute("DFrameLinkColor","#ff0000"));
- appPrefs.displayPrefs.DFrameAnnotationColor = QColor(dc.attribute("DFrameAnnotationColor","#0000ff"));
- appPrefs.displayPrefs.DPageBorderColor = QColor(dc.attribute("DPageBorderColor","#ff0000"));
- appPrefs.displayPrefs.DControlCharColor = QColor(dc.attribute("DControlCharColor","#800000"));
+ appPrefs.displayPrefs.paperColor = QColor(dc.attribute("PAGEC"));
+ appPrefs.displayPrefs.frameColor = QColor(dc.attribute("SELEC","#ff0000"));
+ appPrefs.displayPrefs.frameNormColor = QColor(dc.attribute("DFrameNormColor","#000000"));
+ appPrefs.displayPrefs.frameGroupColor = QColor(dc.attribute("DFrameGroupColor","#008080"));
+ appPrefs.displayPrefs.frameLockColor = QColor(dc.attribute("DFrameLockColor","#800000"));
+ appPrefs.displayPrefs.frameLinkColor = QColor(dc.attribute("DFrameLinkColor","#ff0000"));
+ appPrefs.displayPrefs.frameAnnotationColor = QColor(dc.attribute("DFrameAnnotationColor","#0000ff"));
+ appPrefs.displayPrefs.pageBorderColor = QColor(dc.attribute("DPageBorderColor","#ff0000"));
+ appPrefs.displayPrefs.controlCharColor = QColor(dc.attribute("DControlCharColor","#800000"));
appPrefs.guidesPrefs.marginColor = QColor(dc.attribute("MARGC","#0000ff"));
appPrefs.displayPrefs.marginColored = static_cast<bool>(dc.attribute("RANDF", "0").toInt());
- appPrefs.displayPrefs.DisScale = ScCLocale::toDoubleC(dc.attribute("DScale"), appPrefs.displayPrefs.DisScale);
+ appPrefs.displayPrefs.displayScale = ScCLocale::toDoubleC(dc.attribute("DScale"), appPrefs.displayPrefs.displayScale);
}
if (dc.tagName()=="TYPO")
{
@@ -2051,10 +2047,10 @@
PGSN = PGSN.nextSibling();
}
appPrefs.pageSets.append(pageS);
- if ((appPrefs.pageSets.count() == appPrefs.docSetupPrefs.pagePositioning) && ((appPrefs.displayPrefs.GapHorizontal < 0) && (appPrefs.displayPrefs.GapVertical < 0)))
+ if ((appPrefs.pageSets.count() == appPrefs.docSetupPrefs.pagePositioning) && ((appPrefs.displayPrefs.pageGapHorizontal < 0) && (appPrefs.displayPrefs.pageGapVertical < 0)))
{
- appPrefs.displayPrefs.GapHorizontal = ScCLocale::toDoubleC(PgsAttr.attribute("GapHorizontal"), 0.0);
- appPrefs.displayPrefs.GapVertical = ScCLocale::toDoubleC(PgsAttr.attribute("GapBelow"), 40.0);
+ appPrefs.displayPrefs.pageGapHorizontal = ScCLocale::toDoubleC(PgsAttr.attribute("GapHorizontal"), 0.0);
+ appPrefs.displayPrefs.pageGapVertical = ScCLocale::toDoubleC(PgsAttr.attribute("GapBelow"), 40.0);
}
}
PGS = PGS.nextSibling();
Index: scribus/sampleitem.cpp
===================================================================
--- scribus/sampleitem.cpp (revision 13973)
+++ scribus/sampleitem.cpp (revision 13974)
@@ -324,7 +324,7 @@
if (m_Doc->view() != NULL)
{
sca = m_Doc->view()->scale();
- m_Doc->view()->setScale(1.0 * PrefsManager::instance()->appPrefs.displayPrefs.DisScale);
+ m_Doc->view()->setScale(1.0 * PrefsManager::instance()->appPrefs.displayPrefs.displayScale);
}
painter->setZoomFactor(m_Doc->view()->scale());
Index: scribus/canvas.cpp
===================================================================
--- scribus/canvas.cpp (revision 13973)
+++ scribus/canvas.cpp (revision 13974)
@@ -1897,7 +1897,7 @@
page->guides.drawPage(p, m_doc, lineWidth);
if (m_doc->currentPage() == page)
{
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.DPageBorderColor, 2 / m_viewMode.scale, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.pageBorderColor, 2 / m_viewMode.scale, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
p->drawRect(0, 0, pageWidth, pageHeight);
}
p->setAntialiasing(true);
Index: scribus/prefsstructs.h
===================================================================
--- scribus/prefsstructs.h (revision 13973)
+++ scribus/prefsstructs.h (revision 13974)
@@ -269,31 +269,31 @@
struct DisplayPrefs
{
- bool marginColored;
- bool showPageShadow;
- QColor DpapColor;
- QColor DFrameColor;
- QColor DFrameNormColor;
- QColor DFrameGroupColor;
- QColor DFrameLinkColor;
- QColor DFrameLockColor;
- QColor DFrameAnnotationColor;
- QColor DPageBorderColor;
- QColor DControlCharColor;
- bool showToolTips;
- bool showMouseCoordinates;
- MarginStruct scratch;
- double GapHorizontal;
- double GapVertical;
- double DisScale;
+ bool marginColored; //! Indicates if the margin to edge of page area will be colored in some other color or not
+ bool showPageShadow; //! Show a shadow around the pages
+ QColor paperColor; //! Color of paper (onscreen only)
+ QColor frameColor; //! Color of frame border (onscreen only)
+ QColor frameNormColor; //! Color of normal frame border (onscreen only)
+ QColor frameGroupColor; //! Color of border of grouped frames (onscreen only)
+ QColor frameLinkColor; //! Color of frame link indicators (onscreen only)
+ QColor frameLockColor; //! Color of locked frame border (onscreen only)
+ QColor frameAnnotationColor; //! Color of annotation frames border (onscreen only)
+ QColor pageBorderColor; //! Color of page border (onscreen only)
+ QColor controlCharColor; //! Color of control characters in text frames if they are shown (onscreen only)
+ bool showToolTips; //! Show tool tips in the GUI or not.
+ bool showMouseCoordinates; //! Show mouse coordinates when interaction with frames
+ MarginStruct scratch; //! Scratch space distances
+ double pageGapHorizontal; //! Horizontal gap between pages
+ double pageGapVertical; //! Vertical gap between pages
+ double displayScale; //! Display scale, typically used to set the scale of the display to 100% of real values.
};
struct ExternalToolsPrefs
{
- QString gs_exe;
- bool gs_AntiAliasText;
- bool gs_AntiAliasGraphics;
- int gs_Resolution;
+ QString gs_exe; //! Location on the system of the Ghostscript interpreter (gs, gswin32c.exe, etc) incl path
+ bool gs_AntiAliasText; //! Tell Ghostscript to antialias text or not
+ bool gs_AntiAliasGraphics; //! Tell Ghostscript to antialias graphics or not
+ int gs_Resolution; //! Resolution of Ghostscript rendered graphics
QString imageEditorExecutable;
QString extBrowserExecutable;
QString uniconvExecutable;
Index: scribus/scpageoutput.cpp
===================================================================
--- scribus/scpageoutput.cpp (revision 13973)
+++ scribus/scpageoutput.cpp (revision 13974)
@@ -562,7 +562,7 @@
painter->setupPolygon(&gly, true);
if (glyph == 0)
{
- ScColorShade tmp(PrefsManager::instance()->appPrefs.displayPrefs.DControlCharColor, 100);
+ ScColorShade tmp(PrefsManager::instance()->appPrefs.displayPrefs.controlCharColor, 100);
painter->setPen(tmp, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
painter->setLineWidth(style.fontSize() * glyphs.scaleV * style.outlineWidth() * 2 / 10000.0);
painter->strokePath();
Index: scribus/pageitem.cpp
===================================================================
--- scribus/pageitem.cpp (revision 13973)
+++ scribus/pageitem.cpp (revision 13974)
@@ -1209,13 +1209,13 @@
{
if ((Frame) && (m_Doc->guidesSettings.framesShown) && ((itemType() == ImageFrame) || (itemType() == LatexFrame) || (itemType() == OSGFrame) || (itemType() == PathText)))
{
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.DFrameNormColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.frameNormColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
if ((isBookmark) || (m_isAnnotation))
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.DFrameAnnotationColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.frameAnnotationColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
if ((BackBox != 0) || (NextBox != 0))
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.DFrameLinkColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.frameLinkColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
if (m_Locked)
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.DFrameLockColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.frameLockColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
p->setFillMode(0);
if (itemType()==PathText)
{
@@ -1449,9 +1449,9 @@
{
//Locked line colour selection
if (m_Locked)
- p->setPen(QPen(PrefsManager::instance()->appPrefs.displayPrefs.DFrameLockColor, 1.0 / sc, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
+ p->setPen(QPen(PrefsManager::instance()->appPrefs.displayPrefs.frameLockColor, 1.0 / sc, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
else
- p->setPen(QPen(PrefsManager::instance()->appPrefs.displayPrefs.DFrameColor, 1.0 / sc, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
+ p->setPen(QPen(PrefsManager::instance()->appPrefs.displayPrefs.frameColor, 1.0 / sc, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
p->setBrush(Qt::NoBrush);
double lw2 = 1.0 / sc;
double lw = 1.0 / sc;
@@ -1479,8 +1479,8 @@
}
else
p->drawRect(QRectF(0, 0, Width, Height));
-// p->setPen(QPen(PrefsManager::instance()->appPrefs.DFrameColor, 1.0 / sc, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
- p->setBrush(PrefsManager::instance()->appPrefs.displayPrefs.DFrameColor);
+// p->setPen(QPen(PrefsManager::instance()->appPrefs.drameColor, 1.0 / sc, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
+ p->setBrush(PrefsManager::instance()->appPrefs.displayPrefs.frameColor);
p->setPen(Qt::NoPen);
if ((!m_Locked) && (!m_SizeLocked))
{
@@ -1510,14 +1510,14 @@
}
else
{
- p->setPen(QPen(PrefsManager::instance()->appPrefs.displayPrefs.DFrameGroupColor, 1.0 / sc, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
+ p->setPen(QPen(PrefsManager::instance()->appPrefs.displayPrefs.frameGroupColor, 1.0 / sc, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
p->setBrush(Qt::NoBrush);
p->drawRect(QRectF(0.0, 0.0, Width, Height));
if (m_Doc->m_Selection->count() == 1)
{
p->setPen(Qt::NoPen);
-// p->setPen(QPen(PrefsManager::instance()->appPrefs.DFrameGroupColor, 1.0 / sc, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
- p->setBrush(PrefsManager::instance()->appPrefs.displayPrefs.DFrameGroupColor);
+// p->setPen(QPen(PrefsManager::instance()->appPrefs.frameGroupColor, 1.0 / sc, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
+ p->setBrush(PrefsManager::instance()->appPrefs.displayPrefs.frameGroupColor);
p->drawRect(QRectF(0.0, 0.0, handleSize, handleSize));
p->drawRect(QRectF(Width - handleSize, Height - handleSize, handleSize, handleSize));
p->drawRect(QRectF(Width - handleSize, 0.0, handleSize, handleSize));
@@ -1915,7 +1915,7 @@
p->setupPolygon(&points, true);
QColor oldBrush = p->brush();
p->setBrush( (style.effects() & ScStyle_SuppressSpace) ? Qt::green
- : PrefsManager::instance()->appPrefs.displayPrefs.DControlCharColor);
+ : PrefsManager::instance()->appPrefs.displayPrefs.controlCharColor);
if (stroke)
{
QColor tmp = p->pen();
@@ -2037,7 +2037,7 @@
}
if (glyph == 0)
{
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.DControlCharColor, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.controlCharColor, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
p->setLineWidth(style.fontSize() * glyphs.scaleV * style.outlineWidth() * 2 / 10000.0);
p->strokePath();
}
Index: scribus/scribusview.cpp
===================================================================
--- scribus/scribusview.cpp (revision 13973)
+++ scribus/scribusview.cpp (revision 13974)
@@ -2704,7 +2704,7 @@
int w = qRound(qMin(visibleWidth() / m_canvas->scale(), Doc->currentPage()->width()));
int h = qRound(qMin(visibleHeight() / m_canvas->scale(), Doc->currentPage()->height()));
rememberOldZoomLocation(w / 2 + x,h / 2 + y);
- zoom(oldX, oldY, zoomSpinBox->value() / 100.0 * Prefs->displayPrefs.DisScale, false);
+ zoom(oldX, oldY, zoomSpinBox->value() / 100.0 * Prefs->displayPrefs.displayScale, false);
setFocus();
}
@@ -2715,7 +2715,7 @@
int w = qRound(qMin(visibleWidth() / m_canvas->scale(), Doc->maxCanvasCoordinate.x() - Doc->minCanvasCoordinate.x()));
int h = qRound(qMin(visibleHeight() / m_canvas->scale(), Doc->maxCanvasCoordinate.y() - Doc->minCanvasCoordinate.y()));
rememberOldZoomLocation(w / 2 + x,h / 2 + y);
- zoom(oldX, oldY, Prefs->displayPrefs.DisScale, false);
+ zoom(oldX, oldY, Prefs->displayPrefs.displayScale, false);
}
void ScribusView::slotZoomIn(int mx,int my)
@@ -2808,7 +2808,7 @@
setRulerPos(contentsX(), contentsY());
setMenTxt(Doc->currentPage()->pageNr());
disconnect(zoomSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setZoom()));
- zoomSpinBox->setValue(m_canvas->scale()/Prefs->displayPrefs.DisScale*100);
+ zoomSpinBox->setValue(m_canvas->scale()/Prefs->displayPrefs.displayScale*100);
connect(zoomSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setZoom()));
}
@@ -4772,20 +4772,20 @@
void ScribusView::setScale(const double newScale)
{
double Scale=newScale;
- double v=Doc->opToolPrefs.magMin*Prefs->displayPrefs.DisScale/100.0;
+ double v=Doc->opToolPrefs.magMin*Prefs->displayPrefs.displayScale/100.0;
if (Scale < v)
Scale=v;
- double v2=Doc->opToolPrefs.magMax*Prefs->displayPrefs.DisScale/100.0;
+ double v2=Doc->opToolPrefs.magMax*Prefs->displayPrefs.displayScale/100.0;
if (Scale > v2)
Scale=v2;
- double v3=32*Prefs->displayPrefs.DisScale;
+ double v3=32*Prefs->displayPrefs.displayScale;
if (Scale > v3)
Scale=v3;
m_canvas->setScale(Scale);
zoomSpinBox->blockSignals(true);
- zoomSpinBox->setValue(m_canvas->scale()/Prefs->displayPrefs.DisScale*100);
+ zoomSpinBox->setValue(m_canvas->scale()/Prefs->displayPrefs.displayScale*100);
zoomSpinBox->blockSignals(false);
unitChange();
@@ -4979,7 +4979,7 @@
{
QPoint canvasPoint;
QPoint globalPoint = m_canvas->canvasToGlobal(QPointF(canvasX, canvasY));
- double newScale = (scale > 32*Prefs->displayPrefs.DisScale) ? (32*Prefs->displayPrefs.DisScale) : scale;
+ double newScale = (scale > 32*Prefs->displayPrefs.displayScale) ? (32*Prefs->displayPrefs.displayScale) : scale;
undoManager->setUndoEnabled(false);
updatesOn(false);
setScale(newScale);
Index: scribus/pageitem_textframe.cpp
===================================================================
--- scribus/pageitem_textframe.cpp (revision 13973)
+++ scribus/pageitem_textframe.cpp (revision 13974)
@@ -2662,13 +2662,13 @@
double scpInv = 1.0 / (qMax(view->scale(), 1.0) * aestheticFactor);
if ((Frame) && (m_Doc->guidesSettings.framesShown))
{
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.DFrameNormColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.frameNormColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
if ((isBookmark) || (m_isAnnotation))
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.DFrameAnnotationColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.frameAnnotationColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
if ((BackBox != 0) || (NextBox != 0))
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.DFrameLinkColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.frameLinkColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
if (m_Locked)
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.DFrameLockColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.frameLockColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
p->setFillMode(0);
// Ugly Hack to fix rendering problems with cairo >=1.5.10 && <1.8.0 follows
@@ -3399,13 +3399,13 @@
double ly1= ofy;
double lx2= ofx+ofwh;
double ly2= ofy+ofwh;
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.DFrameNormColor, 0.5 / view->scale(), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.frameNormColor, 0.5 / view->scale(), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
if ((isBookmark) || (m_isAnnotation))
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.DFrameAnnotationColor, 0.5 / view->scale(), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.frameAnnotationColor, 0.5 / view->scale(), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
if ((BackBox != 0) || (NextBox != 0))
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.DFrameLinkColor, 0.5 / view->scale(), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.frameLinkColor, 0.5 / view->scale(), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
if (m_Locked)
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.DFrameLockColor, 0.5 / view->scale(), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.frameLockColor, 0.5 / view->scale(), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
if (m_Doc->m_Selection->containsItem(this))
p->setPen(Qt::red, 0.5 / view->scale(), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
p->setPenOpacity(1.0);
Index: scribus/ui/prefs.cpp
===================================================================
--- scribus/ui/prefs.cpp (revision 13973)
+++ scribus/ui/prefs.cpp (revision 13974)
@@ -202,8 +202,8 @@
tabDocument->restoreDefaults(prefsData);
tabPrinter->restoreDefaults(prefsData);
tabView->restoreDefaults(prefsData, prefsData->guidesPrefs, prefsData->pageSets, prefsData->docSetupPrefs.pagePositioning, prefsData->displayPrefs.scratch);
- tabView->gapHorizontal->setValue(prefsData->displayPrefs.GapHorizontal); // * unitRatio);
- tabView->gapVertical->setValue(prefsData->displayPrefs.GapVertical); // * unitRatio);
+ tabView->gapHorizontal->setValue(prefsData->displayPrefs.pageGapHorizontal);
+ tabView->gapVertical->setValue(prefsData->displayPrefs.pageGapVertical);
tabScrapbook->restoreDefaults(prefsData);
tabHyphenator->restoreDefaults(prefsData);
tabGuides->restoreDefaults(&prefsData->guidesPrefs, &prefsData->typoPrefs, docUnitIndex);
@@ -358,8 +358,8 @@
prefsManager->appPrefs.uiPrefs.style = tabGeneral->GUICombo->currentText();
prefsManager->appPrefs.uiPrefs.useSmallWidgets = tabGeneral->useSmallWidgetsCheck->isChecked();
- prefsManager->appPrefs.displayPrefs.GapHorizontal = tabView->gapHorizontal->value() / prefsUnitRatio;
- prefsManager->appPrefs.displayPrefs.GapVertical = tabView->gapVertical->value() / prefsUnitRatio;
+ prefsManager->appPrefs.displayPrefs.pageGapHorizontal = tabView->gapHorizontal->value() / prefsUnitRatio;
+ prefsManager->appPrefs.displayPrefs.pageGapVertical = tabView->gapVertical->value() / prefsUnitRatio;
prefsManager->appPrefs.displayPrefs.marginColored = tabView->checkUnprintable->isChecked();
prefsManager->appPrefs.displayPrefs.scratch.Bottom = tabView->bottomScratch->value() / prefsUnitRatio;
prefsManager->appPrefs.displayPrefs.scratch.Left = tabView->leftScratch->value() / prefsUnitRatio;
@@ -367,15 +367,15 @@
prefsManager->appPrefs.displayPrefs.scratch.Top = tabView->topScratch->value() / prefsUnitRatio;
// GUI colors
prefsManager->appPrefs.displayPrefs.showPageShadow = tabView->checkShowPageShadow->isChecked();
- prefsManager->appPrefs.displayPrefs.DpapColor = tabView->colorPaper;
- prefsManager->appPrefs.displayPrefs.DFrameColor = tabView->colorFrame;
- prefsManager->appPrefs.displayPrefs.DFrameNormColor = tabView->colorFrameNorm;
- prefsManager->appPrefs.displayPrefs.DFrameGroupColor = tabView->colorFrameGroup;
- prefsManager->appPrefs.displayPrefs.DFrameLockColor = tabView->colorFrameLocked;
- prefsManager->appPrefs.displayPrefs.DFrameLinkColor = tabView->colorFrameLinked;
- prefsManager->appPrefs.displayPrefs.DFrameAnnotationColor = tabView->colorFrameAnnotation;
- prefsManager->appPrefs.displayPrefs.DPageBorderColor = tabView->colorPageBorder;
- prefsManager->appPrefs.displayPrefs.DControlCharColor = tabView->colorControlChars;
+ prefsManager->appPrefs.displayPrefs.paperColor = tabView->colorPaper;
+ prefsManager->appPrefs.displayPrefs.frameColor = tabView->colorFrame;
+ prefsManager->appPrefs.displayPrefs.frameNormColor = tabView->colorFrameNorm;
+ prefsManager->appPrefs.displayPrefs.frameGroupColor = tabView->colorFrameGroup;
+ prefsManager->appPrefs.displayPrefs.frameLockColor = tabView->colorFrameLocked;
+ prefsManager->appPrefs.displayPrefs.frameLinkColor = tabView->colorFrameLinked;
+ prefsManager->appPrefs.displayPrefs.frameAnnotationColor = tabView->colorFrameAnnotation;
+ prefsManager->appPrefs.displayPrefs.pageBorderColor = tabView->colorPageBorder;
+ prefsManager->appPrefs.displayPrefs.controlCharColor = tabView->colorControlChars;
// Guides
prefsManager->appPrefs.guidesPrefs.framesShown = tabView->checkFrame->isChecked();
@@ -385,7 +385,7 @@
prefsManager->appPrefs.guidesPrefs.showPic = tabView->checkPictures->isChecked();
prefsManager->appPrefs.guidesPrefs.linkShown = tabView->checkLink->isChecked();
prefsManager->appPrefs.guidesPrefs.showControls = tabView->checkControl->isChecked();
- prefsManager->appPrefs.displayPrefs.DisScale = tabView->DisScale;
+ prefsManager->appPrefs.displayPrefs.displayScale = tabView->DisScale;
prefsManager->appPrefs.scrapbookPrefs.doCopyToScrapbook = tabScrapbook->useScrapBookasExtension->isChecked();
prefsManager->appPrefs.scrapbookPrefs.persistentScrapbook = tabScrapbook->persistentScrapbook->isChecked();
Index: scribus/ui/tabdisplay.cpp
===================================================================
--- scribus/ui/tabdisplay.cpp (revision 13973)
+++ scribus/ui/tabdisplay.cpp (revision 13974)
@@ -65,44 +65,44 @@
docUnitIndex = prefsData->docSetupPrefs.docUnitIndex;
double unitRatio = unitGetRatioFromIndex(docUnitIndex);
- DisScale = prefsData->displayPrefs.DisScale;
+ DisScale = prefsData->displayPrefs.displayScale;
int decimals = unitGetPrecisionFromIndex(docUnitIndex);
QString unitSuffix = unitGetSuffixFromIndex(docUnitIndex);
QPixmap pm(54, 14);
- pm.fill(prefsData->displayPrefs.DpapColor);
- colorPaper = prefsData->displayPrefs.DpapColor;
+ pm.fill(prefsData->displayPrefs.paperColor);
+ colorPaper = prefsData->displayPrefs.paperColor;
backColor->setIcon(pm);
backColor->setText( QString::null );
- pm.fill(prefsData->displayPrefs.DFrameColor);
- colorFrame = prefsData->displayPrefs.DFrameColor;
+ pm.fill(prefsData->displayPrefs.frameColor);
+ colorFrame = prefsData->displayPrefs.frameColor;
buttonFrameSelected->setText( QString::null );
buttonFrameSelected->setIcon(pm);
- pm.fill(prefsData->displayPrefs.DFrameNormColor);
- colorFrameNorm = prefsData->displayPrefs.DFrameNormColor;
+ pm.fill(prefsData->displayPrefs.frameNormColor);
+ colorFrameNorm = prefsData->displayPrefs.frameNormColor;
buttonFrameNormal->setText( QString::null );
buttonFrameNormal->setIcon(pm);
- pm.fill(prefsData->displayPrefs.DFrameGroupColor);
- colorFrameGroup = prefsData->displayPrefs.DFrameGroupColor;
+ pm.fill(prefsData->displayPrefs.frameGroupColor);
+ colorFrameGroup = prefsData->displayPrefs.frameGroupColor;
buttonFrameGrouped->setText( QString::null );
buttonFrameGrouped->setIcon(pm);
- pm.fill(prefsData->displayPrefs.DFrameLinkColor);
- colorFrameLinked = prefsData->displayPrefs.DFrameLinkColor;
+ pm.fill(prefsData->displayPrefs.frameLinkColor);
+ colorFrameLinked = prefsData->displayPrefs.frameLinkColor;
buttonFrameLinked->setText( QString::null );
buttonFrameLinked->setIcon(pm);
- pm.fill(prefsData->displayPrefs.DFrameLockColor);
- colorFrameLocked = prefsData->displayPrefs.DFrameLockColor;
+ pm.fill(prefsData->displayPrefs.frameLockColor);
+ colorFrameLocked = prefsData->displayPrefs.frameLockColor;
buttonFrameLocked->setText( QString::null );
buttonFrameLocked->setIcon(pm);
- pm.fill(prefsData->displayPrefs.DFrameAnnotationColor);
- colorFrameAnnotation = prefsData->displayPrefs.DFrameAnnotationColor;
+ pm.fill(prefsData->displayPrefs.frameAnnotationColor);
+ colorFrameAnnotation = prefsData->displayPrefs.frameAnnotationColor;
buttonFrameAnnotation->setText( QString::null );
buttonFrameAnnotation->setIcon(pm);
- pm.fill(prefsData->displayPrefs.DPageBorderColor);
- colorPageBorder = prefsData->displayPrefs.DPageBorderColor;
+ pm.fill(prefsData->displayPrefs.pageBorderColor);
+ colorPageBorder = prefsData->displayPrefs.pageBorderColor;
buttonSelectedPage->setText( QString::null );
buttonSelectedPage->setIcon(pm);
- pm.fill(prefsData->displayPrefs.DControlCharColor);
- colorControlChars = prefsData->displayPrefs.DControlCharColor;
+ pm.fill(prefsData->displayPrefs.controlCharColor);
+ colorControlChars = prefsData->displayPrefs.controlCharColor;
buttonControlChars->setText( QString::null );
buttonControlChars->setIcon(pm);
checkShowPageShadow->setChecked(prefsData->displayPrefs.showPageShadow);
More information about the scribus-commit
mailing list