From 7c6e5ed5dbc32c90984b1cc92bc9dfc023295c84 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Thu, 17 May 2018 10:04:41 +0200 Subject: Distinguish between user and internal divemode names The former should be translated but not those that go to xml/git. ... and fix capitalization of pSCR. Suggested-by: Stefan Fuchs Signed-off-by: Robert C. Helling --- profile-widget/diveeventitem.cpp | 2 +- profile-widget/profilewidget2.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'profile-widget') diff --git a/profile-widget/diveeventitem.cpp b/profile-widget/diveeventitem.cpp index ebb91b463..c9fe4bf08 100644 --- a/profile-widget/diveeventitem.cpp +++ b/profile-widget/diveeventitem.cpp @@ -194,7 +194,7 @@ void DiveEventItem::setupToolTipString(struct gasmix *lastgasmix) } *lastgasmix = *mix; } else if (same_string(internalEvent->name, "modechange")) { - name += tr(": %1").arg(divemode_text[internalEvent->value]); + name += tr(": %1").arg(divemode_text_ui[internalEvent->value]); } else if (value) { if (type == SAMPLE_EVENT_PO2 && same_string(internalEvent->name, "SP change")) { name += QString(": %1bar").arg((double)value / 1000, 0, 'f', 1); diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 4909f5dbe..dc26ea520 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -1433,21 +1433,21 @@ void ProfileWidget2::contextMenuEvent(QContextMenuEvent *event) QMenu *changeMode = m.addMenu(tr("Change divemode")); if (divemode != OC) { QAction *action = new QAction(&m); - action->setText("OC"); + action->setText(divemode_text_ui[OC]); connect(action, SIGNAL(triggered(bool)), this, SLOT(addDivemodeSwith())); action->setData(event->globalPos()); changeMode->addAction(action); } if (divemode != CCR) { QAction *action = new QAction(&m); - action->setText("CCR"); + action->setText(divemode_text_ui[CCR]); connect(action, SIGNAL(triggered(bool)), this, SLOT(addDivemodeSwith())); action->setData(event->globalPos()); changeMode->addAction(action); } if (divemode != PSCR) { QAction *action = new QAction(&m); - action->setText("PSCR"); + action->setText(divemode_text_ui[PSCR]); connect(action, SIGNAL(triggered(bool)), this, SLOT(addDivemodeSwith())); action->setData(event->globalPos()); changeMode->addAction(action); @@ -1619,7 +1619,7 @@ void ProfileWidget2::addDivemodeSwith() QAction *action = qobject_cast(sender()); QPointF scenePos = mapToScene(mapFromGlobal(action->data().toPoint())); for (i = 0; i < UNDEF_COMP_TYPE; i++) - if (QString(divemode_text[i]) == action->text()) + if (QString(divemode_text_ui[i]) == action->text()) add_event(current_dc, lrint(timeAxis->valueAt(scenePos)), 8, 0, i, "modechange"); invalidate_dive_cache(current_dive); mark_divelist_changed(true); -- cgit v1.2.3-70-g09d2