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

Removed revision label from status bar.

Browse Source 
Cleaned-up tag label


FossilOrigin-Name: 945c7455e0fa0198d51933965cc4c332d0096a1e
This commit is contained in:
kostas
2015-07-11 15:01:06 +00:00
parent e0c9080555
commit 846938e603
4 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/MainWindow.cpp
View File

@@ -240,12 +240,9 @@ 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);
// Tags Label
lblTags = new QLabel();
ui->statusBar->insertPermanentWidget(1, lblTags);
ui->statusBar->insertPermanentWidget(0, lblTags);
lblTags->setVisible(true);
// Construct ProgressBar
@@ -255,7 +252,7 @@ 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(2, progressBar);
ui->statusBar->insertPermanentWidget(1, progressBar);
progressBar->setVisible(false);
@@ -708,10 +705,7 @@ 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->setText(" " + fossil().getCurrentTags().join(" ") + " ");
lblTags->setVisible(true);
}
@@ -2449,7 +2443,6 @@ 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();
}
@@ -2468,7 +2461,6 @@ 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();
}

1
src/MainWindow.h
View File

@@ -177,7 +177,6 @@ private:
class QAction *fileActionSeparator;
class QAction *workspaceActionSeparator;
class QProgressBar *progressBar;
class QLabel *lblRevision;
class QLabel *lblTags;
class QShortcut *abortShortcut;
class SearchBox *searchBox;