Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 7920 → Rev 7921

/branches/Version13x/Scribus/scribus/cpalette.cpp
318,7 → 318,7
gradientQCombo->setCurrentItem(currentItem->GrType);
gradEdit->Preview->updateDisplay();
double dur = currentDoc->unitRatio();
setSpecialGradient(currentItem->GrStartX * dur, currentItem->GrStartY * dur, currentItem->GrEndX * dur, currentItem->GrEndY * dur, currentItem->width() * dur, currentItem->height() * dur);
setSpecialGradient(currentItem->GrStartX * dur, currentItem->GrStartY * dur, currentItem->GrEndX * dur, currentItem->GrEndY * dur);
}
}
 
724,7 → 724,7
connect(gradientQCombo, SIGNAL(activated(int)), this, SLOT(slotGrad(int)));
}
 
void Cpalette::setSpecialGradient(double x1, double y1, double x2, double y2, double w, double h)
void Cpalette::setSpecialGradient(double x1, double y1, double x2, double y2)
{
disconnect(gX1, SIGNAL(valueChanged(int)), this, SLOT(changeSpecial()));
disconnect(gX2, SIGNAL(valueChanged(int)), this, SLOT(changeSpecial()));
/branches/Version13x/Scribus/scribus/cpalette.h
94,7 → 94,7
void setActFarben(QString p, QString b, int shp, int shb);
void setActGradient(int typ);
void setActPattern(QString pattern, double scaleX, double scaleY, double offsetX, double offsetY, double rotation);
void setSpecialGradient(double x1, double y1, double x2, double y2, double w, double h);
void setSpecialGradient(double x1, double y1, double x2, double y2);
void changeSpecial();
void setActShade();
void setActTrans(double, double);
/branches/Version13x/Scribus/scribus/mpalette.cpp
4405,9 → 4405,9
return;
double dur=doc->unitRatio();
PageItem *currItem=doc->m_Selection->itemAt(0);
Cpal->setSpecialGradient(currItem->GrStartX * dur, currItem->GrStartY * dur,
currItem->GrEndX * dur, currItem->GrEndY * dur,
currItem->width() * dur, currItem->height() * dur);
if (currItem)
Cpal->setSpecialGradient(currItem->GrStartX * dur, currItem->GrStartY * dur,
currItem->GrEndX * dur, currItem->GrEndY * dur);
}
 
void Mpalette::updateSpinBoxConstants()