1.1 --- a/mapeditor.h	Wed Mar 29 09:11:09 2006 +0000
     1.2 +++ b/mapeditor.h	Fri Jun 16 08:27:11 2006 +0000
     1.3 @@ -12,6 +12,7 @@
     1.4  #include "mapcenterobj.h"
     1.5  #include "file.h"
     1.6  #include "misc.h"
     1.7 +#include "showtextdialog.h"
     1.8  
     1.9  class QNetworkOperation;
    1.10  class QUrlOperator;
    1.11 @@ -30,24 +31,26 @@
    1.12  	bool isRepositionBlocked(); // block while load or undo
    1.13  	
    1.14  private:
    1.15 +	QString getName(LinkableMapObj*);	// Get e.g. heading or filename
    1.16  	void makeTmpDirs();		// create temporary directories
    1.17      QString saveToDir(const QString&,const QString &,bool, const QPoint &,LinkableMapObj*);
    1.18 -    void saveState();		// save actual state to backup
    1.19 -    void saveState(LinkableMapObj *);
    1.20 -    void saveState(const QString &, const QString &);
    1.21 -    void saveState(const QString &, LinkableMapObj *);
    1.22 -    void saveState(const SaveMode&, const QString &, LinkableMapObj *, const QString &, LinkableMapObj *);
    1.23 +    void saveState(const QString &);	// save actual state to backup
    1.24 +    void saveState(LinkableMapObj *, const QString &);
    1.25 +    void saveState(const QString &, const QString &, const QString &);
    1.26 +    void saveState(const QString &, LinkableMapObj *, const QString &);
    1.27 +    void saveState(const SaveMode&, const QString &, LinkableMapObj *, const QString &, LinkableMapObj *, const QString &);
    1.28      void parseAtom(const QString &);	
    1.29  
    1.30      void addFloatImage(const QPixmap &img);
    1.31  
    1.32    private slots:
    1.33 -    void finishedLineEditNoSave();
    1.34 +    void finishedLineEdit();
    1.35      void fetchImage(const QString &img);
    1.36      void imageDataFetched(const QByteArray &, QNetworkOperation *);
    1.37      void imageDataFinished(QNetworkOperation *);
    1.38  
    1.39  public:
    1.40 +	void toggleHistoryWindow();
    1.41  	bool isDefault();		// false, if map was changed once
    1.42      bool isUnsaved();		// save necessary
    1.43      bool hasChanged();		// undo possible
    1.44 @@ -131,11 +134,8 @@
    1.45  	void editVymLink();						// edit link to another map
    1.46  	void deleteVymLink();					// delete link to another map
    1.47  	QString getVymLink();					// return path to map
    1.48 -	void setHideExport();					// toggle the export flag
    1.49 -protected:	
    1.50  	void toggleHideExport();				// toggle the export flag
    1.51 -public:	
    1.52 -	void removeBranchHere();				// remove but keep childs
    1.53 +	void removeBranchKeepChilds();			// remove but keep childs
    1.54  	void removeChilds();					// remove childs
    1.55  	void editMapInfo();						// dialog to enter author, ...
    1.56  	void updateActions();					// update e.g. format buttons
    1.57 @@ -250,6 +250,8 @@
    1.58    QDataStream *imageData;
    1.59    QBuffer *imageBuffer;
    1.60  
    1.61 +	ShowTextDialog *historyWindow;
    1.62 +
    1.63  };
    1.64  #endif
    1.65