1.1 --- a/mapeditor.h	Thu Sep 21 13:48:05 2006 +0000
     1.2 +++ b/mapeditor.h	Mon Oct 16 12:42:54 2006 +0000
     1.3 @@ -2,18 +2,7 @@
     1.4  #define MAPEDITOR_H
     1.5  
     1.6  #include <q3canvas.h>
     1.7 -//#include <q3filedialog.h>
     1.8 -//#include <q3process.h>
     1.9  #include <QBuffer>
    1.10 -#include <QContextMenuEvent>
    1.11 -#include <QCursor>
    1.12 -#include <QDragEnterEvent>
    1.13 -#include <QDropEvent>
    1.14 -#include <QEvent>
    1.15 -#include <QLineEdit>
    1.16 -#include <QMouseEvent>
    1.17 -#include <QPixmap>
    1.18 -#include <QResizeEvent>
    1.19  
    1.20  #include "mapcenterobj.h"
    1.21  #include "file.h"
    1.22 @@ -29,10 +18,10 @@
    1.23      Q_OBJECT
    1.24  
    1.25  public:
    1.26 -    MapEditor(QWidget* parent=0, bool interactive=false, const char* name=0, Qt::WFlags f=0);
    1.27 +    MapEditor(QWidget* parent=0,  const char* name=0, Qt::WFlags f=0);
    1.28  	~MapEditor();
    1.29 -    QColor color();
    1.30 -    QColor backgroundColor();
    1.31 +    QColor getColor();
    1.32 +    QColor getBackgroundColor();
    1.33      MapCenterObj* getMapCenter();
    1.34  	Q3Canvas* getCanvas();
    1.35  	void adjustCanvasSize();// adjust canvas size to map and scrollview
    1.36 @@ -45,7 +34,6 @@
    1.37      void saveStateComplete       (const QString &);					
    1.38      void saveStatePart           (LinkableMapObj *, const QString &);
    1.39      void saveStateConstSelection (const QString &, const QString &, const QString &);
    1.40 -    void saveStateComData		 (LinkableMapObj *, const QString &, LinkableMapObj *, const QString &, const QString &, LinkableMapObj *);
    1.41      void saveState(LinkableMapObj *, const QString &, LinkableMapObj *, const QString &, const QString &);
    1.42      void saveState(const QString &, const QString &, const QString &, const QString &, const QString &);
    1.43      void saveState(const SaveMode&, const QString &, const QString &, const QString &, const QString &, const QString &, LinkableMapObj *);
    1.44 @@ -90,7 +78,9 @@
    1.45      void clear();		// clear map
    1.46      void copy();		// copy branch to clipboard
    1.47      void redo();		// redo last action
    1.48 +	bool isRedoAvailable();
    1.49      void undo();		// undo last action
    1.50 +	bool isUndoAvailable();
    1.51  	void gotoStep (int);// goto a step in history
    1.52  private:	
    1.53      void undoXML(const QString &, const QString &);
    1.54 @@ -247,7 +237,6 @@
    1.55  	QString destPath;			// path to .vym file (needed for vymlinks)
    1.56  	QString mapName;			// fileName without ".vym"
    1.57  
    1.58 -	bool isInteractive;			// non interactive don't need tmpdirs
    1.59  	QString tmpMapDir;			// tmp directory with undo history
    1.60  	QString histPath;			// Path to history file
    1.61  	int stepsTotal;				// total number of steps (undos+redos)