1.1 --- a/mapeditor.h	Mon Oct 30 12:39:37 2006 +0000
     1.2 +++ b/mapeditor.h	Thu Nov 16 10:07:11 2006 +0000
     1.3 @@ -20,7 +20,6 @@
     1.4  public:
     1.5      MapEditor(QWidget* parent=0,  const char* name=0, Qt::WFlags f=0);
     1.6  	~MapEditor();
     1.7 -    QColor getBackgroundColor();
     1.8      MapCenterObj* getMapCenter();
     1.9  	Q3Canvas* getCanvas();
    1.10  	void adjustCanvasSize();// adjust canvas size to map and scrollview
    1.11 @@ -30,7 +29,6 @@
    1.12  	QString getName(LinkableMapObj*);	// Get e.g. heading or filename
    1.13  	void makeTmpDirs();		// create temporary directories
    1.14      QString saveToDir(const QString&,const QString &,bool, const QPoint &,LinkableMapObj*);
    1.15 -    void saveStateComplete       (const QString &);					
    1.16      void saveStateChangingPart (LinkableMapObj *, LinkableMapObj *, const QString &, const QString &);
    1.17      void saveStateRemovingPart (LinkableMapObj *, const QString &);
    1.18      void saveState(LinkableMapObj *, const QString &, LinkableMapObj *, const QString &, const QString &);
    1.19 @@ -121,8 +119,9 @@
    1.20      void selectRightBranch();
    1.21      void selectFirstBranch();
    1.22      void selectLastBranch();
    1.23 -    void selectBackgroundColor();
    1.24 -    void setBackgroundColor(QColor);
    1.25 +    void selectMapBackgroundColor();
    1.26 +    void setMapBackgroundColor(QColor);
    1.27 +    QColor getMapBackgroundColor();
    1.28      QColor getCurrentHeadingColor();
    1.29      void colorItem(QColor);
    1.30      void colorBranch(QColor);
    1.31 @@ -148,19 +147,21 @@
    1.32  	void editMapInfo();						// dialog to enter author, ...
    1.33  	void updateActions();					// update e.g. format buttons
    1.34  	void updateNoteFlag();					// when TextEditor changes
    1.35 -	void setLinkStyle (LinkStyle);			// Set style of link
    1.36 -	LinkStyle getLinkStyle ();				// requested in LMO
    1.37 -	void setLinkColor(QColor);				// default color of links
    1.38 -	void setLinkColorHint();				// color of links
    1.39 -	void setLinkColorHint(LinkColorHint);	// color of links
    1.40 -	LinkColorHint getLinkColorHint();
    1.41 -	QColor getDefLinkColor();
    1.42 -	void setDefXLinkColor(QColor);
    1.43 -	QColor getDefXLinkColor();
    1.44 -	void setDefXLinkWidth (int);
    1.45 -	int getDefXLinkWidth();
    1.46 -	void toggleLinkColorHint();				// after changing linkStyles
    1.47 -    void selectLinkColor();
    1.48 +	void setMapAuthor (const QString &);
    1.49 +	void setMapComment(const QString &);
    1.50 +	void setMapLinkStyle (const QString &);	// Set style of link
    1.51 +	LinkStyle getMapLinkStyle ();			// requested in LMO
    1.52 +	void setMapDefLinkColor(QColor);		// default color of links
    1.53 +	void setMapLinkColorHintInt();			// color of links
    1.54 +	void setMapLinkColorHint(LinkColorHint);// color of links
    1.55 +	LinkColorHint getMapLinkColorHint();
    1.56 +	QColor getMapDefLinkColor();
    1.57 +	void setMapDefXLinkColor(QColor);
    1.58 +	QColor getMapDefXLinkColor();
    1.59 +	void setMapDefXLinkWidth (int);
    1.60 +	int getMapDefXLinkWidth();
    1.61 +	void toggleMapLinkColorHint();			// after changing linkStyles
    1.62 +    void selectMapLinkColor();
    1.63      void toggleScroll();
    1.64      void unScrollAll();
    1.65  	void loadFloatImage ();
    1.66 @@ -183,6 +184,8 @@
    1.67  	void ensureSelectionVisible();		
    1.68  	virtual void updateViewCenter();	// needed for zooming
    1.69  	virtual void contentsContextMenuEvent ( QContextMenuEvent *e );
    1.70 +    virtual void keyPressEvent(QKeyEvent*);
    1.71 +    virtual void keyReleaseEvent(QKeyEvent*);
    1.72      virtual void contentsMousePressEvent(QMouseEvent*);
    1.73      virtual void contentsMouseReleaseEvent(QMouseEvent*);
    1.74      virtual void contentsMouseDoubleClickEvent(QMouseEvent*);
    1.75 @@ -203,8 +206,10 @@
    1.76  	LinkColorHint linkcolorhint;// use heading color or own color
    1.77  	LinkStyle linkstyle;		// default style for links
    1.78  
    1.79 -    QCursor handOpenCursor;		// cursor while moving canvas view
    1.80 -	QCursor pickColorCursor;	// cursor while picking color 
    1.81 +    QCursor HandOpenCursor;		// cursor while moving canvas view
    1.82 +	QCursor PickColorCursor;	// cursor while picking color 
    1.83 +	QCursor CopyCursor;			// cursor while picking color 
    1.84 +	QCursor XLinkCursor;		// cursor while picking color 
    1.85  	bool pickingColor;
    1.86  	bool drawingLink;			// true while creating a link
    1.87  	bool copyingObj;			// true while creating a link