Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 2262 → Rev 2263

/branches/Version13x/Scribus/scribus/edit1format.h
82,6 → 82,7
PageItem *previewItem;
//! Reference to the own ScribusDoc (preferences etc.) 12/30/2004 petr vanek
ScribusDoc *parentDoc;
ApplicationPrefs *PrefsData;
 
private slots:
void Verlassen();
/branches/Version13x/Scribus/scribus/prefs.cpp
625,6 → 625,9
AskForSubs = new QCheckBox( tr( "Always ask before fonts are replaced when loading a document" ), Misc, "askforSubs" );
AskForSubs->setChecked(prefsData->askBeforeSubstituite);
MiscLayout->addWidget( AskForSubs );
stylePreview = new QCheckBox( tr( "Preview of current Paragraph Style visible when editing Styles" ), Misc, "stylePreview" );
stylePreview->setChecked(prefsData->haveStylePreview);
MiscLayout->addWidget( stylePreview );
QSpacerItem* spacer_3m = new QSpacerItem( 0, 1, QSizePolicy::Minimum, QSizePolicy::Expanding );
MiscLayout->addItem( spacer_3m );
addItem( tr("Miscellaneous"), loadIcon("misc.png"), Misc);
/branches/Version13x/Scribus/scribus/scribusXml.cpp
3187,6 → 3187,7
dc.setAttribute("ScratchTop", Vor->ScratchTop);
dc.setAttribute("STECOLOR", Vor->STEcolor.name());
dc.setAttribute("STEFONT", Vor->STEfont);
dc.setAttribute("STYLEPREVIEW", static_cast<int>(Vor->haveStylePreview));
elem.appendChild(dc);
QDomElement dc1=docu.createElement("GRID");
dc1.setAttribute("MINOR",Vor->guidesSettings.minorGrid);
3528,6 → 3529,7
Vorein->guidesSettings.baseShown = static_cast<bool>(QStoInt(dc.attribute("SHOWBASE","1")));
Vorein->guidesSettings.linkShown = static_cast<bool>(QStoInt(dc.attribute("SHOWLINK","0")));
Vorein->guidesSettings.showPic = static_cast<bool>(QStoInt(dc.attribute("SHOWPICT","1")));
Vorein->haveStylePreview = static_cast<bool>(QStoInt(dc.attribute("STYLEPREVIEW","1")));
Vorein->ScratchBottom = QStodouble(dc.attribute("ScratchBottom", "20"));
// FIXME A typo in early 1.3cvs (MAR 05) means we must support loading of
// FIXME 'ScatchLeft' for a while too. This can be removed in a few months.
/branches/Version13x/Scribus/scribus/edit1format.cpp
24,6 → 24,7
setIcon(loadIcon("AppIcon.png"));
AutoVal = au;
DocsEin = dEin;
PrefsData = Prefs;
EditStyleLayout = new QGridLayout( this );
EditStyleLayout->setSpacing( 6 );
EditStyleLayout->setMargin( 10 );
215,7 → 216,7
layoutPreview->setSpacing(6);
layoutPreview->setMargin(0);
previewCaption = new QCheckBox( tr("Preview of the Paragraph Style"), this, "previewCaption" );
previewCaption->setChecked(true);
previewCaption->setChecked(Prefs->haveStylePreview);
layoutPreview->addWidget(previewCaption);
previewText = new QLabel(this, "previewText");
previewText->setMinimumSize(640, 200);
298,6 → 299,7
BelowV->setValue(vor->gapAfter * parentDoc->unitRatio);
AboveV->setValue(vor->gapBefore * parentDoc->unitRatio);
ColorChange();
togglePreview();
}
 
void EditStyle::togglePreview()
313,6 → 315,7
previewText->hide();
previewText->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
}
PrefsData->haveStylePreview = previewCaption->isChecked();
layout()->activate();
resize(minimumSizeHint());
}
/branches/Version13x/Scribus/scribus/prefs.h
169,6 → 169,7
QCheckBox* ClipMarg;
QCheckBox* DoGCR;
QCheckBox* AskForSubs;
QCheckBox* stylePreview;
// plugin manager
QWidget* pluginManagerWidget;
QGroupBox* plugGroupBox;
/branches/Version13x/Scribus/scribus/scribusstructs.h
503,6 → 503,7
double ScratchTop;
double ScratchBottom;
bool askBeforeSubstituite;
bool haveStylePreview;
};
 
struct PrintOptions
/branches/Version13x/Scribus/scribus/scribus.cpp
561,6 → 561,7
Prefs.ScratchTop = 20;
Prefs.ScratchBottom = 20;
Prefs.askBeforeSubstituite = true;
Prefs.haveStylePreview = true;
struct checkerPrefs checkerSettings;
checkerSettings.ignoreErrors = false;
checkerSettings.autoCheck = true;
7905,6 → 7906,7
Prefs.guidesSettings.before = dia->tabGuides->inBackground->isChecked();
Prefs.marginColored = dia->checkUnprintable->isChecked();
Prefs.askBeforeSubstituite = dia->AskForSubs->isChecked();
Prefs.haveStylePreview = dia->stylePreview->isChecked();
if (Prefs.DisScale != dia->DisScale)
{
Prefs.DisScale = dia->DisScale;