SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

Fix language support issue

Browse Source
This commit is contained in:
DreamSourceLab
2015-12-14 21:21:16 +08:00
parent 6c7101c2cc
commit ceda90aec5
5 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DSView/pv/dialogs/deviceoptions.cpp
View File

@@ -72,7 +72,7 @@ DeviceOptions::DeviceOptions(QWidget *parent, boost::shared_ptr<pv::device::DevI
GVariant* gvar = _dev_inst->get_config(NULL, NULL, SR_CONF_OPERATION_MODE);
if (gvar != NULL) {
_mode = g_variant_get_string(gvar, NULL);
_mode = QString::fromUtf8(g_variant_get_string(gvar, NULL));
g_variant_unref(gvar);
}
connect(&_mode_check, SIGNAL(timeout()), this, SLOT(mode_check()));
@@ -124,7 +124,7 @@ QWidget* DeviceOptions::get_property_form()
{
assert(p);
const QString label = p->labeled_widget() ? QString() : p->name();
if (label == "Operation Mode")
if (label == tr("Operation Mode"))
layout->addRow(label, p->get_widget(form, true));
else
layout->addRow(label, p->get_widget(form));
@@ -159,7 +159,7 @@ void DeviceOptions::setup_probes()
const char **const options = g_variant_get_strv(gvar_opts, &num_opts);
GVariant* gvar = _dev_inst->get_config(NULL, NULL, SR_CONF_CHANNEL_MODE);
if (gvar != NULL) {
ch_mode = g_variant_get_string(gvar, NULL);
ch_mode = QString::fromUtf8(g_variant_get_string(gvar, NULL));
g_variant_unref(gvar);
for (unsigned int i=0; i<num_opts; i++){
@@ -167,7 +167,7 @@ void DeviceOptions::setup_probes()
_probes_box_layout.addWidget(ch_opts, row0, col, 1, 8);
connect(ch_opts, SIGNAL(pressed()), this, SLOT(channel_check()));
row0++;
if (QString::fromLocal8Bit(options[i]) == ch_mode)
if (QString::fromUtf8(options[i]) == ch_mode)
ch_opts->setChecked(true);
}
}
@@ -247,7 +247,7 @@ void DeviceOptions::mode_check()
QString mode;
GVariant* gvar = _dev_inst->get_config(NULL, NULL, SR_CONF_OPERATION_MODE);
if (gvar != NULL) {
mode = g_variant_get_string(gvar, NULL);
mode = QString::fromUtf8(g_variant_get_string(gvar, NULL));
g_variant_unref(gvar);
if (mode != _mode) {
@@ -276,7 +276,7 @@ void DeviceOptions::channel_check()
{
QRadioButton* sc=dynamic_cast<QRadioButton*>(sender());
if(sc != NULL)
_dev_inst->set_config(NULL, NULL, SR_CONF_CHANNEL_MODE, g_variant_new_string(sc->text().toLocal8Bit()));
_dev_inst->set_config(NULL, NULL, SR_CONF_CHANNEL_MODE, g_variant_new_string(sc->text().toUtf8().data()));
setup_probes();
}

2
DSView/pv/prop/string.cpp
View File

@@ -64,7 +64,7 @@ void String::commit()
if (!_line_edit)
return;
QByteArray ba = _line_edit->text().toLocal8Bit();
QByteArray ba = _line_edit->text().toUtf8();
_setter(g_variant_new_string(ba.data()));
}

6
DSView/pv/view/view.cpp
View File

@@ -227,10 +227,8 @@ void View::zoom(double steps, int offset)
}
}
if (_session.get_device()->dev_inst()->mode != DSO) {
_offset = cursor_offset - _scale * offset;
_offset = max(min(_offset, get_max_offset()), get_min_offset());
}
_offset = cursor_offset - _scale * offset;
_offset = max(min(_offset, get_max_offset()), get_min_offset());
if (_scale != _preScale || _offset != _preOffset) {
_header->update();

BIN
DSView/res/DSCope.bin
View File

Binary file not shown.