diff --git a/manifest b/manifest index 355a40b..cc2e69b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fuel\sno\slonger\srelies\son\sfossil\sfor\sthe\sdefault\sremote. -D 2015-07-11T14:44:13.188 +C Removed\srevision\slabel\sfrom\sstatus\sbar.\nCleaned-up\stag\slabel\n +D 2015-07-11T15:01:06.978 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b @@ -225,8 +225,8 @@ F src/FslSettingsDialog.cpp 2531d3709f0eab66651671e3edead2ca720d07d5 F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 -F src/MainWindow.cpp 37e53b84cd69b69200f9362b023ec7fbd7ea511b -F src/MainWindow.h 7bbf19b176b9b17d9e9502eb23027a78b3e3580f +F src/MainWindow.cpp a6dffbc663a7d14e10252815650435da84c1a933 +F src/MainWindow.h c819e6a574fedcdb1bc1a261443fd0d372233555 F src/RemoteDialog.cpp 8540cc5e2e41c4127ed8a028d84691604fa6ecac F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d F src/RevisionDialog.cpp e58c4f8a704f00addebb15d521b76620fdafda79 @@ -253,7 +253,7 @@ F ui/MainWindow.ui 10181826a25056ed5aba2b23a7d110159be7c043 F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd F ui/SettingsDialog.ui 47b9a31e28ad523f14a1c4cd361270b6babbdf7d -P bf0f238d67482239b37e46f4eab20782d1275207 -R 5c75478e3bf7d7c5f9ef932a568d537e +P 6f96b3f7c927e06ac740b9df993a3f19d57eb74a +R ac363738e384d42ff5d3412f6b09ecc6 U kostas -Z c286da8089f4147df5f69a97f564e3f4 +Z 842ad749b9d1ee8580309846bf44766b diff --git a/manifest.uuid b/manifest.uuid index fbfa14c..3dbe22c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6f96b3f7c927e06ac740b9df993a3f19d57eb74a \ No newline at end of file +945c7455e0fa0198d51933965cc4c332d0096a1e \ No newline at end of file diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index dec86a9..798d212 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -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(); } diff --git a/src/MainWindow.h b/src/MainWindow.h index b65bc10..b3292fc 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -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;