Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 190 → Rev 191

/trunk/Scribus/ChangeLogCVS
1,4 → 1,6
Changes since Version 1.1.4
11.02.2004 Updated the Ukrainian Translation.
 
10.02.2004 Updated the Finnish and CzechTranslation.
Added a CMYK Preview to the Print Preview.
 
/trunk/Scribus/scribus/story.cpp
227,15 → 227,17
Form1Layout = new QVBoxLayout( this, 5, 5, "Form1Layout");
edList.clear();
stList.clear();
QString tmp[] = { tr("Left"), tr("Center"), tr("Right"), tr("Block"), tr("Forced")};
size_t ar = sizeof(tmp) / sizeof(*tmp);
for (uint a = 0; a < ar; ++a)
style.append(tmp[a]);
style.clear();
if (doc->Vorlagen.count() > 5)
{
{
for (uint a = 5; a < doc->Vorlagen.count(); ++a)
style.append(doc->Vorlagen[a].Vname);
}
}
style.sort();
QString tmp[] = { tr("Forced"), tr("Block"), tr("Right"), tr("Center"), tr("Left") };
size_t ar = sizeof(tmp) / sizeof(*tmp);
for (uint a = 0; a < ar; ++a)
style.prepend(tmp[a]);
CurrItem = ite;
 
fmenu = new QPopupMenu();
433,9 → 435,10
CharC2->setText(tmp.setNum(counter1-1));
}
 
void StoryEditor::closeEvent(QCloseEvent *)
void StoryEditor::closeEvent(QCloseEvent *event)
{
Do_leave();
if (!event->isAccepted())
Do_leave();
}
 
void StoryEditor::Do_leave()
551,6 → 554,17
if (a < edList.count()-1)
ss->Objekt += QChar(10);
int st = cp->currentItem();
if (st > 4)
{
for (uint x = 5; x < doc->Vorlagen.count(); ++x)
{
if (doc->Vorlagen[x].Vname == cp->text(st))
{
st = x;
break;
}
}
}
ss->GetText(nb, st, doc->Vorlagen[st].Font, doc->Vorlagen[st].FontSize, first);
delete ss;
first = true;
585,15 → 599,16
QComboBox *ct;
emit EditSt();
style.clear();
QString tmp[] = { tr("Left"), tr("Center"), tr("Right"), tr("Block"), tr("Forced")};
size_t ar = sizeof(tmp) / sizeof(*tmp);
for (uint a = 0; a < ar; ++a)
style.append(tmp[a]);
if (doc->Vorlagen.count() > 5)
{
for (uint a = 5; a < doc->Vorlagen.count(); ++a)
style.append(doc->Vorlagen[a].Vname);
}
style.sort();
QString tmp[] = { tr("Forced"), tr("Block"), tr("Right"), tr("Center"), tr("Left") };
size_t ar = sizeof(tmp) / sizeof(*tmp);
for (uint a = 0; a < ar; ++a)
style.prepend(tmp[a]);
for (uint b = 0; b < stList.count(); ++b)
{
ct = stList.at(b);
613,9 → 628,23
void StoryEditor::styleChange(int st)
{
int r = stList.findRef((QComboBox*)sender());
int align = st > 4 ? doc->Vorlagen[st].Ausri : st;
if (r != -1)
{
QComboBox *c = stList.at(r);
int align;
if (st > 4)
{
for (uint x = 5; x < doc->Vorlagen.count(); ++x)
{
if (doc->Vorlagen[x].Vname == c->text(st))
{
align = x;
break;
}
}
}
else
align = st;
SEditor *tt = dynamic_cast<SEditor*>(table1->cellWidget(r, 1));
switch (align)
{
661,6 → 690,17
cp->setText(text);
table1->adjHeight(where);
connect(ct, SIGNAL(highlighted(int)), this, SLOT(styleChange(int)));
if (sty > 4)
{
for (uint x = 5; x < doc->Vorlagen.count(); ++x)
{
if (doc->Vorlagen[x].Vname == ct->text(sty))
{
sty = x;
break;
}
}
}
ct->setCurrentItem(sty);
disconnect(ct, SIGNAL(highlighted(int)), this, SLOT(styleChange(int)));
cp->setFocus();
/trunk/Scribus/scribus/libabout/about.cpp
54,7 → 54,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg(10).arg("February").arg(2004);
QString bu = tr("%1. %2 %3 ").arg(11).arg("February").arg(2004);
#ifdef HAVE_CMS
bu += "C";
#else
81,25 → 81,25
tabLayout->setSpacing( 6 );
tabLayout->setMargin( 10 );
TextView1 = new QTextView( tab_2, "TextView1" );
TextView1->setText( "<table><tr><td><b>" + tr("Programming:") + "</b></td><td> </td></tr>" +
TextView1->setText(QString::fromUtf8("<table><tr><td><b>" + tr("Programming:").utf8() + "</b></td><td> </td></tr>" +
"<tr><td>Franz Schmid</td><td>Franz.Schmid@altmuehlnet.de</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Contributions from:") + "</b></td><td></td></tr>" +
"<tr><td><b>" + tr("Contributions from:").utf8() + "</b></td><td></td></tr>" +
"<tr><td>Paul F. Johnson</td><td>paul@all-the-johnsons.co.uk</td></tr>" +
"<tr><td>Craig Bradney</td><td>cbradney@zip.com.au</td></tr>" +
"<tr><td>Alessandro Rimoldi</td><td>http://ideale.ch/contact</td></tr>" +
"<tr><td>Christian Tpp</td><td>mr-ct@gmx.de</td></tr>" +
"<tr><td>Christian Töpp</td><td>mr-ct@gmx.de</td></tr>" +
"<tr><td>Alastair Robinson</td><td>blackfive@fakenhamweb.co.uk</td></tr>" +
"<tr><td></td><td> </td></tr>" +
#if (_MSC_VER >= 1200)
"<tr><td><b>" + tr("Windows port:") + "</b></td><td> </td></tr>" +
"<tr><td><b>" + tr("Windows port:").utf8() + "</b></td><td> </td></tr>" +
"<tr><td>Paul F. Johnson</td><td>paul@all-the-johnsons.co.uk</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
#endif
"<tr><td><b>" + tr("Documentation:") + "</b></td><td></td></tr>" +
"<tr><td><b>" + tr("Documentation:").utf8() + "</b></td><td></td></tr>" +
"<tr><td>Peter Linnell</td><td>scribusdocs@atlantictechsolutions.com</td></tr>" +
"<tr><td>Yves Ceccone</td><td>yves@yeccoe.org</td></tr>" +
"<tr><td>Thomas Zastrow</td><td>webmaster@thomas-zastrow.de</td></tr></table>");
"<tr><td>Thomas Zastrow</td><td>webmaster@thomas-zastrow.de</td></tr></table>"));
TextView1->setTextFormat( QTextView::RichText );
tabLayout->addWidget( TextView1 );
TabWidget2->insertTab( tab_2, tr( "Authors" ) );
108,72 → 108,72
tabLayout_2->setSpacing( 6 );
tabLayout_2->setMargin( 10 );
TextView2 = new QTextView( tab_3, "TextView1_2" );
TextView2->setText( "<table><tr><td><b>" + tr("German:") + "</b></td><td> </td></tr>" +
TextView2->setText(QString::fromUtf8( "<table><tr><td><b>" + tr("German:").utf8() + "</b></td><td> </td></tr>" +
"<tr><td>Franz Schmid</td><td>Franz.Schmid@altmuehlnet.de</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("French:") + "</b></td><td> </td>" +
"<tr><td><b>" + tr("French:").utf8() + "</b></td><td> </td>" +
"<tr><td>Michel Briand</td><td>michelbriand@free.fr</td></tr>" +
"<tr><td>Yves Ceccone</td><td>yves@yeccoe.org</td></tr>" +
"<tr><td>Nicolas Boos</td><td>nicolas.boos@wanadoo.fr</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Spanish and Catalan:") + "</b></td><td> </td></tr>" +
"<tr><td><b>" + tr("Spanish and Catalan:").utf8() + "</b></td><td> </td></tr>" +
"<tr><td>Josep Febrer</td><td>josep@linuxmail.org</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Italian:") + "</b></td><td> </td></tr>" +
"<tr><td>Giovanni Biczs</td><td>gbiczo@freestart.hu</td></tr>" +
"<tr><td><b>" + tr("Italian:").utf8() + "</b></td><td> </td></tr>" +
"<tr><td>Giovanni Biczó</td><td>gbiczo@freestart.hu</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Hungarian:") + "</b></td><td> </td></tr>" +
"<tr><td>Giovanni Bicz</td><td>gbiczo@freestart.hu</td></tr>" +
"<tr><td><b>" + tr("Hungarian:").utf8() + "</b></td><td> </td></tr>" +
"<tr><td>Giovanni Biczó</td><td>gbiczo@freestart.hu</td></tr>" +
"<tr><td>Bence Nagy</td><td>scribus@tipogral.hu</td></tr>" +
"<tr><td>Zolt? Bszrm?yi</td><td>zboszor@freemail.hu</td></tr>" +
"<tr><td>Zoltán Böszörményi</td><td>zboszor@freemail.hu</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Ukrainian:") + "</b></td><td> </td></tr>" +
"<tr><td><b>" + tr("Ukrainian:").utf8() + "</b></td><td> </td></tr>" +
"<tr><td>Sergiy Kudryk</td><td>kudryk@yahoo.com</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Bulgarian:") + "</b></td><td> </td></tr>" +
"<tr><td><b>" + tr("Bulgarian:").utf8() + "</b></td><td> </td></tr>" +
"<tr><td>Vasko Tomanov</td><td>vasko@web.bg</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Galician:") + "</b></td><td> </td></tr>" +
"<tr><td><b>" + tr("Galician:").utf8() + "</b></td><td> </td></tr>" +
"<tr><td>Manuel Anxo Rei</td><td>manxopar@avogaciagalega.org</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Turkish:") + "</b></td><td> </td></tr>" +
"<tr><td><b>" + tr("Turkish:").utf8() + "</b></td><td> </td></tr>" +
"<tr><td>Erkan Kaplan</td><td>Selamsana@uni.de</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Lithuanian:") + "</b></td><td> </td></tr>" +
"<tr><td><b>" + tr("Lithuanian:").utf8() + "</b></td><td> </td></tr>" +
"<tr><td>Aivaras Kirejevas</td><td>kiras@mail.lt</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Polish:") + "</b></td><td> </td></tr>" +
"<tr><td>Maciej Haski</td><td>m.hanski@gmx.at</td></tr>" +
"<tr><td><b>" + tr("Polish:").utf8() + "</b></td><td> </td></tr>" +
"<tr><td>Maciej Hański</td><td>m.hanski@gmx.at</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Czech:") + "</b></td><td></td></tr>" +
"<tr><td>Petr Van�</td><td>subzero@py.cz</td></tr>" +
"<tr><td><b>" + tr("Czech:").utf8() + "</b></td><td></td></tr>" +
"<tr><td>Petr Vaněk</td><td>subzero@py.cz</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Slovak:") + "</b></td><td></td></tr>" +
"<tr><td>Zdenko Podobn</td><td>zdpo@mailbox.sk</td></tr>" +
"<tr><td><b>" + tr("Slovak:").utf8() + "</b></td><td></td></tr>" +
"<tr><td>Zdenko Podobn&yacute;ý</td><td>zdpo@mailbox.sk</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Danish:") + "</b></td><td></td></tr>" +
"<tr><td><b>" + tr("Danish:").utf8() + "</b></td><td></td></tr>" +
"<tr><td>Morten Langlo</td><td>mlanglo@post6.tele.dk</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Norwegian:") + "</b></td><td></td></tr>" +
"<tr><td><b>" + tr("Norwegian:").utf8() + "</b></td><td></td></tr>" +
"<tr><td>Klaus Ade Johnstad</td><td>klaus@astro.uio.no</td></tr>" +
"<tr><td>Johannes Wilm</td><td>j@indymedia.no</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("English:") + "</b></td><td></td></tr>" +
"<tr><td><b>" + tr("English:").utf8() + "</b></td><td></td></tr>" +
"<tr><td>Paul F. Johnson</td><td>paul@all-the-johnsons.co.uk</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Welsh:") + "</b></td><td></td></tr>" +
"<tr><td><b>" + tr("Welsh:").utf8() + "</b></td><td></td></tr>" +
"<tr><td>Kevin Donnelly</td><td>kevin@dotmon.com</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Russian:") + "</b></td><td></td></tr>" +
"<tr><td><b>" + tr("Russian:").utf8() + "</b></td><td></td></tr>" +
"<tr><td>Alexandre Prokoudine</td><td>techwriter@land.ru</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Brazilian:") + "</b></td><td></td></tr>" +
"<tr><td><b>" + tr("Brazilian:").utf8() + "</b></td><td></td></tr>" +
"<tr><td>Celio Santos</td><td>celio@electronic.srv.br</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Finnish:") + "</b></td><td></td></tr>" +
"<tr><td><b>" + tr("Finnish:").utf8() + "</b></td><td></td></tr>" +
"<tr><td>Riku Leino</td><td>tsoots@welho.com</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"</table>");
"</table>"));
TextView2->setTextFormat( QTextView::RichText );
tabLayout_2->addWidget( TextView2 );
TabWidget2->insertTab( tab_3, tr( "Translations" ) );
/trunk/Scribus/scribus/plugins/printpreview/preview.cpp
103,11 → 103,11
Layout3->setMargin(0);
AliasText = new QCheckBox(this, "TextAntiAlias");
AliasText->setText( tr("Anti-alias Text"));
AliasText->setChecked(true);
AliasText->setChecked(false);
Layout2->addWidget(AliasText);
AliasGr = new QCheckBox(this, "GraphicsAntiAlias");
AliasGr->setText( tr("Anti-alias Graphics"));
AliasGr->setChecked(true);
AliasGr->setChecked(false);
Layout2->addWidget(AliasGr);
AliasTr = new QCheckBox(this, "DisplayTransparency");
AliasTr->setText( tr("Display Transparency"));
318,20 → 318,19
for (int x=0; x < w2; x += 4 )
{
cyan = uchar(imgc[(y * w2) + x]);
magenta = uchar(imgc[(y * w2) + x + 1]);
yellow = uchar(imgc[(y * w2) + x + 2]);
black = uchar(imgc[(y * w2)+ x + 3]);
if (!EnableCMYK_C->isChecked())
cyan = 0;
if (!EnableCMYK_M->isChecked())
magenta = 0;
if (!EnableCMYK_Y->isChecked())
yellow = 0;
if (!EnableCMYK_K->isChecked())
black = 0;
CMYKColor color = CMYKColor(cyan, magenta, yellow, black);
*p = color.getRGBColor().rgb() | 0xff000000;
p++;
magenta = uchar(imgc[(y * w2) + x + 1]);
yellow = uchar(imgc[(y * w2) + x + 2]);
black = uchar(imgc[(y * w2)+ x + 3]);
if (!EnableCMYK_C->isChecked())
cyan = 0;
if (!EnableCMYK_M->isChecked())
magenta = 0;
if (!EnableCMYK_Y->isChecked())
yellow = 0;
if (!EnableCMYK_K->isChecked())
black = 0;
*p = qRgba(255-QMIN(255, cyan+black), 255-QMIN(255,magenta+black), 255-QMIN(255,yellow+black), 255);
p++;
}
}
}
338,11 → 337,11
else
{
image.load(app->PrefsPfad+"/sc.png");
image = image.convertDepth(32);
image = image.convertDepth(32);
}
Bild.convertFromImage(image);
system("rm -f "+app->PrefsPfad+"/sc.png");
}
}
system("rm -f "+app->PrefsPfad+"/tmp.ps");
return Bild;
}
/trunk/Scribus/scribus/po/scribus.uk.ts
327,7 → 327,7
</message>
<message>
<source>Error during EPS-Export</source>
<translation type="unfinished">Помилка під час експорту EPS файлу</translation>
<translation>Помилка під час експорту EPS файлу</translation>
</message>
<message>
<source>Flip vertical</source>
419,7 → 419,7
</message>
<message>
<source>Error creating PDF-File..</source>
<translation type="unfinished">Помилка створення файла PDF</translation>
<translation>Помилка створення файла PDF</translation>
</message>
<message>
<source>Insert Rectangles</source>
1003,7 → 1003,7
</message>
<message>
<source>Output to File:</source>
<translation type="unfinished">Результат записати до файлу</translation>
<translation>Результат записати до файлу</translation>
</message>
<message>
<source>Linespacing</source>
3264,6 → 3264,10
<source>Copy of %1</source>
<translation>Копія %1</translation>
</message>
<message>
<source>Remove Unused</source>
<translation>Видалити невикористані</translation>
</message>
</context>
<context>
<name>FontPrefs</name>
5055,6 → 5059,31
<source>All</source>
<translation>Все</translation>
</message>
<message>
<source>Display Transparency</source>
<translation>Показувати прозорість</translation>
</message>
<message>
<source>Display CMYK</source>
<translation>Показувати CMYK</translation>
</message>
<message>
<source>C</source>
<translation>
C</translation>
</message>
<message>
<source>M</source>
<translation>M</translation>
</message>
<message>
<source>Y</source>
<translation>Y</translation>
</message>
<message>
<source>K</source>
<translation>K</translation>
</message>
</context>
<context>
<name>Page</name>
7703,7 → 7732,7
<name>StoryEditor</name>
<message>
<source>Story Editor</source>
<translation>Внутрішній редактор</translation>
<translation>Редактор тексту</translation>
</message>
<message>
<source>New</source>
7755,7 → 7784,7
</message>
<message>
<source>Update Textframe</source>
<translation>Обновити вміст текстової рамки</translation>
<translation>Поновити вміст текстової рамки</translation>
</message>
<message>
<source>File</source>
7841,6 → 7870,10
<source>Update Text Frame</source>
<translation>Обновити вміст текстової рамки</translation>
</message>
<message>
<source>Search/Replace...</source>
<translation>Пошук/Заміна...</translation>
</message>
</context>
<context>
<name>StyleSelect</name>
/trunk/Scribus/scribus/qm/scribus.uk.qm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream