From fd0d4d9f2604047649cd95c378ece8b7233f6abb Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Sun, 7 Apr 2024 23:21:53 +0800 Subject: [PATCH] =?UTF-8?q?auto=20detect=20mingw=20in=20mingw32/mingw64=20?= =?UTF-8?q?remove=20spaces=20in=20"=E5=B0=8F=E7=86=8A=E7=8C=ABC++"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RedPandaIDE/settings.cpp | 10 +++++----- platform/windows/installer-scripts/lang.nsh | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index a4408b81..85489338 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -3267,9 +3267,9 @@ void Settings::CompilerSets::findSets() QStringList pathList = path.split(PATH_SEPARATOR); #ifdef Q_OS_WIN pathList = QStringList{ - mSettings->dirs().appDir() + "/Clang64/bin", - mSettings->dirs().appDir() + "/MinGW64/bin", - mSettings->dirs().appDir() + "/MinGW32/bin", + mSettings->dirs().appDir() + "/clang64/bin", + mSettings->dirs().appDir() + "/mingw64/bin", + mSettings->dirs().appDir() + "/mingw32/bin", } + pathList; #endif QString folder, canonicalFolder; @@ -3381,8 +3381,8 @@ void Settings::CompilerSets::loadSets() QString msg = QObject::tr("Compiler set not configuared.") +"

" +QObject::tr("Would you like Red Panda C++ to search for compilers in the following locations:
'%1'
'%2'? ") - .arg(includeTrailingPathDelimiter(pSettings->dirs().appDir()) + "MinGW32") - .arg(includeTrailingPathDelimiter(pSettings->dirs().appDir()) + "MinGW64"); + .arg(includeTrailingPathDelimiter(pSettings->dirs().appDir()) + "mingw32") + .arg(includeTrailingPathDelimiter(pSettings->dirs().appDir()) + "mingw64"); #else QString msg = QObject::tr("Compiler set not configuared.") +"

" diff --git a/platform/windows/installer-scripts/lang.nsh b/platform/windows/installer-scripts/lang.nsh index ce39981c..cdaa14dd 100644 --- a/platform/windows/installer-scripts/lang.nsh +++ b/platform/windows/installer-scripts/lang.nsh @@ -44,20 +44,20 @@ LangString StrHeaderFile 1033 "Header File" LangString StrUninstallerAppName 1033 "Uninstall ${APP_NAME_EN}" /* Simplified Chinese 2052 */ -LangString MessageSectionMain 2052 "小熊猫 C++ IDE（集成开发环境）" +LangString MessageSectionMain 2052 "小熊猫C++IDE（集成开发环境）" LangString MessageSectionIcons 2052 "项目模板使用的图标文件" LangString MessageSectionMinGW32 2052 "${MINGW32_COMPILER_NAME} 编译器和相关的工具、头文件和库" LangString MessageSectionMinGW64 2052 "${MINGW64_COMPILER_NAME} 编译器和相关的工具、头文件和库" LangString MessageSectionLlvm 2052 "LLVM-MinGW 编译器和相关的工具、头文件和库" LangString MessageSectionLangs 2052 "小熊猫 C++ 翻译文件" -LangString MessageSectionAssocs 2052 "使用小熊猫 C++ 打开这些文件" +LangString MessageSectionAssocs 2052 "使用小熊猫C++ 打开这些文件" LangString MessageSectionShortcuts 2052 "开始菜单和快捷方式" -LangString MessageSectionCompress 2052 "压缩小熊猫 C++ 安装目录（需要 Windows 10 或更高版本）" +LangString MessageSectionCompress 2052 "压缩小熊猫C++ 安装目录（需要 Windows 10 或更高版本）" LangString MessageSectionConfig 2052 "删除之前安装遗留的所有配置文件" -LangString MessageUninstallText 2052 "将要删除小熊猫 C++, 是否继续?" -LangString MessageUninstallV2 2052 "本机上已经安装了旧版本小熊猫 C++。$\n$\n点击 “确定” 以将其删除并继续，或者 “取消” 中止安装。" +LangString MessageUninstallText 2052 "将要删除小熊猫C++, 是否继续?" +LangString MessageUninstallV2 2052 "本机上已经安装了旧版本小熊猫C++。$\n$\n点击 “确定” 以将其删除并继续，或者 “取消” 中止安装。" LangString MessageUninstallingExisting 2052 "正在删除旧版本..." -LangString MessageCompressing 2052 "正在压缩小熊猫 C++ 安装目录..." +LangString MessageCompressing 2052 "正在压缩小熊猫C++ 安装目录..." LangString MessageRemoveConfig 2052 "你想要删除所有的配置文件吗？" LangString SectionMainName 2052 "程序文件（必需）" LangString SectionIconsName 2052 "图标文件" @@ -65,9 +65,9 @@ LangString SectionLangsName 2052 "语言文件" LangString SectionMinGW32Name 2052 "${MINGW32_COMPILER_NAME} 编译器" LangString SectionMinGW64Name 2052 "${MINGW64_COMPILER_NAME} 编译器" LangString SectionLlvmName 2052 "LLVM-MinGW 编译器" -LangString SectionAssocsName 2052 "关联文件到小熊猫 C++" +LangString SectionAssocsName 2052 "关联文件到小熊猫C++" LangString SectionAssocExtNameBegin 2052 "将" -LangString SectionAssocExtNameEnd 2052 "文件关联到小熊猫 C++" +LangString SectionAssocExtNameEnd 2052 "文件关联到小熊猫C++" LangString SectionShortcutsName 2052 "快捷方式" LangString SectionMenuLaunchName 2052 "创建开始菜单程序项" LangString SectionDesktopLaunchName 2052 "创建桌面快捷方式" @@ -77,7 +77,7 @@ LangString SectionConfigName 2052 "删除原有配置文件" LangString ErrorArchMismatch 2052 "架构不匹配。此软件包适用于 ${ARCH}，但操作系统是 $osArch。" LangString ErrorWindowsBuildRequired 2052 "不支持的操作系统。需要 ${REQUIRED_WINDOWS_NAME} (${REQUIRED_WINDOWS_BUILD}) 或更高版本。" -LangString WarningArchMismatch 2052 "注意：在 $osArch 操作系统上安装小熊猫 C++ ${ARCH} 版本。你可能想要安装本机版本。" +LangString WarningArchMismatch 2052 "注意：在 $osArch 操作系统上安装小熊猫C++ ${ARCH} 版本。你可能想要安装本机版本。" LangString StrAppName 2052 "${APP_NAME_ZH_CN}" LangString StrInstTypeFull 2052 "完整"