Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 5831 → Rev 5832

/branches/Version13x/Scribus/scribus/mpalette.h
46,10 → 46,11
class Cpalette;
class Autoforms;
class ArrowChooser;
class ScComboBox;
class ScribusMainWindow;
class UserActionSniffer;
extern bool CMSavail;
 
/*
class SCRIBUS_API LabelButton : public QLabel
{
Q_OBJECT
74,7 → 75,7
virtual void mousePressEvent(QMouseEvent*);
virtual void mouseReleaseEvent(QMouseEvent *);
};
 
*/
class SCRIBUS_API NameWidget : public QLineEdit
{
Q_OBJECT
362,7 → 363,8
QLabel* endArrowText;
 
LabelButton* colgapLabel;
// LabelButton* colgapLabel;
ScComboBox* colgapLabel;
StyleSelect* SeStyle;
AlignSelect* GroupAlign;
 
/branches/Version13x/Scribus/scribus/mpalette.cpp
40,7 → 40,7
using namespace std;
 
 
 
/*
LabelButton::LabelButton(QWidget* parent, QString text1, QString text2) : QLabel(parent)
{
state = true;
91,7 → 91,7
setLineWidth( 2 );
emit clicked();
}
 
*/
NameWidget::NameWidget(QWidget* parent) : QLineEdit(parent)
{}
 
360,9 → 360,10
DistanceLayout->addWidget( DCol, 0, 1 );
 
dGap = new MSpinBox( 0, 300, Distance, 1 );
colgapLabel = new LabelButton( Distance, "&Gap:", "&Width:");
colgapLabel->setBuddy(dGap);
DistanceLayout->addWidget( colgapLabel, 1, 0 );
// colgapLabel = new LabelButton( Distance, "&Gap:", "&Width:");
// colgapLabel->setBuddy(dGap);
colgapLabel = new ScComboBox( false, Distance, "colgapLabel" );
DistanceLayout->addWidget( colgapLabel, 1, 0, Qt::AlignLeft );
DistanceLayout->addWidget( dGap, 1, 1 );
 
DTop = new MSpinBox( 0, 300, Distance, 1 );
871,7 → 872,8
connect( LeftLine, SIGNAL( clicked() ), this, SLOT( HandleTLines() ) );
connect( RightLine, SIGNAL( clicked() ), this, SLOT( HandleTLines() ) );
connect( BottomLine, SIGNAL( clicked() ), this, SLOT( HandleTLines() ) );
connect( colgapLabel, SIGNAL( clicked() ), this, SLOT( HandleGapSwitch() ) );
// connect( colgapLabel, SIGNAL( clicked() ), this, SLOT( HandleGapSwitch() ) );
connect(colgapLabel, SIGNAL(activated(int)), this, SLOT(HandleGapSwitch()));
connect( Cpal, SIGNAL(NewSpecial(double, double, double, double )), this, SLOT(NewSpGradient(double, double, double, double )));
connect( Cpal, SIGNAL(editGradient()), this, SLOT(toggleGradientEdit()));
connect(startArrow, SIGNAL(activated(int)), this, SLOT(setStartArrow(int )));
1080,7 → 1082,8
DCol->setMinValue(1);
DCol->setValue(i2->Cols);
dGap->setMinValue(0);
if (colgapLabel->getState())
// if (colgapLabel->getState())
if (colgapLabel->currentItem() == 0)
{
dGap->setMaxValue(QMAX((i2->width() / i2->Cols - i2->textToFrameDistLeft() - i2->textToFrameDistRight())*Umrech, 0));
dGap->setValue(i2->ColGap*Umrech);
1280,7 → 1283,8
DCol->setMinValue(1);
DCol->setValue(i2->Cols);
dGap->setMinValue(0);
if (colgapLabel->getState())
// if (colgapLabel->getState())
if (colgapLabel->currentItem() == 0)
{
dGap->setMaxValue(QMAX((i2->width() / i2->Cols - i2->textToFrameDistLeft() - i2->textToFrameDistRight())*Umrech, 0));
dGap->setValue(i2->ColGap*Umrech);
1862,7 → 1866,8
if (i2!=0)
{
DCol->setMaxValue(QMAX(qRound(i2->width() / QMAX(i2->ColGap, 10.0)), 1));
if (colgapLabel->getState())
// if (colgapLabel->getState())
if (colgapLabel->currentItem() == 0)
{
dGap->setMaxValue(QMAX((i2->width() / i2->Cols - i2->textToFrameDistLeft() - i2->textToFrameDistRight())*Umrech, 0));
dGap->setValue(i2->ColGap*Umrech);
2594,7 → 2599,8
{
setCols(CurItem->Cols, CurItem->ColGap);
QToolTip::remove(dGap);
if (colgapLabel->getState())
// if (colgapLabel->getState())
if (colgapLabel->currentItem() == 0)
QToolTip::add( dGap, tr( "Distance between columns" ) );
else
QToolTip::add( dGap, tr( "Column width" ) );
2620,7 → 2626,8
return;
if ((HaveDoc) && (HaveItem))
{
if (colgapLabel->getState())
// if (colgapLabel->getState())
if (colgapLabel->currentItem() == 0)
CurItem->ColGap = dGap->value() / Umrech;
else
{
3866,7 → 3873,12
rndcornersLabel->setText( tr("R&ound\nCorners:"));
Distance->setTitle( tr("Distance of Text"));
columnsLabel->setText( tr("Colu&mns:"));
colgapLabel->setTexts( tr("&Gap:"), tr("&Width:"));
int oldcolgapLabel = colgapLabel->currentItem();
colgapLabel->clear();
colgapLabel->insertItem( tr("Gap:"));
colgapLabel->insertItem( tr("Width:"));
colgapLabel->setCurrentItem(oldcolgapLabel);
// colgapLabel->setTexts( tr("&Gap:"), tr("&Width:"));
topLabel->setText( tr("To&p:"));
bottomLabel->setText( tr("&Bottom:"));
leftLabel->setText( tr("&Left:"));
/branches/Version13x/Scribus/scribus/scribusview.cpp
7111,7 → 7111,8
if (currItem->locked())
return;
QRect oldR(currItem->getRedrawBounding(Scale));
if ((Doc->RotMode != 0) && (m_MouseButtonPressed))
// if ((Doc->RotMode != 0) && (m_MouseButtonPressed))
if (Doc->RotMode != 0)
{
QWMatrix ma;
ma.translate(currItem->xPos(), currItem->yPos());
7147,11 → 7148,11
MoveItem(x-currItem->xPos(), y-currItem->yPos(), currItem);
currItem->Sizing = oldS;
}
else
/* else
{
currItem->setRotation(win);
Doc->setRedrawBounding(currItem);
}
} */
QRect newR(currItem->getRedrawBounding(Scale));
updateContents(newR.unite(oldR));
//emit SetAngle(currItem->rotation());