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 --- desktop-widgets/diveplanner.cpp | 3 ++- desktop-widgets/tab-widgets/maintab.cpp | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp index b22d268d8..bbaf8dc7f 100644 --- a/desktop-widgets/diveplanner.cpp +++ b/desktop-widgets/diveplanner.cpp @@ -447,7 +447,8 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) disableDecoElements((int) prefs.planner_deco_mode); // should be the same order as in dive_comp_type! - rebreather_modes << tr("Open circuit") << tr("CCR") << tr("pSCR"); + for (int i=0; i < FREEDIVE; i++) + rebreather_modes.append(QString(divemode_text_ui[i])); ui.rebreathermode->insertItems(0, rebreather_modes); modeMapper = new QSignalMapper(this); diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index 0f50800c9..c9dccc7ea 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -109,7 +109,10 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent), connect(ui.weights, SIGNAL(addButtonClicked()), this, SLOT(addWeight_clicked())); // This needs to be the same order as enum dive_comp_type in dive.h! - ui.DiveType->insertItems(0, QStringList() << tr("OC") << tr("CCR") << tr("pSCR") << tr("Freedive")); + QStringList types = QStringList(); + for (int i = 0; i < NUM_DIVEMODE; i++) + types.append(QString(divemode_text_ui[i])); + ui.DiveType->insertItems(0, types); connect(ui.DiveType, SIGNAL(currentIndexChanged(int)), this, SLOT(divetype_Changed(int))); connect(ui.cylinders->view(), SIGNAL(clicked(QModelIndex)), this, SLOT(editCylinderWidget(QModelIndex))); -- cgit v1.2.3-70-g09d2