chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change unstable references to testing

Browse Source
This commit is contained in:
Mark Watkins 2014-05-04 16:21:26 +10:00
parent 1428e2ca3d
commit 1db5a74125
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sleepyhead/SleepLib/common.cpp
View File

@ -25,8 +25,8 @@ const QString getDeveloperName()
const QString getAppName() const QString getAppName()
{ {
QString name = STR_AppName; QString name = STR_AppName;
#ifdef UNSTABLE_BUILD #ifdef TEST_BUILD
name += STR_Unstable; name += STR_TestBuild;
#endif #endif
return name; return name;
} }
@ -34,8 +34,8 @@ const QString getAppName()
const QString getDefaultAppRoot() const QString getDefaultAppRoot()
{ {
QString approot = STR_AppRoot; QString approot = STR_AppRoot;
#ifdef UNSTABLE_BUILD #ifdef TEST_BUILD
approot += STR_Unstable; approot += STR_TestBuild;
#endif #endif
return approot; return approot;
} }

6
sleepyhead/SleepLib/common.h
View File

@ -51,10 +51,10 @@ QString weightString(float kg, UnitSystem us = US_Undefined);
bool removeDir(const QString &path); bool removeDir(const QString &path);
#ifdef UNSTABLE_BUILD #ifdef TEST_BUILD
const QString STR_Unstable = "-Unstable"; const QString STR_TestBuild = "-Testing";
#else #else
const QString STR_Unstable = ""; const QString STR_TestBuild = "";
#endif #endif
const QString getAppName(); const QString getAppName();

5
sleepyhead/mainwindow.cpp
View File

@ -99,10 +99,9 @@ MainWindow::MainWindow(QWidget *parent) :
QString version = FullVersionString; QString version = FullVersionString;
if (QString(GIT_BRANCH) != "master") { version += QString(" ") + QString(GIT_BRANCH); } // if (QString(GIT_BRANCH) != "master") { version += QString(" ") + QString(GIT_BRANCH); }
this->setWindowTitle(STR_TR_SleepyHead + QString(" v%1 (" + tr("Profile") + ": %2)").arg( this->setWindowTitle(STR_TR_SleepyHead + QString(" v%1 (" + tr("Profile") + ": %2)").arg(version).arg(PREF[STR_GEN_Profile].toString()));
version).arg(PREF[STR_GEN_Profile].toString()));
//ui->tabWidget->setCurrentIndex(1); //ui->tabWidget->setCurrentIndex(1);
#ifdef Q_OS_MAC #ifdef Q_OS_MAC

2
sleepyhead/sleepyhead.pro
View File

@ -39,7 +39,7 @@ exists(../.git):{
DEFINES += GIT_BRANCH=\\\"$$GIT_BRANCH\\\" DEFINES += GIT_BRANCH=\\\"$$GIT_BRANCH\\\"
DEFINES += GIT_REVISION=\\\"$$system(git rev-parse --short HEAD)\\\" DEFINES += GIT_REVISION=\\\"$$system(git rev-parse --short HEAD)\\\"
contains(GIT_BRANCH,"unstable"):DEFINES += UNSTABLE_BUILD contains(GIT_BRANCH,"testing"):DEFINES += TEST_BUILD
} else { } else {
DEFINES += GIT_BRANCH=\\\"UNKNOWN\\\" DEFINES += GIT_BRANCH=\\\"UNKNOWN\\\"

4
sleepyhead/statistics.cpp
View File

@ -50,8 +50,8 @@ QString htmlHeader()
"<div align=center><table cellpadding=3 cellspacing=0 border=0 width=100%>" "<div align=center><table cellpadding=3 cellspacing=0 border=0 width=100%>"
//"<tr>" //"<tr>"
//"<td bgcolor='red' width=100% colspan=3 align=center><font color='yellow'><b>"+QObject::tr("Warning:")+"</b> "+ //"<td bgcolor='red' width=100% colspan=3 align=center><font color='yellow'><b>"+QObject::tr("Warning:")+"</b> "+
// #ifdef UNSTABLE_BUILD // #ifdef TEST_BUILD
// QObject::tr("This is an unstable build so expect the possibility things will go wrong.")+"<br/>"+ // QObject::tr("This is an testing build so expect the possibility things will go wrong.")+"<br/>"+
// QObject::tr("Please report bugs you find here to SleepyHead's developer mailing list.")+ // QObject::tr("Please report bugs you find here to SleepyHead's developer mailing list.")+
// #else // #else
// QObject::tr("This is a beta software and some functionality may not work as intended yet.")+"<br/>"+ // QObject::tr("This is a beta software and some functionality may not work as intended yet.")+"<br/>"+

5
sleepyhead/translation.cpp
View File

@ -101,8 +101,8 @@ void initTranslations(QSettings & settings) {
QComboBox lang_combo(&langsel); QComboBox lang_combo(&langsel);
QPushButton lang_okbtn("->", &langsel); QPushButton lang_okbtn("->", &langsel);
QVBoxLayout layout1(&langsel); QVBoxLayout layout1;
QVBoxLayout layout2(&langsel); QVBoxLayout layout2;
lang_layout.addLayout(&layout1); lang_layout.addLayout(&layout1);
lang_layout.addLayout(&layout2); lang_layout.addLayout(&layout2);
@ -126,6 +126,7 @@ void initTranslations(QSettings & settings) {
} }
langsel.connect(&lang_okbtn, SIGNAL(clicked()), &langsel, SLOT(close())); langsel.connect(&lang_okbtn, SIGNAL(clicked()), &langsel, SLOT(close()));
langsel.exec(); langsel.exec();

4
sleepyhead/version.h
View File

@ -20,8 +20,8 @@ const int revision_number = 4;
const int release_number = 5; const int release_number = 5;
#ifdef UNSTABLE_BUILD #ifdef TEST_BUILD
const QString ReleaseStatus = "unstable"; const QString ReleaseStatus = "testing";
#else #else
const QString ReleaseStatus = "beta"; const QString ReleaseStatus = "beta";
#endif #endif