AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added tag and revision display on status bar

Browse Source 
FossilOrigin-Name: b64d5954b1e1baf7e69d56b2ec8c31584141cebb
This commit is contained in:
kostas
2015-05-03 12:43:46 +00:00
parent 894f980a7c
commit 90bc163bea
4 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/MainWindow.cpp
View File

@ -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();
}

2
src/MainWindow.h
View File

@ -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;