# # # patch "src/model/InventoryProxyModel.h" # from [781f17e4103f8fa4144bf31f06697959ba2229c3] # to [55ef557f5b2db51a7851fbfc0e6ce037f3ea6763] # # patch "src/view/WorkspaceMenuBar.cpp" # from [d117b786668703d11b86b144962764d108e5a439] # to [99be5d3394b63addbadf7e1278b811f6976b91ac] # # patch "src/view/WorkspaceMenuBar.h" # from [00dd3c433ab74935e3b0b8c4227a651f367724ae] # to [5ff25dbe25f18656d83bcf73b555ed2f92257a95] # # patch "src/view/WorkspaceWindow.cpp" # from [84e4e071bfc21347ab5e142af43ee5af2e903d42] # to [ba67a6ea92fb4ea587a1ff29940d02a85f708348] # ============================================================ --- src/model/InventoryProxyModel.h 781f17e4103f8fa4144bf31f06697959ba2229c3 +++ src/model/InventoryProxyModel.h 55ef557f5b2db51a7851fbfc0e6ce037f3ea6763 @@ -27,7 +27,7 @@ public: { Q_OBJECT public: - enum ViewOption { All, Changed, Patched, Added, Dropped, + enum ViewOption { All = 0, Changed, Patched, Added, Dropped, Renamed, Missing, Unknown, Ignored }; InventoryProxyModel(QObject *, bool); ============================================================ --- src/view/WorkspaceMenuBar.cpp d117b786668703d11b86b144962764d108e5a439 +++ src/view/WorkspaceMenuBar.cpp 99be5d3394b63addbadf7e1278b811f6976b91ac @@ -146,7 +146,7 @@ void WorkspaceMenuBar::toggleFilterFiles void WorkspaceMenuBar::toggleFilterFiles(QAction * act) { - emit filterFiles(act->data().toInt()); + emit filterFiles(static_cast(act->data().toInt())); // disable any previous action and check the new action entry QList assocWidgets = act->associatedWidgets(); ============================================================ --- src/view/WorkspaceMenuBar.h 00dd3c433ab74935e3b0b8c4227a651f367724ae +++ src/view/WorkspaceMenuBar.h 5ff25dbe25f18656d83bcf73b555ed2f92257a95 @@ -22,6 +22,7 @@ #define WORKSPACE_MENU_BAR_H #include "DatabaseMenuBar.h" +#include "InventoryProxyModel.h" class WorkspaceMenuBar : public DatabaseMenuBar { @@ -33,7 +34,7 @@ signals: signals: void hideIgnoredFiles(bool); void expandTree(bool); - void filterFiles(int); + void filterFiles(InventoryProxyModel::ViewOption); void showUpdateWorkspace(); void showCommitRevision(); ============================================================ --- src/view/WorkspaceWindow.cpp 84e4e071bfc21347ab5e142af43ee5af2e903d42 +++ src/view/WorkspaceWindow.cpp ba67a6ea92fb4ea587a1ff29940d02a85f708348 @@ -170,7 +170,7 @@ void WorkspaceWindow::setup() connect( dialogManager, SIGNAL(revisionCommitted(const QString &)), - invModel, SIGNAL(readInventory()) + invModel, SLOT(readInventory()) ); connect( @@ -189,13 +189,13 @@ void WorkspaceWindow::setup() ); connect( - menuBar, SIGNAL(filterFiles(int)), - proxyModelFileList, SLOT(setViewOption(int)) + menuBar, SIGNAL(filterFiles(InventoryProxyModel::ViewOption)), + proxyModelFileList, SLOT(setViewOption(InventoryProxyModel::ViewOption)) ); connect( - menuBar, SIGNAL(filterFiles(int)), - proxyModelFolderTree, SLOT(setViewOption(int)) + menuBar, SIGNAL(filterFiles(InventoryProxyModel::ViewOption)), + proxyModelFolderTree, SLOT(setViewOption(InventoryProxyModel::ViewOption)) ); treeView->setModel(proxyModelFolderTree);