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

diff -r 7eb4e5529c82 -r 954221e01e4e exports.h
--- a/exports.h	Mon Jan 14 16:26:59 2008 +0000
+++ b/exports.h	Mon Jan 14 16:26:59 2008 +0000
@@ -7,6 +7,7 @@
 
 #include "mapcenterobj.h"
 #include "settings.h"
+#include "vymmodel.h"
 
 
 /*! \brief Base class for all exports
@@ -22,18 +23,18 @@
 	virtual void setDir(const QDir&);
 	virtual void setFile(const QString &);
 	virtual QString getFile ();
-	virtual void setMapCenter (MapCenterObj*);
+	virtual void setModel (VymModel *m);
 	virtual void setCaption(const QString &);
 	virtual void addFilter (const QString &);
 	virtual bool execDialog();
 	virtual bool canceled();
 protected:  
+	VymModel *model;
 	virtual QString getSectionString (BranchObj*);
 
 	QDir tmpDir;
 	QDir outDir;
 	QString outputFile;
-	MapCenterObj *mapCenter;
 	QString	indentPerDepth;
 	QString caption;
 	QString filter;
diff -r 7eb4e5529c82 -r 954221e01e4e flagrowobj.cpp
--- a/flagrowobj.cpp	Mon Jan 14 16:26:59 2008 +0000
+++ b/flagrowobj.cpp	Mon Jan 14 16:26:59 2008 +0000
@@ -1,4 +1,5 @@
 #include "flagrowobj.h"
+#include "geometry.h"
 
 #include <QToolBar>
 
@@ -109,9 +110,9 @@
 
 QString FlagRowObj::getFlagName (const QPointF &p)
 {
-	if (!inBox (p)) return "";
+	if (!inBox (p,clickBox)) return "";
 	for (int i=0; i<flag.size(); ++i)
-		if (flag.at(i)->inBox (p)) return flag.at(i)->getName();
+		if (inBox (p,flag.at(i)->getClickBox ())) return flag.at(i)->getName();
 	return "";	
 
 	
diff -r 7eb4e5529c82 -r 954221e01e4e historywindow.cpp
--- a/historywindow.cpp	Mon Jan 14 16:26:59 2008 +0000
+++ b/historywindow.cpp	Mon Jan 14 16:26:59 2008 +0000
@@ -170,6 +170,5 @@
 
 void HistoryWindow::select()
 {
-	cout <<"HW::select  "<<ui.historyTable->row (ui.historyTable->selectedItems().first())<<endl;
 	mainWindow->gotoHistoryStep (ui.historyTable->row (ui.historyTable->selectedItems().first()));
 }
diff -r 7eb4e5529c82 -r 954221e01e4e linkablemapobj.cpp
--- a/linkablemapobj.cpp	Mon Jan 14 16:26:59 2008 +0000
+++ b/linkablemapobj.cpp	Mon Jan 14 16:26:59 2008 +0000
@@ -180,7 +180,7 @@
 
 LinkableMapObj::Style LinkableMapObj::getDefLinkStyle ()
 {
-	if (mapEditor==0) return UndefinedStyle;
+	if (!mapEditor) return UndefinedStyle;
 	Style ls=mapEditor->getMapLinkStyle();
 	switch (ls)
 	{
@@ -560,10 +560,10 @@
 				break;
 		} else
 			if (typ=="bo:")
-				lmo=((BranchObj*)(lmo))->getBranchNum (num.toInt());
+				lmo=((BranchObj*)lmo)->getBranchNum (num.toInt());
 			else
 				if (typ=="fi:")
-					lmo=((BranchObj*)(lmo))->getFloatImageNum (num.toUInt());
+					lmo=((BranchObj*)lmo)->getFloatImageNum (num.toUInt());
 		if (!lmo) break;
 		
 		if (s.contains(","))