diff --git a/assets/translations/en_US.ts b/assets/translations/en_US.ts index 788995cef..1b51566dd 100644 --- a/assets/translations/en_US.ts +++ b/assets/translations/en_US.ts @@ -980,7 +980,7 @@ BuildPropertyPage - + Output direcotry: @@ -1021,12 +1021,12 @@ storage: %2 CMakeDebug - + The gdb is required, please install it in console with "sudo apt install gdb", and then restart the tool, reselect the CMake Debugger in Options Dialog... - + Request cxx dap port failed, please retry. @@ -1042,55 +1042,60 @@ storage: %2 CmakeProjectGenerator - + Run CMake - + Clear CMake - + Files in project %1 have changed, needs to run cmake to update - + Properties - + File are not automatically added to the CmakeList.txt file to the Cmake project. Copy the path to the source files to the clipboard? - + Copy to Clipboard? - + Ok - + Project Properties - + Build - + Run + + + Kit + + CodeCompletionExtendWidget @@ -1121,77 +1126,77 @@ storage: %2 CodeEditor - + Save All Documents - + Close All Documents - + Print - + backward - + forward - + Close Current Editor - + Switch Header/Source - + Follow Symbol Under Cursor - + Toggle Breakpoint - + Find Usages - + Rename Symbol Under Cursor - + Current document - + Current document content - + Backward - + Forward @@ -1605,38 +1610,38 @@ storage: %2 DAPDebugger - - + + The debugee has Terminated. - + The debugee has Exited. - + Input Condition Expression - + Condition - + When the breakpoint is reached, it will be hit only when the expression is true - - + + Cancel @@ -1646,138 +1651,138 @@ The debugee has Terminated. - + The gdb is required, please install it in console with "sudo apt install gdb", and then restart the tool, reselect the CMake Debugger in Options Dialog... - + Request cxx dap port failed, please retry. - - + + Ok - + <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 - + New Evaluator Expression - + Enter an expression to evaluate - + Threads: - + Stack List - + Add New Expression Evaluator - + Remove This Evaluator - + Name - + Value - + Type - + Breakpoint List - + 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: @@ -2881,6 +2886,19 @@ need to manually copy the source code to this path + + KitPage + + + Kit: + + + + + None + + + KitsPane @@ -3224,12 +3242,12 @@ repos path: %0 - - OK + + Apply - + Cancel @@ -3361,22 +3379,22 @@ repos path: %0 - + Config - + Kit: - + Cancel - + Confirm @@ -3813,7 +3831,7 @@ not exists support files: %0 QFileDialog - + Open Project Directory @@ -3841,7 +3859,7 @@ not exists support files: %0 - + Build configuration: @@ -4088,22 +4106,22 @@ not exists support files: %0 - + Build Steps - + Clean Steps - + Build Environment - + CMake config @@ -4285,7 +4303,7 @@ not exists support files: %0 - + Search &Results @@ -5602,6 +5620,37 @@ not exists support files: %0 + + SymbolWidget + + + No symbols found in document "%1" + + + + + Follow Cursor + + + + + Expand All + + + + + Collapse All + + + + + SymbolWidgetGenerator + + + OUTLINE + + + TabBarPrivate @@ -5666,7 +5715,7 @@ not exists support files: %0 TabWidgetPrivate - + File Operation @@ -5898,96 +5947,96 @@ not exists support files: %0 WorkspaceWidgetPrivate - + Add/Delete Comment - + Add/Remove Comment - + &Add/Remove Comment - - + + Show opened files - + &Show open files - + The file <i>%1</i> has been changed on disk.Do you want to reload it? - + File Has Been Changed - + Yes button - + Yes To All button - + No button - + No To All button - - + + Close button - + The file <i>%1</i> has been removed from disk. Do you want to save it under a different name, or close the editor? - + File Has Been Removed - + Save button - + Save As button - + Close All button diff --git a/assets/translations/zh_CN.ts b/assets/translations/zh_CN.ts index 432d50ff8..d79aa3e80 100644 --- a/assets/translations/zh_CN.ts +++ b/assets/translations/zh_CN.ts @@ -994,7 +994,7 @@ BuildPropertyPage - + Output direcotry: 输出目录： @@ -1038,12 +1038,12 @@ storage: %2 CMakeDebug - + The gdb is required, please install it in console with "sudo apt install gdb", and then restart the tool, reselect the CMake Debugger in Options Dialog... gdb尚未安装，请使用“sudo apt install gdb”将其安装在控制台中，然后重新启动工具，在选项对话框中重新选择CMake调试器... - + Request cxx dap port failed, please retry. 请求cxx dap端口失败，请重新尝试。 @@ -1059,55 +1059,60 @@ storage: %2 CmakeProjectGenerator - + Run CMake 执行CMake - + Clear CMake 清除CMake - + Files in project %1 have changed, needs to run cmake to update 项目%1中的文件已经更改，需要运行 cmake 来更新 - + Properties 工程属性 - + File are not automatically added to the CmakeList.txt file to the Cmake project. Copy the path to the source files to the clipboard? 文件不会自动添加到 Cmake 项目的 CmakeList.txt 文件中。将源文件的路径复制到剪贴板？ - + Copy to Clipboard? 复制到剪贴板？ - + Ok 确定 - + Project Properties 工程属性 - + Build 编译 - + Run 运行 + + + Kit + 套件 + CodeCompletionExtendWidget @@ -1138,77 +1143,77 @@ storage: %2 CodeEditor - + Save All Documents 保存所有文件 - + Close All Documents 关闭所有文件 - + Print 打印 - + backward 后退 - + forward 前进 - + Close Current Editor 关闭当前编辑器 - + Switch Header/Source 切换头文件/源文件 - + Follow Symbol Under Cursor 跟随光标下符号 - + Toggle Breakpoint 切换断点 - + Find Usages 查找引用 - + Rename Symbol Under Cursor 重命名 - + Current document 当前文档 - + Current document content 当前文档内容 - + Backward 后退 - + Forward 前进 @@ -1628,8 +1633,8 @@ storage: %2 DAPDebugger - - + + The debugee has Terminated. @@ -1638,31 +1643,31 @@ The debugee has Terminated. - + The debugee has Exited. 调试已退出。 - + Input Condition Expression 输入条件表达式 - + Condition 条件 - + When the breakpoint is reached, it will be hit only when the expression is true 当断点到达，仅在表达式为真时触发 - - + + Cancel 取消 @@ -1672,117 +1677,117 @@ The debugee has Terminated. 调试其他应用程序时不能附加到进程 - + The gdb is required, please install it in console with "sudo apt install gdb", and then restart the tool, reselect the CMake Debugger in Options Dialog... gdb尚未安装，请在控制台中使用“sudo apt install gdb”将其安装，然后重新启动工具，在选项对话框中重新选择CMake调试器... - + Request cxx dap port failed, please retry. 请求cxx dap端口失败，请重新尝试。 - - + + Ok 确认 - + <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 信号已接收 - + New Evaluator Expression 新评估表达式 - + Enter an expression to evaluate - 输入求值表达式 + 输入求值表达式 - + Threads: 线程： - + Stack List 堆栈列表 - + Add New Expression Evaluator 添加新评估表达式 - + Remove This Evaluator 删除评估 - + Name 名称 - + Value 值 - + Type 类型 - + Breakpoint List 断点列表 - + 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. @@ -1791,22 +1796,22 @@ dap端口未就绪，请重试。 - + Debugging starts 调试开始 - + Start debugging coredump file: 开始调试coredump文件： - + The coredump target file is error: coredump目标文件错误： - + The coredump file is error: coredump文件错误： @@ -2912,6 +2917,19 @@ need to manually copy the source code to this path 套件 + + KitPage + + + Kit: + 构建工具： + + + + None + 空 + + KitsPane @@ -3256,12 +3274,12 @@ repos path: %0 全局选项 - - OK - 确定 + + Apply + 应用 - + Cancel 取消 @@ -3393,22 +3411,22 @@ repos path: %0 聚焦文件 - + Config 配置 - + Kit: 构建工具： - + Cancel 取消 - + Confirm 确定 @@ -3847,7 +3865,7 @@ not exists support files: %0 QFileDialog - + Open Project Directory 打开工程目录 @@ -3875,7 +3893,7 @@ not exists support files: %0 密码： - + Build configuration: 编译配置： @@ -4122,22 +4140,22 @@ not exists support files: %0 否 - + Build Steps 编译步骤 - + Clean Steps 清扫步骤 - + Build Environment 编译环境 - + CMake config CMake 配置 @@ -4319,7 +4337,7 @@ not exists support files: %0 符号 - + Search &Results 查找结果(&R) @@ -5642,6 +5660,37 @@ not exists support files: %0 当前文档的符号 + + SymbolWidget + + + No symbols found in document "%1" + 在文档“%1”中找不到符号 + + + + Follow Cursor + 跟随光标 + + + + Expand All + 展开所有 + + + + Collapse All + 折叠所有 + + + + SymbolWidgetGenerator + + + OUTLINE + 大纲 + + TabBarPrivate @@ -5706,7 +5755,7 @@ not exists support files: %0 TabWidgetPrivate - + File Operation 文件操作 @@ -5826,7 +5875,7 @@ not exists support files: %0 New Tool - + 新工具 @@ -5938,96 +5987,96 @@ not exists support files: %0 WorkspaceWidgetPrivate - + Add/Delete Comment 添加/删除注释 - + Add/Remove Comment 添加/删除注释 - + &Add/Remove Comment &添加/删除注释 - - + + Show opened files 显示打开的文件 - + &Show open files &显示打开的文件 - + The file <i>%1</i> has been changed on disk.Do you want to reload it? %1 被修改，是否重新加载？ - + File Has Been Changed 文件发生修改 - + Yes button 确定 - + Yes To All button 应用所有 - + No button 取消 - + No To All button 取消所有 - - + + Close button 关闭 - + The file <i>%1</i> has been removed from disk. Do you want to save it under a different name, or close the editor? %1 被移除，是否需要另存为，或者关闭当前编辑页？ - + File Has Been Removed 文件被移除 - + Save button 保存 - + Save As button 另存为 - + Close All button 关闭所有 diff --git a/src/plugins/option/optioncore/mainframe/optionsdialog.cpp b/src/plugins/option/optioncore/mainframe/optionsdialog.cpp index 3b275bcc2..91b344549 100644 --- a/src/plugins/option/optioncore/mainframe/optionsdialog.cpp +++ b/src/plugins/option/optioncore/mainframe/optionsdialog.cpp @@ -167,21 +167,22 @@ void OptionsDialog::setupUi() auto buttonLayout = new QHBoxLayout; buttonLayout->setSpacing(6); - auto horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + buttonLayout->setAlignment(Qt::AlignCenter); - buttonLayout->addItem(horizontalSpacer); - - auto okBtn = new DSuggestButton(tr("OK"), this); + auto okBtn = new DSuggestButton(tr("Apply"), this); + okBtn->setMinimumWidth(175); connect(okBtn, SIGNAL(clicked()), this, SLOT(saveAllConfig())); auto cancelBtn = new DPushButton(tr("Cancel"), this); - connect(cancelBtn, &DPushButton::clicked, [this] { + cancelBtn->setMinimumWidth(175); + connect(cancelBtn, &DPushButton::clicked, this, [this] { // TODO(Mozart) this->close(); }); - buttonLayout->addWidget(okBtn); buttonLayout->addWidget(cancelBtn); + buttonLayout->addWidget(new DVerticalLine(this)); + buttonLayout->addWidget(okBtn); rightLayout->addLayout(buttonLayout);