diff -r dba9303a1a5c -r c810a11d11d9 mapeditor.cpp
--- a/mapeditor.cpp	Wed May 18 07:39:58 2005 +0000
+++ b/mapeditor.cpp	Mon May 23 15:28:20 2005 +0000
@@ -121,6 +121,7 @@
 extern QAction *actionSettingsAutoselectHeading;
 extern QAction *actionSettingsAutoselectText;
 extern QAction *actionSettingsPasteNewHeading;
+extern QAction *actionSettingsUseFlagGroups;
 
 extern QPopupMenu *branchContextMenu;
 extern QPopupMenu *branchLinksContextMenu;
@@ -193,22 +194,26 @@
 
 		FlagObj *fo = new FlagObj (mapCanvas);
 		fo->load(QPixmap(flag_exclamationmark_xpm));
-		fo->setName("exclamationmark");
+		fo->setName ("exclamationmark");
+		fo->setGroup("standard-mark");
 		fo->setToolTip(tr("Take care!","Standardflag"));
 		standardFlagsDefault->addFlag (fo);	// makes deep copy
 		
 		fo->load(QPixmap(flag_questionmark_xpm));
 		fo->setName("questionmark");
+		fo->setGroup("standard-mark");
 		fo->setToolTip(tr("Really?","Standardflag"));
 		standardFlagsDefault->addFlag (fo);	
 
 		fo->load(QPixmap(flag_hook_green_xpm));
 		fo->setName("hook-green");
+		fo->setGroup("standard-hook");
 		fo->setToolTip(tr("ok!","Standardflag"));
 		standardFlagsDefault->addFlag (fo);	
 
 		fo->load(QPixmap(flag_cross_red_xpm));
 		fo->setName("cross-red");
+		fo->setGroup("standard-hook");
 		fo->setToolTip(tr("Not ok!","Standardflag"));
 		standardFlagsDefault->addFlag (fo);	
 
@@ -219,11 +224,13 @@
 
 		fo->load(QPixmap(flag_smiley_good_xpm));
 		fo->setName("smiley-good");
+		fo->setGroup("standard-smiley");
 		fo->setToolTip(tr("Good","Standardflag"));
 		standardFlagsDefault->addFlag (fo);	
 
 		fo->load(QPixmap(flag_smiley_sad_xpm));
 		fo->setName("smiley-sad");
+		fo->setGroup("standard-smiley");
 		fo->setToolTip(tr("Bad","Standardflag"));
 		standardFlagsDefault->addFlag (fo);	
 
@@ -239,21 +246,26 @@
 
 		fo->load(QPixmap(flag_arrow_up_xpm));
 		fo->setName("arrow-up");
+		fo->setGroup("standard-arrow");
 		fo->setToolTip(tr("Important","Standardflag"));
 		standardFlagsDefault->addFlag (fo);	
 
 		fo->load(QPixmap(flag_arrow_down_xpm));
 		fo->setName("arrow-down");
+		fo->setGroup("standard-arrow");
 		fo->setToolTip(tr("Unimportant","Standardflag"));
 		standardFlagsDefault->addFlag (fo);	
 
 		fo->load(QPixmap(flag_thumb_up_xpm));
 		fo->setName("thumb-up");
+		fo->setGroup("standard-thumb");
 		fo->setToolTip(tr("I like this","Standardflag"));
 		standardFlagsDefault->addFlag (fo);	
 
 		fo->load(QPixmap(flag_thumb_down_xpm));
 		fo->setName("thumb-down");
+		fo->setGroup("standard-thumb");
+		fo->setToolTip(tr("I like this","Standardflag"));
 		fo->setToolTip(tr("I do not like this","Standardflag"));
 		standardFlagsDefault->addFlag (fo);	
 		
@@ -549,7 +561,6 @@
 
 	if (writeflags)
 		standardFlagsDefault->saveToDir (tmpdir+"/flags/","",writeflags);
-	
 	return s;
 }
 
@@ -1996,7 +2007,7 @@
 	{
 		setChanged();
 		saveState(PartOfMap,selection);	
-		((BranchObj*)(selection))->toggleStandardFlag (f);
+		((BranchObj*)(selection))->toggleStandardFlag (f,actionSettingsUseFlagGroups);
 	}	
 }
 
@@ -2235,6 +2246,7 @@
 	uint b=0;
 	uint f=0;
 	uint n=0;
+	uint xl=0;
 	BranchObj *bo;
 	bo=mapCenter->first();
 	while (bo) 
@@ -2242,9 +2254,11 @@
 		if (!bo->getNote().isEmpty() ) n++;
 		f+= bo->countFloatImages();
 		b++;
+		xl+=bo->countXLinks();
 		bo=bo->next();
 	}
     stats+=QString ("%1 branches\n").arg (b-1,6);
+    stats+=QString ("%1 xLinks \n").arg (xl-1,6);
     stats+=QString ("%1 notes\n").arg (n,6);
     stats+=QString ("%1 images\n").arg (f,6);
 	dia.setStats (stats);
@@ -2346,7 +2360,10 @@
 
 			actionEditCopy->setEnabled (true);	
 			actionEditCut->setEnabled (true);	
-			actionEditPaste->setEnabled (true);	
+			if (clipboardME->getMapCenter()->countBranches()>0)
+				actionEditPaste->setEnabled (true);	
+			else	
+				actionEditPaste->setEnabled (false);	
 			for (a=actionListBranches.first();a;a=actionListBranches.next())
 				a->setEnabled(true);
 			actionEditDelete->setEnabled (true);
@@ -2668,6 +2685,7 @@
 					QMessageBox::critical (0,tr("Critical Import Error"),tr("Cannot find the directory"));
 				else 
 				{
+					// Recursively add subdirs
 					importDir (bo,d);
 					d.cdUp();
 				}
@@ -2685,6 +2703,9 @@
 			bo=dst->getLastBranch();
 			bo->setHeading (fi->fileName() );
 			bo->setColor (QColor("black"),false);
+			if (fi->fileName().right(4) == ".vym" )
+				bo->setVymLink (fi->filePath());
+
 			++itfile;
 		}	
 	}