Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 3628 → Rev 3629

/branches/Version13x/Scribus/scribus/tabtools.h
132,7 → 132,7
virtual void changeImageScalingRatio(int);
virtual void setSample();
virtual void setTool();
virtual void setFillChar();
virtual void setFillChar(int act);
virtual void setCustomFillChar(const QString &txt);
 
protected:
/branches/Version13x/Scribus/scribus/tabtools.cpp
736,8 → 736,7
connect(chainButton, SIGNAL(clicked()), this, SLOT(toggleChain()));
connect(scalingHorizontal, SIGNAL(valueChanged(int)), this, SLOT(hChange()));
connect(scalingVertical, SIGNAL(valueChanged(int)), this, SLOT(vChange()));
connect(tabFillCombo, SIGNAL(activated(int)), this, SLOT(setFillChar()));
connect(tabFillCombo, SIGNAL(textChanged(const QString &)), this, SLOT(setCustomFillChar(const QString &)));
connect(tabFillCombo, SIGNAL(activated(int)), this, SLOT(setFillChar(int)));
}
 
void TabTools::restoreDefaults()
749,7 → 748,7
if (txt == tr("Custom:"))
return;
disconnect(tabFillCombo, SIGNAL(textChanged(const QString &)), this, SLOT(setCustomFillChar(const QString &)));
disconnect(tabFillCombo, SIGNAL(activated(int)), this, SLOT(setFillChar()));
disconnect(tabFillCombo, SIGNAL(activated(int)), this, SLOT(setFillChar(int)));
QString ret = txt.right(1);
if (tabFillCombo->editable())
{
758,35 → 757,32
tabFillCombo->changeItem( tr("Custom: ")+ret, 4);
}
connect(tabFillCombo, SIGNAL(textChanged(const QString &)), this, SLOT(setCustomFillChar(const QString &)));
connect(tabFillCombo, SIGNAL(activated(int)), this, SLOT(setFillChar()));
connect(tabFillCombo, SIGNAL(activated(int)), this, SLOT(setFillChar(int)));
}
 
void TabTools::setFillChar()
void TabTools::setFillChar(int act)
{
disconnect(tabFillCombo, SIGNAL(textChanged(const QString &)), this, SLOT(setCustomFillChar(const QString &)));
disconnect(tabFillCombo, SIGNAL(activated(int)), this, SLOT(setFillChar()));
switch (tabFillCombo->currentItem())
disconnect(tabFillCombo, SIGNAL(activated(int)), this, SLOT(setFillChar(int)));
switch (act)
{
case 0:
tabFillCombo->setEditable(false);
break;
case 1:
tabFillCombo->setEditable(false);
break;
case 2:
tabFillCombo->setEditable(false);
break;
case 3:
tabFillCombo->setCurrentItem(act);
tabFillCombo->setEditable(false);
break;
case 4:
tabFillCombo->setEditable(true);
tabFillCombo->setEditText( tr("Custom:"));
tabFillCombo->setEditText( tr("Custom: "));
tabFillCombo->changeItem( tr("Custom: "), 4);
tabFillCombo->lineEdit()->setFocus();
tabFillCombo->lineEdit()->setCursorPosition( tr("Custom: ").length());
connect(tabFillCombo, SIGNAL(textChanged(const QString &)), this, SLOT(setCustomFillChar(const QString &)));
break;
}
connect(tabFillCombo, SIGNAL(activated(int)), this, SLOT(setFillChar()));
connect(tabFillCombo, SIGNAL(textChanged(const QString &)), this, SLOT(setCustomFillChar(const QString &)));
connect(tabFillCombo, SIGNAL(activated(int)), this, SLOT(setFillChar(int)));
}
 
/*!
/branches/Version13x/Scribus/scribus/scribusview.cpp
3250,13 → 3250,8
ClRe = *SelNode.at(itm);
currItem->OldB2 = currItem->Width;
currItem->OldH2 = currItem->Height;
if (ClRe != 0)
if (((ClRe != 0) && (SelNode.count() > 1)) || (SelNode.count() == 1))
MoveClipPoint(currItem, npf);
else
{
if (currItem->asPolyLine())
MoveClipPoint(currItem, npf);
}
}
currItem->OldB2 = currItem->Width;
currItem->OldH2 = currItem->Height;
/branches/Version13x/Scribus/scribus/pageitem_imageframe.cpp
87,12 → 87,12
}
else
{
p->save();
if (imageClip.size() != 0)
p->setupPolygon(&imageClip);
else
p->setupPolygon(&PoLine);
p->setClipPath();
p->save();
if (imageFlippedH())
{
p->translate(Width * sc, 0);