Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 27 → Rev 28

/trunk/Scribus/ChangeLogCVS
1,4 → 1,9
Changes since Version 0.9.10
10.06.2003 multiline.cpp Added Workaround for a Bug in Qt-3.1.2
page.cpp Improved Text to Path
scribus.cpp Compile Fix for Qt-3.0.x
scribusXml.cpp Added Saving of Linestyles.
 
09.06.2003 lineformats.cpp
multiline.cpp Added Support for Named Linestyles, allowing to have
Paths stroked with multiple Lines.
15,7 → 20,7
pageitem.cpp
serializer.cpp Fixed various Bugs with the Textbox and Styles.
 
02.06.2003 svgexplugin.cpp Improved Image Support, Images are now save as PNG-Images in the
02.06.2003 svgexplugin.cpp Improved Image Support, Images are now saved as PNG-Images in the
same Folder as the SVG File.
preview.cpp Added New Plugin for Print Preview.
Needs Ghostscript to work.
/trunk/Scribus/scribus/lineformats.cpp
153,5 → 153,11
EditB->setEnabled(false);
DeleteB->setEnabled(false);
}
else
{
EditB->setEnabled(true);
DublicateB->setEnabled(true);
DeleteB->setEnabled(true);
}
connect(ListBox1, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selFormat(QListBoxItem*)));
}
/trunk/Scribus/scribus/libabout/about.cpp
32,7 → 32,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = "09. June 2003 ";
QString bu = "10. June 2003 ";
#ifdef HAVE_FREETYPE
bu += "F";
#else
/trunk/Scribus/scribus/scribus.cpp
2986,9 → 2986,13
void ScribusApp::ClipChange()
{
QString cc;
#if QT_VERSION >= 0x030100
cc = ClipB->text(QClipboard::Clipboard);
if (cc.isNull())
cc = ClipB->text(QClipboard::Selection);
#else
cc = ClipB->text();
#endif
editMenu->setItemEnabled(edid3, 0);
if (!cc.isNull())
{
3685,9 → 3689,13
}
}
QString cc;
#if QT_VERSION >= 0x030100
cc = ClipB->text(QClipboard::Clipboard);
if (cc.isNull())
cc = ClipB->text(QClipboard::Selection);
#else
cc = ClipB->text();
#endif
editMenu->setItemEnabled(edid3, 0);
if (!cc.isNull())
{
5374,7 → 5382,6
}
if (!getPDFDriver(fn, nam, Components, frPa, toPa, thumbs))
QMessageBox::warning(this, tr("Warning"), tr("Can't write the File: \n%1").arg(fn), tr("OK"));
// BuildFontMenu();
qApp->setOverrideCursor(QCursor(arrowCursor), true);
}
delete dia;
5499,6 → 5506,7
{
BuildFontMenu();
Mpal->Spal->updateFList();
Mpal->SetLineFormats(docc);
docc->ActPage->update();
slotDocCh();
docc->UnDoValid = false;
5555,13 → 5563,6
DatSav->setEnabled(false);
DatOpe->setEnabled(false);
DatClo->setEnabled(false);
/* fileMenu->setItemEnabled(fid1, 0);
fileMenu->setItemEnabled(fid4, 0);
fileMenu->setItemEnabled(fid5, 0);
fileMenu->setItemEnabled(fid51, 0);
fileMenu->setItemEnabled(fid12, 0);
fileMenu->setItemEnabled(fid13, 0);
fileMenu->setItemEnabled(fid14, 0); */
fileMenu->setEnabled(false);
doc->TemplateMode = true;
Sepal->DisablePal();
/trunk/Scribus/scribus/multiline.cpp
226,7 → 226,13
break;
}
tmp2 += " ";
Styles->changeItem(pm, tmp2, CurLin);
if (Styles->count() == 1) // to avoid Bug in Qt-3.1.2
{
Styles->clear();
Styles->insertItem(pm, tmp2);
}
else
Styles->changeItem(pm, tmp2, CurLin);
}
 
void MultiLine::reSort()
/trunk/Scribus/scribus/page.cpp
4739,6 → 4739,8
continue;
}
pts = traceCharacter(b, chx, a, &x, &y);
if (pts.size() == 0)
continue;
uint z = PaintPoly(b->Xpos, b->Ypos, b->Width, b->Height, b->Pwidth, b->Pcolor2, b->Pcolor);
bb = Items.at(z);
bb->PoLine = pts;
4770,7 → 4772,7
bb->ClipEdited = true;
SelItem.append(bb);
}
if (SelItem.count() != 0)
if (SelItem.count() > 1)
{
for (uint ag = 0; ag < SelItem.count(); ++ag)
{
/trunk/Scribus/scribus/scribusXml.cpp
1153,6 → 1153,7
QFont fo;
QMap<QString,QString> DoFonts;
QMap<uint,QString> DoVorl;
QMap<QString,QString> DoMul;
uint VorlC;
bool fou;
bool VorLFound = false;
1227,14 → 1228,32
}
if(pg.tagName()=="COLOR")
{
if (pg.hasAttribute("CMYK"))
lf.setNamedColor(pg.attribute("CMYK"));
else
lf.fromQColor(QColor(pg.attribute("RGB")));
if (!doc->PageColors.contains(pg.attribute("NAME")))
doc->PageColors[pg.attribute("NAME")] = lf;
}
if(pg.tagName()=="MultiLine")
{
multiLine ml;
QDomNode MuLn = DOC.firstChild();
while(!MuLn.isNull())
{
if (pg.hasAttribute("CMYK"))
lf.setNamedColor(pg.attribute("CMYK"));
else
lf.fromQColor(QColor(pg.attribute("RGB")));
doc->PageColors[pg.attribute("NAME")] = lf;
QDomElement MuL = MuLn.toElement();
struct singleLine sl;
sl.Color = MuL.attribute("Color");
sl.Dash = QStoInt(MuL.attribute("Dash"));
sl.LineEnd = QStoInt(MuL.attribute("LineEnd"));
sl.LineJoin = QStoInt(MuL.attribute("LineJoin"));
sl.Shade = QStoInt(MuL.attribute("Shade"));
sl.Width = QStoFloat(MuL.attribute("Width"));
ml.append(sl);
MuLn = MuLn.nextSibling();
}
if (!doc->MLineStyles.contains(pg.attribute("Name")))
doc->MLineStyles.insert(pg.attribute("Name"), ml);
}
if(pg.tagName()=="STYLE")
{
1803,6 → 1822,26
elem.appendChild(fo);
}
}
QMap<QString,multiLine>::Iterator itMU;
for (itMU = doc->MLineStyles.begin(); itMU != doc->MLineStyles.end(); ++itMU)
{
QDomElement MuL=docu.createElement("MultiLine");
MuL.setAttribute("Name",itMU.key());
multiLine ml = itMU.data();
multiLine::Iterator itMU2;
for (itMU2 = ml.begin(); itMU2 != ml.end(); ++itMU2)
{
QDomElement SuL=docu.createElement("SubLine");
SuL.setAttribute("Color", (*itMU2).Color);
SuL.setAttribute("Shade", (*itMU2).Shade);
SuL.setAttribute("Dash", (*itMU2).Dash);
SuL.setAttribute("LineEnd", (*itMU2).LineEnd);
SuL.setAttribute("LineJoin", (*itMU2).LineJoin);
SuL.setAttribute("Width", (*itMU2).Width);
MuL.appendChild(SuL);
}
elem.appendChild(MuL);
}
return docu.toString().utf8();
}