1.1 --- a/mainwindow.cpp	Sat Apr 09 22:50:08 2005 +0000
     1.2 +++ b/mainwindow.cpp	Thu Apr 21 19:14:38 2005 +0000
     1.3 @@ -16,7 +16,7 @@
     1.4  
     1.5  
     1.6  #include <iostream>
     1.7 -#include <stdlib.h>
     1.8 +#include <cstdlib>
     1.9  #include <typeinfo>
    1.10  
    1.11  #include "version.h"
    1.12 @@ -842,9 +842,9 @@
    1.13  	branchContextMenu->insertSeparator();	
    1.14  	actionEditLoadImage->addTo( branchContextMenu );
    1.15  	branchContextMenu->insertSeparator();	
    1.16 -	actionEditCopy->addTo( branchContextMenu );
    1.17 -	actionEditCut->addTo( branchContextMenu );
    1.18 -	actionEditPaste->addTo( branchContextMenu );
    1.19 +	//actionEditCopy->addTo( branchContextMenu );
    1.20 +	//actionEditCut->addTo( branchContextMenu );
    1.21 +	//actionEditPaste->addTo( branchContextMenu );
    1.22  	branchContextMenu->insertSeparator();	
    1.23  	actionGroupFormatFrameTypes->addTo( branchContextMenu );
    1.24  
    1.25 @@ -852,12 +852,12 @@
    1.26  	// This will be populated "on demand" in MapEditor::updateActions
    1.27  	branchContextMenu->insertSeparator();	
    1.28  	branchLinksContextMenu =new QPopupMenu (this);
    1.29 -	branchContextMenu->insertItem (tr("Goto Link"),branchLinksContextMenu);
    1.30 -	connect( branchLinksContextMenu, SIGNAL( activated(int) ), this, SLOT( editFollowLink(int ) ) );
    1.31 +	branchContextMenu->insertItem (tr("Goto XLink"),branchLinksContextMenu);
    1.32 +	connect( branchLinksContextMenu, SIGNAL( activated(int) ), this, SLOT( editFollowXLink(int ) ) );
    1.33  	
    1.34  	branchLinksContextMenuDup =new QPopupMenu (this);
    1.35 -	branchContextMenu->insertItem (tr("Edit Link"),branchLinksContextMenuDup);
    1.36 -	connect( branchLinksContextMenuDup, SIGNAL( activated(int) ), this, SLOT( editEditLink(int ) ) );
    1.37 +	branchContextMenu->insertItem (tr("Edit XLink"),branchLinksContextMenuDup);
    1.38 +	connect( branchLinksContextMenuDup, SIGNAL( activated(int) ), this, SLOT( editEditXLink(int ) ) );
    1.39  
    1.40  	// Context menu for floatimage
    1.41  	floatimageContextMenu =new QPopupMenu (this);
    1.42 @@ -1135,8 +1135,7 @@
    1.43  		if (!QFile(fn).exists() )
    1.44  		{
    1.45  			QMessageBox mb( "VYM",
    1.46 -				tr("The map") + fn + 
    1.47 -				tr(" does not exist.\n Do you want to create a new one?"),
    1.48 +				tr("This map does not exist:\n  ")+fn+tr("\nDo you want to create a new one?"),
    1.49  				QMessageBox::Question,
    1.50  				QMessageBox::Yes ,
    1.51  				QMessageBox::Cancel | QMessageBox::Default,
    1.52 @@ -1994,16 +1993,16 @@
    1.53  		currentMapEditor()->toggleFloatExport();
    1.54  }
    1.55  
    1.56 -void Main::editFollowLink(int item)
    1.57 +void Main::editFollowXLink(int item)
    1.58  {
    1.59  	if (currentMapEditor())
    1.60 -		currentMapEditor()->followLink(branchLinksContextMenu->indexOf(item));
    1.61 +		currentMapEditor()->followXLink(branchLinksContextMenu->indexOf(item));
    1.62  }
    1.63  
    1.64 -void Main::editEditLink(int item)
    1.65 +void Main::editEditXLink(int item)
    1.66  {
    1.67  	if (currentMapEditor())
    1.68 -		currentMapEditor()->editLink(branchLinksContextMenuDup->indexOf(item));
    1.69 +		currentMapEditor()->editXLink(branchLinksContextMenuDup->indexOf(item));
    1.70  }
    1.71  
    1.72  void Main::formatSelectColor()