diff options
author | Thomas Hartmann <thomas.hartmann@qt.io> | 2017-02-10 15:49:35 +0100 |
---|---|---|
committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2017-02-15 11:54:47 +0000 |
commit | dfe389804104d2e5f47dfadcbf65a6b5efd0208a (patch) | |
tree | 10f1f3e3405e3ab98f832abfa5fcea2575c81cce /src/plugins/qmldesigner/settingspage.cpp | |
parent | 6052e28b840a099171318f1284637b1eccb2047e (diff) |
QmlDesigner: Implement preliminary support for qsTranslate
There are now 3 options for QML translations in the options.
* qsTr (default)
* qsTrId
* qsTranslate
In case of qsTranslate the context is preserved when editing the text
and the context can be changed by setting a binding on the text property.
Task-number: QTCREATORBUG-17714
Change-Id: Ied2ccb84d98d99d5b920fe47ee6d8cb67ff2bd5b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/settingspage.cpp')
-rw-r--r-- | src/plugins/qmldesigner/settingspage.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp index bfe5884806c..5be651cecc5 100644 --- a/src/plugins/qmldesigner/settingspage.cpp +++ b/src/plugins/qmldesigner/settingspage.cpp @@ -106,8 +106,19 @@ DesignerSettings SettingsPageWidget::settings() const m_ui.designerEnableDebuggerCheckBox->isChecked()); settings.insert(DesignerSettingsKey::USE_ONLY_FALLBACK_PUPPET, m_ui.useDefaultPuppetRadioButton->isChecked()); - settings.insert(DesignerSettingsKey::USE_QSTR_FUNCTION, - m_ui.useQsTrFunctionRadioButton->isChecked()); + + int typeOfQsTrFunction; + + if (m_ui.useQsTrFunctionRadioButton->isChecked()) + typeOfQsTrFunction = 0; + else if (m_ui.useQsTrIdFunctionRadioButton->isChecked()) + typeOfQsTrFunction = 1; + else if (m_ui.useQsTranslateFunctionRadioButton->isChecked()) + typeOfQsTrFunction = 2; + else + typeOfQsTrFunction = 0; + + settings.insert(DesignerSettingsKey::TYPE_OF_QSTR_FUNCTION, typeOfQsTrFunction); settings.insert(DesignerSettingsKey::CONTROLS_STYLE, m_ui.styleLineEdit->text()); settings.insert(DesignerSettingsKey::FORWARD_PUPPET_OUTPUT, m_ui.forwardPuppetOutputComboBox->currentText()); @@ -160,9 +171,11 @@ void SettingsPageWidget::setSettings(const DesignerSettings &settings) m_ui.useQtRelatedPuppetRadioButton->setChecked(!settings.value( DesignerSettingsKey::USE_ONLY_FALLBACK_PUPPET).toBool()); m_ui.useQsTrFunctionRadioButton->setChecked(settings.value( - DesignerSettingsKey::USE_QSTR_FUNCTION).toBool()); - m_ui.useQsTrIdFunctionRadioButton->setChecked(!settings.value( - DesignerSettingsKey::USE_QSTR_FUNCTION).toBool()); + DesignerSettingsKey::TYPE_OF_QSTR_FUNCTION).toInt() == 0); + m_ui.useQsTrIdFunctionRadioButton->setChecked(settings.value( + DesignerSettingsKey::TYPE_OF_QSTR_FUNCTION).toInt() == 1); + m_ui.useQsTranslateFunctionRadioButton->setChecked(settings.value( + DesignerSettingsKey::TYPE_OF_QSTR_FUNCTION).toInt() == 2); m_ui.styleLineEdit->setText(settings.value( DesignerSettingsKey::CONTROLS_STYLE).toString()); |