Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 97 → Rev 98

/trunk/Scribus/ChangeLogCVS
1,4 → 1,7
Changes since Version 1.1.2
09.11.2003 Fixed compilation issues with the Scripter-Plugin.
Fixed wrong colors for Gradients in PDF.
 
08.11.2003 You can now insert Pictures by simply dragging them to a Page.
Setting the Textflow works again for Lines.
Added an absolute coordinate Mode to the Node-Palette.
/trunk/Scribus/scribus/pageitem.cpp
65,8 → 65,8
TxTStyle = 0;
Shade = 100;
Shade2 = 100;
GrColor = "";
GrColor2 = "";
GrColor = Pcolor2;
GrColor2 = Pcolor2;
GrShade = 100;
GrShade2 = 100;
GrType = 0;
/trunk/Scribus/scribus/libabout/about.cpp
32,7 → 32,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = "08. November 2003 ";
QString bu = "09. November 2003 ";
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/plugins/scriptplugin/Makefile.am
1,4 → 1,3
if COMPILE_PYTHON
SUBDIRS = doc samples
pluginsdir = $(prefix)/lib/scribus/plugins
AM_CPPFLAGS = -I$(top_builddir)/scribus $(PYTHONINC)
10,4 → 9,3
EXTRA_DIST = cmdvar.h cmdutil.cpp cmdutil.h cmddialog.cpp cmddialog.h cmddoc.cpp cmddoc.h cmdpage.cpp cmdpage.h cmdobj.cpp cmdobj.h cmdgetprop.cpp cmdgetprop.h cmdsetprop.cpp cmdsetprop.h cmdtext.cpp cmdtext.h cmdmani.cpp cmdmani.h cmdcolor.cpp cmdcolor.h cmdmisc.cpp cmdmisc.h scriptplugin.cpp scriptplugin.h pconsole.cpp pconsole.h conswin.cpp conswin.h
KDE_OPTIONS = qtonly
AM_LDFLAGS = -Xlinker -s $(PYTHONLIB) $(LIBPYTHON)
endif
/trunk/Scribus/scribus/plugins/Makefile.am
1,5 → 1,8
####### kdevelop will overwrite this part!!! (begin)##########
if COMPILE_PYTHON
pyt = scriptplugin
endif
 
SUBDIRS = libchar svgexplugin svgimplugin printpreview scriptplugin
SUBDIRS = libchar svgexplugin svgimplugin printpreview $(pyt)
 
####### kdevelop will overwrite this part!!! (end)############
/trunk/Scribus/scribus/page.cpp
217,7 → 217,7
QStrList imfo = QImageIO::inputFormats();
if (ext == "JPG")
ext = "JPEG";
img = ((imfo.contains(ext))||(ext=="PS")||(ext=="EPS")||(ext=="TIF"));
img = ((imfo.contains(ext))||(ext=="PS")||(ext=="EPS")||(ext=="PDF")||(ext=="TIF"));
if ((fi.exists()) && (img) && (!SeleItemPos(e->pos())))
{
int z = PaintPict(qRound(e->pos().x()/doku->Scale), qRound(e->pos().y()/doku->Scale), 1, 1);
5397,6 → 5397,15
uint a;
PageItem *i;
QColor tmp;
QString col1c, col2c;
if ((col1 == "None") || (col1 == ""))
col1c = "Black";
else
col1c = col1;
if ((col2 == "None") || (col2 == ""))
col2c = "Black";
else
col2c = col2;
if (SelItem.count() != 0)
{
for (a = 0; a < SelItem.count(); ++a)
5405,25 → 5414,21
i->fill_gradient.clearStops();
if (typ == 5)
{
if ((col2 != "None") && (col2 != ""))
i->SetFarbe(&tmp, col2, sh2);
i->SetFarbe(&tmp, col2c, sh2);
i->fill_gradient.addStop(tmp, 0.0, 0.5, 1.0);
if ((col1 != "None") && (col1 != ""))
i->SetFarbe(&tmp, col1, sh1);
i->SetFarbe(&tmp, col1c, sh1);
i->fill_gradient.addStop(tmp, 1.0, 0.5, 1.0);
}
else
{
if ((col1 != "None") && (col1 != ""))
i->SetFarbe(&tmp, col1, sh1);
i->SetFarbe(&tmp, col1c, sh1);
i->fill_gradient.addStop(tmp, 0.0, 0.5, 1.0);
if ((col2 != "None") && (col2 != ""))
i->SetFarbe(&tmp, col2, sh2);
i->SetFarbe(&tmp, col2c, sh2);
i->fill_gradient.addStop(tmp, 1.0, 0.5, 1.0);
}
i->GrColor2 = col1;
i->GrColor2 = col1c;
i->GrShade2 = sh1;
i->GrColor = col2;
i->GrColor = col2c;
i->GrShade = sh2;
i->GrType = typ;
RefreshItem(i);
/trunk/Scribus/scribus/libpdf/pdflib.cpp
2043,7 → 2043,7
ResCount++;
ObjCounter++;
PutDoc("<<\n");
PutDoc(b->GrType == 5 ? "ShadingType 3\n" : "/ShadingType 2\n");
PutDoc(b->GrType == 5 ? "/ShadingType 3\n" : "/ShadingType 2\n");
if (Options->UseRGB)
PutDoc("/ColorSpace /DeviceRGB\n");
else