# 
# 
# patch "src/model/Workspace.cpp"
#  from [43e09bc3a0cf24607b0c2d47b433944593a091d6]
#    to [8708b7b6bbe73ce4452a7e540cc2af5afa2fad93]
# 
# patch "src/model/WorkspaceItem.cpp"
#  from [556f473be6d28710e2aaf00ed0a5e75df251bd57]
#    to [a10732475af6c33e0c26d3074b8fd0ec92a93e5f]
# 
# patch "src/view/Guitone.cpp"
#  from [ba0a4ba9d3fe4844028192813ad7d3a8b5b0067e]
#    to [1763590b55f11e703a1d6ae2e4216ca8fbdd508c]
# 
# patch "src/view/WorkspaceView.cpp"
#  from [131c7316865cddb626c29ec289f650cf24ed55b8]
#    to [5cf0e91b0d4a649bae61028f6fa36b0b233b9684]
# 
============================================================
--- src/model/Workspace.cpp	43e09bc3a0cf24607b0c2d47b433944593a091d6
+++ src/model/Workspace.cpp	8708b7b6bbe73ce4452a7e540cc2af5afa2fad93
@@ -196,9 +196,9 @@
 
     rootItem->setChildren(buildTreeRecursive(tempItems, NULL));
     
-    // send a signal to update the whole view
-    QModelIndex startIndex = this->createIndex(0,0, rootItem);
-    emit dataChanged(startIndex, startIndex);
+    // reset the model to repaint the view completly
+    // (all QModelIndexes are discarded through that, e.g. selections!)
+    this->reset();
 }
 
 QList<WorkspaceItem*> Workspace::buildTreeRecursive(QList<WorkspaceItem*> items, WorkspaceItem* parentItem)
============================================================
--- src/model/WorkspaceItem.cpp	556f473be6d28710e2aaf00ed0a5e75df251bd57
+++ src/model/WorkspaceItem.cpp	a10732475af6c33e0c26d3074b8fd0ec92a93e5f
@@ -111,7 +111,7 @@
 {
     // there are currently three columns per item
     // 1: icon, 2: item name, 3: item status
-    return 3;
+    return 2;
 }
 
 QVariant WorkspaceItem::data(int column) const
@@ -121,17 +121,16 @@
     {
         switch (column)
         {
-            case 1: return QVariant(QString(tr("File")));
-            case 2: return QVariant(QString(tr("Status")));
+            case 0: return QVariant(QString(tr("File")));
+            case 1: return QVariant(QString(tr("Status")));
             default: return QVariant();
         }
     }
         
     switch (column)
     {
-        // Qt::DecorationRole for icon display (col 0)
-        case 1: return QVariant(getFilename());
-        case 2: return QVariant(statusString());
+        case 0: return QVariant(getFilename());
+        case 1: return QVariant(statusString());
         default: return QVariant();
     }
 }
============================================================
--- src/view/Guitone.cpp	ba0a4ba9d3fe4844028192813ad7d3a8b5b0067e
+++ src/view/Guitone.cpp	1763590b55f11e703a1d6ae2e4216ca8fbdd508c
@@ -51,7 +51,7 @@
 	//
     // Toolbar
     //
-	toolBar = new QToolBar(this);
+    toolBar = new QToolBar(this);
     toolBar->setAllowedAreas(Qt::TopToolBarArea | Qt::BottomToolBarArea);
     addToolBar(toolBar);	
 	
@@ -68,7 +68,6 @@
     listView = new WorkspaceView(mainSplitter, WorkspaceView::FileList);
     listView->setModel(myWorkspace);
     listView->setSelectionModel(selection);    
-
 /*
     treeView->setRootIndex(mySandbox->index(0,0));
     listView->setRootIndex(mySandbox->index(0,0));
@@ -88,9 +87,9 @@
     */	
     setCentralWidget(mainSplitter);
 
-    resize( 450, 600 );
+    resize(450, 600);
 
-    statusBar()->message(tr("Ready"), 2000 );
+    statusBar()->message(tr("Ready"), 2000);
 }
 
 
============================================================
--- src/view/WorkspaceView.cpp	131c7316865cddb626c29ec289f650cf24ed55b8
+++ src/view/WorkspaceView.cpp	5cf0e91b0d4a649bae61028f6fa36b0b233b9684
@@ -8,6 +8,7 @@
 WorkspaceView::WorkspaceView(QWidget* parent, int type)
 	: QTreeView(parent)
 {
+    //setRootIsDecorated(true);
 /*  
 	rootItem  = 0;
 	
@@ -38,6 +39,7 @@
 }
 
 WorkspaceView::~WorkspaceView() {}
+
 /*
 void WorkspaceView::display(std::list<WorkspaceItem*>* items)
 {