diff --git a/sleepyhead/SleepLib/common.cpp b/sleepyhead/SleepLib/common.cpp index ef1f6941..84ebec2c 100644 --- a/sleepyhead/SleepLib/common.cpp +++ b/sleepyhead/SleepLib/common.cpp @@ -25,8 +25,8 @@ const QString getDeveloperName() const QString getAppName() { QString name = STR_AppName; -#ifdef UNSTABLE_BUILD - name += STR_Unstable; +#ifdef TEST_BUILD + name += STR_TestBuild; #endif return name; } @@ -34,8 +34,8 @@ const QString getAppName() const QString getDefaultAppRoot() { QString approot = STR_AppRoot; -#ifdef UNSTABLE_BUILD - approot += STR_Unstable; +#ifdef TEST_BUILD + approot += STR_TestBuild; #endif return approot; } diff --git a/sleepyhead/SleepLib/common.h b/sleepyhead/SleepLib/common.h index 720b5c85..c702bda9 100644 --- a/sleepyhead/SleepLib/common.h +++ b/sleepyhead/SleepLib/common.h @@ -51,10 +51,10 @@ QString weightString(float kg, UnitSystem us = US_Undefined); bool removeDir(const QString &path); -#ifdef UNSTABLE_BUILD -const QString STR_Unstable = "-Unstable"; +#ifdef TEST_BUILD +const QString STR_TestBuild = "-Testing"; #else -const QString STR_Unstable = ""; +const QString STR_TestBuild = ""; #endif const QString getAppName(); diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index ea226747..e0dc192b 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -99,10 +99,9 @@ MainWindow::MainWindow(QWidget *parent) : 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( - version).arg(PREF[STR_GEN_Profile].toString())); + this->setWindowTitle(STR_TR_SleepyHead + QString(" v%1 (" + tr("Profile") + ": %2)").arg(version).arg(PREF[STR_GEN_Profile].toString())); //ui->tabWidget->setCurrentIndex(1); #ifdef Q_OS_MAC diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro index f010d064..c8ac05ad 100644 --- a/sleepyhead/sleepyhead.pro +++ b/sleepyhead/sleepyhead.pro @@ -39,7 +39,7 @@ exists(../.git):{ DEFINES += GIT_BRANCH=\\\"$$GIT_BRANCH\\\" DEFINES += GIT_REVISION=\\\"$$system(git rev-parse --short HEAD)\\\" - contains(GIT_BRANCH,"unstable"):DEFINES += UNSTABLE_BUILD + contains(GIT_BRANCH,"testing"):DEFINES += TEST_BUILD } else { DEFINES += GIT_BRANCH=\\\"UNKNOWN\\\" diff --git a/sleepyhead/statistics.cpp b/sleepyhead/statistics.cpp index ec6b93d1..e190140e 100644 --- a/sleepyhead/statistics.cpp +++ b/sleepyhead/statistics.cpp @@ -50,8 +50,8 @@ QString htmlHeader() "
"+QObject::tr("Warning:")+" "+
- // #ifdef UNSTABLE_BUILD
- // QObject::tr("This is an unstable build so expect the possibility things will go wrong.")+" "+ + // #ifdef TEST_BUILD + // QObject::tr("This is an testing build so expect the possibility things will go wrong.")+" "+ // QObject::tr("Please report bugs you find here to SleepyHead's developer mailing list.")+ // #else // QObject::tr("This is a beta software and some functionality may not work as intended yet.")+" "+ diff --git a/sleepyhead/translation.cpp b/sleepyhead/translation.cpp index 3d5112a6..f9d5f823 100644 --- a/sleepyhead/translation.cpp +++ b/sleepyhead/translation.cpp @@ -101,8 +101,8 @@ void initTranslations(QSettings & settings) { QComboBox lang_combo(&langsel); QPushButton lang_okbtn("->", &langsel); - QVBoxLayout layout1(&langsel); - QVBoxLayout layout2(&langsel); + QVBoxLayout layout1; + QVBoxLayout layout2; lang_layout.addLayout(&layout1); lang_layout.addLayout(&layout2); @@ -126,6 +126,7 @@ void initTranslations(QSettings & settings) { } + langsel.connect(&lang_okbtn, SIGNAL(clicked()), &langsel, SLOT(close())); langsel.exec(); diff --git a/sleepyhead/version.h b/sleepyhead/version.h index ffd4fa49..521ba103 100644 --- a/sleepyhead/version.h +++ b/sleepyhead/version.h @@ -20,8 +20,8 @@ const int revision_number = 4; const int release_number = 5; -#ifdef UNSTABLE_BUILD -const QString ReleaseStatus = "unstable"; +#ifdef TEST_BUILD +const QString ReleaseStatus = "testing"; #else const QString ReleaseStatus = "beta"; #endif |