Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 207 → Rev 208

/trunk/Scribus/ChangeLogCVS
1,4 → 1,9
Changes since Version 1.1.5
24.02.2004 Fixed Bug with wrong Gradients when copying Objects.
Moved the Documentation files to $prefix/share/scribus
Fixed Problems with Editing Styles changing unexpectedly Textframes.
All Fonts used in a Document are now embedded into PDF by default.
 
23.02.2004 Added the Option to protect an Object against resizing.
Fixed Issues with Rounded Corners.
Added a Context Menueitem for updating Picture frames.
/trunk/Scribus/scribus/pdfopts.cpp
270,8 → 270,9
Layout6->addWidget( TextFont1_2 );
EmbedList = new QListBox( GroupFont, "EmbedList" );
EmbedList->setMinimumSize(QSize(150, 140));
// EmbedList->setMaximumSize(QSize(150, 140));
if (Optionen->EmbedList.count() != 0)
EmbedFonts->setChecked(true);
EmbedAll();
/* if (Optionen->EmbedList.count() != 0)
{
for (uint efo = 0; efo < Optionen->EmbedList.count(); ++efo)
{
283,7 → 284,7
{
EmbedFonts->setChecked(true);
EmbedAll();
}
} */
Layout6->addWidget( EmbedList );
GroupFontLayout->addLayout( Layout6 );
tabLayout_3->addWidget( GroupFont );
/trunk/Scribus/scribus/mpalette.cpp
2679,29 → 2679,32
void Mpalette::handlePrint()
{
if ((HaveDoc) && (HaveItem))
{
for ( uint a = 0; a < doc->ActPage->SelItem.count(); ++a)
{
CurItem->isPrintable = !NoPrint->isOn();
doc->ActPage->SelItem.at(a)->isPrintable = !NoPrint->isOn();
}
emit DocChanged();
}
}
}
 
void Mpalette::handleResize()
{
if ((HaveDoc) && (HaveItem))
{
for ( uint a = 0; a < doc->ActPage->SelItem.count(); ++a)
{
CurItem->LockRes = NoResize->isOn();
Width->setEnabled(!CurItem->LockRes);
Height->setEnabled(!CurItem->LockRes);
doc->ActPage->SelItem.at(a)->LockRes = NoResize->isOn();
}
Width->setEnabled(!NoResize->isOn());
Height->setEnabled(!NoResize->isOn());
emit DocChanged();
}
}
}
 
void Mpalette::ToggleFlow()
{
if (Textflow->isChecked())
Textflow2->setEnabled(true);
else
Textflow2->setEnabled(false);
Textflow2->setEnabled(Textflow->isChecked());
}
 
void Mpalette::handlePathLine()
/trunk/Scribus/scribus/pageitem.cpp
1351,7 → 1351,12
bool savre = Doc->RePos;
Doc->RePos = true;
p->save();
NextBox->DrawObj(p, QRect(0, 0, 1, 1));
QPixmap pgPix(1, 1);
ScPainter *painter = new ScPainter(&pgPix, 1, 1);
painter->translate(0.5, 0.5);
NextBox->DrawObj(painter, QRect(0, 0, 1, 1));
painter->end();
delete painter;
p->restore();
Doc->RePos = savre;
}
/trunk/Scribus/scribus/libpostscript/pslib.cpp
554,13 → 554,29
int pla = Plate - 1 < 0 ? 3 : Plate - 1;
QStringList cols1 = QStringList::split(" ", GrColor2);
QStringList cols2 = QStringList::split(" ", GrColor1);
PutSeite("/C1 ["+ToStr(1-cols1[pla].toDouble())+"]\n");
PutSeite("/C0 ["+ToStr(1-cols2[pla].toDouble())+"]\n");
if (grad == 4)
{
PutSeite("/C0 ["+ToStr(1-cols1[pla].toDouble())+"]\n");
PutSeite("/C1 ["+ToStr(1-cols2[pla].toDouble())+"]\n");
}
else
{
PutSeite("/C1 ["+ToStr(1-cols1[pla].toDouble())+"]\n");
PutSeite("/C0 ["+ToStr(1-cols2[pla].toDouble())+"]\n");
}
}
else
{
PutSeite("/C0 ["+GrColor1+"]\n");
PutSeite("/C1 ["+GrColor2+"]\n");
if (grad == 4)
{
PutSeite("/C1 ["+GrColor1+"]\n");
PutSeite("/C0 ["+GrColor2+"]\n");
}
else
{
PutSeite("/C0 ["+GrColor1+"]\n");
PutSeite("/C1 ["+GrColor2+"]\n");
}
}
PutSeite("/N 1\n");
PutSeite(">>\n");
/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(23).arg("February").arg(2004);
QString bu = tr("%1. %2 %3 ").arg(24).arg("February").arg(2004);
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/helpbrowser.cpp
83,7 → 83,7
QString pfad2;
bool Avail = true;
if (Datei == "")
pfad2 = pfad + "/lib/scribus/doc/"+QString(QTextCodec::locale()).left(2)+"/index.html";
pfad2 = pfad + "/share/scribus/doc/"+QString(QTextCodec::locale()).left(2)+"/index.html";
else
pfad2 = Datei;
QFileInfo fi;
90,7 → 90,7
fi = QFileInfo(pfad2);
if (!fi.exists())
{
pfad2 = pfad + "/lib/scribus/doc/en/index.html";
pfad2 = pfad + "/share/scribus/doc/en/index.html";
fi = QFileInfo(pfad2);
if (!fi.exists())
{
/trunk/Scribus/scribus/scribus.cpp
4765,7 → 4765,7
else
ers.append(0);
}
doc->Vorlagen = dia->TempVorl;
// doc->Vorlagen = dia->TempVorl;
for (uint c=0; c<view->DocPages.count(); ++c)
{
for (uint d=0; d<view->DocPages.at(c)->Items.count(); ++d)
4775,19 → 4775,27
{
for (uint e=0; e<ite->Ptext.count(); ++e)
{
if (ite->Ptext.at(e)->cab > 4)
int cabori = ite->Ptext.at(e)->cab;
int cabneu = ers[cabori];
if (cabori > 4)
{
ite->Ptext.at(e)->cab = ers[ite->Ptext.at(e)->cab];
if (doc->Vorlagen[ite->Ptext.at(e)->cab].Font != "")
ite->Ptext.at(e)->cstyle &= ~127;
if (cabneu > 0)
{
ite->Ptext.at(e)->cfont = doc->Vorlagen[ite->Ptext.at(e)->cab].Font;
ite->Ptext.at(e)->csize = doc->Vorlagen[ite->Ptext.at(e)->cab].FontSize;
ite->Ptext.at(e)->cstyle &= ~127;
ite->Ptext.at(e)->cstyle |= doc->Vorlagen[ite->Ptext.at(e)->cab].FontEffect;
ite->Ptext.at(e)->ccolor = doc->Vorlagen[ite->Ptext.at(e)->cab].FColor;
ite->Ptext.at(e)->cshade = doc->Vorlagen[ite->Ptext.at(e)->cab].FShade;
ite->Ptext.at(e)->cstroke = doc->Vorlagen[ite->Ptext.at(e)->cab].SColor;
ite->Ptext.at(e)->cshade2 = doc->Vorlagen[ite->Ptext.at(e)->cab].SShade;
if (ite->Ptext.at(e)->cfont == doc->Vorlagen[cabori].Font)
ite->Ptext.at(e)->cfont = dia->TempVorl[cabneu].Font;
if (ite->Ptext.at(e)->csize == doc->Vorlagen[cabori].FontSize)
ite->Ptext.at(e)->csize = dia->TempVorl[cabneu].FontSize;
if (ite->Ptext.at(e)->cstyle == doc->Vorlagen[cabori].FontEffect)
ite->Ptext.at(e)->cstyle |= dia->TempVorl[cabneu].FontEffect;
if (ite->Ptext.at(e)->ccolor == doc->Vorlagen[cabori].FColor)
ite->Ptext.at(e)->ccolor = dia->TempVorl[cabneu].FColor;
if (ite->Ptext.at(e)->cshade == doc->Vorlagen[cabori].FShade)
ite->Ptext.at(e)->cshade = dia->TempVorl[cabneu].FShade;
if (ite->Ptext.at(e)->cstroke == doc->Vorlagen[cabori].SColor)
ite->Ptext.at(e)->cstroke = dia->TempVorl[cabneu].SColor;
if (ite->Ptext.at(e)->cshade2 == doc->Vorlagen[cabori].SShade)
ite->Ptext.at(e)->cshade2 = dia->TempVorl[cabneu].SShade;
}
else
{
4796,9 → 4804,9
ite->Ptext.at(e)->cstroke = ite->TxtStroke;
ite->Ptext.at(e)->cshade2 = ite->ShTxtStroke;
ite->Ptext.at(e)->csize = ite->ISize;
ite->Ptext.at(e)->cstyle &= ~127;
ite->Ptext.at(e)->cstyle |= ite->TxTStyle;
}
ite->Ptext.at(e)->cab = cabneu;
}
}
}
4813,19 → 4821,27
{
for (uint e=0; e<ite->Ptext.count(); ++e)
{
if (ite->Ptext.at(e)->cab > 4)
int cabori = ite->Ptext.at(e)->cab;
int cabneu = ers[cabori];
if (cabori > 4)
{
ite->Ptext.at(e)->cab = ers[ite->Ptext.at(e)->cab];
if (doc->Vorlagen[ite->Ptext.at(e)->cab].Font != "")
ite->Ptext.at(e)->cstyle &= ~127;
if (cabneu > 0)
{
ite->Ptext.at(e)->cfont = doc->Vorlagen[ite->Ptext.at(e)->cab].Font;
ite->Ptext.at(e)->csize = doc->Vorlagen[ite->Ptext.at(e)->cab].FontSize;
ite->Ptext.at(e)->cstyle &= ~127;
ite->Ptext.at(e)->cstyle |= doc->Vorlagen[ite->Ptext.at(e)->cab].FontEffect;
ite->Ptext.at(e)->ccolor = doc->Vorlagen[ite->Ptext.at(e)->cab].FColor;
ite->Ptext.at(e)->cshade = doc->Vorlagen[ite->Ptext.at(e)->cab].FShade;
ite->Ptext.at(e)->cstroke = doc->Vorlagen[ite->Ptext.at(e)->cab].SColor;
ite->Ptext.at(e)->cshade2 = doc->Vorlagen[ite->Ptext.at(e)->cab].SShade;
if (ite->Ptext.at(e)->cfont == doc->Vorlagen[cabori].Font)
ite->Ptext.at(e)->cfont = dia->TempVorl[cabneu].Font;
if (ite->Ptext.at(e)->csize == doc->Vorlagen[cabori].FontSize)
ite->Ptext.at(e)->csize = dia->TempVorl[cabneu].FontSize;
if (ite->Ptext.at(e)->cstyle == doc->Vorlagen[cabori].FontEffect)
ite->Ptext.at(e)->cstyle |= dia->TempVorl[cabneu].FontEffect;
if (ite->Ptext.at(e)->ccolor == doc->Vorlagen[cabori].FColor)
ite->Ptext.at(e)->ccolor = dia->TempVorl[cabneu].FColor;
if (ite->Ptext.at(e)->cshade == doc->Vorlagen[cabori].FShade)
ite->Ptext.at(e)->cshade = dia->TempVorl[cabneu].FShade;
if (ite->Ptext.at(e)->cstroke == doc->Vorlagen[cabori].SColor)
ite->Ptext.at(e)->cstroke = dia->TempVorl[cabneu].SColor;
if (ite->Ptext.at(e)->cshade2 == doc->Vorlagen[cabori].SShade)
ite->Ptext.at(e)->cshade2 = dia->TempVorl[cabneu].SShade;
}
else
{
4834,14 → 4850,15
ite->Ptext.at(e)->cstroke = ite->TxtStroke;
ite->Ptext.at(e)->cshade2 = ite->ShTxtStroke;
ite->Ptext.at(e)->csize = ite->ISize;
ite->Ptext.at(e)->cstyle &= ~127;
ite->Ptext.at(e)->cstyle |= ite->TxTStyle;
}
ite->Ptext.at(e)->cab = cabneu;
}
}
}
}
}
}
doc->Vorlagen = dia->TempVorl;
for (uint a=0; a<doc->Vorlagen.count(); ++a)
{
if (doc->Vorlagen[a].Font != "")
/trunk/Scribus/scribus/plugins/scriptplugin/doc/en/Makefile.am
4,73 → 4,73
EXTRA_DIST = index.html node1.html node10.html node11.html node12.html node13.html node14.html node15.html node16.html node17.html node18.html node2.html node3.html Scripter.png node9.html node8.html node7.html node6.html node5.html node4.html Manual.css node19.html
 
install-data-local:
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/index.html $(prefix)/lib/scribus/doc/en/Scripter/index.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node1.html $(prefix)/lib/scribus/doc/en/Scripter/node1.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node10.html $(prefix)/lib/scribus/doc/en/Scripter/node10.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node11.html $(prefix)/lib/scribus/doc/en/Scripter/node11.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node12.html $(prefix)/lib/scribus/doc/en/Scripter/node12.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node13.html $(prefix)/lib/scribus/doc/en/Scripter/node13.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node14.html $(prefix)/lib/scribus/doc/en/Scripter/node14.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node15.html $(prefix)/lib/scribus/doc/en/Scripter/node15.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node16.html $(prefix)/lib/scribus/doc/en/Scripter/node16.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node17.html $(prefix)/lib/scribus/doc/en/Scripter/node17.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node18.html $(prefix)/lib/scribus/doc/en/Scripter/node18.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node2.html $(prefix)/lib/scribus/doc/en/Scripter/node2.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node3.html $(prefix)/lib/scribus/doc/en/Scripter/node3.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/Scripter.png $(prefix)/lib/scribus/doc/en/Scripter/Scripter.png
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node9.html $(prefix)/lib/scribus/doc/en/Scripter/node9.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node8.html $(prefix)/lib/scribus/doc/en/Scripter/node8.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node7.html $(prefix)/lib/scribus/doc/en/Scripter/node7.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node6.html $(prefix)/lib/scribus/doc/en/Scripter/node6.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node5.html $(prefix)/lib/scribus/doc/en/Scripter/node5.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node4.html $(prefix)/lib/scribus/doc/en/Scripter/node4.html
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/Manual.css $(prefix)/lib/scribus/doc/en/Scripter/Manual.css
$(mkinstalldirs) $(prefix)/lib/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node19.html $(prefix)/lib/scribus/doc/en/Scripter/node19.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/index.html $(prefix)/share/scribus/doc/en/Scripter/index.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node1.html $(prefix)/share/scribus/doc/en/Scripter/node1.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node10.html $(prefix)/share/scribus/doc/en/Scripter/node10.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node11.html $(prefix)/share/scribus/doc/en/Scripter/node11.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node12.html $(prefix)/share/scribus/doc/en/Scripter/node12.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node13.html $(prefix)/share/scribus/doc/en/Scripter/node13.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node14.html $(prefix)/share/scribus/doc/en/Scripter/node14.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node15.html $(prefix)/share/scribus/doc/en/Scripter/node15.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node16.html $(prefix)/share/scribus/doc/en/Scripter/node16.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node17.html $(prefix)/share/scribus/doc/en/Scripter/node17.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node18.html $(prefix)/share/scribus/doc/en/Scripter/node18.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node2.html $(prefix)/share/scribus/doc/en/Scripter/node2.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node3.html $(prefix)/share/scribus/doc/en/Scripter/node3.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/Scripter.png $(prefix)/share/scribus/doc/en/Scripter/Scripter.png
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node9.html $(prefix)/share/scribus/doc/en/Scripter/node9.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node8.html $(prefix)/share/scribus/doc/en/Scripter/node8.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node7.html $(prefix)/share/scribus/doc/en/Scripter/node7.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node6.html $(prefix)/share/scribus/doc/en/Scripter/node6.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node5.html $(prefix)/share/scribus/doc/en/Scripter/node5.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node4.html $(prefix)/share/scribus/doc/en/Scripter/node4.html
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/Manual.css $(prefix)/share/scribus/doc/en/Scripter/Manual.css
$(mkinstalldirs) $(prefix)/share/scribus/doc/en/Scripter/
$(INSTALL_DATA) $(srcdir)/node19.html $(prefix)/share/scribus/doc/en/Scripter/node19.html
 
uninstall-local:
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/index.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node1.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node10.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node11.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node12.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node13.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node14.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node15.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node16.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node17.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node18.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node2.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node3.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/Scripter.png
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node9.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node8.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node7.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node6.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node5.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node4.html
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/Manual.css
-rm -f $(prefix)/lib/scribus/doc/en/Scripter/node19.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/index.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node1.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node10.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node11.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node12.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node13.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node14.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node15.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node16.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node17.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node18.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node2.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node3.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/Scripter.png
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node9.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node8.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node7.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node6.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node5.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node4.html
-rm -f $(prefix)/share/scribus/doc/en/Scripter/Manual.css
-rm -f $(prefix)/share/scribus/doc/en/Scripter/node19.html
 
####### kdevelop will overwrite this part!!! (end)############
/trunk/Scribus/scribus/plugins/scriptplugin/samples/Makefile.am
4,46 → 4,46
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
 
install-data-local:
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
$(INSTALL_DATA) $(srcdir)/quote.py $(prefix)/lib/scribus/samples/quote.py
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
$(INSTALL_DATA) $(srcdir)/wordcount.py $(prefix)/lib/scribus/samples/wordcount.py
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
$(INSTALL_DATA) $(srcdir)/Sample1.py $(prefix)/lib/scribus/samples/Sample1.py
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
$(INSTALL_DATA) $(srcdir)/trait_de_coupe.py $(prefix)/lib/scribus/samples/trait_de_coupe.py
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
$(INSTALL_DATA) $(srcdir)/Calender.py $(prefix)/lib/scribus/samples/Calendar.py
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
$(INSTALL_DATA) $(srcdir)/pochette_cd.py $(prefix)/lib/scribus/samples/pochette_cd.py
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
$(INSTALL_DATA) $(srcdir)/htmlimport.py $(prefix)/lib/scribus/samples/htmlimport.py
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
$(INSTALL_DATA) $(srcdir)/3columnUSLTR.py $(prefix)/lib/scribus/samples/3columnUSLTR.py
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
$(INSTALL_DATA) $(srcdir)/3columnA4.py $(prefix)/lib/scribus/samples/3columnA4.py
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
$(INSTALL_DATA) $(srcdir)/legende.py $(prefix)/lib/scribus/samples/legende.py
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
$(INSTALL_DATA) $(srcdir)/moins_10_pourcent_group.py $(prefix)/lib/scribus/samples/moins_10_pourcent_group.py
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
$(INSTALL_DATA) $(srcdir)/plus_10_pourcent_group.py $(prefix)/lib/scribus/samples/plus_10_pourcent_group.py
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
$(INSTALL_DATA) $(srcdir)/ReadMe $(prefix)/lib/scribus/samples/ReadMe
$(mkinstalldirs) $(prefix)/share/scribus/samples/
$(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
$(mkinstalldirs) $(prefix)/share/scribus/samples/
$(INSTALL_DATA) $(srcdir)/Sample1.py $(prefix)/share/scribus/samples/Sample1.py
$(mkinstalldirs) $(prefix)/share/scribus/samples/
$(INSTALL_DATA) $(srcdir)/trait_de_coupe.py $(prefix)/share/scribus/samples/trait_de_coupe.py
$(mkinstalldirs) $(prefix)/share/scribus/samples/
$(INSTALL_DATA) $(srcdir)/Calender.py $(prefix)/share/scribus/samples/Calendar.py
$(mkinstalldirs) $(prefix)/share/scribus/samples/
$(INSTALL_DATA) $(srcdir)/pochette_cd.py $(prefix)/share/scribus/samples/pochette_cd.py
$(mkinstalldirs) $(prefix)/share/scribus/samples/
$(INSTALL_DATA) $(srcdir)/htmlimport.py $(prefix)/share/scribus/samples/htmlimport.py
$(mkinstalldirs) $(prefix)/share/scribus/samples/
$(INSTALL_DATA) $(srcdir)/3columnUSLTR.py $(prefix)/share/scribus/samples/3columnUSLTR.py
$(mkinstalldirs) $(prefix)/share/scribus/samples/
$(INSTALL_DATA) $(srcdir)/3columnA4.py $(prefix)/share/scribus/samples/3columnA4.py
$(mkinstalldirs) $(prefix)/share/scribus/samples/
$(INSTALL_DATA) $(srcdir)/legende.py $(prefix)/share/scribus/samples/legende.py
$(mkinstalldirs) $(prefix)/share/scribus/samples/
$(INSTALL_DATA) $(srcdir)/moins_10_pourcent_group.py $(prefix)/share/scribus/samples/moins_10_pourcent_group.py
$(mkinstalldirs) $(prefix)/share/scribus/samples/
$(INSTALL_DATA) $(srcdir)/plus_10_pourcent_group.py $(prefix)/share/scribus/samples/plus_10_pourcent_group.py
$(mkinstalldirs) $(prefix)/share/scribus/samples/
$(INSTALL_DATA) $(srcdir)/ReadMe $(prefix)/share/scribus/samples/ReadMe
 
uninstall-local:
-rm -f $(prefix)/lib/scribus/samples/quote.py
-rm -f $(prefix)/lib/scribus/samples/wordcount.py
-rm -f $(prefix)/lib/scribus/samples/Sample1.py
-rm -f $(prefix)/lib/scribus/samples/Calendar.py
-rm -f $(prefix)/lib/scribus/samples/trait_de_coupe.py
-rm -f $(prefix)/lib/scribus/samples/pochette_cd.py
-rm -f $(prefix)/lib/scribus/samples/htmlimport.py
-rm -f $(prefix)/lib/scribus/samples/3columnUSLTR.py
-rm -f $(prefix)/lib/scribus/samples/3columnA4.py
-rm -f $(prefix)/lib/scribus/samples/moins_10_pourcent_group.py
-rm -f $(prefix)/lib/scribus/samples/plus_10_pourcent_group.py
-rm -f $(prefix)/lib/scribus/samples/legende.py
-rm -f $(prefix)/lib/scribus/samples/ReadMe
-rm -f $(prefix)/share/scribus/samples/quote.py
-rm -f $(prefix)/share/scribus/samples/wordcount.py
-rm -f $(prefix)/share/scribus/samples/Sample1.py
-rm -f $(prefix)/share/scribus/samples/Calendar.py
-rm -f $(prefix)/share/scribus/samples/trait_de_coupe.py
-rm -f $(prefix)/share/scribus/samples/pochette_cd.py
-rm -f $(prefix)/share/scribus/samples/htmlimport.py
-rm -f $(prefix)/share/scribus/samples/3columnUSLTR.py
-rm -f $(prefix)/share/scribus/samples/3columnA4.py
-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/ReadMe
 
####### kdevelop will overwrite this part!!! (end)############
/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
101,7 → 101,7
{
QString pfad = PREL;
QString pfad2;
pfad2 = pfad + "/lib/scribus/doc/en/Scripter/index.html";
pfad2 = pfad + "/share/scribus/doc/en/Scripter/index.html";
HelpBrowser *dia = new HelpBrowser(0, QObject::tr("Online Reference"), pfad2);
dia->show();
}
/trunk/Scribus/scribus/page.cpp
5929,9 → 5929,9
b->fill_gradient.clearStops();
QString c1 = typ == 5 ? col2 : col1, c2 = typ == 5 ? col1 : col2;
int s1 = typ == 5 ? sh2 : sh1, s2 = typ == 5 ? sh1 : sh2;
b->SetFarbe(&tmp, c1, s1);
b->fill_gradient.addStop(tmp, 0.0, 0.5, 1.0);
b->SetFarbe(&tmp, c2, s2);
b->fill_gradient.addStop(tmp, 0.0, 0.5, 1.0);
b->SetFarbe(&tmp, c1, s1);
b->fill_gradient.addStop(tmp, 1.0, 0.5, 1.0);
b->GrColor2 = col1;
b->GrShade2 = sh1;
6879,20 → 6879,20
b->fill_gradient.clearStops();
if (Buffer->GrType == 5)
{
if ((Buffer->GrColor != "None") && (Buffer->GrColor != ""))
b->SetFarbe(&tmp, Buffer->GrColor, Buffer->GrShade);
b->fill_gradient.addStop(tmp, 0.0, 0.5, 1.0);
if ((Buffer->GrColor2 != "None") && (Buffer->GrColor2 != ""))
b->SetFarbe(&tmp, Buffer->GrColor2, Buffer->GrShade2);
b->fill_gradient.addStop(tmp, 0.0, 0.5, 1.0);
if ((Buffer->GrColor != "None") && (Buffer->GrColor != ""))
b->SetFarbe(&tmp, Buffer->GrColor, Buffer->GrShade);
b->fill_gradient.addStop(tmp, 1.0, 0.5, 1.0);
}
else
{
if ((Buffer->GrColor2 != "None") && (Buffer->GrColor2 != ""))
b->SetFarbe(&tmp, Buffer->GrColor2, Buffer->GrShade2);
b->fill_gradient.addStop(tmp, 0.0, 0.5, 1.0);
if ((Buffer->GrColor != "None") && (Buffer->GrColor != ""))
b->SetFarbe(&tmp, Buffer->GrColor, Buffer->GrShade);
b->fill_gradient.addStop(tmp, 0.0, 0.5, 1.0);
if ((Buffer->GrColor2 != "None") && (Buffer->GrColor2 != ""))
b->SetFarbe(&tmp, Buffer->GrColor2, Buffer->GrShade2);
b->fill_gradient.addStop(tmp, 1.0, 0.5, 1.0);
}
b->GrColor2 = Buffer->GrColor2;
/trunk/Scribus/scribus/libpdf/pdflib.cpp
2095,7 → 2095,7
PutDoc("/Background ["+SetFarbe(b->Pcolor, b->Shade)+"]\n");
PutDoc(b->GrType == 5 ? "/Extend [true true]\n" : "/Extend [false false]\n");
PutDoc("/Function\n<<\n/FunctionType 2\n/Domain [0 1]\n");
bool t = b->GrType == 5 ? true : false;
bool t = b->GrType > 3 ? true : false;
PutDoc("/C0 [" +
SetFarbe((t == true ? b->GrColor : b->GrColor2), (t == true ? b->GrShade : b->GrShade2)) +
"]\n");