r15102 by cbradney - Remove old commented out code now new preferences panes are working
scribus-commit
scribus-commit at lists.scribus.net
Mon May 24 10:20:24 CEST 2010
Revision: 15102
Author: cbradney
Date: 2010-05-24T08:16:18.215703Z
Commit message: Remove old commented out code now new preferences panes are working
Changeset:
M /trunk/Scribus/scribus/scribusdoc.cpp
M /trunk/Scribus/scribus/scribusdoc.h
Diffs:
Index: scribus/scribusdoc.cpp
===================================================================
--- scribus/scribusdoc.cpp (revision 15101)
+++ scribus/scribusdoc.cpp (revision 15102)
@@ -164,7 +164,6 @@
loading(false),
modified(false),
ActiveLayer(0),
- //->Prefs docUnitIndex(appPrefsData.docSetupPrefs.docUnitIndex),
rotMode(0),
automaticTextFrames(0),
m_masterPageMode(false),
@@ -177,25 +176,14 @@
First(1), Last(0),
viewCount(0), viewID(0),
SnapGuides(false), GuideLock(false),
- //scratch(appPrefsData.displayPrefs.scratch),
- //->Prefs GapHorizontal(appPrefsData.displayPrefs.pageGapHorizontal),
- //->Prefs GapVertical(appPrefsData.displayPrefs.pageGapVertical),
-// ScratchLeft(prefsData.ScratchLeft),
-// ScratchRight(prefsData.ScratchRight),
-// ScratchTop(prefsData.ScratchTop),
-// ScratchBottom(prefsData.ScratchBottom),
minCanvasCoordinate(FPoint(0, 0)),
rulerXoffset(0.0), rulerYoffset(0.0),
Pages(0), MasterPages(), DocPages(),
MasterNames(),
Items(0), MasterItems(), DocItems(), FrameItems(),
m_Selection(new Selection(this, true)),
- //->Prefs pageWidth(0), pageHeight(0),
- //->Prefs pageSets(appPrefsData.pageSets),
PageSp(1), PageSpa(0),
currentPageLayout(0),
- //->Prefs PageOri(0),
- //->Prefs m_pageSize(),
FirstPnum(1),
useRaster(false),
PageColors(this, true),
@@ -207,15 +195,8 @@
UsedFonts(),
AllFonts(&appPrefsData.fontPrefs.AvailFonts),
AObjects(),
- //->Prefs papColor(appPrefsData.displayPrefs.paperColor),
CurrentSel(-1),
nodeEdit(),
- //->Prefs typographicSettings(appPrefsData.typoPrefs),
- //->Prefs guidesSettings(appPrefsData.guidesPrefs),
- //->Prefs itemToolPrefs(appPrefsData.itemToolPrefs),
- //->Prefs opToolPrefs(appPrefsData.opToolPrefs),
- //->Prefs checkerProfiles(appPrefsData.verifierPrefs.checkerPrefsList),
- //->Prefs curCheckProfile(appPrefsData.verifierPrefs.curCheckProfile),
LastAuto(0), FirstAuto(0),
DraggedElem(0),
ElemToLink(0),
@@ -223,26 +204,16 @@
docParagraphStyles(),
docCharStyles(),
Layers(),
- //->Prefs marginColored(appPrefsData.displayPrefs.marginColored),
GroupCounter(1),
colorEngine(ScCore->defaultEngine),
JavaScripts(),
TotalItems(0),
- //->Prefs MinWordLen(appPrefsData.hyphPrefs.MinWordLen),
- //->Prefs HyCount(appPrefsData.hyphPrefs.HyCount),
- //->Prefs Language(appPrefsData.hyphPrefs.Language),
- //->Prefs Automatic(appPrefsData.hyphPrefs.Automatic),
- //->Prefs AutoCheck(appPrefsData.hyphPrefs.AutoCheck),
- //->Prefs PDF_Options(appPrefsData.pdfPrefs),
RePos(false),
BookMarks(),
OldBM(false),
hasName(false),
- //->Prefs AutoSave(appPrefsData.docSetupPrefs.AutoSave),
- //->Prefs AutoSaveTime(appPrefsData.docSetupPrefs.AutoSaveTime),
autoSaveTimer(new QTimer(this)),
MLineStyles(),
- //->Prefs arrowStyles(appPrefsData.arrowStyles),
WinHan(0),
DoDrawing(true),
OpenNodes(),
@@ -250,9 +221,6 @@
docLayerErrors(),
docItemErrors(),
masterItemErrors(),
- //->Prefs docItemAttributes(appPrefsData.itemAttrPrefs.defaultItemAttributes),
- //->Prefs docToCSetups(appPrefsData.tocPrefs.defaultToCSetups),
- // sections
symReturn(), symNewLine(), symTab(), symNonBreak(), symNewCol(), symNewFrame(),
docHyphenator(0),
m_itemCreationTransaction(NULL),
@@ -266,7 +234,6 @@
docPrefsData.docSetupPrefs.pageWidth=0;
maxCanvasCoordinate=(FPoint(docPrefsData.displayPrefs.scratch.Left + docPrefsData.displayPrefs.scratch.Right, docPrefsData.displayPrefs.scratch.Top + docPrefsData.displayPrefs.scratch.Bottom)),
init();
- //->Prefs bleeds = appPrefsData.docSetupPrefs.bleeds;
docPrefsData.pdfPrefs.bleeds = docPrefsData.docSetupPrefs.bleeds;
docPrefsData.pdfPrefs.useDocBleeds = true;
Print_Options.firstUse = true;
@@ -281,7 +248,6 @@
loading(false),
modified(false),
ActiveLayer(0),
- //->Prefs docUnitIndex(unitindex),
docUnitRatio(unitGetRatioFromIndex(appPrefsData.docSetupPrefs.docUnitIndex)),
rotMode(0),
automaticTextFrames(pagesSetup.autoTextFrames),
@@ -295,27 +261,14 @@
First(1), Last(0),
viewCount(0), viewID(0),
SnapGuides(false), GuideLock(false),
- //->Prefs scratch(appPrefsData.displayPrefs.scratch),
- //->Prefs GapHorizontal(appPrefsData.displayPrefs.pageGapHorizontal),
- //->Prefs GapVertical(appPrefsData.displayPrefs.pageGapVertical),
-// ScratchLeft(prefsData.ScratchLeft),
-// ScratchRight(prefsData.ScratchRight),
-// ScratchTop(prefsData.ScratchTop),
-// ScratchBottom(prefsData.ScratchBottom),
minCanvasCoordinate(FPoint(0, 0)),
rulerXoffset(0.0), rulerYoffset(0.0),
Pages(0), MasterPages(), DocPages(),
MasterNames(),
Items(0), MasterItems(), DocItems(), FrameItems(),
m_Selection(new Selection(this, true)),
- //->Prefs pageWidth(pagesize.width()), pageHeight(pagesize.height()),
- //->Prefs pageMargins(margins),
- //->Prefs marginPreset(appPrefsData.docSetupPrefs.marginPreset),
- //->Prefs pageSets(appPrefsData.pageSets),
PageSp(pagesSetup.columnCount), PageSpa(pagesSetup.columnDistance),
currentPageLayout(pagesSetup.pageArrangement),
- //->Prefs PageOri(pagesSetup.orientation),
- //->Prefs m_pageSize(pagesize.name()),
FirstPnum(pagesSetup.firstPageNumber),
useRaster(false),
PageColors(this, true),
@@ -327,15 +280,8 @@
UsedFonts(),
AllFonts(&appPrefsData.fontPrefs.AvailFonts),
AObjects(),
- //->Prefs papColor(appPrefsData.displayPrefs.paperColor),
CurrentSel(-1),
nodeEdit(),
- //->Prefs typographicSettings(appPrefsData.typoPrefs),
- //->Prefs guidesSettings(appPrefsData.guidesPrefs),
- //->Prefs itemToolPrefs(appPrefsData.itemToolPrefs),
- //->Prefs opToolPrefs(appPrefsData.opToolPrefs),
- //->Prefs checkerProfiles(appPrefsData.verifierPrefs.checkerPrefsList),
- //->Prefs curCheckProfile(appPrefsData.verifierPrefs.curCheckProfile),
LastAuto(0), FirstAuto(0),
DraggedElem(0),
ElemToLink(0),
@@ -343,26 +289,16 @@
docParagraphStyles(),
docCharStyles(),
Layers(),
- //->Prefs marginColored(appPrefsData.displayPrefs.marginColored),
GroupCounter(1),
colorEngine(ScCore->defaultEngine),
JavaScripts(),
TotalItems(0),
- //->Prefs MinWordLen(appPrefsData.hyphPrefs.MinWordLen),
- //->Prefs HyCount(appPrefsData.hyphPrefs.HyCount),
- //->Prefs Language(appPrefsData.hyphPrefs.Language),
- //->Prefs Automatic(appPrefsData.hyphPrefs.Automatic),
- //->Prefs AutoCheck(appPrefsData.hyphPrefs.AutoCheck),
- //->Prefs PDF_Options(appPrefsData.pdfPrefs),
RePos(false),
BookMarks(),
OldBM(false),
hasName(false),
- //->Prefs AutoSave(appPrefsData.docSetupPrefs.AutoSave),
- //->Prefs AutoSaveTime(appPrefsData.docSetupPrefs.AutoSaveTime),
autoSaveTimer(new QTimer(this)),
MLineStyles(),
- //->Prefs arrowStyles(appPrefsData.arrowStyles),
WinHan(0),
DoDrawing(true),
OpenNodes(),
@@ -370,9 +306,6 @@
docLayerErrors(),
docItemErrors(),
masterItemErrors(),
- //->Prefs docItemAttributes(appPrefsData.itemAttrPrefs.defaultItemAttributes),
- //->Prefs docToCSetups(appPrefsData.tocPrefs.defaultToCSetups),
- // sections
symReturn(), symNewLine(), symTab(), symNonBreak(), symNewCol(), symNewFrame(),
docHyphenator(0),
m_itemCreationTransaction(NULL),
@@ -388,9 +321,7 @@
docPrefsData.docSetupPrefs.margins=margins;
maxCanvasCoordinate=(FPoint(docPrefsData.displayPrefs.scratch.Left + docPrefsData.displayPrefs.scratch.Right, docPrefsData.displayPrefs.scratch.Top + docPrefsData.displayPrefs.scratch.Bottom)),
setPageSetFirstPage(pagesSetup.pageArrangement, pagesSetup.firstPageLocation);
- //->Prefs pageSets[pagesSetup.pageArrangement].FirstPage = pagesSetup.firstPageLocation;
init();
- //->Prefs bleeds = appPrefsData.docSetupPrefs.bleeds;
docPrefsData.pdfPrefs.bleeds = docPrefsData.docSetupPrefs.bleeds;
docPrefsData.pdfPrefs.useDocBleeds = true;
docPrefsData.docSetupPrefs.pageOrientation=pagesSetup.orientation;
@@ -626,7 +557,6 @@
{
docPrefsData.docSetupPrefs.docUnitIndex=unitIndex;
setPageSetFirstPage(fp, firstLeft);
- //->Prefs pageSets[fp].FirstPage = firstLeft;
docPrefsData.docSetupPrefs.pageOrientation = orientation;
docPrefsData.docSetupPrefs.pageSize = defaultPageSize;
FirstPnum = firstPageNumber;
Index: scribus/scribusdoc.h
===================================================================
--- scribus/scribusdoc.h (revision 15101)
+++ scribus/scribusdoc.h (revision 15102)
@@ -189,7 +189,6 @@
void appendToArrowStyles(const struct ArrowDesc& as) { docPrefsData.arrowStyles.append(as); }
const bool marginColored() const { return docPrefsData.displayPrefs.marginColored; }
void setMarginColored(bool b) { docPrefsData.displayPrefs.marginColored=b; }
- //->Prefs QMap<QString, CheckerPrefs> checkerProfiles;
QMap<QString, CheckerPrefs>& checkerProfiles() { return docPrefsData.verifierPrefs.checkerPrefsList; }
void setCheckerProfiles(const QMap<QString, CheckerPrefs>& cl) { docPrefsData.verifierPrefs.checkerPrefsList=cl; }
void set1CheckerProfile(const QString profileName, const struct CheckerPrefs& cs) { docPrefsData.verifierPrefs.checkerPrefsList[profileName] = cs; }
@@ -1013,7 +1012,6 @@
bool loading;
bool modified;
int ActiveLayer;
- //->Prefs int docUnitIndex;
double docUnitRatio;
int rotMode;
bool automaticTextFrames; // Flag for automatic Textframes
@@ -1033,14 +1031,6 @@
int viewID;
bool SnapGuides;
bool GuideLock;
- /** \brief Scratch space around Pages */
- //->Prefs MarginStruct scratch;
- //->Prefs double GapHorizontal;
- //->Prefs double GapVertical;
-// double ScratchLeft;
-// double ScratchRight;
-// double ScratchTop;
-// double ScratchBottom;
/** \brief Minimum and Maximum Points of Document */
FPoint minCanvasCoordinate;
FPoint maxCanvasCoordinate;
@@ -1060,38 +1050,18 @@
QList<PageItem*> DocItems;
QList<PageItem*> FrameItems;
Selection* const m_Selection;
- //->Prefs /** \brief Pagewidth */
- //->Prefs double pageWidth;
- //->Prefs /** \brief Pageheight */
- //->Prefs double pageHeight;
- /* Number of Pages */
- // int pageCount; Disabled CR no longer required
- //->Prefs /** \brief Margins */
- //->Prefs MarginStruct pageMargins;
- //->Prefs int marginPreset;
- //->Prefs QList<PageSet> pageSets;
- //->Prefs MarginStruct bleeds;
-// double BleedTop;
-// double BleedLeft;
-// double BleedRight;
-// double BleedBottom;
/** \brief Number of Columns */
double PageSp;
/** \brief Distance of Columns */
double PageSpa;
/** \brief current Pagelayout */
int currentPageLayout;
- ///** \brief Flag fuer Hoch- oder Querformat 0 = Hochformat */
- //->Prefs int PageOri;
- //->Prefs QString m_pageSize;
/** \brief Erste Seitennummer im Dokument */
int FirstPnum;
/** \brief Flag fuer Rasterbenutzung */
bool useRaster;
/** \brief Im Dokument benutzte Farben */
ColorList PageColors;
- //->Prefs /** \brief InfoStrings fuer das aktuelle Dokument */
- //->Prefs DocumentInformation documentInfo;
int appMode;
int SubMode;
double *ShapeValues;
@@ -1100,19 +1070,9 @@
QMap<QString,int> UsedFonts;
SCFonts * const AllFonts;
QList<AlignObjs> AObjects;
- //->Prefs QColor papColor;
int CurrentSel;
ParagraphStyle currentStyle;
-
NodeEditContext nodeEdit;
-
- //->Prefs TypoPrefs typographicSettings;
- //->Prefs GuidesPrefs guidesSettings;
- //->Prefs ItemToolPrefs itemToolPrefs;
- //->Prefs OperatorToolPrefs opToolPrefs;
-
- //->Prefs QMap<QString, CheckerPrefs> checkerProfiles;
- //->Prefs QString curCheckProfile;
/** \brief Letztes Element fuer AutoTextrahmen */
PageItem *LastAuto;
/** \brief Erstes Element fuer AutoTextrahmen */
@@ -1129,7 +1089,6 @@
ScLayers Layers;
//bool marginColored;
int GroupCounter;
- //->Prefs CMSData CMSSettings;
ScColorMgmtEngine colorEngine;
ScColorProfile DocInputImageRGBProf;
@@ -1157,12 +1116,6 @@
bool HasCMS;
QMap<QString,QString> JavaScripts;
int TotalItems;
- //->Prefs int MinWordLen;
- //->Prefs int HyCount;
- //->Prefs QString Language;
- //->Prefs bool Automatic;
- //->Prefs bool AutoCheck;
- //->Prefs PDFOptions PDF_Options;
PrintOptions Print_Options;
bool RePos;
struct BookMa {
@@ -1180,11 +1133,8 @@
QList<BookMa> BookMarks;
bool OldBM;
bool hasName;
- //->Prefs bool AutoSave;
- //->Prefs int AutoSaveTime;
QTimer * const autoSaveTimer;
QMap<QString,multiLine> MLineStyles;
- //->Prefs QList<ArrowDesc> arrowStyles;
QMap<QString, ScPattern> docPatterns;
QMap<QString, VGradient> docGradients;
QWidget* WinHan;
@@ -1200,10 +1150,6 @@
QMap<int, errorCodes> docLayerErrors;
QMap<int, errorCodes> docItemErrors;
QMap<int, errorCodes> masterItemErrors;
- //Attributes to be applied to frames
- //->Prefs ObjAttrVector docItemAttributes;
- //->Prefs ToCSetupVector docToCSetups;
- //->Prefs DocumentSectionMap sections;
FPointArray symReturn;
FPointArray symNewLine;
FPointArray symTab;
More information about the scribus-commit
mailing list