Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 98 → Rev 99

/trunk/Scribus/configure.in
125,6 → 125,7
AC_ENABLE_STATIC(no)
KDE_PROG_LIBTOOL
hapy=no
hapython=yes
KDE_CHECK_PYTHON(1.5)
 
COMPILE_PYTHON=no
132,6 → 133,12
if test $hapy = no; then
COMPILE_PYTHON=no
fi
if test $hapy = yes; then
AC_CHECK_HEADER(python2.3/Python.h, [foo=""],[hapython=no])
if test $hapython = yes; then
AC_DEFINE_UNQUOTED(HAVE_PYTHON_23, 1, [Python])
fi
fi
AM_CONDITIONAL(COMPILE_PYTHON, test x$COMPILE_PYTHON = xyes)
 
AC_CHECK_HEADER(cups/cups.h, [foo=""],[hacups=no])
193,5 → 200,10
if test $COMPILE_PYTHON = no; then
echo "The Scripter-Plugin will no be build."
fi
if test $hapython = yes; then
echo "Using Python 2.3"
else
echo "Using Python < 2.3"
fi
echo ""
echo "Start make now."
/trunk/Scribus/config.h.in
46,6 → 46,9
/* Define if you have the development files for python */
#undef HAVE_PYTHON
 
/* Python */
#undef HAVE_PYTHON_23
 
/* Define if you have the res_init function */
#undef HAVE_RES_INIT
 
/trunk/Scribus/ChangeLogCVS
1,4 → 1,7
Changes since Version 1.1.2
10.11.2003 Added Web-Links to the PDF-Export.
Fixed compilation issues with Python 2.3
 
09.11.2003 Fixed compilation issues with the Scripter-Plugin.
Fixed wrong colors for Gradients in PDF.
 
/trunk/Scribus/scribus/libabout/about.cpp
32,7 → 32,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = "09. November 2003 ";
QString bu = "10. November 2003 ";
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/scribus.cpp
6217,9 → 6217,20
b = doc->ActPage->SelItem.at(0);
if ((b->AnType == 0) || (b->AnType == 1) || (b->AnType > 9))
{
int AnType = b->AnType;
int AnActType = b->AnActType;
QString AnAction = b->AnAction;
QString An_Extern = b->An_Extern;
Annota *dia = new Annota(this, b, doc->PageC, static_cast<int>(doc->PageB), static_cast<int>(doc->PageH), doc->PageColors, view);
if (dia->exec())
slotDocCh();
else
{
b->AnType = AnType;
b->AnActType = AnActType;
b->AnAction = AnAction;
b->An_Extern = An_Extern;
}
delete dia;
}
else
/trunk/Scribus/scribus/annota.cpp
53,6 → 53,7
ComboBox1->insertItem( tr( "Text" ) );
ComboBox1->insertItem( tr( "Link" ) );
ComboBox1->insertItem( tr( "External Link" ) );
ComboBox1->insertItem( tr( "External Web-Link" ) );
ComboBox1->setEditable(false);
Layout1->addWidget( ComboBox1 );
AnnotLayout->addLayout( Layout1 );
59,6 → 60,8
item->AnType < 2 ? ComboBox1->setCurrentItem(item->AnType) : ComboBox1->setCurrentItem(item->AnType-10);
if (item->AnActType == 7)
ComboBox1->setCurrentItem(2);
if (item->AnActType == 8)
ComboBox1->setCurrentItem(3);
Fram = new QWidgetStack(this);
AnnotLayout->addWidget( Fram );
 
79,7 → 82,7
ChFile = new QPushButton(GroupBox1, "Change");
ChFile->setText(tr("Change..."));
GroupBox1Layout->addWidget( ChFile, 0, 2 );
if (item->AnActType != 7)
if ((item->AnActType != 7) && (item->AnActType != 8))
{
Destfile->hide();
ChFile->hide();
151,7 → 154,6
SetCross();
}
 
 
void Annota::SetCo(double x, double y)
{
SpinBox2->setValue(static_cast<int>(x*Breite));
216,6 → 218,16
}
item->AnType = 11;
}
if (item->AnType == 13)
{
item->AnAction = "";
if (Destfile->text() != "")
{
item->An_Extern = Destfile->text();
item->AnActType = 8;
}
item->AnType = 11;
}
accept();
}
 
222,6 → 234,13
void Annota::SetZiel(int it)
{
disconnect(ComboBox1, SIGNAL(activated(int)), this, SLOT(SetZiel(int)));
Pg->show();
TextLabel3->show();
TextLabel4->show();
TextLabel5->show();
SpinBox1->show();
SpinBox2->show();
SpinBox3->show();
switch (it)
{
case 1:
236,8 → 255,12
Fram->raiseWidget(1);
Destfile->show();
ChFile->show();
if (Destfile->text() == "")
Destfile->setReadOnly(true);
if ((Destfile->text() == "") || (item->AnActType == 8))
{
Destfile->setText("");
GetFile();
}
if (Destfile->text() == "")
{
item->AnActType = 2;
250,6 → 273,20
item->AnActType = 7;
SetPg(QMIN(SpinBox1->value(), MaxSeite));
break;
case 3:
Fram->raiseWidget(1);
Destfile->show();
Destfile->setReadOnly(false);
ChFile->hide();
Pg->hide();
TextLabel3->hide();
TextLabel4->hide();
TextLabel5->hide();
SpinBox1->hide();
SpinBox2->hide();
SpinBox3->hide();
item->AnActType = 8;
break;
case 11:
Fram->raiseWidget(1);
if (item->AnActType == 7)
256,8 → 293,23
{
Destfile->show();
ChFile->show();
Destfile->setReadOnly(true);
}
SetPg(QMIN(SpinBox1->value(), MaxSeite));
if (item->AnActType == 8)
{
Destfile->show();
Destfile->setReadOnly(false);
ChFile->hide();
Pg->hide();
TextLabel3->hide();
TextLabel4->hide();
TextLabel5->hide();
SpinBox1->hide();
SpinBox2->hide();
SpinBox3->hide();
}
if (Pg->isVisible())
SetPg(QMIN(SpinBox1->value(), MaxSeite));
break;
default:
Fram->raiseWidget(2);
/trunk/Scribus/scribus/plugins/scriptplugin/cmdvar.h
1,7 → 1,10
#ifndef CMDVAR_H
#define CMDVAR_H
 
#include "Python.h"
#ifdef HAVE_PYTHON_23
#include <Python.h>
#endif
 
#include "scribus.h"
 
/* Static global Variables */
/trunk/Scribus/scribus/libpdf/pdflib.cpp
2182,13 → 2182,8
case 1:
case 11:
PutDoc("/Subtype /Link\n");
if (ite->AnActType == 7)
if (ite->AnActType == 2)
{
PutDoc("/A << /Type /Action /S /GoToR\n/F "+EncString("("+Path2Relative(ite->An_Extern)+")",ObjCounter-1)+"\n");
PutDoc("/D ["+IToStr(ite->AnZiel)+" /XYZ "+ite->AnAction+"]\n>>\n");
}
else
{
PutDoc("/Dest /"+NDnam+IToStr(NDnum)+"\n");
de.Name = NDnam+IToStr(NDnum);
de.Seite = ite->AnZiel;
2196,6 → 2191,13
NamedDest.append(de);
NDnum++;
}
if (ite->AnActType == 7)
{
PutDoc("/A << /Type /Action /S /GoToR\n/F "+EncString("("+Path2Relative(ite->An_Extern)+")",ObjCounter-1)+"\n");
PutDoc("/D ["+IToStr(ite->AnZiel)+" /XYZ "+ite->AnAction+"]\n>>\n");
}
if (ite->AnActType == 8)
PutDoc("/A << /Type /Action /S /URI\n/URI "+EncString("("+ite->An_Extern+")",ObjCounter-1)+"\n>>\n");
break;
case 2:
case 3:
/trunk/Scribus/scribus/annot.cpp
2011,10 → 2011,13
if (Destfile->text() == "")
{
GetFile();
item->AnActType = 2;
Destfile->setEnabled(false);
ChFile->setEnabled(false);
LExtern->setChecked(false);
if (Destfile->text() == "")
{
item->AnActType = 2;
Destfile->setEnabled(false);
ChFile->setEnabled(false);
LExtern->setChecked(false);
}
}
SetPg(QMIN(SpinBox11->value(), MaxSeite));
}
/trunk/Scribus/scribus/scribusXml.cpp
407,14 → 407,14
OB.An_F_act = obj.attribute("ANFACT","");
OB.An_V_act = obj.attribute("ANVACT","");
OB.An_C_act = obj.attribute("ANCACT","");
OB.AnActType = QStoInt(obj.attribute("ANACTYP","0"));
OB.An_Extern = obj.attribute("ANEXTERN","");
if (OB.An_Extern != "")
if ((OB.An_Extern != "") && (OB.AnActType != 8))
{
QFileInfo efp(OB.An_Extern);
OB.An_Extern = efp.absFilePath();
}
OB.AnZiel = QStoInt(obj.attribute("ANZIEL","0"));
OB.AnActType = QStoInt(obj.attribute("ANACTYP","0"));
OB.AnName = obj.attribute("ANNAME","");
OB.AnToolTip = obj.attribute("ANTOOLTIP","");
OB.AnRollOver = obj.attribute("ANROLL","");
978,14 → 978,14
OB.An_F_act = obj.attribute("ANFACT","");
OB.An_V_act = obj.attribute("ANVACT","");
OB.An_C_act = obj.attribute("ANCACT","");
OB.AnActType = QStoInt(obj.attribute("ANACTYP","0"));
OB.An_Extern = obj.attribute("ANEXTERN","");
if (OB.An_Extern != "")
if ((OB.An_Extern != "") && (OB.AnActType != 8))
{
QFileInfo efp(OB.An_Extern);
OB.An_Extern = efp.absFilePath();
}
OB.AnZiel = QStoInt(obj.attribute("ANZIEL","0"));
OB.AnActType = QStoInt(obj.attribute("ANACTYP","0"));
OB.AnName = obj.attribute("ANNAME","");
OB.AnToolTip = obj.attribute("ANTOOLTIP","");
OB.AnRollOver = obj.attribute("ANROLL","");
1453,14 → 1453,14
OB.An_F_act = pg.attribute("ANFACT","");
OB.An_V_act = pg.attribute("ANVACT","");
OB.An_C_act = pg.attribute("ANCACT","");
OB.AnActType = QStoInt(pg.attribute("ANACTYP","0"));
OB.An_Extern = pg.attribute("ANEXTERN","");
if (OB.An_Extern != "")
if ((OB.An_Extern != "") && (OB.AnActType != 8))
{
QFileInfo efp(OB.An_Extern);
OB.An_Extern = efp.absFilePath();
}
OB.AnZiel = QStoInt(pg.attribute("ANZIEL","0"));
OB.AnActType = QStoInt(pg.attribute("ANACTYP","0"));
OB.AnName = pg.attribute("ANNAME","");
OB.AnToolTip = pg.attribute("ANTOOLTIP","");
OB.AnRollOver = pg.attribute("ANROLL","");
1739,7 → 1739,10
ob.setAttribute("ANFACT", item->An_F_act);
ob.setAttribute("ANVACT", item->An_V_act);
ob.setAttribute("ANCACT", item->An_C_act);
ob.setAttribute("ANEXTERN", Path2Relative(item->An_Extern));
if (item->AnActType == 8)
ob.setAttribute("ANEXTERN", item->An_Extern);
else
ob.setAttribute("ANEXTERN", Path2Relative(item->An_Extern));
ob.setAttribute("ANZIEL", item->AnZiel);
ob.setAttribute("ANACTYP", item->AnActType);
ob.setAttribute("ANTOOLTIP", item->AnToolTip);
2119,7 → 2122,10
ob.setAttribute("ANFACT", item->An_F_act);
ob.setAttribute("ANVACT", item->An_V_act);
ob.setAttribute("ANCACT", item->An_C_act);
ob.setAttribute("ANEXTERN", Path2Relative(item->An_Extern));
if (item->AnActType == 8)
ob.setAttribute("ANEXTERN", item->An_Extern);
else
ob.setAttribute("ANEXTERN", Path2Relative(item->An_Extern));
ob.setAttribute("ANZIEL", item->AnZiel);
ob.setAttribute("ANACTYP", item->AnActType);
ob.setAttribute("ANTOOLTIP", item->AnToolTip);