Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 1186 → Rev 1187

/branches/Version13x/Scribus/scribus/fileloader.cpp
390,7 → 390,7
if (dc.hasAttribute("BaseC"))
doc->guidesSettings.baseColor = QColor(dc.attribute("BaseC"));
doc->marginColored = static_cast<bool>(QStoInt(dc.attribute("RANDF","0")));
doc->Before = static_cast<bool>(QStoInt(dc.attribute("BACKG","1")));
doc->guidesSettings.before = static_cast<bool>(QStoInt(dc.attribute("BACKG","1")));
doc->guidesSettings.guideRad = QStoInt(dc.attribute("GuideRad","10"));
doc->guidesSettings.grabRad = QStoInt(dc.attribute("GRAB","4"));
doc->LastAuto = 0;
/branches/Version13x/Scribus/scribus/tabguides.h
7,6 → 7,8
class QVBoxLayout;
class QHBoxLayout;
class QGroupBox;
class QButtonGroup;
class QRadioButton;
class QLabel;
class MSpinBox;
class QSpinBox;
39,6 → 41,9
QGroupBox* checkGrid;
QGroupBox* groupBox1;
QGroupBox* groupBox2;
QButtonGroup* buttonGroup1;
QRadioButton* inBackground;
QRadioButton* inForeground;
QLabel* textLabel1;
QLabel* textLabel2;
QLabel* textLabel3;
67,6 → 72,7
QGridLayout* checkGridLayout;
QGridLayout* groupBox1Layout;
QGridLayout* groupBox2Layout;
QHBoxLayout* buttonGroup1Layout;
QGridLayout* layout11;
QHBoxLayout* layout2;
QHBoxLayout* layout3;
/branches/Version13x/Scribus/scribus/libprefs/prefs.cpp
864,23 → 864,6
groupScratchLayout->addLayout( Layout4s );
tabViewLayout->addWidget( groupScratch );
 
buttonGroup1 = new QButtonGroup( tabView, "buttonGroup1" );
buttonGroup1->setExclusive( true );
buttonGroup1->setColumnLayout(0, Qt::Vertical );
buttonGroup1->layout()->setSpacing( 5 );
buttonGroup1->layout()->setMargin( 10 );
buttonGroup1->setTitle( tr( "Placing of Guides" ) );
buttonGroup1Layout = new QHBoxLayout( buttonGroup1->layout() );
buttonGroup1Layout->setAlignment( Qt::AlignTop );
inBackground = new QRadioButton( buttonGroup1, "inBackground" );
inBackground->setText( tr( "In the Background" ) );
buttonGroup1Layout->addWidget( inBackground );
inForeground = new QRadioButton( buttonGroup1, "inForeground" );
inForeground->setText( tr( "In the Foreground" ) );
buttonGroup1Layout->addWidget( inForeground );
inBackground->setChecked( prefsData->Before );
inForeground->setChecked( !prefsData->Before );
tabViewLayout->addWidget( buttonGroup1 );
CaliGroup = new QGroupBox( tr( "&Adjust Display Size" ), tabView, "CaliGroup" );
CaliGroup->setColumnLayout(0, Qt::Vertical );
CaliGroup->layout()->setSpacing( 6 );
/branches/Version13x/Scribus/scribus/libprefs/prefs.h
98,9 → 98,6
QLabel* TextLabel5s;
QLabel* Linkss;
QLabel* Rechtss;
QButtonGroup* buttonGroup1;
QRadioButton* inBackground;
QRadioButton* inForeground;
 
QWidget* tabTools;
QButtonGroup* buttonGroupTools;
300,7 → 297,6
QHBoxLayout* pageBackgroundLayout;
QHBoxLayout* groupScratchLayout;
QGridLayout* Layout4s;
QHBoxLayout* buttonGroup1Layout;
QHBoxLayout* tabToolsLayout;
QVBoxLayout* buttonGroupToolsLayout;
QGridLayout* subTabTextLayout;
/branches/Version13x/Scribus/scribus/reformdoc.cpp
288,24 → 288,6
layout4s->addWidget( Rechtss, 1, 2 );
groupScratchLayout->addLayout( layout4s );
tabViewLayout->addWidget( groupScratch );
 
buttonGroup1 = new QButtonGroup( tabView, "buttonGroup1" );
buttonGroup1->setExclusive( true );
buttonGroup1->setColumnLayout(0, Qt::Vertical );
buttonGroup1->layout()->setSpacing( 5 );
buttonGroup1->layout()->setMargin( 10 );
buttonGroup1->setTitle( tr( "Placing of Guides" ) );
buttonGroup1Layout = new QVBoxLayout( buttonGroup1->layout() );
buttonGroup1Layout->setAlignment( Qt::AlignTop );
inBackground = new QRadioButton( buttonGroup1, "inBackground" );
inBackground->setText( tr( "In the Background" ) );
buttonGroup1Layout->addWidget( inBackground );
inForeground = new QRadioButton( buttonGroup1, "inForeground" );
inForeground->setText( tr( "In the Foreground" ) );
buttonGroup1Layout->addWidget( inForeground );
inBackground->setChecked( doc->Before );
inForeground->setChecked( !doc->Before );
tabViewLayout->addWidget( buttonGroup1 );
addItem( tr("Display"), loadIcon("screen.png"), tabView);
 
tabTypo = new TabTypograpy( prefsWidgets, &doc->typographicSetttings, UmReFaktor, ein);
/branches/Version13x/Scribus/scribus/scribusdoc.cpp
55,6 → 55,7
guidesSettings.margColor = prefsData->guidesSettings.margColor;
guidesSettings.guideColor = prefsData->guidesSettings.guideColor;
guidesSettings.baseColor = prefsData->guidesSettings.baseColor;
guidesSettings.before = prefsData->guidesSettings.before;
PageColors.clear();
PageColors.insert("Black", CMYKColor(0, 0, 0, 255));
PageColors.insert("White", CMYKColor(0, 0, 0, 0));
108,7 → 109,6
MagMin = prefsData->MagMin;
MagMax = prefsData->MagMax;
MagStep = prefsData->MagStep;
Before = prefsData->Before;
docUnitIndex = prefsData->docUnitIndex;
marginColored = prefsData->marginColored;
Language = prefsData->Language;
/branches/Version13x/Scribus/scribus/scribusXml.cpp
2574,7 → 2574,7
dc.setAttribute("GuideC", doc->guidesSettings.guideColor.name());
dc.setAttribute("BaseC", doc->guidesSettings.baseColor.name());
dc.setAttribute("GuideZ", doc->guidesSettings.guideRad);
dc.setAttribute("BACKG", static_cast<int>(doc->Before));
dc.setAttribute("BACKG", static_cast<int>(doc->guidesSettings.before));
dc.setAttribute("PAGEC",doc->papColor.name());
dc.setAttribute("MARGC",doc->guidesSettings.margColor.name());
dc.setAttribute("RANDF", static_cast<int>(doc->marginColored));
2849,7 → 2849,7
dc1.setAttribute("GuideC", Vor->guidesSettings.guideColor.name());
dc1.setAttribute("BaseC", Vor->guidesSettings.baseColor.name());
dc1.setAttribute("GuideZ", Vor->guidesSettings.guideRad);
dc1.setAttribute("BACKG", static_cast<int>(Vor->Before));
dc1.setAttribute("BACKG", static_cast<int>(Vor->guidesSettings.before));
dc1.setAttribute("SHOW", static_cast<int>(Vor->guidesSettings.gridShown));
elem.appendChild(dc1);
QDomElement dc1a=docu.createElement("PAGE");
3127,7 → 3127,7
Vorein->guidesSettings.majorGrid = QStodouble(dc.attribute("MAJOR"));
Vorein->guidesSettings.minorColor = QColor(dc.attribute("MINORC"));
Vorein->guidesSettings.majorColor = QColor(dc.attribute("MAJORC"));
Vorein->Before = static_cast<bool>(QStoInt(dc.attribute("BACKG","1")));
Vorein->guidesSettings.before = static_cast<bool>(QStoInt(dc.attribute("BACKG","1")));
Vorein->guidesSettings.gridShown = static_cast<bool>(QStoInt(dc.attribute("SHOW","0")));
if (dc.hasAttribute("GuideC"))
Vorein->guidesSettings.guideColor = QColor(dc.attribute("GuideC"));
/branches/Version13x/Scribus/scribus/scribusstructs.h
376,6 → 376,7
bool baseShown;
bool linkShown;
bool showPic;
bool before;
QColor guideColor;
QColor baseColor;
QColor margColor;
415,7 → 416,6
int ShadePict;
double ScaleX;
double ScaleY;
bool Before;
int docUnitIndex;
windowPrefs mainToolBarSettings;
windowPrefs pdfToolBarSettings;
/branches/Version13x/Scribus/scribus/reformdoc.h
82,10 → 82,7
CMSPrefs* tabColorManagement;
QLabel* textLabel9;
QPushButton* backColor;
QButtonGroup* buttonGroup1;
QButtonGroup* pageBackground;
QRadioButton* inBackground;
QRadioButton* inForeground;
QCheckBox* checkUnprintable;
 
QButtonGroup* buttonGroupTools;
/branches/Version13x/Scribus/scribus/scribusview.cpp
228,13 → 228,13
painter->setPen(black, 1, SolidLine, FlatCap, MiterJoin);
painter->setBrush(Doc->papColor);
painter->drawRect(x, y, w, h);
if (Doc->Before)
if (Doc->guidesSettings.before)
DrawPageMarks(painter, Doc->Pages.at(a), QRect(clipx, clipy, clipw, cliph));
}
DrawMasterItems(painter, Doc->Pages.at(a), QRect(clipx, clipy, clipw, cliph));
}
DrawPageItems(painter, QRect(clipx, clipy, clipw, cliph));
if (!Doc->Before)
if (!Doc->guidesSettings.before)
{
for (uint a = 0; a < Doc->Pages.count(); ++a)
{
261,11 → 261,11
painter->drawRect(x+5, y+5, w, h);
painter->setBrush(Doc->papColor);
painter->drawRect(x, y, w, h);
if (Doc->Before)
if (Doc->guidesSettings.before)
DrawPageMarks(painter, Doc->currentPage, QRect(clipx, clipy, clipw, cliph));
}
DrawPageItems(painter, QRect(clipx, clipy, clipw, cliph));
if ((!Doc->Before) && (QRect(x, y, w+5, h+5).intersects(QRect(clipx, clipy, clipw, cliph))))
if ((!Doc->guidesSettings.before) && (QRect(x, y, w+5, h+5).intersects(QRect(clipx, clipy, clipw, cliph))))
DrawPageMarks(painter, Doc->currentPage, QRect(clipx, clipy, clipw, cliph));
}
if ((SelItem.count() != 0) || (linkedFramesToShow.count() != 0))
/branches/Version13x/Scribus/scribus/scribusdoc.h
207,7 → 207,6
double ScaleY;
bool ScaleType;
bool AspectRatio;
bool Before;
int docUnitIndex;
bool DragP;
bool leaveDrag;
/branches/Version13x/Scribus/scribus/tabguides.cpp
2,6 → 2,8
#include "tabguides.moc"
#include <qlayout.h>
#include <qgroupbox.h>
#include <qbuttongroup.h>
#include <qradiobutton.h>
#include <qlabel.h>
#include <qtooltip.h>
#include <qspinbox.h>
84,6 → 86,23
groupBox2Layout->addWidget( minorSpace, 0, 1 );
checkGridLayout->addWidget( groupBox2, 0, 1 );
tabGuidesLayout->addWidget( checkGrid );
buttonGroup1 = new QButtonGroup( this, "buttonGroup1" );
buttonGroup1->setExclusive( true );
buttonGroup1->setColumnLayout(0, Qt::Vertical );
buttonGroup1->layout()->setSpacing( 5 );
buttonGroup1->layout()->setMargin( 10 );
buttonGroup1->setTitle( tr( "Placing of Guides" ) );
buttonGroup1Layout = new QHBoxLayout( buttonGroup1->layout() );
buttonGroup1Layout->setAlignment( Qt::AlignTop );
inBackground = new QRadioButton( buttonGroup1, "inBackground" );
inBackground->setText( tr( "In the Background" ) );
buttonGroup1Layout->addWidget( inBackground );
inForeground = new QRadioButton( buttonGroup1, "inForeground" );
inForeground->setText( tr( "In the Foreground" ) );
buttonGroup1Layout->addWidget( inForeground );
inBackground->setChecked( prefsData->before );
inForeground->setChecked( !prefsData->before );
tabGuidesLayout->addWidget( buttonGroup1 );
layout11 = new QGridLayout( 0, 1, 1, 0, 5, "layout11");
textLabel8 = new QLabel( this, "textLabel8" );
textLabel8->setText( tr( "Guide Snap Distance:" ) );
/branches/Version13x/Scribus/scribus/scribus.cpp
418,7 → 418,7
Prefs.ShadePict = 100;
Prefs.ScaleX = 1;
Prefs.ScaleY = 1;
Prefs.Before = true;
Prefs.guidesSettings.before = true;
Prefs.docUnitIndex = 0;
Prefs.PolyC = 4;
Prefs.PolyF = 0.5;
2560,7 → 2560,7
doc->FirstPageLeft = dia->firstPage->isChecked();
doc->FirstPnum = dia->pageNumber->value();
doc->resetPage(tpr2, lr2, rr2, br2, fp);
doc->Before = dia->inBackground->isChecked();
doc->guidesSettings.before = dia->tabGuides->inBackground->isChecked();
doc->marginColored = dia->checkUnprintable->isChecked();
doc->papColor = dia->colorPaper;
doc->guidesSettings.marginsShown = dia->tabGuides->checkMargin->isChecked();
7096,7 → 7096,7
Prefs.gs_exe = dia->GSName->text();
Prefs.ClipMargin = dia->ClipMarg->isChecked();
Prefs.GCRMode = dia->DoGCR->isChecked();
Prefs.Before = dia->inBackground->isChecked();
Prefs.guidesSettings.before = dia->tabGuides->inBackground->isChecked();
Prefs.marginColored = dia->checkUnprintable->isChecked();
if (Prefs.DisScale != dia->DisScale)
{
7240,7 → 7240,7
{
QWidget* w = wsp->windowList().at( i );
ScribusWin* swin = (ScribusWin*)w;
swin->doc->Before = Prefs.Before;
swin->doc->guidesSettings.before = Prefs.guidesSettings.before;
swin->doc->marginColored = Prefs.marginColored;
}
}