/trunk/Scribus/ChangeLogCVS |
---|
1,5 → 1,14 |
Changes since 1.2RC1 |
24.08.2004 |
* bug #263: distribute items shuffles the order of the items |
* bug #991: layer selector doesnt reflect the order of the layers |
* bug #996: Changing paragraph style in story editor then exit and text frame does not redraw, then goes blank |
* bug #998: Story Editor adds lines after paragraphs |
* bug #999: PDF Elements lose names on save |
* feature #993: New french translators |
* feature #995: Update of russian translation |
23.08.2004 |
* bug #804: Color tab for fill/line color doesn't jump to the specific color when entering the beginning character |
* bug #960: Python scripting only accepts text in Latin1 |
/trunk/Scribus/scribus/mpalette.cpp |
---|
994,7 → 994,7 |
DRight->setDecimals(10); |
LSize->setMaxValue( 36 ); |
LSize->setMinValue( 0 ); |
Dist->setMaxValue( 300 ); |
Dist->setMaxValue( 30000 ); |
Dist->setMinValue( 0 ); |
Dist->setLineStep(10); |
LineW->setMaxValue( 300 ); |
/trunk/Scribus/scribus/annot.cpp |
---|
12,6 → 12,7 |
#include "selfield.h" |
#include "customfdialog.h" |
#include "buttonicon.h" |
#include "mpalette.h" |
#include <qstringlist.h> |
#include <qdatetime.h> |
#include <qimage.h> |
87,9 → 88,10 |
Tip->setText(item->AnToolTip); |
Layout60->addWidget( Tip, 1, 1 ); |
Name = new QLineEdit( GroupBox10, "Name" ); |
Name = new NameWidget(GroupBox10); |
Name->setText(item->AnName); |
Layout60->addWidget( Name, 0, 1 ); |
OldName = item->AnName; |
TextLabel30 = new QLabel( GroupBox10, "TextLabel3" ); |
TextLabel30->setText( tr( "Tool-Tip:" ) ); |
1072,6 → 1074,7 |
connect(PlaceIcon, SIGNAL(clicked()), this, SLOT(IPlace())); |
connect(ChFile, SIGNAL(clicked()), this, SLOT(GetFile())); |
connect(LExtern, SIGNAL(clicked()), this, SLOT(SetExternL())); |
connect(Name, SIGNAL(Leaved()), this, SLOT(NewName())); |
QToolTip::add(NoSpell, tr( "Flag is ignored for PDF 1.3" ) ); |
QToolTip::add(NoScroll, tr( "Flag is ignored for PDF 1.3" ) ); |
QToolTip::add(CalcFields, tr( "Enter a comma separated list of fields here" ) ); |
1083,6 → 1086,35 |
Annot::~Annot() |
{} |
void Annot::NewName() |
{ |
QString NameNew = Name->text(); |
if (NameNew == "") |
{ |
Name->setText(OldName); |
return; |
} |
bool found = false; |
for (uint a = 0; a < view->Pages.count(); ++a) |
{ |
for (uint b = 0; b < view->Pages.at(a)->Items.count(); ++b) |
{ |
if ((NameNew == view->Pages.at(a)->Items.at(b)->AnName) && (view->Pages.at(a)->Items.at(b) != item)) |
{ |
found = true; |
break; |
} |
} |
if (found) |
break; |
} |
if (found) |
{ |
Name->setText(OldName); |
Name->setFocus(); |
} |
} |
void Annot::IPlace() |
{ |
ButtonIcon* dia = new ButtonIcon(this, item); |
1659,7 → 1691,11 |
QString Nfo = ""; |
bool AAct = false; |
item->AnType = ComboBox1->currentItem()+2; |
item->AnName = Name->text(); |
if (Name->text() != OldName) |
{ |
item->AnName = Name->text(); |
item->AutoName = false; |
} |
item->AnToolTip = Tip->text(); |
item->AnRollOver = TextO->text(); |
item->AnDown = DownT->text(); |
1674,7 → 1710,7 |
item->AnBColor = BorderC->currentText(); |
if (item->AnBColor == tr("None")) |
item->AnBColor = "None"; |
Limit->isChecked() ? item->AnMaxChar = MaxChars->value() : item->AnMaxChar = -1; |
Limit->isChecked() ? item->AnMaxChar = MaxChars->value() : item->AnMaxChar = -1; |
if (item->AnType == 2) |
{ |
item->AnFlag += 65536; |
/trunk/Scribus/scribus/po/scribus.ru.ts |
---|
1721,7 → 1721,7 |
</message> |
<message> |
<source>Edit Fill Color Properties</source> |
<translation>Изменить свойства заполнения линии</translation> |
<translation>Изменить свойства заливки линии</translation> |
</message> |
<message> |
<source>Saturation of color</source> |
1729,7 → 1729,7 |
</message> |
<message> |
<source>Normal or gradient fill method</source> |
<translation>Обычное или градиентное заполнение</translation> |
<translation>Обычная или градиентная заливка</translation> |
</message> |
<message> |
<source>Set the transparency for the color selected</source> |
2529,7 → 2529,7 |
</message> |
<message> |
<source>Name of your paragraph style</source> |
<translation>Имя стиля параграфа</translation> |
<translation>Имя стиля абзаца</translation> |
</message> |
<message> |
<source>Font of selected text or object</source> |
2541,7 → 2541,7 |
</message> |
<message> |
<source>Color of text fill</source> |
<translation>Цвет заполнения текста</translation> |
<translation>Цвет заливки текста</translation> |
</message> |
<message> |
<source>Color of text stroke</source> |
2549,7 → 2549,7 |
</message> |
<message> |
<source>Provides an oversized first letter for a paragraph. Used for stylistic effect</source> |
<translation>Создать увеличенную первую букву параграфа. |
<translation>Создать увеличенную первую букву абзаца. |
Этот приём используется для стилизации.</translation> |
</message> |
<message> |
2562,11 → 2562,11 |
</message> |
<message> |
<source>Spacing above the paragraph</source> |
<translation>Интервал над параграфом</translation> |
<translation>Интервал над абзацем</translation> |
</message> |
<message> |
<source>Spacing below the paragraph</source> |
<translation>Интервал под параграфом</translation> |
<translation>Интервал под абзацем</translation> |
</message> |
<message> |
<source>Tabulators and Indentation</source> |
4574,19 → 4574,19 |
</message> |
<message> |
<source>Color of text fill</source> |
<translation>Цвет заполнения текста</translation> |
<translation>Цвет заливки текста</translation> |
</message> |
<message> |
<source>Saturation of color of text stroke</source> |
<translation>Насыщение цвета текстового штриха</translation> |
<translation>Насыщенность цвета текстового штриха</translation> |
</message> |
<message> |
<source>Saturation of color of text fill</source> |
<translation>Насыщение цвета заполнения текста</translation> |
<translation>Насыщенность цвета заливки текста</translation> |
</message> |
<message> |
<source>Style of current paragraph</source> |
<translation>Стиль текущего параграфа</translation> |
<translation>Стиль текущего абзаца</translation> |
</message> |
<message> |
<source>Change settings for left or end points</source> |
6930,7 → 6930,7 |
</message> |
<message> |
<source>Paragraphs: </source> |
<translation>Параграфов:</translation> |
<translation>Абзацев:</translation> |
</message> |
<message> |
<source>Words: </source> |
8006,7 → 8006,7 |
</message> |
<message> |
<source>Fill color of picture frames</source> |
<translation>Цвет заполнения рамок изображений</translation> |
<translation>Цвет заливки рамок изображений</translation> |
</message> |
<message> |
<source>Saturation of color of fill</source> |
8022,7 → 8022,7 |
</message> |
<message> |
<source>Fill color of shapes</source> |
<translation>Цвет заполнения очертаний</translation> |
<translation>Цвет заливки очертаний</translation> |
</message> |
<message> |
<source>Line style of shapes</source> |
9038,23 → 9038,23 |
</message> |
<message> |
<source>Sort by &Name</source> |
<translation type="unfinished"></translation> |
<translation>Сортировать по &имени</translation> |
</message> |
<message> |
<source>Sort by &Size</source> |
<translation type="unfinished"></translation> |
<translation>Сортировать по &размеру</translation> |
</message> |
<message> |
<source>Sort by &Date</source> |
<translation type="unfinished"></translation> |
<translation>Сортировать по &дате</translation> |
</message> |
<message> |
<source>&Unsorted</source> |
<translation type="unfinished"></translation> |
<translation>&Без сортировки</translation> |
</message> |
<message> |
<source>Sort</source> |
<translation type="unfinished"></translation> |
<translation>Сортировать</translation> |
</message> |
<message> |
<source>Show &hidden files</source> |
9891,7 → 9891,7 |
</message> |
<message> |
<source>Style of current paragraph</source> |
<translation>Стиль текущего параграфа</translation> |
<translation>Стиль текущего абзаца</translation> |
</message> |
</context> |
<context> |
9906,11 → 9906,11 |
</message> |
<message> |
<source>Color of text fill</source> |
<translation>Цвет заполнения текста</translation> |
<translation>Цвет заливки текста</translation> |
</message> |
<message> |
<source>Saturation of color of text fill</source> |
<translation>Цветонасыщенность заполнения текста</translation> |
<translation>Цветонасыщенность заливки текста</translation> |
</message> |
</context> |
<context> |
10795,7 → 10795,7 |
</message> |
<message> |
<source>&Paragraph Styles...</source> |
<translation>Стили &параграфа...</translation> |
<translation>Стили &абзаца...</translation> |
</message> |
<message> |
<source>&Line Styles...</source> |
11542,7 → 11542,7 |
</message> |
<message> |
<source>Paragraph Style</source> |
<translation>Стиль параграфа</translation> |
<translation>Стиль абзаца</translation> |
</message> |
<message> |
<source>Font</source> |
11915,7 → 11915,7 |
</message> |
<message> |
<source>Current Paragraph:</source> |
<translation>Текущий параграф:</translation> |
<translation>Текущий абзац:</translation> |
</message> |
<message> |
<source>Words: </source> |
11931,7 → 11931,7 |
</message> |
<message> |
<source>Paragraphs: </source> |
<translation>Параграфов:</translation> |
<translation>Абзацев:</translation> |
</message> |
<message> |
<source>Update Text Frame</source> |
12248,11 → 12248,11 |
</message> |
<message> |
<source>Indentation for first line of the paragraph</source> |
<translation>Отступ первой строки параграфа</translation> |
<translation>Отступ первой строки абзаца</translation> |
</message> |
<message> |
<source>Indentation from the left for the whole paragraph</source> |
<translation>Отступ слева для всего параграфа</translation> |
<translation>Отступ слева для всего абзаца</translation> |
</message> |
<message> |
<source>Delete all Tabulators</source> |
/trunk/Scribus/scribus/qm/scribus.nb_NO.qm |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes: |
Deleted: svn:mime-type |
## -1 +0,0 ## |
-application/octet-stream |
\ No newline at end of property |
Index: Scribus/scribus/qm/scribus.no_NO.qm |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/Scribus/scribus/qm/scribus.no_NO.qm |
---|
Property changes: |
Deleted: svn:mime-type |
## -1 +0,0 ## |
-application/octet-stream |
\ No newline at end of property |
Index: Scribus/scribus/qm/scribus.nb.qm |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/Scribus/scribus/qm/scribus.nb.qm |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+application/octet-stream |
\ No newline at end of property |
Index: Scribus/scribus/qm/scribus.no.qm |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/Scribus/scribus/qm/scribus.no.qm |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+application/octet-stream |
\ No newline at end of property |
Index: Scribus/scribus/qm/Makefile.am |
=================================================================== |
--- Scribus/scribus/qm/Makefile.am (revision 391) |
+++ Scribus/scribus/qm/Makefile.am (revision 392) |
@@ -1,7 +1,7 @@ |
####### kdevelop will overwrite this part!!! (begin)########## |
-EXTRA_DIST = scribus.eu.qm scribus.sl.qm scribus.fi.qm scribus.cy.qm scribus.id.qm scribus.nl.qm scribus.ru.qm scribus.cs.qm scribus.bg.qm scribus.ca.qm scribus.da.qm scribus.de.qm scribus.en_GB.qm scribus.es.qm scribus.fr.qm scribus.gl.qm scribus.hu.qm scribus.it.qm scribus.lt_LT.qm scribus.pl.qm scribus.sk.qm scribus.tr.qm scribus.uk.qm scribus.no_NO.qm scribus.nb_NO.qm scribus.br.qm |
+EXTRA_DIST = scribus.eu.qm scribus.sl.qm scribus.fi.qm scribus.cy.qm scribus.id.qm scribus.nl.qm scribus.ru.qm scribus.cs.qm scribus.bg.qm scribus.ca.qm scribus.da.qm scribus.de.qm scribus.en_GB.qm scribus.es.qm scribus.fr.qm scribus.gl.qm scribus.hu.qm scribus.it.qm scribus.lt_LT.qm scribus.pl.qm scribus.sk.qm scribus.tr.qm scribus.uk.qm scribus.no.qm scribus.nb.qm scribus.br.qm |
install-data-local: |
$(mkinstalldirs) $(prefix)/lib/scribus/ |
@@ -43,9 +43,9 @@ |
$(mkinstalldirs) $(prefix)/lib/scribus/ |
$(INSTALL_DATA) $(srcdir)/scribus.uk.qm $(prefix)/lib/scribus/scribus.uk.qm |
$(mkinstalldirs) $(prefix)/lib/scribus/ |
- $(INSTALL_DATA) $(srcdir)/scribus.nb_NO.qm $(prefix)/lib/scribus/scribus.nb_NO.qm |
+ $(INSTALL_DATA) $(srcdir)/scribus.nb.qm $(prefix)/lib/scribus/scribus.nb.qm |
$(mkinstalldirs) $(prefix)/lib/scribus/ |
- $(INSTALL_DATA) $(srcdir)/scribus.no_NO.qm $(prefix)/lib/scribus/scribus.no_NO.qm |
+ $(INSTALL_DATA) $(srcdir)/scribus.no.qm $(prefix)/lib/scribus/scribus.no.qm |
$(mkinstalldirs) $(prefix)/lib/scribus/ |
$(INSTALL_DATA) $(srcdir)/scribus.ru.qm $(prefix)/lib/scribus/scribus.ru.qm |
$(mkinstalldirs) $(prefix)/lib/scribus/ |
@@ -77,8 +77,8 @@ |
-rm -f $(prefix)/lib/scribus/scribus.tr.qm |
-rm -f $(prefix)/lib/scribus/scribus.uk.qm |
-rm -f $(prefix)/lib/scribus/scribus.hu.qm |
- -rm -f $(prefix)/lib/scribus/scribus.nb_NO.qm |
- -rm -f $(prefix)/lib/scribus/scribus.no_NO.qm |
+ -rm -f $(prefix)/lib/scribus/scribus.nb.qm |
+ -rm -f $(prefix)/lib/scribus/scribus.no.qm |
-rm -f $(prefix)/lib/scribus/scribus.ru.qm |
-rm -f $(prefix)/lib/scribus/scribus.nl.qm |
-rm -f $(prefix)/lib/scribus/scribus.cy.qm |
/trunk/Scribus/scribus/qm/scribus.ru.qm |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/trunk/Scribus/scribus/story.cpp |
---|
598,6 → 598,7 |
struct Pti *hg; |
hg = new Pti; |
hg->ch = QChar(13); |
chars = StyledText.at(p-1); |
if (chars->count() != 0) |
{ |
hg->cfont = chars->at(c)->cfont; |
608,7 → 609,6 |
hg->cshade2 = chars->at(c)->cshade2; |
hg->cscale = chars->at(c)->cscale; |
hg->cstyle = chars->at(c)->cstyle; |
hg->cab = chars->at(c)->cab; |
hg->cextra = chars->at(c)->cextra; |
} |
else |
620,15 → 620,15 |
hg->cfont = CurrFont; |
hg->csize = CurrFontSize; |
hg->cstyle = CurrentStyle; |
hg->cab = CurrentABStil; |
hg->cextra = CurrTextKern; |
hg->cscale = CurrTextScale; |
if (doc->Vorlagen[CurrentABStil].Font != "") |
if (doc->Vorlagen[ParagStyles[p-1]].Font != "") |
{ |
hg->cfont = doc->Vorlagen[CurrentABStil].Font; |
hg->csize = doc->Vorlagen[CurrentABStil].FontSize; |
hg->cfont = doc->Vorlagen[ParagStyles[p-1]].Font; |
hg->csize = doc->Vorlagen[ParagStyles[p-1]].FontSize; |
} |
} |
hg->cab = ParagStyles[p-1]; |
hg->cselect = false; |
hg->xp = 0; |
hg->yp = 0; |
1598,7 → 1598,6 |
Editor->loadItemText(ite); |
updateProps(0,0); |
updateStatus(); |
Editor->setFocus(); |
TextChanged = false; |
EditorBar->setFrameStyle(Editor->frameStyle()); |
EditorBar->setLineWidth(Editor->lineWidth()); |
1623,6 → 1622,7 |
connect(FontTools, SIGNAL(NewScale(int )), this, SLOT(newTxScale(int ))); |
connect(StyleTools, SIGNAL(NewKern(double )), this, SLOT(newTxKern(double ))); |
connect(StyleTools, SIGNAL(NewStyle(int )), this, SLOT(newTxStyle(int ))); |
Editor->setFocus(); |
} |
int StoryEditor::exec() |
1631,6 → 1631,7 |
setWFlags( WShowModal ); |
result = 0; |
show(); |
Editor->setFocus(); |
qApp->enter_loop(); |
clearWFlags( WShowModal ); |
return result; |
2199,9 → 2200,7 |
void StoryEditor::changeAlignSB(int pa, int align) |
{ |
int p, i; |
Editor->CurrentABStil = align; |
Editor->getCursorPosition(&p, &i); |
if (Editor->StyledText.count() != 0) |
{ |
disconnect(Editor, SIGNAL(cursorPositionChanged(int, int)), this, SLOT(updateProps(int, int))); |
2241,8 → 2240,9 |
} |
Editor->updateFromChars(pa); |
} |
Editor->setCursorPosition(p, i); |
updateProps(p, i); |
Editor->setCursorPosition(pa, 0); |
updateProps(pa, 0); |
Editor->ensureCursorVisible(); |
connect(Editor, SIGNAL(cursorPositionChanged(int, int)), this, SLOT(updateProps(int, int))); |
} |
else |
2356,6 → 2356,7 |
if (sel) |
Editor->setSelection(PStart2, SelStart2, PEnd2, SelEnd2); |
Editor->setCursorPosition(p, i); |
Editor->ensureCursorVisible(); |
updateProps(p, i); |
connect(Editor, SIGNAL(cursorPositionChanged(int, int)), this, SLOT(updateProps(int, int))); |
} |
/trunk/Scribus/scribus/scribusview.cpp |
---|
562,33 → 562,42 |
void ScribusView::LaMenu() |
{ |
uint a; |
int Lnr; |
struct Layer ll; |
ll.LNr = 0; |
Laymen->clear(); |
if (Doc->Layers.count() != 0) |
{ |
Lnr = 0; |
QValueList<Layer>::iterator it; |
Laymen->clear(); |
if (Doc->Layers.count() != 0) |
{ |
for (a=0; a < Doc->Layers.count(); a++) |
{ |
Level2Layer(Doc, &ll, Lnr); |
Laymen->insertItem(Doc->Layers[ll.LNr].Name); |
if (Doc->ActiveLayer == static_cast<int>(ll.LNr)) |
Laymen->setItemChecked(Laymen->idAt(a), true); |
Lnr++; |
} |
} |
{ |
int curr,n=0; |
for (it = Doc->Layers.begin(); it != Doc->Layers.end(); ++it,n++) |
{ |
if (Doc->Layers.count()-(*it).Level-1 == a) |
{ |
Laymen->insertItem((*it).Name); |
if (Doc->ActiveLayer == n) |
curr=Doc->Layers.count()-(*it).Level-1; |
} |
} |
Laymen->setItemChecked(Laymen->idAt(curr), true); |
} |
} |
} |
void ScribusView::GotoLa(int l) |
{ |
int d = Laymen->indexOf(l); |
struct Layer ll; |
ll.LNr = 0; |
Level2Layer(Doc, &ll, d); |
Doc->ActiveLayer = ll.LNr; |
LY->setText(Doc->Layers[ll.LNr].Name); |
emit changeLA(ll.LNr); |
int a=0; |
int d = Doc->Layers.count()-Laymen->indexOf(l)-1; |
QValueList<Layer>::iterator it; |
for (it = Doc->Layers.begin(); it != Doc->Layers.end(); ++it,a++) |
{ |
if ( d == (*it).Level ) |
{ |
Doc->ActiveLayer = a; |
LY->setText(Doc->Layers[a].Name); |
emit changeLA(a); |
break; |
} |
} |
} |
void ScribusView::GotoPa(int Seite) |
/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("23").arg("August").arg("2004"); |
QString bu = tr("%1. %2 %3 ").arg("24").arg("August").arg("2004"); |
#ifdef HAVE_CMS |
bu += "C"; |
#else |
122,6 → 122,8 |
"<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>Louis Desjardins</td><td>louis_desjardins@mardigrafe.com</td></tr>" + |
"<tr><td>Frédéric Dubuy</td><td>effediwhy@gmail.com</td></tr>" + |
"<tr><td> </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>" + |
/trunk/Scribus/scribus/annot.h |
---|
208,8 → 208,10 |
int FormNum; |
QString JavaScr; |
int MaxSeite; |
QString OldName; |
public slots: |
void NewName(); |
void IPlace(); |
void RemoveNIcon(); |
void RemovePIcon(); |