Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 3533 → Rev 3534

/branches/Version13x/Scribus/scribus/cpalette.cpp
172,7 → 172,7
gradEdit->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
GradientMode = false;
layout()->activate();
updateCList();
//updateCList();
repaint();
}
emit QueryItem();
206,7 → 206,7
}
}
layout()->activate();
updateCList();
//updateCList();
repaint();
}
emit QueryItem();
224,10 → 224,11
disconnect(colorListQLBox, SIGNAL(clicked(QListBoxItem*)), this, SLOT(selectColor(QListBoxItem*)));
disconnect(colorListQLBox, SIGNAL(selected(QListBoxItem*)), this, SLOT(selectColor(QListBoxItem*)));
colorListQLBox->clear();
ColorList::Iterator it;
if ((!GradientMode) || (Mode == 1))
colorListQLBox->insertItem( tr("None"));
for (it = colorList.begin(); it != colorList.end(); ++it)
ColorList::Iterator it;
ColorList::Iterator itend=colorList.end();
for (it = colorList.begin(); it != itend; ++it)
{
ScColor col = colorList[it.key()];
QPixmap * pm = getFancyPixmap(col);
272,17 → 273,17
{
disconnect(colorListQLBox, SIGNAL(clicked(QListBoxItem*)), this, SLOT(selectColor(QListBoxItem*)));
disconnect(colorListQLBox, SIGNAL(selected(QListBoxItem*)), this, SLOT(selectColor(QListBoxItem*)));
ColorList::Iterator it;
int c = 0;
if ((colorName != "None") && (!colorName.isEmpty()))
{
if (!GradientMode)
c++;
for (it = colorList.begin(); it != colorList.end(); ++it)
++c;
ColorList::Iterator itend=colorList.end();
for (ColorList::Iterator it = colorList.begin(); it != itend; ++it)
{
if (it.key() == colorName)
break;
c++;
++c;
}
}
colorListQLBox->setCurrentItem(c);
360,12 → 361,12
switch (number)
{
case 0:
updateCList();
//updateCList();
PM1->setValue(Shade3);
updateBoxS(Color3);
break;
default:
updateCList();
//updateCList();
PM1->setValue(Shade);
updateBoxS(Color);
break;
/branches/Version13x/Scribus/scribus/scribusview.cpp
9009,7 → 9009,7
void ScribusView::GotoPa(int Seite)
{
GotoPage(Seite-1);
ScApp->setFocus();
//ScApp->setFocus();
}
 
void ScribusView::ChgUnit(int art)