Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 12470 → Rev 12471

/trunk/Scribus/scribus/pageitem.cpp
2234,7 → 2234,7
}
}
setFillQColor();
emit colors(lineColorVal, fillColorVal, lineShadeVal, fillShadeVal);
//CB unused in 135 emit colors(lineColorVal, fillColorVal, lineShadeVal, fillShadeVal);
}
 
void PageItem::setFillShade(double newShade)
2256,7 → 2256,7
}
fillShadeVal = newShade;
setFillQColor();
emit colors(lineColorVal, fillColorVal, lineShadeVal, fillShadeVal);
//CB unused in 135 emit colors(lineColorVal, fillColorVal, lineShadeVal, fillShadeVal);
}
 
void PageItem::setFillTransparency(double newTransparency)
2327,7 → 2327,7
}
lineColorVal = tmp;
setLineQColor();
emit colors(lineColorVal, fillColorVal, lineShadeVal, fillShadeVal);
//CB unused in 135 emit colors(lineColorVal, fillColorVal, lineShadeVal, fillShadeVal);
}
 
void PageItem::setLineShade(double newShade)
2349,7 → 2349,7
}
lineShadeVal = newShade;
setLineQColor();
emit colors(lineColorVal, fillColorVal, lineShadeVal, fillShadeVal);
//CB unused in 135 emit colors(lineColorVal, fillColorVal, lineShadeVal, fillShadeVal);
}
 
void PageItem::setLineQColor()
4845,7 → 4845,7
connect(this, SIGNAL(printEnabled(bool)), pp, SLOT(setPrintingEnabled(bool)));
connect(this, SIGNAL(position(double, double)), pp, SLOT(setXY(double, double)));
connect(this, SIGNAL(widthAndHeight(double, double)), pp, SLOT(setBH(double, double)));
connect(this, SIGNAL(colors(QString, QString, double, double)), m_Doc->scMW(), SLOT(setCSMenu()));
//CB unused in 135 connect(this, SIGNAL(colors(QString, QString, double, double)), m_Doc->scMW(), SLOT(setCSMenu()));
// connect(this, SIGNAL(colors(QString, QString, double, double)), pp->Cpal, SLOT(setActFarben(QString, QString, int, int)));
// connect(this, SIGNAL(gradientType(int)), pp->Cpal, SLOT(setActGradient(int)));
connect(this, SIGNAL(patternFill(QString, double, double, double, double, double)), pp->Cpal, SLOT(setActPattern(QString, double, double, double, double, double)));
4858,12 → 4858,12
connect(this, SIGNAL(cornerRadius(double)), pp, SLOT(setRR(double)));
// connect(view, SIGNAL(ItemTextCols(int, double)), propertiesPalette, SLOT(setCols(int, double)));
//Line signals
connect(this, SIGNAL(lineWidth(double)), pp, SLOT(setSvalue(double)));
connect(this, SIGNAL(imageOffsetScale(double, double, double, double)), pp, SLOT(setLvalue(double, double, double, double)));
connect(this, SIGNAL(lineWidth(double)), pp, SLOT(setLineWidth(double)));
connect(this, SIGNAL(imageOffsetScale(double, double, double, double)), pp, SLOT(setScaleAndOffset(double, double, double, double)));
connect(this, SIGNAL(lineStyleCapJoin(Qt::PenStyle, Qt::PenCapStyle, Qt::PenJoinStyle)), pp, SLOT( setLIvalue(Qt::PenStyle, Qt::PenCapStyle, Qt::PenJoinStyle)));
//Frame text signals
connect(this, SIGNAL(lineSpacing(double)), pp, SLOT(setLsp(double)));
connect(this, SIGNAL(textToFrameDistances(double, double, double, double)), pp, SLOT(setDvals(double, double, double, double)));
connect(this, SIGNAL(textToFrameDistances(double, double, double, double)), pp, SLOT(setTextToFrameDistances(double, double, double, double)));
connect(this, SIGNAL(textKerning(double)), pp, SLOT(setExtra(double)));
connect(this, SIGNAL(textStyle(int)), pp, SLOT(setStil(int)));
connect(this, SIGNAL(textStyle(int)), m_Doc->scMW(), SLOT(setStilvalue(int)));
4901,6 → 4901,7
 
emit myself(this);
emit frameType(m_ItemType);
/*CB using the emit myself* instead of all of these
emit position(Xpos, Ypos);
emit widthAndHeight(Width, Height);
emit rotation(Rot);
4912,15 → 4913,18
emit lineWidth(m_lineWidth);
emit lineStyleCapJoin(PLineArt, PLineEnd, PLineJoin);
emit imageOffsetScale(LocalScX, LocalScY, LocalX, LocalY);
emit colors(lineColorVal, fillColorVal, lineShadeVal, fillShadeVal);
*/
//CB unused in 135 emit colors(lineColorVal, fillColorVal, lineShadeVal, fillShadeVal);
// emit gradientType(GrType);
// double dur=m_Doc->unitRatio();
// emit gradientColorUpdate(GrStartX*dur, GrStartY*dur, GrEndX*dur, GrEndY*dur, Width*dur, Height*dur);
// emit transparency(fillTransparencyVal, lineTransparencyVal);
// emit blendmode(fillBlendmodeVal, lineBlendmodeVal);
/*CB using the emit myself* instead of all of these
emit patternFill(patternVal, patternScaleX, patternScaleY, patternOffsetX, patternOffsetY, patternRotation);
emit textToFrameDistances(Extra, TExtra, BExtra, RExtra);
emit columns(Cols, ColGap);
*/
if (m_Doc->appMode == modeEdit)
{
/* maybe already done elsewhere? -- av
4934,6 → 4938,7
}
else
{
//TODO remove and use the emit myself
emit lineSpacing(itemText.defaultStyle().lineSpacing());
emit textKerning(itemText.defaultStyle().charStyle().tracking());
emit textStyle(itemText.defaultStyle().charStyle().effects());
/trunk/Scribus/scribus/scribus.cpp
2529,7 → 2529,7
{
propertiesPalette->Cpal->ChooseGrad(0);
updateActiveWindowCaption(doc->DocName);
scrActions["shade100"]->setChecked(true);
// scrActions["shade100"]->setChecked(true);
propertiesPalette->setDoc(doc);
pagePalette->setView(view);
propertiesPalette->Fonts->RebuildList(doc);
2684,7 → 2684,7
 
//Update palettes
updateActiveWindowCaption(doc->DocName);
scrActions["shade100"]->setChecked(true);
// scrActions["shade100"]->setChecked(true);
propertiesPalette->setDoc(doc);
propertiesPalette->Cpal->ChooseGrad(0);
// propertiesPalette->updateColorList();
2712,8 → 2712,8
connect(view, SIGNAL(ChBMText(PageItem *)), this, SLOT(BookMarkTxT(PageItem *)));
connect(view, SIGNAL(HaveSel(int)), this, SLOT(HaveNewSel(int)));
connect(view, SIGNAL(SetAngle(double)), propertiesPalette, SLOT(setR(double)));
connect(view, SIGNAL(SetSizeValue(double)), propertiesPalette, SLOT(setSvalue(double)));
connect(view, SIGNAL(SetLocalValues(double, double, double, double)), propertiesPalette, SLOT(setLvalue(double, double, double, double)));
connect(view, SIGNAL(SetSizeValue(double)), propertiesPalette, SLOT(setLineWidth(double)));
connect(view, SIGNAL(SetLocalValues(double, double, double, double)), propertiesPalette, SLOT(setScaleAndOffset(double, double, double, double)));
connect(view, SIGNAL(SetLineArt(Qt::PenStyle, Qt::PenCapStyle, Qt::PenJoinStyle)), propertiesPalette, SLOT( setLIvalue(Qt::PenStyle, Qt::PenCapStyle, Qt::PenJoinStyle)));
// connect(view, SIGNAL(ItemFarben(QString, QString, int, int)), this, SLOT(setCSMenu(QString, QString, int, int)));
// connect(view, SIGNAL(ItemFarben(QString, QString, int, int)), propertiesPalette->Cpal, SLOT(setActFarben(QString, QString, int, int)));
2723,7 → 2723,7
connect(view, SIGNAL(ItemTextAttr(double)), propertiesPalette, SLOT(setLsp(double)));
connect(view, SIGNAL(ItemTextUSval(double)), propertiesPalette, SLOT(setExtra(double)));
// connect(view, SIGNAL(ItemTextCols(int, double)), propertiesPalette, SLOT(setCols(int, double)));
connect(view, SIGNAL(SetDistValues(double, double, double, double)), propertiesPalette, SLOT(setDvals(double, double, double, double)));
connect(view, SIGNAL(SetDistValues(double, double, double, double)), propertiesPalette, SLOT(setTextToFrameDistances(double, double, double, double)));
connect(view, SIGNAL(ItemTextAbs(int)), propertiesPalette, SLOT(setAli(int)));
connect(view, SIGNAL(ItemTextFont(const QString&)), propertiesPalette, SLOT(setFontFace(const QString&)));
connect(view, SIGNAL(ItemTextSize(double)), propertiesPalette, SLOT(setSize(double)));
4208,7 → 4208,7
//view->AdjustPictScale(currItem, false);
//false was ignored anyway
currItem->AdjustPictScale();
propertiesPalette->setLvalue(currItem->imageXScale(), currItem->imageYScale(), currItem->imageXOffset(), currItem->imageYOffset());
propertiesPalette->setScaleAndOffset(currItem->imageXScale(), currItem->imageYScale(), currItem->imageXOffset(), currItem->imageYOffset());
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
view->DrawNew();
propertiesPalette->updateColorList();
7024,7 → 7024,7
doc->itemSelection_SetFont(nf2);
// doc->currentStyle.charStyle().setFont((*doc->AllFonts)[nf2]);
view->DrawNew();
slotDocCh();
// slotDocCh();
}
 
void ScribusMainWindow::setItemFSize(int id)
7045,7 → 7045,7
delete dia;
}
propertiesPalette->setSize(c*10);
slotDocCh();
// slotDocCh();
}
 
//CB-->Doc partly
7080,9 → 7080,10
delete dia;
}
}
slotDocCh();
// slotDocCh();
}
 
/* CB: unused in 135 without the colours menu
void ScribusMainWindow::setCSMenu()
{
QString la = CommonStrings::tr_NoneColor;
7115,6 → 7116,7
if (scrActions[QString("shade%1").arg(lb)])
scrActions[QString("shade%1").arg(lb)]->setChecked(true);
}
*/
 
#if 0
//CB still called from SE
/trunk/Scribus/scribus/propertiespalette.cpp
220,13 → 220,13
keepFrameWHRatioButton->setMaximumSize( QSize( 15, 32767 ) );
keepFrameWHRatioButton->setChecked(true);
GeoGroupLayout->addWidget( keepFrameWHRatioButton, 2, 2, 2, 1 );
Rot = new ScrSpinBox( GeoGroup, 6);
Rot->setWrapping( true );
installSniffer(Rot);
Rotation = new ScrSpinBox( GeoGroup, 6);
Rotation->setWrapping( true );
installSniffer(Rotation);
rotationLabel = new QLabel( "&Rotation:", GeoGroup );
rotationLabel->setBuddy(Rot);
rotationLabel->setBuddy(Rotation);
GeoGroupLayout->addWidget( rotationLabel, 4, 0 );
GeoGroupLayout->addWidget( Rot, 4, 1 );
GeoGroupLayout->addWidget( Rotation, 4, 1 );
basepointLabel = new QLabel( "Basepoint:", GeoGroup );
GeoGroupLayout->addWidget( basepointLabel, 5, 0 );
RotationGroup = new BasePointWidget(GeoGroup, 0);
1444,7 → 1444,7
connect(Ypos, SIGNAL(valueChanged(double)), this, SLOT(NewY()));
connect(Width, SIGNAL(valueChanged(double)), this, SLOT(NewW()));
connect(Height, SIGNAL(valueChanged(double)), this, SLOT(NewH()));
connect(Rot, SIGNAL(valueChanged(double)), this, SLOT(NewRotation()));
connect(Rotation, SIGNAL(valueChanged(double)), this, SLOT(setRotation()));
connect(RoundRect, SIGNAL(valueChanged(double)), this, SLOT(NewCornerRadius()));
connect(LineSp, SIGNAL(valueChanged(double)), this, SLOT(NewLineSpacing()));
connect(Size, SIGNAL(valueChanged(double)), this, SLOT(NewSize()));
1554,7 → 1554,7
Ypos->setValue(0);
Width->setValue(0);
Height->setValue(0);
Rot->setValue(0);
Rotation->setValue(0);
RoundRect->setValue(0);
TabStack3->setCurrentIndex(0);
TabStack2->setCurrentIndex(0);
1601,7 → 1601,7
// connect(this, SIGNAL(ShapeEdit()), m_ScMW, SLOT(ToggleFrameEdit()));
connect(this, SIGNAL(NewFont(const QString&)), m_ScMW, SLOT(SetNewFont(const QString&)));
connect(this, SIGNAL(UpdtGui(int)), m_ScMW, SLOT(HaveNewSel(int)));
connect(this->Cpal, SIGNAL(modeChanged()), m_ScMW, SLOT(setCSMenu()));
//CB unused in 135 connect(this->Cpal, SIGNAL(modeChanged()), m_ScMW, SLOT(setCSMenu()));
connect(this->Cpal->gradEdit->Preview, SIGNAL(gradientChanged()), m_ScMW, SLOT(updtGradFill()));
connect(this->Cpal, SIGNAL(gradientChanged()), m_ScMW, SLOT(updtGradFill()));
connect(DoUnGroup, SIGNAL(clicked()), m_ScMW, SLOT(UnGroupObj()) );
1670,7 → 1670,7
imageXOffsetSpinBox->setValues( -16777215, maxXYWHVal, precision, 0);
imageYOffsetSpinBox->setValues( -16777215, maxXYWHVal, precision, 0);
 
Rot->setValues( 0, 359.99, 1, 0);
Rotation->setValues( 0, 359.99, 1, 0);
RoundRect->setValues( -300, 300, 2, 0);
Extra->setValues( -300, 300, 2, 0);
Size->setValues( 0.5, 2048, 2, 1);
1751,7 → 1751,7
Ypos->setValue(0);
Width->setValue(0);
Height->setValue(0);
Rot->setValue(0);
Rotation->setValue(0);
RoundRect->setValue(0);
for (int ws = 1; ws < 7; ++ws)
TabStack->setItemEnabled(ws, false);
1864,6 → 1864,8
PageItem_TextFrame *i2=CurItem->asTextFrame();
if (i2!=0)
{
disconnect(dGap, SIGNAL(valueChanged(double)), this, SLOT(NewGap()));
disconnect(DCol, SIGNAL(valueChanged(int)), this, SLOT(NewCols()));
DCol->setMaximum(qMax(qRound(i2->width() / qMax(i2->ColGap, 10.0)), 1));
DCol->setMinimum(1);
DCol->setValue(i2->Cols);
1886,6 → 1888,8
// but it’s a PageItem prop. and as such should be set without considering
// the frame type.
setFlop(CurItem->firstLineOffset());
connect(dGap, SIGNAL(valueChanged(double)), this, SLOT(NewGap()));
connect(DCol, SIGNAL(valueChanged(int)), this, SLOT(NewCols()));
}
if (CurItem->asImageFrame())
{
1932,10 → 1936,71
connect(NameEdit, SIGNAL(Leaved()), this, SLOT(NewName()));
connect(startArrow, SIGNAL(activated(int)), this, SLOT(setStartArrow(int )));
connect(endArrow, SIGNAL(activated(int)), this, SLOT(setEndArrow(int )));
//CB not needed, done from pageitem->emitalltogui or individual emit.
//NoPrint->setChecked(!i->printEnabled());
//setLocked(i->locked());
//setSizeLocked(i->sizeLocked());
 
//CB replaces old emits from PageItem::emitAllToGUI()
disconnect(Xpos, SIGNAL(valueChanged(double)), this, SLOT(NewX()));
disconnect(Ypos, SIGNAL(valueChanged(double)), this, SLOT(NewY()));
disconnect(Width, SIGNAL(valueChanged(double)), this, SLOT(NewW()));
disconnect(Height, SIGNAL(valueChanged(double)), this, SLOT(NewH()));
disconnect(Locked, SIGNAL(clicked()), this, SLOT(handleLock()));
disconnect(NoPrint, SIGNAL(clicked()), this, SLOT(handlePrint()));
disconnect(NoResize, SIGNAL(clicked()), this, SLOT(handleLockSize()));
disconnect(FlipH, SIGNAL(clicked()), this, SLOT(handleFlipH()));
disconnect(FlipV, SIGNAL(clicked()), this, SLOT(handleFlipV()));
disconnect(LSize, SIGNAL(valueChanged(double)), this, SLOT(NewLineWidth()));
disconnect(LStyle, SIGNAL(activated(int)), this, SLOT(NewLineStyle()));
disconnect(LJoinStyle, SIGNAL(activated(int)), this, SLOT(NewLineJoin()));
disconnect(LEndStyle, SIGNAL(activated(int)), this, SLOT(NewLineEnd()));
disconnect(Rotation, SIGNAL(valueChanged(double)), this, SLOT(setRotation()));
disconnect(imageXScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(HChange()));
disconnect(imageYScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(VChange()));
disconnect(imageXOffsetSpinBox, SIGNAL(valueChanged(double)), this, SLOT(NewLocalXY()));
disconnect(imageYOffsetSpinBox, SIGNAL(valueChanged(double)), this, SLOT(NewLocalXY()));
disconnect(DTop, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
disconnect(DLeft, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
disconnect(DRight, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
disconnect(DBottom, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
setXY(i->xPos(), i->yPos());
setBH(i->width(), i->height());
NoPrint->setChecked(!i->printEnabled());
setLocked(i->locked());
setSizeLocked(i->sizeLocked());
setFlippedH(i->imageFlippedH());
setFlippedV(i->imageFlippedV());
setLineWidth(i->lineWidth());
setLIvalue(i->lineStyle(), i->lineEnd(), i->lineJoin());
RoVal = i->rotation();
Rotation->setValue(i->rotation());
setScaleAndOffset(i->imageXScale(), i->imageYScale(), i->imageXOffset(), i->imageYOffset());
setTextToFrameDistances(i->textToFrameDistLeft(),i->textToFrameDistTop(),i->textToFrameDistBottom(),i->textToFrameDistRight());
double patternScaleX, patternScaleY, patternOffsetX, patternOffsetY, patternRotation;
i->patternTransform(patternScaleX, patternScaleY, patternOffsetX, patternOffsetY, patternRotation);
Cpal->setActPattern(i->pattern(), patternScaleX, patternScaleY, patternOffsetX, patternOffsetY, patternRotation);
 
//CB TODO reconnect PP signals from here
connect(Xpos, SIGNAL(valueChanged(double)), this, SLOT(NewX()));
connect(Ypos, SIGNAL(valueChanged(double)), this, SLOT(NewY()));
connect(Width, SIGNAL(valueChanged(double)), this, SLOT(NewW()));
connect(Height, SIGNAL(valueChanged(double)), this, SLOT(NewH()));
connect(Locked, SIGNAL(clicked()), this, SLOT(handleLock()));
connect(NoPrint, SIGNAL(clicked()), this, SLOT(handlePrint()));
connect(NoResize, SIGNAL(clicked()), this, SLOT(handleLockSize()));
connect(FlipH, SIGNAL(clicked()), this, SLOT(handleFlipH()));
connect(FlipV, SIGNAL(clicked()), this, SLOT(handleFlipV()));
connect(LSize, SIGNAL(valueChanged(double)), this, SLOT(NewLineWidth()));
connect(LStyle, SIGNAL(activated(int)), this, SLOT(NewLineStyle()));
connect(LJoinStyle, SIGNAL(activated(int)), this, SLOT(NewLineJoin()));
connect(LEndStyle, SIGNAL(activated(int)), this, SLOT(NewLineEnd()));
connect(Rotation, SIGNAL(valueChanged(double)), this, SLOT(setRotation()));
connect(imageXScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(HChange()));
connect(imageYScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(VChange()));
connect(imageXOffsetSpinBox, SIGNAL(valueChanged(double)), this, SLOT(NewLocalXY()));
connect(imageYOffsetSpinBox, SIGNAL(valueChanged(double)), this, SLOT(NewLocalXY()));
connect(DTop, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
connect(DLeft, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
connect(DRight, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
connect(DBottom, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
 
if ((CurItem->isTableItem) && (CurItem->isSingleSel))
{
setter = true;
1946,7 → 2011,7
BottomLine->setChecked(CurItem->BottomLine);
Xpos->setEnabled(false);
Ypos->setEnabled(false);
Rot->setEnabled(false);
Rotation->setEnabled(false);
}
else
{
1983,7 → 2048,7
/*
Xpos->setReadOnly(setter);
Ypos->setReadOnly(setter);
Rot->setReadOnly(setter);
Rotation->setReadOnly(setter);
*/
if (CurItem->asPathText())
{
2009,10 → 2074,7
else
{
TabStack2->setCurrentIndex(1);
if (i->itemType() == PageItem::ImageFrame)
Distance3->hide();
else
Distance3->show();
Distance3->setVisible(i->itemType() != PageItem::ImageFrame);
flopItem->setHidden(false);
DistanceItem->setHidden(false);
Distance2Item->setHidden(true);
2023,10 → 2085,7
RoundRect->setEnabled(true);
else
{
if ((CurItem->asPolygon()) && (!CurItem->ClipEdited) && ((CurItem->FrameType == 0) || (CurItem->FrameType == 2)))
RoundRect->setEnabled(true);
else
RoundRect->setEnabled(false);
RoundRect->setEnabled ((CurItem->asPolygon()) && (!CurItem->ClipEdited) && ((CurItem->FrameType == 0) || (CurItem->FrameType == 2)));
}
KnockOut->setChecked(!CurItem->doOverprint);
Overprint->setChecked(CurItem->doOverprint);
2036,7 → 2095,7
widthLabel->setText( tr( "X&2:" ) );
yposLabel->setText( tr( "Y&1:" ) );
heightLabel->setText( tr( "&Y2:" ) );
Rot->setEnabled(false);
Rotation->setEnabled(false);
}
else
{
2044,19 → 2103,13
widthLabel->setText( tr( "&Width:" ) );
yposLabel->setText( tr( "&Y-Pos:" ) );
heightLabel->setText( tr( "&Height:" ) );
if ((CurItem->isTableItem) && (CurItem->isSingleSel))
Rot->setEnabled(false);
else
Rot->setEnabled(true);
Rotation->setEnabled(!((CurItem->isTableItem) && (CurItem->isSingleSel)));
}
HaveItem = true;
if (CurItem->asLine())
{
keepFrameWHRatioButton->setEnabled(false);
if (LMode && !CurItem->locked())
Height->setEnabled(true);
else
Height->setEnabled(false);
Height->setEnabled(LMode && !CurItem->locked());
}
else
{
2151,7 → 2204,7
Ypos->setValue(0);
Width->setValue(0);
Height->setValue(0);
Rot->setValue(0);
Rotation->setValue(0);
RoundRect->setValue(0);
HaveItem = true;
Xpos->setEnabled(true);
2158,7 → 2211,7
Ypos->setEnabled(true);
Width->setEnabled(true);
Height->setEnabled(true);
Rot->setEnabled(true);
Rotation->setEnabled(true);
// TabStack->setCurrentIndex(0);
for (int ws = 1; ws < 7; ++ws)
TabStack->setItemEnabled(ws, false);
2236,7 → 2289,7
widthLabel->setText( tr( "&Width:" ) );
yposLabel->setText( tr( "&Y-Pos:" ) );
heightLabel->setText( tr( "&Height:" ) );
//Rot->setEnabled(true);
//Rotation->setEnabled(true);
//Height->setEnabled(true);
RoundRect->setEnabled(false);
HaveItem = false;
2244,7 → 2297,7
Ypos->setValue(0);
Width->setValue(0);
Height->setValue(0);
Rot->setValue(0);
Rotation->setValue(0);
RoundRect->setValue(0);
for (int ws = 1; ws < 7; ++ws)
TabStack->setItemEnabled(ws, false);
2549,7 → 2602,7
if ((LMode) && (CurItem->asLine()))
{
ma.translate(static_cast<double>(Xpos->value()) / m_unitRatio, static_cast<double>(Ypos->value()) / m_unitRatio);
ma.rotate(static_cast<double>(Rot->value())*(-1));
ma.rotate(static_cast<double>(Rotation->value())*(-1));
// Qt4 dp = ma * QPoint(static_cast<int>(x), static_cast<int>(y));
dp = QPoint(static_cast<int>(x), static_cast<int>(y)) * ma;
Width->setValue(dp.x()*m_unitRatio);
2574,7 → 2627,7
if (r > 0)
rr = 360 - rr;
HaveItem = false;
Rot->setValue(fabs(rr));
Rotation->setValue(fabs(rr));
HaveItem = tmp;
}
 
2663,7 → 2716,7
HaveItem = tmp;
}
 
void PropertiesPalette::setDvals(double left, double top, double bottom, double right)
void PropertiesPalette::setTextToFrameDistances(double left, double top, double bottom, double right)
{
if (!m_ScMW || m_ScMW->ScriptRunning)
return;
2746,7 → 2799,7
}
}
 
void PropertiesPalette::setLvalue(double scx, double scy, double x, double y)
void PropertiesPalette::setScaleAndOffset(double scx, double scy, double x, double y)
{
if (!m_ScMW || m_ScMW->ScriptRunning)
return;
2790,7 → 2843,7
HaveItem = tmp;
}
 
void PropertiesPalette::setSvalue(double s)
void PropertiesPalette::setLineWidth(double s)
{
if (!m_ScMW || m_ScMW->ScriptRunning)
return;
3431,7 → 3484,7
}
}
 
void PropertiesPalette::NewRotation()
void PropertiesPalette::setRotation()
{
if (!m_ScMW || m_ScMW->ScriptRunning)
return;
3442,7 → 3495,7
{
if (!_userActionOn)
m_ScMW->view->startGroupTransaction();
doc->rotateGroup((Rot->value() - RoVal)*(-1), m_ScMW->view->RCenter);
doc->rotateGroup((Rotation->value() - RoVal)*(-1), m_ScMW->view->RCenter);
if (!_userActionOn)
{
m_ScMW->view->endGroupTransaction();
3451,10 → 3504,10
setXY(gx, gy);
}
else
doc->RotateItem(Rot->value()*(-1), CurItem->ItemNr);
doc->RotateItem(Rotation->value()*(-1), CurItem->ItemNr);
emit DocChanged();
doc->regionsChanged()->update(QRect());
RoVal = Rot->value();
RoVal = Rotation->value();
}
}
 
3715,7 → 3768,7
widthLabel->setText( tr( "&Width:" ) );
yposLabel->setText( tr( "&Y-Pos:" ) );
heightLabel->setText( tr( "&Height:" ) );
Rot->setEnabled(true);
Rotation->setEnabled(true);
Height->setEnabled(false);
LMode = false;
}
3725,7 → 3778,7
widthLabel->setText( tr( "X&2:" ) );
yposLabel->setText( tr( "Y&1:" ) );
heightLabel->setText( tr( "&Y2:" ) );
Rot->setEnabled(false);
Rotation->setEnabled(false);
Height->setEnabled(true);
LMode = true;
}
4967,13 → 5020,13
StyledLine->item(0)->setText( tr("No Style") );
// updateCList();
// updateCmsList();
 
/* CB: doesnt look like we need to do this on languageChange anymore with qt4
NameEdit->setToolTip("");
Xpos->setToolTip("");
Ypos->setToolTip("");
Width->setToolTip("");
Height->setToolTip("");
Rot->setToolTip("");
Rotation->setToolTip("");
basepointLabel->setToolTip("");
// TopLeft->setToolTip("");
// TopRight->setToolTip("");
5058,13 → 5111,13
Aspect->setToolTip("");
InputP->setToolTip("");
MonitorI->setToolTip("");
 
*/
NameEdit->setToolTip( tr("Name of selected object"));
Xpos->setToolTip( tr("Horizontal position of current basepoint"));
Ypos->setToolTip( tr("Vertical position of current basepoint"));
Width->setToolTip( tr("Width"));
Height->setToolTip( tr("Height"));
Rot->setToolTip( tr("Rotation of object at current basepoint"));
Rotation->setToolTip( tr("Rotation of object at current basepoint"));
basepointLabel->setToolTip( tr("Point from which measurements or rotation angles are referenced"));
// TopLeft->setToolTip( tr("Select top left for basepoint"));
// TopRight->setToolTip( tr("Select top right for basepoint"));
5221,25 → 5274,17
Ypos->setReadOnly(isLocked);
Width->setReadOnly(isLocked);
Height->setReadOnly(isLocked);
Rot->setReadOnly(isLocked);
Rotation->setReadOnly(isLocked);
QPalette pal(qApp->palette());
if (isLocked)
{
QPalette pal(qApp->palette());
pal.setCurrentColorGroup(QPalette::Disabled);
Xpos->setPalette(pal);
Ypos->setPalette(pal);
Width->setPalette(pal);
Height->setPalette(pal);
Rot->setPalette(pal);
}
else
{
Xpos->setPalette(qApp->palette());
Ypos->setPalette(qApp->palette());
Width->setPalette(qApp->palette());
Height->setPalette(qApp->palette());
Rot->setPalette(qApp->palette());
}
 
Xpos->setPalette(pal);
Ypos->setPalette(pal);
Width->setPalette(pal);
Height->setPalette(pal);
Rotation->setPalette(pal);
 
EditShape->setEnabled(!isLocked);
LayerGroup->setEnabled(!isLocked);
Locked->setChecked(isLocked);
5260,18 → 5305,13
b=true;
Width->setReadOnly(b);
Height->setReadOnly(b);
QPalette pal(qApp->palette());
if (b)
{
QPalette pal(qApp->palette());
pal.setCurrentColorGroup(QPalette::Disabled);
Width->setPalette(pal);
Height->setPalette(pal);
}
else
{
Width->setPalette(qApp->palette());
Height->setPalette(qApp->palette());
}
 
Width->setPalette(pal);
Height->setPalette(pal);
NoResize->setChecked(isSizeLocked);
}
 
/trunk/Scribus/scribus/actionmanager.cpp
293,6 → 293,7
connect( (*scrActions)["alignForced"], SIGNAL(triggeredData(int)), mainWindow, SLOT(setNewAlignment(int)));
 
//Shade actions
/*
scrActionGroups->insert("shade", new QActionGroup(mainWindow));
name="shadeOther";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), (*scrActionGroups).value("shade"), -1));
304,6 → 305,7
(*scrActions)[shadeName]->setToggleAction(true);
connect( (*scrActions)[shadeName], SIGNAL(triggeredData(int)), mainWindow, SLOT(setItemShade(int)));
}
*/
 
//Type Effects actions
scrActionGroups->insert("typeEffects", new QActionGroup(mainWindow));
1291,6 → 1293,7
(*scrActions)["alignBlock"]->setTexts( tr("&Block"));
(*scrActions)["alignForced"]->setTexts( tr("&Forced"));
 
/*
for (uint i=0; i<=100 ; i+=10)
{
QString shadeName=QString("shade%1").arg(i);
1298,6 → 1301,7
}
 
(*scrActions)["shadeOther"]->setTexts( tr("&Other..."));
*/
(*scrActions)["typeEffectNormal"]->setTexts( tr("&Normal"));
(*scrActions)["typeEffectUnderline"]->setTexts( tr("&Underline"));
(*scrActions)["typeEffectUnderlineWords"]->setTexts( tr("Underline &Words"));
1675,9 → 1679,9
itmenu->second << QString("fontSize%1").arg(font_sizes[s]);
itmenu->second << "fontSizeOther";
itmenu->second << "alignLeft" << "alignCenter" << "alignRight" << "alignBlock" << "alignForced";
for (uint i=0; i<=100 ; i+=10)
itmenu->second << QString("shade%1").arg(i);
itmenu->second << "shadeOther";
// for (uint i=0; i<=100 ; i+=10)
// itmenu->second << QString("shade%1").arg(i);
// itmenu->second << "shadeOther";
itmenu->second << "typeEffectNormal" << "typeEffectUnderline" << "typeEffectUnderlineWords" << "typeEffectStrikeThrough" << "typeEffectAllCaps" << "typeEffectSmallCaps" << "typeEffectSuperscript" << "typeEffectSubscript" << "typeEffectOutline" << "typeEffectShadow" << "styleImageEffects" << "styleTabulators";
//Item
++itmenu;
/trunk/Scribus/scribus/propertiespalette.h
197,10 → 197,10
void setSize(double s);
void setFontFace(const QString&);
void setExtra(double e);
void setDvals(double left, double top, double bottom, double right);
void setTextToFrameDistances(double left, double top, double bottom, double right);
void ChangeScaling();
void setLvalue(double scx, double scy, double x, double y);
void setSvalue(double s);
void setScaleAndOffset(double scx, double scy, double x, double y);
void setLineWidth(double s);
void setLIvalue(Qt::PenStyle p, Qt::PenCapStyle pc, Qt::PenJoinStyle pj);
void setFlop(FirstLineOffsetPolicy);
/// update TB values:
248,7 → 248,7
void NewY();
void NewW();
void NewH();
void NewRotation();
void setRotation();
void NewCornerRadius();
void NewLineSpacing();
void HandleGapSwitch();
538,7 → 538,7
ScrSpinBox* Xpos;
ScrSpinBox* Ypos;
ScrSpinBox* Height;
ScrSpinBox* Rot;
ScrSpinBox* Rotation;
ScrSpinBox* RoundRect;
ScrSpinBox* dGap;
ScrSpinBox* DTop;
/trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
396,7 → 396,7
// Force the braindead app to notice the changes
 
//FIXME emit or something so we dont need this
ScCore->primaryMainWindow()->propertiesPalette->setLvalue(item->imageXScale(), item->imageYScale(), item->imageXOffset(), item->imageYOffset());
ScCore->primaryMainWindow()->propertiesPalette->setScaleAndOffset(item->imageXScale(), item->imageYScale(), item->imageXOffset(), item->imageYOffset());
item->AdjustPictScale();
//ScCore->primaryMainWindow()->view->AdjustPictScale(item);
 
/trunk/Scribus/scribus/scribus.h
456,7 → 456,7
// Setzt die Brush-Farbe
void setBrushFarbe(QString farbe);
*/
void setCSMenu();
//CB: void setCSMenu();
/** Fragt nach den Farben */
// void GetBrushPen();
/** Erzeugt einen Rahmen */