Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 206 → Rev 207

/trunk/Scribus/scribus/mpalette.cpp
1089,6 → 1089,7
BottomLeft->setEnabled(true);
BottomRight->setEnabled(true);
Center->setEnabled(true);
visID = TabStack->id(TabStack->visibleWidget());
TabStack->widget(0)->setEnabled(true);
TabStack->widget(1)->setEnabled(false);
TabStack->widget(2)->setEnabled(false);
1096,7 → 1097,6
TabStack->widget(4)->setEnabled(false);
TabStack->widget(5)->setEnabled(true);
SColor->setEnabled(true);
visID = TabStack->id(TabStack->visibleWidget());
switch (nr)
{
case -1:
1123,7 → 1123,7
SImage->setEnabled(false);
SLine->setEnabled(false);
SColor->setEnabled(false);
SGeom->setOn(true);
// SGeom->setOn(true);
break;
case 1:
SGeom->setEnabled(true);
2666,7 → 2666,14
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
doc->ActPage->ToggleLock();
{
for ( uint a = 0; a < doc->ActPage->SelItem.count(); ++a)
{
doc->ActPage->SelItem.at(a)->Locked = Locked->isOn();
doc->ActPage->RefreshItem(doc->ActPage->SelItem.at(a));
}
emit DocChanged();
}
}
 
void Mpalette::handlePrint()
/trunk/Scribus/scribus/page.cpp
3828,7 → 3828,7
double gx, gy, gh, gw;
getGroupRectScreen(&gx, &gy, &gw, &gh);
if ((QRect(static_cast<int>(gx), static_cast<int>(gy), static_cast<int>(gw),
static_cast<int>(gh)).intersects(mpo)) && (m->state() != (ControlButton | AltButton)))
static_cast<int>(gh)).intersects(mpo)) && (m->state() != (ControlButton | AltButton)) && (m->state() != ShiftButton))
{
HowTo = 0;
if (QRect(static_cast<int>(gx+gw)-6, static_cast<int>(gy+gh)-6, 6, 6).intersects(mpo))
6879,20 → 6879,20
b->fill_gradient.clearStops();
if (Buffer->GrType == 5)
{
if ((Buffer->GrColor2 != "None") && (Buffer->GrColor2 != ""))
b->SetFarbe(&tmp, Buffer->GrColor2, Buffer->GrShade2);
b->fill_gradient.addStop(tmp, 0.0, 0.5, 1.0);
if ((Buffer->GrColor != "None") && (Buffer->GrColor != ""))
b->SetFarbe(&tmp, Buffer->GrColor, Buffer->GrShade);
b->fill_gradient.addStop(tmp, 0.0, 0.5, 1.0);
if ((Buffer->GrColor2 != "None") && (Buffer->GrColor2 != ""))
b->SetFarbe(&tmp, Buffer->GrColor2, Buffer->GrShade2);
b->fill_gradient.addStop(tmp, 1.0, 0.5, 1.0);
}
else
{
if ((Buffer->GrColor != "None") && (Buffer->GrColor != ""))
b->SetFarbe(&tmp, Buffer->GrColor, Buffer->GrShade);
b->fill_gradient.addStop(tmp, 0.0, 0.5, 1.0);
if ((Buffer->GrColor2 != "None") && (Buffer->GrColor2 != ""))
b->SetFarbe(&tmp, Buffer->GrColor2, Buffer->GrShade2);
b->fill_gradient.addStop(tmp, 0.0, 0.5, 1.0);
if ((Buffer->GrColor != "None") && (Buffer->GrColor != ""))
b->SetFarbe(&tmp, Buffer->GrColor, Buffer->GrShade);
b->fill_gradient.addStop(tmp, 1.0, 0.5, 1.0);
}
b->GrColor2 = Buffer->GrColor2;