Commit 7c7e95f7 authored by Anthony Léonard's avatar Anthony Léonard

Updated About dialog for beta 2 version

We now display the right version's name and "beta 2".
Version number is now based on RING_CLIENT_BUILD_DATE.

Change-Id: I4dcdbb080a97ca9ab62de12e094ea0336b80e96f
parent 2f9e6708
......@@ -10,14 +10,19 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets svg xml network
win32: QT += winextras
VERSION = 1.0.0
VERSION = 2.0.0
GIT_VERSION = $$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --always --tags)
RING_CLIENT_BUILD_DATE = $$(RING_CLIENT_BUILD_DATE)
isEmpty(RING_CLIENT_BUILD_DATE){
RING_CLIENT_BUILD_DATE = $$system(date +%s)
}
NIGHTLY_VERSION =$$system(date +'%Y%m%d')
DEFINES += VERSION=\\\"$$VERSION\\\"
DEFINES += GIT_VERSION=\\\"$$GIT_VERSION\\\"
DEFINES += NIGHTLY_VERSION=\\\"$$NIGHTLY_VERSION\\\"
DEFINES += RING_CLIENT_BUILD_DATE=\\\"$$RING_CLIENT_BUILD_DATE\\\"
BUILD=$${BUILD}
TARGET = Ring
......
......@@ -29,8 +29,8 @@ AboutDialog::AboutDialog(QWidget *parent) :
ui->creditsWidget->hide();
ui->clientVersionLabel->setText(
QString("<html><head/><body><p><span style=\" font-weight:600;\">"
"%1 v%2</span></p></body></html>").arg(tr("Windows Ring"), VERSION));
ui->gitVersionLabel->setText(QString("%1: %2").arg(tr("version"), GIT_VERSION));
"%1 v%2</span></p></body></html>").arg(tr("Ring"), VERSION));
ui->gitVersionLabel->setText(QString("%1: %2").arg(tr("version"), RING_CLIENT_BUILD_DATE));
ui->creditsBrowser->setHtml("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">"
"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">"
......
......@@ -551,7 +551,7 @@
<item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="releaseLabel">
<property name="text">
<string>Release : Louis-Joseph Papineau</string>
<string>Release : Beta 2 - Gaston Miron</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment