diff -r 39aa64b24375 -r d42881c25fb6 mainwindow.cpp
--- a/mainwindow.cpp	Mon Oct 30 12:39:37 2006 +0000
+++ b/mainwindow.cpp	Thu Nov 16 10:07:11 2006 +0000
@@ -1447,8 +1447,6 @@
 		branchAddContextMenu->addAction ( actionEditAddBranchAbove);
 		branchAddContextMenu->addAction ( actionEditAddBranchBelow );
 		branchAddContextMenu->addSeparator();	
-		branchAddContextMenu->addAction ( actionEditLoadImage);
-		branchAddContextMenu->addSeparator();	
 		branchAddContextMenu->addAction ( actionEditImportAdd );
 		branchAddContextMenu->addAction ( actionEditImportReplace );
 
@@ -1465,11 +1463,12 @@
 	branchContextMenu->addSeparator();	
 	branchContextMenu->addAction ( actionFormatFrameNone );
 	branchContextMenu->addAction ( actionFormatFrameRectangle);
+	branchContextMenu->addAction ( actionFormatHideLinkUnselected );
 
 	branchContextMenu->addSeparator();	
+	branchContextMenu->addAction ( actionEditLoadImage);
 	branchContextMenu->addAction ( actionFormatIncludeImagesVer );
 	branchContextMenu->addAction ( actionFormatIncludeImagesHor );
-	branchContextMenu->addAction ( actionFormatHideLinkUnselected );
 
 	// Submenu for Links (URLs, vymLinks)
 	branchLinksContextMenu =new QMenu (this);
@@ -3003,42 +3002,42 @@
 void Main::formatLinkStyleLine()
 {
 	if (currentMapEditor())
-		currentMapEditor()->setLinkStyle(StyleLine);
+		currentMapEditor()->setMapLinkStyle("StyleLine");
 }
 
 void Main::formatLinkStyleParabel()
 {
 	if (currentMapEditor())
-		currentMapEditor()->setLinkStyle(StyleParabel);
+		currentMapEditor()->setMapLinkStyle("StyleParabel");
 }
 
 void Main::formatLinkStylePolyLine()
 {
 	if (currentMapEditor())
-		currentMapEditor()->setLinkStyle(StylePolyLine);
+		currentMapEditor()->setMapLinkStyle("StylePolyLine");
 }
 
 void Main::formatLinkStylePolyParabel()
 {
 	if (currentMapEditor())
-		currentMapEditor()->setLinkStyle(StylePolyParabel);
+		currentMapEditor()->setMapLinkStyle("StylePolyParabel");
 }
 
 void Main::formatSelectBackColor()
 {
 	if (currentMapEditor())
-		currentMapEditor()->selectBackgroundColor();
+		currentMapEditor()->selectMapBackgroundColor();
 }
 
 void Main::formatSelectLinkColor()
 {
 	if (currentMapEditor())
-		currentMapEditor()->selectLinkColor();
+		currentMapEditor()->selectMapLinkColor();
 }
 
 void Main::formatToggleLinkColorHint()
 {
-	currentMapEditor()->toggleLinkColorHint();
+	currentMapEditor()->toggleMapLinkColorHint();
 }
 
 void Main::formatFrameNone()
@@ -3173,12 +3172,12 @@
 	actionViewToggleNoteEditor->setOn (textEditor->showWithMain());
 
 	QAction *a;
-	if (me->getLinkColorHint()==HeadingColor) 
+	if (me->getMapLinkColorHint()==HeadingColor) 
 		actionFormatLinkColorHint->setOn(true);
 	else	
 		actionFormatLinkColorHint->setOn(false);
 
-	switch (me->getLinkStyle())
+	switch (me->getMapLinkStyle())
 	{
 		case StyleLine: 
 			actionFormatLinkStyleLine->setOn(true);
@@ -3197,9 +3196,9 @@
 	}	
 
 	QPixmap pix( 16, 16 );
-    pix.fill( me->getBackgroundColor() );
+    pix.fill( me->getMapBackgroundColor() );
     actionFormatBackColor->setIconSet( pix );
-    pix.fill( me->getDefLinkColor() );
+    pix.fill( me->getMapDefLinkColor() );
     actionFormatLinkColor->setIconSet( pix );
 
 	actionFileSave->setEnabled( me->isUnsaved() );
@@ -3415,7 +3414,6 @@
 {
 	if (!currentMapEditor()) return;
 	currentMapEditor()->testFunction();
-	
 }
 
 void Main::testCommand()