/trunk/Scribus/ChangeLogCVS |
---|
1,5 → 1,10 |
Changes since 1.2RC1 |
20.08.2004 |
* bug #977: Font spacing problem |
* bug #978: Selecting text font size box deselects text inside the Story Editor |
* bug #979: Some characters need to be presented as entity references when saving as template |
19.08.2004 |
* bug #547: multi-frame text disappears from later frames |
/trunk/Scribus/scribus/story.cpp |
---|
147,6 → 147,7 |
{ |
doc = docc; |
wasMod = false; |
StoredSel = false; |
StyledText.clear(); |
StyledText.setAutoDelete(true); |
ParagStyles.clear(); |
377,6 → 378,18 |
emit SideBarUpdate(); |
} |
void SEditor::focusOutEvent(QFocusEvent *e) |
{ |
if (hasSelectedText()) |
{ |
getSelection(&SelParaStart, &SelCharStart, &SelParaEnd, &SelCharEnd); |
StoredSel = true; |
} |
else |
StoredSel = false; |
QTextEdit::focusOutEvent(e); |
} |
void SEditor::insChars(QString t) |
{ |
int p, i, p2, ccab; |
979,6 → 992,11 |
{ |
int PStart, PEnd, SelStart, SelEnd, start, end; |
ChList *chars; |
if (StoredSel) |
{ |
setSelection(SelParaStart, SelCharStart, SelParaEnd, SelCharEnd); |
StoredSel = false; |
} |
getSelection(&PStart, &SelStart, &PEnd, &SelEnd); |
for (int pa = PStart; pa < PEnd+1; ++pa) |
{ |
2109,6 → 2127,7 |
{ |
nb2->Ptext.clear(); |
nb2->CPos = 0; |
nb2->Dirty = false; |
nb2 = nb2->NextBox; |
} |
Editor->saveItemText(nb); |
/trunk/Scribus/scribus/pageitem.cpp |
---|
597,6 → 597,18 |
if (!Doc->RePos) |
DrawZeichenS(p, &Zli3); |
} |
if (Ptext.count() > MaxChars) |
{ |
if (!Doc->RePos) |
{ |
double scp = QMAX(Doc->Scale, 1); |
p->setPen(black, 1 / scp, SolidLine, FlatCap, MiterJoin); |
p->setBrush(white); |
p->drawRect(Width-16 / scp, Height-16 / scp, 14 / scp, 14 / scp); |
p->drawLine(FPoint(Width-16 / scp, Height-16 / scp), FPoint(Width-3 / scp, Height-3 / scp)); |
p->drawLine(FPoint(Width-16 / scp, Height-3 / scp), FPoint(Width-3 / scp, Height-16 / scp)); |
} |
} |
Dirty = false; |
Redrawn = true; |
pf2.end(); |
/trunk/Scribus/scribus/libabout/about.cpp |
---|
56,7 → 56,7 |
tabLayout1->addWidget( PixmapLabel1 ); |
BuildID = new QLabel( tab, "BB" ); |
BuildID->setAlignment(Qt::AlignCenter); |
QString bu = tr("%1. %2 %3 ").arg("19").arg("August").arg("2004"); |
QString bu = tr("%1. %2 %3 ").arg("20").arg("August").arg("2004"); |
#ifdef HAVE_CMS |
bu += "C"; |
#else |
/trunk/Scribus/scribus/plugins/psimport/import.prolog |
---|
466,9 → 466,38 |
/ashow |
{ |
% ax ay string |
exch pop |
exch pop |
show |
exch /ydist exch def |
exch /xdist exch def |
userdict begin |
storeMatrix |
currentfont /FontName known |
% stack: string |
{ |
currentpoint % x y |
newpath |
/clipCnt 0 def |
moveto |
% we process each char separately to get smaller paths |
0 1 2 index length 1 sub |
{ |
(n\n)print % start polygon |
writecurrentcolor % write color |
storeMatrix |
currentpoint % x y |
newpath % clear graphic stack |
moveto |
1 index exch 1 getinterval false root_charpath |
{_move} {_line} {_curve} {_close} pathforall |
(f\n)print % close polygon |
} for |
currentpoint % x y |
exch xdist add exch |
ydist add |
newpath % clear graphic stack (and current point) |
moveto |
} if |
pop |
end |
} bind def |
/widthshow % cx cy char string |
/trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp |
---|
195,24 → 195,58 |
} |
} |
QDate now = QDate::currentDate(); |
QString tag = "\t<template category=\""+category+"\">\n"; |
tag += "\t\t<name>"+dia->nameEdit->text()+"</name>\n"; |
QString cat = QString(category); |
replaceIllegalChars(cat); |
QString tag = "\t<template category=\""+cat+"\">\n"; |
QString name = QString(dia->nameEdit->text()); |
replaceIllegalChars(name); |
tag += "\t\t<name>"+name+"</name>\n"; |
tag += "\t\t<file>"+file+"</file>\n"; |
tag += "\t\t<tnail>"+dia->nameEdit->text()+"tn.png"+"</tnail>\n"; |
tag += "\t\t<img>"+dia->nameEdit->text()+".png"+"</img>\n"; |
tag += "\t\t<psize>"+dia->psizeEdit->text()+"</psize>\n"; |
tag += "\t\t<color>"+dia->colorsEdit->text()+"</color>\n"; |
tag += "\t\t<descr>"+dia->descrEdit->text()+"</descr>\n"; |
tag += "\t\t<usage>"+dia->usageEdit->text()+"</usage>\n"; |
tag += "\t\t<scribus_version>" + QString(VERSION) + "</scribus_version>\n"; |
tag += "\t\t<date>" + now.toString(Qt::ISODate) + "</date>\n"; |
tag += "\t\t<author>"+dia->authorEdit->text()+"</author>\n"; |
tag += "\t\t<email>"+dia->emailEdit->text()+"</email>\n"; |
tag += "\t\t<tnail>"+name+"tn.png"+"</tnail>\n"; |
tag += "\t\t<img>"+name+".png"+"</img>\n"; |
QString psize = QString(dia->psizeEdit->text()); |
replaceIllegalChars(psize); |
tag += "\t\t<psize>"+psize+"</psize>\n"; |
QString colors = QString(dia->colorsEdit->text()); |
replaceIllegalChars(colors); |
tag += "\t\t<color>"+colors+"</color>\n"; |
QString descr = QString(dia->descrEdit->text()); |
replaceIllegalChars(descr); |
tag += "\t\t<descr>"+descr+"</descr>\n"; |
QString usage = QString(dia->usageEdit->text()); |
replaceIllegalChars(usage); |
tag += "\t\t<usage>"+usage+"</usage>\n"; |
QString scribus_version = QString(VERSION); |
replaceIllegalChars(scribus_version); |
tag += "\t\t<scribus_version>" + scribus_version + "</scribus_version>\n"; |
QString date = QString(now.toString(Qt::ISODate)); |
replaceIllegalChars(date); |
tag += "\t\t<date>" + date + "</date>\n"; |
QString author = QString(dia->authorEdit->text()); |
replaceIllegalChars(author); |
tag += "\t\t<author>"+author+"</author>\n"; |
QString email = QString(dia->emailEdit->text()); |
replaceIllegalChars(email); |
tag += "\t\t<email>"+email+"</email>\n"; |
tag += "\t</template>\n"; |
return tag; |
} |
void sat::replaceIllegalChars(QString& s) |
{ |
s.replace("&", "&"); |
s.replace("<", "<"); |
s.replace(">", ">"); |
s.replace(""", "\""); |
s.replace("'", "\'"); |
s.replace("&", "&"); |
s.replace("<", "<"); |
s.replace(">", ">"); |
s.replace("\"", """); |
s.replace("\'", "'"); |
} |
QString sat::findTemplateXml(QString dir) |
{ |
QString tmp = dir + "/template." + lang + ".xml"; |
/trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.h |
---|
56,6 → 56,7 |
void appendTmplXml(); |
QString getTemplateTag(); |
QString findTemplateXml(QString dir); |
void replaceIllegalChars(QString& s); |
public: |
void createTmplXml(); |
void createImages(); |
/trunk/Scribus/scribus/story.h |
---|
98,9 → 98,15 |
QString tBuffer; |
ChList cBuffer; |
int ClipData; |
bool StoredSel; |
int SelParaStart; |
int SelParaEnd; |
int SelCharStart; |
int SelCharEnd; |
protected: |
void keyPressEvent(QKeyEvent *k); |
void focusOutEvent(QFocusEvent *e); |
QPopupMenu* createPopupMenu(const QPoint & pos); |
public slots: |
/trunk/Scribus/scribus/po/scribus.pl_PL.ts |
---|
10206,7 → 10206,7 |
</message> |
<message> |
<source>HTML Files</source> |
<translation>Plików HTML</translation> |
<translation>Pliki HTML</translation> |
</message> |
<message> |
<source>html</source> |
10214,7 → 10214,7 |
</message> |
<message> |
<source>Text Files</source> |
<translation>Plików tekstowych</translation> |
<translation>Pliki tekstowe</translation> |
</message> |
<message> |
<source>Comma Separated Value Files</source> |
/trunk/Scribus/scribus/qm/scribus.pl.qm |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |