diff -r 83a3be747ad9 -r 8b9cfc26638c mainwindow.h
--- a/mainwindow.h	Wed Apr 25 16:02:54 2007 +0000
+++ b/mainwindow.h	Wed Apr 25 16:02:54 2007 +0000
@@ -12,13 +12,19 @@
 #include "texteditor.h"
 #include "xml.h"
 
-enum ModMode {ModModeNone,ModModeColor,ModModeCopy,ModModeXLink};
-
 class Main : public QMainWindow 
 {
     Q_OBJECT
 
 public:
+	/*! Modifier modes are used when CTRL together with a mouse button is pressed */
+	enum ModMode {
+		ModModeNone,	//!< Unused
+		ModModeColor,	//!< Pick color from object
+		ModModeCopy,	//!< Copy object
+		ModModeXLink	//!< Create a XLink (XLinkObj) from selected object
+		};
+
     Main(QWidget* parent=0, const char* name=0, Qt::WFlags f=0);
     ~Main();
 	void loadCmdLine();
@@ -58,8 +64,11 @@
     void fileLoad();
 	void fileLoadRecent();
 	void addRecentMap (const QString &);
-    void fileSave(const SaveMode & );
+    void fileSave(MapEditor*, const SaveMode & );
     void fileSave();
+public slots:	
+    void fileSave(MapEditor *);	// autosave from MapEditor
+private slots:	
     void fileSaveAs(const SaveMode &);
     void fileSaveAs();
     void fileImportKDEBookmarks();
@@ -114,7 +123,7 @@
     void editMoveUp();	
     void editMoveDown();	
     void editToggleScroll();
-    void editUnScrollAll();
+    void editUnscrollChilds();
     void editNewBranch();
     void editNewBranchBefore();
     void editNewBranchAbove();
@@ -150,8 +159,6 @@
     void formatSelectLinkColor();
     void formatSelectSelectionColor();
     void formatToggleLinkColorHint();
-	void formatIncludeImagesVer();
-	void formatIncludeImagesHor();
 	void formatHideLinkUnselected();
 
     void viewZoomReset();
@@ -163,9 +170,13 @@
 	bool settingsURL();
 	void settingsMacroDir();
 	void settingsToggleDelKey();
+	void settingsUndoLevels();
+	void settingsAutosaveToggle();
+	void settingsAutosaveTime();
 
 	void windowToggleNoteEditor();
 	void windowToggleHistory();
+	void windowToggleProperty();
 	void updateHistory(SimpleSettings &);
 	void windowToggleAntiAlias();
 	void windowToggleSmoothPixmap();
@@ -180,7 +191,6 @@
 	void runScript(const QString &);
 
 private slots:
-	void showPropertyDialog();
 	void windowNextEditor();
 	void windowPreviousEditor();
 	void windowShowNoteEditor();
@@ -196,6 +206,7 @@
     void helpAboutQT();
 
 	void callMacro ();
+
 private:
 	QTabWidget *tabWidget;
 	FindWindow *findWindow;
@@ -269,8 +280,6 @@
 	QAction* actionFormatBackImage;
 	QAction* actionFormatLinkColor;
 	QAction* actionFormatSelectionColor;
-	QAction *actionFormatIncludeImagesVer;
-	QAction *actionFormatIncludeImagesHor;
 
 	QActionGroup* actionGroupModModes;
 	QAction* actionModModeColor;
@@ -279,7 +288,7 @@
 
 	QActionGroup *actionGroupFormatFrameTypes;
 
-	QAction *actionTogglePropertyDialog;
+	QAction *actionTogglePropertyWindow;
 
 	QActionGroup *actionGroupFormatLinkStyles;
 	QAction *actionFormatLinkStyleLine;
@@ -299,6 +308,8 @@
 	QAction* actionSettingsUseDelKey;
 	QAction* actionSettingsUseFlagGroups;
 	QAction* actionSettingsUseHideExport;
+	QAction* actionSettingsAutosaveToggle;
+	QAction* actionSettingsAutosaveTime;
 };