1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/adaptormodel.cpp	Mon Aug 03 10:42:12 2009 +0000
     1.3 @@ -0,0 +1,57 @@
     1.4 +#include "adaptormodel.h"
     1.5 +#include <QtCore/QMetaObject>
     1.6 +#include <QtCore/QString>
     1.7 +#include <QtCore/QVariant>
     1.8 +
     1.9 +#include "vymmodel.h"
    1.10 +
    1.11 +AdaptorModel::AdaptorModel(QObject *obj)
    1.12 +         : QDBusAbstractAdaptor(obj)
    1.13 +{
    1.14 +	model=static_cast <VymModel*> (obj);
    1.15 +	setAutoRelaySignals (true);
    1.16 +}
    1.17 +
    1.18 +AdaptorModel::~AdaptorModel()
    1.19 +{
    1.20 +    // destructor
    1.21 +}
    1.22 +
    1.23 +void AdaptorModel::setModel(VymModel *vm)
    1.24 +{
    1.25 +	model=vm;
    1.26 +}
    1.27 +
    1.28 +QString AdaptorModel::caption()
    1.29 +{
    1.30 +	return m_caption;
    1.31 +}
    1.32 +
    1.33 +void AdaptorModel::setCaption (const QString &newCaption)
    1.34 +{
    1.35 +	m_caption=newCaption;
    1.36 +}
    1.37 +
    1.38 +QDBusVariant AdaptorModel::query(const QString &query)
    1.39 +{
    1.40 +	QString s;
    1.41 +	if (model)
    1.42 +		s=model->getHeading();
    1.43 +	else
    1.44 +		s="oops, no vymModel?";
    1.45 +
    1.46 +	return QDBusVariant (s);
    1.47 +}
    1.48 +
    1.49 +QDBusVariant AdaptorModel::getHeading()
    1.50 +{
    1.51 +	QString s;
    1.52 +	if (model)
    1.53 +		s=model->getHeading();
    1.54 +	else
    1.55 +		s="oops, no vymModel?";
    1.56 +
    1.57 +	return QDBusVariant (s);
    1.58 +}
    1.59 +
    1.60 +

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/adaptormodel.h	Mon Aug 03 10:42:12 2009 +0000
     2.3 @@ -0,0 +1,35 @@
     2.4 +#ifndef ADAPTORModel_H
     2.5 +#define ADAPTORModel_H
     2.6 +
     2.7 +#include <QtCore/QObject>
     2.8 +#include <QtDBus/QtDBus>
     2.9 +
    2.10 +class VymModel;
    2.11 +class QString;
    2.12 +
    2.13 +class AdaptorModel: public QDBusAbstractAdaptor
    2.14 +{
    2.15 +    Q_OBJECT
    2.16 +    Q_CLASSINFO("D-Bus Interface", "org.insilmaril.Adaptor")
    2.17 +	Q_PROPERTY(QString caption READ caption WRITE setCaption)
    2.18 +private:
    2.19 +	VymModel *model;
    2.20 +
    2.21 +public:
    2.22 +    AdaptorModel(QObject *obj);
    2.23 +    virtual ~AdaptorModel();
    2.24 +	void setModel (VymModel *vm);
    2.25 +
    2.26 +public: // PROPERTIES
    2.27 +	QString m_caption;
    2.28 +	QString caption();
    2.29 +	void setCaption(const QString &newCaption);
    2.30 +public slots: // METHODS
    2.31 +   QDBusVariant query(const QString &query);
    2.32 +   QDBusVariant getHeading();
    2.33 +
    2.34 +Q_SIGNALS: // SIGNALS
    2.35 +    void crashed();
    2.36 +};
    2.37 +
    2.38 +#endif

     3.1 --- a/branchitem.cpp	Mon Jul 27 12:53:17 2009 +0000
     3.2 +++ b/branchitem.cpp	Mon Aug 03 10:42:12 2009 +0000
     3.3 @@ -14,6 +14,9 @@
     3.4  	scrolled=false;
     3.5  	tmpUnscrolled=false;
     3.6  	type=Branch;
     3.7 +
     3.8 +	includeImagesVer=false;
     3.9 +	includeImagesHor=false;
    3.10  }
    3.11  
    3.12  BranchItem::~BranchItem()
    3.13 @@ -98,7 +101,7 @@
    3.14  		+scrolledAttr 
    3.15  	//	+areaAttr 
    3.16  	//	+idAttr 
    3.17 -	//	+getIncludeImageAttr() 
    3.18 +		+getIncludeImageAttr() 
    3.19  		);
    3.20      incIndent();
    3.21  
    3.22 @@ -258,6 +261,46 @@
    3.23  	}	
    3.24  }
    3.25  
    3.26 +void BranchItem::setIncludeImagesVer(bool b)
    3.27 +{
    3.28 +	includeImagesVer=b;
    3.29 +	/* calcBBoxSize(); FIXME-2
    3.30 +	positionBBox();
    3.31 +	requestReposition();
    3.32 +	*/
    3.33 +}
    3.34 +
    3.35 +bool BranchItem::getIncludeImagesVer()
    3.36 +{
    3.37 +	return includeImagesVer;
    3.38 +}
    3.39 +
    3.40 +void BranchItem::setIncludeImagesHor(bool b)
    3.41 +{
    3.42 +	includeImagesHor=b;
    3.43 +	/* calcBBoxSize(); FIXME-2
    3.44 +	positionBBox();
    3.45 +	requestReposition();
    3.46 +	*/
    3.47 +}
    3.48 +
    3.49 +bool BranchItem::getIncludeImagesHor()
    3.50 +{
    3.51 +	return includeImagesHor;
    3.52 +}
    3.53 +
    3.54 +QString BranchItem::getIncludeImageAttr()
    3.55 +{
    3.56 +	QString a;
    3.57 +	if (includeImagesVer)
    3.58 +		a=attribut ("incImgV","true");
    3.59 +	if (includeImagesHor)
    3.60 +		a+=attribut ("incImgH","true");
    3.61 +	return a;	
    3.62 +}
    3.63 +
    3.64 +
    3.65 +
    3.66  TreeItem* BranchItem::findMapItem (QPointF p, TreeItem* excludeTI)
    3.67  {
    3.68  	// Search branches
    3.69 @@ -303,7 +346,7 @@
    3.70  
    3.71  
    3.72  /*
    3.73 -	// Search float images
    3.74 +	// Search float images //FIXME-4
    3.75      for (int i=0; i<floatimage.size(); ++i )
    3.76  		if (floatimage.at(i)->inBox(p) && 
    3.77  			(floatimage.at(i) != excludeLMO) && 

     4.1 --- a/branchitem.h	Mon Jul 27 12:53:17 2009 +0000
     4.2 +++ b/branchitem.h	Mon Aug 03 10:42:12 2009 +0000
     4.3 @@ -34,6 +34,20 @@
     4.4  	virtual void tmpUnscroll();				// unscroll scrolled parents temporary e.g. during "find" process
     4.5  	virtual void resetTmpUnscroll();		// scroll all tmp scrolled parents again e.g. when unselecting
     4.6  
     4.7 +
     4.8 +protected:
     4.9 +	bool includeImagesVer;			//! include floatimages in bbox vertically
    4.10 +	bool includeImagesHor;			//! include floatimages in bbox horizontally
    4.11 +public:
    4.12 +	void setIncludeImagesVer(bool);
    4.13 +	bool getIncludeImagesVer();
    4.14 +	void setIncludeImagesHor(bool);
    4.15 +	bool getIncludeImagesHor();
    4.16 +	QString getIncludeImageAttr();
    4.17 +
    4.18 +public:
    4.19 +
    4.20 +
    4.21  	TreeItem* findMapItem (QPointF p,TreeItem* excludeTI);	//! search map for branches or images. Ignore excludeTI, where search is started 
    4.22  	virtual TreeItem* findID (QString sid);	//! search map for object with ID string
    4.23  

     5.1 --- a/branchobj.cpp	Mon Jul 27 12:53:17 2009 +0000
     5.2 +++ b/branchobj.cpp	Mon Aug 03 10:42:12 2009 +0000
     5.3 @@ -86,18 +86,12 @@
     5.4  		absPos=getRandPos();
     5.5  		absPos+=parObj->getChildPos();
     5.6  	}
     5.7 -
     5.8 -	includeImagesVer=false;
     5.9 -	includeImagesHor=false;
    5.10  }
    5.11  
    5.12  void BranchObj::copy (BranchObj* other)
    5.13  {
    5.14      OrnamentedObj::copy(other);
    5.15  
    5.16 -	for (int i=0; i<other->floatimage.size(); ++i)
    5.17 -		addFloatImage  (other->floatimage.at(i));
    5.18 -	
    5.19  	setVisibility (other->visible);
    5.20  
    5.21  	angle=other->angle;
    5.22 @@ -109,9 +103,6 @@
    5.23  {
    5.24  	//setVisibility (true); //FIXME-4 needed?
    5.25  
    5.26 -	while (!floatimage.isEmpty())
    5.27 -		delete floatimage.takeFirst();
    5.28 -
    5.29  	while (!xlink.isEmpty())
    5.30  		delete xlink.takeFirst();
    5.31  }
    5.32 @@ -218,15 +209,15 @@
    5.33  		standardFlags->setVisibility(v);
    5.34  		LinkableMapObj::setVisibility (v);
    5.35  		int i;
    5.36 -		for (i=0; i<floatimage.size(); ++i)
    5.37 -			floatimage.at(i)->setVisibility (v);
    5.38 +		for (i=0; i<treeItem->imageCount(); ++i)
    5.39 +			treeItem->getImageObjNum(i)->setVisibility (v);
    5.40  		for (i=0; i<xlink.size(); ++i)	
    5.41  			xlink.at(i)->setVisibility ();	
    5.42  
    5.43  		// Only change children, if I am not scrolled
    5.44  		if (! bi->isScrolled() && (bi->depth() < toDepth))
    5.45  		{
    5.46 -			// Now go recursivly through all children
    5.47 +			// Now go recursivly through all children //FIXME-3 are there multiple calls for lower level items???
    5.48  			for (i=0; i<treeItem->branchCount(); ++i)
    5.49  				treeItem->getBranchObjNum(i)->setVisibility (v,toDepth);	
    5.50  		}
    5.51 @@ -264,8 +255,8 @@
    5.52  
    5.53  void BranchObj::positionContents()
    5.54  {
    5.55 -    for (int i=0; i<floatimage.size(); ++i )
    5.56 -		floatimage.at(i)->reposition();
    5.57 +	for (int i=0; i<treeItem->imageCount(); ++i)
    5.58 +		treeItem->getImageObjNum(i)->reposition();
    5.59  	OrnamentedObj::positionContents();
    5.60  }
    5.61  
    5.62 @@ -344,37 +335,38 @@
    5.63  	QPointF rp;
    5.64  
    5.65  	topPad=botPad=leftPad=rightPad=0;
    5.66 -	if (includeImagesVer || includeImagesHor)
    5.67 +	bool incV=((BranchItem*)treeItem)->getIncludeImagesVer();
    5.68 +	bool incH=((BranchItem*)treeItem)->getIncludeImagesHor();
    5.69 +	if (incH || incV)
    5.70  	{
    5.71 -		if (treeItem->imageCount()>0)
    5.72 +		FloatImageObj *fio;
    5.73 +		for (int i=0; i<treeItem->imageCount(); ++i )	
    5.74  		{
    5.75 -			for (int i=0; i<floatimage.size(); ++i )
    5.76 +			fio=treeItem->getImageObjNum(i);
    5.77 +			rp=fio->getRelPos();
    5.78 +			if (incV)
    5.79  			{
    5.80 -				rp=floatimage.at(i)->getRelPos();
    5.81 -				if (includeImagesVer)
    5.82 +				if (rp.y() < 0) 
    5.83 +					topPad=max (topPad,-rp.y()-h);
    5.84 +				if (rp.y()+fio->height() > 0)
    5.85 +					botPad=max (botPad,rp.y()+fio->height());
    5.86 +			}		
    5.87 +			if (incH)
    5.88 +			{
    5.89 +				if (orientation==LinkableMapObj::RightOfCenter)
    5.90  				{
    5.91 -					if (rp.y() < 0) 
    5.92 -						topPad=max (topPad,-rp.y()-h);
    5.93 -					if (rp.y()+floatimage.at(i)->height() > 0)
    5.94 -						botPad=max (botPad,rp.y()+floatimage.at(i)->height());
    5.95 -				}		
    5.96 -				if (includeImagesHor)
    5.97 +					if (-rp.x()-w > 0) 
    5.98 +						leftPad=max (leftPad,-rp.x()-w);
    5.99 +					if (rp.x()+fio->width() > 0)
   5.100 +						rightPad=max (rightPad,rp.x()+fio->width());
   5.101 +				} else
   5.102  				{
   5.103 -					if (orientation==LinkableMapObj::RightOfCenter)
   5.104 -					{
   5.105 -						if (-rp.x()-w > 0) 
   5.106 -							leftPad=max (leftPad,-rp.x()-w);
   5.107 -						if (rp.x()+floatimage.at(i)->width() > 0)
   5.108 -							rightPad=max (rightPad,rp.x()+floatimage.at(i)->width());
   5.109 -					} else
   5.110 -					{
   5.111 -						if (rp.x()< 0) 
   5.112 -							leftPad=max (leftPad,-rp.x());
   5.113 -						if (rp.x()+floatimage.at(i)->width() > w)
   5.114 -							rightPad=max (rightPad,rp.x()+floatimage.at(i)->width()-w);
   5.115 -					}
   5.116 -				}		
   5.117 -			}	
   5.118 +					if (rp.x()< 0) 
   5.119 +						leftPad=max (leftPad,-rp.x());
   5.120 +					if (rp.x()+fio->width() > w)
   5.121 +						rightPad=max (rightPad,rp.x()+fio->width()-w);
   5.122 +				}
   5.123 +			}		
   5.124  		}	
   5.125  		h+=topPad+botPad;
   5.126  		w+=leftPad+rightPad;
   5.127 @@ -478,9 +470,7 @@
   5.128  			changed=true;
   5.129  		}	
   5.130  	}
   5.131 -
   5.132 -	if (changed)
   5.133 -		updateContentSize();
   5.134 +	updateContentSize();
   5.135  }
   5.136  
   5.137  
   5.138 @@ -523,47 +513,9 @@
   5.139  	return NULL;
   5.140  }
   5.141  
   5.142 -void BranchObj::setIncludeImagesVer(bool b)
   5.143 -{
   5.144 -	includeImagesVer=b;
   5.145 -	calcBBoxSize();
   5.146 -	positionBBox();
   5.147 -	requestReposition();
   5.148 -}
   5.149 -
   5.150 -bool BranchObj::getIncludeImagesVer()
   5.151 -{
   5.152 -	return includeImagesVer;
   5.153 -}
   5.154 -
   5.155 -void BranchObj::setIncludeImagesHor(bool b)
   5.156 -{
   5.157 -	includeImagesHor=b;
   5.158 -	calcBBoxSize();
   5.159 -	positionBBox();
   5.160 -	requestReposition();
   5.161 -}
   5.162 -
   5.163 -bool BranchObj::getIncludeImagesHor()
   5.164 -{
   5.165 -	return includeImagesHor;
   5.166 -}
   5.167 -
   5.168 -QString BranchObj::getIncludeImageAttr()
   5.169 -{
   5.170 -	QString a;
   5.171 -	if (includeImagesVer)
   5.172 -		a=attribut ("incImgV","true");
   5.173 -	else
   5.174 -		a=attribut ("incImgV","false");
   5.175 -	if (includeImagesHor)
   5.176 -		a+=attribut ("incImgH","true");
   5.177 -	else
   5.178 -		a+=attribut ("incImgH","false");
   5.179 -	return a;	
   5.180 -}
   5.181 -
   5.182 -FloatImageObj* BranchObj::addFloatImage ()
   5.183 + 
   5.184 +// FIXME-3 FloatImageObj* BranchObj::addFloatImage ()
   5.185 +/*
   5.186  {
   5.187  	FloatImageObj *newfi=new FloatImageObj (scene,this);
   5.188  	floatimage.append (newfi);
   5.189 @@ -571,15 +523,15 @@
   5.190  		newfi->setVisibility (false);
   5.191  	else	
   5.192  		newfi->setVisibility(visible);
   5.193 -		/*
   5.194 -	calcBBoxSize();
   5.195 -	positionBBox();
   5.196 -	*/
   5.197 +	//calcBBoxSize();
   5.198 +	//positionBBox();
   5.199  	requestReposition();
   5.200  	return newfi;
   5.201  }
   5.202 +*/
   5.203  
   5.204 -FloatImageObj* BranchObj::addFloatImage (FloatImageObj *fio)
   5.205 +//FIXME-3 FloatImageObj* BranchObj::addFloatImage (FloatImageObj *fio)
   5.206 +/*
   5.207  {
   5.208  	FloatImageObj *newfi=new FloatImageObj (scene,this);
   5.209  	floatimage.append (newfi);
   5.210 @@ -588,15 +540,14 @@
   5.211  		newfi->setVisibility (false);
   5.212  	else	
   5.213  		newfi->setVisibility(visible);
   5.214 -		/*
   5.215 -	calcBBoxSize();
   5.216 -	positionBBox();
   5.217 -	*/
   5.218 +	//calcBBoxSize();
   5.219 +	//positionBBox();
   5.220  	requestReposition();
   5.221  	return newfi;
   5.222  }
   5.223 +*/
   5.224  
   5.225 -FloatImageObj* BranchObj::getFirstFloatImage ()
   5.226 +/* FIXME-3 FloatImageObj* BranchObj::getFirstFloatImage ()
   5.227  {
   5.228      return floatimage.first();
   5.229  }
   5.230 @@ -606,7 +557,7 @@
   5.231      return floatimage.last();
   5.232  }
   5.233  
   5.234 -FloatImageObj* BranchObj::getFloatImageNum (const uint &i)
   5.235 +FIXME -3 FloatImageObj* BranchObj::getFloatImageNum (const uint &i)
   5.236  {
   5.237      return floatimage.at(i);
   5.238  }
   5.239 @@ -619,6 +570,7 @@
   5.240  	positionBBox();
   5.241  	requestReposition();
   5.242  }
   5.243 +*/
   5.244  
   5.245  void BranchObj::savePosInAngle ()
   5.246  {
   5.247 @@ -849,11 +801,9 @@
   5.248  			(have been NULL at least in calcBBoxSizeWithChilds...)
   5.249  */			
   5.250  
   5.251 -/*
   5.252 -	FIXME-3 for (int i=0; i<floatimage.size(); ++i)
   5.253 -		if (!floatimage.at(i)->isHidden())
   5.254 -			r=addBBox(floatimage.at(i)->getTotalBBox(),r);
   5.255 -	*/	
   5.256 +	for (int i=0; i<treeItem->imageCount(); ++i)
   5.257 +		if (!treeItem->isHidden())
   5.258 +			r=addBBox(treeItem->getImageObjNum(i)->getTotalBBox(),r);
   5.259  	return r;
   5.260  }
   5.261  

     6.1 --- a/branchobj.h	Mon Jul 27 12:53:17 2009 +0000
     6.2 +++ b/branchobj.h	Mon Aug 03 10:42:12 2009 +0000
     6.3 @@ -54,18 +54,14 @@
     6.4  	virtual XLinkObj* XLinkAt (int);		// return reference of XLinkObj 
     6.5  	virtual BranchObj* XLinkTargetAt (int);
     6.6  
     6.7 -	void setIncludeImagesVer(bool);
     6.8 -	bool getIncludeImagesVer();
     6.9 -	void setIncludeImagesHor(bool);
    6.10 -	bool getIncludeImagesHor();
    6.11 -	QString getIncludeImageAttr();
    6.12 -
    6.13 +/* FIXME-3
    6.14  	virtual FloatImageObj* addFloatImage();
    6.15  	virtual FloatImageObj* addFloatImage(FloatImageObj*);
    6.16  	virtual void removeFloatImage(FloatImageObj*);
    6.17      virtual FloatImageObj* getFirstFloatImage();
    6.18      virtual FloatImageObj* getLastFloatImage();
    6.19 -	virtual FloatImageObj* getFloatImageNum(const uint &);
    6.20 +*/	
    6.21 +//FIXME-3	virtual FloatImageObj* getFloatImageNum(const uint &);
    6.22  protected:	
    6.23  	virtual void savePosInAngle();					// write pos in angle for resorting			
    6.24  public:	
    6.25 @@ -86,16 +82,13 @@
    6.26  	virtual bool animate();
    6.27  
    6.28  protected:
    6.29 -	QList<FloatImageObj*> floatimage;// child images
    6.30 +	//FIXME-3 QList<FloatImageObj*> floatimage;// child images
    6.31  	QList<XLinkObj*> xlink;			// xlinks to other branches
    6.32  
    6.33  	AnimPoint anim;
    6.34  
    6.35  public:	
    6.36  	float angle;					// used in mainbranch to reorder mainbranches
    6.37 -protected:	
    6.38 -	bool includeImagesVer;			// include floatimages in bbox vertically
    6.39 -	bool includeImagesHor;			// include floatimages in bbox horizontally
    6.40  };
    6.41  
    6.42  

     7.1 --- a/branchpropwindow.cpp	Mon Jul 27 12:53:17 2009 +0000
     7.2 +++ b/branchpropwindow.cpp	Mon Aug 03 10:42:12 2009 +0000
     7.3 @@ -17,6 +17,7 @@
     7.4  	setCaption(vymName +" - " +tr ("Property Editor","Window caption"));
     7.5  
     7.6  	branch=NULL;
     7.7 +	branchItem=NULL;
     7.8  	model=NULL;
     7.9  
    7.10  	ui.tabWidget->setEnabled(false);
    7.11 @@ -28,7 +29,7 @@
    7.12  	ui.framePenColorButton->setPixmap (pix);
    7.13  	ui.frameBrushColorButton->setPixmap (pix);
    7.14  
    7.15 -	// Create Model and View to hold attributes 
    7.16 +	// Create Model and View to hold attributes		// FIXME-3
    7.17  	/*
    7.18  	attributeModel = new QStandardItemModel (1,3,this);
    7.19  	attributeModel->setHeaderData(0, Qt::Horizontal, tr("Name","Branchprop window: Attribute name"));
    7.20 @@ -58,97 +59,101 @@
    7.21  	settings.setValue( "/satellite/propertywindow/showWithMain",isVisible() );
    7.22  }
    7.23  
    7.24 -void BranchPropertyWindow::setBranch (BranchObj *bo)	
    7.25 +void BranchPropertyWindow::setBranch (BranchItem *bi)	
    7.26  {
    7.27  	disconnectSignals();
    7.28 -	branch=bo;
    7.29 -	if (bo) 
    7.30 +	branchItem=bi;
    7.31 +	if (branchItem)
    7.32  	{
    7.33 -		BranchItem *bi=(BranchItem*)(bo->getTreeItem());
    7.34 -		ui.tabWidget->setEnabled (true);
    7.35  
    7.36 -		// Frame
    7.37 -		FrameObj::FrameType t=branch->getFrameType();
    7.38 -		if (t==FrameObj::NoFrame)
    7.39 +		branch=(BranchObj*)(branchItem->getLMO());
    7.40 +		if (branch)		// FIXME-3 move to branchItem later, when Frame is ported...
    7.41  		{
    7.42 -			ui.frameTypeCombo->setCurrentIndex (0);
    7.43 -			penColor=Qt::white;
    7.44 -			brushColor=Qt::white;
    7.45 -			ui.colorGroupBox->setEnabled (false);
    7.46 -			ui.framePaddingSpinBox->setEnabled (false);
    7.47 -			ui.frameWidthSpinBox->setEnabled (false);
    7.48 -			ui.framePaddingLabel->setEnabled (false);
    7.49 -			ui.frameBorderLabel->setEnabled (false);
    7.50 -		} else	
    7.51 -		{
    7.52 -			penColor=bo->getFramePenColor();
    7.53 -			brushColor=bo->getFrameBrushColor();
    7.54 -			QPixmap pix( 16,16);
    7.55 -			pix.fill (penColor);
    7.56 -			ui.framePenColorButton->setPixmap (pix);
    7.57 -			pix.fill (brushColor);
    7.58 -			ui.frameBrushColorButton->setPixmap (pix);
    7.59 -			ui.colorGroupBox->setEnabled (true);
    7.60 -			ui.framePaddingSpinBox->setEnabled (true);
    7.61 -			ui.framePaddingSpinBox->setValue (bo->getFramePadding());
    7.62 -			ui.frameWidthSpinBox->setEnabled (true);
    7.63 -			ui.frameWidthSpinBox->setValue (bo->getFrameBorderWidth());
    7.64 -			ui.framePaddingLabel->setEnabled (true);
    7.65 -			ui.frameBorderLabel->setEnabled (true);
    7.66 +			ui.tabWidget->setEnabled (true);
    7.67  
    7.68 -			switch (t)
    7.69 +			// Frame
    7.70 +			FrameObj::FrameType t=branch->getFrameType();
    7.71 +			if (t==FrameObj::NoFrame)
    7.72  			{
    7.73 -				case FrameObj::Rectangle: 
    7.74 -					ui.frameTypeCombo->setCurrentIndex (1);
    7.75 -					break;
    7.76 -				case FrameObj::Ellipse: 
    7.77 -					ui.frameTypeCombo->setCurrentIndex (2);
    7.78 -					break;
    7.79 -				default: 
    7.80 -					break;
    7.81 +				ui.frameTypeCombo->setCurrentIndex (0);
    7.82 +				penColor=Qt::white;
    7.83 +				brushColor=Qt::white;
    7.84 +				ui.colorGroupBox->setEnabled (false);
    7.85 +				ui.framePaddingSpinBox->setEnabled (false);
    7.86 +				ui.frameWidthSpinBox->setEnabled (false);
    7.87 +				ui.framePaddingLabel->setEnabled (false);
    7.88 +				ui.frameBorderLabel->setEnabled (false);
    7.89 +			} else	
    7.90 +			{
    7.91 +				penColor=branch->getFramePenColor();
    7.92 +				brushColor=branch->getFrameBrushColor();
    7.93 +				QPixmap pix( 16,16);
    7.94 +				pix.fill (penColor);
    7.95 +				ui.framePenColorButton->setPixmap (pix);
    7.96 +				pix.fill (brushColor);
    7.97 +				ui.frameBrushColorButton->setPixmap (pix);
    7.98 +				ui.colorGroupBox->setEnabled (true);
    7.99 +				ui.framePaddingSpinBox->setEnabled (true);
   7.100 +				ui.framePaddingSpinBox->setValue (branch->getFramePadding());
   7.101 +				ui.frameWidthSpinBox->setEnabled (true);
   7.102 +				ui.frameWidthSpinBox->setValue (branch->getFrameBorderWidth());
   7.103 +				ui.framePaddingLabel->setEnabled (true);
   7.104 +				ui.frameBorderLabel->setEnabled (true);
   7.105 +
   7.106 +				switch (t)
   7.107 +				{
   7.108 +					case FrameObj::Rectangle: 
   7.109 +						ui.frameTypeCombo->setCurrentIndex (1);
   7.110 +						break;
   7.111 +					case FrameObj::Ellipse: 
   7.112 +						ui.frameTypeCombo->setCurrentIndex (2);
   7.113 +						break;
   7.114 +					default: 
   7.115 +						break;
   7.116 +				}
   7.117 +			}	
   7.118 +			
   7.119 +			// Link
   7.120 +			if (branchItem->getHideLinkUnselected())
   7.121 +				ui.hideLinkIfUnselected->setCheckState (Qt::Checked);
   7.122 +			else	
   7.123 +				ui.hideLinkIfUnselected->setCheckState (Qt::Unchecked);
   7.124 +
   7.125 +			// Layout
   7.126 +			if (branchItem->getIncludeImagesVer())
   7.127 +				ui.incImgVer->setCheckState (Qt::Checked);
   7.128 +			else	
   7.129 +				ui.incImgVer->setCheckState (Qt::Unchecked);
   7.130 +			if (branchItem->getIncludeImagesHor())
   7.131 +				ui.incImgHor->setCheckState (Qt::Checked);
   7.132 +			else	
   7.133 +				ui.incImgHor->setCheckState (Qt::Unchecked);
   7.134 +
   7.135 +	/*
   7.136 +			// Attributes
   7.137 +			attributeModel->removeRows(0, attributeModel->rowCount(), QModelIndex());
   7.138 +
   7.139 +			// FIXME-3 some samples for attribute testing
   7.140 +			QStringList attrTypes=mapEditor->attributeTable()->getTypes();
   7.141 +			for (int i=0; i<attrTypes.count()-1;i++)
   7.142 +			{
   7.143 +				attributeModel->insertRow (i,QModelIndex ());
   7.144 +				attributeModel->setData(attributeModel->index(i, 0, QModelIndex()), QString ("Name %1").arg(i));
   7.145 +				attributeModel->setData(attributeModel->index(i, 1, QModelIndex()), i);
   7.146 +				attributeModel->setData(attributeModel->index(i, 2, QModelIndex()), attrTypes.at(i));
   7.147  			}
   7.148 -		}	
   7.149 -		
   7.150 -		// Link
   7.151 -		if (bi->getHideLinkUnselected())
   7.152 -			ui.hideLinkIfUnselected->setCheckState (Qt::Checked);
   7.153 -		else	
   7.154 -			ui.hideLinkIfUnselected->setCheckState (Qt::Unchecked);
   7.155  
   7.156 -		// Layout
   7.157 -		if (branch->getIncludeImagesVer())
   7.158 -			ui.incImgVer->setCheckState (Qt::Checked);
   7.159 -		else	
   7.160 -			ui.incImgVer->setCheckState (Qt::Unchecked);
   7.161 -		if (branch->getIncludeImagesHor())
   7.162 -			ui.incImgHor->setCheckState (Qt::Checked);
   7.163 -		else	
   7.164 -			ui.incImgHor->setCheckState (Qt::Unchecked);
   7.165  
   7.166 -/*
   7.167 -		// Attributes
   7.168 -		attributeModel->removeRows(0, attributeModel->rowCount(), QModelIndex());
   7.169 +			ui.attributeTableView->resizeColumnsToContents();
   7.170  
   7.171 -		// FIXME-3 some samples for attribute testing
   7.172 -		QStringList attrTypes=mapEditor->attributeTable()->getTypes();
   7.173 -		for (int i=0; i<attrTypes.count()-1;i++)
   7.174 -		{
   7.175 -			attributeModel->insertRow (i,QModelIndex ());
   7.176 -			attributeModel->setData(attributeModel->index(i, 0, QModelIndex()), QString ("Name %1").arg(i));
   7.177 -			attributeModel->setData(attributeModel->index(i, 1, QModelIndex()), i);
   7.178 -			attributeModel->setData(attributeModel->index(i, 2, QModelIndex()), attrTypes.at(i));
   7.179 -		}
   7.180 +			// Initialize Delegate
   7.181 +			delegate.setAttributeTable (mapEditor->attributeTable());
   7.182 +			ui.attributeTableView->setItemDelegate (&delegate);
   7.183 +	*/
   7.184  
   7.185 -
   7.186 -		ui.attributeTableView->resizeColumnsToContents();
   7.187 -
   7.188 -		// Initialize Delegate
   7.189 -		delegate.setAttributeTable (mapEditor->attributeTable());
   7.190 -		ui.attributeTableView->setItemDelegate (&delegate);
   7.191 -*/
   7.192 -
   7.193 -		// Finally activate signals
   7.194 -		connectSignals();
   7.195 +			// Finally activate signals
   7.196 +			connectSignals();
   7.197 +		} // BranchObj	
   7.198  	} else
   7.199  	{
   7.200  		ui.tabWidget->setEnabled (false);
   7.201 @@ -159,7 +164,7 @@
   7.202  {
   7.203  	model=m;
   7.204  	if (model) 
   7.205 -		setBranch (model->getSelectedBranchObj() );
   7.206 +		setBranch (model->getSelectedBranchItem() );
   7.207  	else
   7.208  		ui.tabWidget->setEnabled (false);
   7.209  		
   7.210 @@ -180,7 +185,7 @@
   7.211  				model->setFramePadding (5); 
   7.212  				break;
   7.213  		}
   7.214 -		setBranch (branch);
   7.215 +		setBranch (branchItem);
   7.216  	}	
   7.217  }
   7.218  
   7.219 @@ -222,7 +227,7 @@
   7.220  
   7.221  void BranchPropertyWindow::linkHideUnselectedChanged (int i)
   7.222  {
   7.223 -	if (!branch) return;
   7.224 +	if (!branchItem) return;
   7.225  	model->setHideLinkUnselected(i);
   7.226  }
   7.227  

     8.1 --- a/branchpropwindow.h	Mon Jul 27 12:53:17 2009 +0000
     8.2 +++ b/branchpropwindow.h	Mon Aug 03 10:42:12 2009 +0000
     8.3 @@ -20,7 +20,7 @@
     8.4  public:
     8.5  	BranchPropertyWindow (QWidget *parent=0);
     8.6  	~BranchPropertyWindow ();
     8.7 -	void setBranch (BranchObj *);
     8.8 +	void setBranch (BranchItem *);
     8.9  	void setModel (VymModel *);
    8.10  
    8.11  private slots:
    8.12 @@ -48,6 +48,7 @@
    8.13  	Ui::BranchPropertyWindow ui;
    8.14  
    8.15  	BranchObj *branch;
    8.16 +	BranchItem *branchItem;
    8.17  	VymModel *model;
    8.18  
    8.19  	QColor penColor;

     9.1 --- a/linkablemapobj.cpp	Mon Jul 27 12:53:17 2009 +0000
     9.2 +++ b/linkablemapobj.cpp	Mon Aug 03 10:42:12 2009 +0000
     9.3 @@ -440,6 +440,7 @@
     9.4  	// updateLinkGeometry is called from move, but called from constructor we don't
     9.5  	// have parents yet...
     9.6  
     9.7 +//cout <<"LMO::updateLinkGeometry: "<<treeItem->getHeadingStd()<<"  "<<parObj<<endl;
     9.8  	if (!parObj)	
     9.9  	{
    9.10  		// If I am a mapcenter, set childPos to middle of MapCenterObj
    9.11 @@ -460,7 +461,8 @@
    9.12  			bottomlineY=bbox.top() + bbox.height()/2;	// draw link to middle (of frame)
    9.13  			break;
    9.14  		case Bottom:
    9.15 -			bottomlineY=bbox.bottom()-1;	// draw link to bottom of box
    9.16 +			//bottomlineY=bbox.bottom()-1;	// draw link to bottom of box
    9.17 +			bottomlineY=bbox.bottom()-botPad;
    9.18  			break;
    9.19  	}
    9.20  	
    9.21 @@ -567,7 +569,7 @@
    9.22  {
    9.23  }
    9.24  
    9.25 -void LinkableMapObj::requestReposition()
    9.26 +void LinkableMapObj::requestReposition()	//FIXME-3 needed?
    9.27  {
    9.28  	if (!repositionRequest)
    9.29  	{

    10.1 --- a/main.cpp	Mon Jul 27 12:53:17 2009 +0000
    10.2 +++ b/main.cpp	Mon Aug 03 10:42:12 2009 +0000
    10.3 @@ -4,8 +4,6 @@
    10.4  #include <iostream>
    10.5  using namespace std;
    10.6  
    10.7 -#include "adaptor.h"  //FIXME-3
    10.8 -
    10.9  #include "flagrow.h"
   10.10  #include "flagrowobj.h"
   10.11  #include "mainwindow.h"
   10.12 @@ -228,6 +226,7 @@
   10.13  		return 0;
   10.14  	}	
   10.15  
   10.16 +	// Enable some last minute cleanup
   10.17      QObject::connect( &app, SIGNAL(lastWindowClosed()), &app, SLOT(quit()) );
   10.18  
   10.19      return app.exec();

    11.1 --- a/mainwindow.cpp	Mon Jul 27 12:53:17 2009 +0000
    11.2 +++ b/mainwindow.cpp	Mon Aug 03 10:42:12 2009 +0000
    11.3 @@ -3248,7 +3248,7 @@
    11.4  
    11.5  void Main::changeSelection (VymModel *model, const QItemSelection &newsel, const QItemSelection &oldsel)
    11.6  {
    11.7 -	branchPropertyWindow->setModel (model ); //FIXME-2 this used to be called from BranchObj::select(). Maybe use signal now...
    11.8 +	branchPropertyWindow->setModel (model ); //FIXME-3 this used to be called from BranchObj::select(). Maybe use signal now...
    11.9  
   11.10  	if (model && model==currentModel() )
   11.11  	{
   11.12 @@ -3363,7 +3363,7 @@
   11.13  		{
   11.14  			if (selbi)
   11.15  			{
   11.16 -				// Take care of links  // FIXME-1
   11.17 +				// Take care of links  // updateActions: FIXME-1
   11.18  				/*
   11.19  				if (bo->countXLinks()==0)
   11.20  				{

    12.1 --- a/mapeditor.cpp	Mon Jul 27 12:53:17 2009 +0000
    12.2 +++ b/mapeditor.cpp	Mon Aug 03 10:42:12 2009 +0000
    12.3 @@ -1059,6 +1059,7 @@
    12.4  					"moveRel "+pnow,
    12.5  					QString("Move %1 to relative position %2").arg(model->getObjectName(seli)).arg(pnow));
    12.6  
    12.7 +				cout << "ME::release mouse\n";
    12.8  				fio->getParObj()->requestReposition();
    12.9  				model->reposition();
   12.10  			}	
   12.11 @@ -1417,10 +1418,10 @@
   12.12  	
   12.13  	if (ti->isBranchLikeType())
   12.14  	{
   12.15 +	//	cout << "  ->updating...\n";
   12.16  		BranchObj *bo=(BranchObj*) ( ((MapItem*)ti)->getLMO());
   12.17  		bo->updateData();
   12.18  	}
   12.19 -
   12.20  }
   12.21  
   12.22  void MapEditor::setSelectionColor (QColor col)

    13.1 --- a/ornamentedobj.cpp	Mon Jul 27 12:53:17 2009 +0000
    13.2 +++ b/ornamentedobj.cpp	Mon Aug 03 10:42:12 2009 +0000
    13.3 @@ -163,8 +163,11 @@
    13.4  	return frame->getBrushColor ();
    13.5  }
    13.6  
    13.7 -void OrnamentedObj::positionContents()
    13.8 +//#include <iostream>  
    13.9 +//using namespace std;
   13.10 +void OrnamentedObj::positionContents()	//FIXME-4 called multiple times for each object after moving an image with mouse
   13.11  {
   13.12 +//cout << "OO::positionContents topPad="<<topPad<<"  botPad="<<botPad<<"  "<<treeItem->getHeadingStd()<<endl;
   13.13  	double d=frame->getPadding()/2;
   13.14  	double x=absPos.x();
   13.15  	double y=absPos.y();
   13.16 @@ -182,8 +185,8 @@
   13.17  					);
   13.18  	standardFlags->move (ox +x + heading->getWidth() + systemFlags->getBBox().width() , oy + y );
   13.19  
   13.20 -	ornamentsBBox.moveTopLeft ( QPointF ((int)(ox+x),(int)(oy+y)));
   13.21 -	clickBox.moveTopLeft (QPointF ((int)(ox + x), (int)(oy + y)));
   13.22 +	ornamentsBBox.moveTopLeft ( QPointF (ox+x,oy+y));
   13.23 +	clickBox.moveTopLeft (QPointF (ox + x, oy + y));
   13.24  }
   13.25  
   13.26  void OrnamentedObj::move (double x, double y)

    14.1 --- a/version.h	Mon Jul 27 12:53:17 2009 +0000
    14.2 +++ b/version.h	Mon Aug 03 10:42:12 2009 +0000
    14.3 @@ -7,7 +7,7 @@
    14.4  #define __VYM_VERSION "1.13.0"
    14.5  //#define __VYM_CODENAME "Codename: RC-1"
    14.6  #define __VYM_CODENAME "Codename: development version, not for production!"
    14.7 -#define __VYM_BUILD_DATE "2009-07-07"
    14.8 +#define __VYM_BUILD_DATE "2009-08-03"
    14.9  
   14.10  
   14.11  bool checkVersion(const QString &);

    15.1 --- a/vym.pro	Mon Jul 27 12:53:17 2009 +0000
    15.2 +++ b/vym.pro	Mon Aug 03 10:42:12 2009 +0000
    15.3 @@ -1,7 +1,7 @@
    15.4  TEMPLATE	= app
    15.5  LANGUAGE	= C++
    15.6  
    15.7 -CONFIG	+= qt warn_on release debug
    15.8 +CONFIG	+= qt warn_on debug
    15.9  CONFIG += x86 ppc
   15.10  CONFIG += qdbus
   15.11  

    16.1 --- a/vymmodel.cpp	Mon Jul 27 12:53:17 2009 +0000
    16.2 +++ b/vymmodel.cpp	Mon Aug 03 10:42:12 2009 +0000
    16.3 @@ -1497,7 +1497,6 @@
    16.4  			QString("Set heading of %1 to \"%2\"").arg(getObjectName(selbi)).arg(s) );
    16.5  		selbi->setHeading(s );
    16.6  		emitDataHasChanged ( selbi);	//FIXME-3 maybe emit signal from TreeItem? 
    16.7 -
    16.8  		reposition();
    16.9  		emitSelectionChanged();
   16.10  	}
   16.11 @@ -1727,55 +1726,46 @@
   16.12  	}	
   16.13  }
   16.14  
   16.15 -void VymModel::setIncludeImagesVer(bool b)	//FIXME-2
   16.16 -{
   16.17 -/*
   16.18 +void VymModel::setIncludeImagesVer(bool b)
   16.19 +{
   16.20  	BranchItem *bi=getSelectedBranchItem();
   16.21 -	if (ti)
   16.22 +	if (bi)
   16.23  	{
   16.24 -		BranchObj *bo=bi->getLMO();
   16.25 -		if (bo)
   16.26 -		{
   16.27 -			QString u= b ? "false" : "true";
   16.28 -			QString r=!b ? "false" : "true";
   16.29 -			
   16.30 -			saveState(
   16.31 -				bo,
   16.32 -				QString("setIncludeImagesVertically (%1)").arg(u),
   16.33 -				bo, 
   16.34 -				QString("setIncludeImagesVertically (%1)").arg(r),
   16.35 -				QString("Include images vertically in %1").arg(getObjectName(bo))
   16.36 -			);	
   16.37 -			bo->setIncludeImagesVer(b);
   16.38 -			reposition();
   16.39 -		}	
   16.40 +		QString u= b ? "false" : "true";
   16.41 +		QString r=!b ? "false" : "true";
   16.42 +		
   16.43 +		saveState(
   16.44 +			bi,
   16.45 +			QString("setIncludeImagesVertically (%1)").arg(u),
   16.46 +			bi, 
   16.47 +			QString("setIncludeImagesVertically (%1)").arg(r),
   16.48 +			QString("Include images vertically in %1").arg(getObjectName(bi))
   16.49 +		);	
   16.50 +		bi->setIncludeImagesVer(b);
   16.51 +		emitDataHasChanged ( bi);	
   16.52 +		reposition();
   16.53  	}	
   16.54 -*/}
   16.55 -
   16.56 -void VymModel::setIncludeImagesHor(bool b)	//FIXME-2
   16.57 -{
   16.58 -/*
   16.59 -	TreeItem *bi=getSelectedBranchItem();
   16.60 -	if (ti)
   16.61 +}
   16.62 +
   16.63 +void VymModel::setIncludeImagesHor(bool b)	
   16.64 +{
   16.65 +	BranchItem *bi=getSelectedBranchItem();
   16.66 +	if (bi)
   16.67  	{
   16.68 -		BranchObj *bo=bi->getLMO();
   16.69 -		if (bo)
   16.70 -		{
   16.71 -			QString u= b ? "false" : "true";
   16.72 -			QString r=!b ? "false" : "true";
   16.73 -			
   16.74 -			saveState(
   16.75 -				bo,
   16.76 -				QString("setIncludeImagesHorizontally (%1)").arg(u),
   16.77 -				bo, 
   16.78 -				QString("setIncludeImagesHorizontally (%1)").arg(r),
   16.79 -				QString("Include images horizontally in %1").arg(getObjectName(bo))
   16.80 -			);	
   16.81 -			bo->setIncludeImagesHor(b);
   16.82 -			reposition();
   16.83 -		}	
   16.84 +		QString u= b ? "false" : "true";
   16.85 +		QString r=!b ? "false" : "true";
   16.86 +		
   16.87 +		saveState(
   16.88 +			bi,
   16.89 +			QString("setIncludeImagesHorizontally (%1)").arg(u),
   16.90 +			bi, 
   16.91 +			QString("setIncludeImagesHorizontally (%1)").arg(r),
   16.92 +			QString("Include images horizontally in %1").arg(getObjectName(bi))
   16.93 +		);	
   16.94 +		bi->setIncludeImagesHor(b);
   16.95 +		emitDataHasChanged ( bi);
   16.96 +		reposition();
   16.97  	}	
   16.98 -	*/
   16.99  }
  16.100  
  16.101  void VymModel::setHideLinkUnselected (bool b)//FIXME-2
  16.102 @@ -2235,7 +2225,7 @@
  16.103  	return false;
  16.104  }
  16.105  
  16.106 -void VymModel::deleteSelection()
  16.107 +void VymModel::deleteSelection()	// FIXME-2 include fix for deleted mapcenters from 1.12.4
  16.108  {
  16.109  	BranchItem *selbi=getSelectedBranchItem();
  16.110  
  16.111 @@ -4160,7 +4150,7 @@
  16.112  	}
  16.113  }	
  16.114  
  16.115 -void VymModel::setMapBackgroundImage (const QString &fn)	//FIXME-2 missing savestate
  16.116 +void VymModel::setMapBackgroundImage (const QString &fn)	//FIXME-2 missing savestate, move to ME
  16.117  {
  16.118  	QColor oldcol=mapScene->backgroundBrush().color();
  16.119  	/*
  16.120 @@ -4473,7 +4463,7 @@
  16.121      }
  16.122  }
  16.123  
  16.124 -/* FIXME-3
  16.125 +/* FIXME-3 Playing with DBUS...
  16.126  QDBusVariant VymModel::query (const QString &query)
  16.127  {
  16.128  	TreeItem *selti=getSelectedItem();
  16.129 @@ -4484,6 +4474,11 @@
  16.130  }
  16.131  */
  16.132  
  16.133 +void VymModel::testslot()	//FIXME-3
  16.134 +{
  16.135 +	cout << "VM::testslot called\n";
  16.136 +}
  16.137 +
  16.138  void VymModel::selectMapSelectionColor()
  16.139  {
  16.140  	QColor col = QColorDialog::getColor( defLinkColor, NULL);

    17.1 --- a/vymmodel.h	Mon Jul 27 12:53:17 2009 +0000
    17.2 +++ b/vymmodel.h	Mon Aug 03 10:42:12 2009 +0000
    17.3 @@ -540,6 +540,9 @@
    17.4  private:
    17.5  AdaptorModel *adaptorModel; //FIXME-3
    17.6  
    17.7 +public slots:
    17.8 +	void testslot();
    17.9 +
   17.10  ////////////////////////////////////////////
   17.11  // Selection related 
   17.12  ////////////////////////////////////////////

    18.1 --- a/xml-vym.cpp	Mon Jul 27 12:53:17 2009 +0000
    18.2 +++ b/xml-vym.cpp	Mon Aug 03 10:42:12 2009 +0000
    18.3 @@ -354,7 +354,7 @@
    18.4      return "the document is not in the VYM file format";
    18.5  }
    18.6  
    18.7 -bool parseVYMHandler::readBranchAttr (const QXmlAttributes& a)	//FIXME-2
    18.8 +bool parseVYMHandler::readBranchAttr (const QXmlAttributes& a)	
    18.9  {
   18.10  	mainWindow->setProgressValue (branchesCurrent++);
   18.11  
   18.12 @@ -363,12 +363,13 @@
   18.13  	if (!readOOAttr(a)) return false;
   18.14  
   18.15  	if (!a.value( "scrolled").isEmpty() )
   18.16 -		lastBranch->toggleScroll();	//FIXME-3 in endElement unscroll again, if branch is still empty 
   18.17 +		lastBranch->toggleScroll();	
   18.18  		// (interesting for import of KDE bookmarks)
   18.19 -/*
   18.20 -	if (!a.value( "frameType").isEmpty() ) 
   18.21 +
   18.22 +/*	if (!a.value( "frameType").isEmpty() )  FIXME-2
   18.23  		lastOO->setFrameType (a.value("frameType")); //Compatibility 1.8.1
   18.24  
   18.25 +*/	
   18.26  	if (!a.value( "incImgV").isEmpty() ) 
   18.27  	{	
   18.28  		if (a.value("incImgV")=="true")
   18.29 @@ -383,7 +384,6 @@
   18.30  		else	
   18.31  			lastBranch->setIncludeImagesHor(false);
   18.32  	}	
   18.33 -*/	
   18.34  	return true;	
   18.35  }
   18.36