756,7 → 756,7 |
double t4 = color4Alpha->value() / 100.0; |
UndoTransaction trans; |
if (UndoManager::undoEnabled()) |
trans = undoManager->beginTransaction(Um::Selection, Um::IFill, Um::GradVal, QString(), Um::IFill); |
trans = undoManager->beginTransaction(Um::Selection,Um::IFill,Um::GradVal,"",Um::IFill); |
currentItem->set4ColorShade(static_cast<int>(color1Shade->value()), static_cast<int>(color2Shade->value()), static_cast<int>(color3Shade->value()), static_cast<int>(color4Shade->value())); |
currentItem->set4ColorTransparency(t1, t2, t3, t4); |
currentItem->set4ColorColors(color1, color2, color3, color4); |
780,20 → 780,20 |
currentItem->setGradient(name); |
} |
if (gradientType->currentIndex() == 0) |
emit NewGradient(Gradient_Linear); |
emit NewGradient(6); |
else if (gradientType->currentIndex() == 1) |
emit NewGradient(Gradient_Radial); |
emit NewGradient(7); |
else if (gradientType->currentIndex() == 2) |
emit NewGradient(Gradient_Conical); |
emit NewGradient(13); |
else if (gradientType->currentIndex() == 3) |
{ |
setGradientColors(); |
emit NewGradient(Gradient_4Colors); |
emit NewGradient(9); |
} |
else if (gradientType->currentIndex() == 4) |
emit NewGradient(Gradient_Diamond); |
emit NewGradient(10); |
else if (gradientType->currentIndex() == 5) |
emit NewGradient(Gradient_Mesh); |
emit NewGradient(11); |
} |
|
void ColorPalette::setNamedGradientStroke(const QString &name) |
811,9 → 811,9 |
currentItem->setStrokeGradient(name); |
} |
if (gradientTypeStroke->currentIndex() == 0) |
emit NewGradientS(Gradient_Linear); |
emit NewGradientS(6); |
else |
emit NewGradientS(Gradient_Radial); |
emit NewGradientS(7); |
} |
|
void ColorPalette::updatePatternList() |
949,20 → 949,20 |
} |
emit NewPatternS(""); |
if (gradientTypeStroke->currentIndex() == 0) |
emit NewGradientS(Gradient_Linear); |
emit NewGradientS(6); |
else |
emit NewGradientS(Gradient_Radial); |
emit NewGradientS(7); |
namedGradientStroke->blockSignals(sigBlocked); |
} |
else if (number == 2) |
{ |
emit NewGradientS(Gradient_Pattern); |
emit NewGradientS(8); |
if (patternBoxStroke->currentItem()) |
emit NewPatternS(patternBoxStroke->currentItem()->text()); |
} |
else |
{ |
emit NewGradientS(Gradient_None); |
emit NewGradientS(0); |
emit NewPatternS(""); |
} |
strokeModeStack->setCurrentIndex(number); |
1070,7 → 1070,7 |
if (patternList->count() == 0) |
{ |
fillModeCombo->setCurrentIndex(0); |
emit NewGradient(Gradient_None); |
emit NewGradient(0); |
} |
else |
fillModeCombo->setCurrentIndex(3); |
1101,7 → 1101,7 |
if (patternList->count() == 0) |
{ |
strokeModeCombo->setCurrentIndex(0); |
emit NewGradient(Gradient_None); |
emit NewGradient(0); |
} |
else |
strokeModeCombo->setCurrentIndex(2); |
1132,17 → 1132,17 |
if (gradientType->currentIndex() == 0) |
{ |
stackedWidget_2->setCurrentIndex(0); |
emit NewGradient(Gradient_Linear); |
emit NewGradient(6); |
} |
else if (gradientType->currentIndex() == 1) |
{ |
stackedWidget_2->setCurrentIndex(0); |
emit NewGradient(Gradient_Radial); |
emit NewGradient(7); |
} |
else if (gradientType->currentIndex() == 2) |
{ |
stackedWidget_2->setCurrentIndex(0); |
emit NewGradient(Gradient_Conical); |
emit NewGradient(13); |
} |
else if (gradientType->currentIndex() == 3) |
{ |
1171,12 → 1171,12 |
color2Shade->setValue(currentItem->GrCol2Shade); |
color3Shade->setValue(currentItem->GrCol3Shade); |
color4Shade->setValue(currentItem->GrCol4Shade); |
emit NewGradient(Gradient_4Colors); |
emit NewGradient(9); |
} |
else if (gradientType->currentIndex() == 4) |
{ |
stackedWidget_2->setCurrentIndex(0); |
emit NewGradient(Gradient_Diamond); |
emit NewGradient(10); |
} |
else if (gradientType->currentIndex() == 5) |
{ |
1188,12 → 1188,12 |
shadeMeshPoint->setValue(mp.shade); |
transparencyMeshPoint->setValue(mp.transparency * 100); |
} |
emit NewGradient(Gradient_Mesh); |
emit NewGradient(11); |
} |
else if (gradientType->currentIndex() == 6) |
{ |
stackedWidget_2->setCurrentIndex(2); |
emit NewGradient(Gradient_PatchMesh); |
emit NewGradient(12); |
} |
gradEdit->blockSignals(sigBlocked1); |
gradientType->blockSignals(sigBlocked2); |
1213,12 → 1213,12 |
} |
else |
setCurrentComboItem(hatchBackground, CommonStrings::None); |
emit NewGradient(Gradient_Hatch); |
emit NewGradient(14); |
} |
else if (number == 3) |
emit NewGradient(Gradient_Pattern); |
emit NewGradient(8); |
else |
emit NewGradient(Gradient_None); |
emit NewGradient(0); |
fillModeStack->setCurrentIndex(number); |
} |
|
1227,17 → 1227,17 |
if (type == 0) |
{ |
stackedWidget_2->setCurrentIndex(0); |
emit NewGradient(Gradient_Linear); |
emit NewGradient(6); |
} |
else if (type == 1) |
{ |
stackedWidget_2->setCurrentIndex(0); |
emit NewGradient(Gradient_Radial); |
emit NewGradient(7); |
} |
else if (type == 2) |
{ |
stackedWidget_2->setCurrentIndex(0); |
emit NewGradient(Gradient_Conical); |
emit NewGradient(13); |
} |
else if (type == 3) |
{ |
1266,12 → 1266,12 |
color2Shade->setValue(currentItem->GrCol2Shade); |
color3Shade->setValue(currentItem->GrCol3Shade); |
color4Shade->setValue(currentItem->GrCol4Shade); |
emit NewGradient(Gradient_4Colors); |
emit NewGradient(9); |
} |
else if (type == 4) |
{ |
stackedWidget_2->setCurrentIndex(0); |
emit NewGradient(Gradient_Diamond); |
emit NewGradient(10); |
} |
else if (type == 5) |
{ |
1283,12 → 1283,12 |
shadeMeshPoint->setValue(mp.shade); |
transparencyMeshPoint->setValue(mp.transparency * 100); |
} |
emit NewGradient(Gradient_Mesh); |
emit NewGradient(11); |
} |
else if (type == 6) |
{ |
stackedWidget_2->setCurrentIndex(2); |
emit NewGradient(Gradient_PatchMesh); |
emit NewGradient(12); |
} |
} |
|
1295,9 → 1295,9 |
void ColorPalette::slotGradTypeStroke(int type) |
{ |
if (type == 0) |
emit NewGradientS(Gradient_Linear); |
emit NewGradientS(6); |
else |
emit NewGradientS(Gradient_Radial); |
emit NewGradientS(7); |
} |
|
void ColorPalette::editMeshPointColor() |
1803,7 → 1803,7 |
m_Pattern_mirrorY = dia->FlipV->isChecked(); |
delete dia; |
fillModeCombo->setCurrentIndex(3); |
emit NewGradient(Gradient_Pattern); |
emit NewGradient(8); |
} |
|
void ColorPalette::changePatternPropsStroke() |