1.1 --- a/mainwindow.h	Wed Jul 16 11:56:44 2008 +0000
     1.2 +++ b/mainwindow.h	Mon Aug 04 10:43:06 2008 +0000
     1.3 @@ -196,7 +196,7 @@
     1.4  	void windowToggleAntiAlias();
     1.5  	void windowToggleSmoothPixmap();
     1.6  	void updateNoteFlag();
     1.7 -	void updateSatellites(MapEditor *);
     1.8 +	void updateSatellites(VymModel*);
     1.9  	void updateActions();
    1.10  	ModMode getModMode();
    1.11  	bool autoEditNewBranch();
    1.12 @@ -258,44 +258,48 @@
    1.13  	QAction* actionFileNewCopy;
    1.14  	QAction* actionFileSave;
    1.15  	QAction* actionFilePrint;
    1.16 -	QAction* actionEditUndo;
    1.17 -	QAction* actionEditRedo;
    1.18 -	QAction *actionEditCopy;
    1.19 -	QAction *actionEditCut;
    1.20 -	QAction *actionEditPaste;
    1.21 -	QAction *actionEditMoveUp;
    1.22 -	QAction *actionEditMoveDown;
    1.23 -	QAction *actionEditSortChildren;
    1.24 -	QAction *actionEditToggleScroll;
    1.25 -	QAction* actionEditOpenURL;
    1.26 -	QAction* actionEditOpenURLTab;
    1.27 -	QAction* actionEditOpenMultipleURLTabs;
    1.28 -	QAction* actionEditURL;
    1.29 -	QAction* actionEditLocalURL;
    1.30 -	QAction* actionEditHeading2URL;
    1.31 -	QAction* actionEditBugzilla2URL;
    1.32 -	QAction* actionEditFATE2URL;
    1.33 -	QAction *actionEditOpenVymLink;
    1.34 -	QAction *actionEditOpenMultipleVymLinks;
    1.35 -	QAction *actionEditVymLink;
    1.36 -	QAction *actionEditDeleteVymLink;
    1.37 -	QAction *actionEditToggleHideExport;
    1.38 -	QAction *actionEditMapInfo;
    1.39 -	QAction *actionEditHeading;
    1.40 -	QAction *actionEditDelete;
    1.41 -	QAction *actionEditAddMapCenter;
    1.42 -	QAction *actionEditAddBranch;
    1.43 -	QAction *actionEditAddBranchBefore;
    1.44 -	QAction *actionEditAddBranchAbove;
    1.45 -	QAction *actionEditAddBranchBelow;
    1.46 -	QAction *actionEditDeleteKeepChildren;
    1.47 -	QAction *actionEditDeleteChildren;
    1.48 -	QAction *actionEditImportAdd;
    1.49 -	QAction *actionEditImportReplace;
    1.50 -	QAction *actionEditSaveBranch;
    1.51 -	QAction *actionEditSelectFirst;
    1.52 -	QAction *actionEditSelectLast;
    1.53 -	QAction *actionEditLoadImage;
    1.54 +	QAction* actionUndo;
    1.55 +	QAction* actionRedo;
    1.56 +	QAction *actionCopy;
    1.57 +	QAction *actionCut;
    1.58 +	QAction *actionPaste;
    1.59 +	QAction *actionMoveUp;
    1.60 +	QAction *actionMoveDown;
    1.61 +	QAction *actionSortChildren;
    1.62 +	QAction *actionToggleScroll;
    1.63 +	QAction* actionOpenURL;
    1.64 +	QAction* actionOpenURLTab;
    1.65 +	QAction* actionOpenMultipleURLTabs;
    1.66 +	QAction* actionURL;
    1.67 +	QAction* actionLocalURL;
    1.68 +	QAction* actionHeading2URL;
    1.69 +	QAction* actionBugzilla2URL;
    1.70 +	QAction* actionFATE2URL;
    1.71 +	QAction *actionOpenVymLink;
    1.72 +	QAction *actionOpenMultipleVymLinks;
    1.73 +	QAction *actionVymLink;
    1.74 +	QAction *actionDeleteVymLink;
    1.75 +	QAction *actionToggleHideExport;
    1.76 +	QAction *actionMapInfo;
    1.77 +	QAction *actionHeading;
    1.78 +	QAction *actionDelete;
    1.79 +
    1.80 +public:
    1.81 +	QAction *actionAddMapCenter;
    1.82 +
    1.83 +private:	
    1.84 +	QAction *actionAddBranch;
    1.85 +	QAction *actionAddBranchBefore;
    1.86 +	QAction *actionAddBranchAbove;
    1.87 +	QAction *actionAddBranchBelow;
    1.88 +	QAction *actionDeleteKeepChildren;
    1.89 +	QAction *actionDeleteChildren;
    1.90 +	QAction *actionImportAdd;
    1.91 +	QAction *actionImportReplace;
    1.92 +	QAction *actionSaveBranch;
    1.93 +	QAction *actionSelectFirst;
    1.94 +	QAction *actionSelectLast;
    1.95 +	QAction *actionLoadImage;
    1.96  
    1.97  	QAction* actionFormatColor;
    1.98  	QAction* actionFormatPickColor;