diff --git a/NEWS.md b/NEWS.md index 40874f46..420bb23a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -18,6 +18,8 @@ Red Panda C++ Version 2.7 - enhancement: Generate assembly is not correctly disabled when current file is not C/C++. - change: Disable "Copy Limit" int "options"/"editor"/"Copy/Export" by default. - fix: Project's "static link" option is overwrited by global compiler set settings, when project options dialog is opened. + - fix: Icon size not correct under macOS high DPI / zoom factor settings. + - enhancement: "Icon zoom" in options / environment / appearance Red Panda C++ Version 2.6 diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index f0c8ac37..73745c0e 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -488,7 +488,10 @@ void MainWindow::updateStatusbarForLineCol(bool clear) void MainWindow::updateEditorSettings() { - pIconsManager->updateEditorGuttorIcons(pSettings->environment().iconSet(),pointToPixel(pSettings->editor().fontSize())); + pIconsManager->updateEditorGuttorIcons( + pSettings->environment().iconSet(), + calIconSize(pSettings->editor().fontName(),pSettings->editor().fontSize()) + ); mEditorList->applySettings(); } @@ -841,7 +844,11 @@ void MainWindow::applySettings() pIconsManager->prepareCustomIconSet(customIconSetFolder); pIconsManager->setIconSetsFolder(customIconSetFolder); } - pIconsManager->updateParserIcons(pSettings->environment().iconSet(),pointToPixel(pSettings->environment().interfaceFontSize())); + pIconsManager->updateParserIcons( + pSettings->environment().iconSet(), + calIconSize( + pSettings->environment().interfaceFont(), + pSettings->environment().interfaceFontSize())); QFont caseEditorFont(pSettings->executor().caseEditorFontName()); caseEditorFont.setPixelSize(pointToPixel(pSettings->executor().caseEditorFontSize())); @@ -881,7 +888,11 @@ void MainWindow::applySettings() updateActionIcons(); //icon sets for files view - pIconsManager->updateFileSystemIcons(pSettings->environment().iconSet(),pointToPixel(pSettings->environment().interfaceFontSize())); + pIconsManager->updateFileSystemIcons( + pSettings->environment().iconSet(), + calIconSize( + pSettings->environment().interfaceFont(), + pSettings->environment().interfaceFontSize())); if (!mFileSystemModel.rootPath().isEmpty() && mFileSystemModel.rootPath()!=".") setFilesViewRoot(pSettings->environment().currentFolder()); // for (int i=0;icbFilesPath->count();i++) { @@ -1007,6 +1018,13 @@ void MainWindow::onFileSaved(const QString &path, bool inProject) //updateForEncodingInfo(); } +int MainWindow::calIconSize(const QString &fontName, int fontPointSize) +{ + QFont font(fontName,fontPointSize); + QFontMetrics metrics(font); + return metrics.ascent(); +} + void MainWindow::prepareSearchDialog() { if (!mSearchDialog) @@ -1593,7 +1611,9 @@ void MainWindow::updateDebuggerSettings() void MainWindow::updateActionIcons() { - int size = pointToPixel(pSettings->environment().interfaceFontSize()); + int size = calIconSize( + pSettings->environment().interfaceFont(), + pSettings->environment().interfaceFontSize())*pSettings->environment().iconZoomFactor(); pIconsManager->updateActionIcons(pSettings->environment().iconSet(), size); QSize iconSize(size,size); ui->toolbarMain->setIconSize(iconSize); @@ -2810,7 +2830,9 @@ void MainWindow::initToolButtons() hlayout->setContentsMargins(2,2,2,2); mClassBrowserToolbar->setLayout(hlayout); QToolButton * toolButton; - int size = pointToPixel(pSettings->environment().interfaceFontSize()); + int size = calIconSize( + pSettings->environment().interfaceFont(), + pSettings->environment().interfaceFontSize())*pSettings->environment().iconZoomFactor(); QSize iconSize(size,size); toolButton = new QToolButton; toolButton->setIconSize(iconSize); @@ -2835,7 +2857,9 @@ void MainWindow::initToolButtons() { QHBoxLayout* hlayout = dynamic_cast(ui->panelFiles->layout()); QToolButton * toolButton; - int size = pointToPixel(pSettings->environment().interfaceFontSize()); + int size = calIconSize( + pSettings->environment().interfaceFont(), + pSettings->environment().interfaceFontSize())*pSettings->environment().iconZoomFactor(); QSize iconSize(size,size); toolButton = new QToolButton; toolButton->setIconSize(iconSize); diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h index 1f62d182..4f1c825b 100644 --- a/RedPandaIDE/mainwindow.h +++ b/RedPandaIDE/mainwindow.h @@ -258,6 +258,7 @@ public slots: void onFileSaved(const QString& path, bool inProject); private: + int calIconSize(const QString &fontName, int fontPointSize); void prepareSearchDialog(); void prepareReplaceDialog(); void prepareProjectForCompile(); diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index f7e2f015..14227c9b 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -332,6 +332,11 @@ int Settings::_Base::intValue(const QString &key, int defaultValue) return value(key,defaultValue).toInt(); } +double Settings::_Base::doubleValue(const QString &key, double defaultValue) +{ + return value(key,defaultValue).toDouble(); +} + unsigned int Settings::_Base::uintValue(const QString &key, unsigned int defaultValue) { return value(key,defaultValue).toUInt(); @@ -3268,6 +3273,7 @@ void Settings::Environment::doLoad() } mInterfaceFont = stringValue("interface_font",defaultFontName); mInterfaceFontSize = intValue("interface_font_size",11); + mIconZoomFactor = doubleValue("icon_zoom_factor",1.0); mLanguage = stringValue("language", defaultLocaleName); mIconSet = stringValue("icon_set","contrast"); mUseCustomIconSet = boolValue("use_custom_icon_set", false); @@ -3408,12 +3414,23 @@ void Settings::Environment::setOpenFilesInSingleInstance(bool newOpenFilesInSing mOpenFilesInSingleInstance = newOpenFilesInSingleInstance; } +double Settings::Environment::iconZoomFactor() const +{ + return mIconZoomFactor; +} + +void Settings::Environment::setIconZoomFactor(double newIconZoomFactor) +{ + mIconZoomFactor = newIconZoomFactor; +} + void Settings::Environment::doSave() { //Appearence saveValue("theme", mTheme); saveValue("interface_font", mInterfaceFont); saveValue("interface_font_size", mInterfaceFontSize); + saveValue("icon_zoom_factor",mIconZoomFactor); saveValue("language", mLanguage); saveValue("icon_set",mIconSet); saveValue("use_custom_icon_set", mUseCustomIconSet); diff --git a/RedPandaIDE/settings.h b/RedPandaIDE/settings.h index 3dc07c2f..8b78a6d9 100644 --- a/RedPandaIDE/settings.h +++ b/RedPandaIDE/settings.h @@ -69,6 +69,7 @@ private: bool boolValue(const QString &key, bool defaultValue); QSize sizeValue(const QString &key); int intValue(const QString &key, int defaultValue); + double doubleValue(const QString& key, double defaultValue); unsigned int uintValue(const QString &key, unsigned int defaultValue); QStringList stringListValue(const QString &key, const QStringList& defaultValue=QStringList()); QSet stringSetValue(const QString &key); @@ -559,12 +560,16 @@ public: bool openFilesInSingleInstance() const; void setOpenFilesInSingleInstance(bool newOpenFilesInSingleInstance); + double iconZoomFactor() const; + void setIconZoomFactor(double newIconZoomFactor); + private: //Appearence QString mTheme; QString mInterfaceFont; int mInterfaceFontSize; + double mIconZoomFactor; QString mLanguage; QString mCurrentFolder; QString mIconSet; diff --git a/RedPandaIDE/settingsdialog/environmentappearencewidget.cpp b/RedPandaIDE/settingsdialog/environmentappearencewidget.cpp index bdce430b..48a1a486 100644 --- a/RedPandaIDE/settingsdialog/environmentappearencewidget.cpp +++ b/RedPandaIDE/settingsdialog/environmentappearencewidget.cpp @@ -52,6 +52,7 @@ void EnvironmentAppearenceWidget::doLoad() break; } } + ui->spinZoomFactor->setValue(pSettings->environment().iconZoomFactor()); ui->chkUseCustomIconSet->setChecked(pSettings->environment().useCustomIconSet()); ui->chkUseCustomTheme->setChecked(pSettings->environment().useCustomTheme()); @@ -79,6 +80,8 @@ void EnvironmentAppearenceWidget::doSave() pSettings->environment().setInterfaceFontSize(ui->spinFontSize->value()); pSettings->environment().setLanguage(ui->cbLanguage->currentData().toString()); pSettings->environment().setIconSet(ui->cbIconSet->currentData().toString()); + pSettings->environment().setIconZoomFactor(ui->spinZoomFactor->value()); + pSettings->environment().setUseCustomIconSet(ui->chkUseCustomIconSet->isChecked()); pSettings->environment().setUseCustomTheme(ui->chkUseCustomTheme->isChecked()); diff --git a/RedPandaIDE/settingsdialog/environmentappearencewidget.ui b/RedPandaIDE/settingsdialog/environmentappearencewidget.ui index 1b212565..334d0d8a 100644 --- a/RedPandaIDE/settingsdialog/environmentappearencewidget.ui +++ b/RedPandaIDE/settingsdialog/environmentappearencewidget.ui @@ -14,71 +14,10 @@ Form - - + + - Font: - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - *Needs restart - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - Theme: + Icon Set: @@ -120,18 +59,58 @@ - - + + - Language: + Font: - - - - Font Size: + + + + Qt::Vertical + + + 20 + 40 + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + @@ -175,44 +154,17 @@ - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + + + + Theme: + - - + + - Icon Set: + Font Size: @@ -257,6 +209,111 @@ + + + + Language: + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + *Needs restart + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + Icon Zoom: + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 1 + + + 0.100000000000000 + + + 5.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + diff --git a/RedPandaIDE/settingsdialog/settingswidget.cpp b/RedPandaIDE/settingsdialog/settingswidget.cpp index 09ca08f2..1b6976ce 100644 --- a/RedPandaIDE/settingsdialog/settingswidget.cpp +++ b/RedPandaIDE/settingsdialog/settingswidget.cpp @@ -113,6 +113,9 @@ void SettingsWidget::connectInputs() for (QSpinBox* p:findChildren()) { connect(p, QOverload::of(&QSpinBox::valueChanged), this, &SettingsWidget::setSettingsChanged); } + for (QDoubleSpinBox* p:findChildren()) { + connect(p, QOverload::of(&QDoubleSpinBox::valueChanged), this, &SettingsWidget::setSettingsChanged); + } for (ColorEdit* p:findChildren()) { connect(p, &ColorEdit::colorChanged, this, &SettingsWidget::setSettingsChanged); } @@ -148,6 +151,10 @@ void SettingsWidget::disconnectInputs() for (QSpinBox* p:findChildren()) { disconnect(p, QOverload::of(&QSpinBox::valueChanged), this, &SettingsWidget::setSettingsChanged); } + for (QDoubleSpinBox* p:findChildren()) { + disconnect(p, QOverload::of(&QDoubleSpinBox::valueChanged), this, &SettingsWidget::setSettingsChanged); + } + for (ColorEdit* p:findChildren()) { disconnect(p, &ColorEdit::colorChanged, this, &SettingsWidget::setSettingsChanged); } diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts index a279959f..5f5961a4 100644 --- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts +++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts @@ -1698,6 +1698,10 @@ Traditional Chinese Chinês tradicional + + Icon Zoom: + + EnvironmentFileAssociationWidget diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts index 71bca4b8..8b9b358d 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts @@ -2253,62 +2253,67 @@ Are you really want to continue? 表单 - + Theme: 主题: - + Use custom theme 使用自定义主题 - + Icon Set: 图标集： - + Use custom icon set 使用自定义图标 - + + Icon Zoom: + 图标缩放： + + + Font: 字体: - + Language: 语言: - + *Needs restart *需要重启之后生效 - + Font Size: 大小: - + English 英语 - + Portuguese 葡萄牙语 - + Simplified Chinese 简体中文 - + Traditional Chinese 繁体中文 @@ -4046,18 +4051,18 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - - - - + + + + + Issues 编译器 @@ -4131,7 +4136,7 @@ Are you really want to continue? - + Debug Console 调试主控台 @@ -4265,8 +4270,8 @@ Are you really want to continue? - - + + Compile 编译 @@ -4343,9 +4348,9 @@ Are you really want to continue? - - - + + + Copy 复制 @@ -4356,7 +4361,7 @@ Are you really want to continue? - + Paste 粘贴 @@ -4367,8 +4372,8 @@ Are you really want to continue? - - + + Select All 选择全部 @@ -4494,38 +4499,38 @@ Are you really want to continue? - - + + New Problem Set 新建试题集 - + Add Problem 添加试题 - + Remove Problem 删除试题 - - + + Save Problem Set 保存试题集 - - + + Load Problem Set 载入试题集 @@ -4573,7 +4578,7 @@ Are you really want to continue? - + Remove Problem Case Remove Problem Set 删除试题集 @@ -4581,21 +4586,21 @@ Are you really want to continue? - + Open Anwser Source File 打开答案源代码文件 - + Run All Cases Run Current Case 运行所有案例 - + Problem Cases Validation Options 测试案例验证选项 @@ -4655,15 +4660,15 @@ Are you really want to continue? - - + + Import FPS Problem Set 导入FPS试题集 - - + + Export FPS Problem Set 导出FPS试题集 @@ -4900,7 +4905,7 @@ Are you really want to continue? - + Clear all breakpoints 删除所有断点 @@ -5106,7 +5111,7 @@ Are you really want to continue? - + New File 新建文件 @@ -5147,7 +5152,7 @@ Are you really want to continue? - + Rename Symbol 重命名符号 @@ -5168,13 +5173,13 @@ Are you really want to continue? - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -5443,7 +5448,7 @@ Are you really want to continue? 运行参数... - + File Encoding 文件编码 @@ -5453,32 +5458,32 @@ Are you really want to continue? 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -5487,23 +5492,23 @@ Are you really want to continue? 行:%1 列:%2 已选择:%3 总行数:%4 总长度:%5 - + Line:%1 Col:%2 Selected:%3 Lines:%4 Length:%5 Line: %1 Col: %2 Selected: %3 Lines: %4 Length: %5 行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5 - + Read Only 只读 - + Insert 插入 - + Overwrite 覆写 @@ -5516,75 +5521,75 @@ Are you really want to continue? 你确定要关闭'%1'吗？ - - + + Confirm 确认 - - - + + + Source file is not compiled. 源文件尚未编译。 - - + + Compile now? 现在编译？ - - + + Source file is more recent than executable. 源文件比可执行程序新。 - + Recompile now? 重新编译？ - - - - + + + + Wrong Compiler Settings 错误的编译器设置 - - - - + + + + Compiler is set not to generate executable. 编译器被设置为不生成可执行文件。 - - + + We need the executabe to run problem case. 我们需要可执行文件来运行试题案例。 - + No compiler set 无编译器设置 - + No compiler set is configured. 没有配置编译器设置。 - + Can't start debugging. 无法启动调试器 - - + + Enable debugging 启用调试参数 @@ -5593,54 +5598,54 @@ Are you really want to continue? 当前编译设置中未启用调试选项(-g3)，或启用了信息剥除选项(-s)<br /><br/>是否纠正这一问题？ - + Project not built 项目尚未构建 - + Project hasn't been built. Build it now? 项目尚未构建。是否构建？ - + Host applcation missing 宿主程序不存在 - + DLL project needs a host application to run. 动态链接库（DLL）需要一个宿主程序来运行。 - + But it's missing. 但它不存在。 - + Host application not exists 宿主程序不存在 - + Host application file '%1' doesn't exist. 宿主程序'%1'不存在。 - - + + Please correct this before start debugging 请在调试前改正设置。 - + Recompile? 重新编译？ - - + + Save last open info error 保存上次打开信息失败 @@ -5649,60 +5654,60 @@ Are you really want to continue? 无法删除旧上次打开信息文件'%1' - + Can't save last open info file '%1' 无法保存上次打开信息文件'%1' - - + + Load last open info error 载入上次打开信息失败 - - + + Can't load last open info file '%1' 无法载入上次打开信息文件'%1' - + Open Source File 打开源代码文件 - - + + Batch Set Cases 批量设置案例 - + Show detail debug logs 显示详细调试器日志 - + Copy all 全部复制 - + Go to Line 跳转到行 - + Line 行 - + Template Exists 模板已存在 - + Template %1 already exists. Do you want to overwrite? 模板%1已存在。是否覆盖？ @@ -5710,9 +5715,9 @@ Are you really want to continue? - - - + + + Clear 清除 @@ -5728,7 +5733,7 @@ Are you really want to continue? - + Problem Set %1 试题集%1 @@ -5749,68 +5754,68 @@ Are you really want to continue? 或者选择使用其他的网络端口。 - - + + Rebuild Project 重新构建项目 - - + + Project has been modified, do you want to rebuild it? 项目已经被修改过，是否需要重新构建？ - + Auto Save Error 自动保存出错 - + Auto save "%1" to "%2" failed:%3 自动保存"%1"到"%2"失败：%3 - + Properties... 试题属性... - + Set Problem Set Name 设置试题集名称 - + Problem Set Name: 试题集名称： - + Remove 删除 - + Remove All Bookmarks 删除全部书签 - + Modify Description 修改描述 - - - + + + Bookmark Description 书签描述 - - - + + + Description: 描述： @@ -5819,65 +5824,65 @@ Are you really want to continue? 在调试主控台中显示调试器输出 - + Remove this search 清除这次搜索 - + Clear all searches 删除所有搜索 - + Breakpoint condition... 断点条件... - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Remove All Breakpoints Remove all breakpoints 删除所有断点 - + Remove Breakpoint 删除当前断点 - + Rename File 重命名文件 - - + + Add Folder 添加文件夹 - - + + New folder 新文件夹 - + Folder name: 文件夹： - + Rename Folder 重命名 @@ -5886,157 +5891,157 @@ Are you really want to continue? 您没有使用DEBUG编译配置。 - - + + Do you want to set it now? 要现在去修改设置吗？ - + Rename Problem Set 修改试题集名称 - + Can't open last open information file '%1' for write! 无法写入配置文件'%1'。 - + Rename Problem 修改试题名称 - + Goto Url 跳转到试题网址 - + Add Problem Case 添加试题案例 - + Run Current Case 运行当前案例 - + Remove Folder 删除文件夹 - + Switch to normal view 切换为普通视图 - + Switch to custom view 切换为自定义视图 - + Sort By Type 按类型排序 - + Sort alphabetically 按名称排序 - + Show inherited members 显示继承的成员 - + Goto declaration 跳转到声明处 - + Goto definition 跳转到定义处 - + In current file 仅当前文件 - + In current project 整个项目 - - + + New Folder 新建文件夹 - + Rename 重命名 - - - - + + + + Delete 删除 - + Open in Editor 在编辑器中打开 - + Open in External Program 使用外部程序打开 - + Open in Terminal 在终端中打开 - + Open in Windows Explorer 在Windows浏览器中打开 - + Character sets 字符集 - + Convert to %1 转换为%1编码 - + %1 files autosaved 已自动保存%1个文件 - + Set answer to... 设置答案源代码... - + select other file... 选择其他文件... - + Select Answer Source File 选择答案源代码文件 @@ -6045,17 +6050,17 @@ Are you really want to continue? 中止 - + FPS Problem Set Files (*.fps;*.xml) FPS试题集文件(*.fps;*.xml) - + FPS Problem Set Files (*.fps) FPS试题集文件(*.fps) - + Export Error 导出时出错 @@ -6065,7 +6070,7 @@ Are you really want to continue? C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + New Folder %1 新建文件夹%1 @@ -6078,68 +6083,68 @@ Are you really want to continue? 无标题%1 - + Do you really want to delete %1? 你真的要删除%1吗？ - + Do you really want to delete %1 files? 你真的要删除%1个文件吗？ - + Save project 保存项目 - + The project '%1' has modifications. 项目'%1'有改动。 - - + + Do you want to save it? 需要保存吗？ - - + + File Changed 文件已发生变化 - + New Project File? 新建项目文件? - + Do you want to add the new file to the project? 您是否要将新建的文件加入项目? - - - - + + + + Save Error 保存失败 - + Change Project Compiler Set 改变项目编译器配置集 - + Change the project's compiler set will lose all custom compiler set options. 改变项目的编译器配置集会导致所有的自定义编译器选项被重置。 - - + + Do you really want to do that? 你真的想要那么做吗？ @@ -6148,12 +6153,12 @@ Are you really want to continue? 批量设置案例 - + Choose input files 选择输入数据文件 - + Input data files (*.in) 输入数据文件 (*.in) @@ -6162,78 +6167,78 @@ Are you really want to continue? 无标题%1 - + Modify Watch 修改监视表达式 - + Watch Expression 监视表达式 - + Do you really want to clear all breakpoints in this file? 您真的要清除该文件的所有断点吗？ - + New project 新建项目 - + Close %1 and start new project? 关闭'%1'以打开新项目? - + Folder not exist 文件夹不存在 - + Folder '%1' doesn't exist. Create it now? 文件夹'%1'不存在。是否创建？ - + Can't create folder 无法创建文件夹 - + Failed to create folder '%1'. 创建文件夹'%1'失败。 - + Save new project as - + Folder %1 is not empty. 文件夹%1不是空的。 - + Do you really want to delete it? 你真的要删除它吗？ - + Change working folder 改变工作文件夹 - + File '%1' is not in the current working folder. File '%1' is not in the current working folder 文件'%1'不在当前工作文件夹中。 - + Do you want to change working folder to '%1'? 是否将工作文件夹改设为'%1'? @@ -6242,28 +6247,28 @@ Are you really want to continue? 正在删除试题... - + Can't Commit 无法提交 - + Git needs user info to commit. Git需要用信息进行提交。 - + Choose Input Data File 选择输入数据文件 - - + + All files (*.*) 所有文件 (*.*) - + Choose Expected Output Data File Choose Expected Input Data File 选择期望输出文件 @@ -6275,59 +6280,59 @@ Are you really want to continue? - + Choose Working Folder 选择工作文件夹 - - + + Header Exists 头文件已存在 - - + + Header file "%1" already exists! 头文件"%1"已存在！ - + Source Exists 源文件已存在！ - + Source file "%1" already exists! 源文件"%1"已存在！ - + Can't commit! 无法提交！ - + The following files are in conflicting: 下列文件处于冲突状态，请解决后重新添加和提交： - + Commit Message 提交信息 - + Commit Message: 提交信息： - + Commit Failed 提交失败 - + Commit message shouldn't be empty! 提交信息不能为空！ @@ -6336,22 +6341,22 @@ Are you really want to continue? 小熊猫Dev-C++项目文件 (*.dev) - + New project fail 新建项目失败 - + Can't assign project template 无法使用模板创建项目 - + Remove file 删除文件 - + Remove the file from disk? 同时从硬盘上删除文件？ @@ -6360,127 +6365,127 @@ Are you really want to continue? 无标题 - + New Project File Name 新的项目文件名 - + File Name: 文件名： - + File Already Exists! 文件已存在！ - + File '%1' already exists! 文件'%1'已经存在！ - + Add to project 添加到项目 - - + + You are not using a Debug compiler setting. 您没有使用Debug编译器设置。 - + Please use a Debug compiler set, or enable the "generate debugging info (-g3)" and disable the "strip additional info (-s)" options in the compiler settings. 请在工具栏中选择Debug编译器配置集，或者在编译器配置集设置中启用“生成调试信息(-g3)”并禁用“剥除附加信息(-s)”选项。 - + Please choose a Debug compiler set in the toolbar, or enable the "generate debugging info (-g3)" and disable the "strip additional info (-s)" options in the compiler set settings's "settings" page. 请在工具栏中选择Debug编译器配置集，或者在“编译器配置集”设置的“编译/链接选项”页中<b>启用</b>“生成调试信息(-g3)”、<b>禁用</b>“剥除附件信息(-3)”。 - + C/C++ Source Files (*.c *.cpp *.cc *.cxx) C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + This operation will remove all cases for the current problem. 本操作会删除此试题的所有案例。 - + Red Panda C++ project file (*.dev) 小熊猫C++项目文件(*.dev) - + Rename Error 重命名出错 - + Symbol '%1' is defined in system header. 符号'%1'在系统头文件中定义，无法修改。 - + New Name 新名称 - - + + Replace Error 替换出错 - + Can't open file '%1' for replace! 无法打开文件'%1'进行替换！ - + Contents has changed since last search! 内容和上次查找时不一致。 - + Rich Text Format Files (*.rtf) RTF格式文件 (*.rtf) - + HTML Files (*.html) HTML文件 (*.html) - + The current problem set is not empty. 当前的试题集不是空的。 - + Problem %1 试题%1 - - + + Problem Set Files (*.pbs) 试题集文件 (*.pbs) - - + + Load Error 载入失败 - - + + Problem Case %1 试题案例%1 @@ -6491,16 +6496,16 @@ Are you really want to continue? - - - - - - - - - - + + + + + + + + + + Error 错误 @@ -6510,96 +6515,96 @@ Are you really want to continue? 项目历史 - + Load Theme Error 载入主题失败 - - + + Clear History 清除历史 - - + + Version Control 版本控制 - + File '%1' was changed. 磁盘文件'%1'已被修改。 - + Reload its content from disk? 是否重新读取它的内容？ - + File '%1' was removed. 磁盘文件'%1'已被删除。 - + Keep it open? 是否保持它在小熊猫C++中打开的编辑窗口？ - + Open 打开 - + Compile Failed 编译失败 - + Run Failed 运行失败 - - - - + + + + Confirm Convertion 确认转换 - - - - + + + + The editing file will be saved using %1 encoding. <br />This operation can't be reverted. <br />Are you sure to continue? 当前编辑器中的文件将会使用%1编码保存。<br />这项操作无法被撤回。<br />你确定要继续吗？ - + New Watch Expression 新监视表达式 - + Enter Watch Expression (it is recommended to use 'this->' for class members): 输入监视表达式 - + Parsing file %1 of %2: "%3" （%1/%2）正在解析文件"%3" - - + + Done parsing %1 files in %2 seconds 完成%1个文件的解析,用时%2秒 - + (%1 files per second) (每秒%1个文件） @@ -6712,32 +6717,32 @@ Are you really want to continue? 新建项目 - + Make default language 设为缺省语言 - + C Project C语言项目 - + C++ Project C++语言项目 - + Name: 项目名称： - + Create in 创建在 - + Use as the default project location 设为缺省项目位置 @@ -6746,7 +6751,7 @@ Are you really want to continue? 文件夹： - + ... ... @@ -6755,13 +6760,13 @@ Are you really want to continue? 项目%1 - - + + Default 缺省 - + Choose directory 选择文件夹 @@ -8025,7 +8030,7 @@ Are you really want to continue? 生成调试信息(-g3) - + Would you like Red Panda C++ to search for compilers in PATH? 您同意小熊猫C++在PATH路径中寻找gcc编译器吗？ @@ -8138,7 +8143,7 @@ Are you really want to continue? 只生成汇编代码(-S) - + Confirm 确认 @@ -8159,13 +8164,13 @@ Are you really want to continue? 如果仍然保留这些设置，可能会导致编译错误。<br /><br />请选择“是”，除非您清楚的知道选择“否”的后果， - - + + Compiler set not configuared. 未配置编译器设置。 - + Would you like Red Panda C++ to search for compilers in the following locations: <BR />'%1'<BR />'%2'? 您需要小熊猫C++在下列位置搜索编译器吗：<br />%1<br />%2 @@ -9243,18 +9248,18 @@ Are you really want to continue? 性能 - - - + + + Compiler Set 编译器配置集 - - - + + + Compiler @@ -9266,7 +9271,7 @@ Are you really want to continue? 自动链接 - + @@ -9343,15 +9348,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts index e7fd50cd..ad006a6c 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts @@ -1575,6 +1575,10 @@ Traditional Chinese + + Icon Zoom: + + EnvironmentFileAssociationWidget diff --git a/libs/redpanda_qt_utils/qt_utils/utils.cpp b/libs/redpanda_qt_utils/qt_utils/utils.cpp index 20e176fe..1204b7a1 100644 --- a/libs/redpanda_qt_utils/qt_utils/utils.cpp +++ b/libs/redpanda_qt_utils/qt_utils/utils.cpp @@ -34,6 +34,8 @@ #include #ifdef Q_OS_WIN #include +#include +#include #include #include #endif @@ -718,3 +720,5 @@ QStringList absolutePaths(const QString &dirPath, const QStringList &relativePat } return list; } + +