use 'git describe' to generate version info for the about box and servatrice. fixes issue #20

This commit is contained in:
Max-Wilhelm Bruker 2012-02-21 01:08:16 +01:00
parent a1bcd9854f
commit 89bb8e72ee
10 changed files with 49 additions and 12 deletions

View file

@ -69,7 +69,8 @@ SET(cockatrice_SOURCES
src/localserverinterface.cpp
src/localclient.cpp
src/priceupdater.cpp
src/soundengine.cpp
src/soundengine.cpp
${CMAKE_CURRENT_BINARY_DIR}/../common/version_string.cpp
)
SET(cockatrice_HEADERS
src/abstractcounter.h
@ -153,7 +154,7 @@ set(cockatrice_TS
translations/cockatrice_pt.ts
translations/cockatrice_ru.ts
translations/cockatrice_sk.ts
)
)
if(WIN32)
set(cockatrice_SOURCES ${cockatrice_SOURCES} cockatrice.rc)

View file

@ -9,7 +9,6 @@ extern CardDatabase *db;
extern QTranslator *translator;
const QString translationPrefix = "cockatrice";
const QString versionString = "0.20111113";
void installNewTranslator();

View file

@ -40,6 +40,8 @@
#include "settingscache.h"
#include "tab_game.h"
#include "version_string.h"
#include "pb/game_replay.pb.h"
#include "pb/room_commands.pb.h"
#include "pb/event_connection_closed.pb.h"
@ -210,7 +212,7 @@ void MainWindow::actAbout()
{
QMessageBox::about(this, tr("About Cockatrice"), QString(
"<font size=\"8\"><b>Cockatrice</b></font><br>"
+ tr("Version %1").arg(versionString)
+ tr("Version %1").arg(VERSION_STRING)
+ "<br><br><br><b>" + tr("Authors:") + "</b><br>Max-Wilhelm Bruker<br>Marcus Schütz<br><br>"
+ "<b>" + tr("Translators:") + "</b><br>"
+ tr("Spanish:") + " Víctor Martínez<br>"