#
#
# patch "guitone/res/i18n/guitone_de.ts"
#  from [7f11c943fc9ed5ebb69a7ba9586b94c2e53892d2]
#    to [065107c0776d4e4c784912d23dd9995b29b561bc]
#
# patch "guitone/src/model/InventoryProxyModel.cpp"
#  from [0a6bcce2838841f907aeda03006b9f8d13a2c0b7]
#    to [305b276fd10e5d3b20bcd9fe304027c9f5a82d29]
#
# patch "guitone/src/view/InventoryView.cpp"
#  from [e59f8f435f3595d675129944b2806aceaef744f9]
#    to [d87d55be55ef53fce73884656ba084c59aba857a]
#
# patch "guitone/src/view/InventoryView.h"
#  from [b9bd6ab533371f623c4a08e8abcbeeb5b4bb3b4f]
#    to [2f42802112e608d07157a625250d17b31640fa42]
#
============================================================
--- guitone/res/i18n/guitone_de.ts	7f11c943fc9ed5ebb69a7ba9586b94c2e53892d2
+++ guitone/res/i18n/guitone_de.ts	065107c0776d4e4c784912d23dd9995b29b561bc
@@ -428,127 +428,127 @@
 <context>
     <name>InventoryView</name>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="261"/>
+        <location filename="../../src/view/InventoryView.cpp" line="268"/>
         <source>&amp;Add</source>
         <translation>&amp;Hinzufügen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="262"/>
+        <location filename="../../src/view/InventoryView.cpp" line="269"/>
         <source>Add to workspace</source>
         <translation>Zum Arbeitsbereich hinzufügen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="265"/>
+        <location filename="../../src/view/InventoryView.cpp" line="272"/>
         <source>&amp;Remove</source>
         <translation>En&amp;tfernen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="266"/>
+        <location filename="../../src/view/InventoryView.cpp" line="273"/>
         <source>Remove from workspace</source>
         <translation>Vom Arbeitsbereich entfernen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="269"/>
+        <location filename="../../src/view/InventoryView.cpp" line="276"/>
         <source>&amp;Commit</source>
         <translation>&amp;Einpflegen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="270"/>
+        <location filename="../../src/view/InventoryView.cpp" line="277"/>
         <source>Commit</source>
         <translation>Einpflegen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="273"/>
+        <location filename="../../src/view/InventoryView.cpp" line="280"/>
         <source>I&amp;gnore</source>
         <translation>Datei &amp;ignorieren</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="274"/>
+        <location filename="../../src/view/InventoryView.cpp" line="281"/>
         <source>Ignore file</source>
         <translation>Datei ignorieren</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="277"/>
+        <location filename="../../src/view/InventoryView.cpp" line="284"/>
         <source>&amp;Unignore</source>
         <translation>Datei nicht ign&amp;orieren</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="278"/>
+        <location filename="../../src/view/InventoryView.cpp" line="285"/>
         <source>Unignore file</source>
         <translation>Datei nicht mehr ignorieren</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="281"/>
+        <location filename="../../src/view/InventoryView.cpp" line="288"/>
         <source>R&amp;evert</source>
         <translation>&amp;Zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="282"/>
+        <location filename="../../src/view/InventoryView.cpp" line="289"/>
         <source>Revert uncommitted changes</source>
         <translation>Nicht eingepflegte Änderungen verwerfen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="293"/>
+        <location filename="../../src/view/InventoryView.cpp" line="300"/>
         <source>Rena&amp;me</source>
         <translation>Um&amp;benennen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="294"/>
+        <location filename="../../src/view/InventoryView.cpp" line="301"/>
         <source>Rename file</source>
         <translation>Datei umbenennen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="285"/>
+        <location filename="../../src/view/InventoryView.cpp" line="292"/>
         <source>D&amp;iff</source>
         <translation>U&amp;nterschiede anzeigen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="286"/>
+        <location filename="../../src/view/InventoryView.cpp" line="293"/>
         <source>Diff against base revision</source>
         <translation>Unterschiede im Vergleich zur Basisrevision anzeigen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="253"/>
+        <location filename="../../src/view/InventoryView.cpp" line="260"/>
         <source>&amp;Go into</source>
         <translation>&amp;Wechseln zu</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="254"/>
+        <location filename="../../src/view/InventoryView.cpp" line="261"/>
         <source>Go into the directory</source>
         <translation>Wechsle in das Verzeichnis</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="257"/>
+        <location filename="../../src/view/InventoryView.cpp" line="264"/>
         <source>&amp;Open</source>
         <translation>&amp;Öffnen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="258"/>
+        <location filename="../../src/view/InventoryView.cpp" line="265"/>
         <source>Open in default program</source>
         <translation>In Standardprogramm öffnen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="370"/>
+        <location filename="../../src/view/InventoryView.cpp" line="377"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="360"/>
+        <location filename="../../src/view/InventoryView.cpp" line="367"/>
         <source>The file you&apos;re trying to open does not exist.</source>
         <translation>Die Datei, die Sie versucht haben zu öffnen, existiert nicht.</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="372"/>
+        <location filename="../../src/view/InventoryView.cpp" line="379"/>
         <source>Unable to open files on your platform - please contact the author about this problem.</source>
         <translation>Kann keine Dateien auf Ihrer Plattform öffnen - bitte kontaktieren Sie den Autor über dieses Problem.</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="289"/>
+        <location filename="../../src/view/InventoryView.cpp" line="296"/>
         <source>D&amp;iff all</source>
         <translation>Alle U&amp;nterschiede anzeigen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="290"/>
+        <location filename="../../src/view/InventoryView.cpp" line="297"/>
         <source>Show all differences</source>
         <translation>Zeigt Unterschiede in allen Dateien</translation>
     </message>
============================================================
--- guitone/src/model/InventoryProxyModel.cpp	0a6bcce2838841f907aeda03006b9f8d13a2c0b7
+++ guitone/src/model/InventoryProxyModel.cpp	305b276fd10e5d3b20bcd9fe304027c9f5a82d29
@@ -40,7 +40,10 @@ bool InventoryProxyModel::filterAcceptsR
     // state of the item
     if (item->isCdUp())
     {
-        return !folderTree;
+        // only display this item if this is not the folder tree view
+        // and the parent of the item's parent is invalid (i.e. there is no
+        // way to cdUp anymore)
+        return !folderTree && sourceParent.parent().isValid();
     }

     // hide ignored files (not recursively)
============================================================
--- guitone/src/view/InventoryView.cpp	e59f8f435f3595d675129944b2806aceaef744f9
+++ guitone/src/view/InventoryView.cpp	d87d55be55ef53fce73884656ba084c59aba857a
@@ -32,6 +32,7 @@
 #include <QSortFilterProxyModel>
 #include <QFileInfo>
 #include <QMessageBox>
+#include <QTimer>

 InventoryView::InventoryView(QWidget* parent)
 : TreeView(parent)
@@ -100,7 +101,7 @@ void InventoryView::setModel(QSortFilter
     {
         disconnect(
             oldModel, SIGNAL(modelReset()),
-            this, SLOT(modelReset())
+            this, SLOT(delegateModelReset())
         );
     }

@@ -108,20 +109,26 @@ void InventoryView::setModel(QSortFilter

     connect(
         newModel, SIGNAL(modelReset()),
-        this, SLOT(modelReset())
+        this, SLOT(delegateModelReset())
     );
 }

+void InventoryView::delegateModelReset()
+{
+    // give the view another event cycle to reload the new indices
+    QTimer::singleShot(0, this, SLOT(modelReset()));
+}
+
 void InventoryView::modelReset()
 {
-    QModelIndex index(rootIndex());
-    if (!index.isValid()) return;
+    QModelIndex index = model()->index(0, 0, QModelIndex());
+    if (!index.isValid())
+    {
+        qCritical("InventoryView::modelReset: index invalid, aborting...");
+        return;
+    }

-    index = index.child(0,0);
-    Q_ASSERT(index.isValid());
-    InventoryItem * item = static_cast<InventoryItem*>(index.internalPointer());
-    qDebug(qPrintable(item->getLabel()));
-    if (type == FolderTree)
+    if (type == FileList)
     {
         setRootIndex(index);
     }
============================================================
--- guitone/src/view/InventoryView.h	b9bd6ab533371f623c4a08e8abcbeeb5b4bb3b4f
+++ guitone/src/view/InventoryView.h	2f42802112e608d07157a625250d17b31640fa42
@@ -64,6 +64,7 @@ private slots:
     Type type;

 private slots:
+    void delegateModelReset();
     void modelReset();

     void changeDirectory(const QModelIndex &);