Added tag and revision display on status bar

FossilOrigin-Name: b64d5954b1e1baf7e69d56b2ec8c31584141cebb

manifest

@@ -1,5 +1,5 @@
-C Commits\sare\snow\sallowed\swhen\sa\smerge\sintegration\shas\soccured\seven\swhen\sno\sfiles\sare\smodified\nSupport\sfor\sforced\smerges\nContext\smenus\sare\soffset\sby\sa\spixel\sto\sprevent\sunintended\sclicks\n
+C Added\stag\sand\srevision\sdisplay\son\sstatus\sbar
-D 2015-05-03T12:27:11.377
+D 2015-05-03T12:43:46.492
 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
 F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@@ -200,8 +200,8 @@ F src/Fossil.cpp 01b620c7ca283be385211e8276aad98dc642b0ef
 F src/Fossil.h f9b49ed930af2159f97a86ce0f6da821a0b0819e
 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
 F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
-F src/MainWindow.cpp 1ea5808d0ad4cff7adaa7c910a4438bef3245cbc
+F src/MainWindow.cpp 552a6bab2ae5a643e9b27105001ef469753ad5e1
-F src/MainWindow.h a4f3c753debe65d6231721c9948c4e8dee699021
+F src/MainWindow.h e6797adc543fd07a117a4eacc202fb166ec6665a
 F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4
 F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43
 F src/UpdateDialog.cpp 4dd021bc57dde4f6e3f444f5f8a02f5a4a736478
@@ -220,7 +220,7 @@ F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
 F ui/MainWindow.ui d4fc7971a0717677adb1be0bb88502dfcb92f5c4
 F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b
 F ui/UpdateDialog.ui 392cdba296dd4b79145992a85e79748e7c34580d
-P ac65fbf8d33a9e64fb97bd8652a43b4d11c8e538
+P b0f81bc9c4d226d8406f65d9ad02099205d7e067
-R 999f69cdb7954fc29187e1f6edb999d1
+R 402b4d45ccb228937c1b7de260a0504d
 U kostas
-Z 5cfca8d448bbfd5145ee8de41f944a10
+Z 9772818e668c26ddadfe640ce4f9be25

manifest.uuid

@@ -1 +1 @@
-b0f81bc9c4d226d8406f65d9ad02099205d7e067
+b64d5954b1e1baf7e69d56b2ec8c31584141cebb

src/MainWindow.cpp

@@ -10,6 +10,7 @@
 #include <QInputDialog>
 #include <QMimeData>
 #include <QProgressBar>
+#include <QLabel>
 #include <QSettings>
 #include <QShortcut>
 #include "CommitDialog.h"
@@ -193,6 +194,15 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP
 	// TabWidget
 	ui->tabWidget->setCurrentIndex(TAB_LOG);
 
+	lblRevision = new QLabel();
+	ui->statusBar->insertPermanentWidget(0, lblRevision);
+	lblRevision->setVisible(true);
+
+	lblTags = new QLabel();
+	ui->statusBar->insertPermanentWidget(1, lblTags);
+	lblTags->setVisible(true);
+
+
 	// Construct ProgressBar
 	progressBar = new QProgressBar();
 	progressBar->setMinimum(0);
@@ -200,9 +210,10 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP
 	progressBar->setMaximumSize(170, 16);
 	progressBar->setAlignment(Qt::AlignCenter);
 	progressBar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
-	ui->statusBar->insertPermanentWidget(0, progressBar);
+	ui->statusBar->insertPermanentWidget(2, progressBar);
 	progressBar->setVisible(false);
 
+
 #ifdef Q_OS_MACX
 	// Native applications on OSX don't have menu icons
 	foreach(QAction *a, ui->menuBar->actions())
@@ -605,6 +616,11 @@ void MainWindow::scanWorkspace()
 
 	setBusy(false);
 	setStatus("");
+	lblRevision->setText(tr("Revision: %0").arg(fossil().getCurrentRevision()));
+	lblRevision->setVisible(true);
+
+	lblTags->setText(tr("Tags: %0").arg(fossil().getCurrentTags().join(' ')));
+	lblTags->setVisible(true);
 }
 
 //------------------------------------------------------------------------------
@@ -2164,6 +2180,8 @@ void MainWindow::MainWinUICallback::beginProcess(const QString& text)
 {
 	Q_ASSERT(mainWindow);
 	mainWindow->ui->statusBar->showMessage(text);
+	mainWindow->lblTags->setHidden(true);
+	mainWindow->lblRevision->setHidden(true);
 	mainWindow->progressBar->setHidden(false);
 	QCoreApplication::processEvents();
 }
@@ -2181,6 +2199,8 @@ void MainWindow::MainWinUICallback::endProcess()
 {
 	Q_ASSERT(mainWindow);
 	mainWindow->ui->statusBar->clearMessage();
+	mainWindow->lblTags->setHidden(false);
+	mainWindow->lblRevision->setHidden(false);
 	mainWindow->progressBar->setHidden(true);
 	QCoreApplication::processEvents();
 }

src/MainWindow.h

@@ -153,6 +153,8 @@ private:
 	Ui::MainWindow		*ui;
 	class QAction		*recentWorkspaceActs[MAX_RECENT];
 	class QProgressBar	*progressBar;
+	class QLabel		*lblRevision;
+	class QLabel		*lblTags;
 	class QShortcut		*abortShortcut;
 	QMenu				*menuWorkspace;
 	QMenu				*menuStashes;