From 11b012404d46a88bbed7b22fb3aa6767890d1b06 Mon Sep 17 00:00:00 2001 From: kostas Date: Tue, 12 May 2015 20:44:53 +0000 Subject: [PATCH] Display current tags and branches as bold in workspace view FossilOrigin-Name: 59372f35e863ab4a2363baf3b0df87cbb4a183ce --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/MainWindow.cpp | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 66888be..94d1c9f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Added\sSearchBox -D 2015-05-12T20:38:16.320 +C Display\scurrent\stags\sand\sbranches\sas\sbold\sin\sworkspace\sview +D 2015-05-12T20:44:53.278 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 a4ce4ef0d6a49829b23d26954aa866c7ed154370 +F src/MainWindow.cpp 20aa6bdb15e5040bc4a9109bc4e29e494f56d15a F src/MainWindow.h 7a2ac41cdd205acccd64a5314f25621ecb616288 F src/RevisionDialog.cpp 51065c65a07c118dd1a7363da4a55a135d1c6c9c F src/RevisionDialog.h b718c3009342eaabad39c8a11a253a4e4fef7a73 @@ -222,7 +222,7 @@ F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d F ui/MainWindow.ui 9dd0f9ef3f486413c9af912ac557c0e7bf9c6f50 F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b -P d1823f2de2e505cae5c738292e71f54e54908ea0 -R f18b61f87c30ab5d96166c7cdb065ec4 +P 097bed86191fae72e1bf76078b8e9d8da37b2932 +R 8241982b5439365ee06da36eacd2c911 U kostas -Z 94fdd6bb117bbef8d98dd141fa290c48 +Z d350a72e02396a189726dcf5b3f96791 diff --git a/manifest.uuid b/manifest.uuid index 6294e72..a2013e6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -097bed86191fae72e1bf76078b8e9d8da37b2932 \ No newline at end of file +59372f35e863ab4a2363baf3b0df87cbb4a183ce \ No newline at end of file diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index fde70fa..dd1d926 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -719,6 +719,14 @@ void MainWindow::updateWorkspaceView() { QStandardItem *branch = new QStandardItem(getInternalIcon(":icons/icons/Document Organization Chart-01.png"), branch_name); branch->setData(WorkspaceItem(WorkspaceItem::TYPE_BRANCH, branch_name), ROLE_WORKSPACE_ITEM); + + bool active = fossil().getCurrentTags().contains(branch_name); + if(active) + { + QFont font = branch->font(); + font.setBold(true); + branch->setFont(font); + } branches->appendRow(branch); } @@ -730,8 +738,18 @@ void MainWindow::updateWorkspaceView() for(QStringMap::const_iterator it=getWorkspace().getTags().begin(); it!=getWorkspace().getTags().end(); ++it) { const QString &tag_name = it.key(); + + QStandardItem *tag = new QStandardItem(getInternalIcon(":icons/icons/Book-01.png"), tag_name); tag->setData(WorkspaceItem(WorkspaceItem::TYPE_TAG, tag_name), ROLE_WORKSPACE_ITEM); + + bool active = fossil().getCurrentTags().contains(tag_name); + if(active) + { + QFont font = tag->font(); + font.setBold(true); + tag->setFont(font); + } tags->appendRow(tag); }