diff -r 497f19b3c1fe -r 16d63fc9ae42 mainwindow.cpp
--- a/mainwindow.cpp	Tue Nov 06 13:54:41 2007 +0000
+++ b/mainwindow.cpp	Thu Nov 08 15:28:03 2007 +0000
@@ -2773,6 +2773,88 @@
 	} // currentMapEditor()	
 }
 
+void Main::editAttributeFinished()
+{
+	// only called from editHeading(), so there is a currentME
+
+	/*
+	MapEditor *me=currentMapEditor();
+	if (me)
+	{
+		me->setStateEditHeading (false);
+		QPoint p;	//Not used here, only to find out pos of branch
+		bool ok;
+		QString s=me->getHeading(ok,p);
+
+#if defined(Q_OS_MACX)
+#else
+		if (ok && s!=lineedit->text())
+			me->setHeading(lineedit->text());
+			
+		lineedit->releaseKeyboard();
+		lineedit->hide();
+		setFocus();
+#endif	
+		if (!actionSettingsAutoSelectNewBranch->isOn() && 
+			!prevSelection.isEmpty()) 
+			me->select(prevSelection);
+		prevSelection="";
+	}
+	*/
+}
+
+void Main::editAttribute()
+{
+	/*
+	if (currentMapEditor())
+	{
+		MapEditor *me=currentMapEditor();
+		QString oldSel=me->getSelectString();
+
+		if (lineedit->isVisible())
+			editAttributeFinished();
+		else
+		{
+			bool ok;
+			QPoint p;
+			QString s=me->getHeading(ok,p);
+
+			if (ok)
+			{
+				me->setStateEditHeading (true);
+#if defined(Q_OS_MACX)
+				p=me->mapToGlobal (p);
+				QDialog *d =new QDialog(NULL);
+				QLineEdit *le=new QLineEdit (d);
+				d->setWindowFlags (Qt::FramelessWindowHint);
+				d->setGeometry(p.x(),p.y(),230,25);
+				le->resize (d->width()-10,d->height());
+				le->setText (s);
+				le->selectAll();
+				connect (le, SIGNAL (returnPressed()), d, SLOT (accept()));
+				d->activateWindow();
+				d->exec();
+				me->setHeading (le->text());
+				delete (le);
+				delete (d);
+				editHeadingFinished();
+#else
+				p=me->mapTo (this,p);
+				lineedit->setGeometry(p.x(),p.y(),230,25);
+				lineedit->setText(s);
+				lineedit->setCursorPosition(1);
+				lineedit->selectAll();
+				lineedit->show();
+				lineedit->grabKeyboard();
+				lineedit->setFocus();
+#endif
+			}
+		} 
+	} // currentMapEditor()	
+
+	*/
+}
+
 void Main::openVymLinks(const QStringList &vl)
 {
 	for (int j=0; j<vl.size(); j++)
@@ -3646,7 +3728,8 @@
 void Main::testFunction1()
 {
 	if (!currentMapEditor()) return;
-	currentMapEditor()->testFunction1();
+	//currentMapEditor()->testFunction1();
+	editAttribute();
 }
 
 void Main::testFunction2()