1.1 --- a/mapeditor.h	Tue Sep 06 15:04:50 2005 +0000
     1.2 +++ b/mapeditor.h	Mon Sep 12 19:52:51 2005 +0000
     1.3 @@ -37,7 +37,8 @@
     1.4      void saveState();		// save actual state to backup
     1.5      void saveState(LinkableMapObj *);
     1.6      void saveState(const QString &, const QString &);
     1.7 -    void saveState(const SaveMode&, LinkableMapObj *, const QString &, const QString &);
     1.8 +    void saveState(const QString &, LinkableMapObj *);
     1.9 +    void saveState(const SaveMode&, const QString &, LinkableMapObj *, const QString &, LinkableMapObj *);
    1.10      void parseAtom(const QString &);	
    1.11  
    1.12      void addFloatImage(const QPixmap &img);
    1.13 @@ -61,6 +62,7 @@
    1.14  	QString getMapName ();	// e.g. "map"
    1.15  	QString getDestPath (); // e.g. "/home/tux/map.vym"
    1.16      int load (QString&, const LoadMode &);	// newmap, import/replace selection
    1.17 +public:
    1.18      int save(const SaveMode &);	// Save map 
    1.19  	void setZipped(bool);		// save map zipped
    1.20  	bool saveZipped();			// 1 if file will be saved zipped
    1.21 @@ -71,12 +73,15 @@
    1.22      void exportImage (QString fn);		// export as PNG	
    1.23      void exportImage (QString fn, int);	// export in given format
    1.24      void exportASCII();
    1.25 +    void exportLaTeX();
    1.26 +    void exportOOPresentation();
    1.27      void exportXML(const QString&);		// export to directory
    1.28      void clear();		// clear map
    1.29      void copy();		// copy branch to clipboard
    1.30 +    void redo();		// redo last action
    1.31      void undo();		// undo last action
    1.32  private:	
    1.33 -    void undoXML(const QString &);	// undo by replacing with saved data
    1.34 +    void undoXML(const QString &, const QString &);
    1.35      LinkableMapObj* pasteNoSave();		// paste clipboard to branch
    1.36      void cutNoSave();	// cut to clipboard
    1.37  public:	
    1.38 @@ -194,8 +199,6 @@
    1.39  	
    1.40      LinkableMapObj* selection;		// select a LinkableMapObj
    1.41      LinkableMapObj* selectionLast;	// last selection 
    1.42 -	QString undoSelection;			// selection for undo
    1.43 -	QString redoSelection;			// selection for redo
    1.44      MapObj* movingObj;				// moving a MapObj
    1.45  	MapObj* linkingObj_src;			// part of a link
    1.46      QPoint movingObj_orgPos;		// org. pos of mouse before move
    1.47 @@ -208,10 +211,6 @@
    1.48      bool mapDefault;				// Flag if map is untouched
    1.49      bool mapChanged;				// Flag if undo is possible
    1.50  	bool mapUnsaved;				// Flag if map should be saved
    1.51 -    QString backupXML;				// backup (XML) for undo
    1.52 -	QString undoCommand;			// FIXME testing
    1.53 -	QString redoCommand;			// FIXME testing
    1.54 -									// if != NULL
    1.55  
    1.56  	bool printFrame;			// Print frame around map
    1.57  	bool printFooter;			// Print footer below map
    1.58 @@ -225,7 +224,10 @@
    1.59  	QString lastImageDir;		// save dir for adding images
    1.60  
    1.61  	bool isInteractive;			// non interactive don't need tmpdirs
    1.62 -	QString bakMapDir;			// tmp directory with data for undo
    1.63 +	QString tmpMapDir;			// tmp directory with data for undo/redo
    1.64 +	int undosTotal;				// total number of undos 
    1.65 +	int undoNum;				// current number of bakMapDir to be used 
    1.66 +	int undosAvail;				// how many actions can currently be undone
    1.67  	bool blockReposition;		// block while load or undo
    1.68  	bool blockSaveState;		// block while load or undo
    1.69