Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 1885 → Rev 1888

/branches/Version13x/Scribus/scribus/about.cpp
49,7 → 49,7
tabLayout1->addWidget( pixmapLabel1 );
buildID = new QLabel( tab, "BB" );
buildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1 %2 %3 ").arg("11").arg("April").arg("2005");
QString bu = tr("%1 %2 %3 ").arg("12").arg("April").arg("2005");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/charselect.cpp
33,7 → 33,7
extern QPixmap FontSample(QString da, int s, QString ts, QColor back, bool force = false);
extern int setBestEncoding(FT_Face face);
 
Zoom::Zoom(QWidget* parent, QPixmap pix, uint val) : QDialog( parent, "Edit", false, WStyle_Customize | WStyle_NoBorderEx | WType_Popup)
Zoom::Zoom(QWidget* parent, QPixmap pix, uint val) : QDialog( parent, "Edit", false, WStyle_Customize | WStyle_NoBorder)
{
int newwidth=pix.width()+2;
int newheight=pix.height()+20;
68,6 → 68,7
colA = 0;
ap = pl;
par = parent;
dia = 0;
QToolTip::add(this, tr("You can see a thumbnail if you press\nand hold down the right mouse button\n\nThe Insert key inserts a Glyph into the Selection below\nand the Delete key removes the last inserted one"));
}
 
121,6 → 122,7
dia = new Zoom(this, pixm, par->characters[r*16+c]);
QPoint ps = QCursor::pos();
dia->move(ps.x()-2, ps.y()-2);
dia->setModal(false);
dia->show();
}
/* if (e->button() == LeftButton)
138,8 → 140,12
watchTimer->stop();
if ((e->button() == RightButton) && (mPressed))
{
dia->close();
delete dia;
if (dia)
{
dia->close();
delete dia;
dia = 0;
}
}
if ((e->button() == LeftButton) && (!alternate))
emit selectChar(rowAt(e->pos().y()), columnAt(e->pos().x()));
608,12 → 614,12
p->setFillMode(1);
p->setupPolygon(&gly);
p->fillPath();
QTableItem *it = new QTableItem(zTabelle, QTableItem::Never, "", pixm);
zTabelle->setItem(a, b, it);
}
cc++;
p->end();
delete p;
QTableItem *it = new QTableItem(zTabelle, QTableItem::Never, "", pixm);
zTabelle->setItem(a, b, it);
if (cc >= maxCount)
break;
}
/branches/Version13x/Scribus/scribus/editformats.cpp
7,6 → 7,7
#include "scribusdoc.h"
#include "customfdialog.h"
#include "prefsfile.h"
#include "scribusXml.h"
 
extern QPixmap loadIcon(QString nam);
extern PrefsFile* prefsFile;
288,12 → 289,37
ChooseStyles* dia2 = new ChooseStyles(this, &TempVorl2, &TempVorl);
if (dia2->exec())
{
QStringList neededColors;
neededColors.clear();
QMap<QCheckListItem*, int>::Iterator it;
for (it = dia2->storedStyles.begin(); it != dia2->storedStyles.end(); ++it)
{
struct ParagraphStyle sty;
if (it.key()->isOn())
TempVorl.append(TempVorl2[it.data()]);
{
sty = TempVorl2[it.data()];
TempVorl.append(sty);
if ((!Docu->PageColors.contains(sty.SColor)) && (!neededColors.contains(sty.SColor)))
neededColors.append(sty.SColor);
if ((!Docu->PageColors.contains(sty.FColor)) && (!neededColors.contains(sty.FColor)))
neededColors.append(sty.FColor);
}
}
if (!neededColors.isEmpty())
{
ScriXmlDoc *ss = new ScriXmlDoc();
if (ss->ReadColors(selectedFile))
{
ColorList LColors = ss->Farben;
ColorList::Iterator itc;
for (itc = LColors.begin(); itc != LColors.end(); ++itc)
{
if (neededColors.contains(itc.key()))
Docu->PageColors.insert(itc.key(), itc.data());
}
}
delete ss;
}
}
UpdateFList();
}
/branches/Version13x/Scribus/scribus/pageitem.cpp
2381,6 → 2381,8
chma4.translate(hl->xco, hl->yco-(hl->Siz / 10.0));
gly.map(chma * chma2 * chma3 * chma4 * chma5);
p->setFillMode(1);
bool fr = p->fillRule();
p->setFillRule(false);
p->setupTextPolygon(&gly);
if (hl->ZFo->isStroked)
{
2399,6 → 2401,7
p->strokePath();
}
}
p->setFillRule(fr);
}
if (hl->Style & 16)
{
/branches/Version13x/Scribus/scribus/scribus.cpp
7552,6 → 7552,21
}
}
propertiesPalette->Spal->updateFormatList();
propertiesPalette->Cpal->SetColors(doc->PageColors);
propertiesPalette->updateCList();
ColorList::Iterator it;
ColorMenC->clear();
QPixmap pm = QPixmap(15, 15);
int ac = 0;
ColorMenC->insertItem( tr("None"));
for (it = doc->PageColors.begin(); it != doc->PageColors.end(); ++it)
{
pm.fill(doc->PageColors[it.key()].getRGBColor());
ColorMenC->insertItem(pm, it.key());
if (it.key() == doc->toolSettings.dBrush)
ColorMenC->setCurrentItem(ac);
ac++;
}
view->DrawNew();
slotDocCh();
}
/branches/Version13x/Scribus/scribus/scpainter.h
75,6 → 75,7
virtual void newPath();
virtual void fillPath();
virtual void setFillRule( bool fillRule );
virtual bool fillRule() { return m_fillRule; }
virtual void setFillMode( int fill );
virtual void setGradient( VGradient::VGradientType mode, FPoint orig, FPoint vec, FPoint foc = FPoint(0,0));
virtual void strokePath();