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

Metric height is generally measured in meters

Browse Source
This commit is contained in:
Mark Watkins 2018-04-26 05:50:54 +10:00
parent 36e952d2fd
commit 2ef5170940
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sleepyhead/SleepLib/common.cpp
View File

@ -121,6 +121,7 @@ void copyPath(QString src, QString dst)
} }
QString STR_UNIT_M;
QString STR_UNIT_CM; QString STR_UNIT_CM;
QString STR_UNIT_INCH; QString STR_UNIT_INCH;
QString STR_UNIT_FOOT; QString STR_UNIT_FOOT;
@ -322,7 +323,8 @@ QString STR_TR_WAvg; // Short form of Weighted Average
void initializeStrings() void initializeStrings()
{ {
STR_UNIT_CM = QObject::tr("cm"); STR_UNIT_M = QObject::tr(" m");
STR_UNIT_CM = QObject::tr(" cm");
STR_UNIT_INCH = QObject::tr("\""); STR_UNIT_INCH = QObject::tr("\"");
STR_UNIT_FOOT = QObject::tr("ft"); STR_UNIT_FOOT = QObject::tr("ft");
STR_UNIT_POUND = QObject::tr("lb"); STR_UNIT_POUND = QObject::tr("lb");

1
sleepyhead/SleepLib/common.h
View File

@ -146,6 +146,7 @@ const QString STR_AppRoot = "SleepyHeadData";
// Commonly used translatable text strings // Commonly used translatable text strings
/////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////
extern QString STR_UNIT_M;
extern QString STR_UNIT_CM; extern QString STR_UNIT_CM;
extern QString STR_UNIT_INCH; extern QString STR_UNIT_INCH;
extern QString STR_UNIT_FOOT; extern QString STR_UNIT_FOOT;

1
sleepyhead/SleepLib/machine.cpp
View File

@ -874,6 +874,7 @@ void Machine::runTasks()
//QApplication::processEvents(); //QApplication::processEvents();
} }
QThreadPool::globalInstance()->waitForDone(-1); QThreadPool::globalInstance()->waitForDone(-1);
} }
bool Machine::hasModifiedSessions() bool Machine::hasModifiedSessions()

2
sleepyhead/newprofile.cpp
View File

@ -398,7 +398,7 @@ void NewProfile::edit(const QString name)
ui->heightEdit->setValue(v); ui->heightEdit->setValue(v);
ui->heightEdit2->setVisible(false); ui->heightEdit2->setVisible(false);
ui->heightEdit->setDecimals(2); ui->heightEdit->setDecimals(2);
ui->heightEdit->setSuffix(STR_UNIT_CM); ui->heightEdit->setSuffix(STR_UNIT_M);
} }
} }