# # # patch "guitone/res/i18n/guitone_de.ts" # from [939d94f230ac2192de2808b243b3bdedb75e2d12] # to [3591bed3166bda748fcc941fb6664f48b304ae3f] # # patch "guitone/src/view/InventoryView.cpp" # from [201bb7a201028ee92c79fc9a7c0cb112b3c0f031] # to [9be0f6fa4e8f46a92a588a7e5ac99ee2abb962a8] # # patch "guitone/src/view/MainWindow.cpp" # from [b417e1f09b73f2fe7e20d21af5ad3bab56514604] # to [8bfdcacc6cca6397e5aa38ddbbe5f62a8c948ea2] # ============================================================ --- guitone/res/i18n/guitone_de.ts 939d94f230ac2192de2808b243b3bdedb75e2d12 +++ guitone/res/i18n/guitone_de.ts 3591bed3166bda748fcc941fb6664f48b304ae3f @@ -127,37 +127,37 @@ Attributes - + added hinzugefügt - + dropped entfernt - + changed verändert - + unchanged unverändert - + Key Schlüssel - + Value Wert - + State Status @@ -170,7 +170,7 @@ Zweig-Name - + Branches Zweige @@ -178,52 +178,52 @@ Certs - + ok OK - + bad schlecht - + unknown unbekannt - + trusted vertrauenswürdig - + untrusted nicht vertrauenswürdig - + Key Schlüssel - + Name Name - + Value Wert - + Signature Signatur - + Trust Vertrauen @@ -231,22 +231,22 @@ ContentDiff - + %1 (binary) %1 (binär) - + %1 (%2 hunks) %1 (%2 Bereiche) - + Line Zeile - + File/Content Datei/Inhalt @@ -390,12 +390,12 @@ GetFile - + Line Zeile - + Content Inhalt @@ -1142,7 +1142,7 @@ monotone gab zurück: Select - + Revision ID Revisions-ID @@ -1233,24 +1233,32 @@ monotone gab zurück: Tags - + Name Name - + Revision Revision - + Signer Unterzeichner - + Branches Zweige + + Toposort + + + Revision ID + Revisions-ID + + ============================================================ --- guitone/src/view/InventoryView.cpp 201bb7a201028ee92c79fc9a7c0cb112b3c0f031 +++ guitone/src/view/InventoryView.cpp 9be0f6fa4e8f46a92a588a7e5ac99ee2abb962a8 @@ -54,6 +54,9 @@ void InventoryView::setType(Type t) void InventoryView::setType(Type t) { + // ensure that a model is already set, otherwise the app crashes + Q_ASSERT(model()); + type = t; if (type == FileList) ============================================================ --- guitone/src/view/MainWindow.cpp b417e1f09b73f2fe7e20d21af5ad3bab56514604 +++ guitone/src/view/MainWindow.cpp 8bfdcacc6cca6397e5aa38ddbbe5f62a8c948ea2 @@ -95,10 +95,10 @@ bool MainWindow::init() proxyModelFileList->setSourceModel(invModel); // tree and list views + treeView->setModel(proxyModelFolderTree); treeView->setType(InventoryView::FolderTree); - treeView->setModel(proxyModelFolderTree); + listView->setModel(proxyModelFileList); listView->setType(InventoryView::FileList); - listView->setModel(proxyModelFileList); attrView->setModel(attrModel); // query attributes on click