1.1 --- a/mainwindow.h	Wed Apr 11 09:21:14 2007 +0000
     1.2 +++ b/mainwindow.h	Wed Apr 25 16:02:54 2007 +0000
     1.3 @@ -12,13 +12,19 @@
     1.4  #include "texteditor.h"
     1.5  #include "xml.h"
     1.6  
     1.7 -enum ModMode {ModModeNone,ModModeColor,ModModeCopy,ModModeXLink};
     1.8 -
     1.9  class Main : public QMainWindow 
    1.10  {
    1.11      Q_OBJECT
    1.12  
    1.13  public:
    1.14 +	/*! Modifier modes are used when CTRL together with a mouse button is pressed */
    1.15 +	enum ModMode {
    1.16 +		ModModeNone,	//!< Unused
    1.17 +		ModModeColor,	//!< Pick color from object
    1.18 +		ModModeCopy,	//!< Copy object
    1.19 +		ModModeXLink	//!< Create a XLink (XLinkObj) from selected object
    1.20 +		};
    1.21 +
    1.22      Main(QWidget* parent=0, const char* name=0, Qt::WFlags f=0);
    1.23      ~Main();
    1.24  	void loadCmdLine();
    1.25 @@ -58,8 +64,11 @@
    1.26      void fileLoad();
    1.27  	void fileLoadRecent();
    1.28  	void addRecentMap (const QString &);
    1.29 -    void fileSave(const SaveMode & );
    1.30 +    void fileSave(MapEditor*, const SaveMode & );
    1.31      void fileSave();
    1.32 +public slots:	
    1.33 +    void fileSave(MapEditor *);	// autosave from MapEditor
    1.34 +private slots:	
    1.35      void fileSaveAs(const SaveMode &);
    1.36      void fileSaveAs();
    1.37      void fileImportKDEBookmarks();
    1.38 @@ -114,7 +123,7 @@
    1.39      void editMoveUp();	
    1.40      void editMoveDown();	
    1.41      void editToggleScroll();
    1.42 -    void editUnScrollAll();
    1.43 +    void editUnscrollChilds();
    1.44      void editNewBranch();
    1.45      void editNewBranchBefore();
    1.46      void editNewBranchAbove();
    1.47 @@ -150,8 +159,6 @@
    1.48      void formatSelectLinkColor();
    1.49      void formatSelectSelectionColor();
    1.50      void formatToggleLinkColorHint();
    1.51 -	void formatIncludeImagesVer();
    1.52 -	void formatIncludeImagesHor();
    1.53  	void formatHideLinkUnselected();
    1.54  
    1.55      void viewZoomReset();
    1.56 @@ -163,9 +170,13 @@
    1.57  	bool settingsURL();
    1.58  	void settingsMacroDir();
    1.59  	void settingsToggleDelKey();
    1.60 +	void settingsUndoLevels();
    1.61 +	void settingsAutosaveToggle();
    1.62 +	void settingsAutosaveTime();
    1.63  
    1.64  	void windowToggleNoteEditor();
    1.65  	void windowToggleHistory();
    1.66 +	void windowToggleProperty();
    1.67  	void updateHistory(SimpleSettings &);
    1.68  	void windowToggleAntiAlias();
    1.69  	void windowToggleSmoothPixmap();
    1.70 @@ -180,7 +191,6 @@
    1.71  	void runScript(const QString &);
    1.72  
    1.73  private slots:
    1.74 -	void showPropertyDialog();
    1.75  	void windowNextEditor();
    1.76  	void windowPreviousEditor();
    1.77  	void windowShowNoteEditor();
    1.78 @@ -196,6 +206,7 @@
    1.79      void helpAboutQT();
    1.80  
    1.81  	void callMacro ();
    1.82 +
    1.83  private:
    1.84  	QTabWidget *tabWidget;
    1.85  	FindWindow *findWindow;
    1.86 @@ -269,8 +280,6 @@
    1.87  	QAction* actionFormatBackImage;
    1.88  	QAction* actionFormatLinkColor;
    1.89  	QAction* actionFormatSelectionColor;
    1.90 -	QAction *actionFormatIncludeImagesVer;
    1.91 -	QAction *actionFormatIncludeImagesHor;
    1.92  
    1.93  	QActionGroup* actionGroupModModes;
    1.94  	QAction* actionModModeColor;
    1.95 @@ -279,7 +288,7 @@
    1.96  
    1.97  	QActionGroup *actionGroupFormatFrameTypes;
    1.98  
    1.99 -	QAction *actionTogglePropertyDialog;
   1.100 +	QAction *actionTogglePropertyWindow;
   1.101  
   1.102  	QActionGroup *actionGroupFormatLinkStyles;
   1.103  	QAction *actionFormatLinkStyleLine;
   1.104 @@ -299,6 +308,8 @@
   1.105  	QAction* actionSettingsUseDelKey;
   1.106  	QAction* actionSettingsUseFlagGroups;
   1.107  	QAction* actionSettingsUseHideExport;
   1.108 +	QAction* actionSettingsAutosaveToggle;
   1.109 +	QAction* actionSettingsAutosaveTime;
   1.110  };
   1.111  
   1.112