SVN commit 1241292 by freitag: added path attribute for the presentation M +1 -1 zippl.xml M +5 -1 zipplxmlreader.cpp M +1 -0 zipplxmlreader.h --- trunk/playground/office/zippl/zippl.xml #1241291:1241292 @@ -8,7 +8,7 @@ freitag@suse.de - + A Greeting Page --- trunk/playground/office/zippl/zipplxmlreader.cpp #1241291:1241292 @@ -94,6 +94,10 @@ QString mode = attributes().value("mode").toString(); if( !mode.isEmpty() ) mMode = mode; + mPath = attributes().value("path").toString(); + if( !mPath.endsWith('/') ) mPath += "/"; + + qreal dx = qrealAttrib("width") / -2.0; qreal dy = qrealAttrib("height") / -2.0; QRectF rect( dx, dy, -2.0*dx, -2.0*dy ); @@ -296,7 +300,7 @@ QGraphicsPixmapItem *item = new QGraphicsPixmapItem( mCurrParent, scene ); item->setPos( position() ); - QString imgName = readElementText(); + QString imgName = mPath + readElementText(); bool ret = true; if(!QFile::exists( imgName )) { --- trunk/playground/office/zippl/zipplxmlreader.h #1241291:1241292 @@ -46,6 +46,7 @@ QList mSpots; QMap mHiddenItems; QString mMode; + QString mPath; QString mPresentationTitle; QString mPresentationDescr; QString mPresentationDate;