diff -r bb94eec7c8f3 -r 0e1aeb21cb78 main.cpp
--- a/main.cpp	Thu Sep 21 13:48:05 2006 +0000
+++ b/main.cpp	Mon Oct 16 12:42:54 2006 +0000
@@ -2,11 +2,9 @@
 #include <QPixmap>
 #include <QTranslator>
 #include <QDir>
-#include <q3ptrlist.h>
 #include <QTextCodec>
 #include <q3network.h>
-#include <QMenu>
-#include <QActionGroup>
+//#include <QActionGroup>
 
 #include "settings.h"
 #include "options.h"
@@ -29,98 +27,6 @@
 FlagRowObj *systemFlagsDefault;	// used to copy from in LinkableMapObj
 FlagRowObj *standardFlagsDefault;
 
-// Lists of actions
-// (QActionGroup could not be "enabled")
-Q3PtrList <QAction> actionListBranches;
-
-// Actions which change sometimes
-QAction *actionFileSave;
-QAction *actionFilePrint;
-QAction *actionEditUndo;
-QAction *actionEditRedo;
-QAction *actionEditCopy;
-QAction *actionEditCut;
-QAction *actionEditPaste;
-QAction *actionEditMoveUp;
-QAction *actionEditMoveDown;
-QAction *actionEditToggleScroll;
-QAction *actionEditOpenURL;
-QAction *actionEditOpenURLTab;
-QAction *actionEditOpenMultipleURLTabs;
-QAction *actionEditURL;
-QAction *actionEditHeading2URL;
-QAction *actionEditBugzilla2URL;
-QAction *actionEditFATE2URL;
-QAction *actionEditOpenVymLink;
-QAction *actionEditOpenMultipleVymLinks;
-QAction *actionEditVymLink;
-QAction *actionEditToggleHideExport;
-QAction *actionEditDeleteVymLink;
-QAction *actionEditMapInfo;
-QAction *actionEditHeading;
-QAction *actionEditDelete;
-QAction *actionEditAddBranch;
-QAction *actionEditAddBranchHere;
-QAction *actionEditAddBranchAbove;
-QAction *actionEditAddBranchBelow;
-QAction *actionEditRemoveBranchKeepChilds;
-QAction *actionEditRemoveChilds;
-QAction *actionEditImportAdd;
-QAction *actionEditImportReplace;
-QAction *actionEditSaveBranch;
-QAction *actionEditSelectFirst;
-QAction *actionEditSelectLast;
-QAction *actionEditLoadImage;
-
-QAction *actionFormatColor;		
-QAction *actionFormatPickColor;		
-QAction *actionFormatColorBranch;
-QAction *actionFormatColorSubtree;
-QAction *actionFormatBackColor;
-QAction *actionFormatLinkColorHint;
-QAction *actionFormatLinkColor;		
-
-QActionGroup *actionGroupModModes;
-QAction *actionModModeColor;
-QAction *actionModModeLink;
-QAction *actionModModeCopy;
-
-QActionGroup *actionGroupFormatFrameTypes;
-QAction *actionFormatFrameNone;
-QAction *actionFormatFrameRectangle;
-
-QActionGroup *actionGroupFormatLinkStyles;
-QAction *actionFormatIncludeImagesVer;
-QAction *actionFormatIncludeImagesHor;
-QAction *actionFormatHideLinkUnselected;
-QAction *actionFormatLinkStyleLine;
-QAction *actionFormatLinkStyleParabel;
-QAction *actionFormatLinkStylePolyLine;
-QAction *actionFormatLinkStylePolyParabel;
-
-QAction *actionViewToggleNoteEditor;
-QAction *actionViewToggleHistoryWindow;
-
-QAction *actionSettingsAutoselectHeading;
-QAction *actionSettingsAutoselectText;
-QAction *actionSettingsAutoedit;
-QAction *actionSettingsUseDelKey;
-QAction *actionSettingsUseFlagGroups;
-QAction *actionSettingsUseHideExport;
-
-
-QMenu* branchContextMenu;
-QMenu* branchAddContextMenu;
-QMenu* branchRemoveContextMenu;
-QMenu* branchLinksContextMenu;
-QMenu* branchXLinksContextMenuEdit;
-QMenu* branchXLinksContextMenuFollow;
-QMenu* floatimageContextMenu;
-QMenu* canvasContextMenu;
-QMenu* fileLastMapsMenu;
-QMenu* fileImportMenu;
-QMenu* fileExportMenu;
-
 
 Settings settings ("InSilmaril","vym"); // Organization, Application name
 
@@ -177,13 +83,18 @@
 	} else
 	// ok, let's find my way on my own
 	{
-		vymBaseDir.setPath ("/usr/share/vym");
-		if (!vymBaseDir.exists())
-		{
-			vymBaseDir.setPath ("/usr/local/share/vym");
+		#if defined (Q_OS_MACX)
+			vymBaseDir.setPath(vymBaseDir.currentDirPath() +"/vym.app/Contents");
+
+		#else
+			vymBaseDir.setPath ("/usr/share/vym");
 			if (!vymBaseDir.exists())
-				vymBaseDir.setPath(vymBaseDir.currentDirPath() );
-		}		
+			{
+				vymBaseDir.setPath ("/usr/local/share/vym");
+				if (!vymBaseDir.exists())
+					vymBaseDir.setPath(vymBaseDir.currentDirPath() );
+			}		
+		#endif
 	}
 
 	iconPath=vymBaseDir.path()+"/icons/";