diff --git a/.reuse/dep5 b/.reuse/dep5 index e8d9b3b92..5d339a663 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -8,6 +8,11 @@ Files: .gitlab-ci.yml Copyright: None License: CC0-1.0 +# github +Files: .github/* +Copyright: None +License: CC0-1.0 + # ignore files Files: .gitignore .clang-format .clog.toml .project.json Copyright: None diff --git a/assets/translations/en_US.ts b/assets/translations/en_US.ts index 1e9af69dc..f6f663c1b 100644 --- a/assets/translations/en_US.ts +++ b/assets/translations/en_US.ts @@ -1,6 +1,6 @@ - + AboutDialog @@ -179,62 +179,62 @@ BinaryToolsDialog - + Binary Tools - + Use Tool - + Save - + Cancel - + Error: execute command error! The reason is unknown. - + The process "%1" exited normally. - + The process "%1" exited with code %2. - + The process "%1" crashed. - + &Application Output - + Start execute command: "%1" "%2" in workspace "%3". - + Execute command finished. @@ -682,61 +682,77 @@ The debugee has Terminated. - + <Unknown> name - + <Unknown> meaning - + <p>The inferior stopped because it received a signal from the operating system.<p><table><tr><td>Signal name : </td><td>%1</td></tr><tr><td>Signal meaning : </td><td>%2</td></tr></table> - + Signal Received - + Threads: - + + Please build first. + Build : Ctrl + B + + + + + Is preparing dependence, please waiting for a moment + + + + + Is getting the dap port, please waiting for a moment + + + + Requesting debug port... - + The dap port is not ready, please retry. - + Debugging starts - + Start debugging coredump file: - + The coredump target file is error: - + The coredump file is error: @@ -778,47 +794,47 @@ The dap port is not ready, please retry. DetailsView - + Name: - + Version: - + Compatibility version: - + Vendor: - + Copyright: - + URL: - + Description: - + License: - + Dependencies: @@ -852,19 +868,6 @@ The dap port is not ready, please retry. - - EnvironmentModel - - - Key - - - - - Value - - - EnvironmentWidget @@ -1016,6 +1019,19 @@ The dap port is not ready, please retry. + + GradleWidget + + + use Gradle wrapper + + + + + use Local installation, directory： + + + HistoryDiffView @@ -1045,27 +1061,22 @@ The dap port is not ready, please retry. JSDebugger - + Stac&kFrame - + Break&points - + ScriptWidget - - ConsoleWidget - - - - + ErrorLogWidget @@ -1282,14 +1293,6 @@ repos path: %0 - - OptionGeneralGenerator - - - General - - - OptionsDialog @@ -1362,12 +1365,13 @@ repos path: %0 - + Details - + + Close @@ -1377,7 +1381,7 @@ repos path: %0 - + Plugin Details of %1 @@ -1399,26 +1403,6 @@ repos path: %0 Load on Startup - - - Name - - - - - Load - - - - - Version - - - - - Vendor - - ProblemOutputPane @@ -2048,6 +2032,12 @@ storage: %2 Build configuration: + + + + JDK version： + + Gradle Version: @@ -2055,7 +2045,7 @@ storage: %2 - Main Class： + Main Class： @@ -2090,34 +2080,28 @@ storage: %2 - - Gradle distribution： + + Ninja path： - - - JDK version： + + Gradle distribution： - Maven path： + Maven path： - User Setting： + User Setting： - Local Setting： - - - - - Ninja path： + Local Setting： @@ -2374,18 +2358,83 @@ storage: %2 launch mavenConfig + + + Name + + + + + Load + + + + + Version + + + + + Vendor + + + + + General + + + + + + OK + + + + + Cancel + + + + + Build Steps + + + + + Clean Steps + + + + + Runtime Env + + + + + + + Variable + + + + + + + Value + + QPushButton - + Ok - + Cancel @@ -2665,53 +2714,63 @@ Delete anyway? - + + OK + + + + + Cancel + + + + event list - + syscall filter - + x11 events filter - + dbus filter - + Only record the thread where event occurred: - + Record the size of heap memory (default is 0, in KB): - + Record the size of stack memory (the default is 32, in KB): - + Record system call parameter size (default is 256, unit Byte): - + Record the specified global variable (format: [*]var1+size1[,[*]var2+size2,...]): - + Start record after the specified function is executed (c++ mangle name): @@ -2734,22 +2793,32 @@ Delete anyway? - - trace directory： + + OK - - process ID： + + Cancel + + + + + trace directory： - recent： + process ID： + + + + + recent： - + Open Directory diff --git a/assets/translations/zh_CN.ts b/assets/translations/zh_CN.ts index 9c4ffa9db..613b411b0 100644 --- a/assets/translations/zh_CN.ts +++ b/assets/translations/zh_CN.ts @@ -1,6 +1,6 @@ - + AboutDialog @@ -179,67 +179,67 @@ BinaryToolsDialog - + Binary Tools 二进制工具 - + Use Tool 使用工具 - + Save 保存配置 - + Cancel 取消 - + Error: execute command error! The reason is unknown. 错误：执行命令错误！原因未知。 - + The process "%1" exited normally. 进程"%1" 正常退出。 - + The process "%1" exited with code %2. 进程"%1"退出，代码为%2。 - + The process "%1" crashed. 进程"%1"崩溃。 - + &Application Output 应用程序输出(&A) - + Start execute command: "%1" "%2" in workspace "%3". 开始执行命令： "%1" "%2"，工作目录为"%3"。 - + Execute command finished. 命令执行完成。 @@ -703,39 +703,56 @@ The debugee has Terminated. - + <Unknown> name - + <Unknown> meaning - + <p>The inferior stopped because it received a signal from the operating system.<p><table><tr><td>Signal name : </td><td>%1</td></tr><tr><td>Signal meaning : </td><td>%2</td></tr></table> <p>下位机停止，因为它收到了来自操作系统的信号。<p><table><tr><td>信号名： </td><td>%1</td></tr><tr><td>信号含义： </td><td>%2</td></tr></table> - + Signal Received 信号已接收 - + Threads: 线程： - + + Please build first. + Build : Ctrl + B + 请先编译工程。 +编译：Ctrl + B + + + + Is preparing dependence, please waiting for a moment + 正在加载依赖项，请等待 + + + + Is getting the dap port, please waiting for a moment + 正在获取dap端口，请等待 + + + Requesting debug port... 请求调试端口... - + The dap port is not ready, please retry. @@ -744,22 +761,22 @@ dap端口未就绪，请重试。 - + Debugging starts 调试开始 - + Start debugging coredump file: 开始调试coredump文件： - + The coredump target file is error: coredump目标文件错误： - + The coredump file is error: coredump文件错误： @@ -801,47 +818,47 @@ dap端口未就绪，请重试。 DetailsView - + Name: 名称： - + Version: 版本： - + Compatibility version: 兼容版本： - + Vendor: 供应商： - + Copyright: 版权： - + URL: URL： - + Description: 说明： - + License: 许可： - + Dependencies: 依赖关系： @@ -875,19 +892,6 @@ dap端口未就绪，请重试。 正在下载%1... - - EnvironmentModel - - - Key - Key - - - - Value - Value - - EnvironmentWidget @@ -1039,6 +1043,19 @@ dap端口未就绪，请重试。 工程属性 + + GradleWidget + + + use Gradle wrapper + 使用Gradle解析器 + + + + use Local installation, directory： + 使用本地安装应用，路径： + + HistoryDiffView @@ -1068,27 +1085,22 @@ dap端口未就绪，请重试。 JSDebugger - + Stac&kFrame 堆栈列表(&K) - + Break&points 断点列表(&P) - + ScriptWidget 脚本窗口 - - ConsoleWidget - 控制窗口 - - - + ErrorLogWidget 错误日志窗口 @@ -1165,7 +1177,7 @@ dap端口未就绪，请重试。 Name: - 名字： + 名称： @@ -1306,14 +1318,6 @@ repos path: %0 Ninja - - OptionGeneralGenerator - - - General - 通用设置 - - OptionsDialog @@ -1334,7 +1338,7 @@ repos path: %0 OK - OK + 确定 @@ -1386,14 +1390,15 @@ repos path: %0 已安装的插件 - + Details 详情 - + + Close - 关闭关闭 + 关闭 @@ -1401,7 +1406,7 @@ repos path: %0 需要重启。 - + Plugin Details of %1 %1的插件详情 @@ -1423,26 +1428,6 @@ repos path: %0 Load on Startup 启动时载入 - - - Name - 名称 - - - - Load - 加载状态 - - - - Version - 版本 - - - - Vendor - 销售商 - ProblemOutputPane @@ -2082,6 +2067,12 @@ storage: %2 Build configuration: 编译配置： + + + + JDK version： + JDK版本： + Gradle Version: @@ -2089,8 +2080,8 @@ storage: %2 - Main Class： - 主类 + Main Class： + 主类： @@ -2124,36 +2115,30 @@ storage: %2 JS解释器： - - Gradle distribution： - Gradle版本 + + Ninja path： + Ninja路径： - - - JDK version： - JDK版本 + + Gradle distribution： + Gradle版本： - Maven path： - Maven路径 + Maven path： + Maven路径： - User Setting： - 用户设置 + User Setting： + 用户设置： - Local Setting： + Local Setting： 本地设置 - - - Ninja path： - Ninja路径 - QLineEdit @@ -2408,18 +2393,83 @@ storage: %2 launch mavenConfig 加载maven配置 + + + Name + 名称 + + + + Load + 加载状态 + + + + Version + 版本 + + + + Vendor + 销售商 + + + + General + 通用设置 + + + + + OK + 确定 + + + + Cancel + 取消 + + + + Build Steps + 编译步骤 + + + + Clean Steps + 清扫步骤 + + + + Runtime Env + 运行时环境 + + + + + + Variable + 变量名 + + + + + + Value + 值 + QPushButton - + Ok 确定 - + Cancel 取消 @@ -2700,53 +2750,63 @@ Delete anyway? 事件过滤器. - + + OK + 确定 + + + + Cancel + 取消 + + + event list 事件列表 - + syscall filter 系统调用过滤器 - + x11 events filter x11事件过滤器 - + dbus filter dbus过滤器 - + Only record the thread where event occurred: 仅记录事件发生的线程： - + Record the size of heap memory (default is 0, in KB): 记录堆区的大小（默认值为0，以KB为单位）： - + Record the size of stack memory (the default is 32, in KB): 记录栈区的大小（默认值为32，以KB为单位）： - + Record system call parameter size (default is 256, unit Byte): 记录系统调用参数的大小（默认值为256，单位字节）： - + Record the specified global variable (format: [*]var1+size1[,[*]var2+size2,...]): 记录指定的全局变量（格式：[*]var1+size1[，[*]var2+size2，…]）： - + Start record after the specified function is executed (c++ mangle name): 执行指定函数后开始记录（c++mangle名称）： @@ -2769,22 +2829,32 @@ Delete anyway? 浏览... - - trace directory： - 跟踪目录 + + OK + 确定 - - process ID： - 进程ID + + Cancel + 取消 + + + + trace directory： + - recent： - 最近 + process ID： + 进程ID： + + + + recent： + 最近打开： - + Open Directory 打开目录 diff --git a/src/common/dialog/contextdialog.cpp b/src/common/dialog/contextdialog.cpp index 5e4420fdc..44a6f6731 100644 --- a/src/common/dialog/contextdialog.cpp +++ b/src/common/dialog/contextdialog.cpp @@ -26,6 +26,8 @@ void ContextDialog::okCancel(QString text, QString title, messageBox.setText(text); messageBox.setIcon(icon); messageBox.setStandardButtons(QMessageBox::Ok|QMessageBox::Cancel); + messageBox.button(QMessageBox::Ok)->setText(QObject::tr("OK")); + messageBox.button(QMessageBox::Cancel)->setText(QObject::tr("Cancel")); if (okCallBack) QObject::connect(messageBox.button(QMessageBox::Ok), &QAbstractButton::clicked, okCallBack); @@ -47,6 +49,7 @@ void ContextDialog::ok(QString text, QString title, messageBox.setText(text); messageBox.setIcon(icon); messageBox.setStandardButtons(QMessageBox::Ok); + messageBox.button(QMessageBox::Ok)->setText(QObject::tr("OK")); if (okCallBack) QObject::connect(messageBox.button(QMessageBox::Ok), &QAbstractButton::clicked, okCallBack); diff --git a/src/common/dialog/contextdialog.h b/src/common/dialog/contextdialog.h index 2954495bf..0d1e0281f 100644 --- a/src/common/dialog/contextdialog.h +++ b/src/common/dialog/contextdialog.h @@ -13,6 +13,7 @@ #include #include +#include class ContextDialog final { diff --git a/src/framework/lifecycle/pluginview.cpp b/src/framework/lifecycle/pluginview.cpp index ebb2f8006..753357609 100644 --- a/src/framework/lifecycle/pluginview.cpp +++ b/src/framework/lifecycle/pluginview.cpp @@ -108,13 +108,12 @@ PluginView::PluginView(QWidget *parent) categoryWidegt->setIndentation(20); categoryWidegt->setUniformRowHeights(true); categoryWidegt->setSortingEnabled(true); - categoryWidegt->setColumnWidth(2, 40); categoryWidegt->header()->setDefaultSectionSize(120); categoryWidegt->header()->setMinimumSectionSize(40); categoryWidegt->header()->setSortIndicator(0, Qt::AscendingOrder); categoryWidegt->setSelectionMode(QAbstractItemView::SingleSelection); categoryWidegt->setSelectionBehavior(QAbstractItemView::SelectRows); - categoryWidegt->setHeaderLabels({ tr("Name"), tr("Load"), tr("Version"), tr("Vendor") }); + categoryWidegt->setHeaderLabels({QObject::tr("Name"), QObject::tr("Load"), QObject::tr("Version"), QObject::tr("Vendor")}); auto *gridLayout = new QGridLayout(this); gridLayout->setContentsMargins(2, 2, 2, 2); diff --git a/src/plugins/binarytools/mainframe/binarytoolsdialog.cpp b/src/plugins/binarytools/mainframe/binarytoolsdialog.cpp index b9c97a704..4f98b05b6 100644 --- a/src/plugins/binarytools/mainframe/binarytoolsdialog.cpp +++ b/src/plugins/binarytools/mainframe/binarytoolsdialog.cpp @@ -7,6 +7,7 @@ #include "common/util/eventdefinitions.h" #include +#include #include #include #include @@ -15,6 +16,7 @@ class BinaryToolsDialogPrivate { friend class BinaryToolsDialog; BinaryToolsConfigView *configView = nullptr; + QDialogButtonBox *buttons = nullptr; }; BinaryToolsDialog::BinaryToolsDialog(QDialog *parent) @@ -29,32 +31,31 @@ BinaryToolsDialog::BinaryToolsDialog(QDialog *parent) d->configView = new BinaryToolsConfigView; vLayout->addWidget(d->configView); - - QHBoxLayout *buttonLayout = new QHBoxLayout(this); - QPushButton *pbtUse = new QPushButton(tr("Use Tool"), this); - QPushButton *pbtSave = new QPushButton(tr("Save"), this); - QPushButton *pbtCancel = new QPushButton(tr("Cancel"), this); - pbtUse->setDefault(true); - auto buttonSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - - buttonLayout->addItem(buttonSpacer); - buttonLayout->addWidget(pbtUse); - buttonLayout->addWidget(pbtSave); - buttonLayout->addWidget(pbtCancel); + vLayout->addStretch(); + + QHBoxLayout * buttonLayout = new QHBoxLayout(); + d->buttons = new QDialogButtonBox(this); + d->buttons->setStandardButtons(QDialogButtonBox::Apply | QDialogButtonBox::Save | QDialogButtonBox::Cancel); + d->buttons->button(QDialogButtonBox::Apply)->setText(tr("Use Tool")); + d->buttons->button(QDialogButtonBox::Save)->setText(tr("Save")); + d->buttons->button(QDialogButtonBox::Cancel)->setText(tr("Cancel")); + d->buttons->button(QDialogButtonBox::Apply)->setDefault(true); + buttonLayout->addWidget(d->buttons); vLayout->addLayout(buttonLayout); - connect(pbtUse, &QPushButton::clicked, [=](){ + connect(d->configView, &BinaryToolsConfigView::useCombinationCommand, [=](){ QtConcurrent::run([=](){ useClicked(); }); }); - connect(d->configView, &BinaryToolsConfigView::useCombinationCommand, [=](){ + connect(d->buttons->button(QDialogButtonBox::Apply), &QPushButton::clicked, [=](){ QtConcurrent::run([=](){ useClicked(); }); }); - connect(pbtSave, &QPushButton::clicked, this, &BinaryToolsDialog::saveClicked); - connect(pbtCancel, &QPushButton::clicked, this, &BinaryToolsDialog::reject); + connect(d->buttons->button(QDialogButtonBox::Save), &QPushButton::clicked, this, &BinaryToolsDialog::saveClicked); + connect(d->buttons, &QDialogButtonBox::rejected, this, &BinaryToolsDialog::reject); + connect(d->buttons, &QDialogButtonBox::accepted, this, &BinaryToolsDialog::accept); } BinaryToolsDialog::~BinaryToolsDialog() diff --git a/src/plugins/binarytools/mainframe/environmentview.cpp b/src/plugins/binarytools/mainframe/environmentview.cpp index 090a78316..7c6c77f44 100644 --- a/src/plugins/binarytools/mainframe/environmentview.cpp +++ b/src/plugins/binarytools/mainframe/environmentview.cpp @@ -95,9 +95,9 @@ QVariant EnvironmentModel::headerData(int section, Qt::Orientation orientation, if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { switch (section) { case Key: - return tr("Key"); + return QObject::tr("Variable"); case Value: - return tr("Value"); + return QObject::tr("Value"); default: break; } diff --git a/src/plugins/core/mainframe/plugindialog.cpp b/src/plugins/core/mainframe/plugindialog.cpp index d45053afa..0a443131b 100644 --- a/src/plugins/core/mainframe/plugindialog.cpp +++ b/src/plugins/core/mainframe/plugindialog.cpp @@ -29,11 +29,11 @@ PluginDialog::PluginDialog(QWidget *parent) auto vLayout = new QVBoxLayout(this); vLayout->addWidget(view); + closeButton = new QDialogButtonBox(QDialogButtonBox::Close, Qt::Horizontal, this); detailsButton = new QPushButton(tr("Details"), this); - closeButton = new QPushButton(tr("Close"), this); + closeButton->button(QDialogButtonBox::Close)->setText(tr("Close")); detailsButton->setEnabled(false); closeButton->setEnabled(true); - closeButton->setDefault(true); restratRequired = new QLabel(tr(" Restart required."), this); if (!isRestartRequired) @@ -45,6 +45,7 @@ PluginDialog::PluginDialog(QWidget *parent) hLayout->addWidget(restratRequired); hLayout->addStretch(5); hLayout->addWidget(closeButton); + vLayout->addLayout(hLayout); QObject::connect(view, &dpf::PluginView::currentPluginChanged, @@ -55,7 +56,7 @@ PluginDialog::PluginDialog(QWidget *parent) this, &PluginDialog::updateRestartRequired); QObject::connect(detailsButton, &QPushButton::clicked, [this] { openDetails(); }); - QObject::connect(closeButton, &QPushButton::clicked, + QObject::connect(closeButton->button(QDialogButtonBox::Close), &QPushButton::clicked, [this] { closeDialog() ;}); updateButtons(); @@ -91,6 +92,7 @@ void PluginDialog::openDetails() vLayout->addWidget(detailView); detailView->update(plugin); QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Close, Qt::Horizontal, &dialog); + buttons->button(QDialogButtonBox::Close)->setText(tr("Close")); vLayout->addWidget(buttons); connect(buttons, &QDialogButtonBox::accepted, &dialog, &QDialog::accept); diff --git a/src/plugins/core/mainframe/plugindialog.h b/src/plugins/core/mainframe/plugindialog.h index a0c8d681a..cf1cb1c8e 100644 --- a/src/plugins/core/mainframe/plugindialog.h +++ b/src/plugins/core/mainframe/plugindialog.h @@ -15,7 +15,7 @@ #include class DetailsView; -class QPushButton; +class QDialogButtonBox; class QLabel; namespace dpf { @@ -38,8 +38,8 @@ class PluginDialog : public QDialog dpf::PluginView *view = nullptr; DetailsView *detailView = nullptr; + QDialogButtonBox *closeButton = nullptr; QPushButton *detailsButton = nullptr; - QPushButton *closeButton = nullptr; QLabel *restratRequired = nullptr; }; diff --git a/src/plugins/cxx/cmake/project/mainframe/properties/buildpropertywidget.cpp b/src/plugins/cxx/cmake/project/mainframe/properties/buildpropertywidget.cpp index e6a5c99b1..fddb5a8bb 100644 --- a/src/plugins/cxx/cmake/project/mainframe/properties/buildpropertywidget.cpp +++ b/src/plugins/cxx/cmake/project/mainframe/properties/buildpropertywidget.cpp @@ -35,9 +35,9 @@ DetailPropertyWidget::DetailPropertyWidget(QWidget *parent) d->cleanStepsPane = new StepsPane(this); d->envWidget = new EnvironmentWidget(this); - CollapseWidget *buildStep = new CollapseWidget("Build Steps", d->buildStepsPane, this); - CollapseWidget *cleanStep = new CollapseWidget("Clean Steps", d->cleanStepsPane, this); - CollapseWidget *envStep = new CollapseWidget("Runtime Env", d->envWidget, this); + CollapseWidget *buildStep = new CollapseWidget(QObject::tr("Build Steps"), d->buildStepsPane, this); + CollapseWidget *cleanStep = new CollapseWidget(QObject::tr("Clean Steps"), d->cleanStepsPane, this); + CollapseWidget *envStep = new CollapseWidget(QObject::tr("Runtime Env"), d->envWidget, this); addCollapseWidget(buildStep); addCollapseWidget(cleanStep); diff --git a/src/plugins/cxx/cmake/project/mainframe/properties/environmentwidget.cpp b/src/plugins/cxx/cmake/project/mainframe/properties/environmentwidget.cpp index 9c56609c4..b465b587b 100644 --- a/src/plugins/cxx/cmake/project/mainframe/properties/environmentwidget.cpp +++ b/src/plugins/cxx/cmake/project/mainframe/properties/environmentwidget.cpp @@ -59,9 +59,9 @@ QVariant EnvironmentModel::headerData(int section, Qt::Orientation orientation, if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { switch (section) { case kVaribale: - return "Variable"; + return QObject::tr("Variable"); case kValue: - return "Value"; + return QObject::tr("Value"); default: break; } diff --git a/src/plugins/java/gradle/option/gradlewidget.cpp b/src/plugins/java/gradle/option/gradlewidget.cpp index bd57022ce..f9af3a124 100644 --- a/src/plugins/java/gradle/option/gradlewidget.cpp +++ b/src/plugins/java/gradle/option/gradlewidget.cpp @@ -55,10 +55,10 @@ void GradleWidget::setupUi() setLayout(vLayout); QLabel *label = new QLabel(QLabel::tr("Gradle distribution：")); - d->useWrapper = new QRadioButton("use Gradle wrapper"); + d->useWrapper = new QRadioButton(tr("use Gradle wrapper")); QHBoxLayout *localLayout = new QHBoxLayout(); - d->useLocal = new QRadioButton("use Local installation, directory："); + d->useLocal = new QRadioButton(tr("use Local installation, directory：")); d->useLocal->setFixedWidth(300); d->useLocal->setChecked(true); d->localDetail = new QComboBox(); diff --git a/src/plugins/option/optioncore/mainframe/environmentwidget.cpp b/src/plugins/option/optioncore/mainframe/environmentwidget.cpp index 157cadef3..1956b8076 100644 --- a/src/plugins/option/optioncore/mainframe/environmentwidget.cpp +++ b/src/plugins/option/optioncore/mainframe/environmentwidget.cpp @@ -69,9 +69,9 @@ class EnvironmentModel : public QAbstractTableModel if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { switch (section) { case kVaribale: - return "Variable"; + return QObject::tr("Variable"); case kValue: - return "Value"; + return QObject::tr("Value"); default: ; // do nothing. } diff --git a/src/plugins/option/optioncore/mainframe/optiongeneralgenerator.h b/src/plugins/option/optioncore/mainframe/optiongeneralgenerator.h index d3a74c111..64019a5de 100644 --- a/src/plugins/option/optioncore/mainframe/optiongeneralgenerator.h +++ b/src/plugins/option/optioncore/mainframe/optiongeneralgenerator.h @@ -9,9 +9,10 @@ class OptionGeneralGenerator : public dpfservice::OptionGenerator { + Q_OBJECT public: OptionGeneralGenerator(); - inline static QString kitName() {return tr("General");} + inline static QString kitName() {return QObject::tr("General");} virtual QWidget *optionWidget() override; }; diff --git a/src/plugins/reversedebug/eventfilterdialog.cpp b/src/plugins/reversedebug/eventfilterdialog.cpp index 13da7058b..256f0ee98 100644 --- a/src/plugins/reversedebug/eventfilterdialog.cpp +++ b/src/plugins/reversedebug/eventfilterdialog.cpp @@ -252,6 +252,8 @@ void EventFilterDialog::setupUi() d->buttonBox = new QDialogButtonBox(this); d->buttonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok); + d->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK")); + d->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel")); d->buttonBox->button(QDialogButtonBox::Ok)->setDefault(true); d->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true); diff --git a/src/plugins/reversedebug/loadcoredialog.cpp b/src/plugins/reversedebug/loadcoredialog.cpp index 65a98b5b0..ae8c5cf5b 100644 --- a/src/plugins/reversedebug/loadcoredialog.cpp +++ b/src/plugins/reversedebug/loadcoredialog.cpp @@ -70,6 +70,8 @@ void LoadCoreDialog::setupUi() // ok & cancel button. d->buttonBox = new QDialogButtonBox(this); d->buttonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok); + d->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK")); + d->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel")); d->buttonBox->button(QDialogButtonBox::Ok)->setDefault(true); auto hLayout = new QHBoxLayout();