From f1679361980f5bea35b32a97310956b35a94740f Mon Sep 17 00:00:00 2001 From: dreamsourcelabTAI Date: Thu, 6 Apr 2023 11:32:15 +0800 Subject: [PATCH] Update the lang resource --- DSView/pv/toolbars/filebar.cpp | 18 +- DSView/pv/toolbars/logobar.cpp | 18 +- DSView/pv/toolbars/samplingbar.cpp | 29 ++-- DSView/pv/toolbars/trigbar.cpp | 19 +- DSView/pv/ui/string_ids.h | 11 -- DSView/pv/view/devmode.cpp | 46 +++-- DSView/pv/view/devmode.h | 2 - lang/cn/toolbar.json | 188 ++++++++++---------- lang/en/toolbar.json | 268 +++++++++++++++-------------- 9 files changed, 312 insertions(+), 287 deletions(-) diff --git a/DSView/pv/toolbars/filebar.cpp b/DSView/pv/toolbars/filebar.cpp index ab993298..105b768e 100644 --- a/DSView/pv/toolbars/filebar.cpp +++ b/DSView/pv/toolbars/filebar.cpp @@ -107,15 +107,15 @@ void FileBar::changeEvent(QEvent *event) void FileBar::retranslateUi() { - _file_button.setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_FILEBAR_FILE), "File")); - _menu_session->setTitle(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_FILEBAR_CONFIGURATION), "Con&fig...")); //load,save session file - _action_load->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_FILEBAR_LOAD), "&Load...")); - _action_store->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_FILEBAR_STORE), "S&tore...")); - _action_default->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_FILEBAR_DEFAULT), "&Default...")); - _action_open->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_FILEBAR_0PEN), "&Open...")); - _action_save->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_FILEBAR_SAVE), "&Save...")); - _action_export->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_FILEBAR_EXPORT), "&Export...")); - _action_capture->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_FILEBAR_CAPTURE), "&Capture...")); + _file_button.setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_FILE), "File")); + _menu_session->setTitle(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_FILE_CONFIG), "Con&fig...")); //load,save session file + _action_load->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_FILE_CONFIG_LOAD), "&Load...")); + _action_store->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_FILE_CONFIG_STORE), "S&tore...")); + _action_default->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_FILE_CONFIG_DEFAULT), "&Default...")); + _action_open->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_FILE_OPEN), "&Open...")); + _action_save->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_FILE_SAVE), "&Save...")); + _action_export->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_FILE_EXPORT), "&Export...")); + _action_capture->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_FILE_CAPTURE), "&Capture...")); } void FileBar::reStyle() diff --git a/DSView/pv/toolbars/logobar.cpp b/DSView/pv/toolbars/logobar.cpp index 3b97ba12..89b04171 100644 --- a/DSView/pv/toolbars/logobar.cpp +++ b/DSView/pv/toolbars/logobar.cpp @@ -130,15 +130,15 @@ void LogoBar::changeEvent(QEvent *event) void LogoBar::retranslateUi() { - _logo_button.setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_LOGOBAR_HELP), "Help")); - _action_en->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_LOGOBAR_ENGLISH), "English")); - _action_cn->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_LOGOBAR_CHINESE), "中文")); - _language->setTitle(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_LOGOBAR_LANGUAGE), "&Language")); - _about->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_LOGOBAR_ABOUT), "&About...")); - _manual->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_LOGOBAR_MANUAL), "&Manual...")); - _issue->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_LOGOBAR_BUG_REPORT), "&Bug Report")); - _update->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_LOGOBAR_UPDATE), "&Update")); - _log->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_LOGOBAR_LOG_OPTIONS), "L&og Options")); + _logo_button.setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_HELP), "Help")); + _language->setTitle(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_HELP_LANG), "&Language")); + _action_en->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_HELP_LANG_EN), "English")); + _action_cn->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_HELP_LANG_CN), "中文")); + _about->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_HELP_ABOUT), "&About...")); + _manual->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_HELP_MANUAL), "&Manual...")); + _issue->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_HELP_BUG), "&Bug Report")); + _update->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_HELP_UPDATE), "&Update")); + _log->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_HELP_LOG), "L&og Options")); AppConfig &app = AppConfig::Instance(); if (app._frameOptions.language == LAN_CN) diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp index 309afd67..5309153d 100644 --- a/DSView/pv/toolbars/samplingbar.cpp +++ b/DSView/pv/toolbars/samplingbar.cpp @@ -152,11 +152,11 @@ namespace pv { if (_device_agent->is_demo()) { - _device_type.setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_DEMO), "Demo")); + _device_type.setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_DEVICE_TYPE_DEMO), "Demo")); } else if (_device_agent->is_file()) { - _device_type.setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_FILE), "file")); + _device_type.setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_DEVICE_TYPE_FILE), "File")); } else { @@ -176,37 +176,40 @@ namespace pv _device_type.setText("USB UNKNOWN"); } } - _configure_button.setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_OPTION), "Options1")); - _mode_button.setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_MODE), "Mode")); + _configure_button.setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_DEVICE_OPTION), "Options")); + _mode_button.setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_CAPTURE_MODE), "Mode")); int mode = _device_agent->get_work_mode(); bool is_working = _session->is_working(); - auto str_start = L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_START), "Start"); - auto str_stop = L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_STOP), "Stop"); - auto str_single = L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_SINGLE), "Single"); - auto str_instant = L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_INSTANT), "Instant"); + auto str_start = L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_RUN_START), "Start"); + auto str_stop = L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_RUN_STOP), "Stop"); + auto str_single = L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_ONE_SINGLE), "Single"); + auto str_instant = L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_ONE_INSTANT), "Instant"); + auto str_one_stop = L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_ONE_STOP), "Stop"); if (_is_run_as_instant) { if (bDev && mode == DSO) - _instant_button.setText(is_working ? str_stop : str_single); + _instant_button.setText(is_working ? str_one_stop : str_single); else - _instant_button.setText(is_working ? str_stop : str_instant); + _instant_button.setText(is_working ? str_one_stop : str_instant); + _run_stop_button.setText(str_start); } else { _run_stop_button.setText(is_working ? str_stop: str_start); + if (bDev && mode == DSO) _instant_button.setText(str_single); else _instant_button.setText(str_instant); } - _action_single->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_SINGLE_ACTION), "&Single")); - _action_repeat->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_REPEAT_ACTION), "&Repetitive")); - _action_realtime->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_REALTIME_ACTION), "Real&time")); + _action_single->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_CAPTURE_MODE_SINGLE), "&Single")); + _action_repeat->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_CAPTURE_MODE_REPEAT), "&Repetitive")); + _action_realtime->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_CAPTURE_MODE_REALTIME), "Real&time")); } void SamplingBar::reStyle() diff --git a/DSView/pv/toolbars/trigbar.cpp b/DSView/pv/toolbars/trigbar.cpp index 4cfba1ae..defe5dfe 100644 --- a/DSView/pv/toolbars/trigbar.cpp +++ b/DSView/pv/toolbars/trigbar.cpp @@ -140,18 +140,19 @@ void TrigBar::retranslateUi() _measure_button.setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_MEASURE), "Measure")); _search_button.setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_SEARCH), "Search")); _function_button.setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_FUNCTION), "Function")); - _setting_button.setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_DISPLAY), "Display")); - - _action_lissajous->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_LISSAJOUS), "Lissajous")); - _themes->setTitle(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_THEMES), "Themes")); - _dark_style->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_DARK), "Dark")); - _light_style->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_LIGHT), "Light")); + _setting_button.setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_DISPLAY), "Display")); + _themes->setTitle(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_DISPLAY_THEMES), "Themes")); + _action_lissajous->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_DISPLAY_LISSAJOUS), "Lissajous")); - _action_fft->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_FFT), "FFT")); - _action_math->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_MATH), "Math")); + + _dark_style->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_DISPLAY_THEMES_DARK), "Dark")); + _light_style->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_DISPLAY_THEMES_LIGHT), "Light")); - _action_dispalyOptions->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_OPTIONS), "Options")); + _action_fft->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_FUNCTION_FFT), "FFT")); + _action_math->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_FUNCTION_MATH), "Math")); + + _action_dispalyOptions->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_TOOLBAR_DISPLAY_OPTIONS), "Options")); } void TrigBar::reStyle() diff --git a/DSView/pv/ui/string_ids.h b/DSView/pv/ui/string_ids.h index c6f72bae..2fdd8819 100644 --- a/DSView/pv/ui/string_ids.h +++ b/DSView/pv/ui/string_ids.h @@ -28,16 +28,5 @@ #define STR_PAGE_DSL 100 #define STR_PAGE_DECODER 101 -// xx -#define IDS_TOOLBAR_MODE -#define IDS_TOOLBAR_START -#define IDS_TOOLBAR_STOP -#define IDS_TOOLBAR_SINGLE -#define IDS_TOOLBAR_INSTANT -#define IDS_TOOLBAR_SINGLE_ACTION -#define IDS_TOOLBAR_REPEAT_ACTION -#define IDS_TOOLBAR_OPTIONS - - #define IDS_MSG_LOG_LEVEL #endif \ No newline at end of file diff --git a/DSView/pv/view/devmode.cpp b/DSView/pv/view/devmode.cpp index 4dcdb66f..624a098e 100644 --- a/DSView/pv/view/devmode.cpp +++ b/DSView/pv/view/devmode.cpp @@ -40,9 +40,9 @@ static const struct dev_mode_name dev_mode_name_list[] = { - {LOGIC, "Logic Analyzer", "逻辑分析仪", "la.svg"}, - {ANALOG, "Data Acquisition", "数据记录仪", "daq.svg"}, - {DSO, "Oscilloscope", "示波器", "osc.svg"}, + {LOGIC, "la.svg"}, + {ANALOG, "daq.svg"}, + {DSO, "osc.svg"}, }; namespace pv { @@ -138,22 +138,32 @@ void DevMode::set_device() QAction *action = new QAction(this); action->setIcon(QIcon(iconPath + "square-" + icon_name)); - if (lan == LAN_CN) - action->setText(mode_name->_name_cn); - else - action->setText(mode_name->_name_en); + + int md = mode->mode; + + if (md == LOGIC) + action->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_DEVICE_MODE_LOGIC), "Logic Analyzer")); + else if (md == ANALOG) + action->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_DEVICE_MODE_ANALOG), "Data Acquisition")); + else if (md == DSO) + action->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_DEVICE_MODE_DSO), "Oscilloscope")); connect(action, SIGNAL(triggered()), this, SLOT(on_mode_change())); _mode_list[action] = mode; - if (_device_agent->get_work_mode() == _mode_list[action]->mode) + int cur_mode = _device_agent->get_work_mode(); + + if (cur_mode == _mode_list[action]->mode) { QString icon_fname = iconPath + icon_name; _mode_btn->setIcon(QIcon(icon_fname)); - if (lan == LAN_CN) - _mode_btn->setText(mode_name->_name_cn); - else - _mode_btn->setText(mode_name->_name_en); + + if (cur_mode == LOGIC) + _mode_btn->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_DEVICE_MODE_LOGIC), "Logic Analyzer")); + else if (cur_mode == ANALOG) + _mode_btn->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_DEVICE_MODE_ANALOG), "Data Acquisition")); + else if (cur_mode == DSO) + _mode_btn->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_DEVICE_MODE_DSO), "Oscilloscope")); } _pop_menu->addAction(action); } @@ -212,10 +222,14 @@ void DevMode::on_mode_change() QString icon_fname = iconPath + "/" + QString::fromLocal8Bit(mode_name->_logo); _mode_btn->setIcon(QIcon(icon_fname)); - if (lan == LAN_CN) - _mode_btn->setText(mode_name->_name_cn); - else - _mode_btn->setText(mode_name->_name_en); + int cur_mode = mode_name->_mode; + + if (cur_mode == LOGIC) + _mode_btn->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_DEVICE_MODE_LOGIC), "Logic Analyzer")); + else if (cur_mode == ANALOG) + _mode_btn->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_DEVICE_MODE_ANALOG), "Data Acquisition")); + else if (cur_mode == DSO) + _mode_btn->setText(L_S(STR_PAGE_TOOLBAR, S_ID(IDS_DEVICE_MODE_DSO), "Oscilloscope")); break; } diff --git a/DSView/pv/view/devmode.h b/DSView/pv/view/devmode.h index 1a4077f3..638e1eab 100644 --- a/DSView/pv/view/devmode.h +++ b/DSView/pv/view/devmode.h @@ -38,8 +38,6 @@ struct dev_mode_name{ int _mode; - const char *_name_en; - const char *_name_cn; const char *_logo; }; diff --git a/lang/cn/toolbar.json b/lang/cn/toolbar.json index 62b24246..f7d6d7e1 100644 --- a/lang/cn/toolbar.json +++ b/lang/cn/toolbar.json @@ -1,176 +1,186 @@ [ { - "id": "IDS_TOOLBAR_DEMO", + "id": "IDS_DEVICE_MODE_LOGIC", + "text": "逻辑分析仪(&L)" + }, + { + "id": "IDS_DEVICE_MODE_ANALOG", + "text": "数据记录仪(&A)" + }, + { + "id": "IDS_DEVICE_MODE_DSO", + "text": "示波器(&C)" + }, + { + "id": "IDS_TOOLBAR_DEVICE_TYPE_DEMO", "text": "演示" }, { - "id": "IDS_TOOLBAR_FILE", + "id": "IDS_TOOLBAR_DEVICE_TYPE_FILE", "text": "文件" }, { - "id": "IDS_TOOLBAR_OPTION", - "text": "选项" + "id": "IDS_TOOLBAR_DEVICE_OPTION", + "text": "选项(&O)" }, { - "id": "IDS_TOOLBAR_MODE", - "text": "模式" + "id": "IDS_TOOLBAR_CAPTURE_MODE", + "text": "模式(&E)" }, { - "id": "IDS_TOOLBAR_START", - "text": "开始" - }, - { - "id": "IDS_TOOLBAR_STOP", - "text": "停止" - }, - { - "id": "IDS_TOOLBAR_SINGLE", - "text": "单次" - }, - { - "id": "IDS_TOOLBAR_INSTANT", - "text": "立即" - }, - { - "id": "IDS_TOOLBAR_SINGLE_ACTION", + "id": "IDS_TOOLBAR_CAPTURE_MODE_SINGLE", "text": "单次(&S)" }, { - "id": "IDS_TOOLBAR_REPEAT_ACTION", + "id": "IDS_TOOLBAR_CAPTURE_MODE_REPEAT", "text": "重复(&R)" }, { - "id": "IDS_TOOLBAR_REALTIME_ACTION", + "id": "IDS_TOOLBAR_CAPTURE_MODE_REALTIME", "text": "实时(&T)" }, + { + "id": "IDS_TOOLBAR_RUN_START", + "text": "开始(&S)" + }, + { + "id": "IDS_TOOLBAR_RUN_STOP", + "text": "停止(&S)" + }, + { + "id": "IDS_TOOLBAR_ONE_SINGLE", + "text": "单次(&I)" + }, + { + "id": "IDS_TOOLBAR_ONE_INSTANT", + "text": "立即(&I)" + }, + { + "id": "IDS_TOOLBAR_ONE_STOP", + "text": "停止(&S)" + }, { "id": "IDS_TOOLBAR_TRIGGER", - "text": "触发" + "text": "触发(&T)" }, { "id": "IDS_TOOLBAR_DECODE", - "text": "解码" + "text": "解码(&D)" }, { "id": "IDS_TOOLBAR_MEASURE", - "text": "测量" + "text": "测量(&M)" }, { "id": "IDS_TOOLBAR_SEARCH", - "text": "搜索" + "text": "搜索(&R)" }, { "id": "IDS_TOOLBAR_FUNCTION", - "text": "函数" + "text": "函数(&N)" + }, + { + "id": "IDS_TOOLBAR_FUNCTION_FFT", + "text": "&FFT" + }, + { + "id": "IDS_TOOLBAR_FUNCTION_MATH", + "text": "数学运算(&M)" }, { "id": "IDS_TOOLBAR_DISPLAY", - "text": "显示" + "text": "显示(&P)" }, { - "id": "IDS_TOOLBAR_LISSAJOUS", - "text": "李萨如图(&L)" + "id": "IDS_TOOLBAR_DISPLAY_THEMES", + "text": "主题(&T)" }, { - "id": "IDS_TOOLBAR_THEMES", - "text": "主题" + "id": "IDS_TOOLBAR_DISPLAY_LISSAJOUS", + "text": "李萨如图(&A)" + }, + { + "id": "IDS_TOOLBAR_DISPLAY_THEMES_DARK", + "text": "暗黑(&D)" }, { - "id": "IDS_TOOLBAR_DARK", - "text": "暗黑" + "id": "IDS_TOOLBAR_DISPLAY_THEMES_LIGHT", + "text": "清新(&L)" + }, + { + "id": "IDS_TOOLBAR_DISPLAY_OPTIONS", + "text": "选项(&O)" }, { - "id": "IDS_TOOLBAR_LIGHT", - "text": "清新" + "id": "IDS_TOOLBAR_FILE", + "text": "文件(&F)" }, { - "id": "IDS_TOOLBAR_FFT", - "text": "FFT" + "id": "IDS_TOOLBAR_FILE_CONFIG", + "text": "配置(&G)" }, { - "id": "IDS_TOOLBAR_MATH", - "text": "数学运算" + "id": "IDS_TOOLBAR_FILE_CONFIG_LOAD", + "text": "加载配置(&L)" }, { - "id": "IDS_TOOLBAR_OPTIONS", - "text": "选项" - }, - - - { - "id": "IDS_FILEBAR_FILE", - "text": "文件" + "id": "IDS_TOOLBAR_FILE_CONFIG_STORE", + "text": "保存配置(&S)" }, { - "id": "IDS_FILEBAR_CONFIGURATION", - "text": "配置(&F)" + "id": "IDS_TOOLBAR_FILE_CONFIG_DEFAULT", + "text": "加载默认配置(&D)" }, { - "id": "IDS_FILEBAR_LOAD", - "text": "打开(&l)" - }, - { - "id": "IDS_FILEBAR_STORE", - "text": "保存(&S)" - }, - { - "id": "IDS_FILEBAR_DEFAULT", - "text": "默认" - }, - { - "id": "IDS_FILEBAR_0PEN", + "id": "IDS_TOOLBAR_FILE_OPEN", "text": "打开(&O)" }, { - "id": "IDS_FILEBAR_SAVE", + "id": "IDS_TOOLBAR_FILE_SAVE", "text": "保存(&S)" }, { - "id": "IDS_FILEBAR_EXPORT", + "id": "IDS_TOOLBAR_FILE_EXPORT", "text": "导出(&E)" }, { - "id": "IDS_FILEBAR_CAPTURE", + "id": "IDS_TOOLBAR_FILE_CAPTURE", "text": "截屏(&C)" }, { - "id": "IDS_FILEBAR_CONVERT_LOGIC", - "text": "逻辑分析(&G)" + "id": "IDS_TOOLBAR_HELP", + "text": "帮助(&H)" }, { - "id": "IDS_LOGOBAR_HELP", - "text": "帮助" - }, - { - "id": "IDS_LOGOBAR_ENGLISH", - "text": "English" - }, - { - "id": "IDS_LOGOBAR_CHINESE", - "text": "中文" - }, - { - "id": "IDS_LOGOBAR_LANGUAGE", + "id": "IDS_TOOLBAR_HELP_LANG", "text": "语言(&L)" }, { - "id": "IDS_LOGOBAR_ABOUT", + "id": "IDS_TOOLBAR_HELP_LANG_EN", + "text": "&English" + }, + { + "id": "IDS_TOOLBAR_HELP_LANG_CN", + "text": "中文(&C)" + }, + { + "id": "IDS_TOOLBAR_HELP_ABOUT", "text": "关于(&A)" }, { - "id": "IDS_LOGOBAR_MANUAL", + "id": "IDS_TOOLBAR_HELP_MANUAL", "text": "手册(&M)" }, { - "id": "IDS_LOGOBAR_BUG_REPORT", + "id": "IDS_TOOLBAR_HELP_BUG", "text": "报告问题(&B)" }, { - "id": "IDS_LOGOBAR_UPDATE", + "id": "IDS_TOOLBAR_HELP_UPDATE", "text": "更新(&U)" }, { - "id": "IDS_LOGOBAR_LOG_OPTIONS", + "id": "IDS_TOOLBAR_HELP_LOG", "text": "日志选项(&L)" } ] \ No newline at end of file diff --git a/lang/en/toolbar.json b/lang/en/toolbar.json index 77d9b11d..d9ca842e 100644 --- a/lang/en/toolbar.json +++ b/lang/en/toolbar.json @@ -1,176 +1,186 @@ -[ +[ { - "id": "IDS_TOOLBAR_DEMO", + "id": "IDS_DEVICE_MODE_LOGIC", + "text": "&Logic Analyzer" + }, + { + "id": "IDS_DEVICE_MODE_ANALOG", + "text": "D&ata Acquisition" + }, + { + "id": "IDS_DEVICE_MODE_DSO", + "text": "Os&cilloscope" + }, + { + "id": "IDS_TOOLBAR_DEVICE_TYPE_DEMO", "text": "Demo" }, { - "id": "IDS_TOOLBAR_FILE", - "text": "file" - }, - { - "id": "IDS_TOOLBAR_OPTION", - "text": "Options" - }, - { - "id": "IDS_TOOLBAR_MODE", - "text": "Mode" - }, - { - "id": "IDS_TOOLBAR_START", - "text": "Start" - }, - { - "id": "IDS_TOOLBAR_STOP", - "text": "Stop" - }, - { - "id": "IDS_TOOLBAR_SINGLE", - "text": "Single" - }, - { - "id": "IDS_TOOLBAR_INSTANT", - "text": "Instant" - }, - { - "id": "IDS_TOOLBAR_SINGLE_ACTION", - "text": "&Single" - }, - { - "id": "IDS_TOOLBAR_REPEAT_ACTION", - "text": "&Repetitive" - }, - { - "id": "IDS_TOOLBAR_REALTIME_ACTION", - "text": "Real&time" - }, - { - "id": "IDS_TOOLBAR_TRIGGER", - "text": "Trigger" - }, - { - "id": "IDS_TOOLBAR_DECODE", - "text": "Decode" - }, - { - "id": "IDS_TOOLBAR_MEASURE", - "text": "Measure" - }, - { - "id": "IDS_TOOLBAR_SEARCH", - "text": "Search" - }, - { - "id": "IDS_TOOLBAR_FUNCTION", - "text": "Function" - }, - { - "id": "IDS_TOOLBAR_DISPLAY", - "text": "Display" - }, - { - "id": "IDS_TOOLBAR_LISSAJOUS", - "text": "Lissajous" - }, - { - "id": "IDS_TOOLBAR_THEMES", - "text": "Themes" - }, - { - "id": "IDS_TOOLBAR_DARK", - "text": "Dark" - }, - { - "id": "IDS_TOOLBAR_LIGHT", - "text": "Light" - }, - { - "id": "IDS_TOOLBAR_FFT", - "text": "FFT" - }, - { - "id": "IDS_TOOLBAR_MATH", - "text": "Math" - }, - { - "id": "IDS_TOOLBAR_OPTIONS", - "text": "Options" - }, - - - { - "id": "IDS_FILEBAR_FILE", + "id": "IDS_TOOLBAR_DEVICE_TYPE_FILE", "text": "File" }, { - "id": "IDS_FILEBAR_CONFIGURATION", - "text": "Con&fig..." + "id": "IDS_TOOLBAR_DEVICE_OPTION", + "text": "&Options" }, { - "id": "IDS_FILEBAR_LOAD", - "text": "Load..." + "id": "IDS_TOOLBAR_CAPTURE_MODE", + "text": "Mod&e" }, { - "id": "IDS_FILEBAR_STORE", - "text": "S&tore..." + "id": "IDS_TOOLBAR_CAPTURE_MODE_SINGLE", + "text": "&Single" }, { - "id": "IDS_FILEBAR_DEFAULT", - "text": "Default..." + "id": "IDS_TOOLBAR_CAPTURE_MODE_REPEAT", + "text": "&Repetitive" }, { - "id": "IDS_FILEBAR_0PEN", + "id": "IDS_TOOLBAR_CAPTURE_MODE_REALTIME", + "text": "Real&time" + }, + { + "id": "IDS_TOOLBAR_RUN_START", + "text": "&Start" + }, + { + "id": "IDS_TOOLBAR_RUN_STOP", + "text": "&Stop" + }, + { + "id": "IDS_TOOLBAR_ONE_SINGLE", + "text": "S&ingle" + }, + { + "id": "IDS_TOOLBAR_ONE_INSTANT", + "text": "&Instant" + }, + { + "id": "IDS_TOOLBAR_ONE_STOP", + "text": "&Stop" + }, + { + "id": "IDS_TOOLBAR_TRIGGER", + "text": "&Trigger" + }, + { + "id": "IDS_TOOLBAR_DECODE", + "text": "&Decode" + }, + { + "id": "IDS_TOOLBAR_MEASURE", + "text": "&Measure" + }, + { + "id": "IDS_TOOLBAR_SEARCH", + "text": "Sea&rch" + }, + { + "id": "IDS_TOOLBAR_FUNCTION", + "text": "Fu&nction" + }, + { + "id": "IDS_TOOLBAR_FUNCTION_FFT", + "text": "&FFT" + }, + { + "id": "IDS_TOOLBAR_FUNCTION_MATH", + "text": "&Math" + }, + { + "id": "IDS_TOOLBAR_DISPLAY", + "text": "Dis&play" + }, + { + "id": "IDS_TOOLBAR_DISPLAY_THEMES", + "text": "&Themes" + }, + { + "id": "IDS_TOOLBAR_DISPLAY_LISSAJOUS", + "text": "Liss&ajous" + }, + { + "id": "IDS_TOOLBAR_DISPLAY_THEMES_DARK", + "text": "&Dark" + }, + { + "id": "IDS_TOOLBAR_DISPLAY_THEMES_LIGHT", + "text": "&Light" + }, + { + "id": "IDS_TOOLBAR_DISPLAY_OPTIONS", + "text": "&Options" + }, + { + "id": "IDS_TOOLBAR_FILE", + "text": "&File" + }, + { + "id": "IDS_TOOLBAR_FILE_CONFIG", + "text": "Confi&g" + }, + { + "id": "IDS_TOOLBAR_FILE_CONFIG_LOAD", + "text": "&Load Configuration" + }, + { + "id": "IDS_TOOLBAR_FILE_CONFIG_STORE", + "text": "&Save Configuration" + }, + { + "id": "IDS_TOOLBAR_FILE_CONFIG_DEFAULT", + "text": "Load &Default Configuration" + }, + { + "id": "IDS_TOOLBAR_FILE_OPEN", "text": "&Open..." }, { - "id": "IDS_FILEBAR_SAVE", + "id": "IDS_TOOLBAR_FILE_SAVE", "text": "&Save..." }, { - "id": "IDS_FILEBAR_EXPORT", + "id": "IDS_TOOLBAR_FILE_EXPORT", "text": "&Export..." }, { - "id": "IDS_FILEBAR_CAPTURE", + "id": "IDS_TOOLBAR_FILE_CAPTURE", "text": "&Capture..." }, { - "id": "IDS_FILEBAR_CONVERT_LOGIC", - "text": "Lo&gic" + "id": "IDS_TOOLBAR_HELP", + "text": "&Help" }, { - "id": "IDS_LOGOBAR_HELP", - "text": "Help" - }, - { - "id": "IDS_LOGOBAR_ENGLISH", - "text": "English" - }, - { - "id": "IDS_LOGOBAR_CHINESE", - "text": "中文" - }, - { - "id": "IDS_LOGOBAR_LANGUAGE", + "id": "IDS_TOOLBAR_HELP_LANG", "text": "&Language" }, { - "id": "IDS_LOGOBAR_ABOUT", + "id": "IDS_TOOLBAR_HELP_LANG_EN", + "text": "&English" + }, + { + "id": "IDS_TOOLBAR_HELP_LANG_CN", + "text": "中文(&C)" + }, + { + "id": "IDS_TOOLBAR_HELP_ABOUT", "text": "&About..." }, { - "id": "IDS_LOGOBAR_MANUAL", + "id": "IDS_TOOLBAR_HELP_MANUAL", "text": "&Manual..." }, { - "id": "IDS_LOGOBAR_BUG_REPORT", + "id": "IDS_TOOLBAR_HELP_BUG", "text": "&Bug Report" }, { - "id": "IDS_LOGOBAR_UPDATE", + "id": "IDS_TOOLBAR_HELP_UPDATE", "text": "&Update" }, { - "id": "IDS_LOGOBAR_LOG_OPTIONS", + "id": "IDS_TOOLBAR_HELP_LOG", "text": "L&og Options" }