# # # patch "res/forms/dialogs/file_history.ui" # from [1d35a4e4b17ea28af877bdf1069846f3eadb6dcd] # to [549048e7d5f304313b58f470e78f55e80cf3b15f] # # patch "res/forms/dialogs/select_revision.ui" # from [a75737914c219c1239a51a3e6d742fdc0b9e2971] # to [e21e36d10dbe3edb3c33b5002fd685262c7b388f] # # patch "src/view/dialogs/FileHistory.cpp" # from [6dec9845328d399def5bae6972acd6f4f69a7a0b] # to [363e3cd95e7cc9938f3a7c694310f0622da224ef] # # patch "src/view/dialogs/SelectRevision.cpp" # from [f96753b6221a7d798068890bcb458dd8feef8eff] # to [9ebfde2a43baa073075f4608586bc1b20a8b1d6d] # ============================================================ --- res/forms/dialogs/file_history.ui 1d35a4e4b17ea28af877bdf1069846f3eadb6dcd +++ res/forms/dialogs/file_history.ui 549048e7d5f304313b58f470e78f55e80cf3b15f @@ -1,7 +1,8 @@ - + + FileHistoryDialog - - + + 0 0 @@ -9,67 +10,67 @@ 411 - + History of %1 - - + + :/icons/guitone.png:/icons/guitone.png - + - + - - + + Qt::Vertical - - + + - - + + true - + QAbstractItemView::SingleSelection - + false - + false - + - - + + false - + Select as first revision - - + + false - + Select as second revision - + Qt::Horizontal - + 538 20 @@ -78,11 +79,11 @@ - - + + false - + Show differences @@ -91,39 +92,26 @@ - - - true + + + Details - - QAbstractItemView::NoSelection - - - QAbstractItemView::ScrollPerPixel - - - 5 - - - false - - - false - - - true - + + + + + - + - + Qt::Horizontal - + 40 20 @@ -132,11 +120,11 @@ - - + + Close - + true @@ -156,12 +144,17 @@ Splitter QSplitter -
Splitter.h
+
Splitter.h
1 + + CertListBrowser + QTextBrowser +
CertListBrowser.h
+ - + @@ -170,11 +163,11 @@ FileHistoryDialog close() - + 229 252 - + 199 149 ============================================================ --- res/forms/dialogs/select_revision.ui a75737914c219c1239a51a3e6d742fdc0b9e2971 +++ res/forms/dialogs/select_revision.ui e21e36d10dbe3edb3c33b5002fd685262c7b388f @@ -1,7 +1,8 @@ - + + SelectRevision - - + + 0 0 @@ -9,35 +10,35 @@ 417 - + Select Revision - - + + :/icons/guitone.png:/icons/guitone.png - + - + - + - - + + contains - + selectorValue - + - - + + Find @@ -45,50 +46,50 @@ - - + + Qt::Vertical - - + + - - + + false - + false - + - - + + false - + Select as first revision - - + + false - + Select as second revision - + Qt::Horizontal - + 40 20 @@ -97,11 +98,11 @@ - - + + false - + Show differences @@ -110,31 +111,21 @@ - - - true + + + Details - - QAbstractItemView::NoSelection - - - QAbstractItemView::ScrollPerPixel - - - 10 - - - false - - - false - + + + + + - - + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -150,9 +141,14 @@ Splitter QSplitter -
Splitter.h
+
Splitter.h
1 + + CertListBrowser + QTextBrowser +
CertListBrowser.h
+ selectorBox @@ -160,7 +156,7 @@ searchRevsBtn - + @@ -169,11 +165,11 @@ searchRevsBtn click() - + 281 27 - + 631 35 @@ -185,11 +181,11 @@ SelectRevision accept() - + 502 391 - + 637 334 @@ -201,11 +197,11 @@ SelectRevision reject() - + 588 389 - + 638 361 ============================================================ --- src/view/dialogs/FileHistory.cpp 6dec9845328d399def5bae6972acd6f4f69a7a0b +++ src/view/dialogs/FileHistory.cpp 363e3cd95e7cc9938f3a7c694310f0622da224ef @@ -36,8 +36,12 @@ FileHistory::FileHistory(QWidget * paren // assign the models to the views revisionFileList->setModel(changeModel); - certList->setModel(certsModel); + connect( + certsModel, SIGNAL(certsRead(const CertList &)), + certList, SLOT(setCertList(const CertList &)) + ); + // display the certs of a selected revision on click connect( revisionFileList, SIGNAL(clicked(const QModelIndex &)), ============================================================ --- src/view/dialogs/SelectRevision.cpp f96753b6221a7d798068890bcb458dd8feef8eff +++ src/view/dialogs/SelectRevision.cpp 9ebfde2a43baa073075f4608586bc1b20a8b1d6d @@ -60,15 +60,16 @@ SelectRevision::SelectRevision(QWidget * // assign the models to the views revisionList->setModel(sortModel); - certList->setModel(certsModel); + connect( + certsModel, SIGNAL(certsRead(const CertList &)), + certList, SLOT(setCertList(const CertList &)) + ); + // enable sorting of revisions revisionList->setSortingEnabled(true); revisionList->sortByColumn(0, Qt::AscendingOrder); - // some tweak - certList->header()->setResizeMode(QHeaderView::Interactive); - // connect its item clicked signal with a local slot connect( revisionList, SIGNAL(clicked(const QModelIndex &)),