diff -r 382a444f5b0c -r a6931cd6309a vymview.cpp
--- a/vymview.cpp	Thu May 14 12:42:58 2009 +0000
+++ b/vymview.cpp	Fri May 15 15:22:15 2009 +0000
@@ -6,6 +6,7 @@
 #include "linkablemapobj.h"
 #include "mainwindow.h"
 #include "mapeditor.h"
+#include "treeeditor.h"
 
 extern Main *mainWindow;
 
@@ -15,13 +16,13 @@
 	model=m;
 
 	// Create TreeView
-	treeview=new QTreeView;
-	treeview->setModel ((QAbstractItemModel*)model);
-	//treeview->setMinimumWidth (50);
+	treeEditor=new TreeEditor (model);
+	treeEditor->setModel ((QAbstractItemModel*)model);
+	//treeEditor->setMinimumWidth (50);
 
-	treeview->setColumnWidth (0,350);
+	treeEditor->setColumnWidth (0,350);
 
-	selModel=treeview->selectionModel();
+	selModel=treeEditor->selectionModel();
 	model->setSelectionModel (selModel);
 	connect (
 		selModel, SIGNAL (selectionChanged(const QItemSelection &, const QItemSelection &)), 
@@ -62,11 +63,10 @@
 		this, SLOT (showSelection() ) );
 		
 
-	//mapEditor->viewport()->setFocus();	//FIXmapEditor-3 needed?
 	mapEditor->setAntiAlias (mainWindow->isAliased());
 	mapEditor->setSmoothPixmap(mainWindow->hasSmoothPixmapTransform());
 
-	addWidget (treeview);
+	addWidget (treeEditor);
 	addWidget (mapEditor);
 
 	// Set geometry
@@ -76,12 +76,17 @@
 	setSizes(widths);
 }
 
+void VymView::initFocus()
+{
+	mapEditor->setFocus();
+}
+
 QItemSelectionModel* VymView::selectionModel() 
 {
-	if (treeview) 
+	if (treeEditor) 
 		return selModel;
 	else 
-		std::cout <<"VymView::selectionModel: hey, no treeview so far???\n";
+		std::cout <<"VymView::selectionModel: hey, no treeEditor so far???\n";
 	return NULL;
 }
 
@@ -104,12 +109,12 @@
 
 void VymView::expandAll()
 {
-	treeview->expandAll();
+	treeEditor->expandAll();
 }
 
 void VymView::showSelection()
 {
-	treeview->scrollTo(
+	treeEditor->scrollTo(
 		model->getSelectedIndex(), 
 		//QAbstractItemView::PositionAtCenter   
 		QAbstractItemView::EnsureVisible