# HG changeset patch
# User insilmaril
# Date 1200328019 0
# Node ID 7eb4e5529c824b1548ec09d4f8c5106916aad48e
# Parent  d35bd2241fd1fa3f064498fd856f450bd7f080c2
Added french manual by Claude

diff -r d35bd2241fd1 -r 7eb4e5529c82 branchobj.cpp
--- a/branchobj.cpp	Mon Jan 14 16:26:59 2008 +0000
+++ b/branchobj.cpp	Mon Jan 14 16:26:59 2008 +0000
@@ -1,6 +1,7 @@
 #include "branchobj.h"
 
 // #include "texteditor.h"
+#include "geometry.h"
 #include "mapeditor.h"
 #include "mainwindow.h"
 #include "misc.h"
@@ -690,12 +691,12 @@
 	
 
 	// Search myself
-    if (inBox (p) && (this != excludeLMO) && isVisibleObj() ) 
+    if (inBox (p,clickBox) && (this != excludeLMO) && isVisibleObj() ) 
 		return this;
 
 	// Search float images
     for (int i=0; i<floatimage.size(); ++i )
-		if (floatimage.at(i)->inBox(p) && 
+		if (inBox(p,floatimage.at(i)->getClickBox()) && 
 			(floatimage.at(i) != excludeLMO) && 
 			floatimage.at(i)->getParObj()!= excludeLMO &&
 			floatimage.at(i)->isVisibleObj() 
diff -r d35bd2241fd1 -r 7eb4e5529c82 exports.cpp
--- a/exports.cpp	Mon Jan 14 16:26:59 2008 +0000
+++ b/exports.cpp	Mon Jan 14 16:26:59 2008 +0000
@@ -42,9 +42,9 @@
 	return outputFile;
 }
 
-void ExportBase::setMapCenter(MapCenterObj *mc)
+void ExportBase::setModel(VymModel *m)
 {
-	mapCenter=mc;
+	model=m;
 }
 
 void ExportBase::setCaption (const QString &s)
@@ -59,9 +59,10 @@
 
 bool ExportBase::execDialog()
 {
-	if (mapCenter && mapCenter->getMapEditor())
+	//MapEditor *me=model.getMapEditor(); FIXME needed?
+	// if (model->mapCenters.count() && me)
 	{
-		QFileDialog *fd=new QFileDialog( mapCenter->getMapEditor(), caption);
+		QFileDialog *fd=new QFileDialog( 0, caption);
 		fd->setFilter (filter);
 		fd->setCaption(caption);
 		fd->setMode( QFileDialog::AnyFile );
@@ -145,7 +146,7 @@
 	QString curIndent;
 	int i;
 	BranchObj *bo;
-	bo=mapCenter->first();
+	bo=model->first();
 	while (bo) 
 	{
 		// Make indentstring
@@ -189,7 +190,7 @@
 				ts << QString (s+"\n");
 			}
 		}
-		bo=bo->next();
+		bo=model->next(bo);
 	}
 	file.close();
 }
@@ -221,7 +222,7 @@
 	QString curIndent("");
 	int i;
 	BranchObj *bo;
-	bo=mapCenter->first();
+	bo=model->first();
 	while (bo) 
 	{
 		if (!bo->hasHiddenExportParent() )
@@ -242,7 +243,7 @@
 			ts << curIndent << "\"" << bo->getHeading()<<"\""<<endl;
 		}
 		
-		bo=bo->next();
+		bo=model->next(bo);
 		curIndent="";
 	}
 	file.close();
@@ -251,8 +252,7 @@
 ////////////////////////////////////////////////////////////////////////
 void ExportKDEBookmarks::doExport() 
 {
-	MapEditor *me=NULL;
-	if (mapCenter) me=mapCenter->getMapEditor();
+	MapEditor *me=model->getMapEditor();
 	if (me)
 	{
 		WarningDialog dia;
@@ -287,8 +287,7 @@
 ////////////////////////////////////////////////////////////////////////
 void ExportFirefoxBookmarks::doExport() 
 {
-	MapEditor *me=NULL;
-	if (mapCenter) me=mapCenter->getMapEditor();
+	MapEditor *me=model->getMapEditor();
 	if (me)
 	{
 		WarningDialog dia;
@@ -327,8 +326,7 @@
 ////////////////////////////////////////////////////////////////////////
 void ExportTaskjuggler::doExport() 
 {
-	MapEditor *me=NULL;
-	if (mapCenter) me=mapCenter->getMapEditor();
+	MapEditor *me=model->getMapEditor();
 	if (me)
 	{
 		me->exportXML(tmpDir.path(),false);
@@ -364,7 +362,7 @@
   // QString curIndent("");
   // int i;
   BranchObj *bo;
-  bo=mapCenter->first();
+  bo=model->first();
   while (bo) {
 	if (!bo->hasHiddenExportParent() )
 	{
@@ -391,7 +389,7 @@
 		  ts << ("\n");
 		}
 	}
-    bo=bo->next();
+    bo=model->next(bo);
    }
   file.close();
 }
@@ -443,6 +441,7 @@
 {
 	QString allPages;
 
+/* FIXME not adapted to multiple mapCenters yet
 	// Insert new content
 	content.replace ("<!-- INSERT TITLE -->",quotemeta(mapCenter->getHeading()));
 	content.replace ("<!-- INSERT AUTHOR -->",quotemeta(mapCenter->getAuthor()));
@@ -506,6 +505,7 @@
 
 	// zip tmpdir to destination
 	zipDir (tmpDir,outputFile);	
+*/
 }
 
 bool ExportOO::setConfigFile (const QString &cf)