diff -r 39aa64b24375 -r d42881c25fb6 mapeditor.h
--- a/mapeditor.h	Mon Oct 30 12:39:37 2006 +0000
+++ b/mapeditor.h	Thu Nov 16 10:07:11 2006 +0000
@@ -20,7 +20,6 @@
 public:
     MapEditor(QWidget* parent=0,  const char* name=0, Qt::WFlags f=0);
 	~MapEditor();
-    QColor getBackgroundColor();
     MapCenterObj* getMapCenter();
 	Q3Canvas* getCanvas();
 	void adjustCanvasSize();// adjust canvas size to map and scrollview
@@ -30,7 +29,6 @@
 	QString getName(LinkableMapObj*);	// Get e.g. heading or filename
 	void makeTmpDirs();		// create temporary directories
     QString saveToDir(const QString&,const QString &,bool, const QPoint &,LinkableMapObj*);
-    void saveStateComplete       (const QString &);					
     void saveStateChangingPart (LinkableMapObj *, LinkableMapObj *, const QString &, const QString &);
     void saveStateRemovingPart (LinkableMapObj *, const QString &);
     void saveState(LinkableMapObj *, const QString &, LinkableMapObj *, const QString &, const QString &);
@@ -121,8 +119,9 @@
     void selectRightBranch();
     void selectFirstBranch();
     void selectLastBranch();
-    void selectBackgroundColor();
-    void setBackgroundColor(QColor);
+    void selectMapBackgroundColor();
+    void setMapBackgroundColor(QColor);
+    QColor getMapBackgroundColor();
     QColor getCurrentHeadingColor();
     void colorItem(QColor);
     void colorBranch(QColor);
@@ -148,19 +147,21 @@
 	void editMapInfo();						// dialog to enter author, ...
 	void updateActions();					// update e.g. format buttons
 	void updateNoteFlag();					// when TextEditor changes
-	void setLinkStyle (LinkStyle);			// Set style of link
-	LinkStyle getLinkStyle ();				// requested in LMO
-	void setLinkColor(QColor);				// default color of links
-	void setLinkColorHint();				// color of links
-	void setLinkColorHint(LinkColorHint);	// color of links
-	LinkColorHint getLinkColorHint();
-	QColor getDefLinkColor();
-	void setDefXLinkColor(QColor);
-	QColor getDefXLinkColor();
-	void setDefXLinkWidth (int);
-	int getDefXLinkWidth();
-	void toggleLinkColorHint();				// after changing linkStyles
-    void selectLinkColor();
+	void setMapAuthor (const QString &);
+	void setMapComment(const QString &);
+	void setMapLinkStyle (const QString &);	// Set style of link
+	LinkStyle getMapLinkStyle ();			// requested in LMO
+	void setMapDefLinkColor(QColor);		// default color of links
+	void setMapLinkColorHintInt();			// color of links
+	void setMapLinkColorHint(LinkColorHint);// color of links
+	LinkColorHint getMapLinkColorHint();
+	QColor getMapDefLinkColor();
+	void setMapDefXLinkColor(QColor);
+	QColor getMapDefXLinkColor();
+	void setMapDefXLinkWidth (int);
+	int getMapDefXLinkWidth();
+	void toggleMapLinkColorHint();			// after changing linkStyles
+    void selectMapLinkColor();
     void toggleScroll();
     void unScrollAll();
 	void loadFloatImage ();
@@ -183,6 +184,8 @@
 	void ensureSelectionVisible();		
 	virtual void updateViewCenter();	// needed for zooming
 	virtual void contentsContextMenuEvent ( QContextMenuEvent *e );
+    virtual void keyPressEvent(QKeyEvent*);
+    virtual void keyReleaseEvent(QKeyEvent*);
     virtual void contentsMousePressEvent(QMouseEvent*);
     virtual void contentsMouseReleaseEvent(QMouseEvent*);
     virtual void contentsMouseDoubleClickEvent(QMouseEvent*);
@@ -203,8 +206,10 @@
 	LinkColorHint linkcolorhint;// use heading color or own color
 	LinkStyle linkstyle;		// default style for links
 
-    QCursor handOpenCursor;		// cursor while moving canvas view
-	QCursor pickColorCursor;	// cursor while picking color 
+    QCursor HandOpenCursor;		// cursor while moving canvas view
+	QCursor PickColorCursor;	// cursor while picking color 
+	QCursor CopyCursor;			// cursor while picking color 
+	QCursor XLinkCursor;		// cursor while picking color 
 	bool pickingColor;
 	bool drawingLink;			// true while creating a link
 	bool copyingObj;			// true while creating a link