1.1 --- a/mapeditor.h	Tue Oct 24 15:36:38 2006 +0000
     1.2 +++ b/mapeditor.h	Mon Oct 30 12:39:37 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 getColor();
     1.8      QColor getBackgroundColor();
     1.9      MapCenterObj* getMapCenter();
    1.10  	Q3Canvas* getCanvas();
    1.11 @@ -32,16 +31,15 @@
    1.12  	void makeTmpDirs();		// create temporary directories
    1.13      QString saveToDir(const QString&,const QString &,bool, const QPoint &,LinkableMapObj*);
    1.14      void saveStateComplete       (const QString &);					
    1.15 -    void saveStateChangingPart (LinkableMapObj *, const QString &);
    1.16 +    void saveStateChangingPart (LinkableMapObj *, LinkableMapObj *, const QString &, const QString &);
    1.17      void saveStateRemovingPart (LinkableMapObj *, const QString &);
    1.18 -    void saveStateConstSelection (const QString &, const QString &, const QString &);
    1.19      void saveState(LinkableMapObj *, const QString &, LinkableMapObj *, const QString &, const QString &);
    1.20      void saveState(const QString &, const QString &, const QString &, const QString &, const QString &);
    1.21      void saveState(const SaveMode&, const QString &, const QString &, const QString &, const QString &, const QString &, LinkableMapObj *);
    1.22  public:	
    1.23      void parseAtom(const QString &);	
    1.24  private:
    1.25 -    void addFloatImage(const QPixmap &img);
    1.26 +    void addFloatImageInt(const QPixmap &img);
    1.27  
    1.28    private slots:
    1.29      void fetchImage(const QString &img);
    1.30 @@ -123,16 +121,16 @@
    1.31      void selectRightBranch();
    1.32      void selectFirstBranch();
    1.33      void selectLastBranch();
    1.34 -    void setColor(QColor);
    1.35      void selectBackgroundColor();
    1.36      void setBackgroundColor(QColor);
    1.37 -    QColor pickColor();
    1.38 -    void colorItem();
    1.39 -    void colorBranch();
    1.40 +    QColor getCurrentHeadingColor();
    1.41 +    void colorItem(QColor);
    1.42 +    void colorBranch(QColor);
    1.43  	void toggleStandardFlag(QString);
    1.44  	virtual void setViewCenter();			// needed for zooming
    1.45      BranchObj* findText(QString,bool);		// Find object
    1.46      void findReset();						// Reset Find 
    1.47 +	void setURL(const QString &);			// set the URL
    1.48  	void editURL();							// edit the URL
    1.49  	QString getURL();						// returns URL of selection or ""
    1.50  	QStringList getURLs();					// returns URLs of subtree
    1.51 @@ -143,9 +141,10 @@
    1.52  	void deleteVymLink();					// delete link to another map
    1.53  	QString getVymLink();					// return path to map
    1.54  	QStringList getVymLinks();				// return paths in subtree
    1.55 +	void setHideExport(bool);				// toggle the export flag
    1.56  	void toggleHideExport();				// toggle the export flag
    1.57 -	void removeBranchKeepChilds();			// remove but keep childs
    1.58 -	void removeChilds();					// remove childs
    1.59 +	void deleteKeepChilds();				// remove but keep childs
    1.60 +	void deleteChilds();					// remove childs
    1.61  	void editMapInfo();						// dialog to enter author, ...
    1.62  	void updateActions();					// update e.g. format buttons
    1.63  	void updateNoteFlag();					// when TextEditor changes
    1.64 @@ -198,7 +197,6 @@
    1.65  	bool adjustCanvasRequested;	// collect requests until end of user event
    1.66  	BranchObj *editingBO;		// entering Text into BO
    1.67  
    1.68 -    QColor actColor;			// actual color
    1.69  	QColor defLinkColor;		// default color for links
    1.70  	QColor defXLinkColor;		// default color for xlinks
    1.71  	int defXLinkWidth;			// default width for xlinks