Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 12898 → Rev 12899

/trunk/Scribus/scribus/printdialogbase.ui
266,7 → 266,7
<item>
<widget class="QTabWidget" name="printOptions" >
<property name="currentIndex" >
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="tab" >
<attribute name="title" >
367,7 → 367,7
<item>
<widget class="QCheckBox" name="ClipMarg" >
<property name="text" >
<string>Clip to Page Margins</string>
<string>Clip to Printer Margins</string>
</property>
</widget>
</item>
/trunk/Scribus/scribus/tabprinter.ui
41,14 → 41,6
<number>0</number>
</property>
<widget class="QWidget" name="tab" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>656</width>
<height>331</height>
</rect>
</property>
<attribute name="title" >
<string>Options</string>
</attribute>
95,7 → 87,7
<item row="3" column="0" >
<widget class="QCheckBox" name="setClip" >
<property name="text" >
<string>Clip to Page Margins</string>
<string>Clip to Printer Margins</string>
</property>
</widget>
</item>
225,14 → 217,6
</layout>
</widget>
<widget class="QWidget" name="TabPage" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>656</width>
<height>331</height>
</rect>
</property>
<attribute name="title" >
<string>Marks &amp;&amp; Bleeds</string>
</attribute>
/trunk/Scribus/scribus/pdflib_core.cpp
2832,9 → 2832,10
PutPage("1 0 0 -1 0 "+FToStr(ActPageP->height())+" cm\n");
if (clip)
{
double maxBoxX = ActPageP->width()+bleedRight+bleedLeft;
double maxBoxY = ActPageP->height()+Options.bleeds.Top+Options.bleeds.Bottom;
PutPage(FToStr(-bleedLeft)+" "+FToStr(-Options.bleeds.Bottom)+" "+FToStr(maxBoxX)+" "+FToStr(maxBoxY)+" re W n\n");
double maxBoxX = ActPageP->width() - ActPageP->Margins.Right - ActPageP->Margins.Left;
double maxBoxY = ActPageP->height() - ActPageP->Margins.Top - ActPageP->Margins.Bottom;
PutPage(FToStr(ActPageP->Margins.Left)+" "+FToStr(ActPageP->Margins.Bottom)+" "+FToStr(maxBoxX)+" "+FToStr(maxBoxY)+" re W n\n");
// PutPage("0 0 "+FToStr(ActPageP->width())+" "+FToStr(ActPageP->height())+" re W n\n");
}
if (!pag->MPageNam.isEmpty())
{
/trunk/Scribus/scribus/preview.cpp
239,7 → 239,7
MirrorVert = new QCheckBox( tr( "Mirror Page(s) Vertical" ), jobTitle );
Layout1->addWidget( MirrorVert );
 
ClipMarg = new QCheckBox( tr( "Clip to Page Margins" ), jobTitle );
ClipMarg = new QCheckBox( tr( "Clip to Printer Margins" ), jobTitle );
Layout1->addWidget( ClipMarg );
 
useGray = new QCheckBox( tr("Print in Grayscale"), jobTitle);
/trunk/Scribus/scribus/tabpdfoptions.cpp
302,7 → 302,7
MirrorV->setCheckable( true );
Layout11a->addWidget( MirrorV, 0, 1 );
RangeGroupLayout->addLayout( Layout11a );
ClipMarg = new QCheckBox( tr( "Clip to Page Margins" ), RangeGroup );
ClipMarg = new QCheckBox( tr( "Clip to Printer Margins" ), RangeGroup );
RangeGroupLayout->addWidget( ClipMarg );
Layout13->addWidget( RangeGroup );
 
/trunk/Scribus/scribus/pslib.cpp
634,8 → 634,6
PutStream("%%PageCropBox: "+ToStr(bleedLeft+markOffs)+" "+ToStr(Options.bleeds.Bottom+markOffs)+" "+ToStr(maxBoxX-bleedRight-markOffs*2.0)+" "+ToStr(maxBoxY-Options.bleeds.Top-markOffs*2.0)+"\n");
PutStream("Scribusdict begin\n");
PutStream("save\n");
if (Clipping)
PutStream(PDev);
PutStream("/DeviceCMYK setcolorspace\n");
if ((Art) && (Options.setDevParam))
{
650,6 → 648,7
PDev += ToStr(pg->width() - Ma->Right) + " " + ToStr(Ma->Bottom) + " li\n";
PDev += ToStr(pg->width() - Ma->Right) + " " + ToStr(pg->height() - Ma->Top) + " li\n";
PDev += ToStr(Ma->Left) + " " + ToStr(pg->height() - Ma->Top) + " li cl clip newpath\n";
PutStream(PDev);
}
}