diff -r 192e1392ba6a -r 12958f987bcf branchpropwindow.cpp
--- a/branchpropwindow.cpp	Wed Jul 16 10:44:44 2008 +0000
+++ b/branchpropwindow.cpp	Wed Jul 16 10:46:14 2008 +0000
@@ -16,7 +16,7 @@
 	setCaption(vymName +" - " +tr ("Property Editor","Window caption"));
 
 	branch=NULL;
-	mapEditor=NULL;
+	model=NULL;
 
 	ui.tabWidget->setEnabled(false);
 
@@ -125,7 +125,8 @@
 		// Attributes
 		attributeModel->removeRows(0, attributeModel->rowCount(), QModelIndex());
 
-		// FIXME some samples for testing
+/*
+		// FIXME some samples for attribute testing
 		QStringList attrTypes=mapEditor->attributeTable()->getTypes();
 		for (int i=0; i<attrTypes.count()-1;i++)
 		{
@@ -141,7 +142,7 @@
 		// Initialize Delegate
 		delegate.setAttributeTable (mapEditor->attributeTable());
 		ui.attributeTableView->setItemDelegate (&delegate);
-
+*/
 
 		// Finally activate signals
 		connectSignals();
@@ -151,11 +152,11 @@
 	}
 }
 
-void BranchPropertyWindow::setMapEditor (MapEditor *me)
+void BranchPropertyWindow::setModel (VymModel *m)
 {
-	mapEditor=me;
-	if (mapEditor) 
-		setBranch (mapEditor->getSelectedBranch() );
+	model=m;
+	if (model) 
+		setBranch (model->getSelectedBranch() );
 	else
 		ui.tabWidget->setEnabled (false);
 		
@@ -163,17 +164,17 @@
 
 void BranchPropertyWindow::frameTypeChanged (int i)
 {
-	if (mapEditor)
+	if (model)
 	{
 		switch (i)
 		{
-			case 0: mapEditor->setFrameType (FrameObj::NoFrame); break;
+			case 0: model->setFrameType (FrameObj::NoFrame); break;
 			case 1: 
-				mapEditor->setFrameType (FrameObj::Rectangle); 
+				model->setFrameType (FrameObj::Rectangle); 
 				break;
 			case 2: 
-				mapEditor->setFrameType (FrameObj::Ellipse); 
-				mapEditor->setFramePadding (5); 
+				model->setFrameType (FrameObj::Ellipse); 
+				model->setFramePadding (5); 
 				break;
 		}
 		setBranch (branch);
@@ -182,54 +183,54 @@
 
 void BranchPropertyWindow::framePenColorClicked()
 {
-	if (mapEditor) 
+	if (model) 
 	{	
 		QColor col = QColorDialog::getColor( penColor, this );
 		if ( col.isValid() ) 
 		{
 			penColor=col;
-			mapEditor->setFramePenColor (penColor);
+			model->setFramePenColor (penColor);
 		}	
 	}
 }
 
 void BranchPropertyWindow::frameBrushColorClicked()
 {
-	if (mapEditor) 
+	if (model) 
 	{
 		QColor col = QColorDialog::getColor( brushColor, this );
 		if ( col.isValid() ) 
 		{
 			brushColor=col;
-			mapEditor->setFrameBrushColor (brushColor);
+			model->setFrameBrushColor (brushColor);
 		}	
 	}	
 }
 
 void BranchPropertyWindow::framePaddingChanged(int i)
 {
-	if (mapEditor) mapEditor->setFramePadding (i);
+	if (model) model->setFramePadding (i);
 }
 
 void BranchPropertyWindow::frameBorderWidthChanged(int i)
 {
-	if (mapEditor) mapEditor->setFrameBorderWidth(i);
+	if (model) model->setFrameBorderWidth(i);
 }
 
 void BranchPropertyWindow::linkHideUnselectedChanged (int i)
 {
 	if (!branch) return;
-	mapEditor->setHideLinkUnselected(i);
+	model->setHideLinkUnselected(i);
 }
 
 void BranchPropertyWindow::incImgVerChanged (int  i)
 {
-	if (mapEditor) mapEditor->setIncludeImagesVer (i);
+	if (model) model->setIncludeImagesVer (i);
 }
 
 void BranchPropertyWindow::incImgHorChanged (int  i)
 {
-	if (mapEditor) mapEditor->setIncludeImagesHor (i);
+	if (model) model->setIncludeImagesHor (i);
 }
 
 void BranchPropertyWindow::closeEvent( QCloseEvent* ce )
@@ -262,7 +263,7 @@
 
 void BranchPropertyWindow::deleteAttributeClicked()
 {
-	cout << "BPW::delete\n";
+	//FIXME cout << "BPW::delete\n";
 }
 
 void BranchPropertyWindow::connectSignals()