From adbd44da3ac12a326cb32862e8587c2f7dcbccac Mon Sep 17 00:00:00 2001 From: kostas Date: Tue, 12 May 2015 19:13:27 +0000 Subject: [PATCH] The header of the workspace view is no longer regenerated every refresh FossilOrigin-Name: d1823f2de2e505cae5c738292e71f54e54908ea0 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/MainWindow.cpp | 13 +++++++------ 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/manifest b/manifest index d27a787..2eef9c8 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Renamed\sorganisation\sname\sback\sto\s"fuel-scm.org" -D 2015-05-12T18:01:31.611 +C The\sheader\sof\sthe\sworkspace\sview\sis\sno\slonger\sregenerated\severy\srefresh\n +D 2015-05-12T19:13:27.768 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b @@ -200,7 +200,7 @@ F src/Fossil.cpp ca7ad24622e1fc1a03c92d7ae9b51afc17f7c09c F src/Fossil.h d65a7461d213bcc30f08724d3306c6ee00843217 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 -F src/MainWindow.cpp 6a50f409c7cb2aa5389183854a4dbe8de3c9cfef +F src/MainWindow.cpp fe78b884abb2e123c2526ed28eda3b7d88d27843 F src/MainWindow.h 2b84fe52f8184364d63a7c9518500017b866e8ea F src/RevisionDialog.cpp 51065c65a07c118dd1a7363da4a55a135d1c6c9c F src/RevisionDialog.h b718c3009342eaabad39c8a11a253a4e4fef7a73 @@ -220,7 +220,7 @@ F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d F ui/MainWindow.ui 9dd0f9ef3f486413c9af912ac557c0e7bf9c6f50 F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b -P 9eea1bac1b8780266c9eac0e31d9d9246854e6ac -R 3c799002119213ea44b7e7ff73f556ec +P 0bdfeb81b088e0b1476518a320428b235967936f +R 2d33b0f451ed31f3d6f54ffd9cf1f7d3 U kostas -Z 5e69aac744baa1274bf632c8186dc572 +Z 23fe2012ed952500a94dffca4949ebb4 diff --git a/manifest.uuid b/manifest.uuid index 2b75155..6953b61 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0bdfeb81b088e0b1476518a320428b235967936f \ No newline at end of file +d1823f2de2e505cae5c738292e71f54e54908ea0 \ No newline at end of file diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 3de5ad6..5f13141 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -129,6 +129,11 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP // workspaceTreeView ui->workspaceTreeView->setModel(&getWorkspace().getDirModel()); + + header.clear(); + header << tr("Workspace"); + getWorkspace().getDirModel().setHorizontalHeaderLabels(header); + connect( ui->workspaceTreeView->selectionModel(), SIGNAL( selectionChanged(const QItemSelection &, const QItemSelection &) ), SLOT( onWorkspaceTreeViewSelectionChanged(const QItemSelection &, const QItemSelection &) ), @@ -660,12 +665,8 @@ static void addPathToTree(QStandardItem &root, const QString &path, const QIcon //------------------------------------------------------------------------------ void MainWindow::updateWorkspaceView() { - // Directory View - getWorkspace().getDirModel().clear(); - - QStringList header; - header << tr("Workspace"); - getWorkspace().getDirModel().setHorizontalHeaderLabels(header); + // Clear content except headers + getWorkspace().getDirModel().removeRows(0, getWorkspace().getDirModel().rowCount()); QStandardItem *workspace = new QStandardItem(getInternalIcon(":icons/icons/Folder-01.png"), tr("Files") ); workspace->setData(WorkspaceItem(WorkspaceItem::TYPE_WORKSPACE, ""), ROLE_WORKSPACE_ITEM);