1.1 --- a/mainwindow.cpp	Mon Oct 30 12:39:37 2006 +0000
     1.2 +++ b/mainwindow.cpp	Thu Nov 16 10:07:11 2006 +0000
     1.3 @@ -1447,8 +1447,6 @@
     1.4  		branchAddContextMenu->addAction ( actionEditAddBranchAbove);
     1.5  		branchAddContextMenu->addAction ( actionEditAddBranchBelow );
     1.6  		branchAddContextMenu->addSeparator();	
     1.7 -		branchAddContextMenu->addAction ( actionEditLoadImage);
     1.8 -		branchAddContextMenu->addSeparator();	
     1.9  		branchAddContextMenu->addAction ( actionEditImportAdd );
    1.10  		branchAddContextMenu->addAction ( actionEditImportReplace );
    1.11  
    1.12 @@ -1465,11 +1463,12 @@
    1.13  	branchContextMenu->addSeparator();	
    1.14  	branchContextMenu->addAction ( actionFormatFrameNone );
    1.15  	branchContextMenu->addAction ( actionFormatFrameRectangle);
    1.16 +	branchContextMenu->addAction ( actionFormatHideLinkUnselected );
    1.17  
    1.18  	branchContextMenu->addSeparator();	
    1.19 +	branchContextMenu->addAction ( actionEditLoadImage);
    1.20  	branchContextMenu->addAction ( actionFormatIncludeImagesVer );
    1.21  	branchContextMenu->addAction ( actionFormatIncludeImagesHor );
    1.22 -	branchContextMenu->addAction ( actionFormatHideLinkUnselected );
    1.23  
    1.24  	// Submenu for Links (URLs, vymLinks)
    1.25  	branchLinksContextMenu =new QMenu (this);
    1.26 @@ -3003,42 +3002,42 @@
    1.27  void Main::formatLinkStyleLine()
    1.28  {
    1.29  	if (currentMapEditor())
    1.30 -		currentMapEditor()->setLinkStyle(StyleLine);
    1.31 +		currentMapEditor()->setMapLinkStyle("StyleLine");
    1.32  }
    1.33  
    1.34  void Main::formatLinkStyleParabel()
    1.35  {
    1.36  	if (currentMapEditor())
    1.37 -		currentMapEditor()->setLinkStyle(StyleParabel);
    1.38 +		currentMapEditor()->setMapLinkStyle("StyleParabel");
    1.39  }
    1.40  
    1.41  void Main::formatLinkStylePolyLine()
    1.42  {
    1.43  	if (currentMapEditor())
    1.44 -		currentMapEditor()->setLinkStyle(StylePolyLine);
    1.45 +		currentMapEditor()->setMapLinkStyle("StylePolyLine");
    1.46  }
    1.47  
    1.48  void Main::formatLinkStylePolyParabel()
    1.49  {
    1.50  	if (currentMapEditor())
    1.51 -		currentMapEditor()->setLinkStyle(StylePolyParabel);
    1.52 +		currentMapEditor()->setMapLinkStyle("StylePolyParabel");
    1.53  }
    1.54  
    1.55  void Main::formatSelectBackColor()
    1.56  {
    1.57  	if (currentMapEditor())
    1.58 -		currentMapEditor()->selectBackgroundColor();
    1.59 +		currentMapEditor()->selectMapBackgroundColor();
    1.60  }
    1.61  
    1.62  void Main::formatSelectLinkColor()
    1.63  {
    1.64  	if (currentMapEditor())
    1.65 -		currentMapEditor()->selectLinkColor();
    1.66 +		currentMapEditor()->selectMapLinkColor();
    1.67  }
    1.68  
    1.69  void Main::formatToggleLinkColorHint()
    1.70  {
    1.71 -	currentMapEditor()->toggleLinkColorHint();
    1.72 +	currentMapEditor()->toggleMapLinkColorHint();
    1.73  }
    1.74  
    1.75  void Main::formatFrameNone()
    1.76 @@ -3173,12 +3172,12 @@
    1.77  	actionViewToggleNoteEditor->setOn (textEditor->showWithMain());
    1.78  
    1.79  	QAction *a;
    1.80 -	if (me->getLinkColorHint()==HeadingColor) 
    1.81 +	if (me->getMapLinkColorHint()==HeadingColor) 
    1.82  		actionFormatLinkColorHint->setOn(true);
    1.83  	else	
    1.84  		actionFormatLinkColorHint->setOn(false);
    1.85  
    1.86 -	switch (me->getLinkStyle())
    1.87 +	switch (me->getMapLinkStyle())
    1.88  	{
    1.89  		case StyleLine: 
    1.90  			actionFormatLinkStyleLine->setOn(true);
    1.91 @@ -3197,9 +3196,9 @@
    1.92  	}	
    1.93  
    1.94  	QPixmap pix( 16, 16 );
    1.95 -    pix.fill( me->getBackgroundColor() );
    1.96 +    pix.fill( me->getMapBackgroundColor() );
    1.97      actionFormatBackColor->setIconSet( pix );
    1.98 -    pix.fill( me->getDefLinkColor() );
    1.99 +    pix.fill( me->getMapDefLinkColor() );
   1.100      actionFormatLinkColor->setIconSet( pix );
   1.101  
   1.102  	actionFileSave->setEnabled( me->isUnsaved() );
   1.103 @@ -3415,7 +3414,6 @@
   1.104  {
   1.105  	if (!currentMapEditor()) return;
   1.106  	currentMapEditor()->testFunction();
   1.107 -	
   1.108  }
   1.109  
   1.110  void Main::testCommand()