1.1 --- a/mapeditor.cpp	Wed Feb 10 13:48:42 2010 +0000
     1.2 +++ b/mapeditor.cpp	Fri Feb 19 13:47:03 2010 +0000
     1.3 @@ -1,8 +1,6 @@
     1.4  #include "mapeditor.h"
     1.5  
     1.6 -#include <iostream>
     1.7 -#include <cstdlib>
     1.8 -#include <typeinfo>
     1.9 +#include <iostream>	
    1.10  
    1.11  #include <QObject>
    1.12  
    1.13 @@ -89,13 +87,13 @@
    1.14      a = new QAction( "Select left branch", this);
    1.15  	a->setShortcut (Qt::Key_Left );
    1.16  //	a->setShortcutContext (Qt::WindowShortcut);
    1.17 -	a->setShortcutContext (Qt::WidgetWithChildrenShortcut);
    1.18 +//	a->setShortcutContext (Qt::WidgetWithChildrenShortcut);
    1.19  	addAction (a);
    1.20      connect( a, SIGNAL( triggered() ), this, SLOT( cursorLeft() ) );
    1.21  
    1.22      a = new QAction( "Select child branch", this);
    1.23  	a->setShortcut (Qt::Key_Right);
    1.24 -	a->setShortcutContext (Qt::WidgetWithChildrenShortcut);
    1.25 +//	a->setShortcutContext (Qt::WidgetWithChildrenShortcut);
    1.26  	addAction (a);
    1.27      connect( a, SIGNAL( triggered() ), this, SLOT( cursorRight() ) );
    1.28  
    1.29 @@ -940,7 +938,9 @@
    1.30  	editingHeading=false;
    1.31  	lineEdit->releaseKeyboard();
    1.32  	lineEdit->clearFocus();
    1.33 -	model->setHeading (lineEdit->text() );
    1.34 +	QString s=lineEdit->text();
    1.35 +	s.replace (QRegExp ("\\n")," ");	// Don't paste newline chars
    1.36 +	model->setHeading (s);
    1.37  	model->setSelectionBlocked(false);
    1.38  	delete (lineEdit);
    1.39  
    1.40 @@ -1055,7 +1055,7 @@
    1.41  		{
    1.42  			// systemFlag clicked
    1.43  			model->select (lmo);	
    1.44 -			if (foname=="system-url") 
    1.45 +			if (foname.contains("system-url")) 
    1.46  			{
    1.47  				if (e->state() & Qt::ControlModifier)
    1.48  					mainWindow->editOpenURLTab();