Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 213 → Rev 214

/trunk/Scribus/ChangeLogCVS
1,4 → 1,7
Changes since Version 1.1.5
29.02.2004 Added first Gimp Integration, contributed by Jean Jacques Sarton.
Improved the PrintPreview a little more.
 
27.02.2004 Improved the PrintPreview, it now remembers the last used Settings.
Added some new Commands to the Scripter.
 
/trunk/Scribus/scribus/util.cpp
55,7 → 55,7
#endif
}
 
#include "scribusdoc.h"
#include "scribus.h"
#include "libpdf/pdflib.h"
#include <ft2build.h>
#include FT_FREETYPE_H
82,6 → 82,7
extern int IntentPrinter;
#endif
extern ProfilesL InputProfiles;
extern ScribusApp* ScApp;
 
void ReOrderText(ScribusDoc *doc, ScribusView *view);
void WordAndPara(PageItem* b, int *w, int *p, int *c, int *wN, int *pN, int *cN);
243,6 → 244,7
proc->setArguments(args);
if ( !proc->start() )
{
delete proc;
return 1;
}
/* start was OK */
274,7 → 276,12
args.append("gs");
args.append("-q");
args.append("-dNOPAUSE");
args.append("-sDEVICE=png16m");
if (ScApp->HavePngAlpha != 0)
args.append("-sDEVICE=png16m");
else
args.append("-sDEVICE=pngalpha");
args.append("-dTextAlphaBits=4");
args.append("-dGraphicsAlphaBits=4");
/* insert specific arguments */
QStringList p;
285,7 → 292,6
args.append("showpage");
args.append("-c");
args.append("quit");
return System(args);
}
 
431,18 → 437,21
image.load(tmpFile);
image = image.convertDepth(32);
image.setAlphaBuffer(true);
int wi = image.width();
int hi = image.height();
for( int yi=0; yi < hi; ++yi )
if (ScApp->HavePngAlpha != 0)
{
int wi = image.width();
int hi = image.height();
for( int yi=0; yi < hi; ++yi )
{
QRgb *s = (QRgb*)(image.scanLine( yi ));
for(int xi=0; xi < wi; ++xi )
QRgb *s = (QRgb*)(image.scanLine( yi ));
for(int xi=0; xi < wi; ++xi )
{
if((*s) == 0xffffffff)
(*s) &= 0x00ffffff;
s++;
if((*s) == 0xffffffff)
(*s) &= 0x00ffffff;
s++;
}
}
}
Bild = image.copy(static_cast<int>(x), 0, static_cast<int>(b-x), static_cast<int>(h-y));
unlink(tmpFile);
}
582,18 → 591,21
image.load(tmpFile);
image = image.convertDepth(32);
image.setAlphaBuffer(true);
int wi = image.width();
int hi = image.height();
for( int yi=0; yi < hi; ++yi )
if (ScApp->HavePngAlpha != 0)
{
int wi = image.width();
int hi = image.height();
for( int yi=0; yi < hi; ++yi )
{
QRgb *s = (QRgb*)(image.scanLine( yi ));
for(int xi=0; xi < wi; ++xi )
QRgb *s = (QRgb*)(image.scanLine( yi ));
for(int xi=0; xi < wi; ++xi )
{
if((*s) == 0xffffffff)
(*s) &= 0x00ffffff;
s++;
if((*s) == 0xffffffff)
(*s) &= 0x00ffffff;
s++;
}
}
}
}
Bild = image.copy(static_cast<int>(x), 0, static_cast<int>(b-x), static_cast<int>(h-y));
unlink(tmpFile);
*realCMYK = false;
/trunk/Scribus/scribus/icons/Makefile.am
1,10 → 1,12
####### kdevelop will overwrite this part!!! (begin)##########
 
 
EXTRA_DIST = Kreuz.xpm Bild.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm Rotieren.xpm Stift.xpm Text.xpm Unlock.xpm DateiClos.xpm DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave.xpm AppIcon.png LupeZ.xpm Gross.xpm Klein.xpm DragPix.xpm Rotieren2.xpm HandC.xpm scribus_logo.jpg DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editdelete.png editpaste.png exit.png doc.png image.png pdf.png postscript.png txt.png Zeichen.xpm Hoch.xpm Kapital.xpm Strike.xpm Tief.xpm Unter.xpm Kern.xpm Spacing.xpm Corner.xpm FlipH.xpm FlipV.xpm Winkel.xpm acrobat.png scribusicon.png text_block.png text_center.png text_left.png text_right.png Text2.xpm spline.png triangle.png Stiftalt.xpm beziertool.png AddNode.png DeleteNode.png MoveAsym.png MoveKontrol.png MoveNode.png MoveSym.png BevelJoin.png ButtCap.png MiterJoin.png RoundJoin.png SquareCap.png ResetNode.png RoundCap.png Reset1Node.png BezierClose.png PolyCut.png AddPoint.png DelPoint.png Split.png Deletelayer.png Layervisible.xpm Lowerlayer.png Newlayer.png Raiselayer.png checkbox.png combobox.png listbox.png pushbutton.png textview.png charset.png goto.png document2.png trashcan.png trashcan2.png gohome.png bottom.png down.png top.png up.png irreg.png text_force.png ok.png Revers.png hmirror.png vmirror.png shear_right.png shear_left.png shear_up.png shear_down.png Splash.png back.png start.png forward.png finish.png penciladd.png pencilsub.png outlined.png fill.png NoPrint.png unlock.png locked.png signature.png rotate_cw.png rotate_ccw.png crop.png expand.png frameresize.png framenoresize.png
EXTRA_DIST = Kreuz.xpm Bild.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm Rotieren.xpm Stift.xpm Text.xpm Unlock.xpm DateiClos.xpm DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave.xpm AppIcon.png LupeZ.xpm Gross.xpm Klein.xpm DragPix.xpm Rotieren2.xpm HandC.xpm scribus_logo.jpg DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editdelete.png editpaste.png exit.png doc.png image.png pdf.png postscript.png txt.png Zeichen.xpm Hoch.xpm Kapital.xpm Strike.xpm Tief.xpm Unter.xpm Kern.xpm Spacing.xpm Corner.xpm FlipH.xpm FlipV.xpm Winkel.xpm acrobat.png scribusicon.png text_block.png text_center.png text_left.png text_right.png Text2.xpm spline.png triangle.png Stiftalt.xpm beziertool.png AddNode.png DeleteNode.png MoveAsym.png MoveKontrol.png MoveNode.png MoveSym.png BevelJoin.png ButtCap.png MiterJoin.png RoundJoin.png SquareCap.png ResetNode.png RoundCap.png Reset1Node.png BezierClose.png PolyCut.png AddPoint.png DelPoint.png Split.png Deletelayer.png Layervisible.xpm Lowerlayer.png Newlayer.png Raiselayer.png checkbox.png combobox.png listbox.png pushbutton.png textview.png charset.png goto.png document2.png trashcan.png trashcan2.png gohome.png bottom.png down.png top.png up.png irreg.png text_force.png ok.png Revers.png hmirror.png vmirror.png shear_right.png shear_left.png shear_up.png shear_down.png Splash.png back.png start.png forward.png finish.png penciladd.png pencilsub.png outlined.png fill.png NoPrint.png unlock.png locked.png signature.png rotate_cw.png rotate_ccw.png crop.png expand.png frameresize.png framenoresize.png testfill.png
 
install-data-local:
$(mkinstalldirs) $(prefix)/lib/scribus/icons/
$(INSTALL_DATA) $(srcdir)/testfill.png $(prefix)/lib/scribus/icons/testfill.png
$(mkinstalldirs) $(prefix)/lib/scribus/icons/
$(INSTALL_DATA) $(srcdir)/frameresize.png $(prefix)/lib/scribus/icons/frameresize.png
$(mkinstalldirs) $(prefix)/lib/scribus/icons/
$(INSTALL_DATA) $(srcdir)/framenoresize.png $(prefix)/lib/scribus/icons/framenoresize.png
397,6 → 399,7
-rm -f $(prefix)/lib/scribus/icons/expand.png
-rm -f $(prefix)/lib/scribus/icons/framenoresize.png
-rm -f $(prefix)/lib/scribus/icons/frameresize.png
-rm -f $(prefix)/lib/scribus/icons/testfill.png
 
 
####### kdevelop will overwrite this part!!! (end)############
/trunk/Scribus/scribus/icons/testfill.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: trunk/Scribus/scribus/page.h
===================================================================
--- trunk/Scribus/scribus/page.h (revision 213)
+++ trunk/Scribus/scribus/page.h (revision 214)
@@ -205,6 +205,8 @@
void ToggleLock();
void TogglePic();
void UpdatePic();
+ void CallGimp();
+ void GimpExited();
void FlipImageH();
void FlipImageV();
void ItemFont(QString fon);
Index: trunk/Scribus/scribus/scpainter.cpp
===================================================================
--- trunk/Scribus/scribus/scpainter.cpp (revision 213)
+++ trunk/Scribus/scribus/scpainter.cpp (revision 214)
@@ -135,7 +135,7 @@
ScPainter::clear()
{
if( m_buffer )
- memset( m_buffer, qRgba( 255, 255, 255, 255 ), m_width * m_height * 4 );
+ memset( m_buffer, 255, m_width * m_height * 4 );
}
void
@@ -142,7 +142,14 @@
ScPainter::clear( const QColor &c )
{
if( m_buffer )
- memset( m_buffer, c.rgb(), m_width * m_height * 4 );
+ {
+ unsigned int *src = (unsigned int*)m_buffer;
+ unsigned int co = qRgba(c.blue(), c.green(), c.red(), 255);
+ for(unsigned int cc = 0; cc < (m_width * m_height); ++cc)
+ {
+ *src++ = co;
+ }
+ }
}
void ScPainter::setWorldMatrix( const QWMatrix &mat )
/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(27).arg("February").arg(2004);
QString bu = tr("%1. %2 %3 ").arg(29).arg("February").arg(2004);
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/scribus.cpp
471,6 → 471,7
}
ScBook->AdjustMenu();
HaveGS = system("gs -h > /dev/null 2>&1");
HavePngAlpha = system("gs -sDEVICE=pngalpha -c quit > /dev/null 2>&1");
splash->setStatus( tr("Initializing Plugins"));
InitPlugs(splash);
ClipB = QApplication::clipboard();
/trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
344,3 → 344,34
return Py_None;
}
 
PyObject *scribus_textflow(PyObject *self, PyObject* args)
{
char* name;
int id, state = -1;
 
if (!PyArg_ParseTuple(args, "s|i", &name, &state))
return NULL;
Py_INCREF(Py_None);
if (!Carrier->HaveDoc)
return Py_None;
 
id = GetItem(QString(name));
if (id == -1)
return Py_None;
 
if (state == -1)
{
Carrier->doc->ActPage->Items.at(id)->Textflow =
!Carrier->doc->ActPage->Items.at(id)->Textflow;
}
else
{
state
? Carrier->doc->ActPage->Items.at(id)->Textflow = true
: Carrier->doc->ActPage->Items.at(id)->Textflow = false;
} // if state null
 
Carrier->view->DrawNew();
Carrier->slotDocCh(true);
return Py_None;
}
/trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
586,6 → 586,8
 
int id1 = GetItem(QString(name1));
int id2 = GetItem(QString(name2));
if ((id1 == -1) || (id2 == -1))
return Py_None;
 
PageItem *item1 = Carrier->doc->ActPage->Items.at(id1);
PageItem *item2 = Carrier->doc->ActPage->Items.at(id2);
638,6 → 640,8
return Py_None;
 
int id = GetItem(QString(name));
if (id == -1)
return Py_None;
PageItem *item = Carrier->doc->ActPage->Items.at(id);
 
// only linked
/trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.h
13,6 → 13,14
PyObject *scribus_bezierline(PyObject *self, PyObject* args);
PyObject *scribus_pathtext(PyObject *self, PyObject* args);
PyObject *scribus_deleteobj(PyObject *self, PyObject* args);
/**
Enables/disables "Text Flows Around Box" feature for object.
Called with params string objectName and voluntary 1|0.
When 1 set flowing to true (0 to false). When is second param
empty flowing is reverted.
02/28/2004 petr vanek
*/
PyObject *scribus_textflow(PyObject *self, PyObject* args);
 
#endif
 
/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
367,6 → 367,7
 
static PyMethodDef scribus_methods[] = {
// petr's stuff
{"TextFlowsAroundBox", scribus_textflow, METH_VARARGS},
{"GetXFontNames", scribus_xfontnames, METH_VARARGS},
{"LinkTextFrames", scribus_linktextframes, METH_VARARGS},
{"UnlinkTextFrames", scribus_unlinktextframes, METH_VARARGS},
/trunk/Scribus/scribus/plugins/svgimplugin/svgplugin.cpp
471,16 → 471,16
case 4:
{
QWMatrix mm = gc->matrix;
ite->Xpos += mm.dx();
ite->Ypos += mm.dy();
/* Doku->ActPage->SelItem.append(ite);
ite->Xpos += mm.dx() / mm.m11();
ite->Ypos += mm.dy() / mm.m22();
Doku->ActPage->SelItem.append(ite);
Doku->ActPage->HowTo = 1;
Doku->ActPage->setGroupRect();
Doku->ActPage->scaleGroup(mm.m11(), mm.m22());
Doku->ActPage->Deselect();
ite->Ypos += ite->LineSp; */
ite->Width = ite->Width * mm.m11();
ite->Height = ite->Height * mm.m22();
// ite->Ypos += ite->LineSp;
// ite->Width = ite->Width * mm.m11();
// ite->Height = ite->Height * mm.m22();
break;
}
default:
1600,7 → 1600,7
ff.setPointSize(QMAX(qRound(m_gc.current()->FontSize / 10.0), 1));
p.setFont(ff);
int desc = p.fontMetrics().descent();
QString Text = QString::fromUtf8(e.text());
QString Text = QString::fromUtf8(e.text()).stripWhiteSpace();
QDomNode c = e.firstChild();
ite->LineSp = m_gc.current()->FontSize / 10.0 + 2;
if ((!c.isNull()) && (c.toElement().tagName() == "tspan"))
1617,8 → 1617,10
Prog->SetNewFont(gc->Family);
double x = parseUnit( tspan.attribute( "x", "1" ) );
double y = parseUnit( tspan.attribute( "y", "1" ) );
ite->Xpos += x;
ite->Ypos += y;
if (!tspan.text().isNull())
Text = QString::fromUtf8(tspan.text());
Text = QString::fromUtf8(tspan.text()).stripWhiteSpace();
else
Text = " ";
for (uint tt = 0; tt < Text.length(); ++tt)
1639,13 → 1641,13
else
hg->cstyle = 0;
hg->cab = 0;
hg->xp = x;
hg->yp = y;
hg->xp = 0;
hg->yp = 0;
hg->PRot = 0;
hg->PtransX = 0;
hg->PtransY = 0;
ite->Ptext.append(hg);
tempW += Cwidth(Doku, hg->cfont, hg->ch, hg->csize);
tempW += Cwidth(Doku, hg->cfont, hg->ch, hg->csize);
if (hg->ch == QChar(13))
{
ite->Height += ite->LineSp+desc;
/trunk/Scribus/scribus/plugins/printpreview/preview.cpp
19,6 → 19,8
#include <qimage.h>
#include <cstdlib>
#include <qcursor.h>
#include <qpainter.h>
#include <qcolor.h>
 
extern QPixmap loadIcon(QString nam);
extern void ReOrderText(ScribusDoc *doc, ScribusView *view);
97,6 → 99,7
CMode = false;
TxtAl = false;
GrAl = false;
Trans = false;
setIcon(loadIcon("AppIcon.png"));
PLayout = new QVBoxLayout(this, 0, 0, "PLayout");
Layout5 = new QHBoxLayout;
302,7 → 305,12
if (EnableCMYK->isChecked())
cmd1 += " -sDEVICE=bitcmyk -dGrayValues=256";
else
cmd1 += " -sDEVICE=png16m";
{
if ((!AliasTr->isChecked()) || (app->HavePngAlpha != 0))
cmd1 += " -sDEVICE=png16m";
else
cmd1 += " -sDEVICE=pngalpha";
}
if (AliasText->isChecked())
cmd1 += " -dTextAlphaBits=4";
if (AliasGr->isChecked())
329,7 → 337,9
double b = app->doc->PageB * Res / 72;
double h = app->doc->PageH * Res / 72;
qApp->setOverrideCursor(QCursor(waitCursor), true);
if ((Seite != APage) || (EnableCMYK->isChecked() != CMode) || (AliasText->isChecked() != TxtAl) || (AliasGr->isChecked() != GrAl))
if ((Seite != APage) || (EnableCMYK->isChecked() != CMode)
|| (AliasText->isChecked() != TxtAl) || (AliasGr->isChecked() != GrAl)
|| ((AliasTr->isChecked() != Trans) && (!EnableCMYK->isChecked())))
{
ret = RenderPreview(Seite, Res);
if (ret != 0)
343,6 → 353,7
CMode = EnableCMYK->isChecked();
TxtAl = AliasText->isChecked();
GrAl = AliasGr->isChecked();
Trans = AliasTr->isChecked();
QImage image;
if (EnableCMYK->isChecked())
{
389,7 → 400,7
{
image.load(app->PrefsPfad+"/sc.png");
image = image.convertDepth(32);
if (AliasTr->isChecked())
if ((AliasTr->isChecked()) && (app->HavePngAlpha == 0))
{
int wi = image.width();
int hi = image.height();
406,6 → 417,17
}
}
image.setAlphaBuffer(true);
if (AliasTr->isChecked())
{
Bild = QPixmap(image.width(), image.height());
QPainter p;
QBrush b(QColor(205,205,205), loadIcon("testfill.png"));
p.begin(&Bild);
p.fillRect(0, 0, image.width(), image.height(), b);
p.drawImage(0, 0, image);
p.end();
}
else
Bild.convertFromImage(image);
qApp->setOverrideCursor(QCursor(arrowCursor), true);
return Bild;
/trunk/Scribus/scribus/plugins/printpreview/preview.h
50,6 → 50,7
bool CMode;
bool TxtAl;
bool GrAl;
bool Trans;
 
public slots:
void ToSeite(int num);
/trunk/Scribus/scribus/page.cpp
49,6 → 49,9
#include <qpopupmenu.h>
#include <qbuttongroup.h>
#include <qlayout.h>
#include <qevent.h>
#include <qeventloop.h>
#include <qprocess.h>
 
#ifdef HAVE_TIFF
#include <tiffio.h>
362,6 → 365,7
return;
QPixmap pgPix(vr.width(), vr.height());
ScPainter *painter = new ScPainter(&pgPix, pgPix.width(), pgPix.height());
painter->clear(doku->papColor);
painter->translate(0.5, 0.5);
if (doku->Before)
DrawPageMarks(painter, vr);
2231,7 → 2235,10
pmen->insertItem( tr("Get Picture..."), this, SIGNAL(LoadPic()));
int px = pmen->insertItem( tr("Image Visible"), this, SLOT(TogglePic()));
pmen->setItemChecked(px, b->PicArt);
pmen->insertItem( tr("Update Picture"), this, SLOT(UpdatePic()));
if (b->PicAvail)
pmen->insertItem( tr("Update Picture"), this, SLOT(UpdatePic()));
if (b->PicAvail && b->isRaster)
pmen->insertItem( tr("Edit Picture"), this, SLOT(CallGimp()));
}
if (b->PType == 4)
{
6338,6 → 6345,107
}
}
 
// jjsa, added the following object for waiting on external process
// and refreshing the main application
 
class AppUserFilter : public QObject
{
public:
AppUserFilter(QObject *o){};
protected:
bool eventFilter(QObject *o, QEvent *e );
};
 
static QProcess *proc = 0;
static AppUserFilter *filter = 0;
 
bool AppUserFilter::eventFilter(QObject *o, QEvent *e )
{
switch(e->type())
{
case QEvent::KeyPress:
case QEvent::KeyRelease:
case QEvent::MouseButtonPress:
case QEvent::MouseButtonRelease:
case QEvent::MouseButtonDblClick:
case QEvent::MouseMove:
case QEvent::TabletPress:
case QEvent::TabletRelease:
case QEvent::TabletMove:
case QEvent::Enter:
case QEvent::Leave:
case QEvent::Close:
case QEvent::Quit:
return TRUE;
break;
default:
return false;
break;
}
return FALSE;
}
 
/* on exit of external programm, remove our event filter and */
/* do the rest of the job */
void Page::GimpExited()
{
int ex;
if ( proc != 0 )
ex = proc->exitStatus();
if ( filter != 0 )
{
qApp->removeEventFilter(filter);
delete filter;
filter = 0;
}
if ( proc != 0 )
{
ex = proc->exitStatus();
delete proc;
proc = 0;
}
PageItem *b = SelItem.at(0);
if (b->PicAvail)
{
if ( ex == 0 )
{
LoadPict(b->Pfile, b->ItemNr);
AdjustPictScale(b);
AdjustPreview(b);
update();
}
}
qApp->mainWidget()->setEnabled(true);
}
 
/* call gimp and wait uppon completion */
void Page::CallGimp()
{
QStringList cmd;
if (SelItem.count() != 0)
{
PageItem *b = SelItem.at(0);
if (b->PicAvail)
{
b->pixmOrg = QImage();
proc = new QProcess(NULL);
cmd.append("gimp");
cmd.append(b->Pfile);
proc->setArguments(cmd);
if ( !proc->start() )
{
delete proc;
proc = 0;
return;
}
qApp->mainWidget()->setEnabled(false);
connect(proc, SIGNAL(processExited()), this, SLOT(GimpExited()));
filter = new AppUserFilter(this);
qApp->installEventFilter(filter);
}
}
}
 
void Page::FlipImageH()
{
if (SelItem.count() != 0)
7418,8 → 7526,8
ts2 >> dummy >> x >> y >> b >> h;
QStringList args;
args.append("-r72");
args.append("-g"+tmp.setNum(qRound(b))+"x"+tmp2.setNum(qRound(h)));
args.append("-sOutputFile="+tmpFile);
args.append("-g"+tmp.setNum(qRound(b))+"x"+tmp2.setNum(qRound(h)));
args.append(fn);
ret = callGS(args);
if (ret == 0)
7429,24 → 7537,26
image.load(tmpFile);
image = image.convertDepth(32);
image.setAlphaBuffer(true);
int wi = image.width();
int hi = image.height();
for( int yi=0; yi < hi; ++yi )
if (ScApp->HavePngAlpha != 0)
{
int wi = image.width();
int hi = image.height();
for( int yi=0; yi < hi; ++yi )
{
QRgb *s = (QRgb*)(image.scanLine( yi ));
for(int xi=0; xi < wi; ++xi )
QRgb *s = (QRgb*)(image.scanLine( yi ));
for(int xi=0; xi < wi; ++xi )
{
if((*s) == 0xffffffff)
(*s) &= 0x00ffffff;
s++;
if((*s) == 0xffffffff)
(*s) &= 0x00ffffff;
s++;
}
}
}
im4.setAlphaBuffer(true);
im4 = image.copy(static_cast<int>(x), 0, static_cast<int>(b-x), static_cast<int>(h-y));
image = ProofPict(&im4, Items.at(ItNr)->IProfile, Items.at(ItNr)->IRender);
Items.at(ItNr)->pixm = image;
Items.at(ItNr)->pixmOrg = image.copy();
Items.at(ItNr)->Pfile = fi.absFilePath();
Items.at(ItNr)->PicAvail = true;
Items.at(ItNr)->PicArt = true;
Items.at(ItNr)->isRaster = false;
7458,6 → 7568,7
Items.at(ItNr)->LocalViewY = Items.at(ItNr)->LocalScY;
Items.at(ItNr)->dpiX = 72.0;
Items.at(ItNr)->dpiY = 72.0;
Items.at(ItNr)->Pfile = fi.absFilePath();
unlink(tmpFile);
}
else
/trunk/Scribus/scribus/scribus.h
163,6 → 163,7
bool ScriptRunning;
Autoforms* SCustom;
WerkToolB* WerkTools;
int HavePngAlpha;
 
public slots:
void slotStoryEditor();