1.1 Binary file demos/todo.vym has changed

     2.1 --- a/flagrowobj.cpp	Wed Mar 08 12:59:07 2006 +0000
     2.2 +++ b/flagrowobj.cpp	Wed Mar 08 12:59:08 2006 +0000
     2.3 @@ -125,14 +125,9 @@
     2.4  bool FlagRowObj::isActive (const QString &foname)
     2.5  {
     2.6  	FlagObj *fo=findFlag (foname);
     2.7 -	if (parentRow)
     2.8 -	{
     2.9 -		if (fo)
    2.10 -			return fo->isActive();
    2.11 -		else
    2.12 -			qWarning ("FlagRowObj::isActive of "+name+" couldn't find "+foname);
    2.13 -			
    2.14 -	} else
    2.15 +	if (parentRow && fo)
    2.16 +		return fo->isActive();
    2.17 +	else
    2.18  		if (fo) return true;
    2.19  	return false;
    2.20  }

     3.1 --- a/floatobj.cpp	Wed Mar 08 12:59:07 2006 +0000
     3.2 +++ b/floatobj.cpp	Wed Mar 08 12:59:08 2006 +0000
     3.3 @@ -83,8 +83,8 @@
     3.4  
     3.5  void FloatObj::setDockPos()
     3.6  {
     3.7 -	childPos=QPoint (bbox.bottomRight().x(), bbox.bottomRight().y() ); 
     3.8  	parPos=absPos;
     3.9 +	childPos=absPos;
    3.10  }
    3.11  
    3.12  void FloatObj::reposition()

     4.1 --- a/mapeditor.cpp	Wed Mar 08 12:59:07 2006 +0000
     4.2 +++ b/mapeditor.cpp	Wed Mar 08 12:59:08 2006 +0000
     4.3 @@ -30,6 +30,7 @@
     4.4  #include "editxlinkdialog.h"
     4.5  #include "exports.h"
     4.6  #include "extrainfodialog.h"
     4.7 +#include "file.h"
     4.8  #include "linkablemapobj.h"
     4.9  #include "mainwindow.h"
    4.10  #include "misc.h"
    4.11 @@ -2673,7 +2674,7 @@
    4.12  	{
    4.13  		BranchObj *bo=((BranchObj*)selection);
    4.14  
    4.15 -		QFileDialog *fd=new QFileDialog( this,QString ("vym - ")+tr("Load image"));
    4.16 +		QFileDialog *fd=new QFileDialog( this);
    4.17  		fd->setMode (QFileDialog::ExistingFiles);
    4.18  		fd->addFilter (QString (tr("Images") + " (*.png *.bmp *.xbm *.jpg *.png *.xpm *.gif *.pnm)"));
    4.19  		ImagePreview *p =new ImagePreview (fd);
    4.20 @@ -2705,6 +2706,8 @@
    4.21  			adjustCanvasSize();
    4.22  			canvas()->update();
    4.23  		}
    4.24 +		delete (p);
    4.25 +		delete (fd);
    4.26  	}
    4.27  }
    4.28  

     5.1 --- a/ornamentedobj.cpp	Wed Mar 08 12:59:07 2006 +0000
     5.2 +++ b/ornamentedobj.cpp	Wed Mar 08 12:59:08 2006 +0000
     5.3 @@ -107,8 +107,8 @@
     5.4  					);
     5.5  	standardFlags->move (ox +x + heading->getWidth() + systemFlags->getBBox().width() , oy + y );
     5.6  
     5.7 -	ornamentsBBox.moveTopLeft ( QPoint (ox+x, oy+y));
     5.8 -	clickBox.moveTopLeft (QPoint (ox + x, oy + y));
     5.9 +	ornamentsBBox.moveTopLeft ( QPoint ((int)(ox+x),(int)(oy+y)));
    5.10 +	clickBox.moveTopLeft (QPoint ((int)(ox + x), (int)(oy + y)));
    5.11  
    5.12  }
    5.13  
    5.14 @@ -218,6 +218,12 @@
    5.15  	return systemFlags->getFlagName(p);	
    5.16  }
    5.17  
    5.18 +bool OrnamentedObj::isActiveFlag (const QString & fname)
    5.19 +{
    5.20 +	if (standardFlags->isActive (fname) ) return true;
    5.21 +	return false;
    5.22 +}
    5.23 +
    5.24  void OrnamentedObj::updateNoteFlag()
    5.25  {
    5.26  	if (selected) 

     6.1 --- a/ornamentedobj.h	Wed Mar 08 12:59:07 2006 +0000
     6.2 +++ b/ornamentedobj.h	Wed Mar 08 12:59:08 2006 +0000
     6.3 @@ -35,6 +35,7 @@
     6.4  	virtual void toggleStandardFlag(QString, bool);
     6.5  	virtual void activateStandardFlag(QString);
     6.6  	virtual QString getSystemFlagName (const QPoint &p);
     6.7 +	virtual bool isActiveFlag(const QString&);	// check if flag is set
     6.8  	virtual void updateNoteFlag();
     6.9  
    6.10  protected:
    6.11 @@ -43,7 +44,6 @@
    6.12  	FlagRowObj *systemFlags;		// System Flags
    6.13  	FlagRowObj *standardFlags;		// Standard Flags
    6.14  	QRect ornamentsBBox;			// bbox of flags and heading
    6.15 -	
    6.16  };
    6.17  
    6.18  #endif

     7.1 --- a/version.h	Wed Mar 08 12:59:07 2006 +0000
     7.2 +++ b/version.h	Wed Mar 08 12:59:08 2006 +0000
     7.3 @@ -3,6 +3,6 @@
     7.4  
     7.5  #define __VYM "VYM"
     7.6  #define __VYM_VERSION "1.7.10"
     7.7 -#define __BUILD_DATE "March 7, 2006"
     7.8 +#define __BUILD_DATE "March 8, 2006"
     7.9  
    7.10  #endif