Skip to content
Snippets Groups Projects
Commit 7c7e95f7 authored by Anthony Léonard's avatar Anthony Léonard
Browse files

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
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
RingWinClient.pro
+ 6
− 1
View file @ 7c7e95f7
...@@ -10,14 +10,19 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets svg xml network ...@@ -10,14 +10,19 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets svg xml network
win32: QT += winextras 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) 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') NIGHTLY_VERSION =$$system(date +'%Y%m%d')
DEFINES += VERSION=\\\"$$VERSION\\\" DEFINES += VERSION=\\\"$$VERSION\\\"
DEFINES += GIT_VERSION=\\\"$$GIT_VERSION\\\" DEFINES += GIT_VERSION=\\\"$$GIT_VERSION\\\"
DEFINES += NIGHTLY_VERSION=\\\"$$NIGHTLY_VERSION\\\" DEFINES += NIGHTLY_VERSION=\\\"$$NIGHTLY_VERSION\\\"
DEFINES += RING_CLIENT_BUILD_DATE=\\\"$$RING_CLIENT_BUILD_DATE\\\"
BUILD=$${BUILD} BUILD=$${BUILD}
TARGET = Ring TARGET = Ring
......
aboutdialog.cpp
+ 2
− 2
View file @ 7c7e95f7
...@@ -29,8 +29,8 @@ AboutDialog::AboutDialog(QWidget *parent) : ...@@ -29,8 +29,8 @@ AboutDialog::AboutDialog(QWidget *parent) :
ui->creditsWidget->hide(); ui->creditsWidget->hide();
ui->clientVersionLabel->setText( ui->clientVersionLabel->setText(
QString("<html><head/><body><p><span style=\" font-weight:600;\">" QString("<html><head/><body><p><span style=\" font-weight:600;\">"
"%1 v%2</span></p></body></html>").arg(tr("Windows Ring"), VERSION)); "%1 v%2</span></p></body></html>").arg(tr("Ring"), VERSION));
ui->gitVersionLabel->setText(QString("%1: %2").arg(tr("version"), GIT_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\">" 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\">" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">"
......
aboutdialog.ui
+ 1
− 1
View file @ 7c7e95f7
...@@ -551,7 +551,7 @@ ...@@ -551,7 +551,7 @@
<item alignment="Qt::AlignHCenter"> <item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="releaseLabel"> <widget class="QLabel" name="releaseLabel">
<property name="text"> <property name="text">
<string>Release : Louis-Joseph Papineau</string> <string>Release : Beta 2 - Gaston Miron</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::PlainText</enum> <enum>Qt::PlainText</enum>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment