Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 24 → Rev 25

/trunk/Scribus/ChangeLogCVS
1,4 → 1,8
Changes since Version 0.9.10
05.06.2003 annot.cpp Fixed Bug with external PDF-Links.
pdfopts.cpp Fixed Bug with PDF-Page Effects.
scribus.cpp Fixed Bug when exporting Documents to PDF.
 
03.06.2003 scribus.cpp
page.cpp
pageitem.cpp
/trunk/Scribus/scribus/serializer.h
34,7 → 34,7
QString GetObjekt();
void PutText(PageItem *Item);
void GetText(PageItem *Item, int Absatz, bool Append = false);
void GetText(PageItem *Item, int Absatz, QString font, int size, bool Append = false);
bool Write(QString Cod = "");
bool Read(QString Cod = "");
};
/trunk/Scribus/scribus/pdfopts.cpp
274,6 → 274,16
for (uint pg2 = 0; pg2 < vie->Pages.count(); ++pg2)
{
Pages->insertItem(tr("Page")+" "+tmp.setNum(pg2+1));
if (EffVal.count()-1 < pg2)
{
ef.EffektLen = 1;
ef.AnzeigeLen = 1;
ef.Effekt = 0;
ef.Dm = 0;
ef.M = 0;
ef.Di = 0;
EffVal.append(ef);
}
}
}
else
725,7 → 735,6
connect(ToEmbed, SIGNAL(clicked()), this, SLOT(PutToEmbed()));
connect(FromEmbed, SIGNAL(clicked()), this, SLOT(RemoveEmbed()));
connect(DSColor, SIGNAL(clicked()), this, SLOT(DoDownsample()));
// connect(CheckBM, SIGNAL(clicked()), this, SLOT(ToggleBM()));
connect(PagePrev, SIGNAL(clicked()), this, SLOT(PagePr()));
connect(Pages, SIGNAL(highlighted(int)), this, SLOT(SetPgEff(int)));
connect(EffectType, SIGNAL(activated(int)), this, SLOT(SetEffOpts(int)));
929,7 → 938,6
FirstPage->setEnabled( true );
LastPage->setEnabled( true );
CheckBM->setChecked(false);
// ToggleBM();
}
}
 
978,7 → 986,7
EffVal[PgSel].Dm = EDirection->currentItem();
EffVal[PgSel].M = EDirection_2->currentItem();
EffVal[PgSel].Di = EDirection_2_2->currentItem();
SetEffOpts(EffectType->currentItem());
SetEffOpts(EffVal[nr].Effekt);
PageTime->setValue(EffVal[nr].AnzeigeLen);
EffectTime->setValue(EffVal[nr].EffektLen);
EffectType->setCurrentItem(EffVal[nr].Effekt);
1034,6 → 1042,7
 
void PDF_Opts::PagePr()
{
disconnect(Pages, SIGNAL(highlighted(int)), this, SLOT(SetPgEff(int)));
QString tmp;
int ci = Pages->currentItem();
if (PagePrev->isChecked())
1060,15 → 1069,8
PgSel = 0;
Pages->clearSelection();
}
connect(Pages, SIGNAL(highlighted(int)), this, SLOT(SetPgEff(int)));
}
/*
void PDF_Opts::ToggleBM()
{
if (CheckBM->isChecked())
BView->setEnabled(true);
else
BView->setEnabled(false);
} */
 
void PDF_Opts::DoDownsample()
{
/trunk/Scribus/scribus/customfdialog.cpp
204,19 → 204,19
TxCodeT->setText(tr("Encoding:"));
TxCodeM = new QComboBox(true, LayoutC, "Cod");
TxCodeM->setEditable(false);
TxCodeM->insertItem("ISO8859-1");
TxCodeM->insertItem("ISO8859-2");
TxCodeM->insertItem("ISO8859-3");
TxCodeM->insertItem("ISO8859-4");
TxCodeM->insertItem("ISO8859-5");
TxCodeM->insertItem("ISO8859-6");
TxCodeM->insertItem("ISO8859-7");
TxCodeM->insertItem("ISO8859-8");
TxCodeM->insertItem("ISO8859-9");
TxCodeM->insertItem("ISO8859-10");
TxCodeM->insertItem("ISO8859-13");
TxCodeM->insertItem("ISO8859-14");
TxCodeM->insertItem("ISO8859-15");
TxCodeM->insertItem("ISO 8859-1");
TxCodeM->insertItem("ISO 8859-2");
TxCodeM->insertItem("ISO 8859-3");
TxCodeM->insertItem("ISO 8859-4");
TxCodeM->insertItem("ISO 8859-5");
TxCodeM->insertItem("ISO 8859-6");
TxCodeM->insertItem("ISO 8859-7");
TxCodeM->insertItem("ISO 8859-8");
TxCodeM->insertItem("ISO 8859-9");
TxCodeM->insertItem("ISO 8859-10");
TxCodeM->insertItem("ISO 8859-13");
TxCodeM->insertItem("ISO 8859-14");
TxCodeM->insertItem("ISO 8859-15");
TxCodeM->insertItem("utf8");
TxCodeM->insertItem("KOI8-R");
TxCodeM->insertItem("KOI8-U");
/trunk/Scribus/scribus/scribus.cpp
5112,7 → 5112,7
#else
pfad += "/lib/scribus/libs/libpdf.so";
#endif
PDFDriver = dlopen(pfad, RTLD_LAZY);
PDFDriver = dlopen(pfad, RTLD_NOW);
if (!PDFDriver)
{
std::cout << "Can't find Plugin" << endl;
5321,7 → 5321,7
QMessageBox::warning(this, tr("Warning"), tr("Can't write the File: \n%1").arg(fn), tr("OK"));
delete pd;
closePDFDriver();
// BuildFontMenu();
BuildFontMenu();
qApp->setOverrideCursor(QCursor(arrowCursor), true);
}
delete dia;
5528,12 → 5528,6
DatSav->setEnabled(ActWin->MenuStat[0]);
DatOpe->setEnabled(true);
DatClo->setEnabled(true);
/* fileMenu->setItemEnabled(fid1, ActWin->MenuStat[1]);
fileMenu->setItemEnabled(fid4, ActWin->MenuStat[2]);
fileMenu->setItemEnabled(fid5, ActWin->MenuStat[3]);
fileMenu->setItemEnabled(fid12, 1);
fileMenu->setItemEnabled(fid13, 1);
fileMenu->setItemEnabled(fid14, 1); */
fileMenu->setEnabled(true);
if (view->Pages.count() > 1)
{
/trunk/Scribus/scribus/annota.cpp
90,13 → 90,14
GroupBox1Layout->addWidget( TextLabel3, 1, 0 );
SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
SpinBox1->setMinValue(1);
if (Destfile->text() != "")
if (item->AnActType == 7)
// if (Destfile->text() != "")
SpinBox1->setMaxValue(1000);
else
SpinBox1->setMaxValue(Seite);
SpinBox1->setValue(item->AnZiel+1);
GroupBox1Layout->addWidget( SpinBox1, 1, 1 );
if (Destfile->text() != "")
if ((Destfile->text() != "") && (item->AnActType == 7))
Pg = new Navigator( GroupBox1, 100, item->AnZiel+1, view, item->An_Extern);
else
Pg = new Navigator( GroupBox1, 100, item->AnZiel, view);
/trunk/Scribus/scribus/page.cpp
14,7 → 14,6
* (at your option) any later version. *
* *
***************************************************************************/
#include <iostream.h>
 
#include "page.h"
#include "page.moc"
/trunk/Scribus/scribus/libpdf/pdflib.cpp
53,6 → 53,7
PDFlib *dia = new PDFlib();
return dia;
}
 
PDFlib::PDFlib()
{
OwnerKey = QByteArray(32);
887,7 → 888,7
void PDFlib::PDF_TemplatePage(Page* pag)
{
QString tmp;
ActPage = pag;
ActPageP = pag;
Inhalt = "";
Seite.AObjects.clear();
PDF_ProcessPage(pag, pag->PageNr);
960,7 → 961,7
void PDFlib::PDF_Begin_Page(Page* pag, QPixmap pm)
{
QString tmp;
ActPage = pag;
ActPageP = pag;
Inhalt = "";
Seite.AObjects.clear();
if (Options->Thumbnails)
984,7 → 985,7
 
void PDFlib::PDF_End_Page()
{
uint PgNr = ActPage->PageNr;
uint PgNr = ActPageP->PageNr;
Seite.ObjNum = ObjCounter;
WritePDFStream(&Inhalt);
StartObj(ObjCounter);
1061,7 → 1062,7
void PDFlib::PDF_ProcessPage(Page* pag, uint PNr)
{
QString tmp;
ActPage = pag;
ActPageP = pag;
PageItem* ite;
int Lnr = 0;
struct Layer ll;
1181,9 → 1182,9
Level2Layer(doc, &ll, Lnr);
if (ll.Drucken)
{
for (uint a = 0; a < ActPage->Items.count(); ++a)
for (uint a = 0; a < ActPageP->Items.count(); ++a)
{
ite = ActPage->Items.at(a);
ite = ActPageP->Items.at(a);
if (ite->LayerNr != ll.LNr)
continue;
PutPage("q\n");
/trunk/Scribus/scribus/libpdf/pdflib.h
48,33 → 48,33
QMap<QString, GListeInd> GlyphsIdxOfFont;
private:
QString EncStream(QString *in, int ObjNum);
QString EncString(QString in, int ObjNum);
void CalcOwnerKey(QString Owner, QString User);
void CalcUserKey(QString User, int Permission);
QString FitKey(QString pass);
QString FToStr(float c);
QString IToStr(int c);
QString SetClipPath(PageItem *ite);
QString SetFarbe(QString farbe, int Shade);
QString setTextSt(PageItem *ite, uint PNr);
void PutDoc(QString in);
void PutPage(QString in);
void StartObj(int nr);
void WritePDFStream(QString *cc);
QString PDFEncode(QString in);
QByteArray ComputeMD5(QString in);
void PDF_Bookmark(int nr, float ypos);
void PDF_Gradient(PageItem *b);
void PDF_Transparenz(PageItem *b);
void PDF_Annotation(PageItem *ite, uint PNr);
void PDF_Form(QString im);
void PDF_xForm(float w, float h, QString im);
void PDF_Image(bool inver, QString fn, float sx, float sy, float x, float y, bool fromAN = false, QString Profil = "", bool Embedded = false, int Intent = 1);
virtual QString EncStream(QString *in, int ObjNum);
virtual QString EncString(QString in, int ObjNum);
virtual void CalcOwnerKey(QString Owner, QString User);
virtual void CalcUserKey(QString User, int Permission);
virtual QString FitKey(QString pass);
virtual QString FToStr(float c);
virtual QString IToStr(int c);
virtual QString SetClipPath(PageItem *ite);
virtual QString SetFarbe(QString farbe, int Shade);
virtual QString setTextSt(PageItem *ite, uint PNr);
virtual void PutDoc(QString in);
virtual void PutPage(QString in);
virtual void StartObj(int nr);
virtual void WritePDFStream(QString *cc);
virtual QString PDFEncode(QString in);
virtual QByteArray ComputeMD5(QString in);
virtual void PDF_Bookmark(int nr, float ypos);
virtual void PDF_Gradient(PageItem *b);
virtual void PDF_Transparenz(PageItem *b);
virtual void PDF_Annotation(PageItem *ite, uint PNr);
virtual void PDF_Form(QString im);
virtual void PDF_xForm(float w, float h, QString im);
virtual void PDF_Image(bool inver, QString fn, float sx, float sy, float x, float y, bool fromAN = false, QString Profil = "", bool Embedded = false, int Intent = 1);
QString Inhalt;
ScribusDoc* doc;
ScribusView* view;
Page* ActPage;
Page* ActPageP;
PDFOpt* Options;
BookMView* Bvie;
QFile Spool;
/trunk/Scribus/scribus/annot.cpp
616,13 → 616,15
GroupBox11Layout->addWidget( TextLabel31, 1, 0 );
SpinBox11 = new QSpinBox( GroupBox11, "SpinBox1" );
SpinBox11->setMinValue(1);
if (Destfile->text() != "")
if (item->AnActType == 7)
// if (Destfile->text() != "")
SpinBox11->setMaxValue(1000);
else
SpinBox11->setMaxValue(Seite);
SpinBox11->setValue(item->AnZiel+1);
GroupBox11Layout->addWidget( SpinBox11, 1, 1 );
if (Destfile->text() != "")
if (item->AnActType == 7)
// if (Destfile->text() != "")
Pg1 = new Navigator( GroupBox11, 100, item->AnZiel+1, view, item->An_Extern);
else
Pg1 = new Navigator( GroupBox11, 100, item->AnZiel, view);
/trunk/Scribus/scribus/frameedit.cpp
131,18 → 131,22
ButtonGroup4Layout->setAlignment( Qt::AlignTop );
 
PolyShearL = new QToolButton( ButtonGroup4, "ShearL" );
PolyShearL->setAutoRepeat(true);
PolyShearL->setText( tr( "" ) );
PolyShearL->setPixmap(loadIcon("shear_left.png"));
ButtonGroup4Layout->addWidget( PolyShearL );
PolyShearR = new QToolButton( ButtonGroup4, "ShearR" );
PolyShearR->setAutoRepeat(true);
PolyShearR->setText( tr( "" ) );
PolyShearR->setPixmap(loadIcon("shear_right.png"));
ButtonGroup4Layout->addWidget( PolyShearR );
PolyShearU = new QToolButton( ButtonGroup4, "ShearU" );
PolyShearU->setAutoRepeat(true);
PolyShearU->setText( tr( "" ) );
PolyShearU->setPixmap(loadIcon("shear_up.png"));
ButtonGroup4Layout->addWidget( PolyShearU );
PolyShearD = new QToolButton( ButtonGroup4, "ShearD" );
PolyShearD->setAutoRepeat(true);
PolyShearD->setText( tr( "" ) );
PolyShearD->setPixmap(loadIcon("shear_down.png"));
ButtonGroup4Layout->addWidget( PolyShearD );