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

Here are the promised translation-cleaned program files plus updated language files

Browse Source
This commit is contained in:
ArieKlerk 2022-01-10 16:49:23 +01:00
parent 42cc67e8d9
commit 6bbb656c02
54 changed files with 11259 additions and 12196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

823
Translations/Afrikaans.af.ts
View File

File diff suppressed because it is too large Load Diff

779
Translations/Arabic.ar.ts
View File

File diff suppressed because it is too large Load Diff

789
Translations/Bulgarian.bg.ts
View File

File diff suppressed because it is too large Load Diff

781
Translations/Chinese.zh_CN.ts
View File

File diff suppressed because it is too large Load Diff

793
Translations/Chinese.zh_TW.ts
View File

File diff suppressed because it is too large Load Diff

805
Translations/Dansk.da.ts
View File

File diff suppressed because it is too large Load Diff

805
Translations/Deutsch.de.ts
View File

File diff suppressed because it is too large Load Diff

813
Translations/English.en_UK.ts
View File

File diff suppressed because it is too large Load Diff

811
Translations/Espaniol.es.ts
View File

File diff suppressed because it is too large Load Diff

785
Translations/Espaniol.es_MX.ts
View File

File diff suppressed because it is too large Load Diff

797
Translations/Filipino.ph.ts
View File

File diff suppressed because it is too large Load Diff

805
Translations/Francais.fr.ts
View File

File diff suppressed because it is too large Load Diff

805
Translations/Greek.el.ts
View File

File diff suppressed because it is too large Load Diff

809
Translations/Hebrew.he.ts
View File

File diff suppressed because it is too large Load Diff

805
Translations/Italiano.it.ts
View File

File diff suppressed because it is too large Load Diff

827
Translations/Korean.ko.ts
View File

File diff suppressed because it is too large Load Diff

805
Translations/Magyar.hu.ts
View File

File diff suppressed because it is too large Load Diff

815
Translations/Nederlands.nl.ts
View File

File diff suppressed because it is too large Load Diff

787
Translations/Norsk.no.ts
View File

File diff suppressed because it is too large Load Diff

805
Translations/Polski.pl.ts
View File

File diff suppressed because it is too large Load Diff

781
Translations/Portugues.pt.ts
View File

File diff suppressed because it is too large Load Diff

781
Translations/Portugues.pt_BR.ts
View File

File diff suppressed because it is too large Load Diff

805
Translations/Romanian.ro.ts
View File

File diff suppressed because it is too large Load Diff

805
Translations/Russkiy.ru.ts
View File

File diff suppressed because it is too large Load Diff

805
Translations/Suomi.fi.ts
View File

File diff suppressed because it is too large Load Diff

805
Translations/Svenska.sv.ts
View File

File diff suppressed because it is too large Load Diff

813
Translations/Thai.th.ts
View File

File diff suppressed because it is too large Load Diff

805
Translations/Turkish.tr.ts
View File

File diff suppressed because it is too large Load Diff

8
oscar/Graphs/gGraphView.cpp
View File

@ -2148,7 +2148,7 @@ void gGraphView::populateMenu(gGraph * graph)
if (lines_menu->actions().size() > 0) {
lines_menu->insertSeparator(lines_menu->actions()[0]);
action = new QAction(QObject::tr("%1").arg(graph->title()), lines_menu);
action = new QAction(QString("%1").arg(graph->title()), lines_menu);
lines_menu->insertAction(lines_menu->actions()[0], action);
action->setFont(font);
action->setData(QString(""));
@ -2191,7 +2191,7 @@ void gGraphView::populateMenu(gGraph * graph)
if (plots_menu->actions().size() > 0) {
plots_menu->insertSeparator(plots_menu->actions()[0]);
action = new QAction(QObject::tr("%1").arg(graph->title()), plots_menu);
action = new QAction(QString("%1").arg(graph->title()), plots_menu);
plots_menu->insertAction(plots_menu->actions()[0], action);
action->setFont(font);
@ -2262,7 +2262,7 @@ void gGraphView::populateMenu(gGraph * graph)
// Show CPAP Events menu Header...
cpap_menu->insertSeparator(cpap_menu->actions()[0]);
action = new QAction(QObject::tr("%1").arg(graph->title()), cpap_menu);
action = new QAction(QString("%1").arg(graph->title()), cpap_menu);
cpap_menu->insertAction(cpap_menu->actions()[0], action);
action->setFont(font);
action->setData(QString(""));
@ -2279,7 +2279,7 @@ void gGraphView::populateMenu(gGraph * graph)
}
oximeter_menu->insertSeparator(oximeter_menu->actions()[0]);
action = new QAction(QObject::tr("%1").arg(graph->title()), oximeter_menu);
action = new QAction(QString("%1").arg(graph->title()), oximeter_menu);
oximeter_menu->insertAction(oximeter_menu->actions()[0], action);
action->setFont(font);
action->setData(QString(""));

8
oscar/Graphs/gSessionTimesChart.cpp
View File

@ -284,15 +284,15 @@ void gSummaryChart::afterDraw(QPainter &painter, gGraph &graph, QRectF rect)
break;
case ST_MID:
val = mid;
txt = QObject::tr("%1: ").arg(midstr);
txt = QString("%1: ").arg(midstr);
break;
case ST_90P:
val = mid;
txt = QObject::tr("%1: ").arg(percstr);
txt = QString("%1: ").arg(percstr);
break;
default:
val = mid;
txt = QObject::tr("???: ");
txt = QString("???: ");
break;
}
strlist.append(QString("%1%2").arg(txt).arg(val,0,'f',2));
@ -1250,7 +1250,7 @@ void gAHIChart::afterDraw(QPainter & /*painter */, gGraph &graph, QRectF rect)
}
QStringList txtlist;
if (!skip) txtlist.append(QObject::tr("%1 %2 / %3 / %4").arg(STR_TR_AHI).arg(min_ahi, 0, 'f', 2).arg(med, 0, 'f', 2).arg(max_ahi, 0, 'f', 2));
if (!skip) txtlist.append(QString("%1 %2 / %3 / %4").arg(STR_TR_AHI).arg(min_ahi, 0, 'f', 2).arg(med, 0, 'f', 2).arg(max_ahi, 0, 'f', 2));
int i = calcitems.size();
while (i > 0) {

2
oscar/Graphs/gSummaryChart.cpp
View File

@ -1167,7 +1167,7 @@ bool SummaryChart::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
break;
case ST_90P:
strDataType = QObject::tr("90%");
strDataType = QString("90%");
break;
case ST_PERC:

2
oscar/Graphs/gdailysummary.cpp
View File

@ -109,7 +109,7 @@ void gDailySummary::SetDay(Day *day)
CPAPMode mode = (CPAPMode)(int)round(day->settings_wavg(CPAP_Mode));
info.append(QObject::tr("%1: %2").arg(STR_TR_AHI).arg(day->calcAHI(),0,'f',2));
info.append(QString("%1: %2").arg(STR_TR_AHI).arg(day->calcAHI(),0,'f',2));
info_background.append(QColor("orange"));

8
oscar/SleepLib/common.cpp
View File

@ -664,7 +664,7 @@ void initializeStrings()
STR_UNIT_M = QObject::tr(" m");
STR_UNIT_CM = QObject::tr(" cm");
STR_UNIT_INCH = QObject::tr("\"");
STR_UNIT_INCH = QObject::tr("in");
STR_UNIT_FOOT = QObject::tr("ft");
STR_UNIT_POUND = QObject::tr("lb");
STR_UNIT_OUNCE = QObject::tr("oz");
@ -678,7 +678,7 @@ void initializeStrings()
STR_UNIT_s = QObject::tr("s"); // seconds shortform
STR_UNIT_ms = QObject::tr("ms"); // milliseconds
STR_UNIT_EventsPerHour = QObject::tr("Events/hr"); // Events per hour
STR_UNIT_Percentage = QObject::tr("%");
STR_UNIT_Percentage = QString("%");
STR_UNIT_Hz = QObject::tr("Hz"); // Hertz
STR_UNIT_BPM = QObject::tr("bpm"); // Beats per Minute
STR_UNIT_LPM = QObject::tr("L/min"); // Litres per Minute
@ -715,7 +715,7 @@ void initializeStrings()
STR_TR_Weight = QObject::tr("Weight");
STR_TR_Zombie = QObject::tr("Zombie");
STR_TR_PulseRate = QObject::tr("Pulse Rate"); // Pulse / Heart rate
STR_TR_SpO2 = QObject::tr("SpO2");
STR_TR_SpO2 = QString("SpO2");
STR_TR_Plethy = QObject::tr("Plethy"); // Plethysomogram
STR_TR_Pressure = QObject::tr("Pressure");
@ -815,7 +815,7 @@ void initializeStrings()
STR_TR_PrRelief = QObject::tr("Pr. Relief"); // Pressure Relief
STR_TR_Bookmarks = QObject::tr("Bookmarks");
STR_TR_OSCAR = QObject::tr("OSCAR");
STR_TR_OSCAR = QString("OSCAR");
//STR_TR_AppVersion = QObject::tr("v%1").arg(getVersion());
STR_TR_Mode = QObject::tr("Mode");

12
oscar/SleepLib/day.cpp
View File

@ -173,20 +173,20 @@ QString Day::calcMiddleLabel(ChannelID code)
{
int c = p_profile->general->prefCalcMiddle();
if (c == 0) {
return QObject::tr("%1 %2").arg(STR_TR_Median).arg(schema::channel[code].label());
return QString("%1 %2").arg(STR_TR_Median).arg(schema::channel[code].label());
} else if (c == 1) {
return QObject::tr("%1 %2").arg(STR_TR_WAvg).arg(schema::channel[code].label());
return QString("%1 %2").arg(STR_TR_WAvg).arg(schema::channel[code].label());
} else {
return QObject::tr("%1 %2").arg(STR_TR_Avg).arg(schema::channel[code].label());
return QString("%1 %2").arg(STR_TR_Avg).arg(schema::channel[code].label());
}
}
QString Day::calcMaxLabel(ChannelID code)
{
return QObject::tr("%1 %2").arg(p_profile->general->prefCalcMax() ? QObject::tr("99.5%") : STR_TR_Max).arg(schema::channel[code].label());
return QString("%1 %2").arg(p_profile->general->prefCalcMax() ? QObject::tr("99.5%") : STR_TR_Max).arg(schema::channel[code].label());
}
QString Day::calcPercentileLabel(ChannelID code)
{
return QObject::tr("%1% %2").arg(p_profile->general->prefCalcPercentile(),0, 'f',0).arg(schema::channel[code].label());
return QString("%1% %2").arg(p_profile->general->prefCalcPercentile(),0, 'f',0).arg(schema::channel[code].label());
}
EventDataType Day::countInsideSpan(ChannelID span, ChannelID code)
@ -1543,7 +1543,7 @@ QString Day::getPressureRelief()
// TODO: This is an awful hack that depends on the enum ordering of the pressure relief mode.
// See the comment in getCPAPModeStr().
int pr_mode = qRound(settings_wavg(pr_mode_chan));
pr_str = QObject::tr("%1%2").arg(loader->PresReliefLabel()).arg(schema::channel[pr_mode_chan].option(pr_mode));
pr_str = QString("%1%2").arg(loader->PresReliefLabel()).arg(schema::channel[pr_mode_chan].option(pr_mode));
int pr_level = -1;
if (pr_level_chan != NoChannel && settingExists(pr_level_chan)) {

2
oscar/SleepLib/journal.cpp
View File

@ -23,7 +23,7 @@ JournalEntry::JournalEntry(QDate date)
{
Machine * jmach = p_profile->GetMachine(MT_JOURNAL);
if (jmach == nullptr) { // Create Journal machine record if it doesn't already exist
MachineInfo info(MT_JOURNAL,0, "Journal", QObject::tr("Journal Data"), QString(), QString(), QString(), QObject::tr("OSCAR"), QDateTime::currentDateTime(), journal_data_version);
MachineInfo info(MT_JOURNAL,0, "Journal", QObject::tr("Journal Data"), QString(), QString(), QString(), QString("OSCAR"), QDateTime::currentDateTime(), journal_data_version);
// Using machine ID 1 rather than a random number, so in future, if profile.xml gets screwed up they'll get their data back..
// TODO: Perhaps search for unlinked journal folders here to save some anger and frustration? :P

2
oscar/SleepLib/schema.cpp
View File

@ -206,7 +206,7 @@ void init()
schema::channel[OXI_Pulse].setUpperThreshold(130);
schema::channel.add(GRP_OXI, new Channel(OXI_SPO2 = 0x1801, WAVEFORM, MT_OXIMETER, SESSION, STR_GRAPH_Oxi_SPO2,
QObject::tr("SpO2 %"), QObject::tr("Blood-oxygen saturation percentage"), QObject::tr("SpO2"), STR_UNIT_Percentage, DEFAULT, QColor("blue")));
QString("SpO2 %"), QObject::tr("Blood-oxygen saturation percentage"), QString("SpO2"), STR_UNIT_Percentage, DEFAULT, QColor("blue")));
schema::channel[OXI_SPO2].setLowerThreshold(88);
schema::channel.add(GRP_OXI, new Channel(OXI_Plethy = 0x1802, WAVEFORM, MT_OXIMETER, SESSION, STR_GRAPH_Oxi_Plethy,

3
oscar/aboutdialog.ui
View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
<string notr="true">Dialog</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
@ -129,7 +129,6 @@
<property name="font">
<font>
<pointsize>14</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>

2
oscar/daily.cpp
View File

@ -1319,7 +1319,7 @@ QString Daily::getStatisticsInfo(Day * day)
.arg(STR_TR_Channel)
.arg(STR_TR_Min)
.arg(midname)
.arg(tr("%1%2").arg(percentile*100,0,'f',0).arg(STR_UNIT_Percentage))
.arg(QString("%1%2").arg(percentile*100,0,'f',0).arg(STR_UNIT_Percentage))
.arg(ST_max == ST_MAX?STR_TR_Max:tr("99.5%"));
ChannelID chans[]={

8
oscar/daily.ui
View File

@ -432,7 +432,7 @@
</palette>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="spacing">
@ -1047,7 +1047,7 @@ QToolButton:pressed {
</font>
</property>
<property name="text">
<string> i </string>
<string notr="true"> i </string>
</property>
</widget>
</item>
@ -1055,7 +1055,6 @@ QToolButton:pressed {
<widget class="QToolButton" name="JournalNotesBold">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1178,7 +1177,6 @@ QToolButton:pressed {
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1191,7 +1189,6 @@ QToolButton:pressed {
<widget class="QLabel" name="label_9">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
@ -1284,7 +1281,6 @@ QSlider::handle:horizontal {
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>

4
oscar/exportcsv.cpp
View File

@ -71,7 +71,7 @@ ExportCSV::~ExportCSV()
void ExportCSV::on_filenameBrowseButton_clicked()
{
QString timestamp = tr("OSCAR_");
QString timestamp = QString("OSCAR_");
timestamp += p_profile->Get("UserName") + "_";
if (ui->rb1_details->isChecked()) { timestamp += tr("Details_"); }
@ -219,7 +219,7 @@ void ExportCSV::on_exportButton_clicked()
}
for (int i = 0; i < p90list.size(); i++) {
header += sep + tr("%1% ").arg(percent*100.0, 0, 'f', 0) + schema::channel[p90list[i]].label();
header += sep + QString("%1% ").arg(percent*100.0, 0, 'f', 0) + schema::channel[p90list[i]].label();
}
for (int i = 0; i < maxlist.size(); i++) {

4
oscar/help.ui
View File

@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
@ -64,7 +64,6 @@ color: rgb(255,255,255);</string>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -190,7 +189,6 @@ color: rgb(255,255,255);</string>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>

479
oscar/mainwindow.ui
View File

@ -24,421 +24,13 @@
</property>
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Light">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Midlight">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Dark">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>127</red>
<green>127</green>
<blue>127</blue>
</color>
</brush>
</colorrole>
<colorrole role="Mid">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>170</red>
<green>170</green>
<blue>170</blue>
</color>
</brush>
</colorrole>
<colorrole role="Text">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="BrightText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="ButtonText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Shadow">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="AlternateBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="ToolTipBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>220</blue>
</color>
</brush>
</colorrole>
<colorrole role="ToolTipText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Light">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Midlight">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Dark">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>127</red>
<green>127</green>
<blue>127</blue>
</color>
</brush>
</colorrole>
<colorrole role="Mid">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>170</red>
<green>170</green>
<blue>170</blue>
</color>
</brush>
</colorrole>
<colorrole role="Text">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="BrightText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="ButtonText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Shadow">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="AlternateBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="ToolTipBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>220</blue>
</color>
</brush>
</colorrole>
<colorrole role="ToolTipText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>127</red>
<green>127</green>
<blue>127</blue>
</color>
</brush>
</colorrole>
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Light">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Midlight">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Dark">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>127</red>
<green>127</green>
<blue>127</blue>
</color>
</brush>
</colorrole>
<colorrole role="Mid">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>170</red>
<green>170</green>
<blue>170</blue>
</color>
</brush>
</colorrole>
<colorrole role="Text">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>127</red>
<green>127</green>
<blue>127</blue>
</color>
</brush>
</colorrole>
<colorrole role="BrightText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="ButtonText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>127</red>
<green>127</green>
<blue>127</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Shadow">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="AlternateBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="ToolTipBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>220</blue>
</color>
</brush>
</colorrole>
<colorrole role="ToolTipText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</disabled>
<active/>
<inactive/>
<disabled/>
</palette>
</property>
<property name="windowTitle">
<string>OSCAR</string>
<string notr="true">OSCAR</string>
</property>
<property name="windowIcon">
<iconset resource="Resources.qrc">
@ -1211,8 +803,8 @@ QToolBox::tab:selected {
<rect>
<x>0</x>
<y>0</y>
<width>175</width>
<height>690</height>
<width>153</width>
<height>697</height>
</rect>
</property>
<property name="palette">
@ -1669,8 +1261,8 @@ border: 2px solid #56789a; border-radius: 30px;
<rect>
<x>0</x>
<y>0</y>
<width>175</width>
<height>690</height>
<width>167</width>
<height>687</height>
</rect>
</property>
<property name="palette">
@ -2390,6 +1982,15 @@ border: 2px solid #56789a; border-radius: 30px;
</color>
</brush>
</colorrole>
<colorrole role="PlaceholderText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
@ -2455,6 +2056,15 @@ border: 2px solid #56789a; border-radius: 30px;
</color>
</brush>
</colorrole>
<colorrole role="PlaceholderText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
@ -2520,6 +2130,15 @@ border: 2px solid #56789a; border-radius: 30px;
</color>
</brush>
</colorrole>
<colorrole role="PlaceholderText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
@ -2711,10 +2330,10 @@ border-radius: 10px;
</property>
<property name="html">
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;meta charset=&quot;utf-8&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openLinks">
<bool>false</bool>
@ -2728,8 +2347,8 @@ p, li { white-space: pre-wrap; }
<rect>
<x>0</x>
<y>0</y>
<width>175</width>
<height>690</height>
<width>167</width>
<height>687</height>
</rect>
</property>
<property name="mouseTracking">
@ -2768,10 +2387,10 @@ p, li { white-space: pre-wrap; }
</property>
<property name="html">
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;meta charset=&quot;utf-8&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openLinks">
<bool>false</bool>
@ -2791,7 +2410,7 @@ p, li { white-space: pre-wrap; }
<x>0</x>
<y>0</y>
<width>1023</width>
<height>18</height>
<height>21</height>
</rect>
</property>
<property name="sizePolicy">
@ -2998,7 +2617,13 @@ p, li { white-space: pre-wrap; }
</action>
<action name="action_CycleTabs">
<property name="text">
<string>-</string>
<string notr="true">-</string>
</property>
<property name="iconText">
<string notr="true">-</string>
</property>
<property name="toolTip">
<string notr="true">-</string>
</property>
<property name="shortcut">
<string notr="true">Ctrl+Tab</string>
@ -3284,7 +2909,7 @@ p, li { white-space: pre-wrap; }
<string>Show Pie Chart on Daily page</string>
</property>
<property name="shortcut">
<string>F3</string>
<string notr="true">F3</string>
</property>
</action>
<action name="action_Standard_Graph_Order">

8
oscar/newprofile.ui
View File

@ -40,7 +40,7 @@
<item>
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="welcomePage">
<layout class="QVBoxLayout" name="verticalLayout_8">
@ -54,6 +54,9 @@
<string>about:blank</string>
</url>
</property>
<property name="searchPaths">
<stringlist notr="true"/>
</property>
<property name="openExternalLinks">
<bool>false</bool>
</property>
@ -868,13 +871,12 @@
<property name="font">
<font>
<pointsize>14</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>OSCAR</string>
<string notr="true">OSCAR</string>
</property>
<property name="alignment">
<set>Qt::AlignHCenter|Qt::AlignTop</set>

6
oscar/overview.ui
View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
@ -197,7 +197,7 @@ QToolButton:pressed {
}</string>
</property>
<property name="text">
<string>...</string>
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="Resources.qrc">
@ -246,7 +246,7 @@ QToolButton:pressed {
}</string>
</property>
<property name="text">
<string>...</string>
<string notr="true">...</string>
</property>
<property name="checkable">
<bool>true</bool>

2
oscar/oximeterimport.cpp
View File

@ -596,7 +596,7 @@ void OximeterImport::on_calendarWidget_clicked(const QDate &date)
sessbar->update();
} else if (ui->radioSyncOximeter) {
qDebug() << "oximod - Using oximeter date and time";
ui->sessbarLabel->setText(tr("%1").arg(date.toString(Qt::SystemLocaleLongDate)));
ui->sessbarLabel->setText(QString("%1").arg(date.toString(Qt::SystemLocaleLongDate)));
ui->dateTimeEdit->setDateTime(QDateTime(date, ui->dateTimeEdit->dateTime().time()));
}
}

363
oscar/oximeterimport.ui
View File

@ -6,12 +6,12 @@
<rect>
<x>0</x>
<y>0</y>
<width>1312</width>
<height>661</height>
<width>1370</width>
<height>748</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
<string notr="true">Dialog</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
<property name="leftMargin">
@ -77,15 +77,6 @@
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Button">
<brush brushstyle="LinearGradientPattern">
<gradient startx="0.000000000000000" starty="0.000000000000000" endx="1.000000000000000" endy="0.000000000000000" type="LinearGradient" spread="PadSpread" coordinatemode="ObjectBoundingMode">
@ -106,69 +97,6 @@
</gradient>
</brush>
</colorrole>
<colorrole role="Light">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>153</red>
<green>174</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Midlight">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>103</red>
<green>132</green>
<blue>243</blue>
</color>
</brush>
</colorrole>
<colorrole role="Dark">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>27</red>
<green>45</green>
<blue>116</blue>
</color>
</brush>
</colorrole>
<colorrole role="Mid">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>36</red>
<green>60</green>
<blue>155</blue>
</color>
</brush>
</colorrole>
<colorrole role="Text">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="BrightText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="ButtonText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base">
<brush brushstyle="LinearGradientPattern">
<gradient startx="0.000000000000000" starty="0.000000000000000" endx="1.000000000000000" endy="0.000000000000000" type="LinearGradient" spread="PadSpread" coordinatemode="ObjectBoundingMode">
@ -209,53 +137,8 @@
</gradient>
</brush>
</colorrole>
<colorrole role="Shadow">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="AlternateBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>154</red>
<green>172</green>
<blue>243</blue>
</color>
</brush>
</colorrole>
<colorrole role="ToolTipBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>220</blue>
</color>
</brush>
</colorrole>
<colorrole role="ToolTipText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Button">
<brush brushstyle="LinearGradientPattern">
<gradient startx="0.000000000000000" starty="0.000000000000000" endx="1.000000000000000" endy="0.000000000000000" type="LinearGradient" spread="PadSpread" coordinatemode="ObjectBoundingMode">
@ -276,69 +159,6 @@
</gradient>
</brush>
</colorrole>
<colorrole role="Light">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>153</red>
<green>174</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Midlight">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>103</red>
<green>132</green>
<blue>243</blue>
</color>
</brush>
</colorrole>
<colorrole role="Dark">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>27</red>
<green>45</green>
<blue>116</blue>
</color>
</brush>
</colorrole>
<colorrole role="Mid">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>36</red>
<green>60</green>
<blue>155</blue>
</color>
</brush>
</colorrole>
<colorrole role="Text">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="BrightText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="ButtonText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base">
<brush brushstyle="LinearGradientPattern">
<gradient startx="0.000000000000000" starty="0.000000000000000" endx="1.000000000000000" endy="0.000000000000000" type="LinearGradient" spread="PadSpread" coordinatemode="ObjectBoundingMode">
@ -379,53 +199,8 @@
</gradient>
</brush>
</colorrole>
<colorrole role="Shadow">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="AlternateBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>154</red>
<green>172</green>
<blue>243</blue>
</color>
</brush>
</colorrole>
<colorrole role="ToolTipBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>220</blue>
</color>
</brush>
</colorrole>
<colorrole role="ToolTipText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>27</red>
<green>45</green>
<blue>116</blue>
</color>
</brush>
</colorrole>
<colorrole role="Button">
<brush brushstyle="LinearGradientPattern">
<gradient startx="0.000000000000000" starty="0.000000000000000" endx="1.000000000000000" endy="0.000000000000000" type="LinearGradient" spread="PadSpread" coordinatemode="ObjectBoundingMode">
@ -446,69 +221,6 @@
</gradient>
</brush>
</colorrole>
<colorrole role="Light">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>153</red>
<green>174</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Midlight">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>103</red>
<green>132</green>
<blue>243</blue>
</color>
</brush>
</colorrole>
<colorrole role="Dark">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>27</red>
<green>45</green>
<blue>116</blue>
</color>
</brush>
</colorrole>
<colorrole role="Mid">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>36</red>
<green>60</green>
<blue>155</blue>
</color>
</brush>
</colorrole>
<colorrole role="Text">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>27</red>
<green>45</green>
<blue>116</blue>
</color>
</brush>
</colorrole>
<colorrole role="BrightText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="ButtonText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>27</red>
<green>45</green>
<blue>116</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base">
<brush brushstyle="LinearGradientPattern">
<gradient startx="0.000000000000000" starty="0.000000000000000" endx="1.000000000000000" endy="0.000000000000000" type="LinearGradient" spread="PadSpread" coordinatemode="ObjectBoundingMode">
@ -549,42 +261,6 @@
</gradient>
</brush>
</colorrole>
<colorrole role="Shadow">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="AlternateBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>54</red>
<green>90</green>
<blue>232</blue>
</color>
</brush>
</colorrole>
<colorrole role="ToolTipBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>220</blue>
</color>
</brush>
</colorrole>
<colorrole role="ToolTipText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
@ -728,10 +404,10 @@ border-radius: 0px;</string>
</property>
<property name="html">
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;meta charset=&quot;utf-8&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'.SF NS Text'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Lucida Grande UI';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Lucida Grande UI'; font-size:13pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="placeholderText">
<string notr="true"/>
@ -820,7 +496,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
</font>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;Please note: &lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Make sure your correct oximeter type is selected otherwise import will fail.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;Please note: &lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;First select your correct oximeter type from the pull-down menu below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignHCenter|Qt::AlignTop</set>
@ -907,12 +583,17 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
<item>
<widget class="QLabel" name="label_13">
<property name="text">
<string>Select Oximeter Type:</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt; font-weight:700;&quot;&gt;FIRST Select your Oximeter from these groups:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="oximeterType">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
@ -958,7 +639,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
</property>
<property name="font">
<font>
<weight>75</weight>
<pointsize>11</pointsize>
<italic>true</italic>
<bold>true</bold>
</font>
@ -1045,7 +726,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
<bool>true</bool>
</property>
<property name="cursorPosition">
<number>0</number>
<number>7</number>
</property>
<property name="placeholderText">
<string notr="true"/>
@ -1383,7 +1064,6 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
<widget class="QCheckBox" name="showLiveGraphs">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1414,7 +1094,6 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
<widget class="QLabel" name="label_4">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1450,12 +1129,11 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
<widget class="QLabel" name="label_7">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>SpO2 %</string>
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;SpO&lt;span style=&quot; vertical-align:sub;&quot;&gt;2&lt;/span&gt; %&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignHCenter|Qt::AlignTop</set>
@ -1532,7 +1210,6 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
<widget class="QLabel" name="label_8">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1719,11 +1396,11 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
</size>
</property>
<property name="title">
<string>Day recording (normally would of) started</string>
<string>Day recording (normally would have) started</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
<property name="spacing">
<number>-1</number>
<number>6</number>
</property>
<property name="leftMargin">
<number>0</number>
@ -1914,7 +1591,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
</sizepolicy>
</property>
<property name="text">
<string>...</string>
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="Resources.qrc">
@ -1953,7 +1630,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
</sizepolicy>
</property>
<property name="text">
<string>...</string>
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="Resources.qrc">

6
oscar/oximetry.ui
View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
@ -157,7 +157,7 @@ QToolButton:pressed {
</sizepolicy>
</property>
<property name="text">
<string>SpO2</string>
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;SpO&lt;span style=&quot; vertical-align:sub;&quot;&gt;2&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
@ -343,7 +343,7 @@ QToolButton:pressed {
}</string>
</property>
<property name="text">
<string>...</string>
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="Resources.qrc">

4
oscar/preferencesdialog.cpp
View File

@ -318,8 +318,8 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
ui->maskLeaks4Slider->setValue(profile->cpap->custom4cmH2OLeaks()*10.0);
ui->maskLeaks20Slider->setValue(profile->cpap->custom20cmH2OLeaks()*10.0);
ui->maskLeaks4Label->setText(tr("%1 %2").arg(profile->cpap->custom4cmH2OLeaks(), 5, 'f', 1).arg(STR_UNIT_LPM));
ui->maskLeaks20Label->setText(tr("%1 %2").arg(profile->cpap->custom20cmH2OLeaks(), 5, 'f', 1).arg(STR_UNIT_LPM));
ui->maskLeaks4Label->setText(QString("%1 %2").arg(profile->cpap->custom4cmH2OLeaks(), 5, 'f', 1).arg(STR_UNIT_LPM));
ui->maskLeaks20Label->setText(QString("%1 %2").arg(profile->cpap->custom20cmH2OLeaks(), 5, 'f', 1).arg(STR_UNIT_LPM));
/* QLocale locale=QLocale::system();
QString shortformat=locale.dateFormat(QLocale::ShortFormat);

37
oscar/preferencesdialog.ui
View File

@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>942</width>
<height>655</height>
<height>726</height>
</rect>
</property>
<property name="sizePolicy">
@ -63,7 +63,7 @@
</sizepolicy>
</property>
<property name="currentIndex">
<number>5</number>
<number>2</number>
</property>
<widget class="QWidget" name="importTab">
<attribute name="title">
@ -1011,7 +1011,7 @@ This option must be enabled before import, otherwise a purge is required.</strin
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="apneaFlowRestriction2">
<property name="suffix">
<string>%</string>
<string notr="true">%</string>
</property>
<property name="value">
<double>10.000000000000000</double>
@ -1044,7 +1044,7 @@ This option must be enabled before import, otherwise a purge is required.</strin
<item row="3" column="0">
<widget class="QLabel" name="label_50">
<property name="text">
<string>#2</string>
<string notr="true">#2</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -1105,7 +1105,7 @@ p, li { white-space: pre-wrap; }
A value of 20% works well for detecting apneas. </string>
</property>
<property name="suffix">
<string>%</string>
<string notr="true">%</string>
</property>
<property name="value">
<double>10.000000000000000</double>
@ -1138,7 +1138,7 @@ A value of 20% works well for detecting apneas. </string>
<item row="2" column="0">
<widget class="QLabel" name="label_49">
<property name="text">
<string>#1</string>
<string notr="true">#1</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -1247,7 +1247,6 @@ Defaults to 60 minutes.. Highly recommend it's left at this value.</string>
<widget class="QCheckBox" name="showLeakRedline">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
@ -1288,7 +1287,7 @@ Defaults to 60 minutes.. Highly recommend it's left at this value.</string>
<string>User definable threshold considered large leak</string>
</property>
<property name="suffix">
<string> L/min</string>
<string> l/min</string>
</property>
<property name="decimals">
<number>1</number>
@ -1405,7 +1404,7 @@ as this is the only value available on summary-only days.</string>
<item row="4" column="0">
<widget class="QLabel" name="label_29">
<property name="text">
<string>Culminative Indices</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cumulative Indices&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
@ -1582,7 +1581,7 @@ as this is the only value available on summary-only days.</string>
<item row="0" column="1">
<widget class="QSpinBox" name="oxiDesaturationThreshold">
<property name="suffix">
<string>%</string>
<string notr="true">%</string>
</property>
</widget>
</item>
@ -1626,7 +1625,7 @@ as this is the only value available on summary-only days.</string>
<item row="0" column="0">
<widget class="QLabel" name="label_52">
<property name="text">
<string>Flag SPO2 Desaturations Below</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Flag SpO&lt;span style=&quot; vertical-align:sub;&quot;&gt;2&lt;/span&gt; Desaturations Below&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -1677,7 +1676,7 @@ as this is the only value available on summary-only days.</string>
</sizepolicy>
</property>
<property name="text">
<string>SPO2</string>
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;SpO&lt;span style=&quot; vertical-align:sub;&quot;&gt;2&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
@ -1742,7 +1741,7 @@ as this is the only value available on summary-only days.</string>
<string>Percentage drop in oxygen saturation</string>
</property>
<property name="suffix">
<string>%</string>
<string notr="true">%</string>
</property>
<property name="decimals">
<number>0</number>
@ -1787,12 +1786,12 @@ as this is the only value available on summary-only days.</string>
</property>
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;meta charset=&quot;utf-8&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.84158pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; font-weight:600;&quot;&gt;Syncing Oximetry and CPAP Data&lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;CMS50 data imported from SpO2Review (from .spoR files) or the serial import method does &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; font-weight:600; text-decoration: underline;&quot;&gt;not&lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt; have the correct timestamp needed to sync.&lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;CMS50 data imported from SpO2Review (from .spoR files) or the serial import method do &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; font-weight:600; text-decoration: underline;&quot;&gt;not&lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt; have the correct timestamp needed to sync.&lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;Live view mode (using a serial cable) is one way to acheive an accurate sync on CMS50 oximeters, but does not counter for CPAP clock drift.&lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
@ -2097,7 +2096,6 @@ Mainly affects the importer.</string>
<widget class="QCheckBox" name="automaticallyCheckUpdates">
<property name="font">
<font>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
<underline>false</underline>
@ -2815,7 +2813,6 @@ Try it and see if you like it.</string>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -2834,7 +2831,6 @@ Try it and see if you like it.</string>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -2853,7 +2849,6 @@ Try it and see if you like it.</string>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -2875,7 +2870,6 @@ Try it and see if you like it.</string>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -3141,7 +3135,6 @@ Try it and see if you like it.</string>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>

4
oscar/profileselector.cpp
View File

@ -132,7 +132,7 @@ void ProfileSelector::updateProfileList()
// Problem: Can't access profile details until it's loaded.
QString usersname;
if (!prof->user->lastName().isEmpty()) {
usersname = tr("%1, %2").arg(prof->user->lastName()).arg(prof->user->firstName());
usersname = QString("%1, %2").arg(prof->user->lastName()).arg(prof->user->firstName());
}
model->setData(model->index(row, 0, QModelIndex()), name);
@ -309,7 +309,7 @@ void ProfileSelector::on_buttonEditProfile_clicked()
if (newprof->exec() != NewProfile::Rejected) {
QString usersname;
if (!prof->user->lastName().isEmpty()) {
usersname = tr("%1, %2").arg(prof->user->lastName()).arg(prof->user->firstName());
usersname = QString("%1, %2").arg(prof->user->lastName()).arg(prof->user->firstName());
}
proxy->setData(proxy->index(ui->profileView->currentIndex().row(), 5, QModelIndex()), usersname);

10
oscar/profileselector.ui
View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
@ -52,7 +52,7 @@ QToolButton:pressed {
}</string>
</property>
<property name="text">
<string>...</string>
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="Resources.qrc">
@ -176,12 +176,11 @@ QToolButton:pressed {
<property name="font">
<font>
<pointsize>13</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>OSCAR</string>
<string notr="true">OSCAR</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@ -252,7 +251,6 @@ QToolButton:pressed {
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -273,7 +271,6 @@ QToolButton:pressed {
</property>
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
@ -298,7 +295,6 @@ QToolButton:pressed {
<widget class="QLabel" name="diskSpaceInfo">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>

2
oscar/reports.cpp
View File

@ -552,7 +552,7 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
if (first) {
QDateTime timestamp = QDateTime::currentDateTime();
QString footer = QObject::tr("%1 %2 %3").arg(timestamp.toString(MedDateFormat+" hh:mm"))
QString footer = QString("%1 %2 %3").arg(timestamp.toString(MedDateFormat+" hh:mm"))
.arg(STR_TR_OSCAR)
.arg(getVersion());

14
oscar/reports.ui
View File

@ -11,18 +11,24 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<property name="margin" stdset="0">
<number>0</number>
</property>
<item>
<widget class="QWebView" name="webView">
<property name="url">
<widget class="QWebView" name="webView" native="true">
<property name="toolTipDuration">
<number>-14</number>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="url" stdset="0">
<url>
<string>about:blank</string>
</url>

11
oscar/welcome.ui
View File

@ -7,11 +7,11 @@
<x>0</x>
<y>0</y>
<width>965</width>
<height>748</height>
<height>750</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true">Form</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
@ -120,7 +120,6 @@
<property name="font">
<font>
<pointsize>15</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -448,10 +447,10 @@ border: 2px solid #56789a; border-radius: 10px;
</property>
<property name="html">
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;meta charset=&quot;utf-8&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Segoe UI'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>