mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow translation of the cylinder use strings for the UI

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-11-17 14:15:19 +00:00
parent 0c3f13d128
commit 8856417b2f
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dive.c
View file

@ -26,10 +26,11 @@ static const char *default_tags[] = {
QT_TRANSLATE_NOOP("gettextFromC", "deco")
};
const char *cylinderuse_text[] = { "OC-gas", "diluent", "oxygen" };
const char *cylinderuse_text[] = {
QT_TRANSLATE_NOOP("gettextFromC", "OC-gas"), QT_TRANSLATE_NOOP("gettextFromC", "diluent"), QT_TRANSLATE_NOOP("gettextFromC", "oxygen")
};
const char *dctype_text[] = { "OC", "CCR", "PSCR" };
int event_is_gaschange(struct event *ev)
{
return ev->type == SAMPLE_EVENT_GASCHANGE ||
@ -586,7 +587,7 @@ void copy_cylinders(struct dive *s, struct dive *d, bool used_only)
int cylinderuse_from_text(const char *text)
{
for (enum cylinderuse i = 0; i < NUM_GAS_USE; i++) {
if (same_string(text, cylinderuse_text[i]))
if (same_string(text, cylinderuse_text[i]) || same_string(text, translate("gettextFromC", cylinderuse_text[i])))
return i;
}
return -1;

7
qt-ui/modeldelegates.cpp
View file

@ -1,10 +1,11 @@
#include "modeldelegates.h"
#include "../dive.h"
#include "../divelist.h"
#include "dive.h"
#include "divelist.h"
#include "starwidget.h"
#include "models.h"
#include "diveplanner.h"
#include "simplewidgets.h"
#include "gettextfromc.h"
#include <QtDebug>
#include <QPainter>
@ -286,7 +287,7 @@ QWidget *TankUseDelegate::createEditor(QWidget * parent, const QStyleOptionViewI
{
QComboBox *comboBox = new QComboBox(parent);
for (int i = 0; i < NUM_GAS_USE; i++)
comboBox->addItem(QString(cylinderuse_text[i]));
comboBox->addItem(gettextFromC::instance()->trGettext(cylinderuse_text[i]));
return comboBox;
}

2
qt-ui/models.cpp
View file

@ -173,7 +173,7 @@ QVariant CylindersModel::data(const QModelIndex &index, int role) const
ret = get_depth_string(cyl->depth, true);
break;
case USE:
ret = QString(cylinderuse_text[cyl->cylinder_use]);
ret = gettextFromC::instance()->trGettext(cylinderuse_text[cyl->cylinder_use]);
break;
}
break;