diff -r 462d39502273 -r 11f9124c1cca mainwindow.h
--- a/mainwindow.h	Wed Jul 16 11:56:44 2008 +0000
+++ b/mainwindow.h	Mon Aug 04 10:43:06 2008 +0000
@@ -196,7 +196,7 @@
 	void windowToggleAntiAlias();
 	void windowToggleSmoothPixmap();
 	void updateNoteFlag();
-	void updateSatellites(MapEditor *);
+	void updateSatellites(VymModel*);
 	void updateActions();
 	ModMode getModMode();
 	bool autoEditNewBranch();
@@ -258,44 +258,48 @@
 	QAction* actionFileNewCopy;
 	QAction* actionFileSave;
 	QAction* actionFilePrint;
-	QAction* actionEditUndo;
-	QAction* actionEditRedo;
-	QAction *actionEditCopy;
-	QAction *actionEditCut;
-	QAction *actionEditPaste;
-	QAction *actionEditMoveUp;
-	QAction *actionEditMoveDown;
-	QAction *actionEditSortChildren;
-	QAction *actionEditToggleScroll;
-	QAction* actionEditOpenURL;
-	QAction* actionEditOpenURLTab;
-	QAction* actionEditOpenMultipleURLTabs;
-	QAction* actionEditURL;
-	QAction* actionEditLocalURL;
-	QAction* actionEditHeading2URL;
-	QAction* actionEditBugzilla2URL;
-	QAction* actionEditFATE2URL;
-	QAction *actionEditOpenVymLink;
-	QAction *actionEditOpenMultipleVymLinks;
-	QAction *actionEditVymLink;
-	QAction *actionEditDeleteVymLink;
-	QAction *actionEditToggleHideExport;
-	QAction *actionEditMapInfo;
-	QAction *actionEditHeading;
-	QAction *actionEditDelete;
-	QAction *actionEditAddMapCenter;
-	QAction *actionEditAddBranch;
-	QAction *actionEditAddBranchBefore;
-	QAction *actionEditAddBranchAbove;
-	QAction *actionEditAddBranchBelow;
-	QAction *actionEditDeleteKeepChildren;
-	QAction *actionEditDeleteChildren;
-	QAction *actionEditImportAdd;
-	QAction *actionEditImportReplace;
-	QAction *actionEditSaveBranch;
-	QAction *actionEditSelectFirst;
-	QAction *actionEditSelectLast;
-	QAction *actionEditLoadImage;
+	QAction* actionUndo;
+	QAction* actionRedo;
+	QAction *actionCopy;
+	QAction *actionCut;
+	QAction *actionPaste;
+	QAction *actionMoveUp;
+	QAction *actionMoveDown;
+	QAction *actionSortChildren;
+	QAction *actionToggleScroll;
+	QAction* actionOpenURL;
+	QAction* actionOpenURLTab;
+	QAction* actionOpenMultipleURLTabs;
+	QAction* actionURL;
+	QAction* actionLocalURL;
+	QAction* actionHeading2URL;
+	QAction* actionBugzilla2URL;
+	QAction* actionFATE2URL;
+	QAction *actionOpenVymLink;
+	QAction *actionOpenMultipleVymLinks;
+	QAction *actionVymLink;
+	QAction *actionDeleteVymLink;
+	QAction *actionToggleHideExport;
+	QAction *actionMapInfo;
+	QAction *actionHeading;
+	QAction *actionDelete;
+
+public:
+	QAction *actionAddMapCenter;
+
+private:	
+	QAction *actionAddBranch;
+	QAction *actionAddBranchBefore;
+	QAction *actionAddBranchAbove;
+	QAction *actionAddBranchBelow;
+	QAction *actionDeleteKeepChildren;
+	QAction *actionDeleteChildren;
+	QAction *actionImportAdd;
+	QAction *actionImportReplace;
+	QAction *actionSaveBranch;
+	QAction *actionSelectFirst;
+	QAction *actionSelectLast;
+	QAction *actionLoadImage;
 
 	QAction* actionFormatColor;
 	QAction* actionFormatPickColor;