diff -r dba9303a1a5c -r c810a11d11d9 mainwindow.cpp
--- a/mainwindow.cpp	Wed May 18 07:39:58 2005 +0000
+++ b/mainwindow.cpp	Mon May 23 15:28:20 2005 +0000
@@ -129,6 +129,7 @@
 extern QAction* actionSettingsAutoselectText;
 extern QAction* actionSettingsPasteNewHeading;
 extern QAction* actionSettingsUseDelKey;
+extern QAction* actionSettingsUseFlagGroups;
 
 extern QPopupMenu* branchContextMenu;
 extern QPopupMenu* branchAddContextMenu;
@@ -253,6 +254,7 @@
 	settings.writeEntry( "/vym/mapeditor/editmode/pastenewheading",actionSettingsPasteNewHeading->isOn() );
 	settings.writeEntry( "/vym/mapeditor/editmode/autoedit",actionSettingsAutoedit->isOn() );
 	settings.writeEntry( "/vym/mapeditor/editmode/useDelKey",actionSettingsUseDelKey->isOn() );
+	settings.writeEntry( "/vym/mapeditor/editmode/useFlagGroups",actionSettingsUseFlagGroups->isOn() );
 
 	QString s;
 	int maps=lastMaps.count();
@@ -517,8 +519,6 @@
 	actionEditHeading=a;
     a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_F2, this, "editHeading" );
     connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
-    a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_E, this, "editHeading" );
-    connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
 	a->setEnabled (false);
     a->addTo ( menu );
 	actionEditHeading=a;
@@ -834,6 +834,12 @@
 	a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/useDelKey",false) );
     a->addTo( menu );
 	actionSettingsUseDelKey=a;
+
+    a= new QAction( tr( "Use groups in flag toolbars" ), QPixmap(), tr( "Enable flag groups" ), 0, this, "flaggroups" );
+	a->setToggleAction(true);
+	a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/useFlagGroups",true) );
+    a->addTo( menu );
+	actionSettingsUseFlagGroups=a;
 }
 
 // Test Actions
@@ -964,7 +970,8 @@
 
     a = new QAction( tr( "Export as ASCII (still experimental)" ), QPixmap(), tr( "Export (ASCII)" ), 0, this, "exportASCII" );
     connect( a, SIGNAL( activated() ), this, SLOT( fileExportASCII() ) );
-    a->addTo( exportMenu );
+	// FIXME deactivated, doesn't work with QRichtext anyway
+	//   a->addTo( exportMenu );
 
 	a = new QAction( tr( "Export XML" ), QPixmap(), tr( "Export XML" ),  0, this, "exportXML" );
     connect( a, SIGNAL( activated() ), this, SLOT( fileExportXML() ) );
@@ -2307,8 +2314,12 @@
 void Main::helpDoc()
 {
 	QString docpath;
-	// default path in SUSE LINUX
-	docpath="/usr/share/doc/packages/vym/doc/vym.pdf";
+	#if defined(Q_OS_MACX)
+		docpath="./vym.app/Contents/vym.pdf";
+	#else
+		// default path in SUSE LINUX
+		docpath="/usr/share/doc/packages/vym/doc/vym.pdf";
+	#endif
 
 	if (!QFile (docpath).exists() )
 	{