Remove all usages of gettext function from outside of TranslatedString

Change-Id: I8564505b04f450405b61d2dbd32969af7f544b3d

diff --git a/src/ActionPage.cpp b/src/ActionPage.cpp
index d19d787896ad82b1c65314dbeff58df06fd5d0b7..4fa06fc793eef63a4b7de8f1274ba604603e8085 100644 (file)
--- a/src/ActionPage.cpp
+++ b/src/ActionPage.cpp
@@ -25,8 +25,7 @@
 ActionPage::ActionPage(NaviframeItem targetItem)
        : context_(Singleton<AppContext>::instance())
 {
-       setValuePage_ = std::make_unique<SetValuePage>(
-               ValueEditorType::RADIOS, _("IDS_ACCS_UNIVERSAL_SWITCH_SELECT_ACTION"), targetItem);
+       setValuePage_ = std::make_unique<SetValuePage>(ValueEditorType::RADIOS, "IDS_ACCS_UNIVERSAL_SWITCH_SELECT_ACTION", targetItem);
        setValuePage_->addRadioItemChangedCb([this](auto val) { this->actionChangedCb(val); });
        for (auto i = 0u; i < context_.config.activity_types.size(); ++i)
                setValuePage_->addRadioItem(context_.config.activity_types[i]->name, i, false);

diff --git a/src/SetValuePage.cpp b/src/SetValuePage.cpp
index f38ffc532d214171fb3b7b07c2c28ad6f13aa274..7b4dfd31e0ab1dbbe944ccd84276c66bf80b8797 100644 (file)
--- a/src/SetValuePage.cpp
+++ b/src/SetValuePage.cpp
@@ -75,7 +75,7 @@ SetValuePage::SetValuePage(ValueEditorType type, TranslatedString title, Navifra
                check_ = Widget::make<Check>(layout_, false, "on&off", [this]() { checkStateChangedCb(); });
                layout_->setPartContent("set-value-switch", check_);
                check_->setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               genlist_ = createGenlist(layout_, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_OPTIONS"));
+               genlist_ = createGenlist(layout_, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_OPTIONS");
                break;
        default:
                ERROR("Wrong value type");
@@ -106,7 +106,7 @@ SetValuePage::SetValuePage(ValueEditorType type, TranslatedString title, Navifra
                prevBtn);
 }
 
-void SetValuePage::setDescription(const std::string &description)
+void SetValuePage::setDescription(const TranslatedString &description)
 {
        layout_->setPartText("set-value-desc", description);
 }

diff --git a/src/SetValuePage.hpp b/src/SetValuePage.hpp
index ea277fafbb5b6dc1639dcd9af1042ca85daf5c89..380e91eb8c114450335d410e6d184443b3d542d8 100644 (file)
--- a/src/SetValuePage.hpp
+++ b/src/SetValuePage.hpp
@@ -54,7 +54,7 @@ class SetValuePage
 {
        public:
        SetValuePage(ValueEditorType type, TranslatedString title, NaviframeItem targetItem = {});
-       void setDescription(const std::string &description);
+       void setDescription(const TranslatedString &description);
        void setRange(double min, double max, double step);
        void setValue(double value, const std::string &units);
        void setSwitch(bool state);

diff --git a/src/UniversalSwitchSettingsPage.cpp b/src/UniversalSwitchSettingsPage.cpp
index e9bea5ed91d5d2380f9cee493d2245f0ea5ad1d2..96087e1c021536c01f77eb7d009f9a2f31f2f89e 100644 (file)
--- a/src/UniversalSwitchSettingsPage.cpp
+++ b/src/UniversalSwitchSettingsPage.cpp
@@ -243,20 +243,19 @@ void UniversalSwitchSettingsPage::createFeedbackGroup()
 
 void UniversalSwitchSettingsPage::createAdditionalSettingsGroup()
 {
-       std::string str;
        genlist_->appendItem({"group_index", "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS"});
 
-       str = getValueUnitText(NULL,
+       auto str = getValueUnitText(NULL,
                &context_.us_configuration.pause_on_first_value,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                !context_.us_configuration.pause_on_first_state,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
 
        pauseOnFirst_ = genlist_->appendItem({"type1",
                "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_PAUSE_ON_FIRST",
                str,
                [this](auto item) {
-                       setValuePage_ = std::make_unique<SetValuePage>(ValueEditorType::NUMERIC_SWITCH, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_PAUSE_ON_FIRST"));
+                       setValuePage_ = std::make_unique<SetValuePage>(ValueEditorType::NUMERIC_SWITCH, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_PAUSE_ON_FIRST");
                        setValuePage_->setSwitch(context_.us_configuration.pause_on_first_state);
                        setValuePage_->addValueChangedCb([this](auto val) {
                                this->pauseOnFirstValueChangedCb(val);
@@ -273,9 +272,9 @@ void UniversalSwitchSettingsPage::createAdditionalSettingsGroup()
                        context_.us_configuration.pause_on_first_state = item->getState();
                        auto str = getValueUnitText(NULL,
                                &context_.us_configuration.pause_on_first_value,
-                               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+                               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                                !context_.us_configuration.pause_on_first_state,
-                               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+                               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
                        item->setDescription(str);
                        item->update();
                        Singleton<VConfInterface>::instance().set(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_PAUSE_ON_FIRST_STATE, item->getState()); },
@@ -284,22 +283,22 @@ void UniversalSwitchSettingsPage::createAdditionalSettingsGroup()
                pauseOnFirst_->setState(true);
                auto str = getValueUnitText(NULL,
                        &context_.us_configuration.pause_on_first_value,
-                       _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+                       "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                        !context_.us_configuration.pause_on_first_state,
-                       _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+                       "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
                pauseOnFirst_->setDescription(str);
                pauseOnFirst_->update();
        }
        if (!context_.us_configuration.auto_scan)
                pauseOnFirst_->disable();
 
-       str = getValueUnitText(NULL, &context_.us_configuration.tap_duration_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"), !context_.us_configuration.tap_duration_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+       str = getValueUnitText(NULL, &context_.us_configuration.tap_duration_value, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS", !context_.us_configuration.tap_duration_state, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
 
        tapDuration_ = genlist_->appendItem({"type1",
                "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_TAP_DURATION",
                str,
                [this](auto item) {
-                       setValuePage_ = std::make_unique<SetValuePage>(ValueEditorType::NUMERIC_SWITCH, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_TAP_DURATION"));
+                       setValuePage_ = std::make_unique<SetValuePage>(ValueEditorType::NUMERIC_SWITCH, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_TAP_DURATION");
                        setValuePage_->setSwitch(context_.us_configuration.tap_duration_state);
                        setValuePage_->addValueChangedCb([this](auto val) {
                                this->tapDurationValueChangedCb(val);
@@ -307,16 +306,16 @@ void UniversalSwitchSettingsPage::createAdditionalSettingsGroup()
                        setValuePage_->addSwitchChangedCb([this](auto state) {
                                this->tapDurationSwitchChangedCb(state);
                        });
-                       setValuePage_->setDescription(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_TAP_DURATION"));
+                       setValuePage_->setDescription("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_TAP_DURATION");
                        setValuePage_->setRange(RANGE_MIN_TAP_DURATION, RANGE_MAX_TAP_DURATION, STEP_TAP_DURATION);
                        setValuePage_->setValue(context_.us_configuration.tap_duration_value, "seconds"); },
                [this](auto item) {
                        context_.us_configuration.tap_duration_state = item->getState();
                        auto str = getValueUnitText(NULL,
                                &context_.us_configuration.tap_duration_value,
-                               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+                               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                                !context_.us_configuration.tap_duration_state,
-                               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+                               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
                        item->setDescription(str);
                        item->update();
                        Singleton<VConfInterface>::instance().set(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_TAP_DURATION_STATE, item->getState()); },
@@ -326,20 +325,20 @@ void UniversalSwitchSettingsPage::createAdditionalSettingsGroup()
                tapDuration_->setState(true);
                auto str = getValueUnitText(NULL,
                        &context_.us_configuration.tap_duration_value,
-                       _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+                       "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                        !context_.us_configuration.tap_duration_state,
-                       _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+                       "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
                tapDuration_->setDescription(str);
                tapDuration_->update();
        }
 
-       str = getValueUnitText(NULL, &context_.us_configuration.sgl_iaction_int_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"), !context_.us_configuration.sgl_iaction_int_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+       str = getValueUnitText(NULL, &context_.us_configuration.sgl_iaction_int_value, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS", !context_.us_configuration.sgl_iaction_int_state, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
 
        singleInteractionInterval_ = genlist_->appendItem({"type1",
                "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_SGL_IACTION_INT",
                str,
                [this](auto item) {
-                       setValuePage_ = std::make_unique<SetValuePage>(ValueEditorType::NUMERIC_SWITCH, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_SGL_IACTION_INT"));
+                       setValuePage_ = std::make_unique<SetValuePage>(ValueEditorType::NUMERIC_SWITCH, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_SGL_IACTION_INT");
                        setValuePage_->setSwitch(context_.us_configuration.sgl_iaction_int_state);
                        setValuePage_->addValueChangedCb([this](auto val) {
                                this->sglInactionIntervalValueChangedCb(val);
@@ -347,16 +346,16 @@ void UniversalSwitchSettingsPage::createAdditionalSettingsGroup()
                        setValuePage_->addSwitchChangedCb([this](auto state) {
                                this->sglInactionIntervalSwitchChangedCb(state);
                        });
-                       setValuePage_->setDescription(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_SGL_IACTION_INT"));
+                       setValuePage_->setDescription("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_SGL_IACTION_INT");
                        setValuePage_->setRange(RANGE_MIN_SGL_IACTION_INT, RANGE_MAX_SGL_IACTION_INT, STEP_SGL_IACTION_INT);
                        setValuePage_->setValue(context_.us_configuration.sgl_iaction_int_value, "seconds"); },
                [this](auto item) {
                        context_.us_configuration.sgl_iaction_int_state = item->getState();
                        auto str = getValueUnitText(NULL,
                                &context_.us_configuration.sgl_iaction_int_value,
-                               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+                               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                                !context_.us_configuration.sgl_iaction_int_state,
-                               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+                               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
                        item->setDescription(str);
                        item->update();
                        Singleton<VConfInterface>::instance().set(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_SGL_IACTION_INT_STATE, item->getState()); },
@@ -366,20 +365,20 @@ void UniversalSwitchSettingsPage::createAdditionalSettingsGroup()
                singleInteractionInterval_->setState(true);
                auto str = getValueUnitText(NULL,
                        &context_.us_configuration.sgl_iaction_int_value,
-                       _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+                       "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                        !context_.us_configuration.sgl_iaction_int_state,
-                       _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+                       "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
                singleInteractionInterval_->setDescription(str);
                singleInteractionInterval_->update();
        }
 
-       str = getValueUnitText(NULL, &context_.us_configuration.auto_tap_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"), !context_.us_configuration.auto_tap_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+       str = getValueUnitText(NULL, &context_.us_configuration.auto_tap_value, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS", !context_.us_configuration.auto_tap_state, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
 
        autoTap_ = genlist_->appendItem({"type1",
                "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_AUTO_TAP",
                str,
                [this](auto item) {
-                       setValuePage_ = std::make_unique<SetValuePage>(ValueEditorType::NUMERIC_SWITCH, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_AUTO_TAP"));
+                       setValuePage_ = std::make_unique<SetValuePage>(ValueEditorType::NUMERIC_SWITCH, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_AUTO_TAP");
                        setValuePage_->setSwitch(context_.us_configuration.auto_tap_state);
                        setValuePage_->addSwitchChangedCb([this](auto val) {
                                this->autoTapSwitchChangedCb(val);
@@ -387,16 +386,16 @@ void UniversalSwitchSettingsPage::createAdditionalSettingsGroup()
                        setValuePage_->addValueChangedCb([this](auto val) {
                                this->autoTapValueChangedCb(val);
                        });
-                       setValuePage_->setDescription(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_AUTO_TAP"));
+                       setValuePage_->setDescription("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_AUTO_TAP");
                        setValuePage_->setRange(RANGE_MIN_AUTO_TAP, RANGE_MAX_AUTO_TAP, STEP_AUTO_TAP);
                        setValuePage_->setValue(context_.us_configuration.auto_tap_value, "seconds"); },
                [this](auto item) {
                        context_.us_configuration.auto_tap_state = item->getState();
                        auto str = getValueUnitText(NULL,
                                &context_.us_configuration.auto_tap_value,
-                               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+                               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                                !context_.us_configuration.auto_tap_state,
-                               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+                               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
                        item->setDescription(str);
                        item->update();
                        Singleton<VConfInterface>::instance().set(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_AUTO_TAP_STATE, item->getState()); },
@@ -406,20 +405,20 @@ void UniversalSwitchSettingsPage::createAdditionalSettingsGroup()
                autoTap_->setState(true);
                auto str = getValueUnitText(NULL,
                        &context_.us_configuration.auto_tap_value,
-                       _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+                       "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                        !context_.us_configuration.auto_tap_state,
-                       _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+                       "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
                autoTap_->setDescription(str);
                autoTap_->update();
        }
 
-       str = getValueUnitText(NULL, &context_.us_configuration.auto_move_int_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"), !context_.us_configuration.auto_move_int_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+       str = getValueUnitText(NULL, &context_.us_configuration.auto_move_int_value, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS", !context_.us_configuration.auto_move_int_state, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
 
        autoMoveInterval_ = genlist_->appendItem({"type1",
                "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_AUTO_MOVE_INT",
                str,
                [this](auto item) {
-                       setValuePage_ = std::make_unique<SetValuePage>(ValueEditorType::NUMERIC_SWITCH, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_AUTO_MOVE_INT"));
+                       setValuePage_ = std::make_unique<SetValuePage>(ValueEditorType::NUMERIC_SWITCH, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_AUTO_MOVE_INT");
                        setValuePage_->setSwitch(context_.us_configuration.auto_move_int_state);
                        setValuePage_->addValueChangedCb([this](auto val) {
                                this->autoMoveIntervalValueChangedCb(val);
@@ -427,13 +426,13 @@ void UniversalSwitchSettingsPage::createAdditionalSettingsGroup()
                        setValuePage_->addSwitchChangedCb([this](auto state) {
                                this->autoMoveIntervalSwitchChangedCb(state);
                        });
-                       setValuePage_->setDescription(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_AUTO_MOVE_INT"));
+                       setValuePage_->setDescription("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_AUTO_MOVE_INT");
                        setValuePage_->setRange(RANGE_MIN_AUTO_MOVE_INT, RANGE_MAX_AUTO_MOVE_INT, STEP_AUTO_MOVE_INT);
                        setValuePage_->setValue(context_.us_configuration.auto_move_int_value, "seconds"); },
                [this](auto item) {
                        context_.us_configuration.auto_move_int_state = item->getState();
-                       auto str = getValueUnitText(NULL, &context_.us_configuration.auto_move_int_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
-                                                                               !context_.us_configuration.auto_move_int_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+                       auto str = getValueUnitText(NULL, &context_.us_configuration.auto_move_int_value, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
+                                                                               !context_.us_configuration.auto_move_int_state, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
                        item->setDescription(str);
                        item->update();
                        Singleton<VConfInterface>::instance().set(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_AUTO_MOVE_INT_STATE, item->getState()); },
@@ -442,9 +441,9 @@ void UniversalSwitchSettingsPage::createAdditionalSettingsGroup()
                autoMoveInterval_->setState(true);
                auto str = getValueUnitText(NULL,
                        &context_.us_configuration.auto_tap_value,
-                       _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+                       "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                        !context_.us_configuration.auto_move_int_state,
-                       _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+                       "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
                autoMoveInterval_->setDescription(str);
                autoMoveInterval_->update();
        }
@@ -466,7 +465,6 @@ void UniversalSwitchSettingsPage::createAdditionalSettingsGroup()
 
 void UniversalSwitchSettingsPage::createScanningGroup()
 {
-       std::string str;
        genlist_->appendItem({"group_index", "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING"});
 
        auto item = genlist_->appendItem({"type1",
@@ -494,15 +492,15 @@ void UniversalSwitchSettingsPage::createScanningGroup()
        if (context_.us_configuration.auto_scan)
                item->setState(true);
 
-       str = getValueUnitText(NULL, &context_.us_configuration.auto_scan_interval, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"), false, {});
+       auto str = getValueUnitText(NULL, &context_.us_configuration.auto_scan_interval, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS", false, {});
        autoScanInterval_ = genlist_->appendItem({"type1",
                "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_AUTO_SCAN_INT",
                str,
                [this](auto item) {
                        setValuePage_ = std::make_unique<SetValuePage>(
-                               ValueEditorType::NUMERIC, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_AUTO_SCAN_INT"));
+                               ValueEditorType::NUMERIC, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_AUTO_SCAN_INT");
                        setValuePage_->addValueChangedCb([this](auto val) { this->autoScanIntervalChangedCb(val); });
-                       setValuePage_->setDescription(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_AUTO_SCAN_INT"));
+                       setValuePage_->setDescription("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_AUTO_SCAN_INT");
                        setValuePage_->setRange(RANGE_MIN_AUTO_SCAN_INTERVAL, RANGE_MAX_AUTO_SCAN_INTERVAL, STEP_AUTO_SCAN_INTERVAL);
                        setValuePage_->setValue(context_.us_configuration.auto_scan_interval, "seconds");
                }});
@@ -514,9 +512,9 @@ void UniversalSwitchSettingsPage::createScanningGroup()
                "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_NUM_OF_SCANS",
                str,
                [this](auto item) {
-                       setValuePage_ = std::make_unique<SetValuePage>(ValueEditorType::NUMERIC, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_NUM_OF_SCANS"));
+                       setValuePage_ = std::make_unique<SetValuePage>(ValueEditorType::NUMERIC, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_NUM_OF_SCANS");
                        setValuePage_->addValueChangedCb([this](auto val) { this->scanNumberChangedCb(val); });
-                       setValuePage_->setDescription(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_NUM_OF_SCANS"));
+                       setValuePage_->setDescription("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_NUM_OF_SCANS");
                        setValuePage_->setRange(RANGE_MIN_SCANS_NUM, RANGE_MAX_SCANS_NUM, STEP_SCANS_NUM);
                        setValuePage_->setValue(context_.us_configuration.auto_scan_num, "times");
                }});
@@ -544,9 +542,9 @@ void UniversalSwitchSettingsPage::createScanningGroup()
                "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_PT_SPEED",
                str,
                [this](auto item) {
-                       setValuePage_ = std::make_unique<SetValuePage>(ValueEditorType::NUMERIC, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_PT_SPEED"));
+                       setValuePage_ = std::make_unique<SetValuePage>(ValueEditorType::NUMERIC, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_PT_SPEED");
                        setValuePage_->addValueChangedCb([this](auto val) { this->scanSpeedChangedCb(val); });
-                       setValuePage_->setDescription(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_SCAN_SPEED"));
+                       setValuePage_->setDescription("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_SCAN_SPEED");
                        setValuePage_->setRange(RANGE_MIN_SCAN_SPEED, RANGE_MAX_SCAN_SPEED, STEP_SCAN_SPEED);
                        setValuePage_->setValue(context_.us_configuration.scan_pt_speed, "");
                }});
@@ -588,7 +586,7 @@ TranslatedString UniversalSwitchSettingsPage::getScanMethodText(ScanMethod metho
        }
 }
 
-std::string UniversalSwitchSettingsPage::getValueUnitText(int *ivalue, double *dvalue, const std::string &units, bool def_trigger, const std::string &def)
+TranslatedString UniversalSwitchSettingsPage::getValueUnitText(int *ivalue, double *dvalue, const TranslatedString &units, bool def_trigger, const TranslatedString &def)
 {
        if (def_trigger)
                return def;
@@ -603,7 +601,7 @@ std::string UniversalSwitchSettingsPage::getValueUnitText(int *ivalue, double *d
        }
 
        if (!units.empty())
-               ss << " " << units;
+               ss << " " << units.str();
 
        return ss.str();
 }
@@ -767,8 +765,7 @@ void UniversalSwitchSettingsPage::updateSwitchesCount(void *data)
 
        int switch_count = setting_accessibility_universal_switch_dbus_config_get_switch_count(&self->context_.config);
 
-       self->switchesItem_->setDescription(
-               getValueUnitText(&switch_count, NULL, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SWITCHES"), false, {}));
+       self->switchesItem_->setDescription(getValueUnitText(&switch_count, NULL, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SWITCHES", false, {}));
        self->switchesItem_->update();
 }
 
@@ -863,12 +860,11 @@ void UniversalSwitchSettingsPage::feedbackSoundCb(void *data, Evas_Object *obj,
        std::string str = std::to_string(self->context_.us_configuration.feedback_sound_volume) + "%";
 
        self->nestedSetValuePage_ = std::make_unique<SetValuePage>(
-               ValueEditorType::LIST_SWITCH, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_SOUND"));
+               ValueEditorType::LIST_SWITCH, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_SOUND");
        self->nestedSetValuePage_->setSwitch(self->context_.us_configuration.feedback_sound_state);
-       self->nestedSetValuePage_->setDescription(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_FEEDBACK_SOUND"));
+       self->nestedSetValuePage_->setDescription("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_FEEDBACK_SOUND");
        self->nestedSetValuePage_->addSwitchChangedCb([self](auto state) { self->feedbackSoundSwitchChangedCb(state); });
-       self->feedbackSoundVolume_ = self->nestedSetValuePage_->addRadioListItem(
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_SOUND_VOLUME"), str.c_str(), 0);
+       self->feedbackSoundVolume_ = self->nestedSetValuePage_->addRadioListItem("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_SOUND_VOLUME", str.c_str(), 0);
        self->nestedSetValuePage_->addListItemOptionsRequestCb([self](auto val) { self->feedbackSoundItemOptionsRequestCb(val); });
        int vconf_ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_FEEDBACK_SOUND_STATE,
                SetValuePage::syncPageWithVconf,
@@ -880,8 +876,7 @@ void UniversalSwitchSettingsPage::feedbackSoundCb(void *data, Evas_Object *obj,
 
 void UniversalSwitchSettingsPage::feedbackSoundItemOptionsRequestCb(int option_id)
 {
-       setValuePage_ = std::make_unique<SetValuePage>(
-               ValueEditorType::RADIOS, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_SOUND_VOLUME"));
+       setValuePage_ = std::make_unique<SetValuePage>(ValueEditorType::RADIOS, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_SOUND_VOLUME");
        setValuePage_->addRadioItemChangedCb([this](auto val) { this->feedbackSoundVolumeChangedCb(val); });
 
        for (auto i = 0u; i < mediaLevel.size(); i++)
@@ -928,9 +923,9 @@ void UniversalSwitchSettingsPage::autoMoveIntervalSwitchChangedCb(bool state)
        autoMoveInterval_->setState(state);
        auto str = getValueUnitText(NULL,
                &context_.us_configuration.auto_move_int_value,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                !context_.us_configuration.auto_move_int_state,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
        autoMoveInterval_->setDescription(str);
        autoMoveInterval_->update();
 }
@@ -942,9 +937,9 @@ void UniversalSwitchSettingsPage::autoTapSwitchChangedCb(bool state)
        autoTap_->setState(state);
        auto str = getValueUnitText(NULL,
                &context_.us_configuration.auto_tap_value,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                !context_.us_configuration.auto_tap_state,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
        autoTap_->setDescription(str);
        autoTap_->update();
 }
@@ -954,9 +949,9 @@ void UniversalSwitchSettingsPage::autoTapValueChangedCb(double value)
        context_.us_configuration.auto_tap_value = value;
        auto str = getValueUnitText(NULL,
                &context_.us_configuration.auto_tap_value,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                !context_.us_configuration.auto_tap_state,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
        autoTap_->setDescription(str);
        autoTap_->update();
        Singleton<VConfInterface>::instance().set(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_AUTO_TAP_VALUE, value);
@@ -969,9 +964,9 @@ void UniversalSwitchSettingsPage::sglInactionIntervalSwitchChangedCb(bool state)
        singleInteractionInterval_->setState(state);
        auto str = getValueUnitText(NULL,
                &context_.us_configuration.sgl_iaction_int_value,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                !context_.us_configuration.sgl_iaction_int_state,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
        singleInteractionInterval_->setDescription(str);
        singleInteractionInterval_->update();
 }
@@ -980,7 +975,7 @@ void UniversalSwitchSettingsPage::sglInactionIntervalValueChangedCb(double value
 {
        context_.us_configuration.sgl_iaction_int_value = value;
        Singleton<VConfInterface>::instance().set(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_SGL_IACTION_INT_VALUE, value);
-       auto str = getValueUnitText(NULL, &context_.us_configuration.sgl_iaction_int_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"), !context_.us_configuration.sgl_iaction_int_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+       auto str = getValueUnitText(NULL, &context_.us_configuration.sgl_iaction_int_value, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS", !context_.us_configuration.sgl_iaction_int_state, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
        singleInteractionInterval_->setDescription(str);
        singleInteractionInterval_->update();
 }
@@ -993,9 +988,9 @@ void UniversalSwitchSettingsPage::tapDurationSwitchChangedCb(bool state)
        tapDuration_->setState(state);
        auto str = getValueUnitText(NULL,
                &context_.us_configuration.tap_duration_value,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                !context_.us_configuration.tap_duration_state,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
        tapDuration_->setDescription(str);
        tapDuration_->update();
 }
@@ -1007,9 +1002,9 @@ void UniversalSwitchSettingsPage::tapDurationValueChangedCb(double value)
 
        auto str = getValueUnitText(NULL,
                &context_.us_configuration.tap_duration_value,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                !context_.us_configuration.tap_duration_state,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
        tapDuration_->setDescription(str);
        tapDuration_->update();
 }
@@ -1022,9 +1017,9 @@ void UniversalSwitchSettingsPage::pauseOnFirstSwitchChangedCb(bool state)
        pauseOnFirst_->setState(state);
        auto str = getValueUnitText(NULL,
                &context_.us_configuration.pause_on_first_value,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                !context_.us_configuration.pause_on_first_state,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
        pauseOnFirst_->setDescription(str);
        pauseOnFirst_->update();
 }
@@ -1036,9 +1031,9 @@ void UniversalSwitchSettingsPage::pauseOnFirstValueChangedCb(double value)
 
        auto str = getValueUnitText(NULL,
                &context_.us_configuration.pause_on_first_value,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                !context_.us_configuration.pause_on_first_state,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
        pauseOnFirst_->setDescription(str);
        pauseOnFirst_->update();
 }
@@ -1138,7 +1133,7 @@ void UniversalSwitchSettingsPage::autoScanIntervalChangedCb(double value)
        Singleton<VConfInterface>::instance().set(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_AUTO_SCAN_INT, value);
 
        autoScanInterval_->setDescription(
-               getValueUnitText(NULL, &value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"), false, {}));
+               getValueUnitText(NULL, &value, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS", false, {}));
        autoScanInterval_->update();
 }
 
@@ -1149,9 +1144,9 @@ void UniversalSwitchSettingsPage::autoMoveIntervalValueChangedCb(double value)
 
        auto str = getValueUnitText(NULL,
                &context_.us_configuration.auto_move_int_value,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS",
                !context_.us_configuration.auto_move_int_state,
-               _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+               "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
        autoMoveInterval_->setDescription(str);
        autoMoveInterval_->update();
 }

diff --git a/src/UniversalSwitchSettingsPage.hpp b/src/UniversalSwitchSettingsPage.hpp
index 13f5d0b96b06b79cae06d8ec6cab3ad542ad15f3..7056d27a4e169dc5dbc885f80b0085cc3307b636 100644 (file)
--- a/src/UniversalSwitchSettingsPage.hpp
+++ b/src/UniversalSwitchSettingsPage.hpp
@@ -51,7 +51,7 @@ class UniversalSwitchSettingsPage
        void scanDirectionCtxPopupItemClicked(ScanDirection scan_dir);
        TranslatedString getScanDirectionText(ScanDirection direction);
        TranslatedString getScanMethodText(ScanMethod method);
-       static std::string getValueUnitText(int *ivalue, double *dvalue, const std::string &units, bool def_trigger, const std::string &def);
+       static TranslatedString getValueUnitText(int *ivalue, double *dvalue, const TranslatedString &units, bool def_trigger, const TranslatedString &def);
        void getVconfSettings();
        static int getAndConvertVconfValue(const std::string &key);
        static bool getVconfValue(const std::string &key, bool *bvalue, int *ivalue, double *dvalue);