1.1 --- a/branchobj.cpp	Mon Jan 14 16:26:59 2008 +0000
     1.2 +++ b/branchobj.cpp	Mon Jan 14 16:26:59 2008 +0000
     1.3 @@ -1,6 +1,7 @@
     1.4  #include "branchobj.h"
     1.5  
     1.6  // #include "texteditor.h"
     1.7 +#include "geometry.h"
     1.8  #include "mapeditor.h"
     1.9  #include "mainwindow.h"
    1.10  #include "misc.h"
    1.11 @@ -690,12 +691,12 @@
    1.12  	
    1.13  
    1.14  	// Search myself
    1.15 -    if (inBox (p) && (this != excludeLMO) && isVisibleObj() ) 
    1.16 +    if (inBox (p,clickBox) && (this != excludeLMO) && isVisibleObj() ) 
    1.17  		return this;
    1.18  
    1.19  	// Search float images
    1.20      for (int i=0; i<floatimage.size(); ++i )
    1.21 -		if (floatimage.at(i)->inBox(p) && 
    1.22 +		if (inBox(p,floatimage.at(i)->getClickBox()) && 
    1.23  			(floatimage.at(i) != excludeLMO) && 
    1.24  			floatimage.at(i)->getParObj()!= excludeLMO &&
    1.25  			floatimage.at(i)->isVisibleObj() 

     2.1 --- a/exports.cpp	Mon Jan 14 16:26:59 2008 +0000
     2.2 +++ b/exports.cpp	Mon Jan 14 16:26:59 2008 +0000
     2.3 @@ -42,9 +42,9 @@
     2.4  	return outputFile;
     2.5  }
     2.6  
     2.7 -void ExportBase::setMapCenter(MapCenterObj *mc)
     2.8 +void ExportBase::setModel(VymModel *m)
     2.9  {
    2.10 -	mapCenter=mc;
    2.11 +	model=m;
    2.12  }
    2.13  
    2.14  void ExportBase::setCaption (const QString &s)
    2.15 @@ -59,9 +59,10 @@
    2.16  
    2.17  bool ExportBase::execDialog()
    2.18  {
    2.19 -	if (mapCenter && mapCenter->getMapEditor())
    2.20 +	//MapEditor *me=model.getMapEditor(); FIXME needed?
    2.21 +	// if (model->mapCenters.count() && me)
    2.22  	{
    2.23 -		QFileDialog *fd=new QFileDialog( mapCenter->getMapEditor(), caption);
    2.24 +		QFileDialog *fd=new QFileDialog( 0, caption);
    2.25  		fd->setFilter (filter);
    2.26  		fd->setCaption(caption);
    2.27  		fd->setMode( QFileDialog::AnyFile );
    2.28 @@ -145,7 +146,7 @@
    2.29  	QString curIndent;
    2.30  	int i;
    2.31  	BranchObj *bo;
    2.32 -	bo=mapCenter->first();
    2.33 +	bo=model->first();
    2.34  	while (bo) 
    2.35  	{
    2.36  		// Make indentstring
    2.37 @@ -189,7 +190,7 @@
    2.38  				ts << QString (s+"\n");
    2.39  			}
    2.40  		}
    2.41 -		bo=bo->next();
    2.42 +		bo=model->next(bo);
    2.43  	}
    2.44  	file.close();
    2.45  }
    2.46 @@ -221,7 +222,7 @@
    2.47  	QString curIndent("");
    2.48  	int i;
    2.49  	BranchObj *bo;
    2.50 -	bo=mapCenter->first();
    2.51 +	bo=model->first();
    2.52  	while (bo) 
    2.53  	{
    2.54  		if (!bo->hasHiddenExportParent() )
    2.55 @@ -242,7 +243,7 @@
    2.56  			ts << curIndent << "\"" << bo->getHeading()<<"\""<<endl;
    2.57  		}
    2.58  		
    2.59 -		bo=bo->next();
    2.60 +		bo=model->next(bo);
    2.61  		curIndent="";
    2.62  	}
    2.63  	file.close();
    2.64 @@ -251,8 +252,7 @@
    2.65  ////////////////////////////////////////////////////////////////////////
    2.66  void ExportKDEBookmarks::doExport() 
    2.67  {
    2.68 -	MapEditor *me=NULL;
    2.69 -	if (mapCenter) me=mapCenter->getMapEditor();
    2.70 +	MapEditor *me=model->getMapEditor();
    2.71  	if (me)
    2.72  	{
    2.73  		WarningDialog dia;
    2.74 @@ -287,8 +287,7 @@
    2.75  ////////////////////////////////////////////////////////////////////////
    2.76  void ExportFirefoxBookmarks::doExport() 
    2.77  {
    2.78 -	MapEditor *me=NULL;
    2.79 -	if (mapCenter) me=mapCenter->getMapEditor();
    2.80 +	MapEditor *me=model->getMapEditor();
    2.81  	if (me)
    2.82  	{
    2.83  		WarningDialog dia;
    2.84 @@ -327,8 +326,7 @@
    2.85  ////////////////////////////////////////////////////////////////////////
    2.86  void ExportTaskjuggler::doExport() 
    2.87  {
    2.88 -	MapEditor *me=NULL;
    2.89 -	if (mapCenter) me=mapCenter->getMapEditor();
    2.90 +	MapEditor *me=model->getMapEditor();
    2.91  	if (me)
    2.92  	{
    2.93  		me->exportXML(tmpDir.path(),false);
    2.94 @@ -364,7 +362,7 @@
    2.95    // QString curIndent("");
    2.96    // int i;
    2.97    BranchObj *bo;
    2.98 -  bo=mapCenter->first();
    2.99 +  bo=model->first();
   2.100    while (bo) {
   2.101  	if (!bo->hasHiddenExportParent() )
   2.102  	{
   2.103 @@ -391,7 +389,7 @@
   2.104  		  ts << ("\n");
   2.105  		}
   2.106  	}
   2.107 -    bo=bo->next();
   2.108 +    bo=model->next(bo);
   2.109     }
   2.110    file.close();
   2.111  }
   2.112 @@ -443,6 +441,7 @@
   2.113  {
   2.114  	QString allPages;
   2.115  
   2.116 +/* FIXME not adapted to multiple mapCenters yet
   2.117  	// Insert new content
   2.118  	content.replace ("<!-- INSERT TITLE -->",quotemeta(mapCenter->getHeading()));
   2.119  	content.replace ("<!-- INSERT AUTHOR -->",quotemeta(mapCenter->getAuthor()));
   2.120 @@ -506,6 +505,7 @@
   2.121  
   2.122  	// zip tmpdir to destination
   2.123  	zipDir (tmpDir,outputFile);	
   2.124 +*/
   2.125  }
   2.126  
   2.127  bool ExportOO::setConfigFile (const QString &cf)