/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("15").arg("August").arg("2004"); |
QString bu = tr("%1. %2 %3 ").arg("16").arg("August").arg("2004"); |
#ifdef HAVE_CMS |
bu += "C"; |
#else |
/trunk/Scribus/scribus/scribus.cpp |
---|
6489,10 → 6489,13 |
void ScribusApp::slotFontOrg() |
{ |
uint a; |
qApp->setOverrideCursor(QCursor(Qt::WaitCursor), true); |
FontPrefs *dia = new FontPrefs(this, Prefs.AvailFonts, HaveDoc, &Prefs, PrefsPfad); |
connect(dia, SIGNAL(ReReadPrefs()), this, SLOT(ReadPrefs())); |
qApp->setOverrideCursor(QCursor(Qt::ArrowCursor), true); |
if (dia->exec()) |
{ |
qApp->setOverrideCursor(QCursor(Qt::WaitCursor), true); |
a = 0; |
SCFontsIterator it(Prefs.AvailFonts); |
for ( ; it.current() ; ++it) |
6510,11 → 6513,14 |
Prefs.GFontSub[itfsu.key()] = dia->FlagsRepl.at(a)->currentText(); |
a++; |
} |
qApp->setOverrideCursor(QCursor(Qt::ArrowCursor), true); |
} |
qApp->setOverrideCursor(QCursor(Qt::WaitCursor), true); |
FontSub->RebuildList(&Prefs); |
Mpal->Fonts->RebuildList(&Prefs); |
disconnect(dia, SIGNAL(ReReadPrefs()), this, SLOT(ReadPrefs())); |
delete dia; |
qApp->setOverrideCursor(QCursor(Qt::ArrowCursor), true); |
} |
void ScribusApp::slotPrefsOrg() |
/trunk/Scribus/scribus/plugins/scriptplugin/samples/Makefile.am |
---|
1,10 → 1,11 |
####### kdevelop will overwrite this part!!! (begin)########## |
EXTRA_DIST = Sample1.py Calender.py trait_de_coupe.py pochette_cd.py htmlimport.py 3columnUSLTR.py 3columnA4.py legende.py moins_10_pourcent_group.py plus_10_pourcent_group.py wordcount.py quote.py ReadMe |
EXTRA_DIST = Sample1.py Calender.py trait_de_coupe.py pochette_cd.py htmlimport.py 3columnUSLTR.py 3columnA4.py legende.py moins_10_pourcent_group.py plus_10_pourcent_group.py wordcount.py quote.py golden-mean.py ReadMe |
install-data-local: |
$(mkinstalldirs) $(prefix)/share/scribus/samples/ |
$(INSTALL_DATA) $(srcdir)/golden-mean.py $(prefix)/share/scribus/samples/golden-mean.py |
$(INSTALL_DATA) $(srcdir)/quote.py $(prefix)/share/scribus/samples/quote.py |
$(mkinstalldirs) $(prefix)/share/scribus/samples/ |
$(INSTALL_DATA) $(srcdir)/wordcount.py $(prefix)/share/scribus/samples/wordcount.py |
44,6 → 45,7 |
-rm -f $(prefix)/share/scribus/samples/moins_10_pourcent_group.py |
-rm -f $(prefix)/share/scribus/samples/plus_10_pourcent_group.py |
-rm -f $(prefix)/share/scribus/samples/legende.py |
-rm -f $(prefix)/share/scribus/samples/golden-mean.py |
-rm -f $(prefix)/share/scribus/samples/ReadMe |
####### kdevelop will overwrite this part!!! (end)############ |
/trunk/Scribus/scribus/plugins/fontpreview/ui.cpp |
---|
26,21 → 26,14 |
setName( "FontPreview" ); |
setIcon(loadIcon("AppIcon.png")); |
FontPreviewLayout = new QGridLayout( this, 1, 1, 11, 6, "FontPreviewLayout"); |
layout6 = new QVBoxLayout( 0, 0, 6, "layout6"); |
layout5 = new QHBoxLayout( 0, 0, 6, "layout5"); |
fontList = new QListBox( this, "fontList" ); |
layout5->addWidget( fontList ); |
layout2 = new QVBoxLayout( 0, 0, 6, "layout2"); |
layout1 = new QVBoxLayout( 0, 0, 6, "layout1"); |
okButton = new QPushButton( this, "okButton" ); |
layout1->addWidget( okButton ); |
cancelButton = new QPushButton( this, "cancelButton" ); |
layout1->addWidget( cancelButton ); |
layout2->addLayout( layout1 ); |
48,11 → 41,8 |
layout2->addItem( spacer ); |
layout5->addLayout( layout2 ); |
layout6->addLayout( layout5 ); |
fontPreview = new QLabel( this, "fontPreview" ); |
fontPreview->setMinimumSize(QSize(400,80)); |
/* fontPreview->setScaledContents( TRUE ); |
fontPreview->setPixmap(loadIcon("scribus_head.png")); */ |
fontPreview->setMinimumSize(QSize(400,90)); |
layout6->addWidget( fontPreview ); |
FontPreviewLayout->addLayout( layout6, 0, 0 ); |
86,9 → 76,8 |
} |
// signals and slots connections |
connect( okButton, SIGNAL( clicked() ), this, SLOT( okButton_clicked() ) ); |
connect( cancelButton, SIGNAL( clicked() ), this, SLOT( cancelButton_clicked() ) ); |
//connect( fontList, SIGNAL( clicked(QListBoxItem*,const QPoint&) ), this, SLOT( fontList_clicked(QListBoxItem*,const QPoint&) ) ); |
connect( okButton, SIGNAL( clicked() ), this, SLOT(accept())); |
connect( cancelButton, SIGNAL( clicked() ), this, SLOT( reject() ) ); |
connect( fontList, SIGNAL( selectionChanged(QListBoxItem*) ), this, SLOT( fontList_changed(QListBoxItem*) ) ); |
} |
113,41 → 102,13 |
cancelButton->setAccel( QKeySequence( tr( "Alt+C" ) ) ); |
} |
/** |
User wants to add font into Style menu |
*/ |
void FontPreview::okButton_clicked() |
{ |
accept(); |
} |
/** |
Just close the dialog |
*/ |
void FontPreview::cancelButton_clicked() |
{ |
reject(); |
} |
/** |
Creates pixmap with font sample |
*/ |
void FontPreview::fontList_changed( QListBoxItem *item ) |
{ |
int w = fontPreview->width(); |
int h = fontPreview->height(); |
QString da = carrier->Prefs.AvailFonts[item->text()]->Datei; |
QPixmap pixmap = FontSample( da, 28, tr("Woven silk pyjamas exchanged for blue quartz"), paletteBackgroundColor()); |
if ((pixmap.width() > w) || (pixmap.height() > h)) |
{ |
pixmap.resize(pixmap.width() > w ? w : pixmap.width(), pixmap.height() > h ? h : pixmap.height()); |
} |
QPixmap pixmap = FontSample(da, 28, tr("Woven silk pyjamas exchanged for blue quartz"), paletteBackgroundColor()); |
fontPreview->clear(); |
fontPreview->setScaledContents(FALSE); |
fontPreview->setPixmap(pixmap); |
fontPreview->setMinimumSize(w, h); |
fontPreview->setMaximumSize(w, h); |
} |
/trunk/Scribus/scribus/page.cpp |
---|
9189,8 → 9189,8 |
BuildAObj(); |
for (uint a = 0; a < AObjects.count(); ++a) |
{ |
Ysorted.insert(AObjects[a].y1, a, false); |
Xsorted.insert(AObjects[a].x1, a, false); |
Ysorted.insert(qRound(AObjects[a].y1)*1000000+qRound(AObjects[a].x1*100)+a, a, false); |
Xsorted.insert(qRound(AObjects[a].x1)*1000000+qRound(AObjects[a].y1*100)+a, a, false); |
} |
QValueList<uint> Yindex = Ysorted.values(); |
QValueList<uint> Xindex = Xsorted.values(); |
/trunk/Scribus/scribus/po/scribus.ru.ts |
---|
1808,6 → 1808,10 |
<source>Cancel</source> |
<translation type="unfinished"></translation> |
</message> |
<message> |
<source>None</source> |
<translation type="unfinished"></translation> |
</message> |
</context> |
<context> |
<name>CupsOptions</name> |
/trunk/Scribus/scribus/po/scribus.de.ts |
---|
1829,6 → 1829,10 |
<source>Cancel</source> |
<translation>Abbrechen</translation> |
</message> |
<message> |
<source>None</source> |
<translation>Keiner</translation> |
</message> |
</context> |
<context> |
<name>CupsOptions</name> |
/trunk/Scribus/scribus/po/scribus.nb_NO.ts |
---|
6097,6 → 6097,10 |
<source>Cancel</source> |
<translation type="unfinished">Avbryt</translation> |
</message> |
<message> |
<source>None</source> |
<translation type="unfinished">Ingen</translation> |
</message> |
</context> |
<context> |
<name>CupsOptions</name> |
/trunk/Scribus/scribus/po/scribus.fi.ts |
---|
1576,6 → 1576,10 |
<source>Cancel</source> |
<translation type="unfinished">Peruuta</translation> |
</message> |
<message> |
<source>None</source> |
<translation type="unfinished"></translation> |
</message> |
</context> |
<context> |
<name>CupsOptions</name> |
2656,7 → 2660,7 |
</message> |
<message> |
<source>Fonts Preview</source> |
<translation type="unfinished"></translation> |
<translation>Kirjasinten esikatselu</translation> |
</message> |
</context> |
<context> |
7009,7 → 7013,7 |
<name>QFontDialog</name> |
<message> |
<source>&Font</source> |
<translation type="unfinished">&Kirjasin</translation> |
<translation>&Kirjasin</translation> |
</message> |
<message> |
<source>Font st&yle</source> |
7017,11 → 7021,11 |
</message> |
<message> |
<source>&Size</source> |
<translation type="unfinished">&Koko</translation> |
<translation>&Koko</translation> |
</message> |
<message> |
<source>Effects</source> |
<translation type="unfinished">Efektit</translation> |
<translation>Efektit</translation> |
</message> |
<message> |
<source>Stri&keout</source> |
7033,7 → 7037,7 |
</message> |
<message> |
<source>&Color</source> |
<translation type="unfinished">&Väri</translation> |
<translation>&Väri</translation> |
</message> |
<message> |
<source>Sample</source> |
7045,7 → 7049,7 |
</message> |
<message> |
<source>OK</source> |
<translation type="unfinished">OK</translation> |
<translation>OK</translation> |
</message> |
<message> |
<source>Apply</source> |
7053,11 → 7057,11 |
</message> |
<message> |
<source>Cancel</source> |
<translation type="unfinished">Peruuta</translation> |
<translation>Peruuta</translation> |
</message> |
<message> |
<source>Close</source> |
<translation type="unfinished">Sulje</translation> |
<translation>Sulje</translation> |
</message> |
<message> |
<source>Select Font</source> |
/trunk/Scribus/scribus/po/scribus.cs_CZ.ts |
---|
5703,6 → 5703,10 |
<source>Cancel</source> |
<translation type="unfinished">Zrušit</translation> |
</message> |
<message> |
<source>None</source> |
<translation type="unfinished">Žádné</translation> |
</message> |
</context> |
<context> |
<name>CupsOptions</name> |
/trunk/Scribus/scribus/po/scribus.da_DK.ts |
---|
1585,6 → 1585,10 |
<source>Cancel</source> |
<translation type="unfinished">Annullér</translation> |
</message> |
<message> |
<source>None</source> |
<translation type="unfinished">Ingen</translation> |
</message> |
</context> |
<context> |
<name>CupsOptions</name> |
/trunk/Scribus/scribus/po/scribus.br.ts |
---|
1882,6 → 1882,10 |
<source>Cancel</source> |
<translation type="unfinished">Cancelar</translation> |
</message> |
<message> |
<source>None</source> |
<translation type="unfinished"></translation> |
</message> |
</context> |
<context> |
<name>CupsOptions</name> |
/trunk/Scribus/scribus/po/scribus.pl_PL.ts |
---|
1873,6 → 1873,10 |
<source>Cancel</source> |
<translation type="unfinished">Anuluj</translation> |
</message> |
<message> |
<source>None</source> |
<translation type="unfinished">Brak</translation> |
</message> |
</context> |
<context> |
<name>CupsOptions</name> |
/trunk/Scribus/scribus/po/scribus.fr.ts |
---|
8394,6 → 8394,10 |
<source>Cancel</source> |
<translation type="unfinished">Annuler</translation> |
</message> |
<message> |
<source>None</source> |
<translation type="unfinished">Aucune</translation> |
</message> |
</context> |
<context> |
<name>CupsOptions</name> |
/trunk/Scribus/scribus/po/scribus.no_NO.ts |
---|
6097,6 → 6097,10 |
<source>Cancel</source> |
<translation type="unfinished">Avbryt</translation> |
</message> |
<message> |
<source>None</source> |
<translation type="unfinished">Ingen</translation> |
</message> |
</context> |
<context> |
<name>CupsOptions</name> |
/trunk/Scribus/scribus/po/scribus.en_GB.ts |
---|
1577,6 → 1577,10 |
<source>Cancel</source> |
<translation>Cancel</translation> |
</message> |
<message> |
<source>None</source> |
<translation>None</translation> |
</message> |
</context> |
<context> |
<name>CupsOptions</name> |
/trunk/Scribus/scribus/po/scribus.cy.ts |
---|
5614,6 → 5614,10 |
<source>Cancel</source> |
<translation type="unfinished">Diddymu</translation> |
</message> |
<message> |
<source>None</source> |
<translation type="unfinished">Dim</translation> |
</message> |
</context> |
<context> |
<name>CupsOptions</name> |
/trunk/Scribus/scribus/po/scribus.sl.ts |
---|
1813,6 → 1813,10 |
<source>Cancel</source> |
<translation type="unfinished"></translation> |
</message> |
<message> |
<source>None</source> |
<translation type="unfinished">Brez</translation> |
</message> |
</context> |
<context> |
<name>CupsOptions</name> |
/trunk/Scribus/scribus/po/scribus.uk.ts |
---|
1815,6 → 1815,10 |
<source>Cancel</source> |
<translation type="unfinished">Вихід</translation> |
</message> |
<message> |
<source>None</source> |
<translation type="unfinished"></translation> |
</message> |
</context> |
<context> |
<name>CupsOptions</name> |
/trunk/Scribus/scribus/templates/sc_presentation/presentationtn.png |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+application/octet-stream |
\ No newline at end of property |
Index: Scribus/scribus/templates/sc_presentation/presentation.sla.gz |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/Scribus/scribus/templates/sc_presentation/presentation.sla.gz |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+application/octet-stream |
\ No newline at end of property |
Index: Scribus/scribus/templates/sc_presentation/template.xml |
=================================================================== |
--- Scribus/scribus/templates/sc_presentation/template.xml (nonexistent) |
+++ Scribus/scribus/templates/sc_presentation/template.xml (revision 381) |
@@ -0,0 +1,17 @@ |
+<?xml version="1.0" encoding="UTF-8"?> |
+<templates> |
+ <template category="Devel Templates"> |
+ <name>presentation</name> |
+ <file>presentation.sla.gz</file> |
+ <tnail>presentationtn.png</tnail> |
+ <img>presentation.png</img> |
+ <psize>custom, 760x620</psize> |
+ <color>color - Scribus website (or team Rabobank jersey ;))</color> |
+ <descr>Based on the Maciej Hanski's presentation layout. I made it more simple because I like simple things. Used often in my office presentations.</descr> |
+ <usage>Right click on text replace what's inside with your own. (Beware the management newspeak! ;)</usage> |
+ <scribus_version>1.2RC1cvs</scribus_version> |
+ <date>2004-07-1</date> |
+ <author>Petr Vaněk</author> |
+ <email>petr@yarpen.cz</email> |
+ </template> |
+</templates> |
/Scribus/scribus/templates/sc_presentation/template.xml |
---|
Property changes: |
Added: svn:eol-style |
## -0,0 +1 ## |
+native |
\ No newline at end of property |
Added: svn:keywords |
## -0,0 +1 ## |
+Author Date Id Revision |
\ No newline at end of property |
Index: Scribus/scribus/templates/sc_presentation/presentation.png |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/Scribus/scribus/templates/sc_presentation/presentation.png |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+application/octet-stream |
\ No newline at end of property |
Index: Scribus/scribus/templates/textbased/textbased.sla.gz |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/Scribus/scribus/templates/textbased/textbased.sla.gz |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+application/octet-stream |
\ No newline at end of property |
Index: Scribus/scribus/templates/textbased/an_image.tif |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/Scribus/scribus/templates/textbased/an_image.tif |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+application/octet-stream |
\ No newline at end of property |
Index: Scribus/scribus/templates/textbased/author.tif |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/Scribus/scribus/templates/textbased/author.tif |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+application/octet-stream |
\ No newline at end of property |
Index: Scribus/scribus/templates/textbased/textbased.png |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/Scribus/scribus/templates/textbased/textbased.png |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+application/octet-stream |
\ No newline at end of property |
Index: Scribus/scribus/templates/textbased/textbasedtn.png |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/Scribus/scribus/templates/textbased/textbasedtn.png |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+application/octet-stream |
\ No newline at end of property |
Index: Scribus/scribus/templates/textbased/template.xml |
=================================================================== |
--- Scribus/scribus/templates/textbased/template.xml (nonexistent) |
+++ Scribus/scribus/templates/textbased/template.xml (revision 381) |
@@ -0,0 +1,17 @@ |
+<?xml version="1.0" encoding="UTF-8"?> |
+<templates> |
+ <template category="Devel Templates"> |
+ <name>textbased</name> |
+ <file>textbased.sla.gz</file> |
+ <tnail>textbasedtn.png</tnail> |
+ <img>textbased.png</img> |
+ <psize>A4, na výšku</psize> |
+ <color>color</color> |
+ <descr>A decent newsletter/magazine originaly created for one non-profit organization. Unrealized unfortunately.</descr> |
+ <usage>Right click on text replace what's inside with your own. Or whatever you want to... ;)</usage> |
+ <scribus_version>1.2RC1cvs</scribus_version> |
+ <date>2004-07-10</date> |
+ <author>Petr Vaněk</author> |
+ <email>petr@yarpen.cz</email> |
+ </template> |
+</templates> |
/Scribus/scribus/templates/textbased/template.xml |
---|
Property changes: |
Added: svn:eol-style |
## -0,0 +1 ## |
+native |
\ No newline at end of property |
Added: svn:keywords |
## -0,0 +1 ## |
+Author Date Id Revision |
\ No newline at end of property |
Index: Scribus/scribus/qm/scribus.fi.qm |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Index: Scribus/scribus/qm/scribus.en_GB.qm |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Index: Scribus/scribus/qm/scribus.de.qm |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |